Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update consensus and wasm params #545

Merged
merged 9 commits into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,12 @@ steps:
password:
from_secret: docker_password
tags:
- v3-alpha
- v3-latest
when:
event:
- push
branch:
- main
- name: publish-docker
image: plugins/docker:18
settings:
dockerfile: docker/Dockerfile
repo: publicawesome/stargaze
username:
from_secret: docker_username
password:
from_secret: docker_password
tags:
- wasm
when:
event:
- push
branch:
- jhernandez/add-wasmd
- name: trigger
image: plugins/downstream
settings:
Expand Down Expand Up @@ -348,7 +332,7 @@ steps:
commands:
- ./scripts/ci/upgrade/proposal.sh
- name: stargaze-upgraded
image: publicawesome/stargaze:wasm
image: publicawesome/stargaze:3.0.0-rc
commands:
- ./scripts/ci/upgrade/run-upgrade.sh
environment:
Expand All @@ -372,6 +356,19 @@ steps:
image: publicawesome/hermes:0.10.0
commands:
- /bin/bash ./scripts/ci/upgrade/transfer-relayer.sh
- name: stargaze-upgraded-params
image: publicawesome/stargaze:3.0.0-rc
commands:
- echo "BaseApp Params"
- starsd q params subspace baseapp BlockParams --node http://stargaze-upgraded:26657
- starsd q params subspace baseapp EvidenceParams --node http://stargaze-upgraded:26657
- starsd q params subspace baseapp ValidatorParams --node http://stargaze-upgraded:26657
- starsd q params subspace wasm uploadAccess --node http://stargaze-upgraded:26657
- starsd q params subspace wasm instantiateAccess --node http://stargaze-upgraded:26657
- starsd q params subspace wasm maxWasmCodeSize --node http://stargaze-upgraded:26657
environment:
GOPROXY: http://goproxy

- name: discord
image: appleboy/drone-discord
settings:
Expand All @@ -397,6 +394,6 @@ depends_on:
- ibc-integration-test
---
kind: signature
hmac: 06d4eea0c6a7033aed5da61ddce082dade980ef159d33fec40a25db483f9e7ef
hmac: a3d7847bf38e727b0e708af22b5fec4d54be7858c46589a75b15bed58e150938

...
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ WORKDIR /code
COPY . /code/

# See https://github.com/CosmWasm/wasmvm/releases
ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta5/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
RUN sha256sum /lib/libwasmvm_muslc.a | grep d16a2cab22c75dbe8af32265b9346c6266070bdcf9ed5aa9b7b39a7e32e25fe0
ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta6/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
RUN echo "e9cb9517585ce3477905e2d4e37553d85f6eac29bdc3b9c25c37c8f5e554045c /lib/libwasmvm_muslc.a" | sha256sum -c

# force it to use static lib (from above) not standard libgo_cosmwasm.so file
RUN FAUCET_ENABLED=true LEDGER_ENABLED=false BUILD_TAGS=muslc make build
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build


# --------------------------------------------------------
Expand Down
14 changes: 11 additions & 3 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@ func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
if err != nil {
return newVM, err
}
params := app.WasmKeeper.GetParams(ctx)
params.CodeUploadAccess = wasmtypes.AllowNobody
app.WasmKeeper.SetParams(ctx, params)
// consensus params
// increase max gas as part of the upgrade to handle cosmwam
consensusParams := app.BaseApp.GetConsensusParams(ctx)
consensusParams.Block.MaxGas = 75_000_000 // 75M
jhernandezb marked this conversation as resolved.
Show resolved Hide resolved
app.BaseApp.StoreConsensusParams(ctx, consensusParams)

// wasm params
wasmParams := app.WasmKeeper.GetParams(ctx)
wasmParams.CodeUploadAccess = wasmtypes.AllowNobody
wasmParams.MaxWasmCodeSize = DefaultMaxWasmCodeSize
app.WasmKeeper.SetParams(ctx, wasmParams)
return newVM, err
})

Expand Down
5 changes: 3 additions & 2 deletions cmd/starsd/cmd/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -462,12 +462,13 @@ func MainnetGenesisParams() GenesisParams {

genParams.ConsensusParams = tmtypes.DefaultConsensusParams()
genParams.ConsensusParams.Block.MaxBytes = 25 * 1024 * 1024 // 26,214,400 for cosmwasm
genParams.ConsensusParams.Block.MaxGas = 10_000_000
genParams.ConsensusParams.Block.MaxGas = 100_000_000
genParams.ConsensusParams.Evidence.MaxAgeDuration = genParams.StakingParams.UnbondingTime
genParams.ConsensusParams.Evidence.MaxAgeNumBlocks = int64(genParams.StakingParams.UnbondingTime.Seconds()) / 3
genParams.ConsensusParams.Version.AppVersion = 1

genParams.WasmParams = wasmtypes.DefaultParams()
genParams.WasmParams.MaxWasmCodeSize = 1000 * 1024 * 2 // 2000 KB

return genParams
}
Expand Down Expand Up @@ -553,6 +554,6 @@ func LocalnetGenesisParams() GenesisParams {
genParams.GovParams.TallyParams.Quorum = sdk.MustNewDecFromStr("0.1") // 10%
genParams.GovParams.TallyParams.Threshold = sdk.MustNewDecFromStr("0.5") // 50%
genParams.GovParams.VotingParams.VotingPeriod = time.Minute * 1 // 5 min
jhernandezb marked this conversation as resolved.
Show resolved Hide resolved

genParams.WasmParams.MaxWasmCodeSize = 1000 * 1024 * 2 // 2000kb
return genParams
}
5 changes: 5 additions & 0 deletions scripts/ci/upgrade/proposal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ apk add -U --no-cache jq tree
STARGAZE_HOME=/stargaze/starsd
starsd config keyring-backend test --home $STARGAZE_HOME

echo "BaseApp Params"
starsd q params subspace baseapp BlockParams --node http://stargaze:26657
jhernandezb marked this conversation as resolved.
Show resolved Hide resolved
starsd q params subspace baseapp EvidenceParams --node http://stargaze:26657
starsd q params subspace baseapp ValidatorParams --node http://stargaze:26657

HEIGHT=$(starsd status --node http://stargaze:26657 --home $STARGAZE_HOME | jq .SyncInfo.latest_block_height -r)
tree -L 2 /stargaze/starsd/
echo "current height $HEIGHT"
Expand Down