From 84a09c133d9b0e93750b3ee09aaebc22f7ab01a9 Mon Sep 17 00:00:00 2001 From: John Letey Date: Fri, 20 Oct 2023 12:20:30 +0200 Subject: [PATCH 1/2] fix: use ibc/v4 in v4 branch --- chain/cosmos/codec.go | 4 ++-- chain/cosmos/cosmos_chain.go | 2 +- conformance/relayersetup.go | 2 +- conformance/test.go | 2 +- examples/cosmos/light_client_test.go | 2 +- examples/ibc/interchain_accounts_test.go | 2 +- examples/ibc/learn_ibc_test.go | 2 +- examples/ibc/packet_forward_test.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- ibc/packet.go | 4 ++-- ibc/relayer.go | 6 +++--- ibc/relayer_test.go | 2 +- ibc/types.go | 2 +- interchain_test.go | 4 ++-- relayer/hermes/hermes_commander.go | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/chain/cosmos/codec.go b/chain/cosmos/codec.go index d0fbf2694..e4fe49083 100644 --- a/chain/cosmos/codec.go +++ b/chain/cosmos/codec.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authTx "github.com/cosmos/cosmos-sdk/x/auth/tx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - ibctypes "github.com/cosmos/ibc-go/v3/modules/core/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + ibctypes "github.com/cosmos/ibc-go/v4/modules/core/types" ) func DefaultEncoding() simappparams.EncodingConfig { diff --git a/chain/cosmos/cosmos_chain.go b/chain/cosmos/cosmos_chain.go index d1e6cb167..f10d25beb 100644 --- a/chain/cosmos/cosmos_chain.go +++ b/chain/cosmos/cosmos_chain.go @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/types" bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" paramsutils "github.com/cosmos/cosmos-sdk/x/params/client/utils" - chanTypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chanTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" dockertypes "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" diff --git a/conformance/relayersetup.go b/conformance/relayersetup.go index b7a71da21..7e9b29e97 100644 --- a/conformance/relayersetup.go +++ b/conformance/relayersetup.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/ibc" "github.com/strangelove-ventures/interchaintest/v4/testreporter" diff --git a/conformance/test.go b/conformance/test.go index 47542622d..cab2335f2 100644 --- a/conformance/test.go +++ b/conformance/test.go @@ -35,7 +35,7 @@ import ( "testing" "time" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" "github.com/docker/docker/client" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" diff --git a/examples/cosmos/light_client_test.go b/examples/cosmos/light_client_test.go index e3bf80565..ae5e560c3 100644 --- a/examples/cosmos/light_client_test.go +++ b/examples/cosmos/light_client_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v4/ibc" diff --git a/examples/ibc/interchain_accounts_test.go b/examples/ibc/interchain_accounts_test.go index a72c00ea4..3bfa9a300 100644 --- a/examples/ibc/interchain_accounts_test.go +++ b/examples/ibc/interchain_accounts_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/crypto/keyring" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v4/ibc" diff --git a/examples/ibc/learn_ibc_test.go b/examples/ibc/learn_ibc_test.go index 11b9bc97e..2e7328f6a 100644 --- a/examples/ibc/learn_ibc_test.go +++ b/examples/ibc/learn_ibc_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/ibc" "github.com/strangelove-ventures/interchaintest/v4/testreporter" diff --git a/examples/ibc/packet_forward_test.go b/examples/ibc/packet_forward_test.go index 83414a7ab..923c72722 100644 --- a/examples/ibc/packet_forward_test.go +++ b/examples/ibc/packet_forward_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" interchaintest "github.com/strangelove-ventures/interchaintest/v4" "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v4/ibc" diff --git a/go.mod b/go.mod index 872384a26..472dfb59b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/atotto/clipboard v0.1.4 github.com/avast/retry-go/v4 v4.3.4 github.com/cosmos/cosmos-sdk v0.45.16 - github.com/cosmos/ibc-go/v3 v3.4.0 + github.com/cosmos/ibc-go/v4 v4.5.1 github.com/davecgh/go-spew v1.1.1 github.com/docker/docker v24.0.1+incompatible github.com/docker/go-connections v0.4.0 @@ -53,7 +53,7 @@ require ( github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677 // indirect github.com/cockroachdb/redact v1.1.3 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/confio/ics23/go v0.9.0 // indirect + github.com/confio/ics23/go v0.9.1 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect diff --git a/go.sum b/go.sum index 092376a97..91f662f9a 100644 --- a/go.sum +++ b/go.sum @@ -802,8 +802,8 @@ github.com/cometbft/cometbft v0.34.27/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKRe github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= -github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= +github.com/confio/ics23/go v0.9.1 h1:3MV46eeWwO3xCauKyAtuAdJYMyPnnchW4iLr2bTw6/U= +github.com/confio/ics23/go v0.9.1/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -959,8 +959,8 @@ github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v2 v2.0.2 h1:y7eUgggMEVe43wHLw9XrGbeaTWtfkJYMoL3m6YW4fIY= github.com/cosmos/ibc-go/v2 v2.0.2/go.mod h1:XUmW7wmubCRhIEAGtMGS+5IjiSSmcAwihoN/yPGd6Kk= -github.com/cosmos/ibc-go/v3 v3.4.0 h1:ha3cqEG36pqMWqA1D+kxDWBTZXpeFMd/aZIQF7I0xro= -github.com/cosmos/ibc-go/v3 v3.4.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= +github.com/cosmos/ibc-go/v4 v4.5.1 h1:+P73X7aIikGAXBUJ9vP9rEbvdSuekt3KGXmAWCSYets= +github.com/cosmos/ibc-go/v4 v4.5.1/go.mod h1:2EOi40Bx/j6rJrtP1ui8k8yUAMpGybmL1EjakYqYv5U= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= diff --git a/ibc/packet.go b/ibc/packet.go index 412ad53b1..7c3ecb872 100644 --- a/ibc/packet.go +++ b/ibc/packet.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" "go.uber.org/multierr" ) @@ -13,7 +13,7 @@ type Nanoseconds uint64 // Packet is a packet sent over an IBC channel as defined in ICS-4. // See: https://github.com/cosmos/ibc/blob/52a9094a5bc8c5275e25c19d0b2d9e6fd80ba31c/spec/core/ics-004-channel-and-packet-semantics/README.md -// Proto defined at: github.com/cosmos/ibc-go/v3@v3.0.0/proto/ibc/core/channel/v1/tx.proto +// Proto defined at: github.com/cosmos/ibc-go/v4@v3.0.0/proto/ibc/core/channel/v1/tx.proto type Packet struct { Sequence uint64 // the order of sends and receives, where a packet with an earlier sequence number must be sent and received before a packet with a later sequence number SourcePort string // the port on the sending chain diff --git a/ibc/relayer.go b/ibc/relayer.go index 56f34b1c3..f9fd86e89 100644 --- a/ibc/relayer.go +++ b/ibc/relayer.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - ptypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ptypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" ) // Relayer represents an instance of a relayer that can be support IBC. diff --git a/ibc/relayer_test.go b/ibc/relayer_test.go index 8c075833b..daec467a6 100644 --- a/ibc/relayer_test.go +++ b/ibc/relayer_test.go @@ -3,7 +3,7 @@ package ibc import ( "testing" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/stretchr/testify/require" ) diff --git a/ibc/types.go b/ibc/types.go index 4605dacfe..e491e07d3 100644 --- a/ibc/types.go +++ b/ibc/types.go @@ -6,7 +6,7 @@ import ( simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" ) // ChainConfig defines the chain parameters requires to run an interchaintest testnet for a chain. diff --git a/interchain_test.go b/interchain_test.go index 83346754d..1ea5292f8 100644 --- a/interchain_test.go +++ b/interchain_test.go @@ -18,8 +18,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" ) func TestInterchain_DuplicateChain_CosmosRly(t *testing.T) { diff --git a/relayer/hermes/hermes_commander.go b/relayer/hermes/hermes_commander.go index ea7e4f577..e9f4fe793 100644 --- a/relayer/hermes/hermes_commander.go +++ b/relayer/hermes/hermes_commander.go @@ -9,8 +9,8 @@ import ( "github.com/strangelove-ventures/interchaintest/v4/relayer" "go.uber.org/zap" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" ) var _ relayer.RelayerCommander = &commander{} From 7139a14683dbe1821673d7276b589f287b750b9e Mon Sep 17 00:00:00 2001 From: John Letey Date: Fri, 20 Oct 2023 19:54:00 +0200 Subject: [PATCH 2/2] chore: small nit --- ibc/packet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibc/packet.go b/ibc/packet.go index 7c3ecb872..f5903adc8 100644 --- a/ibc/packet.go +++ b/ibc/packet.go @@ -13,7 +13,7 @@ type Nanoseconds uint64 // Packet is a packet sent over an IBC channel as defined in ICS-4. // See: https://github.com/cosmos/ibc/blob/52a9094a5bc8c5275e25c19d0b2d9e6fd80ba31c/spec/core/ics-004-channel-and-packet-semantics/README.md -// Proto defined at: github.com/cosmos/ibc-go/v4@v3.0.0/proto/ibc/core/channel/v1/tx.proto +// Proto defined at: github.com/cosmos/ibc-go/v4@v4.5.1/proto/ibc/core/channel/v1/tx.proto type Packet struct { Sequence uint64 // the order of sends and receives, where a packet with an earlier sequence number must be sent and received before a packet with a later sequence number SourcePort string // the port on the sending chain