diff --git a/.gitignore b/.gitignore index 4d3b9e835..07c99462b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ contracts/@openzeppelin/* # Build files evmd/build/ +evmd/evmd build/ diff --git a/ante/ante.go b/ante/ante.go index 55afabfba..6b13e2264 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -5,7 +5,7 @@ import ( antetypes "github.com/cosmos/evm/ante/types" "github.com/cosmos/evm/x/vm/types" "github.com/cosmos/gogoproto/proto" - ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper" + ibckeeper "github.com/cosmos/ibc-go/v11/modules/core/keeper" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" diff --git a/ante/cosmos.go b/ante/cosmos.go index a83be2042..d1bad06a2 100644 --- a/ante/cosmos.go +++ b/ante/cosmos.go @@ -4,7 +4,7 @@ import ( cosmosante "github.com/cosmos/evm/ante/cosmos" evmante "github.com/cosmos/evm/ante/evm" evmtypes "github.com/cosmos/evm/x/vm/types" - ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante" + ibcante "github.com/cosmos/ibc-go/v11/modules/core/ante" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" diff --git a/evmd/app.go b/evmd/app.go index 41d1911a9..81cfd1ca9 100644 --- a/evmd/app.go +++ b/evmd/app.go @@ -43,18 +43,18 @@ import ( evmkeeper "github.com/cosmos/evm/x/vm/keeper" evmtypes "github.com/cosmos/evm/x/vm/types" "github.com/cosmos/gogoproto/proto" - ibccallbacks "github.com/cosmos/ibc-go/v10/modules/apps/callbacks" - transfer "github.com/cosmos/ibc-go/v10/modules/apps/transfer" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - transferv2 "github.com/cosmos/ibc-go/v10/modules/apps/transfer/v2" - ibc "github.com/cosmos/ibc-go/v10/modules/core" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - ibcapi "github.com/cosmos/ibc-go/v10/modules/core/api" - ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported" - ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibccallbacks "github.com/cosmos/ibc-go/v11/modules/apps/callbacks" + transfer "github.com/cosmos/ibc-go/v11/modules/apps/transfer" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + transferv2 "github.com/cosmos/ibc-go/v11/modules/apps/transfer/v2" + ibc "github.com/cosmos/ibc-go/v11/modules/core" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + ibcapi "github.com/cosmos/ibc-go/v11/modules/core/api" + ibcexported "github.com/cosmos/ibc-go/v11/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v11/modules/core/keeper" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" + ibctesting "github.com/cosmos/ibc-go/v11/testing" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" diff --git a/evmd/config/permissions.go b/evmd/config/permissions.go index ada04c797..312b52198 100644 --- a/evmd/config/permissions.go +++ b/evmd/config/permissions.go @@ -13,7 +13,7 @@ import ( erc20types "github.com/cosmos/evm/x/erc20/types" feemarkettypes "github.com/cosmos/evm/x/feemarket/types" vmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" corevm "github.com/ethereum/go-ethereum/core/vm" ) diff --git a/evmd/go.mod b/evmd/go.mod index b4e11c52e..2a027864c 100644 --- a/evmd/go.mod +++ b/evmd/go.mod @@ -7,7 +7,7 @@ require ( cosmossdk.io/client/v2 v2.0.0-beta.10.0.20260227212600-39d4711b8970 cosmossdk.io/core v1.1.0 cosmossdk.io/errors v1.1.0 - cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd + cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee cosmossdk.io/math v1.5.3 cosmossdk.io/store v1.10.0-rc.2.0.20260311135820-ea452a1660fd cosmossdk.io/tools/confix v0.1.2 @@ -16,7 +16,7 @@ require ( github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee github.com/cosmos/evm v0.2.0 github.com/cosmos/gogoproto v1.7.2 - github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 + github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f github.com/ethereum/go-ethereum v1.16.8 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.38.0 @@ -388,5 +388,3 @@ replace ( ) replace github.com/cosmos/cosmos-sdk/x/group => github.com/cosmos/cosmos-sdk/enterprise/group v0.0.0-20260227212600-39d4711b8970 - -replace cosmossdk.io/log/v2 => github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e diff --git a/evmd/go.sum b/evmd/go.sum index 07dab1703..98a177ce8 100644 --- a/evmd/go.sum +++ b/evmd/go.sum @@ -34,6 +34,8 @@ cosmossdk.io/depinject v1.2.1 h1:eD6FxkIjlVaNZT+dXTQuwQTKZrFZ4UrfCq1RKgzyhMw= cosmossdk.io/depinject v1.2.1/go.mod h1:lqQEycz0H2JXqvOgVwTsjEdMI0plswI7p6KX+MVqFOM= cosmossdk.io/errors v1.1.0 h1:X2DSt9JYgH7cuiaDr318aUqIl2z5Lfo/PdGzAtmczUU= cosmossdk.io/errors v1.1.0/go.mod h1:lnjBmx7etZpMTLnxdspZupH0d9HGRWZhiezDZX2ayyI= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee h1:6p/O3NR3o2Fi5mCTs2lmxdugDMiRVEufp0WQ+eKS1MM= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee/go.mod h1:+31kpYi571Y8KWWPUnw/ict/S7yBqHaCfgFKn3HXr+Y= cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U= cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ= cosmossdk.io/schema v1.1.0 h1:mmpuz3dzouCoyjjcMcA/xHBEmMChN+EHh8EHxHRHhzE= @@ -270,8 +272,6 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+R github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee h1:gAqxehRc0hIEOzw/pUQWDVADds7P0PnGEeRXUsKZHRw= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee/go.mod h1:iH4LQxDSImD6nwxmj+dyfUurZy0dlhBjQluMwidHKBE= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e h1:mZfv3i0jUvAp2m2mMPVb9fhgLjnh98aDbYbPddV3YR8= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e/go.mod h1:Mvss71xjzwK7lywM5hO+Emne4BcAgK+YhkiiO1NU7mQ= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/go-ethereum v1.16.2-cosmos-1.0.20260126204437-32ededcf907f h1:xsll4sPrBiGOaLCfRRsGXBQeveGId7TYI+WJ7KkTuwE= @@ -283,8 +283,8 @@ github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHC github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk= github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs= github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 h1:S7/LxIfkYZ4jEy2tPRpIU+GZ1KfhnRINSJTHLwx6vIA= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021/go.mod h1:DJWRAeB10fPiIlYaVcbuFW88DcUvT4zAzR2TLxz3Mes= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f h1:UWVmJAieoNIRFk07n2dwPZjGWeVjzVt9fy9md5ppAXg= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f/go.mod h1:pGaslaA72xPFbgLuaUgogJLDEyotleA25VAtNiNEzh0= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/evmd/test_helpers.go b/evmd/test_helpers.go index cbcd217ca..74b621a87 100644 --- a/evmd/test_helpers.go +++ b/evmd/test_helpers.go @@ -16,7 +16,7 @@ import ( "github.com/cosmos/evm/testutil/integration/evm/network" feemarkettypes "github.com/cosmos/evm/x/feemarket/types" "github.com/cosmos/evm/x/vm/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" "cosmossdk.io/log/v2" "cosmossdk.io/math" diff --git a/evmd/tests/ibc/helper.go b/evmd/tests/ibc/helper.go index 62146943d..826808f37 100644 --- a/evmd/tests/ibc/helper.go +++ b/evmd/tests/ibc/helper.go @@ -18,7 +18,7 @@ import ( erc20types "github.com/cosmos/evm/x/erc20/types" "github.com/cosmos/evm/x/vm/statedb" "github.com/cosmos/evm/x/vm/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" errorsmod "cosmossdk.io/errors" diff --git a/evmd/tests/ibc/ibc_middleware_test.go b/evmd/tests/ibc/ibc_middleware_test.go index 62ee72f20..208594c54 100644 --- a/evmd/tests/ibc/ibc_middleware_test.go +++ b/evmd/tests/ibc/ibc_middleware_test.go @@ -26,11 +26,11 @@ import ( callbacktypes "github.com/cosmos/evm/x/ibc/callbacks/types" "github.com/cosmos/evm/x/vm/statedb" evmtypes "github.com/cosmos/evm/x/vm/types" - ibctransfer "github.com/cosmos/ibc-go/v10/modules/apps/transfer" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctransfer "github.com/cosmos/ibc-go/v11/modules/apps/transfer" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + ibctesting "github.com/cosmos/ibc-go/v11/testing" "cosmossdk.io/math" diff --git a/evmd/tests/ibc/ics02_precompile_client_test.go b/evmd/tests/ibc/ics02_precompile_client_test.go index eaa3fc674..a50da5d94 100644 --- a/evmd/tests/ibc/ics02_precompile_client_test.go +++ b/evmd/tests/ibc/ics02_precompile_client_test.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/evm/precompiles/ics02" evmibctesting "github.com/cosmos/evm/testutil/ibc" "github.com/cosmos/gogoproto/proto" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - commitmenttypesv2 "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types/v2" - ibchost "github.com/cosmos/ibc-go/v10/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + commitmenttypesv2 "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types/v2" + ibchost "github.com/cosmos/ibc-go/v11/modules/core/24-host" + ibcexported "github.com/cosmos/ibc-go/v11/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" + ibctesting "github.com/cosmos/ibc-go/v11/testing" ) type ICS02ClientTestSuite struct { diff --git a/evmd/tests/ibc/ics20_erc20_conversion_test.go b/evmd/tests/ibc/ics20_erc20_conversion_test.go index 886f088d1..44bb4071c 100644 --- a/evmd/tests/ibc/ics20_erc20_conversion_test.go +++ b/evmd/tests/ibc/ics20_erc20_conversion_test.go @@ -14,8 +14,8 @@ import ( "github.com/cosmos/evm/precompiles/ics20" evmibctesting "github.com/cosmos/evm/testutil/ibc" erc20types "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/ibc/ics20_precompile_transfer_test.go b/evmd/tests/ibc/ics20_precompile_transfer_test.go index c7a70c6c8..9aef6ad88 100644 --- a/evmd/tests/ibc/ics20_precompile_transfer_test.go +++ b/evmd/tests/ibc/ics20_precompile_transfer_test.go @@ -21,8 +21,8 @@ import ( evmibctesting "github.com/cosmos/evm/testutil/ibc" evmante "github.com/cosmos/evm/x/vm/ante" "github.com/cosmos/evm/x/vm/statedb" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/ibc/ics20_recursive_precompile_calls_test.go b/evmd/tests/ibc/ics20_recursive_precompile_calls_test.go index 592944850..db8587b40 100644 --- a/evmd/tests/ibc/ics20_recursive_precompile_calls_test.go +++ b/evmd/tests/ibc/ics20_recursive_precompile_calls_test.go @@ -22,8 +22,8 @@ import ( erc20types "github.com/cosmos/evm/x/erc20/types" "github.com/cosmos/evm/x/vm/statedb" evmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/ibc/transfer_test.go b/evmd/tests/ibc/transfer_test.go index a386e1e68..a03c541f8 100644 --- a/evmd/tests/ibc/transfer_test.go +++ b/evmd/tests/ibc/transfer_test.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/evm/evmd" "github.com/cosmos/evm/evmd/tests/integration" evmibctesting "github.com/cosmos/evm/testutil/ibc" - "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/ibc/v2_ibc_middleware_test.go b/evmd/tests/ibc/v2_ibc_middleware_test.go index 603fdce67..1b802ba41 100644 --- a/evmd/tests/ibc/v2_ibc_middleware_test.go +++ b/evmd/tests/ibc/v2_ibc_middleware_test.go @@ -18,11 +18,11 @@ import ( "github.com/cosmos/evm/x/erc20/types" v2 "github.com/cosmos/evm/x/erc20/v2" "github.com/cosmos/gogoproto/proto" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" - ibcmockv2 "github.com/cosmos/ibc-go/v10/testing/mock/v2" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" + ibctesting "github.com/cosmos/ibc-go/v11/testing" + ibcmockv2 "github.com/cosmos/ibc-go/v11/testing/mock/v2" "cosmossdk.io/math" diff --git a/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go b/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go index 01421ddb7..0815c8c47 100644 --- a/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go +++ b/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go @@ -22,8 +22,8 @@ import ( evmibctesting "github.com/cosmos/evm/testutil/ibc" evmante "github.com/cosmos/evm/x/vm/ante" "github.com/cosmos/evm/x/vm/statedb" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/ibc/v2_transfer_test.go b/evmd/tests/ibc/v2_transfer_test.go index 626428377..0779debc5 100644 --- a/evmd/tests/ibc/v2_transfer_test.go +++ b/evmd/tests/ibc/v2_transfer_test.go @@ -22,10 +22,10 @@ import ( "github.com/cosmos/evm/evmd" "github.com/cosmos/evm/evmd/tests/integration" evmibctesting "github.com/cosmos/evm/testutil/ibc" - "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" + "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" sdkmath "cosmossdk.io/math" diff --git a/evmd/tests/integration/create_app.go b/evmd/tests/integration/create_app.go index a8deb2dba..c2afc1d80 100644 --- a/evmd/tests/integration/create_app.go +++ b/evmd/tests/integration/create_app.go @@ -11,7 +11,7 @@ import ( srvflags "github.com/cosmos/evm/server/flags" "github.com/cosmos/evm/testutil/constants" feemarkettypes "github.com/cosmos/evm/x/feemarket/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" "cosmossdk.io/log/v2" diff --git a/go.mod b/go.mod index ff06bbb64..9917d8ff8 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/api v1.0.0 cosmossdk.io/core v1.1.0 cosmossdk.io/errors v1.1.0 - cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd + cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee cosmossdk.io/math v1.5.3 cosmossdk.io/store v1.10.0-rc.2.0.20260311135820-ea452a1660fd cosmossdk.io/tools/confix v0.1.2 @@ -18,7 +18,7 @@ require ( github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.7.2 - github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 + github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f github.com/cosmos/ledger-cosmos-go v1.0.0 github.com/creachadair/tomledit v0.0.29 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc @@ -381,8 +381,6 @@ replace ( github.com/tidwall/btree => github.com/cosmos/btree v0.0.0-20250924232609-2c6195d95951 ) -replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.39.0-beta.2.0.20260227171234-00271936093e - retract v0.4.0 replace cosmossdk.io/x/group => github.com/cosmos/cosmos-sdk/enterprise/group v0.0.0-20260227212600-39d4711b8970 @@ -390,5 +388,3 @@ replace cosmossdk.io/x/group => github.com/cosmos/cosmos-sdk/enterprise/group v0 replace github.com/cosmos/cosmos-sdk/x/group => github.com/cosmos/cosmos-sdk/enterprise/group v0.0.0-20260227212600-39d4711b8970 replace cosmossdk.io/x/evidence => github.com/cosmos/cosmos-sdk/x/evidence v0.2.0-rc.2.0.20250429200042-9c736b26bf0c - -replace cosmossdk.io/log/v2 => github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e diff --git a/go.sum b/go.sum index de9c9794e..959888247 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ cosmossdk.io/depinject v1.2.1 h1:eD6FxkIjlVaNZT+dXTQuwQTKZrFZ4UrfCq1RKgzyhMw= cosmossdk.io/depinject v1.2.1/go.mod h1:lqQEycz0H2JXqvOgVwTsjEdMI0plswI7p6KX+MVqFOM= cosmossdk.io/errors v1.1.0 h1:X2DSt9JYgH7cuiaDr318aUqIl2z5Lfo/PdGzAtmczUU= cosmossdk.io/errors v1.1.0/go.mod h1:lnjBmx7etZpMTLnxdspZupH0d9HGRWZhiezDZX2ayyI= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee h1:6p/O3NR3o2Fi5mCTs2lmxdugDMiRVEufp0WQ+eKS1MM= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee/go.mod h1:+31kpYi571Y8KWWPUnw/ict/S7yBqHaCfgFKn3HXr+Y= cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U= cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ= cosmossdk.io/schema v1.1.0 h1:mmpuz3dzouCoyjjcMcA/xHBEmMChN+EHh8EHxHRHhzE= @@ -241,8 +243,8 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v0.39.0-beta.2.0.20260227171234-00271936093e h1:wPbD7JfQwC8vKT4JInMnSiYVrpLYHPqkVTW96OXZurk= -github.com/cometbft/cometbft v0.39.0-beta.2.0.20260227171234-00271936093e/go.mod h1:x63z4WfA5e/o9oA8fo4260UC/z5wFs3PW2nMBhtzHkU= +github.com/cometbft/cometbft v0.39.0-beta.3 h1:g8/uWpjmAVCj/0hVUTjqixdgFQEVJLXpUzj1d5y0NV8= +github.com/cometbft/cometbft v0.39.0-beta.3/go.mod h1:mseCsn4XwUovKhgOrrApXTLzfqAsMdpQobqp9wG1PSA= github.com/cometbft/cometbft-db v0.14.3 h1:foX2zuH/L6feyUSLDWg9YRLvt9w8iWVo883wGcyhdQk= github.com/cometbft/cometbft-db v0.14.3/go.mod h1:5CcpGc+0fgZh8ecKa38MwDHfmRAGiRgQg6bGNs1HA/g= github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= @@ -265,8 +267,6 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+R github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee h1:gAqxehRc0hIEOzw/pUQWDVADds7P0PnGEeRXUsKZHRw= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee/go.mod h1:iH4LQxDSImD6nwxmj+dyfUurZy0dlhBjQluMwidHKBE= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e h1:mZfv3i0jUvAp2m2mMPVb9fhgLjnh98aDbYbPddV3YR8= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e/go.mod h1:Mvss71xjzwK7lywM5hO+Emne4BcAgK+YhkiiO1NU7mQ= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/go-ethereum v1.16.2-cosmos-1.0.20260126204437-32ededcf907f h1:xsll4sPrBiGOaLCfRRsGXBQeveGId7TYI+WJ7KkTuwE= @@ -278,8 +278,8 @@ github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHC github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk= github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs= github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 h1:S7/LxIfkYZ4jEy2tPRpIU+GZ1KfhnRINSJTHLwx6vIA= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021/go.mod h1:DJWRAeB10fPiIlYaVcbuFW88DcUvT4zAzR2TLxz3Mes= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f h1:UWVmJAieoNIRFk07n2dwPZjGWeVjzVt9fy9md5ppAXg= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f/go.mod h1:pGaslaA72xPFbgLuaUgogJLDEyotleA25VAtNiNEzh0= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/ibc/interfaces.go b/ibc/interfaces.go index da0b1ee08..e108c780e 100644 --- a/ibc/interfaces.go +++ b/ibc/interfaces.go @@ -3,8 +3,8 @@ package ibc import ( cmtbytes "github.com/cometbft/cometbft/libs/bytes" - ibctypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported" + ibctypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v11/modules/core/exported" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/ibc/module.go b/ibc/module.go index 77a5801b3..67af57c36 100644 --- a/ibc/module.go +++ b/ibc/module.go @@ -1,9 +1,9 @@ package ibc import ( - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/ibc/module_test.go b/ibc/module_test.go index 0b300635e..f97fb92a9 100644 --- a/ibc/module_test.go +++ b/ibc/module_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" cosmosevmibc "github.com/cosmos/evm/ibc" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/ibc/utils.go b/ibc/utils.go index 45c68139b..c71ccb205 100644 --- a/ibc/utils.go +++ b/ibc/utils.go @@ -3,8 +3,8 @@ package ibc import ( "strings" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" diff --git a/ibc/utils_test.go b/ibc/utils_test.go index 1ae3bd22a..dde86719d 100644 --- a/ibc/utils_test.go +++ b/ibc/utils_test.go @@ -8,9 +8,9 @@ import ( cosmosevmibc "github.com/cosmos/evm/ibc" precompilestestutil "github.com/cosmos/evm/precompiles/testutil" testconstants "github.com/cosmos/evm/testutil/constants" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + ibctesting "github.com/cosmos/ibc-go/v11/testing" "cosmossdk.io/math" diff --git a/interfaces.go b/interfaces.go index 65568ffee..b5bb6ac13 100644 --- a/interfaces.go +++ b/interfaces.go @@ -7,9 +7,9 @@ import ( feemarketkeeper "github.com/cosmos/evm/x/feemarket/keeper" "github.com/cosmos/evm/x/ibc/callbacks/keeper" evmkeeper "github.com/cosmos/evm/x/vm/keeper" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + ibckeeper "github.com/cosmos/ibc-go/v11/modules/core/keeper" + ibctesting "github.com/cosmos/ibc-go/v11/testing" storetypes "cosmossdk.io/store/types" diff --git a/precompiles/common/interfaces.go b/precompiles/common/interfaces.go index fb6ebdb1b..78d28bd08 100644 --- a/precompiles/common/interfaces.go +++ b/precompiles/common/interfaces.go @@ -7,9 +7,9 @@ import ( erc20types "github.com/cosmos/evm/x/erc20/types" "github.com/cosmos/evm/x/vm/statedb" - ibctypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" + ibctypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" "cosmossdk.io/math" diff --git a/precompiles/ics02/tx.go b/precompiles/ics02/tx.go index edb1f08df..434af12e2 100644 --- a/precompiles/ics02/tx.go +++ b/precompiles/ics02/tx.go @@ -9,10 +9,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/core/vm" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - commitmenttypesv2 "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types/v2" - host "github.com/cosmos/ibc-go/v10/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + commitmenttypesv2 "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types/v2" + host "github.com/cosmos/ibc-go/v11/modules/core/24-host" + ibcexported "github.com/cosmos/ibc-go/v11/modules/core/exported" errorsmod "cosmossdk.io/errors" diff --git a/precompiles/ics02/types.go b/precompiles/ics02/types.go index 17065777a..4f22bee0c 100644 --- a/precompiles/ics02/types.go +++ b/precompiles/ics02/types.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" cmn "github.com/cosmos/evm/precompiles/common" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" ) // height is a struct used to parse the ProofHeight parameter used as input diff --git a/precompiles/ics20/query.go b/precompiles/ics20/query.go index 819553b15..58b28bbcd 100644 --- a/precompiles/ics20/query.go +++ b/precompiles/ics20/query.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/core/vm" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/precompiles/ics20/tx.go b/precompiles/ics20/tx.go index 26007e5bd..750af035b 100644 --- a/precompiles/ics20/tx.go +++ b/precompiles/ics20/tx.go @@ -12,10 +12,10 @@ import ( cmn "github.com/cosmos/evm/precompiles/common" erc20types "github.com/cosmos/evm/x/erc20/types" "github.com/cosmos/evm/x/vm/statedb" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v10/modules/core/24-host" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v11/modules/core/24-host" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" diff --git a/precompiles/ics20/types.go b/precompiles/ics20/types.go index 62b992adc..e9bd9458a 100644 --- a/precompiles/ics20/types.go +++ b/precompiles/ics20/types.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" cmn "github.com/cosmos/evm/precompiles/common" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" diff --git a/precompiles/testutil/ibc.go b/precompiles/testutil/ibc.go index 476de91f4..916c6799e 100644 --- a/precompiles/testutil/ibc.go +++ b/precompiles/testutil/ibc.go @@ -1,7 +1,7 @@ package testutil import ( - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" ) var ( diff --git a/precompiles/types/defaults.go b/precompiles/types/defaults.go index 6df4779cf..cd6898674 100644 --- a/precompiles/types/defaults.go +++ b/precompiles/types/defaults.go @@ -8,8 +8,8 @@ import ( ibcutils "github.com/cosmos/evm/ibc" cmn "github.com/cosmos/evm/precompiles/common" erc20Keeper "github.com/cosmos/evm/x/erc20/keeper" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - channelkeeper "github.com/cosmos/ibc-go/v10/modules/core/04-channel/keeper" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + channelkeeper "github.com/cosmos/ibc-go/v11/modules/core/04-channel/keeper" "cosmossdk.io/core/address" diff --git a/precompiles/types/static_precompiles.go b/precompiles/types/static_precompiles.go index 260e9d819..7f19b35c1 100644 --- a/precompiles/types/static_precompiles.go +++ b/precompiles/types/static_precompiles.go @@ -19,8 +19,8 @@ import ( slashingprecompile "github.com/cosmos/evm/precompiles/slashing" stakingprecompile "github.com/cosmos/evm/precompiles/staking" erc20Keeper "github.com/cosmos/evm/x/erc20/keeper" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - channelkeeper "github.com/cosmos/ibc-go/v10/modules/core/04-channel/keeper" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + channelkeeper "github.com/cosmos/ibc-go/v11/modules/core/04-channel/keeper" "github.com/cosmos/cosmos-sdk/codec" distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" diff --git a/rpc/websockets.go b/rpc/websockets.go index 5d9d7a947..7fe71597a 100644 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -453,7 +453,7 @@ func (api *pubSubAPI) subscribe(wsConn *wsConn, subID rpc.ID, params []any) (con } func (api *pubSubAPI) subscribeNewHeads(wsConn *wsConn, subID rpc.ID) (context.CancelFunc, error) { - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(context.Background()) // #nosec G118 // cancel returned to caller for subscription cleanup //nolint: errcheck go api.events.HeaderStream().Subscribe(ctx, func(headers []stream.RPCHeader, _ int) error { for _, header := range headers { @@ -591,7 +591,7 @@ func (api *pubSubAPI) subscribeLogs(wsConn *wsConn, subID rpc.ID, extra any) (co } } - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(context.Background()) // #nosec G118 // cancel returned to caller for subscription cleanup //nolint: errcheck go api.events.LogStream().Subscribe(ctx, func(txLogs []*ethtypes.Log, _ int) error { logs := rpcfilters.FilterLogs(txLogs, crit.FromBlock, crit.ToBlock, crit.Addresses, crit.Topics) @@ -628,7 +628,7 @@ func (api *pubSubAPI) subscribeLogs(wsConn *wsConn, subID rpc.ID, extra any) (co } func (api *pubSubAPI) subscribePendingTransactions(wsConn *wsConn, subID rpc.ID) (context.CancelFunc, error) { - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(context.Background()) // #nosec G118 // cancel returned to caller for subscription cleanup //nolint: errcheck go api.events.PendingTxStream().Subscribe(ctx, func(items []common.Hash, _ int) error { for _, hash := range items { diff --git a/tests/integration/ante/evm_ante_test_suite.go b/tests/integration/ante/evm_ante_test_suite.go index 7aa902b83..ad8703b82 100644 --- a/tests/integration/ante/evm_ante_test_suite.go +++ b/tests/integration/ante/evm_ante_test_suite.go @@ -18,8 +18,8 @@ import ( "github.com/cosmos/evm/testutil/integration/evm/network" utiltx "github.com/cosmos/evm/testutil/tx" evmtypes "github.com/cosmos/evm/x/vm/types" - ibctypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + ibctypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" storetypes "cosmossdk.io/store/types" diff --git a/tests/integration/precompiles/erc20/test_query.go b/tests/integration/precompiles/erc20/test_query.go index 17e781356..ee1a36a66 100644 --- a/tests/integration/precompiles/erc20/test_query.go +++ b/tests/integration/precompiles/erc20/test_query.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/evm/precompiles/erc20" "github.com/cosmos/evm/testutil" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" sdkmath "cosmossdk.io/math" diff --git a/tests/integration/precompiles/ics20/test_integration.go b/tests/integration/precompiles/ics20/test_integration.go index 9cc752d70..705b01342 100644 --- a/tests/integration/precompiles/ics20/test_integration.go +++ b/tests/integration/precompiles/ics20/test_integration.go @@ -21,8 +21,8 @@ import ( "github.com/cosmos/evm/testutil/tx" testutiltypes "github.com/cosmos/evm/testutil/types" evmtypes "github.com/cosmos/evm/x/vm/types" - "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + ibctesting "github.com/cosmos/ibc-go/v11/testing" "cosmossdk.io/math" diff --git a/tests/integration/precompiles/ics20/test_query.go b/tests/integration/precompiles/ics20/test_query.go index dca6ab452..62bcfc30c 100644 --- a/tests/integration/precompiles/ics20/test_query.go +++ b/tests/integration/precompiles/ics20/test_query.go @@ -9,7 +9,7 @@ import ( cmn "github.com/cosmos/evm/precompiles/common" "github.com/cosmos/evm/precompiles/ics20" precompiletestutil "github.com/cosmos/evm/precompiles/testutil" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/tests/integration/precompiles/ics20/test_setup.go b/tests/integration/precompiles/ics20/test_setup.go index 7a21b3a9b..e9b285e5d 100644 --- a/tests/integration/precompiles/ics20/test_setup.go +++ b/tests/integration/precompiles/ics20/test_setup.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/evm" "github.com/cosmos/evm/precompiles/ics20" evmibctesting "github.com/cosmos/evm/testutil/ibc" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" ) type PrecompileTestSuite struct { diff --git a/tests/integration/precompiles/ics20/test_tx.go b/tests/integration/precompiles/ics20/test_tx.go index cbd342872..494474601 100644 --- a/tests/integration/precompiles/ics20/test_tx.go +++ b/tests/integration/precompiles/ics20/test_tx.go @@ -10,8 +10,8 @@ import ( evmibctesting "github.com/cosmos/evm/testutil/ibc" "github.com/cosmos/evm/testutil/tx" evmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" sdkmath "cosmossdk.io/math" diff --git a/tests/integration/x/erc20/test_genesis.go b/tests/integration/x/erc20/test_genesis.go index 3c5b5e02e..c1a952740 100644 --- a/tests/integration/x/erc20/test_genesis.go +++ b/tests/integration/x/erc20/test_genesis.go @@ -7,7 +7,7 @@ import ( utiltx "github.com/cosmos/evm/testutil/tx" "github.com/cosmos/evm/x/erc20" "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" "cosmossdk.io/math" ) diff --git a/tests/integration/x/erc20/test_ibc_callback.go b/tests/integration/x/erc20/test_ibc_callback.go index 263b484a7..cc09ccceb 100644 --- a/tests/integration/x/erc20/test_ibc_callback.go +++ b/tests/integration/x/erc20/test_ibc_callback.go @@ -16,11 +16,11 @@ import ( "github.com/cosmos/evm/x/erc20/types" "github.com/cosmos/evm/x/vm/statedb" evmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - ibcgotesting "github.com/cosmos/ibc-go/v10/testing" - ibcmock "github.com/cosmos/ibc-go/v10/testing/mock" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + ibcgotesting "github.com/cosmos/ibc-go/v11/testing" + ibcmock "github.com/cosmos/ibc-go/v11/testing/mock" "cosmossdk.io/math" diff --git a/tests/integration/x/ibc/callbacks/test_keeper.go b/tests/integration/x/ibc/callbacks/test_keeper.go index ec3c91f22..167d26014 100644 --- a/tests/integration/x/ibc/callbacks/test_keeper.go +++ b/tests/integration/x/ibc/callbacks/test_keeper.go @@ -7,11 +7,11 @@ import ( "github.com/cosmos/evm/testutil/keyring" "github.com/cosmos/evm/x/ibc/callbacks/types" - cbtypes "github.com/cosmos/ibc-go/v10/modules/apps/callbacks/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - ibcerrors "github.com/cosmos/ibc-go/v10/modules/core/errors" + cbtypes "github.com/cosmos/ibc-go/v11/modules/apps/callbacks/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + ibcerrors "github.com/cosmos/ibc-go/v11/modules/core/errors" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/tests/integration/x/ibc/test_keeper.go b/tests/integration/x/ibc/test_keeper.go index 2de25e223..7a41181c0 100644 --- a/tests/integration/x/ibc/test_keeper.go +++ b/tests/integration/x/ibc/test_keeper.go @@ -18,11 +18,11 @@ import ( testutiltypes "github.com/cosmos/evm/testutil/types" erc20types "github.com/cosmos/evm/x/erc20/types" evmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" "cosmossdk.io/math" diff --git a/tests/speedtest/go.mod b/tests/speedtest/go.mod index f0e51769e..06ecedb6f 100644 --- a/tests/speedtest/go.mod +++ b/tests/speedtest/go.mod @@ -11,7 +11,7 @@ replace ( ) require ( - cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd + cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee github.com/cosmos/cosmos-db v1.1.3 github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee github.com/cosmos/evm v0.2.0 @@ -102,7 +102,7 @@ require ( github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.7.2 // indirect github.com/cosmos/iavl v1.2.6 // indirect - github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 // indirect + github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f // indirect github.com/cosmos/ics23/go v0.11.0 // indirect github.com/cosmos/ledger-cosmos-go v1.0.0 // indirect github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect diff --git a/tests/speedtest/go.sum b/tests/speedtest/go.sum index c9d9b1a48..47362a9c9 100644 --- a/tests/speedtest/go.sum +++ b/tests/speedtest/go.sum @@ -34,8 +34,8 @@ cosmossdk.io/depinject v1.2.1 h1:eD6FxkIjlVaNZT+dXTQuwQTKZrFZ4UrfCq1RKgzyhMw= cosmossdk.io/depinject v1.2.1/go.mod h1:lqQEycz0H2JXqvOgVwTsjEdMI0plswI7p6KX+MVqFOM= cosmossdk.io/errors v1.1.0 h1:X2DSt9JYgH7cuiaDr318aUqIl2z5Lfo/PdGzAtmczUU= cosmossdk.io/errors v1.1.0/go.mod h1:lnjBmx7etZpMTLnxdspZupH0d9HGRWZhiezDZX2ayyI= -cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd h1:zk7ef0NexiSNeY1MlIup68+znoUC8RvJ3b9+Xe2RqoQ= -cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd/go.mod h1:+31kpYi571Y8KWWPUnw/ict/S7yBqHaCfgFKn3HXr+Y= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee h1:6p/O3NR3o2Fi5mCTs2lmxdugDMiRVEufp0WQ+eKS1MM= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee/go.mod h1:+31kpYi571Y8KWWPUnw/ict/S7yBqHaCfgFKn3HXr+Y= cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U= cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ= cosmossdk.io/schema v1.1.0 h1:mmpuz3dzouCoyjjcMcA/xHBEmMChN+EHh8EHxHRHhzE= @@ -277,8 +277,8 @@ github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHC github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk= github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs= github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 h1:S7/LxIfkYZ4jEy2tPRpIU+GZ1KfhnRINSJTHLwx6vIA= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021/go.mod h1:DJWRAeB10fPiIlYaVcbuFW88DcUvT4zAzR2TLxz3Mes= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f h1:UWVmJAieoNIRFk07n2dwPZjGWeVjzVt9fy9md5ppAXg= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f/go.mod h1:pGaslaA72xPFbgLuaUgogJLDEyotleA25VAtNiNEzh0= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= github.com/cosmos/ledger-cosmos-go v1.0.0 h1:jNKW89nPf0vR0EkjHG8Zz16h6p3zqwYEOxlHArwgYtw= diff --git a/tests/systemtests/go.mod b/tests/systemtests/go.mod index f7572e34d..a29e7a028 100644 --- a/tests/systemtests/go.mod +++ b/tests/systemtests/go.mod @@ -23,7 +23,7 @@ require ( cosmossdk.io/core v1.1.0 // indirect cosmossdk.io/depinject v1.2.1 // indirect cosmossdk.io/errors v1.1.0 // indirect - cosmossdk.io/log/v2 v2.0.2-0.20260311135820-ea452a1660fd // indirect + cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee // indirect cosmossdk.io/schema v1.1.0 // indirect cosmossdk.io/store v1.10.0-rc.2.0.20260311135820-ea452a1660fd // indirect filippo.io/edwards25519 v1.2.0 // indirect @@ -61,7 +61,7 @@ require ( github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.7.2 // indirect github.com/cosmos/iavl v1.2.6 // indirect - github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 // indirect + github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f // indirect github.com/cosmos/ics23/go v0.11.0 // indirect github.com/cosmos/ledger-cosmos-go v1.0.0 // indirect github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect @@ -308,9 +308,5 @@ require ( replace ( github.com/cosmos/evm => ../.. - // TODO replace this once we no longer pull in an ibc-go version which points to old groups module path - github.com/cosmos/ibc-go/v10 => github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v1.16.2-cosmos-1 ) - -replace cosmossdk.io/log/v2 => github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e diff --git a/tests/systemtests/go.sum b/tests/systemtests/go.sum index 9acda09f6..ee6d2f308 100644 --- a/tests/systemtests/go.sum +++ b/tests/systemtests/go.sum @@ -27,6 +27,8 @@ cosmossdk.io/depinject v1.2.1 h1:eD6FxkIjlVaNZT+dXTQuwQTKZrFZ4UrfCq1RKgzyhMw= cosmossdk.io/depinject v1.2.1/go.mod h1:lqQEycz0H2JXqvOgVwTsjEdMI0plswI7p6KX+MVqFOM= cosmossdk.io/errors v1.1.0 h1:X2DSt9JYgH7cuiaDr318aUqIl2z5Lfo/PdGzAtmczUU= cosmossdk.io/errors v1.1.0/go.mod h1:lnjBmx7etZpMTLnxdspZupH0d9HGRWZhiezDZX2ayyI= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee h1:6p/O3NR3o2Fi5mCTs2lmxdugDMiRVEufp0WQ+eKS1MM= +cosmossdk.io/log/v2 v2.0.2-0.20260311165803-2c527014f3ee/go.mod h1:+31kpYi571Y8KWWPUnw/ict/S7yBqHaCfgFKn3HXr+Y= cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U= cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ= cosmossdk.io/schema v1.1.0 h1:mmpuz3dzouCoyjjcMcA/xHBEmMChN+EHh8EHxHRHhzE= @@ -226,8 +228,6 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+R github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee h1:gAqxehRc0hIEOzw/pUQWDVADds7P0PnGEeRXUsKZHRw= github.com/cosmos/cosmos-sdk v0.54.0-rc.1.0.20260311165803-2c527014f3ee/go.mod h1:iH4LQxDSImD6nwxmj+dyfUurZy0dlhBjQluMwidHKBE= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e h1:mZfv3i0jUvAp2m2mMPVb9fhgLjnh98aDbYbPddV3YR8= -github.com/cosmos/cosmos-sdk/log/v2 v2.0.2-0.20260302180736-2fbcc8d5f49e/go.mod h1:Mvss71xjzwK7lywM5hO+Emne4BcAgK+YhkiiO1NU7mQ= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/go-ethereum v1.16.2-cosmos-1 h1:QIaIS6HIdPSBdTvpFhxswhMLUJgcr4irbd2o9ZKldAI= @@ -239,8 +239,8 @@ github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHC github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk= github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs= github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021 h1:S7/LxIfkYZ4jEy2tPRpIU+GZ1KfhnRINSJTHLwx6vIA= -github.com/cosmos/ibc-go/v10 v10.0.0-beta.0.0.20260311202420-1b48494ae021/go.mod h1:DJWRAeB10fPiIlYaVcbuFW88DcUvT4zAzR2TLxz3Mes= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f h1:UWVmJAieoNIRFk07n2dwPZjGWeVjzVt9fy9md5ppAXg= +github.com/cosmos/ibc-go/v11 v11.0.0-20260311172126-d2ebd83ffd5f/go.mod h1:pGaslaA72xPFbgLuaUgogJLDEyotleA25VAtNiNEzh0= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= github.com/cosmos/ledger-cosmos-go v1.0.0 h1:jNKW89nPf0vR0EkjHG8Zz16h6p3zqwYEOxlHArwgYtw= diff --git a/testutil/app/adapter.go b/testutil/app/adapter.go index 8ee85bc69..9324e608a 100644 --- a/testutil/app/adapter.go +++ b/testutil/app/adapter.go @@ -9,9 +9,9 @@ import ( feemarketkeeper "github.com/cosmos/evm/x/feemarket/keeper" "github.com/cosmos/evm/x/ibc/callbacks/keeper" evmkeeper "github.com/cosmos/evm/x/vm/keeper" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" - ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" + ibckeeper "github.com/cosmos/ibc-go/v11/modules/core/keeper" + ibctesting "github.com/cosmos/ibc-go/v11/testing" storetypes "cosmossdk.io/store/types" diff --git a/testutil/ibc.go b/testutil/ibc.go index dc5636133..30b0ee159 100644 --- a/testutil/ibc.go +++ b/testutil/ibc.go @@ -1,7 +1,7 @@ package testutil import ( - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" ) func GetVoucherDenomFromPacketData( diff --git a/testutil/ibc/chain.go b/testutil/ibc/chain.go index eb90c63a5..ac6b4a4c3 100644 --- a/testutil/ibc/chain.go +++ b/testutil/ibc/chain.go @@ -22,14 +22,14 @@ import ( "github.com/cosmos/evm/crypto/ethsecp256k1" "github.com/cosmos/evm/testutil/tx" "github.com/cosmos/evm/x/vm/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v10/modules/core/24-host" - "github.com/cosmos/ibc-go/v10/modules/core/exported" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" - ibctesting "github.com/cosmos/ibc-go/v10/testing" - "github.com/cosmos/ibc-go/v10/testing/simapp" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types" + host "github.com/cosmos/ibc-go/v11/modules/core/24-host" + "github.com/cosmos/ibc-go/v11/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" + ibctesting "github.com/cosmos/ibc-go/v11/testing" + "github.com/cosmos/ibc-go/v11/testing/simapp" errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" diff --git a/testutil/ibc/config.go b/testutil/ibc/config.go index 879d61d07..f6eae75f1 100644 --- a/testutil/ibc/config.go +++ b/testutil/ibc/config.go @@ -3,11 +3,11 @@ package ibctesting import ( "time" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" - "github.com/cosmos/ibc-go/v10/testing/mock" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" + "github.com/cosmos/ibc-go/v11/testing/mock" ) type ClientConfig interface { diff --git a/testutil/ibc/coordinator.go b/testutil/ibc/coordinator.go index 29ae6cf7b..b5bbeeef4 100644 --- a/testutil/ibc/coordinator.go +++ b/testutil/ibc/coordinator.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/cosmos/evm/x/vm/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" ) var ( diff --git a/testutil/ibc/endpoint.go b/testutil/ibc/endpoint.go index 37fb3e82b..9e62027ab 100644 --- a/testutil/ibc/endpoint.go +++ b/testutil/ibc/endpoint.go @@ -10,14 +10,14 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types" - commitmenttypesv2 "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types/v2" - host "github.com/cosmos/ibc-go/v10/modules/core/24-host" - "github.com/cosmos/ibc-go/v10/modules/core/exported" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types" + commitmenttypesv2 "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types/v2" + host "github.com/cosmos/ibc-go/v11/modules/core/24-host" + "github.com/cosmos/ibc-go/v11/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/testutil/ibc/endpoint_v2.go b/testutil/ibc/endpoint_v2.go index 7c0e35fe4..93f1ba392 100644 --- a/testutil/ibc/endpoint_v2.go +++ b/testutil/ibc/endpoint_v2.go @@ -8,9 +8,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/gogoproto/proto" - clientv2types "github.com/cosmos/ibc-go/v10/modules/core/02-client/v2/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" - hostv2 "github.com/cosmos/ibc-go/v10/modules/core/24-host/v2" + clientv2types "github.com/cosmos/ibc-go/v11/modules/core/02-client/v2/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" + hostv2 "github.com/cosmos/ibc-go/v11/modules/core/24-host/v2" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/ibc/events.go b/testutil/ibc/events.go index 5a89e9ce6..e90ea8c44 100644 --- a/testutil/ibc/events.go +++ b/testutil/ibc/events.go @@ -11,10 +11,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" ) // ParseClientIDFromEvents parses events emitted from a MsgCreateClient and returns the diff --git a/testutil/ibc/path.go b/testutil/ibc/path.go index d66f388fd..cec9a169b 100644 --- a/testutil/ibc/path.go +++ b/testutil/ibc/path.go @@ -7,9 +7,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/gogoproto/proto" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" ) // Path contains two endpoints representing two chains connected over IBC diff --git a/testutil/ibc/testing_app.go b/testutil/ibc/testing_app.go index 921835af5..6f8733f32 100644 --- a/testutil/ibc/testing_app.go +++ b/testutil/ibc/testing_app.go @@ -12,9 +12,9 @@ import ( dbm "github.com/cosmos/cosmos-db" evmtypes "github.com/cosmos/evm/x/vm/types" - "github.com/cosmos/ibc-go/v10/modules/core/keeper" - ibctesting "github.com/cosmos/ibc-go/v10/testing" - "github.com/cosmos/ibc-go/v10/testing/simapp" + "github.com/cosmos/ibc-go/v11/modules/core/keeper" + ibctesting "github.com/cosmos/ibc-go/v11/testing" + "github.com/cosmos/ibc-go/v11/testing/simapp" "cosmossdk.io/log/v2" sdkmath "cosmossdk.io/math" diff --git a/testutil/ibc/values.go b/testutil/ibc/values.go index bff8ebd3f..55aaa884d 100644 --- a/testutil/ibc/values.go +++ b/testutil/ibc/values.go @@ -9,11 +9,11 @@ import ( "github.com/cometbft/cometbft/crypto/tmhash" - ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types" - commitmenttypes "github.com/cosmos/ibc-go/v10/modules/core/23-commitment/types" - ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint" - "github.com/cosmos/ibc-go/v10/testing/mock" + ibctransfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + connectiontypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/v11/modules/core/23-commitment/types" + ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint" + "github.com/cosmos/ibc-go/v11/testing/mock" sdkmath "cosmossdk.io/math" ) diff --git a/testutil/integration/base/network/network.go b/testutil/integration/base/network/network.go index 9c69c76fe..99f379acb 100644 --- a/testutil/integration/base/network/network.go +++ b/testutil/integration/base/network/network.go @@ -6,7 +6,7 @@ import ( abcitypes "github.com/cometbft/cometbft/abci/types" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" sdktypes "github.com/cosmos/cosmos-sdk/types" sdktestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" diff --git a/testutil/integration/evm/network/ibc.go b/testutil/integration/evm/network/ibc.go index 841a2a601..13cdfaf66 100644 --- a/testutil/integration/evm/network/ibc.go +++ b/testutil/integration/evm/network/ibc.go @@ -3,7 +3,7 @@ package network import ( "testing" - ibctesting "github.com/cosmos/ibc-go/v10/testing" + ibctesting "github.com/cosmos/ibc-go/v11/testing" ) // GetIBCChain returns a TestChain instance for the given network. diff --git a/testutil/integration/evm/utils/unit.go b/testutil/integration/evm/utils/unit.go index 978a82eac..7d2abb7fc 100644 --- a/testutil/integration/evm/utils/unit.go +++ b/testutil/integration/evm/utils/unit.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/evm/testutil/integration/evm/network" erc20types "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" "cosmossdk.io/math" diff --git a/utils/utils.go b/utils/utils.go index 57ec19be1..cb8be1521 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/viper" "github.com/cosmos/evm/crypto/ethsecp256k1" - ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" + ibctransfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" errorsmod "cosmossdk.io/errors" diff --git a/x/erc20/ibc_middleware.go b/x/erc20/ibc_middleware.go index 1b6532334..0d49f7c66 100644 --- a/x/erc20/ibc_middleware.go +++ b/x/erc20/ibc_middleware.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/evm/ibc" erc20types "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" errorsmod "cosmossdk.io/errors" diff --git a/x/erc20/keeper/ibc_callbacks.go b/x/erc20/keeper/ibc_callbacks.go index 1ccb3351c..1468e4669 100644 --- a/x/erc20/keeper/ibc_callbacks.go +++ b/x/erc20/keeper/ibc_callbacks.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/evm/ibc" "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" diff --git a/x/erc20/keeper/keeper.go b/x/erc20/keeper/keeper.go index 9f843de59..8eaa7ece1 100644 --- a/x/erc20/keeper/keeper.go +++ b/x/erc20/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/cosmos/evm/x/erc20/types" - transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" + transferkeeper "github.com/cosmos/ibc-go/v11/modules/apps/transfer/keeper" "cosmossdk.io/core/address" "cosmossdk.io/log/v2" diff --git a/x/erc20/types/interfaces.go b/x/erc20/types/interfaces.go index a11157938..25aa417bb 100644 --- a/x/erc20/types/interfaces.go +++ b/x/erc20/types/interfaces.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/evm/x/vm/statedb" evmtypes "github.com/cosmos/evm/x/vm/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v10/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v11/modules/core/exported" "cosmossdk.io/core/address" "cosmossdk.io/log/v2" diff --git a/x/erc20/v2/ibc_middleware.go b/x/erc20/v2/ibc_middleware.go index 4da54d498..7a903980a 100644 --- a/x/erc20/v2/ibc_middleware.go +++ b/x/erc20/v2/ibc_middleware.go @@ -7,11 +7,11 @@ import ( "fmt" erc20types "github.com/cosmos/evm/x/erc20/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types" - ibcapi "github.com/cosmos/ibc-go/v10/modules/core/api" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + channeltypesv2 "github.com/cosmos/ibc-go/v11/modules/core/04-channel/v2/types" + ibcapi "github.com/cosmos/ibc-go/v11/modules/core/api" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/ibc/callbacks/keeper/keeper.go b/x/ibc/callbacks/keeper/keeper.go index 7549bfb10..1efd93903 100644 --- a/x/ibc/callbacks/keeper/keeper.go +++ b/x/ibc/callbacks/keeper/keeper.go @@ -14,12 +14,12 @@ import ( evmante "github.com/cosmos/evm/x/vm/ante" "github.com/cosmos/evm/x/vm/statedb" evmtypes "github.com/cosmos/evm/x/vm/types" - callbacktypes "github.com/cosmos/ibc-go/v10/modules/apps/callbacks/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" - ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported" + callbacktypes "github.com/cosmos/ibc-go/v11/modules/apps/callbacks/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v11/modules/core/exported" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" diff --git a/x/ibc/callbacks/keeper/keeper_test.go b/x/ibc/callbacks/keeper/keeper_test.go index ff1dbafec..4952c1bb7 100644 --- a/x/ibc/callbacks/keeper/keeper_test.go +++ b/x/ibc/callbacks/keeper/keeper_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" "github.com/cosmos/evm/x/ibc/callbacks/types" - callbacktypes "github.com/cosmos/ibc-go/v10/modules/apps/callbacks/types" - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" + callbacktypes "github.com/cosmos/ibc-go/v11/modules/apps/callbacks/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" "cosmossdk.io/log/v2" storetypes "cosmossdk.io/store/types" diff --git a/x/ibc/callbacks/types/marshal.go b/x/ibc/callbacks/types/marshal.go index fc91f492b..edd5c5537 100644 --- a/x/ibc/callbacks/types/marshal.go +++ b/x/ibc/callbacks/types/marshal.go @@ -1,8 +1,8 @@ package types import ( - transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" - porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types" + transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types" + porttypes "github.com/cosmos/ibc-go/v11/modules/core/05-port/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/vm/types/params.go b/x/vm/types/params.go index 0a7bb4718..0a9fd86b5 100644 --- a/x/vm/types/params.go +++ b/x/vm/types/params.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/cosmos/evm/utils" - channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v10/modules/core/24-host" + channeltypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v11/modules/core/24-host" errorsmod "cosmossdk.io/errors"