From 10d550cf8b521a323edda80db78c8e60a13cfa9d Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Wed, 3 May 2023 13:28:25 -0600 Subject: [PATCH 1/4] build(deps): bump github.com/CosmWasm/wasmd to v0.40.0-rc.1 --- app/app.go | 7 +++---- go.mod | 6 +++--- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/app.go b/app/app.go index 8cfc6f6a96..512eaea356 100644 --- a/app/app.go +++ b/app/app.go @@ -158,6 +158,7 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" + govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -174,7 +175,6 @@ import ( authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module" "github.com/CosmWasm/wasmd/x/wasm" - wasmclient "github.com/CosmWasm/wasmd/x/wasm/client" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" ) @@ -238,14 +238,13 @@ var ( mint.AppModuleBasic{}, distr.AppModuleBasic{}, gov.NewAppModuleBasic( - append( - wasmclient.ProposalHandlers, + []govclient.ProposalHandler{ paramsclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler, - ), + }, ), params.AppModuleBasic{}, crisis.AppModuleBasic{}, diff --git a/go.mod b/go.mod index 6e6813efa2..ab3b44e713 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0 - github.com/CosmWasm/wasmd v0.40.0-rc.0 + github.com/CosmWasm/wasmd v0.40.0-rc.1 github.com/armon/go-metrics v0.4.1 github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cometbft/cometbft v0.37.1 @@ -60,7 +60,7 @@ require ( github.com/Antonboom/nilnil v0.1.3 // indirect github.com/BurntSushi/toml v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect - github.com/CosmWasm/wasmvm v1.2.1 // indirect + github.com/CosmWasm/wasmvm v1.2.3 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect @@ -314,7 +314,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Our wasmd branch is: https://github.com/desmos-labs/wasmd v0.40.x-desmos - github.com/CosmWasm/wasmd => github.com/desmos-labs/wasmd v0.40.0-desmos-rc.0 + github.com/CosmWasm/wasmd => github.com/desmos-labs/wasmd v0.40.0-rc.1-desmos // Our cosmos-sdk branch is: https://github.com/desmos-labs/cosmos-sdk v0.47.x-desmos github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.47.2-desmos diff --git a/go.sum b/go.sum index 629954a555..865cc787b4 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v1.2.1 h1:si0tRsRDdUShV0k51Wn6zRKlmj3/WWP9Yr4cLmDTf+8= -github.com/CosmWasm/wasmvm v1.2.1/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= +github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= @@ -458,8 +458,8 @@ github.com/desmos-labs/cosmos-sdk v0.47.2-desmos h1:vZApJFAGmrB8osk3YuDfHNb2L8YL github.com/desmos-labs/cosmos-sdk v0.47.2-desmos/go.mod h1:zYzgI8w8hhotXTSoGbbSOAKfpJTx4wOy4XgbaKhtRtc= github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos h1:uYU67f1pZ7Jht/q9cn5sTdeto0J+lRUHIJgmedDGEVM= github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= -github.com/desmos-labs/wasmd v0.40.0-desmos-rc.0 h1:i/c4IkTTWw+2vUinC+6YKSleBygFqudNFAkBdZ6RZL0= -github.com/desmos-labs/wasmd v0.40.0-desmos-rc.0/go.mod h1:9MispMuIWmjs6HlgRx+XPLfOD0y1k7iQx5KIE2cNGTc= +github.com/desmos-labs/wasmd v0.40.0-rc.1-desmos h1:kMD6Z0bw5kmi9t59y6smn1xoHEz/k3atXOI2Eyd10iI= +github.com/desmos-labs/wasmd v0.40.0-rc.1-desmos/go.mod h1:AgWQP8z5NQ71tqboXvmA5WaCJuoNj+rZA4tNwvAaGBw= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= From d114dc4aed1a3193a0ad4432b3f354e13a8a4567 Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Wed, 3 May 2023 13:30:24 -0600 Subject: [PATCH 2/4] chore: added changeset entry --- ...94a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml diff --git a/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml b/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml new file mode 100644 index 0000000000..5902210d3f --- /dev/null +++ b/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml @@ -0,0 +1,6 @@ +type: deps +module: other +pull_request: 1133 +description: Bump CosmWasm to `v0.40.0-rc.1` +backward_compatible: true +date: 2023-05-03T19:30:07.448271383Z From ac1483f10b1c4397a6be4c2183be0b6c306d1cb2 Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Wed, 3 May 2023 13:34:33 -0600 Subject: [PATCH 3/4] build: updated wasmvm inside Docker builder --- contrib/images/desmos-builder/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/images/desmos-builder/Dockerfile b/contrib/images/desmos-builder/Dockerfile index 28c1e064bf..911925bf4c 100644 --- a/contrib/images/desmos-builder/Dockerfile +++ b/contrib/images/desmos-builder/Dockerfile @@ -12,11 +12,11 @@ WORKDIR /code COPY . /code/ # See https://github.com/CosmWasm/wasmvm/releases -ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.1/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a -RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 86bc5fdc0f01201481c36e17cd3dfed6e9650d22e1c5c8983a5b78c231789ee0 +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.3/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a +RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep d6904bc0082d6510f1e032fc1fd55ffadc9378d963e199afe0f93dd2667c0160 -ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a -RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep a00700aa19f5bfe0f46290ddf69bf51eb03a6dfcd88b905e1081af2e42dbbafc +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.3/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a +RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep bb8ffda690b15765c396266721e45516cb3021146fd4de46f7daeda5b0d82c86 # Copy the library you want to the final location that will be found by the linker flag `-lwasmvm_muslc` RUN cp /lib/libwasmvm_muslc.${arch}.a /usr/local/lib/libwasmvm_muslc.a From a419e8017da1b0cb5e1c19e479ae90eb338d72e3 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 4 May 2023 08:30:53 -0500 Subject: [PATCH 4/4] Update .changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml Co-authored-by: Paul Chen --- ...9c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml b/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml index 5902210d3f..dfb634ae15 100644 --- a/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml +++ b/.changeset/entries/b7c4628489c4494a06a0614c1668e6a4e834584657695d2ab54ed3923b819b8e.yaml @@ -1,6 +1,6 @@ type: deps module: other pull_request: 1133 -description: Bump CosmWasm to `v0.40.0-rc.1` +description: Bump Wasmd to `v0.40.0-rc.1` backward_compatible: true date: 2023-05-03T19:30:07.448271383Z