From 6acb6ed8f82f9c4703fc64b9ccdd43b63aff3bf8 Mon Sep 17 00:00:00 2001 From: John Letey Date: Mon, 23 Oct 2023 18:14:18 +0200 Subject: [PATCH 1/3] chore: update ibc to v4 --- .../unreleased/dependencies/250-bump-ibc.md | 1 + app/ante.go | 6 ++-- app/app.go | 32 +++++++++---------- go.mod | 14 ++++---- go.sum | 20 ++++++------ interchaintest/cctp_deposit_for_burn_test.go | 6 ++-- .../cctp_deposit_for_burn_with_caller_test.go | 6 ++-- interchaintest/cctp_receive_message_test.go | 6 ++-- .../cctp_receive_message_with_caller_test.go | 6 ++-- .../cctp_replace_deposit_for_burn_test.go | 6 ++-- interchaintest/genesis_test.go | 10 +++--- interchaintest/globalfee_test.go | 6 ++-- interchaintest/go.mod | 8 +++-- interchaintest/go.sum | 16 +++++----- interchaintest/ibc_bps_fee_test.go | 12 +++---- .../ibc_client_expire_substitute_test.go | 10 +++--- interchaintest/noble_test.go | 8 ++--- interchaintest/packet_forward_test.go | 12 +++---- interchaintest/paramauthority_test.go | 8 ++--- interchaintest/upgrade_argon_test.go | 8 ++--- interchaintest/upgrade_radon_test.go | 4 +-- interchaintest/upgrade_test.go | 10 +++--- x/blockibc/blockibc.go | 32 +++++++++---------- x/tariff/keeper/keeper.go | 16 +++++++--- 24 files changed, 137 insertions(+), 126 deletions(-) create mode 100644 .changelog/unreleased/dependencies/250-bump-ibc.md diff --git a/.changelog/unreleased/dependencies/250-bump-ibc.md b/.changelog/unreleased/dependencies/250-bump-ibc.md new file mode 100644 index 00000000..f2f4a701 --- /dev/null +++ b/.changelog/unreleased/dependencies/250-bump-ibc.md @@ -0,0 +1 @@ +- Bump IBC to [`v4.5.1`](https://github.com/cosmos/ibc-go/releases/tag/v4.5.1) ([#250](https://github.com/strangelove-ventures/noble/pull/250)) diff --git a/app/ante.go b/app/ante.go index 71b240d8..5344bc59 100644 --- a/app/ante.go +++ b/app/ante.go @@ -12,9 +12,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/ante" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" feeante "github.com/strangelove-ventures/noble/x/globalfee/ante" ) diff --git a/app/app.go b/app/app.go index 1dbe1213..3bb9f0d4 100644 --- a/app/app.go +++ b/app/app.go @@ -57,23 +57,23 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" - icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types" - "github.com/cosmos/ibc-go/v3/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v3/modules/core" - ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - ibcporttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" + packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" + packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" + packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" + ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" + icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" + "github.com/cosmos/ibc-go/v4/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v4/modules/core" + ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcporttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" + ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host" + ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" "github.com/spf13/cast" - packetforward "github.com/strangelove-ventures/packet-forward-middleware/v3/router" - packetforwardkeeper "github.com/strangelove-ventures/packet-forward-middleware/v3/router/keeper" - packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v3/router/types" paramauthorityibc "github.com/strangelove-ventures/paramauthority/x/ibc" paramauthorityibctypes "github.com/strangelove-ventures/paramauthority/x/ibc/types" paramauthority "github.com/strangelove-ventures/paramauthority/x/params" diff --git a/go.mod b/go.mod index 86cb981b..ac6228ea 100644 --- a/go.mod +++ b/go.mod @@ -2,14 +2,13 @@ module github.com/strangelove-ventures/noble go 1.21 -toolchain go1.21.3 - require ( cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566 github.com/cosmos/cosmos-sdk v0.45.16 - github.com/cosmos/ibc-go/v3 v3.4.0 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.0 + github.com/cosmos/ibc-go/v4 v4.5.1 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 @@ -17,7 +16,6 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5 github.com/strangelove-ventures/paramauthority v1.0.0 github.com/stretchr/testify v1.8.4 github.com/tendermint/tendermint v0.34.27 @@ -50,7 +48,7 @@ require ( github.com/cockroachdb/redact v1.1.3 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/cometbft/cometbft-db v0.7.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.4 // indirect github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect @@ -152,15 +150,15 @@ require ( ) replace ( - // huckleberry patch for ibc-go v3 - github.com/cosmos/ibc-go/v3 => github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry - // use macos sonoma compatible cosmos/ledger-cosmos-go github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 // use cosmos-flavored protocol buffers github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + // use ibc v4 compatible strangelove-ventures/paramauthority + github.com/strangelove-ventures/paramauthority => github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 + // cometbft github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27 diff --git a/go.sum b/go.sum index 5a74eeff..a9eecde4 100644 --- a/go.sum +++ b/go.sum @@ -144,8 +144,8 @@ github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx2 github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= @@ -213,8 +213,8 @@ github.com/cometbft/cometbft v0.34.27 h1:ri6BvmwjWR0gurYjywcBqRe4bbwc3QVs9KRcCzg github.com/cometbft/cometbft v0.34.27/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw= 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.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/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= @@ -242,6 +242,12 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= 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-apps/middleware/packet-forward-middleware/v4 v4.1.0 h1:96fDMIUSlSQ6dBcwhdYwTT+uTwFP+EWbSyLORcKSJZ8= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.0/go.mod h1:Mn/jr9pIYr1ofFuptLEi9N6MjcshTT0cpoOY4ln1DeA= +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.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw= github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7wiiY35fv3ctT+k4M= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -765,8 +771,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry h1:02oo/GHLGITexbPNUO/jmYa67xE+B5BvNv/i+wufdHI= -github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= +github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 h1:NNkJUue1CB1G+Q7F9i+f2Jo/nK31AvoJHLcL3SiKCJs= +github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -950,10 +956,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5 h1:iXXjziCSAebzuRUPFSnqD7epSDB8LEPgkh9zhbj7ha4= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5/go.mod h1:ncgsf5rykh36HkM16BNcKKx1XzVRdWXt+4pph1syDHE= -github.com/strangelove-ventures/paramauthority v1.0.0 h1:kgWsSfkiBh25ZZyt/ZQUwXEVdFknX9YIdEWDm1X7AWg= -github.com/strangelove-ventures/paramauthority v1.0.0/go.mod h1:31HVpoItQMa4Wj2BimVhQWbIYeb+kdUDJ8MzBEbGj28= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= diff --git a/interchaintest/cctp_deposit_for_burn_test.go b/interchaintest/cctp_deposit_for_burn_test.go index f42bc401..a0357fee 100644 --- a/interchaintest/cctp_deposit_for_burn_test.go +++ b/interchaintest/cctp_deposit_for_burn_test.go @@ -14,9 +14,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/cctp_deposit_for_burn_with_caller_test.go b/interchaintest/cctp_deposit_for_burn_with_caller_test.go index 0f9d5bcd..22cf4a18 100644 --- a/interchaintest/cctp_deposit_for_burn_with_caller_test.go +++ b/interchaintest/cctp_deposit_for_burn_with_caller_test.go @@ -14,9 +14,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/cctp_receive_message_test.go b/interchaintest/cctp_receive_message_test.go index 9cb1aa7c..f9adb2cf 100644 --- a/interchaintest/cctp_receive_message_test.go +++ b/interchaintest/cctp_receive_message_test.go @@ -19,9 +19,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/cctp_receive_message_with_caller_test.go b/interchaintest/cctp_receive_message_with_caller_test.go index 5b4c57c2..fa974b41 100644 --- a/interchaintest/cctp_receive_message_with_caller_test.go +++ b/interchaintest/cctp_receive_message_with_caller_test.go @@ -19,9 +19,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/cctp_replace_deposit_for_burn_test.go b/interchaintest/cctp_replace_deposit_for_burn_test.go index aed03e59..5077fe12 100644 --- a/interchaintest/cctp_replace_deposit_for_burn_test.go +++ b/interchaintest/cctp_replace_deposit_for_burn_test.go @@ -20,9 +20,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/genesis_test.go b/interchaintest/genesis_test.go index be7897fa..34d960d3 100644 --- a/interchaintest/genesis_test.go +++ b/interchaintest/genesis_test.go @@ -8,11 +8,11 @@ import ( simappparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/types" "github.com/icza/dyno" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/relayer" - "github.com/strangelove-ventures/interchaintest/v3/relayer/rly" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/relayer" + "github.com/strangelove-ventures/interchaintest/v4/relayer/rly" tokenfactorytypes "github.com/strangelove-ventures/noble/x/tokenfactory/types" proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal" upgradetypes "github.com/strangelove-ventures/paramauthority/x/upgrade/types" diff --git a/interchaintest/globalfee_test.go b/interchaintest/globalfee_test.go index e5d8066e..86927ba1 100644 --- a/interchaintest/globalfee_test.go +++ b/interchaintest/globalfee_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal" "github.com/stretchr/testify/require" diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 43e2eb87..0041194c 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -6,10 +6,10 @@ require ( cosmossdk.io/math v1.0.1 github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566 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/ethereum/go-ethereum v1.12.2 github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 - github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27 + github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 github.com/strangelove-ventures/noble v1.0.1-0.20230717234609-400609f26a31 github.com/strangelove-ventures/paramauthority v1.0.0 github.com/stretchr/testify v1.8.4 @@ -43,7 +43,7 @@ require ( github.com/cockroachdb/redact v1.1.3 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/cometbft/cometbft-db v0.7.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 @@ -189,6 +189,8 @@ replace ( // For this nested module, you always want to replace the parent reference with the current worktree. github.com/strangelove-ventures/noble => ../ + github.com/strangelove-ventures/paramauthority => github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 + // cometbft github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27 diff --git a/interchaintest/go.sum b/interchaintest/go.sum index fe95069e..a62463cd 100644 --- a/interchaintest/go.sum +++ b/interchaintest/go.sum @@ -222,8 +222,8 @@ github.com/cometbft/cometbft v0.34.27 h1:ri6BvmwjWR0gurYjywcBqRe4bbwc3QVs9KRcCzg github.com/cometbft/cometbft v0.34.27/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw= 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.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/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= @@ -251,8 +251,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= 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/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.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -807,6 +807,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 h1:NNkJUue1CB1G+Q7F9i+f2Jo/nK31AvoJHLcL3SiKCJs= +github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1001,10 +1003,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27 h1:oJ9yZIFp3yRTlH8BOLnACrsjR1fPIpHyOoLFjM5VRBc= -github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27/go.mod h1:dWv7E8XtgidmA/A5Gy9x76qMIygES+SxPTnlWjYUb7g= -github.com/strangelove-ventures/paramauthority v1.0.0 h1:kgWsSfkiBh25ZZyt/ZQUwXEVdFknX9YIdEWDm1X7AWg= -github.com/strangelove-ventures/paramauthority v1.0.0/go.mod h1:31HVpoItQMa4Wj2BimVhQWbIYeb+kdUDJ8MzBEbGj28= +github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 h1:GuprrfXjcoHpwM7avAL5AmxzDc/4/t1lPtSOKtKdAOk= +github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959/go.mod h1:j7cgQsflU8OWa0GNM0ZtNANlT20oQeYw2PS/gfZrN3Y= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= diff --git a/interchaintest/ibc_bps_fee_test.go b/interchaintest/ibc_bps_fee_test.go index 077c3825..efcf3703 100644 --- a/interchaintest/ibc_bps_fee_test.go +++ b/interchaintest/ibc_bps_fee_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" - "github.com/strangelove-ventures/interchaintest/v3/testutil" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" + "github.com/strangelove-ventures/interchaintest/v4/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/interchaintest/ibc_client_expire_substitute_test.go b/interchaintest/ibc_client_expire_substitute_test.go index 0e60b13c..f40427bc 100644 --- a/interchaintest/ibc_client_expire_substitute_test.go +++ b/interchaintest/ibc_client_expire_substitute_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" - "github.com/strangelove-ventures/interchaintest/v3/testutil" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" + "github.com/strangelove-ventures/interchaintest/v4/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/interchaintest/noble_test.go b/interchaintest/noble_test.go index 9af3fd39..c1f4875b 100644 --- a/interchaintest/noble_test.go +++ b/interchaintest/noble_test.go @@ -5,10 +5,10 @@ import ( "encoding/json" "testing" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/x/tokenfactory/types" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/packet_forward_test.go b/interchaintest/packet_forward_test.go index e363e1fb..60b09a77 100644 --- a/interchaintest/packet_forward_test.go +++ b/interchaintest/packet_forward_test.go @@ -7,12 +7,12 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" - "github.com/strangelove-ventures/interchaintest/v3/testutil" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" + "github.com/strangelove-ventures/interchaintest/v4/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/interchaintest/paramauthority_test.go b/interchaintest/paramauthority_test.go index 55f23f53..d779790a 100644 --- a/interchaintest/paramauthority_test.go +++ b/interchaintest/paramauthority_test.go @@ -8,10 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types/proposal" "github.com/icza/dyno" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal" "github.com/stretchr/testify/require" diff --git a/interchaintest/upgrade_argon_test.go b/interchaintest/upgrade_argon_test.go index 30013b7a..a6fd8789 100644 --- a/interchaintest/upgrade_argon_test.go +++ b/interchaintest/upgrade_argon_test.go @@ -20,10 +20,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testutil" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testutil" "github.com/stretchr/testify/require" ) diff --git a/interchaintest/upgrade_radon_test.go b/interchaintest/upgrade_radon_test.go index baabe15a..9fe053fb 100644 --- a/interchaintest/upgrade_radon_test.go +++ b/interchaintest/upgrade_radon_test.go @@ -6,8 +6,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" fiattokenfactorytypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types" globalfeetypes "github.com/strangelove-ventures/noble/x/globalfee/types" "github.com/stretchr/testify/require" diff --git a/interchaintest/upgrade_test.go b/interchaintest/upgrade_test.go index e83f947b..2a455f41 100644 --- a/interchaintest/upgrade_test.go +++ b/interchaintest/upgrade_test.go @@ -8,11 +8,11 @@ import ( "time" sdkupgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - interchaintest "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/ibc" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" - "github.com/strangelove-ventures/interchaintest/v3/testutil" + interchaintest "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/ibc" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" + "github.com/strangelove-ventures/interchaintest/v4/testutil" "github.com/strangelove-ventures/noble/cmd" upgradetypes "github.com/strangelove-ventures/paramauthority/x/upgrade/types" "github.com/stretchr/testify/require" diff --git a/x/blockibc/blockibc.go b/x/blockibc/blockibc.go index f337d503..a63317de 100644 --- a/x/blockibc/blockibc.go +++ b/x/blockibc/blockibc.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/bech32" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" fiatKeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper" fiat_types "github.com/strangelove-ventures/noble/x/fiattokenfactory/types" "github.com/strangelove-ventures/noble/x/tokenfactory/keeper" @@ -43,7 +43,7 @@ func (im IBCMiddleware) OnChanOpenInit( channelCap *capabilitytypes.Capability, counterparty channeltypes.Counterparty, version string, -) error { +) (string, error) { return im.app.OnChanOpenInit(ctx, order, connectionHops, portID, channelID, channelCap, counterparty, version) } @@ -98,7 +98,7 @@ func (im IBCMiddleware) OnRecvPacket( var ackErr error if err := types.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { ackErr = sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot unmarshal ICS-20 transfer packet data") - return channeltypes.NewErrorAcknowledgement(ackErr.Error()) + return channeltypes.NewErrorAcknowledgement(ackErr) } denomTrace := transfertypes.ParseDenomTrace(data.Denom) @@ -113,56 +113,56 @@ func (im IBCMiddleware) OnRecvPacket( // denom is tokenfactory asset case denomTrace.BaseDenom == tfMintingDenom.Denom: if im.keeper.GetPaused(ctx).Paused { - return channeltypes.NewErrorAcknowledgement(types.ErrPaused.Error()) + return channeltypes.NewErrorAcknowledgement(types.ErrPaused) } _, addressBz, err := bech32.DecodeAndConvert(data.Receiver) if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err) } _, found := im.keeper.GetBlacklisted(ctx, addressBz) if found { ackErr = sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "receiver address is blacklisted") - return channeltypes.NewErrorAcknowledgement(ackErr.Error()) + return channeltypes.NewErrorAcknowledgement(ackErr) } _, addressBz, err = bech32.DecodeAndConvert(data.Sender) if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err) } _, found = im.keeper.GetBlacklisted(ctx, addressBz) if found { ackErr = sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "sender address is blacklisted") - return channeltypes.NewErrorAcknowledgement(ackErr.Error()) + return channeltypes.NewErrorAcknowledgement(ackErr) } // denom is fiat-tokenfactory asset case denomTrace.BaseDenom == ctfMintingDenom.Denom: if im.fiatKeeper.GetPaused(ctx).Paused { - return channeltypes.NewErrorAcknowledgement(fiat_types.ErrPaused.Error()) + return channeltypes.NewErrorAcknowledgement(fiat_types.ErrPaused) } _, addressBz, err := bech32.DecodeAndConvert(data.Receiver) if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err) } _, found := im.fiatKeeper.GetBlacklisted(ctx, addressBz) if found { ackErr = sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "receiver address is blacklisted") - return channeltypes.NewErrorAcknowledgement(ackErr.Error()) + return channeltypes.NewErrorAcknowledgement(ackErr) } _, addressBz, err = bech32.DecodeAndConvert(data.Sender) if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err) } _, found = im.fiatKeeper.GetBlacklisted(ctx, addressBz) if found { ackErr = sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "sender address is blacklisted") - return channeltypes.NewErrorAcknowledgement(ackErr.Error()) + return channeltypes.NewErrorAcknowledgement(ackErr) } } diff --git a/x/tariff/keeper/keeper.go b/x/tariff/keeper/keeper.go index 237e59b2..137d2bcf 100644 --- a/x/tariff/keeper/keeper.go +++ b/x/tariff/keeper/keeper.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v3/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/strangelove-ventures/noble/x/tariff/types" ) @@ -123,3 +123,11 @@ func (k Keeper) WriteAcknowledgement( ) error { return k.ics4Wrapper.WriteAcknowledgement(ctx, chanCap, packet, ack) } + +func (k Keeper) GetAppVersion( + ctx sdk.Context, + portID string, + channelID string, +) (string, bool) { + return k.ics4Wrapper.GetAppVersion(ctx, portID, channelID) +} From 6d206d0d01cd140798240440834e884c1948b94f Mon Sep 17 00:00:00 2001 From: John Letey Date: Tue, 24 Oct 2023 20:15:00 +0200 Subject: [PATCH 2/3] chore: switch to tagged version --- go.mod | 5 +---- go.sum | 4 ++-- interchaintest/go.mod | 4 +--- interchaintest/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index ac6228ea..fba3b10e 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/strangelove-ventures/paramauthority v1.0.0 + github.com/strangelove-ventures/paramauthority v1.1.0 github.com/stretchr/testify v1.8.4 github.com/tendermint/tendermint v0.34.27 github.com/tendermint/tm-db v0.6.7 @@ -156,9 +156,6 @@ replace ( // use cosmos-flavored protocol buffers github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // use ibc v4 compatible strangelove-ventures/paramauthority - github.com/strangelove-ventures/paramauthority => github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 - // cometbft github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27 diff --git a/go.sum b/go.sum index a9eecde4..46b17019 100644 --- a/go.sum +++ b/go.sum @@ -771,8 +771,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 h1:NNkJUue1CB1G+Q7F9i+f2Jo/nK31AvoJHLcL3SiKCJs= -github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -956,6 +954,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/strangelove-ventures/paramauthority v1.1.0 h1:SMeG2NvoWC1sP09ouszukck7ufSu+3gv98Apd+ytQHQ= +github.com/strangelove-ventures/paramauthority v1.1.0/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 0041194c..a3a340e3 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -11,7 +11,7 @@ require ( github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 github.com/strangelove-ventures/noble v1.0.1-0.20230717234609-400609f26a31 - github.com/strangelove-ventures/paramauthority v1.0.0 + github.com/strangelove-ventures/paramauthority v1.1.0 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.24.0 ) @@ -189,8 +189,6 @@ replace ( // For this nested module, you always want to replace the parent reference with the current worktree. github.com/strangelove-ventures/noble => ../ - github.com/strangelove-ventures/paramauthority => github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 - // cometbft github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27 diff --git a/interchaintest/go.sum b/interchaintest/go.sum index a62463cd..cc09f51f 100644 --- a/interchaintest/go.sum +++ b/interchaintest/go.sum @@ -807,8 +807,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34 h1:NNkJUue1CB1G+Q7F9i+f2Jo/nK31AvoJHLcL3SiKCJs= -github.com/noble-assets/paramauthority v0.0.0-20231013150542-f7f7c5739e34/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1005,6 +1003,8 @@ github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jH github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 h1:GuprrfXjcoHpwM7avAL5AmxzDc/4/t1lPtSOKtKdAOk= github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959/go.mod h1:j7cgQsflU8OWa0GNM0ZtNANlT20oQeYw2PS/gfZrN3Y= +github.com/strangelove-ventures/paramauthority v1.1.0 h1:SMeG2NvoWC1sP09ouszukck7ufSu+3gv98Apd+ytQHQ= +github.com/strangelove-ventures/paramauthority v1.1.0/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= From 85db3a35b71d3dbea52ab3e31f74298a43e3c658 Mon Sep 17 00:00:00 2001 From: John Letey Date: Tue, 24 Oct 2023 21:50:12 +0200 Subject: [PATCH 3/3] chore: small fix --- interchaintest/cctp_roles_test.go | 6 +++--- interchaintest/go.mod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interchaintest/cctp_roles_test.go b/interchaintest/cctp_roles_test.go index c99d7894..91d47267 100644 --- a/interchaintest/cctp_roles_test.go +++ b/interchaintest/cctp_roles_test.go @@ -6,9 +6,9 @@ import ( "github.com/circlefin/noble-cctp/x/cctp/types" "github.com/gogo/protobuf/jsonpb" - "github.com/strangelove-ventures/interchaintest/v3" - "github.com/strangelove-ventures/interchaintest/v3/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v3/testreporter" + "github.com/strangelove-ventures/interchaintest/v4" + "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v4/testreporter" "github.com/strangelove-ventures/noble/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/interchaintest/go.mod b/interchaintest/go.mod index a3a340e3..bdd09ed1 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -8,6 +8,7 @@ require ( github.com/cosmos/cosmos-sdk v0.45.16 github.com/cosmos/ibc-go/v4 v4.5.1 github.com/ethereum/go-ethereum v1.12.2 + github.com/gogo/protobuf v1.3.3 github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 github.com/strangelove-ventures/noble v1.0.1-0.20230717234609-400609f26a31 @@ -73,7 +74,6 @@ require ( github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect - github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/glog v1.1.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect