diff --git a/CHANGELOG.md b/CHANGELOG.md index 5194a5e1c02..cd1b9d1d95a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Dependencies +* [\#8617](https://github.com/cosmos/ibc-go/pull/8617) Bump **wasmvm** to **3.0.2** * [\#8451](https://github.com/cosmos/ibc-go/pull/8451) Bump **go** to **1.24** * (light-clients/08-wasm)[\#8500](https://github.com/cosmos/ibc-go/pull/8500) Bump **github.com/prysmaticlabs/prysm/v5** to **github.com/OffchainLabs/prysm/v6@v6.0.4** diff --git a/docs/docs/03-light-clients/04-wasm/03-integration.md b/docs/docs/03-light-clients/04-wasm/03-integration.md index 546a355be71..0f4d1748d76 100644 --- a/docs/docs/03-light-clients/04-wasm/03-integration.md +++ b/docs/docs/03-light-clients/04-wasm/03-integration.md @@ -158,7 +158,7 @@ import ( ... "github.com/cosmos/cosmos-sdk/runtime" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/docs/versioned_docs/version-v10.1.x/03-light-clients/04-wasm/03-integration.md b/docs/versioned_docs/version-v10.1.x/03-light-clients/04-wasm/03-integration.md index 546a355be71..0f4d1748d76 100644 --- a/docs/versioned_docs/version-v10.1.x/03-light-clients/04-wasm/03-integration.md +++ b/docs/versioned_docs/version-v10.1.x/03-light-clients/04-wasm/03-integration.md @@ -158,7 +158,7 @@ import ( ... "github.com/cosmos/cosmos-sdk/runtime" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/e2e/go.mod b/e2e/go.mod index d4da4e34422..3de96385123 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -57,7 +57,7 @@ require ( github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect - github.com/CosmWasm/wasmvm/v2 v2.2.4 // indirect + github.com/CosmWasm/wasmvm/v3 v3.0.2 // indirect github.com/DataDog/datadog-go v4.8.3+incompatible // indirect github.com/DataDog/zstd v1.5.7 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 929a89e6f52..dc53460e272 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -661,8 +661,8 @@ github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= -github.com/CosmWasm/wasmvm/v2 v2.2.4 h1:V3UwXJMA8TNOuQETppDQkaXAevF7gOWLYpKvrThPv7o= -github.com/CosmWasm/wasmvm/v2 v2.2.4/go.mod h1:Aj/rB2KMRM8nAdbWxkO23rnQYb5KsoPuH9ZizSi0sVg= +github.com/CosmWasm/wasmvm/v3 v3.0.2 h1:+MLkOX+IdklITLqfG26PCFv5OXdZvNb8z5Wq5JFXTRM= +github.com/CosmWasm/wasmvm/v3 v3.0.2/go.mod h1:oknpb1bFERvvKcY7vHRp1F/Y/z66xVrsl7n9uWkOAlM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index 3491ed01946..527dac5e9a5 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -22,7 +22,7 @@ require ( cosmossdk.io/x/feegrant v0.2.0 cosmossdk.io/x/tx v0.14.0 cosmossdk.io/x/upgrade v0.2.0 - github.com/CosmWasm/wasmvm/v2 v2.2.4 + github.com/CosmWasm/wasmvm/v3 v3.0.2 github.com/OffchainLabs/prysm/v6 v6.0.4 github.com/cometbft/cometbft v0.38.17 github.com/cosmos/cosmos-db v1.1.3 diff --git a/modules/light-clients/08-wasm/go.sum b/modules/light-clients/08-wasm/go.sum index e1e8785d0e0..bcea3dadaa8 100644 --- a/modules/light-clients/08-wasm/go.sum +++ b/modules/light-clients/08-wasm/go.sum @@ -661,8 +661,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.2.4 h1:V3UwXJMA8TNOuQETppDQkaXAevF7gOWLYpKvrThPv7o= -github.com/CosmWasm/wasmvm/v2 v2.2.4/go.mod h1:Aj/rB2KMRM8nAdbWxkO23rnQYb5KsoPuH9ZizSi0sVg= +github.com/CosmWasm/wasmvm/v3 v3.0.2 h1:+MLkOX+IdklITLqfG26PCFv5OXdZvNb8z5Wq5JFXTRM= +github.com/CosmWasm/wasmvm/v3 v3.0.2/go.mod h1:oknpb1bFERvvKcY7vHRp1F/Y/z66xVrsl7n9uWkOAlM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/modules/light-clients/08-wasm/internal/types/store.go b/modules/light-clients/08-wasm/internal/types/store.go index c29789c3ca2..bad08bd7de9 100644 --- a/modules/light-clients/08-wasm/internal/types/store.go +++ b/modules/light-clients/08-wasm/internal/types/store.go @@ -5,7 +5,7 @@ import ( "errors" "io" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" "cosmossdk.io/store/cachekv" "cosmossdk.io/store/tracekv" diff --git a/modules/light-clients/08-wasm/keeper/contract_keeper.go b/modules/light-clients/08-wasm/keeper/contract_keeper.go index 25a6b522dd0..f84ee48f1dc 100644 --- a/modules/light-clients/08-wasm/keeper/contract_keeper.go +++ b/modules/light-clients/08-wasm/keeper/contract_keeper.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" diff --git a/modules/light-clients/08-wasm/keeper/contract_keeper_test.go b/modules/light-clients/08-wasm/keeper/contract_keeper_test.go index 61ec401a26b..969e137732d 100644 --- a/modules/light-clients/08-wasm/keeper/contract_keeper_test.go +++ b/modules/light-clients/08-wasm/keeper/contract_keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "encoding/json" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" wasmtesting "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/testing" "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types" diff --git a/modules/light-clients/08-wasm/keeper/genesis.go b/modules/light-clients/08-wasm/keeper/genesis.go index e84beb75e70..99cb3acdf11 100644 --- a/modules/light-clients/08-wasm/keeper/genesis.go +++ b/modules/light-clients/08-wasm/keeper/genesis.go @@ -1,7 +1,7 @@ package keeper import ( - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/08-wasm/keeper/keeper.go b/modules/light-clients/08-wasm/keeper/keeper.go index 8c86c226533..0f40e6226cf 100644 --- a/modules/light-clients/08-wasm/keeper/keeper.go +++ b/modules/light-clients/08-wasm/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/hex" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" "cosmossdk.io/collections" "cosmossdk.io/core/store" diff --git a/modules/light-clients/08-wasm/keeper/keeper_test.go b/modules/light-clients/08-wasm/keeper/keeper_test.go index 9e9b3b4b537..f3feaaf7020 100644 --- a/modules/light-clients/08-wasm/keeper/keeper_test.go +++ b/modules/light-clients/08-wasm/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" dbm "github.com/cosmos/cosmos-db" testifysuite "github.com/stretchr/testify/suite" diff --git a/modules/light-clients/08-wasm/keeper/keeper_vm.go b/modules/light-clients/08-wasm/keeper/keeper_vm.go index 6426084f849..689ad5cf410 100644 --- a/modules/light-clients/08-wasm/keeper/keeper_vm.go +++ b/modules/light-clients/08-wasm/keeper/keeper_vm.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" "cosmossdk.io/collections" "cosmossdk.io/core/store" diff --git a/modules/light-clients/08-wasm/keeper/msg_server_test.go b/modules/light-clients/08-wasm/keeper/msg_server_test.go index 72d9a3b16a3..05e1a834f6e 100644 --- a/modules/light-clients/08-wasm/keeper/msg_server_test.go +++ b/modules/light-clients/08-wasm/keeper/msg_server_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "errors" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -61,7 +61,7 @@ func (s *KeeperTestSuite) TestMsgStoreCode() { func() { msg = types.NewMsgStoreCode(signer, []byte{0, 1, 3, 4}) }, - errors.New("Wasm bytes do not start with Wasm magic number"), + errors.New("wasm bytes do not start with Wasm magic number"), }, { "fails with wasm code too large", diff --git a/modules/light-clients/08-wasm/keeper/options_test.go b/modules/light-clients/08-wasm/keeper/options_test.go index 8723ced3e16..be0697c4e20 100644 --- a/modules/light-clients/08-wasm/keeper/options_test.go +++ b/modules/light-clients/08-wasm/keeper/options_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/08-wasm/keeper/querier.go b/modules/light-clients/08-wasm/keeper/querier.go index 8b9adf44948..062de7785cf 100644 --- a/modules/light-clients/08-wasm/keeper/querier.go +++ b/modules/light-clients/08-wasm/keeper/querier.go @@ -5,7 +5,7 @@ import ( "fmt" "slices" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" diff --git a/modules/light-clients/08-wasm/keeper/querier_test.go b/modules/light-clients/08-wasm/keeper/querier_test.go index 7f3ddf8e7a2..76bc0e59aec 100644 --- a/modules/light-clients/08-wasm/keeper/querier_test.go +++ b/modules/light-clients/08-wasm/keeper/querier_test.go @@ -6,8 +6,8 @@ import ( "fmt" "math" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/08-wasm/light_client_module_test.go b/modules/light-clients/08-wasm/light_client_module_test.go index ef890ae6fd9..535308d9c35 100644 --- a/modules/light-clients/08-wasm/light_client_module_test.go +++ b/modules/light-clients/08-wasm/light_client_module_test.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" errorsmod "cosmossdk.io/errors" diff --git a/modules/light-clients/08-wasm/testing/mock_engine.go b/modules/light-clients/08-wasm/testing/mock_engine.go index 9ca7f0cf01f..e96b843b533 100644 --- a/modules/light-clients/08-wasm/testing/mock_engine.go +++ b/modules/light-clients/08-wasm/testing/mock_engine.go @@ -7,8 +7,8 @@ import ( "fmt" "reflect" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types" ) diff --git a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go index 337a475e594..fd8749dd07b 100644 --- a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go +++ b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go @@ -8,7 +8,7 @@ import ( "runtime/debug" "strings" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/CosmWasm/wasmvm/v3" dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -408,7 +408,7 @@ func getExpectedLibwasmVersion() string { panic("can't read build info") } for _, d := range buildInfo.Deps { - if d.Path != "github.com/CosmWasm/wasmvm/v2" { + if d.Path != "github.com/CosmWasm/wasmvm/v3" { continue } if d.Replace != nil { diff --git a/modules/light-clients/08-wasm/types/expected_interfaces.go b/modules/light-clients/08-wasm/types/expected_interfaces.go index 11686cc6049..c10d5acc02f 100644 --- a/modules/light-clients/08-wasm/types/expected_interfaces.go +++ b/modules/light-clients/08-wasm/types/expected_interfaces.go @@ -1,8 +1,8 @@ package types import ( - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/modules/light-clients/08-wasm/types/gas_register.go b/modules/light-clients/08-wasm/types/gas_register.go index 4efea591019..e74b5703251 100644 --- a/modules/light-clients/08-wasm/types/gas_register.go +++ b/modules/light-clients/08-wasm/types/gas_register.go @@ -1,7 +1,7 @@ package types import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" diff --git a/modules/light-clients/08-wasm/types/gas_register_custom.go b/modules/light-clients/08-wasm/types/gas_register_custom.go index 991d8779c43..580a9860236 100644 --- a/modules/light-clients/08-wasm/types/gas_register_custom.go +++ b/modules/light-clients/08-wasm/types/gas_register_custom.go @@ -3,8 +3,8 @@ package types import ( "math" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" storetypes "cosmossdk.io/store/types" diff --git a/modules/light-clients/08-wasm/types/store.go b/modules/light-clients/08-wasm/types/store.go index facce62830c..82721b6ea61 100644 --- a/modules/light-clients/08-wasm/types/store.go +++ b/modules/light-clients/08-wasm/types/store.go @@ -3,8 +3,8 @@ package types import ( "fmt" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" storetypes "cosmossdk.io/store/types" diff --git a/modules/light-clients/08-wasm/types/wasm_vm.go b/modules/light-clients/08-wasm/types/wasm_vm.go index e8d237bcef6..d5d6dccdd46 100644 --- a/modules/light-clients/08-wasm/types/wasm_vm.go +++ b/modules/light-clients/08-wasm/types/wasm_vm.go @@ -2,6 +2,6 @@ package types -import wasmvm "github.com/CosmWasm/wasmvm/v2" +import wasmvm "github.com/CosmWasm/wasmvm/v3" var _ WasmEngine = (*wasmvm.VM)(nil) diff --git a/modules/light-clients/08-wasm/wasm_test.go b/modules/light-clients/08-wasm/wasm_test.go index 9076aab5aec..e232165cf56 100644 --- a/modules/light-clients/08-wasm/wasm_test.go +++ b/modules/light-clients/08-wasm/wasm_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/CosmWasm/wasmvm/v3" + wasmvmtypes "github.com/CosmWasm/wasmvm/v3/types" dbm "github.com/cosmos/cosmos-db" testifysuite "github.com/stretchr/testify/suite" diff --git a/scripts/get-libwasm-version.py b/scripts/get-libwasm-version.py index 7b50cae5873..fab12eb5f23 100755 --- a/scripts/get-libwasm-version.py +++ b/scripts/get-libwasm-version.py @@ -25,7 +25,7 @@ import argparse import requests -WASM_IMPORT = "github.com/CosmWasm/wasmvm/v2" +WASM_IMPORT = "github.com/CosmWasm/wasmvm/v3" def _get_wasm_version(wasm_go_mod_path: str) -> str: