diff --git a/.github/compatibility-test-matrices/release-v7.2.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-a.json new file mode 100644 index 00000000000..941431336d4 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-a.json @@ -0,0 +1,34 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "entrypoint": [ + "TestClientTestSuite" + ], + "test": [ + "TestClientUpdateProposal_Succeeds", + "TestClient_Update_Misbehaviour" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json new file mode 100644 index 00000000000..5e9f298df27 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json @@ -0,0 +1,34 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestClientTestSuite" + ], + "test": [ + "TestClientUpdateProposal_Succeeds", + "TestClient_Update_Misbehaviour" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-a.json new file mode 100644 index 00000000000..93cd82722ff --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-a.json @@ -0,0 +1,33 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "entrypoint": [ + "TestConnectionTestSuite" + ], + "test": [ + "TestMaxExpectedTimePerBlockParam" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-b.json new file mode 100644 index 00000000000..0c2f88fd3de --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/connection-chain-b.json @@ -0,0 +1,33 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestConnectionTestSuite" + ], + "test": [ + "TestMaxExpectedTimePerBlockParam" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json new file mode 100644 index 00000000000..8a5cd87edf9 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json @@ -0,0 +1,29 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "entrypoint": [ + "TestInterchainAccountsTestSuite" + ], + "test": [ + "TestMsgSendTx_SuccessfulTransfer", + "TestMsgSendTx_FailedTransfer_InsufficientFunds", + "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json new file mode 100644 index 00000000000..1e7f985799e --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json @@ -0,0 +1,29 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestInterchainAccountsTestSuite" + ], + "test": [ + "TestMsgSendTx_SuccessfulTransfer", + "TestMsgSendTx_FailedTransfer_InsufficientFunds", + "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-a.json new file mode 100644 index 00000000000..e751749c15c --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-a.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestInterchainAccountsGovTestSuite" + ], + "test": [ + "TestInterchainAccountsGovIntegration" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-b.json new file mode 100644 index 00000000000..a6dfe9584cc --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-gov-chain-b.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "entrypoint": [ + "TestInterchainAccountsGovTestSuite" + ], + "test": [ + "TestInterchainAccountsGovIntegration" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-a.json new file mode 100644 index 00000000000..50c0d028f59 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-a.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "entrypoint": [ + "TestInterchainAccountsGroupsTestSuite" + ], + "test": [ + "TestInterchainAccountsGroupsIntegration" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-b.json new file mode 100644 index 00000000000..5e1e7fbb302 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-groups-chain-b.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestInterchainAccountsGroupsTestSuite" + ], + "test": [ + "TestInterchainAccountsGroupsIntegration" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-a.json new file mode 100644 index 00000000000..15e54afa956 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-a.json @@ -0,0 +1,28 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "entrypoint": [ + "TestIncentivizedInterchainAccountsTestSuite" + ], + "test": [ + "TestMsgSendTx_SuccessfulBankSend_Incentivized", + "TestMsgSendTx_FailedBankSend_Incentivized" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-b.json new file mode 100644 index 00000000000..d7b9577eeb6 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-ica-chain-b.json @@ -0,0 +1,28 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestIncentivizedInterchainAccountsTestSuite" + ], + "test": [ + "TestMsgSendTx_SuccessfulBankSend_Incentivized", + "TestMsgSendTx_FailedBankSend_Incentivized" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-a.json new file mode 100644 index 00000000000..8710a544bd2 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-a.json @@ -0,0 +1,38 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "entrypoint": [ + "TestIncentivizedTransferTestSuite" + ], + "test": [ + "TestMsgPayPacketFee_AsyncSingleSender_Succeeds", + "TestMsgPayPacketFee_InvalidReceiverAccount", + "TestMultiMsg_MsgPayPacketFeeSingleSender", + "TestMsgPayPacketFee_SingleSender_TimesOut", + "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress", + "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-b.json new file mode 100644 index 00000000000..de265c59fdb --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/incentivized-transfer-chain-b.json @@ -0,0 +1,38 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestIncentivizedTransferTestSuite" + ], + "test": [ + "TestMsgPayPacketFee_AsyncSingleSender_Succeeds", + "TestMsgPayPacketFee_InvalidReceiverAccount", + "TestMultiMsg_MsgPayPacketFeeSingleSender", + "TestMsgPayPacketFee_SingleSender_TimesOut", + "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress", + "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-a.json new file mode 100644 index 00000000000..5f2f47bd881 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-a.json @@ -0,0 +1,25 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "LocalhostInterchainAccountsTestSuite" + ], + "test": [ + "TestInterchainAccounts_Localhost", + "TestInterchainAccounts_ReopenChannel_Localhost" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-b.json new file mode 100644 index 00000000000..44fc4cacf0d --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/localhost-ica-chain-b.json @@ -0,0 +1,25 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0" + ], + "entrypoint": [ + "LocalhostInterchainAccountsTestSuite" + ], + "test": [ + "TestInterchainAccounts_Localhost", + "TestInterchainAccounts_ReopenChannel_Localhost" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-a.json new file mode 100644 index 00000000000..7ee659b3e62 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-a.json @@ -0,0 +1,24 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "LocalhostTransferTestSuite" + ], + "test": [ + "TestMsgTransfer_Localhost" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-b.json new file mode 100644 index 00000000000..c1c30c297ae --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/localhost-transfer-chain-b.json @@ -0,0 +1,24 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0" + ], + "entrypoint": [ + "LocalhostTransferTestSuite" + ], + "test": [ + "TestMsgTransfer_Localhost" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-a.json new file mode 100644 index 00000000000..f53d39d7cb3 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-a.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0" + ], + "entrypoint": [ + "TestAuthzTransferTestSuite" + ], + "test": [ + "TestAuthz_MsgTransfer_Succeeds", + "TestAuthz_InvalidTransferAuthorizations" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-b.json new file mode 100644 index 00000000000..bc30aee49c2 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/transfer-authz-chain-b.json @@ -0,0 +1,27 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestAuthzTransferTestSuite" + ], + "test": [ + "TestAuthz_MsgTransfer_Succeeds", + "TestAuthz_InvalidTransferAuthorizations" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-a.json new file mode 100644 index 00000000000..025222efcdf --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-a.json @@ -0,0 +1,38 @@ +{ + "chain-a": [ + "release-v7.2.x" + ], + "chain-b": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "entrypoint": [ + "TestTransferTestSuite" + ], + "test": [ + "TestMsgTransfer_Succeeds_Nonincentivized", + "TestMsgTransfer_Fails_InvalidAddress", + "TestMsgTransfer_Timeout_Nonincentivized", + "TestMsgTransfer_WithMemo", + "TestSendEnabledParam", + "TestReceiveEnabledParam" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json new file mode 100644 index 00000000000..b1986449f8b --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json @@ -0,0 +1,38 @@ +{ + "chain-a": [ + "release-v7.2.x", + "v7.1.0", + "v7.0.1", + "v6.2.0", + "v6.1.1", + "v5.2.1", + "v4.4.2", + "v4.3.1", + "v4.2.2", + "v4.1.3", + "v5.3.1" + ], + "chain-b": [ + "release-v7.2.x" + ], + "entrypoint": [ + "TestTransferTestSuite" + ], + "test": [ + "TestMsgTransfer_Succeeds_Nonincentivized", + "TestMsgTransfer_Fails_InvalidAddress", + "TestMsgTransfer_Timeout_Nonincentivized", + "TestMsgTransfer_WithMemo", + "TestSendEnabledParam", + "TestReceiveEnabledParam" + ], + "relayer-type": [ + "rly" + ], + "chain-binary": [ + "simd" + ], + "chain-image": [ + "ghcr.io/cosmos/ibc-go-simd" + ] +} diff --git a/.github/compatibility-test-matrices/unreleased/client.json b/.github/compatibility-test-matrices/unreleased/client.json index b814255806b..5f142411c65 100644 --- a/.github/compatibility-test-matrices/unreleased/client.json +++ b/.github/compatibility-test-matrices/unreleased/client.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/connection.json b/.github/compatibility-test-matrices/unreleased/connection.json index 606e13e7ee0..8b31df4da85 100644 --- a/.github/compatibility-test-matrices/unreleased/connection.json +++ b/.github/compatibility-test-matrices/unreleased/connection.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/ica-gov.json b/.github/compatibility-test-matrices/unreleased/ica-gov.json index 35845a19511..433cb5dfa9a 100644 --- a/.github/compatibility-test-matrices/unreleased/ica-gov.json +++ b/.github/compatibility-test-matrices/unreleased/ica-gov.json @@ -1,11 +1,13 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", "release-v6.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/ica-groups.json b/.github/compatibility-test-matrices/unreleased/ica-groups.json index e0fc6b7d2fd..a7ee645b00b 100644 --- a/.github/compatibility-test-matrices/unreleased/ica-groups.json +++ b/.github/compatibility-test-matrices/unreleased/ica-groups.json @@ -1,11 +1,13 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", "release-v6.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/ica.json b/.github/compatibility-test-matrices/unreleased/ica.json index 1b10b682049..4b41524c62a 100644 --- a/.github/compatibility-test-matrices/unreleased/ica.json +++ b/.github/compatibility-test-matrices/unreleased/ica.json @@ -1,11 +1,13 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", "release-v6.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/incentivized-ica.json b/.github/compatibility-test-matrices/unreleased/incentivized-ica.json index fcea78d5590..931a994c1cd 100644 --- a/.github/compatibility-test-matrices/unreleased/incentivized-ica.json +++ b/.github/compatibility-test-matrices/unreleased/incentivized-ica.json @@ -1,11 +1,13 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", "release-v6.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-1.json b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-1.json index 31874781120..92e32b4590f 100644 --- a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-1.json +++ b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-1.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-2.json b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-2.json index 9efd7f63045..385902d06fc 100644 --- a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-2.json +++ b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-2.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-3.json b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-3.json index f3261d402c2..d8b7976f34c 100644 --- a/.github/compatibility-test-matrices/unreleased/incentivized-transfer-3.json +++ b/.github/compatibility-test-matrices/unreleased/incentivized-transfer-3.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/localhost-ica.json b/.github/compatibility-test-matrices/unreleased/localhost-ica.json index 3007c0edbde..7c459a3cac8 100644 --- a/.github/compatibility-test-matrices/unreleased/localhost-ica.json +++ b/.github/compatibility-test-matrices/unreleased/localhost-ica.json @@ -1,8 +1,10 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x" ], "entrypoint": [ diff --git a/.github/compatibility-test-matrices/unreleased/localhost-transfer.json b/.github/compatibility-test-matrices/unreleased/localhost-transfer.json index 17e46cce91e..318bb5a8850 100644 --- a/.github/compatibility-test-matrices/unreleased/localhost-transfer.json +++ b/.github/compatibility-test-matrices/unreleased/localhost-transfer.json @@ -1,8 +1,10 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x" ], "entrypoint": [ diff --git a/.github/compatibility-test-matrices/unreleased/transfer-1.json b/.github/compatibility-test-matrices/unreleased/transfer-1.json index d5ba6ec55d8..6041ec22a01 100644 --- a/.github/compatibility-test-matrices/unreleased/transfer-1.json +++ b/.github/compatibility-test-matrices/unreleased/transfer-1.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/transfer-2.json b/.github/compatibility-test-matrices/unreleased/transfer-2.json index 535d6a6d9f2..474af2023a6 100644 --- a/.github/compatibility-test-matrices/unreleased/transfer-2.json +++ b/.github/compatibility-test-matrices/unreleased/transfer-2.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/transfer-3.json b/.github/compatibility-test-matrices/unreleased/transfer-3.json index 12b0461e47c..a22d5519e3d 100644 --- a/.github/compatibility-test-matrices/unreleased/transfer-3.json +++ b/.github/compatibility-test-matrices/unreleased/transfer-3.json @@ -1,5 +1,6 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", @@ -12,6 +13,7 @@ "release-v4.1.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x", diff --git a/.github/compatibility-test-matrices/unreleased/transfer-authz.json b/.github/compatibility-test-matrices/unreleased/transfer-authz.json index 1f73482c718..bf3af1e0797 100644 --- a/.github/compatibility-test-matrices/unreleased/transfer-authz.json +++ b/.github/compatibility-test-matrices/unreleased/transfer-authz.json @@ -1,10 +1,12 @@ { "chain-a": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x" ], "chain-b": [ + "release-v7.2.x", "release-v7.1.x", "release-v7.0.x", "release-v6.2.x" diff --git a/.github/mergify.yml b/.github/mergify.yml index 57c2bc5111e..0048d078b29 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -98,3 +98,11 @@ pull_request_rules: backport: branches: - release/v7.1.x + - name: backport patches to v7.2.x branch + conditions: + - base=main + - label=backport-to-v7.2.x + actions: + backport: + branches: + - release/v7.2.x diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e7a471954a7..5099889d515 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,6 +21,23 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 + with: + images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }} + + - name: Build Docker image + uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 + with: + context: . + tags: ${{ steps.meta.outputs.tags }} + build-args: | + IBC_GO_VERSION=main + + - name: Test simd is runnable + run: | + docker run --rm ${{ steps.meta.outputs.tags }} - name: Log in to the Container registry uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc with: @@ -28,13 +45,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 - with: - images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image + - name: Push Docker image uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 with: context: . diff --git a/.github/workflows/e2e-compatibility-unreleased.yaml b/.github/workflows/e2e-compatibility-unreleased.yaml index 524cf882fb8..35d0c990737 100644 --- a/.github/workflows/e2e-compatibility-unreleased.yaml +++ b/.github/workflows/e2e-compatibility-unreleased.yaml @@ -22,6 +22,7 @@ jobs: - release/v6.2.x - release/v7.0.x - release/v7.1.x + - release/v7.2.x steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml index 895a556384a..29dd7393622 100644 --- a/.github/workflows/e2e-compatibility.yaml +++ b/.github/workflows/e2e-compatibility.yaml @@ -17,6 +17,7 @@ on: - release/v6.2.x - release/v7.0.x - release/v7.1.x + - release/v7.2.x - main ibc-go-version: description: 'The version of ibc-go that is going to be released' @@ -59,6 +60,7 @@ jobs: - release/v6.2.x - release/v7.0.x - release/v7.1.x + - release/v7.2.x - main steps: - uses: actions/checkout@v3 diff --git a/.golangci.yml b/.golangci.yml index 4a0022ce9df..71e76f042a9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,6 +9,7 @@ linters: - dogsled - exportloopref - errcheck + - gci - goconst - gocritic - gofumpt @@ -29,27 +30,38 @@ linters: issues: exclude-rules: - - text: "unused-parameter" + - text: 'unused-parameter' linters: - revive - - text: "SA1019:" + - text: 'SA1019:' linters: - staticcheck - - text: "Use of weak random number generator" + - text: 'Use of weak random number generator' linters: - gosec - - text: "ST1003:" + - text: 'ST1003:' linters: - stylecheck # FIXME: Disabled until golangci-lint updates stylecheck with this fix: # https://github.com/dominikh/go-tools/issues/389 - - text: "ST1016:" + - text: 'ST1016:' linters: - stylecheck max-issues-per-linter: 10000 max-same-issues: 10000 linters-settings: + gci: + sections: + - standard # Standard section: captures all standard packages. + - default # Default section: contains all imports that could not be matched to another section type. + - blank # blank imports + - dot # dot imports + - prefix(cosmossdk.io) + - prefix(github.com/cosmos/cosmos-sdk) + - prefix(github.com/cometbft/cometbft) + - prefix(github.com/cosmos/ibc-go) + custom-order: true dogsled: max-blank-identifiers: 3 maligned: diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ce39e1786..69aa9ad0a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### State Machine Breaking +* [\#3907](https://github.com/cosmos/ibc-go/pull/3907) Re-implemented missing functions of `LegacyMsg` interface to fix transaction signing with ledger. + ### Improvements * (tests) [\#3138](https://github.com/cosmos/ibc-go/pull/3138) Support benchmarks and fuzz tests through `testing.TB`. diff --git a/RELEASES.md b/RELEASES.md index bcd2d0cffa3..3e2e73385c7 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -70,9 +70,9 @@ Only the following major release series have a stable release status: |`v4.1.x`|August 12, 2023| |`v4.2.x`|August 12, 2023| |`v4.3.x`|August 12, 2023| -|`v4.4.x`|August 12, 2023| +|`v4.4.x`|October 31, 2023| |`v5.2.x`|September 28, 2023| -|`v5.3.x`|September 28, 2023| +|`v5.3.x`|October 31, 2023| |`v6.1.x`|December 09, 2023| |`v6.2.x`|December 09, 2023| |`v7.0.x`|March 17, 2024| diff --git a/docs/dev/go-style-guide.md b/docs/dev/go-style-guide.md index 7cf50598000..7301e49edfa 100644 --- a/docs/dev/go-style-guide.md +++ b/docs/dev/go-style-guide.md @@ -69,7 +69,7 @@ type middleware struct { ## Importing libraries - Use [goimports](https://godoc.org/golang.org/x/tools/cmd/goimports). -- Separate imports into blocks: one for the standard lib, one for external libs and one for application libs. For example: +- Separate imports into blocks. For example: ```go import ( @@ -79,6 +79,8 @@ import ( // external library imports "github.com/stretchr/testify/require" + + // Cosmos-SDK imports abci "github.com/cometbft/cometbft/abci/types" // ibc-go library imports @@ -86,6 +88,8 @@ import ( ) ``` +Run `make lint-fix` to get the imports ordered and grouped automatically. + ## Dependencies - Dependencies should be pinned by a release tag, or specific commit, to avoid breaking `go get` when external dependencies are updated. diff --git a/docs/ibc/light-clients/setup.md b/docs/ibc/light-clients/setup.md index 9e97ab22de5..be4e74a5334 100644 --- a/docs/ibc/light-clients/setup.md +++ b/docs/ibc/light-clients/setup.md @@ -82,7 +82,6 @@ Stateless checks are performed within the [`ValidateBasic`](https://github.com/c ```protobuf // MsgCreateClient defines a message to create an IBC client message MsgCreateClient { - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // light client state @@ -101,14 +100,10 @@ Within the `02-client` submodule, the [`ClientState` is then initialized](https: In order to successfully create an IBC client using a new client type, it [must be supported](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/keeper/client.go#L19-L25). Light client support in IBC is gated by on-chain governance. The allow list may be updated by submitting a new governance proposal to update the `02-client` parameter `AllowedClients`. - See below for example: ```shell -%s tx gov submit-proposal param-change --from= +%s tx gov submit-proposal --from ``` where `proposal.json` contains: @@ -116,14 +111,17 @@ where `proposal.json` contains: ```json { "title": "IBC Clients Param Change", - "description": "Update allowed clients", - "changes": [ + "summary": "Update allowed clients", + "messages": [ { - "subspace": "ibc", - "key": "AllowedClients", - "value": ["06-solomachine", "07-tendermint", "0x-new-client"] + "@type": "/ibc.core.client.v1.MsgUpdateParams", + "authority": "cosmos1...", // The gov module account address + "params": { + "allowed_clients": ["06-solomachine", "07-tendermint", "0x-new-client"] + } } ], - "deposit": "1000stake" + "metadata": "AQ==", + "deposit": "100stake" } ``` diff --git a/docs/migrations/v7-to-v8.md b/docs/migrations/v7-to-v8.md index 8ff2323a4f7..d49bd178e6e 100644 --- a/docs/migrations/v7-to-v8.md +++ b/docs/migrations/v7-to-v8.md @@ -80,7 +80,7 @@ TODO: https://github.com/cosmos/ibc-go/pull/3303 ## Relayers -- No relevant changes were made in this release. +- Getter functions in `MsgChannelOpenInitResponse`, `MsgChannelOpenTryResponse`, `MsgTransferResponse`, `MsgRegisterInterchainAccountResponse` and `MsgSendTxResponse` have been removed. The fields can be accessed directly. ## IBC Light Clients diff --git a/e2e/go.mod b/e2e/go.mod index 33eb66da61e..4698710729d 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.24.0 golang.org/x/mod v0.11.0 - google.golang.org/grpc v1.56.0 + google.golang.org/grpc v1.56.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/e2e/go.sum b/e2e/go.sum index 93fccbeb0ba..9b86e48f646 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -1649,8 +1649,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE= -google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/e2e/tests/interchain_accounts/localhost_test.go b/e2e/tests/interchain_accounts/localhost_test.go index f76079ac137..7008c7ab8c4 100644 --- a/e2e/tests/interchain_accounts/localhost_test.go +++ b/e2e/tests/interchain_accounts/localhost_test.go @@ -71,7 +71,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost( msgChanOpenTry := channeltypes.NewMsgChannelOpenTry( icatypes.HostPortID, icatypes.Version, channeltypes.ORDERED, []string{exported.LocalhostConnectionID}, - controllerPortID, msgChanOpenInitRes.GetChannelId(), + controllerPortID, msgChanOpenInitRes.ChannelId, version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -83,8 +83,8 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost( t.Run("channel open ack localhost", func(t *testing.T) { msgChanOpenAck := channeltypes.NewMsgChannelOpenAck( - controllerPortID, msgChanOpenInitRes.GetChannelId(), - msgChanOpenTryRes.GetChannelId(), msgChanOpenTryRes.GetVersion(), + controllerPortID, msgChanOpenInitRes.ChannelId, + msgChanOpenTryRes.ChannelId, msgChanOpenTryRes.Version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -94,7 +94,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost( t.Run("channel open confirm localhost", func(t *testing.T) { msgChanOpenConfirm := channeltypes.NewMsgChannelOpenConfirm( - icatypes.HostPortID, msgChanOpenTryRes.GetChannelId(), + icatypes.HostPortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -103,11 +103,11 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost( }) t.Run("query localhost interchain accounts channel ends", func(t *testing.T) { - channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.GetChannelId()) + channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndA) - channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.GetChannelId()) + channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndB) @@ -228,7 +228,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan msgChanOpenTry := channeltypes.NewMsgChannelOpenTry( icatypes.HostPortID, icatypes.Version, channeltypes.ORDERED, []string{exported.LocalhostConnectionID}, - controllerPortID, msgChanOpenInitRes.GetChannelId(), + controllerPortID, msgChanOpenInitRes.ChannelId, version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -240,8 +240,8 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan t.Run("channel open ack localhost", func(t *testing.T) { msgChanOpenAck := channeltypes.NewMsgChannelOpenAck( - controllerPortID, msgChanOpenInitRes.GetChannelId(), - msgChanOpenTryRes.GetChannelId(), msgChanOpenTryRes.GetVersion(), + controllerPortID, msgChanOpenInitRes.ChannelId, + msgChanOpenTryRes.ChannelId, msgChanOpenTryRes.Version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -251,7 +251,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan t.Run("channel open confirm localhost", func(t *testing.T) { msgChanOpenConfirm := channeltypes.NewMsgChannelOpenConfirm( - icatypes.HostPortID, msgChanOpenTryRes.GetChannelId(), + icatypes.HostPortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -260,11 +260,11 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan }) t.Run("query localhost interchain accounts channel ends", func(t *testing.T) { - channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.GetChannelId()) + channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndA) - channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.GetChannelId()) + channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndB) @@ -357,7 +357,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan msgChanOpenTry := channeltypes.NewMsgChannelOpenTry( icatypes.HostPortID, icatypes.Version, channeltypes.ORDERED, []string{exported.LocalhostConnectionID}, - controllerPortID, msgChanOpenInitRes.GetChannelId(), + controllerPortID, msgChanOpenInitRes.ChannelId, version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -370,8 +370,8 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan t.Run("channel open ack localhost", func(t *testing.T) { msgChanOpenAck := channeltypes.NewMsgChannelOpenAck( - controllerPortID, msgChanOpenInitRes.GetChannelId(), - msgChanOpenTryRes.GetChannelId(), msgChanOpenTryRes.GetVersion(), + controllerPortID, msgChanOpenInitRes.ChannelId, + msgChanOpenTryRes.ChannelId, msgChanOpenTryRes.Version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -381,7 +381,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan t.Run("channel open confirm localhost", func(t *testing.T) { msgChanOpenConfirm := channeltypes.NewMsgChannelOpenConfirm( - icatypes.HostPortID, msgChanOpenTryRes.GetChannelId(), + icatypes.HostPortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -390,11 +390,11 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan }) t.Run("query localhost interchain accounts channel ends", func(t *testing.T) { - channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.GetChannelId()) + channelEndA, err := s.QueryChannel(ctx, chainA, controllerPortID, msgChanOpenInitRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndA) - channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.GetChannelId()) + channelEndB, err := s.QueryChannel(ctx, chainA, icatypes.HostPortID, msgChanOpenTryRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndB) @@ -465,7 +465,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan }) t.Run("verify tokens transferred", func(t *testing.T) { - s.AssertPacketRelayed(ctx, chainA, controllerPortID, msgChanOpenInitRes.GetChannelId(), 1) + s.AssertPacketRelayed(ctx, chainA, controllerPortID, msgChanOpenInitRes.ChannelId, 1) balance, err := chainA.GetBalance(ctx, userBWallet.FormattedAddress(), chainADenom) s.Require().NoError(err) diff --git a/e2e/tests/interchain_accounts/params_test.go b/e2e/tests/interchain_accounts/params_test.go new file mode 100644 index 00000000000..7f33a2523d9 --- /dev/null +++ b/e2e/tests/interchain_accounts/params_test.go @@ -0,0 +1,90 @@ +package interchain_accounts + +import ( + "context" + "testing" + + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/stretchr/testify/suite" + + "github.com/cosmos/ibc-go/e2e/testsuite" + "github.com/cosmos/ibc-go/e2e/testvalues" + controllertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + ibctesting "github.com/cosmos/ibc-go/v7/testing" +) + +func TestInterchainAccountsParamsTestSuite(t *testing.T) { + suite.Run(t, new(InterchainAccountsParamsTestSuite)) +} + +type InterchainAccountsParamsTestSuite struct { + testsuite.E2ETestSuite +} + +// QueryControllerParams queries the params for the controller +func (s *InterchainAccountsParamsTestSuite) QueryControllerParams(ctx context.Context, chain ibc.Chain) controllertypes.Params { + queryClient := s.GetChainGRCPClients(chain).ICAControllerQueryClient + res, err := queryClient.Params(ctx, &controllertypes.QueryParamsRequest{}) + s.Require().NoError(err) + + return *res.Params +} + +// TestControllerEnabledParam tests that changing the ControllerEnabled param works as expected +func (s *InterchainAccountsParamsTestSuite) TestControllerEnabledParam() { + t := s.T() + ctx := context.TODO() + + // setup relayers and connection-0 between two chains + // channel-0 is a transfer channel but it will not be used in this test case + _, _ = s.SetupChainsRelayerAndChannel(ctx) + chainA, _ := s.GetChains() + chainAVersion := chainA.Config().Images[0].Version + + // setup controller account on chainA + controllerAccount := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount) + controllerAddress := controllerAccount.FormattedAddress() + + t.Run("ensure the controller is enabled", func(t *testing.T) { + params := s.QueryControllerParams(ctx, chainA) + s.Require().True(params.ControllerEnabled) + }) + + t.Run("disable the controller", func(t *testing.T) { + if testvalues.SelfParamsFeatureReleases.IsSupported(chainAVersion) { + authority, err := s.QueryModuleAccountAddress(ctx, govtypes.ModuleName, chainA) + s.Require().NoError(err) + s.Require().NotNil(authority) + + msg := controllertypes.MsgUpdateParams{ + Authority: authority.String(), + Params: controllertypes.NewParams(false), + } + s.ExecuteGovProposalV1(ctx, &msg, chainA, controllerAccount, 1) + } else { + changes := []paramsproposaltypes.ParamChange{ + paramsproposaltypes.NewParamChange(controllertypes.StoreKey, string(controllertypes.KeyControllerEnabled), "false"), + } + + proposal := paramsproposaltypes.NewParameterChangeProposal(ibctesting.Title, ibctesting.Description, changes) + s.ExecuteGovProposal(ctx, chainA, controllerAccount, proposal) + } + }) + + t.Run("ensure controller is disabled", func(t *testing.T) { + params := s.QueryControllerParams(ctx, chainA) + s.Require().False(params.ControllerEnabled) + }) + + t.Run("ensure that broadcasting a MsgRegisterInterchainAccount fails", func(t *testing.T) { + // explicitly set the version string because we don't want to use incentivized channels. + version := icatypes.NewDefaultMetadataString(ibctesting.FirstConnectionID, ibctesting.FirstConnectionID) + msgRegisterAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAddress, version) + + txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount) + s.AssertTxFailure(txResp, controllertypes.ErrControllerSubModuleDisabled) + }) +} diff --git a/e2e/tests/transfer/localhost_test.go b/e2e/tests/transfer/localhost_test.go index c8b1bf94bb5..e09331fc98c 100644 --- a/e2e/tests/transfer/localhost_test.go +++ b/e2e/tests/transfer/localhost_test.go @@ -70,7 +70,7 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { msgChanOpenTry := channeltypes.NewMsgChannelOpenTry( transfertypes.PortID, transfertypes.Version, channeltypes.UNORDERED, []string{exported.LocalhostConnectionID}, - transfertypes.PortID, msgChanOpenInitRes.GetChannelId(), + transfertypes.PortID, msgChanOpenInitRes.ChannelId, transfertypes.Version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -82,8 +82,8 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { t.Run("channel open ack localhost", func(t *testing.T) { msgChanOpenAck := channeltypes.NewMsgChannelOpenAck( - transfertypes.PortID, msgChanOpenInitRes.GetChannelId(), - msgChanOpenTryRes.GetChannelId(), transfertypes.Version, + transfertypes.PortID, msgChanOpenInitRes.ChannelId, + msgChanOpenTryRes.ChannelId, transfertypes.Version, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -93,7 +93,7 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { t.Run("channel open confirm localhost", func(t *testing.T) { msgChanOpenConfirm := channeltypes.NewMsgChannelOpenConfirm( - transfertypes.PortID, msgChanOpenTryRes.GetChannelId(), + transfertypes.PortID, msgChanOpenTryRes.ChannelId, localhost.SentinelProof, clienttypes.ZeroHeight(), rlyWallet.FormattedAddress(), ) @@ -102,11 +102,11 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { }) t.Run("query localhost transfer channel ends", func(t *testing.T) { - channelEndA, err := s.QueryChannel(ctx, chainA, transfertypes.PortID, msgChanOpenInitRes.GetChannelId()) + channelEndA, err := s.QueryChannel(ctx, chainA, transfertypes.PortID, msgChanOpenInitRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndA) - channelEndB, err := s.QueryChannel(ctx, chainA, transfertypes.PortID, msgChanOpenTryRes.GetChannelId()) + channelEndB, err := s.QueryChannel(ctx, chainA, transfertypes.PortID, msgChanOpenTryRes.ChannelId) s.Require().NoError(err) s.Require().NotNil(channelEndB) @@ -115,7 +115,7 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { t.Run("send packet localhost ibc transfer", func(t *testing.T) { var err error - txResp := s.Transfer(ctx, chainA, userAWallet, transfertypes.PortID, msgChanOpenInitRes.GetChannelId(), testvalues.DefaultTransferAmount(chainADenom), userAWallet.FormattedAddress(), userBWallet.FormattedAddress(), clienttypes.NewHeight(1, 100), 0, "") + txResp := s.Transfer(ctx, chainA, userAWallet, transfertypes.PortID, msgChanOpenInitRes.ChannelId, testvalues.DefaultTransferAmount(chainADenom), userAWallet.FormattedAddress(), userBWallet.FormattedAddress(), clienttypes.NewHeight(1, 100), 0, "") s.AssertTxSuccess(txResp) events := testsuite.ABCIToSDKEvents(txResp.Events) @@ -153,9 +153,9 @@ func (s *LocalhostTransferTestSuite) TestMsgTransfer_Localhost() { }) t.Run("verify tokens transferred", func(t *testing.T) { - s.AssertPacketRelayed(ctx, chainA, transfertypes.PortID, msgChanOpenInitRes.GetChannelId(), 1) + s.AssertPacketRelayed(ctx, chainA, transfertypes.PortID, msgChanOpenInitRes.ChannelId, 1) - ibcToken := testsuite.GetIBCToken(chainADenom, transfertypes.PortID, msgChanOpenTryRes.GetChannelId()) + ibcToken := testsuite.GetIBCToken(chainADenom, transfertypes.PortID, msgChanOpenTryRes.ChannelId) actualBalance, err := chainA.GetBalance(ctx, userBWallet.FormattedAddress(), ibcToken.IBCDenom()) s.Require().NoError(err) diff --git a/go.mod b/go.mod index 3ea14e5f94a..d05b8376e91 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.0 + google.golang.org/grpc v1.56.1 google.golang.org/protobuf v1.30.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 44a9da04e6e..a5c7114278b 100644 --- a/go.sum +++ b/go.sum @@ -1544,8 +1544,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE= -google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/go.work.example b/go.work.example index 5481cb3c915..655938729b8 100644 --- a/go.work.example +++ b/go.work.example @@ -1,6 +1,7 @@ -go 1.19 +go 1.20 use ( ./ + ./modules/capability ./e2e ) diff --git a/internal/collections/collections_test.go b/internal/collections/collections_test.go index faf16fa6bc3..9fb3664c372 100644 --- a/internal/collections/collections_test.go +++ b/internal/collections/collections_test.go @@ -3,8 +3,9 @@ package collections_test import ( "testing" - "github.com/cosmos/ibc-go/v7/internal/collections" "github.com/stretchr/testify/require" + + "github.com/cosmos/ibc-go/v7/internal/collections" ) func TestContainsString(t *testing.T) { diff --git a/modules/apps/27-interchain-accounts/controller/client/cli/query.go b/modules/apps/27-interchain-accounts/controller/client/cli/query.go index ca71a96652a..4a18fcd05fa 100644 --- a/modules/apps/27-interchain-accounts/controller/client/cli/query.go +++ b/modules/apps/27-interchain-accounts/controller/client/cli/query.go @@ -3,10 +3,11 @@ package cli import ( "fmt" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" ) diff --git a/modules/apps/27-interchain-accounts/controller/client/cli/tx.go b/modules/apps/27-interchain-accounts/controller/client/cli/tx.go index 44094f7b152..232d22b07c9 100644 --- a/modules/apps/27-interchain-accounts/controller/client/cli/tx.go +++ b/modules/apps/27-interchain-accounts/controller/client/cli/tx.go @@ -5,11 +5,12 @@ import ( "os" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/codec" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go index 3e767a24614..1338b3f252f 100644 --- a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go +++ b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go @@ -2,6 +2,7 @@ package controller import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" diff --git a/modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go b/modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go index 663a72b6dcc..cf049e3ae50 100644 --- a/modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go +++ b/modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go @@ -4,10 +4,11 @@ import ( "fmt" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" controllerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go index 189f5c6e903..9ce0f5211a6 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/account.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/account.go @@ -2,6 +2,7 @@ package keeper import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go b/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go index 78e0f37446e..2b983546c61 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go @@ -3,10 +3,11 @@ package keeper import ( "context" - sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/handshake.go b/modules/apps/27-interchain-accounts/controller/keeper/handshake.go index 04b8b97b6df..1bc75623f71 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/handshake.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/handshake.go @@ -5,9 +5,10 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go b/modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go index 9e29dc0a93c..1f3929154f7 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go @@ -2,7 +2,6 @@ package keeper_test import ( capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go index 8b2d6aad48e..9aa172a6f15 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go @@ -6,12 +6,14 @@ import ( "strings" errorsmod "cosmossdk.io/errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/cometbft/cometbft/libs/log" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" genesistypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/migrations.go b/modules/apps/27-interchain-accounts/controller/keeper/migrations.go index 1c1323a6d07..896bd3575cb 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/migrations.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/migrations.go @@ -4,6 +4,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go index d1bbc7205ff..df22e40b34b 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go index 4318bdbc3c1..7960af5b01b 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go @@ -3,10 +3,12 @@ package keeper_test import ( "time" + "github.com/cosmos/gogoproto/proto" + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/relay.go b/modules/apps/27-interchain-accounts/controller/keeper/relay.go index 9ebe2ed85f8..412d2cb2f0c 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/relay.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/relay.go @@ -2,9 +2,10 @@ package keeper import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/27-interchain-accounts/controller/keeper/relay_test.go b/modules/apps/27-interchain-accounts/controller/keeper/relay_test.go index 5e032729c9b..856cda7fdfe 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/relay_test.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/relay_test.go @@ -1,11 +1,12 @@ package keeper_test import ( + "github.com/cosmos/gogoproto/proto" + sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" + sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/gogoproto/proto" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations.go b/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations.go index 96a5d76fa91..0208c97eb49 100644 --- a/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations.go +++ b/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - controllertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_test.go b/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_test.go index 872d1a24039..c079459c0aa 100644 --- a/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_test.go +++ b/modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_test.go @@ -3,10 +3,11 @@ package v6_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs.go b/modules/apps/27-interchain-accounts/controller/types/msgs.go index 39f55c96078..729d098f3fa 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" @@ -13,6 +14,7 @@ import ( var ( _ sdk.Msg = (*MsgRegisterInterchainAccount)(nil) + _ sdk.Msg = (*MsgSendTx)(nil) _ sdk.Msg = (*MsgUpdateParams)(nil) ) diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go index 5b42151f88e..10cbff89a27 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go @@ -3,11 +3,12 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go index 28ac4241013..37e1ba86816 100644 --- a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go +++ b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go @@ -109,20 +109,6 @@ func (m *MsgRegisterInterchainAccountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRegisterInterchainAccountResponse proto.InternalMessageInfo -func (m *MsgRegisterInterchainAccountResponse) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - -func (m *MsgRegisterInterchainAccountResponse) GetPortId() string { - if m != nil { - return m.PortId - } - return "" -} - // MsgSendTx defines the payload for Msg/SendTx type MsgSendTx struct { Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` @@ -204,13 +190,6 @@ func (m *MsgSendTxResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSendTxResponse proto.InternalMessageInfo -func (m *MsgSendTxResponse) GetSequence() uint64 { - if m != nil { - return m.Sequence - } - return 0 -} - // MsgUpdateParams defines the payload for Msg/UpdateParams type MsgUpdateParams struct { // authority is the address that controls the module (defaults to x/gov unless overwritten). @@ -254,20 +233,6 @@ func (m *MsgUpdateParams) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // MsgUpdateParamsResponse defines the response for Msg/UpdateParams type MsgUpdateParamsResponse struct { } @@ -320,46 +285,46 @@ func init() { var fileDescriptor_7def041328c84a30 = []byte{ // 628 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x4f, 0x13, 0x41, - 0x14, 0xde, 0x91, 0x52, 0xec, 0x80, 0xa2, 0x1b, 0x12, 0xca, 0x06, 0x17, 0x52, 0x3d, 0x20, 0x09, - 0x3b, 0x69, 0x35, 0x21, 0xc1, 0x78, 0x10, 0xf0, 0xd0, 0x98, 0x26, 0xcd, 0x8a, 0x09, 0xf1, 0x60, - 0x33, 0x9d, 0x9d, 0x6c, 0x47, 0x76, 0x67, 0xd6, 0x9d, 0xd9, 0x15, 0x6e, 0xc6, 0x8b, 0xc6, 0x83, - 0xf1, 0xea, 0x8d, 0x3f, 0x81, 0xff, 0x42, 0x8e, 0x1c, 0x3d, 0x19, 0x03, 0x07, 0x3c, 0xfb, 0x17, - 0x98, 0xfd, 0xd1, 0x2d, 0x2a, 0x12, 0x2c, 0xdc, 0xfa, 0xde, 0xeb, 0xf7, 0xbd, 0xef, 0x7b, 0xf3, - 0xf6, 0xc1, 0x07, 0xac, 0x4b, 0x10, 0x0e, 0x02, 0x8f, 0x11, 0xac, 0x98, 0xe0, 0x12, 0x31, 0xae, - 0x68, 0x48, 0x7a, 0x98, 0xf1, 0x0e, 0x26, 0x44, 0x44, 0x5c, 0x49, 0x44, 0x04, 0x57, 0xa1, 0xf0, - 0x3c, 0x1a, 0xa2, 0xb8, 0x8e, 0xd4, 0xb6, 0x15, 0x84, 0x42, 0x09, 0xbd, 0xc1, 0xba, 0xc4, 0x3a, - 0x09, 0xb6, 0x4e, 0x01, 0x5b, 0x03, 0xb0, 0x15, 0xd7, 0x8d, 0x29, 0x57, 0xb8, 0x22, 0x85, 0xa3, - 0xe4, 0x57, 0xc6, 0x64, 0xdc, 0x3f, 0x97, 0x8c, 0xb8, 0x8e, 0x02, 0x4c, 0xb6, 0xa8, 0xca, 0x51, - 0x6b, 0x43, 0x88, 0x3f, 0xa1, 0x26, 0x23, 0x99, 0x26, 0x42, 0xfa, 0x42, 0x22, 0x5f, 0xba, 0x49, - 0xdd, 0x97, 0x6e, 0x56, 0xa8, 0xbd, 0x03, 0x70, 0xb6, 0x25, 0x5d, 0x9b, 0xba, 0x4c, 0x2a, 0x1a, - 0x36, 0x0b, 0xea, 0x47, 0x19, 0xb3, 0x3e, 0x05, 0x47, 0xc5, 0x6b, 0x4e, 0xc3, 0x2a, 0x98, 0x07, - 0x0b, 0x15, 0x3b, 0x0b, 0xf4, 0xdb, 0xf0, 0x1a, 0x11, 0x9c, 0x53, 0x92, 0x28, 0xea, 0x30, 0xa7, - 0x7a, 0x25, 0xad, 0x4e, 0x0c, 0x92, 0x4d, 0x47, 0xaf, 0xc2, 0xb1, 0x98, 0x86, 0x92, 0x09, 0x5e, - 0x1d, 0x49, 0xcb, 0xfd, 0x70, 0x45, 0x7f, 0xbf, 0x3b, 0xa7, 0xfd, 0xd8, 0x9d, 0xd3, 0xde, 0x1e, - 0xef, 0x2d, 0x66, 0x94, 0xb5, 0x17, 0xf0, 0xce, 0x59, 0x42, 0x6c, 0x2a, 0x03, 0xc1, 0x25, 0xd5, - 0x6f, 0x41, 0x48, 0x7a, 0x98, 0x73, 0xea, 0x25, 0x7d, 0x33, 0x55, 0x95, 0x3c, 0xd3, 0x74, 0xf4, - 0x69, 0x38, 0x16, 0x88, 0x50, 0x0d, 0x34, 0x95, 0x93, 0xb0, 0xe9, 0xd4, 0x7e, 0x02, 0x58, 0x69, - 0x49, 0xf7, 0x29, 0xe5, 0xce, 0xc6, 0xf6, 0x45, 0x6c, 0x6d, 0xc1, 0xf1, 0xec, 0x81, 0x3a, 0x0e, - 0x56, 0x38, 0xb5, 0x36, 0xde, 0x58, 0xb7, 0xce, 0xb5, 0x26, 0x71, 0xdd, 0xfa, 0xcb, 0x59, 0x3b, - 0x25, 0x5b, 0xc7, 0x0a, 0xaf, 0x96, 0xf6, 0xbf, 0xcd, 0x69, 0x36, 0x0c, 0x8a, 0x8c, 0x7e, 0x17, - 0xde, 0x08, 0xa9, 0x87, 0x15, 0x8b, 0x69, 0x47, 0x31, 0x9f, 0x8a, 0x48, 0x55, 0x4b, 0xf3, 0x60, - 0xa1, 0x64, 0x4f, 0xf6, 0xf3, 0x1b, 0x59, 0xfa, 0xd4, 0xa1, 0x22, 0x78, 0xb3, 0xf0, 0x5c, 0x4c, - 0xd0, 0x80, 0x57, 0x25, 0x7d, 0x15, 0x51, 0x4e, 0x68, 0x6a, 0xbf, 0x64, 0x17, 0x71, 0xed, 0x33, - 0x80, 0x93, 0x2d, 0xe9, 0x3e, 0x0b, 0x1c, 0xac, 0x68, 0x1b, 0x87, 0xd8, 0x97, 0xfa, 0x2c, 0xac, - 0xe0, 0x48, 0xf5, 0x44, 0xc8, 0xd4, 0x4e, 0x7f, 0xe0, 0x45, 0x42, 0xdf, 0x84, 0xe5, 0x20, 0xfd, - 0x5f, 0x3a, 0xac, 0xf1, 0xc6, 0x8a, 0xf5, 0xff, 0x1f, 0x8c, 0x95, 0x75, 0xca, 0xfd, 0xe7, 0x7c, - 0x2b, 0xd7, 0x13, 0x23, 0x83, 0x4e, 0xb5, 0x19, 0x38, 0xfd, 0x87, 0xb4, 0xbe, 0xa5, 0xc6, 0x87, - 0x12, 0x1c, 0x69, 0x49, 0x57, 0xff, 0x02, 0xe0, 0xcc, 0xbf, 0x77, 0xb9, 0x3d, 0x8c, 0xb4, 0xb3, - 0x96, 0xd2, 0xd8, 0xbc, 0x6c, 0xc6, 0xe2, 0x91, 0x3e, 0x02, 0x58, 0xce, 0x77, 0xf5, 0xe1, 0x90, - 0x4d, 0x32, 0xb8, 0xf1, 0xf8, 0x42, 0xf0, 0x42, 0xd0, 0x2e, 0x80, 0x13, 0xbf, 0xad, 0xc5, 0xda, - 0x90, 0xbc, 0x27, 0x49, 0x8c, 0x27, 0x97, 0x40, 0xd2, 0x97, 0x68, 0x8c, 0xbe, 0x39, 0xde, 0x5b, - 0x04, 0xab, 0x2f, 0xf7, 0x0f, 0x4d, 0x70, 0x70, 0x68, 0x82, 0xef, 0x87, 0x26, 0xf8, 0x74, 0x64, - 0x6a, 0x07, 0x47, 0xa6, 0xf6, 0xf5, 0xc8, 0xd4, 0x9e, 0xb7, 0x5d, 0xa6, 0x7a, 0x51, 0xd7, 0x22, - 0xc2, 0x47, 0xf9, 0x45, 0x64, 0x5d, 0xb2, 0xe4, 0x0a, 0x14, 0x2f, 0x23, 0x5f, 0x38, 0x91, 0x47, - 0x65, 0x72, 0x6b, 0x25, 0x6a, 0x2c, 0x2f, 0x0d, 0x74, 0x2c, 0x9d, 0x76, 0x66, 0xd5, 0x4e, 0x40, - 0x65, 0xb7, 0x9c, 0x9e, 0xd1, 0x7b, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x19, 0x0f, 0x13, - 0x63, 0x06, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x41, + 0x14, 0xef, 0x48, 0x29, 0x76, 0x40, 0xd1, 0x0d, 0x09, 0x65, 0x83, 0x85, 0x54, 0x0f, 0x48, 0xc2, + 0x4e, 0x5a, 0x35, 0x24, 0x35, 0x1e, 0x04, 0x3c, 0x34, 0xa6, 0x49, 0xb3, 0x62, 0x42, 0xbc, 0x34, + 0xd3, 0xd9, 0xc9, 0x76, 0x64, 0x77, 0x66, 0xdd, 0x99, 0x5d, 0xe1, 0x66, 0xf4, 0x62, 0x3c, 0x18, + 0xbf, 0x80, 0x09, 0x1f, 0x81, 0x6f, 0x21, 0x47, 0x8e, 0x9e, 0x8c, 0x81, 0x03, 0x37, 0x3f, 0x83, + 0xd9, 0xbf, 0xad, 0x82, 0x04, 0x0b, 0xb7, 0xbe, 0xf7, 0xfa, 0xfb, 0xbd, 0xdf, 0xef, 0xcd, 0xdb, + 0x07, 0x1f, 0xb3, 0x1e, 0x41, 0xd8, 0xf3, 0x1c, 0x46, 0xb0, 0x62, 0x82, 0x4b, 0xc4, 0xb8, 0xa2, + 0x3e, 0xe9, 0x63, 0xc6, 0xbb, 0x98, 0x10, 0x11, 0x70, 0x25, 0x11, 0x11, 0x5c, 0xf9, 0xc2, 0x71, + 0xa8, 0x8f, 0xc2, 0x3a, 0x52, 0x3b, 0x86, 0xe7, 0x0b, 0x25, 0xb4, 0x06, 0xeb, 0x11, 0x63, 0x18, + 0x6c, 0x9c, 0x01, 0x36, 0x06, 0x60, 0x23, 0xac, 0xeb, 0x33, 0xb6, 0xb0, 0x45, 0x0c, 0x47, 0xd1, + 0xaf, 0x84, 0x49, 0x7f, 0x78, 0x21, 0x19, 0x61, 0x1d, 0x79, 0x98, 0x6c, 0x53, 0x95, 0xa2, 0xd6, + 0x47, 0x10, 0x3f, 0xa4, 0x26, 0x21, 0x99, 0x25, 0x42, 0xba, 0x42, 0x22, 0x57, 0xda, 0x51, 0xdd, + 0x95, 0x76, 0x52, 0xa8, 0x7d, 0x00, 0x70, 0xbe, 0x2d, 0x6d, 0x93, 0xda, 0x4c, 0x2a, 0xea, 0xb7, + 0x72, 0xea, 0xa7, 0x09, 0xb3, 0x36, 0x03, 0xc7, 0xc5, 0x5b, 0x4e, 0xfd, 0x0a, 0x58, 0x04, 0x4b, + 0x65, 0x33, 0x09, 0xb4, 0xbb, 0xf0, 0x06, 0x11, 0x9c, 0x53, 0x12, 0x29, 0xea, 0x32, 0xab, 0x72, + 0x2d, 0xae, 0x4e, 0x0d, 0x92, 0x2d, 0x4b, 0xab, 0xc0, 0x89, 0x90, 0xfa, 0x92, 0x09, 0x5e, 0x19, + 0x8b, 0xcb, 0x59, 0xd8, 0xbc, 0xf9, 0x71, 0x6f, 0xa1, 0xf0, 0xfe, 0x64, 0x7f, 0x39, 0xa1, 0xab, + 0x59, 0xf0, 0xde, 0x79, 0x22, 0x4c, 0x2a, 0x3d, 0xc1, 0x25, 0xd5, 0xee, 0x40, 0x48, 0xfa, 0x98, + 0x73, 0xea, 0x44, 0x3d, 0x13, 0x45, 0xe5, 0x34, 0xd3, 0xb2, 0xb4, 0x59, 0x38, 0xe1, 0x09, 0x5f, + 0x0d, 0xf4, 0x94, 0xa2, 0xb0, 0x65, 0x35, 0x8b, 0x51, 0xbf, 0xda, 0x2f, 0x00, 0xcb, 0x6d, 0x69, + 0xbf, 0xa0, 0xdc, 0xda, 0xdc, 0xb9, 0x8c, 0xb1, 0x6d, 0x38, 0x99, 0x3c, 0x51, 0xd7, 0xc2, 0x0a, + 0xc7, 0xe6, 0x26, 0x1b, 0x1b, 0xc6, 0x85, 0x16, 0x25, 0xac, 0x1b, 0xa7, 0xfc, 0x75, 0x62, 0xb2, + 0x0d, 0xac, 0xf0, 0x5a, 0xf1, 0xe0, 0xc7, 0x42, 0xc1, 0x84, 0x5e, 0x9e, 0xd1, 0xee, 0xc3, 0x5b, + 0x3e, 0x75, 0xb0, 0x62, 0x21, 0xed, 0x2a, 0xe6, 0x52, 0x11, 0xa8, 0x4a, 0x71, 0x11, 0x2c, 0x15, + 0xcd, 0xe9, 0x2c, 0xbf, 0x99, 0xa4, 0x4f, 0x8d, 0xf5, 0x11, 0xbc, 0x9d, 0xfb, 0xcd, 0x67, 0xa8, + 0xc3, 0xeb, 0x92, 0xbe, 0x09, 0x28, 0x27, 0x34, 0xb6, 0x5e, 0x34, 0xf3, 0x38, 0x9d, 0xd3, 0x57, + 0x00, 0xa7, 0xdb, 0xd2, 0x7e, 0xe9, 0x59, 0x58, 0xd1, 0x0e, 0xf6, 0xb1, 0x2b, 0xb5, 0x79, 0x58, + 0xc6, 0x81, 0xea, 0x0b, 0x9f, 0xa9, 0xdd, 0x6c, 0xf0, 0x79, 0x42, 0xdb, 0x82, 0x25, 0x2f, 0xfe, + 0x5f, 0x3c, 0xae, 0xc9, 0x46, 0xd3, 0xf8, 0xff, 0x8f, 0xc6, 0x48, 0x3a, 0xa5, 0x13, 0x48, 0xf9, + 0x9a, 0x5a, 0x66, 0x69, 0xd0, 0xad, 0x36, 0x07, 0x67, 0xff, 0x92, 0x97, 0x99, 0x6b, 0x7c, 0x2a, + 0xc2, 0xb1, 0xb6, 0xb4, 0xb5, 0x6f, 0x00, 0xce, 0xfd, 0x7b, 0xa7, 0x3b, 0xa3, 0xc8, 0x3b, 0x6f, + 0x41, 0xf5, 0xad, 0xab, 0x66, 0xcc, 0x9f, 0xeb, 0x33, 0x80, 0xa5, 0x74, 0x63, 0x9f, 0x8c, 0xd8, + 0x24, 0x81, 0xeb, 0xcf, 0x2e, 0x05, 0xcf, 0x05, 0xed, 0x01, 0x38, 0xf5, 0xc7, 0x6a, 0xac, 0x8f, + 0xc8, 0x3b, 0x4c, 0xa2, 0x3f, 0xbf, 0x02, 0x92, 0x4c, 0xa2, 0x3e, 0xfe, 0xee, 0x64, 0x7f, 0x19, + 0xac, 0xbd, 0x3e, 0x38, 0xaa, 0x82, 0xc3, 0xa3, 0x2a, 0xf8, 0x79, 0x54, 0x05, 0x5f, 0x8e, 0xab, + 0x85, 0xc3, 0xe3, 0x6a, 0xe1, 0xfb, 0x71, 0xb5, 0xf0, 0xaa, 0x63, 0x33, 0xd5, 0x0f, 0x7a, 0x06, + 0x11, 0x2e, 0x4a, 0x2f, 0x23, 0xeb, 0x91, 0x15, 0x5b, 0xa0, 0x70, 0x15, 0xb9, 0xc2, 0x0a, 0x1c, + 0x2a, 0xa3, 0x9b, 0x2b, 0x51, 0x63, 0x75, 0x65, 0xa0, 0x63, 0xe5, 0xac, 0x73, 0xab, 0x76, 0x3d, + 0x2a, 0x7b, 0xa5, 0xf8, 0x9c, 0x3e, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xf7, 0xce, 0xb5, + 0x6b, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/27-interchain-accounts/host/client/cli/cli.go b/modules/apps/27-interchain-accounts/host/client/cli/cli.go index 23d2dc2e83a..1eceb6159a4 100644 --- a/modules/apps/27-interchain-accounts/host/client/cli/cli.go +++ b/modules/apps/27-interchain-accounts/host/client/cli/cli.go @@ -1,8 +1,9 @@ package cli import ( - "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" ) // GetQueryCmd returns the query commands for the ICA host submodule diff --git a/modules/apps/27-interchain-accounts/host/client/cli/query.go b/modules/apps/27-interchain-accounts/host/client/cli/query.go index 327f51538fc..36e928fe795 100644 --- a/modules/apps/27-interchain-accounts/host/client/cli/query.go +++ b/modules/apps/27-interchain-accounts/host/client/cli/query.go @@ -4,13 +4,15 @@ import ( "fmt" "strconv" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/host/client/cli/tx.go b/modules/apps/27-interchain-accounts/host/client/cli/tx.go index a4143a50b98..c536fbde43f 100644 --- a/modules/apps/27-interchain-accounts/host/client/cli/tx.go +++ b/modules/apps/27-interchain-accounts/host/client/cli/tx.go @@ -4,12 +4,13 @@ import ( "encoding/json" "fmt" + "github.com/cosmos/gogoproto/proto" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/gogoproto/proto" - "github.com/spf13/cobra" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) diff --git a/modules/apps/27-interchain-accounts/host/client/cli/tx_test.go b/modules/apps/27-interchain-accounts/host/client/cli/tx_test.go index bc2628c501e..f9c4c0a4d71 100644 --- a/modules/apps/27-interchain-accounts/host/client/cli/tx_test.go +++ b/modules/apps/27-interchain-accounts/host/client/cli/tx_test.go @@ -4,12 +4,13 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) diff --git a/modules/apps/27-interchain-accounts/host/ibc_module.go b/modules/apps/27-interchain-accounts/host/ibc_module.go index 5ec6b5f78b2..012130c2efc 100644 --- a/modules/apps/27-interchain-accounts/host/ibc_module.go +++ b/modules/apps/27-interchain-accounts/host/ibc_module.go @@ -4,9 +4,10 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/host/ibc_module_test.go b/modules/apps/27-interchain-accounts/host/ibc_module_test.go index 472fbe30aa8..3ad31f13012 100644 --- a/modules/apps/27-interchain-accounts/host/ibc_module_test.go +++ b/modules/apps/27-interchain-accounts/host/ibc_module_test.go @@ -4,14 +4,16 @@ import ( "fmt" "testing" + "github.com/cosmos/gogoproto/proto" + "github.com/stretchr/testify/suite" + sdkmath "cosmossdk.io/math" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/gogoproto/proto" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/stretchr/testify/suite" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/account.go b/modules/apps/27-interchain-accounts/host/keeper/account.go index 3b02d3c7cae..e7fd35fb236 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/account.go +++ b/modules/apps/27-interchain-accounts/host/keeper/account.go @@ -2,6 +2,7 @@ package keeper import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/handshake.go b/modules/apps/27-interchain-accounts/host/keeper/handshake.go index c82a826efa5..8d43071ac2a 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/handshake.go +++ b/modules/apps/27-interchain-accounts/host/keeper/handshake.go @@ -4,9 +4,10 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/apps/27-interchain-accounts/host/keeper/handshake_test.go b/modules/apps/27-interchain-accounts/host/keeper/handshake_test.go index fca82064518..7c629530137 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/handshake_test.go +++ b/modules/apps/27-interchain-accounts/host/keeper/handshake_test.go @@ -2,10 +2,11 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" hosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/keeper.go b/modules/apps/27-interchain-accounts/host/keeper/keeper.go index 0f77dedff68..9234117c4fe 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/keeper.go +++ b/modules/apps/27-interchain-accounts/host/keeper/keeper.go @@ -4,13 +4,14 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + "github.com/cometbft/cometbft/libs/log" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" genesistypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/migrations.go b/modules/apps/27-interchain-accounts/host/keeper/migrations.go index 558af284c49..d1d5a129e3d 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/migrations.go +++ b/modules/apps/27-interchain-accounts/host/keeper/migrations.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ) diff --git a/modules/apps/27-interchain-accounts/host/keeper/msg_server.go b/modules/apps/27-interchain-accounts/host/keeper/msg_server.go index 388f78c744a..e9bebdf7193 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/msg_server.go +++ b/modules/apps/27-interchain-accounts/host/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/msg_server_test.go b/modules/apps/27-interchain-accounts/host/keeper/msg_server_test.go index 9bebd157ef7..ab9cce28a97 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/msg_server_test.go +++ b/modules/apps/27-interchain-accounts/host/keeper/msg_server_test.go @@ -6,27 +6,19 @@ import ( ) func (suite *KeeperTestSuite) TestUpdateParams() { - msg := types.MsgUpdateParams{} - testCases := []struct { - name string - malleate func(authority string) - expPass bool + name string + msg *types.MsgUpdateParams + expPass bool }{ { "success", - func(authority string) { - msg.Authority = authority - msg.Params = types.DefaultParams() - }, + types.NewMsgUpdateParams(suite.chainA.GetSimApp().ICAHostKeeper.GetAuthority(), types.DefaultParams()), true, }, { "invalid authority address", - func(authority string) { - msg.Authority = "authority" - msg.Params = types.DefaultParams() - }, + types.NewMsgUpdateParams("authority", types.DefaultParams()), false, }, } @@ -37,12 +29,9 @@ func (suite *KeeperTestSuite) TestUpdateParams() { suite.Run(tc.name, func() { suite.SetupTest() - ICAHostKeeper := &suite.chainA.GetSimApp().ICAHostKeeper - tc.malleate(ICAHostKeeper.GetAuthority()) // malleate mutates test data - ctx := suite.chainA.GetContext() - msgServer := keeper.NewMsgServerImpl(ICAHostKeeper) - res, err := msgServer.UpdateParams(ctx, &msg) + msgServer := keeper.NewMsgServerImpl(&suite.chainA.GetSimApp().ICAHostKeeper) + res, err := msgServer.UpdateParams(ctx, tc.msg) if tc.expPass { suite.Require().NoError(err) diff --git a/modules/apps/27-interchain-accounts/host/keeper/relay.go b/modules/apps/27-interchain-accounts/host/keeper/relay.go index fbf900efd7a..4131e9ef722 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/relay.go +++ b/modules/apps/27-interchain-accounts/host/keeper/relay.go @@ -1,10 +1,12 @@ package keeper import ( + "github.com/cosmos/gogoproto/proto" + errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/host/keeper/relay_test.go b/modules/apps/27-interchain-accounts/host/keeper/relay_test.go index 3c796eb1fa2..e88e3b69e93 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/relay_test.go +++ b/modules/apps/27-interchain-accounts/host/keeper/relay_test.go @@ -1,7 +1,10 @@ package keeper_test import ( + "github.com/cosmos/gogoproto/proto" + sdkmath "cosmossdk.io/math" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -10,7 +13,6 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/27-interchain-accounts/host/types/msgs.go b/modules/apps/27-interchain-accounts/host/types/msgs.go index 67dc6566c19..0c851060c44 100644 --- a/modules/apps/27-interchain-accounts/host/types/msgs.go +++ b/modules/apps/27-interchain-accounts/host/types/msgs.go @@ -2,6 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" @@ -9,6 +10,14 @@ import ( var _ sdk.Msg = (*MsgUpdateParams)(nil) +// NewMsgUpdateParams creates a new MsgUpdateParams instance +func NewMsgUpdateParams(authority string, params Params) *MsgUpdateParams { + return &MsgUpdateParams{ + Authority: authority, + Params: params, + } +} + // ValidateBasic implements sdk.Msg func (msg MsgUpdateParams) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Authority) diff --git a/modules/apps/27-interchain-accounts/host/types/msgs_test.go b/modules/apps/27-interchain-accounts/host/types/msgs_test.go index 1156c364083..2cfda22f526 100644 --- a/modules/apps/27-interchain-accounts/host/types/msgs_test.go +++ b/modules/apps/27-interchain-accounts/host/types/msgs_test.go @@ -3,65 +3,46 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" ) func TestMsgUpdateParamsValidateBasic(t *testing.T) { - var msg *types.MsgUpdateParams - testCases := []struct { - name string - malleate func() - expPass bool + name string + msg *types.MsgUpdateParams + expPass bool }{ { "success: valid authority address", - func() { - msg = &types.MsgUpdateParams{ - Authority: ibctesting.TestAccAddress, - Params: types.DefaultParams(), - } - }, + types.NewMsgUpdateParams(sdk.AccAddress(ibctesting.TestAccAddress).String(), types.DefaultParams()), true, }, { "failure: invalid authority address", - func() { - msg = &types.MsgUpdateParams{ - Authority: "authority", - } - }, + types.NewMsgUpdateParams("authority", types.DefaultParams()), false, }, { "failure: invalid allowed message", - func() { - msg = &types.MsgUpdateParams{ - Authority: ibctesting.TestAccAddress, - Params: types.Params{ - AllowMessages: []string{""}, - }, - } - }, + types.NewMsgUpdateParams("authority", types.Params{ + AllowMessages: []string{""}, + }), false, }, } for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - tc.malleate() - - err := msg.ValidateBasic() - if tc.expPass { - require.NoError(t, err) - } else { - require.Error(t, err) - } - }) + err := tc.msg.ValidateBasic() + if tc.expPass { + require.NoError(t, err) + } else { + require.Error(t, err) + } } } @@ -76,10 +57,7 @@ func TestMsgUpdateParamsGetSigners(t *testing.T) { } for _, tc := range testCases { - msg := types.MsgUpdateParams{ - Authority: tc.address.String(), - Params: types.DefaultParams(), - } + msg := types.NewMsgUpdateParams(tc.address.String(), types.DefaultParams()) if tc.expPass { require.Equal(t, []sdk.AccAddress{tc.address}, msg.GetSigners()) } else { diff --git a/modules/apps/27-interchain-accounts/host/types/tx.pb.go b/modules/apps/27-interchain-accounts/host/types/tx.pb.go index 021ee93d2ce..48fdff5812a 100644 --- a/modules/apps/27-interchain-accounts/host/types/tx.pb.go +++ b/modules/apps/27-interchain-accounts/host/types/tx.pb.go @@ -72,20 +72,6 @@ func (m *MsgUpdateParams) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // MsgUpdateParamsResponse defines the response for Msg/UpdateParams type MsgUpdateParamsResponse struct { } @@ -133,7 +119,7 @@ func init() { } var fileDescriptor_fa437afde7f1e7ae = []byte{ - // 351 bytes of a gzipped FileDescriptorProto + // 355 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xcd, 0x4c, 0x4a, 0xd6, 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, @@ -141,21 +127,22 @@ var fileDescriptor_fa437afde7f1e7ae = []byte{ 0xc9, 0x17, 0xd2, 0xc9, 0x4c, 0x4a, 0xd6, 0x43, 0xd6, 0xa6, 0x87, 0x45, 0x9b, 0x1e, 0x48, 0x9b, 0x5e, 0x99, 0xa1, 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, 0x58, 0xa3, 0x3e, 0x88, 0x05, 0x31, 0x43, 0x4a, 0x3c, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x58, 0x3f, 0xb7, 0x38, 0x1d, 0x64, 0x76, 0x6e, 0x71, - 0x3a, 0x54, 0xc2, 0x9c, 0x24, 0x37, 0x81, 0x2d, 0x01, 0x6b, 0x54, 0x9a, 0xcc, 0xc8, 0xc5, 0xef, + 0x3a, 0x54, 0xc2, 0x9c, 0x24, 0x37, 0x81, 0x2d, 0x01, 0x6b, 0x54, 0x9a, 0xce, 0xc8, 0xc5, 0xef, 0x5b, 0x9c, 0x1e, 0x5a, 0x90, 0x92, 0x58, 0x92, 0x1a, 0x90, 0x58, 0x94, 0x98, 0x5b, 0x2c, 0x24, 0xc3, 0xc5, 0x99, 0x58, 0x5a, 0x92, 0x91, 0x5f, 0x94, 0x59, 0x52, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x84, 0x10, 0x10, 0x0a, 0xe2, 0x62, 0x2b, 0x00, 0xab, 0x93, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x36, 0x32, 0xd1, 0x23, 0xc5, 0x63, 0x7a, 0x10, 0x3b, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, - 0x08, 0x82, 0x9a, 0x64, 0xc5, 0xd7, 0xf4, 0x7c, 0x83, 0x16, 0xc2, 0x0e, 0x25, 0x49, 0x2e, 0x71, - 0x34, 0x47, 0x05, 0xa5, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0x2d, 0x66, 0xe4, 0x62, 0xf6, - 0x2d, 0x4e, 0x17, 0x9a, 0xc2, 0xc8, 0xc5, 0x83, 0xe2, 0x6a, 0x5b, 0xd2, 0xdc, 0x81, 0x66, 0xbe, - 0x94, 0x2b, 0x45, 0xda, 0x61, 0xce, 0x93, 0x62, 0x6d, 0x78, 0xbe, 0x41, 0x8b, 0xd1, 0x29, 0xe5, - 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, - 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xbc, 0xd2, 0x33, 0x4b, 0x32, 0x4a, - 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xb1, 0x99, 0x99, 0x94, 0xac, 0x9b, 0x9e, 0xaf, 0x5f, - 0x66, 0xae, 0x9f, 0x9b, 0x9f, 0x52, 0x9a, 0x93, 0x5a, 0x0c, 0x8a, 0xc9, 0x62, 0x7d, 0x23, 0x73, - 0x5d, 0x84, 0x0b, 0x74, 0x51, 0x23, 0xb1, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x87, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x56, 0xf9, 0x77, 0x92, 0x02, 0x00, 0x00, + 0x08, 0x82, 0x9a, 0x64, 0x25, 0xd4, 0xb1, 0x40, 0x9e, 0xa1, 0xe9, 0xf9, 0x06, 0x2d, 0x84, 0x3d, + 0x4a, 0x92, 0x5c, 0xe2, 0x68, 0x0e, 0x0b, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x35, 0x5a, + 0xcc, 0xc8, 0xc5, 0xec, 0x5b, 0x9c, 0x2e, 0x34, 0x85, 0x91, 0x8b, 0x07, 0xc5, 0xe5, 0xb6, 0xa4, + 0xb9, 0x05, 0xcd, 0x7c, 0x29, 0x57, 0x8a, 0xb4, 0xc3, 0x9c, 0x27, 0xc5, 0xda, 0xf0, 0x7c, 0x83, + 0x16, 0xa3, 0x53, 0xca, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, + 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x79, 0xa5, + 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x63, 0x34, 0x33, 0x29, 0x59, + 0x37, 0x3d, 0x5f, 0xbf, 0xcc, 0x5c, 0x3f, 0x37, 0x3f, 0xa5, 0x34, 0x27, 0xb5, 0x18, 0x14, 0x9b, + 0xc5, 0xfa, 0x46, 0xe6, 0xba, 0x08, 0x17, 0xe8, 0xa2, 0x46, 0x64, 0x49, 0x65, 0x41, 0x6a, 0x71, + 0x12, 0x1b, 0x38, 0x1e, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x32, 0xfd, 0x69, 0x96, + 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/27-interchain-accounts/module.go b/modules/apps/27-interchain-accounts/module.go index d5fc60b3da8..31e58cfbcb8 100644 --- a/modules/apps/27-interchain-accounts/module.go +++ b/modules/apps/27-interchain-accounts/module.go @@ -5,15 +5,17 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/client/cli" controllerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" diff --git a/modules/apps/27-interchain-accounts/module_test.go b/modules/apps/27-interchain-accounts/module_test.go index 461091b996d..7e9c6688df2 100644 --- a/modules/apps/27-interchain-accounts/module_test.go +++ b/modules/apps/27-interchain-accounts/module_test.go @@ -3,12 +3,14 @@ package ica_test import ( "testing" + "github.com/stretchr/testify/suite" + + "github.com/cosmos/cosmos-sdk/baseapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/baseapp" - simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" - "github.com/stretchr/testify/suite" ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" controllertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" diff --git a/modules/apps/27-interchain-accounts/simulation/decoder_test.go b/modules/apps/27-interchain-accounts/simulation/decoder_test.go index 81e899b620e..ae54a74c00c 100644 --- a/modules/apps/27-interchain-accounts/simulation/decoder_test.go +++ b/modules/apps/27-interchain-accounts/simulation/decoder_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/types/kv" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/simulation" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/27-interchain-accounts/simulation/genesis_test.go b/modules/apps/27-interchain-accounts/simulation/genesis_test.go index ac38cc936c4..5072865e22c 100644 --- a/modules/apps/27-interchain-accounts/simulation/genesis_test.go +++ b/modules/apps/27-interchain-accounts/simulation/genesis_test.go @@ -5,13 +5,15 @@ import ( "math/rand" "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/stretchr/testify/require" genesistypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/simulation" diff --git a/modules/apps/27-interchain-accounts/types/account.go b/modules/apps/27-interchain-accounts/types/account.go index 472b509818c..5fc1466e52d 100644 --- a/modules/apps/27-interchain-accounts/types/account.go +++ b/modules/apps/27-interchain-accounts/types/account.go @@ -5,12 +5,14 @@ import ( "regexp" "strings" + yaml "gopkg.in/yaml.v2" + errorsmod "cosmossdk.io/errors" + crypto "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkaddress "github.com/cosmos/cosmos-sdk/types/address" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - yaml "gopkg.in/yaml.v2" ) var ( diff --git a/modules/apps/27-interchain-accounts/types/account_test.go b/modules/apps/27-interchain-accounts/types/account_test.go index 8acef7e33a9..50eadc8aad3 100644 --- a/modules/apps/27-interchain-accounts/types/account_test.go +++ b/modules/apps/27-interchain-accounts/types/account_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/27-interchain-accounts/types/codec.go b/modules/apps/27-interchain-accounts/types/codec.go index c316a36ffde..3422f280603 100644 --- a/modules/apps/27-interchain-accounts/types/codec.go +++ b/modules/apps/27-interchain-accounts/types/codec.go @@ -1,12 +1,14 @@ package types import ( + "github.com/cosmos/gogoproto/proto" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cosmos/gogoproto/proto" ) // ModuleCdc references the global interchain accounts module codec. Note, the codec diff --git a/modules/apps/27-interchain-accounts/types/codec_test.go b/modules/apps/27-interchain-accounts/types/codec_test.go index 9b48051e61f..7955607aec3 100644 --- a/modules/apps/27-interchain-accounts/types/codec_test.go +++ b/modules/apps/27-interchain-accounts/types/codec_test.go @@ -1,7 +1,10 @@ package types_test import ( + "github.com/cosmos/gogoproto/proto" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -9,7 +12,6 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" "github.com/cosmos/ibc-go/v7/testing/simapp" diff --git a/modules/apps/27-interchain-accounts/types/expected_keepers.go b/modules/apps/27-interchain-accounts/types/expected_keepers.go index 08547816778..d923d61c603 100644 --- a/modules/apps/27-interchain-accounts/types/expected_keepers.go +++ b/modules/apps/27-interchain-accounts/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/apps/27-interchain-accounts/types/metadata.go b/modules/apps/27-interchain-accounts/types/metadata.go index f9b61b81a15..09cae632058 100644 --- a/modules/apps/27-interchain-accounts/types/metadata.go +++ b/modules/apps/27-interchain-accounts/types/metadata.go @@ -2,6 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/apps/27-interchain-accounts/types/packet.go b/modules/apps/27-interchain-accounts/types/packet.go index f7d1c6648be..213497f6ac6 100644 --- a/modules/apps/27-interchain-accounts/types/packet.go +++ b/modules/apps/27-interchain-accounts/types/packet.go @@ -4,6 +4,7 @@ import ( "time" errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/modules/apps/29-fee/client/cli/query.go b/modules/apps/29-fee/client/cli/query.go index 5c57386668d..e836ac113fe 100644 --- a/modules/apps/29-fee/client/cli/query.go +++ b/modules/apps/29-fee/client/cli/query.go @@ -4,11 +4,12 @@ import ( "fmt" "strconv" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/client/cli/tx.go b/modules/apps/29-fee/client/cli/tx.go index 40d0f5e5c1c..21ffae00f9a 100644 --- a/modules/apps/29-fee/client/cli/tx.go +++ b/modules/apps/29-fee/client/cli/tx.go @@ -5,12 +5,13 @@ import ( "strconv" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index 1938fd6381a..5b260ad7be9 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -4,9 +4,10 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/apps/29-fee/ibc_middleware_test.go b/modules/apps/29-fee/ibc_middleware_test.go index 11302063364..ee1d0ed228a 100644 --- a/modules/apps/29-fee/ibc_middleware_test.go +++ b/modules/apps/29-fee/ibc_middleware_test.go @@ -4,9 +4,10 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" fee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/modules/apps/29-fee/ica_test.go b/modules/apps/29-fee/ica_test.go index 7b9b5383f40..1e009e75d56 100644 --- a/modules/apps/29-fee/ica_test.go +++ b/modules/apps/29-fee/ica_test.go @@ -1,11 +1,13 @@ package fee_test import ( + "github.com/cosmos/gogoproto/proto" + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gogoproto/proto" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go index 8f3f8bd417f..9f9310272cd 100644 --- a/modules/apps/29-fee/keeper/escrow.go +++ b/modules/apps/29-fee/keeper/escrow.go @@ -5,6 +5,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/modules/apps/29-fee/keeper/escrow_test.go b/modules/apps/29-fee/keeper/escrow_test.go index 71a1f9e5a44..fee65c5af9c 100644 --- a/modules/apps/29-fee/keeper/escrow_test.go +++ b/modules/apps/29-fee/keeper/escrow_test.go @@ -2,9 +2,11 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" - "github.com/cometbft/cometbft/crypto/secp256k1" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/keeper/events_test.go b/modules/apps/29-fee/keeper/events_test.go index 7c8b917f49e..2cd5b265b6d 100644 --- a/modules/apps/29-fee/keeper/events_test.go +++ b/modules/apps/29-fee/keeper/events_test.go @@ -2,9 +2,11 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" - abcitypes "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" + abcitypes "github.com/cometbft/cometbft/abci/types" + "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/apps/29-fee/keeper/grpc_query.go b/modules/apps/29-fee/keeper/grpc_query.go index 1f007bbfb8c..6c7122e28c3 100644 --- a/modules/apps/29-fee/keeper/grpc_query.go +++ b/modules/apps/29-fee/keeper/grpc_query.go @@ -3,12 +3,14 @@ package keeper import ( "context" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ) diff --git a/modules/apps/29-fee/keeper/grpc_query_test.go b/modules/apps/29-fee/keeper/grpc_query_test.go index 707980d9bb2..65f880fddb8 100644 --- a/modules/apps/29-fee/keeper/grpc_query_test.go +++ b/modules/apps/29-fee/keeper/grpc_query_test.go @@ -4,10 +4,12 @@ import ( "fmt" sdkmath "cosmossdk.io/math" - "github.com/cometbft/cometbft/crypto/secp256k1" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go index 99801bd6999..cfa353530b0 100644 --- a/modules/apps/29-fee/keeper/keeper.go +++ b/modules/apps/29-fee/keeper/keeper.go @@ -1,12 +1,13 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + "github.com/cometbft/cometbft/libs/log" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" diff --git a/modules/apps/29-fee/keeper/keeper_test.go b/modules/apps/29-fee/keeper/keeper_test.go index d82f09eea5e..f2265afe695 100644 --- a/modules/apps/29-fee/keeper/keeper_test.go +++ b/modules/apps/29-fee/keeper/keeper_test.go @@ -4,9 +4,11 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/suite" + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go index 511c0e5aed7..12dd50506cf 100644 --- a/modules/apps/29-fee/keeper/msg_server.go +++ b/modules/apps/29-fee/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/modules/apps/29-fee/keeper/msg_server_test.go b/modules/apps/29-fee/keeper/msg_server_test.go index 40a24c5225d..fc7420144be 100644 --- a/modules/apps/29-fee/keeper/msg_server_test.go +++ b/modules/apps/29-fee/keeper/msg_server_test.go @@ -2,8 +2,8 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" + sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/modules/apps/29-fee/keeper/relay.go b/modules/apps/29-fee/keeper/relay.go index 625901450a4..a5328703d7c 100644 --- a/modules/apps/29-fee/keeper/relay.go +++ b/modules/apps/29-fee/keeper/relay.go @@ -4,9 +4,10 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/module.go b/modules/apps/29-fee/module.go index 988276073e9..e2981cd97f6 100644 --- a/modules/apps/29-fee/module.go +++ b/modules/apps/29-fee/module.go @@ -5,15 +5,17 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/client/cli" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" diff --git a/modules/apps/29-fee/types/expected_keepers.go b/modules/apps/29-fee/types/expected_keepers.go index c9a82e62608..68ea270b72a 100644 --- a/modules/apps/29-fee/types/expected_keepers.go +++ b/modules/apps/29-fee/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) diff --git a/modules/apps/29-fee/types/fee.go b/modules/apps/29-fee/types/fee.go index 7081540ccb4..103a8a47046 100644 --- a/modules/apps/29-fee/types/fee.go +++ b/modules/apps/29-fee/types/fee.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/29-fee/types/fee_test.go b/modules/apps/29-fee/types/fee_test.go index 0ff42efb41a..a17b42693b5 100644 --- a/modules/apps/29-fee/types/fee_test.go +++ b/modules/apps/29-fee/types/fee_test.go @@ -3,10 +3,13 @@ package types_test import ( "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" - "github.com/cometbft/cometbft/crypto/secp256k1" + sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" + + "github.com/cometbft/cometbft/crypto/secp256k1" "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ) diff --git a/modules/apps/29-fee/types/genesis.go b/modules/apps/29-fee/types/genesis.go index 69dc5e38178..b6d2143e28a 100644 --- a/modules/apps/29-fee/types/genesis.go +++ b/modules/apps/29-fee/types/genesis.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/apps/29-fee/types/genesis_test.go b/modules/apps/29-fee/types/genesis_test.go index 6ecde68c3a6..082efe4dd3e 100644 --- a/modules/apps/29-fee/types/genesis_test.go +++ b/modules/apps/29-fee/types/genesis_test.go @@ -3,10 +3,12 @@ package types_test import ( "testing" - "github.com/cometbft/cometbft/crypto/secp256k1" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go index c66c6ba7aa6..9063a4101a6 100644 --- a/modules/apps/29-fee/types/msgs.go +++ b/modules/apps/29-fee/types/msgs.go @@ -4,13 +4,30 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" ) +// msg types +const ( + TypeMsgPayPacketFee = "payPacketFee" + TypeMsgPayPacketFeeAsync = "payPacketFeeAsync" +) + +var ( + _ sdk.Msg = (*MsgRegisterPayee)(nil) + _ sdk.Msg = (*MsgRegisterCounterpartyPayee)(nil) + _ sdk.Msg = (*MsgPayPacketFee)(nil) + _ sdk.Msg = (*MsgPayPacketFeeAsync)(nil) + _ legacytx.LegacyMsg = (*MsgPayPacketFee)(nil) + _ legacytx.LegacyMsg = (*MsgPayPacketFeeAsync)(nil) +) + // NewMsgRegisterPayee creates a new instance of MsgRegisterPayee func NewMsgRegisterPayee(portID, channelID, relayerAddr, payeeAddr string) *MsgRegisterPayee { return &MsgRegisterPayee{ @@ -145,12 +162,17 @@ func (msg MsgPayPacketFee) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -// Route implements sdk.Msg +// Type implements legacytx.LegacyMsg +func (msg MsgPayPacketFee) Type() string { + return TypeMsgPayPacketFee +} + +// Route implements legacytx.LegacyMsg func (msg MsgPayPacketFee) Route() string { return RouterKey } -// GetSignBytes implements sdk.Msg. +// GetSignBytes implements legacytx.LegacyMsg func (msg MsgPayPacketFee) GetSignBytes() []byte { return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) } @@ -182,12 +204,17 @@ func (msg MsgPayPacketFeeAsync) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -// Route implements sdk.Msg +// Type implements legacytx.LegacyMsg +func (msg MsgPayPacketFeeAsync) Type() string { + return TypeMsgPayPacketFeeAsync +} + +// Route implements legacytx.LegacyMsg func (msg MsgPayPacketFeeAsync) Route() string { return RouterKey } -// GetSignBytes implements sdk.Msg. +// GetSignBytes implements legacytx.LegacyMsg func (msg MsgPayPacketFeeAsync) GetSignBytes() []byte { return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) } diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go index e20984e228b..fee8c236522 100644 --- a/modules/apps/29-fee/types/msgs_test.go +++ b/modules/apps/29-fee/types/msgs_test.go @@ -3,10 +3,12 @@ package types_test import ( "testing" - "github.com/cometbft/cometbft/crypto/secp256k1" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go index 7067a80cf2b..6c517752734 100644 --- a/modules/apps/29-fee/types/tx.pb.go +++ b/modules/apps/29-fee/types/tx.pb.go @@ -373,49 +373,49 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) } var fileDescriptor_05c93128649f1b96 = []byte{ - // 663 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0x9b, 0xfe, 0x65, 0x5a, 0x28, 0x5d, 0x22, 0xe2, 0x5a, 0xad, 0x5b, 0xa2, 0x82, 0x4a, - 0xa5, 0xd8, 0x24, 0x50, 0x21, 0x2a, 0x21, 0x41, 0x2b, 0x15, 0xf5, 0x50, 0x11, 0xe5, 0xc8, 0xa5, - 0x72, 0xd6, 0x13, 0xd7, 0x90, 0x78, 0x2d, 0xaf, 0x13, 0xe1, 0x1b, 0xe2, 0xc4, 0xb1, 0xbc, 0x41, - 0x1f, 0xa1, 0x17, 0xde, 0xa1, 0xc7, 0x1e, 0x39, 0x21, 0x94, 0x1e, 0xca, 0x13, 0x70, 0x46, 0xb6, - 0xd7, 0xc6, 0x4d, 0xe5, 0x2a, 0x20, 0x71, 0xf3, 0xec, 0x7c, 0xf3, 0xcd, 0x7c, 0x9f, 0x67, 0x6d, - 0x58, 0xb3, 0xdb, 0x54, 0x37, 0x5c, 0xb7, 0x6b, 0x53, 0xc3, 0xb7, 0x99, 0xc3, 0xf5, 0x0e, 0xa2, - 0x3e, 0xa8, 0xeb, 0xfe, 0x07, 0xcd, 0xf5, 0x98, 0xcf, 0x48, 0xc5, 0x6e, 0x53, 0x2d, 0x8b, 0xd0, - 0x3a, 0x88, 0xda, 0xa0, 0xae, 0x94, 0x2d, 0x66, 0xb1, 0x08, 0xa3, 0x87, 0x4f, 0x31, 0x5c, 0xb9, - 0x9f, 0x47, 0x18, 0x56, 0x65, 0x20, 0x94, 0x79, 0xa8, 0xd3, 0x23, 0xc3, 0x71, 0xb0, 0x1b, 0xa6, - 0xc5, 0xa3, 0x80, 0x54, 0x28, 0xe3, 0x3d, 0xc6, 0xf5, 0x1e, 0xb7, 0xc2, 0x64, 0x8f, 0x5b, 0x71, - 0xa2, 0x7a, 0x2c, 0xc1, 0x9d, 0x03, 0x6e, 0xb5, 0xd0, 0xb2, 0xb9, 0x8f, 0x5e, 0xd3, 0x08, 0x10, - 0x49, 0x05, 0x66, 0x5c, 0xe6, 0xf9, 0x87, 0xb6, 0x29, 0x4b, 0x6b, 0xd2, 0x46, 0xa9, 0x35, 0x1d, - 0x86, 0xfb, 0x26, 0x59, 0x01, 0x10, 0xbc, 0x61, 0x6e, 0x22, 0xca, 0x95, 0xc4, 0xc9, 0xbe, 0x49, - 0x64, 0x98, 0xf1, 0xb0, 0x6b, 0x04, 0xe8, 0xc9, 0xc5, 0x28, 0x97, 0x84, 0xa4, 0x0c, 0x53, 0x6e, - 0x48, 0x2d, 0x4f, 0x46, 0xe7, 0x71, 0xb0, 0x5d, 0xfe, 0x7c, 0xb2, 0x5a, 0xf8, 0x79, 0xb2, 0x5a, - 0xf8, 0x74, 0x79, 0xba, 0x99, 0x60, 0xab, 0x0a, 0xc8, 0xa3, 0x13, 0xb5, 0x90, 0xbb, 0xcc, 0xe1, - 0x58, 0xfd, 0x2a, 0xc1, 0x72, 0x26, 0xb9, 0xcb, 0xfa, 0x8e, 0x8f, 0x9e, 0x6b, 0x78, 0x7e, 0xf0, - 0xbf, 0x46, 0xaf, 0x01, 0xa1, 0x99, 0x36, 0x87, 0x59, 0x1d, 0x8b, 0x74, 0x74, 0x80, 0x1c, 0x4d, - 0x0f, 0x61, 0xfd, 0xa6, 0xb1, 0x53, 0x7d, 0x43, 0x09, 0x16, 0x0e, 0xb8, 0xd5, 0x34, 0x82, 0xa6, - 0x41, 0xdf, 0xa3, 0xbf, 0x87, 0x48, 0x9e, 0x42, 0xb1, 0x83, 0x18, 0xc9, 0x99, 0x6b, 0x2c, 0x6b, - 0x39, 0xeb, 0xa3, 0xed, 0x21, 0xee, 0x4c, 0x9e, 0x7d, 0x5f, 0x2d, 0xb4, 0x42, 0x38, 0x59, 0x87, - 0xdb, 0x9c, 0xf5, 0x3d, 0x8a, 0x87, 0x89, 0x1f, 0xb1, 0xe6, 0xf9, 0xf8, 0xb4, 0x19, 0xbb, 0xb2, - 0x09, 0x8b, 0x02, 0x95, 0x31, 0x27, 0x36, 0x60, 0x21, 0x4e, 0xec, 0xa6, 0x16, 0xdd, 0x83, 0x69, - 0x6e, 0x5b, 0x0e, 0x7a, 0x42, 0xbc, 0x88, 0x88, 0x02, 0xb3, 0x42, 0x26, 0x97, 0xa7, 0xd6, 0x8a, - 0x1b, 0xa5, 0x56, 0x1a, 0x6f, 0xdf, 0xcd, 0xba, 0x21, 0x0a, 0xaa, 0x4b, 0x50, 0x19, 0xd1, 0x98, - 0xea, 0x3f, 0x93, 0xa0, 0x3c, 0x92, 0x7b, 0xc5, 0x03, 0x87, 0x92, 0x97, 0x50, 0x72, 0xa3, 0x93, - 0xe4, 0xcd, 0xce, 0x35, 0x56, 0x22, 0x2b, 0xc2, 0xbd, 0xd7, 0x92, 0x65, 0x1f, 0xd4, 0xb5, 0xb8, - 0x6e, 0xdf, 0x14, 0x5e, 0xcc, 0xba, 0x22, 0x26, 0xaf, 0x01, 0x04, 0x43, 0xe8, 0xe6, 0x44, 0x44, - 0x51, 0xcd, 0x75, 0x33, 0x6d, 0x2f, 0x78, 0x44, 0xf7, 0x3d, 0xc4, 0xed, 0x07, 0x59, 0x4d, 0xf2, - 0x1f, 0x4e, 0xcd, 0xc3, 0x4e, 0xdf, 0x31, 0x0d, 0xd3, 0xf4, 0x90, 0xf3, 0xaa, 0x1a, 0x6d, 0xea, - 0x35, 0x25, 0x89, 0xd4, 0xc6, 0xaf, 0x22, 0x14, 0x0f, 0xb8, 0x45, 0x7a, 0x70, 0xeb, 0xea, 0xed, - 0x7b, 0x94, 0x3b, 0xd4, 0xe8, 0xb5, 0x50, 0xea, 0x63, 0x43, 0x93, 0xb6, 0xe4, 0x8b, 0x04, 0x4b, - 0xf9, 0xd7, 0x67, 0x6b, 0x1c, 0xc2, 0x6b, 0x65, 0xca, 0x8b, 0x7f, 0x2a, 0x4b, 0x67, 0x7a, 0x07, - 0xf3, 0x57, 0x36, 0x7e, 0xe3, 0x26, 0xba, 0x2c, 0x52, 0x79, 0x3c, 0x2e, 0x32, 0xed, 0x15, 0xc0, - 0xe2, 0xf5, 0xed, 0xaa, 0x8d, 0x4b, 0x13, 0xc1, 0x95, 0xad, 0xbf, 0x82, 0x27, 0xad, 0x95, 0xa9, - 0x8f, 0x97, 0xa7, 0x9b, 0xd2, 0xce, 0x9b, 0xb3, 0xa1, 0x2a, 0x9d, 0x0f, 0x55, 0xe9, 0xc7, 0x50, - 0x95, 0x8e, 0x2f, 0xd4, 0xc2, 0xf9, 0x85, 0x5a, 0xf8, 0x76, 0xa1, 0x16, 0xde, 0x6e, 0x59, 0xb6, - 0x7f, 0xd4, 0x6f, 0x6b, 0x94, 0xf5, 0x74, 0xf1, 0xc1, 0xb6, 0xdb, 0xb4, 0x66, 0x31, 0x7d, 0xf0, - 0x4c, 0xef, 0x31, 0xb3, 0xdf, 0x45, 0x1e, 0xfe, 0x0b, 0xb8, 0xde, 0x78, 0x5e, 0x0b, 0x7f, 0x03, - 0x7e, 0xe0, 0x22, 0x6f, 0x4f, 0x47, 0x9f, 0xf2, 0x27, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa4, - 0xad, 0x40, 0x2c, 0x7c, 0x06, 0x00, 0x00, + // 661 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcf, 0x4e, 0xdb, 0x4e, + 0x10, 0x8e, 0x09, 0xff, 0x32, 0xf0, 0xfb, 0x01, 0x2b, 0xd4, 0x18, 0x0b, 0x0c, 0x44, 0xa8, 0xa2, + 0x48, 0xb1, 0x9b, 0xb4, 0xa8, 0x2a, 0x52, 0xa5, 0x16, 0x24, 0x2a, 0x0e, 0xa8, 0x51, 0x8e, 0xbd, + 0x20, 0x67, 0x3d, 0x31, 0x6e, 0x13, 0xaf, 0xe5, 0x75, 0xa2, 0xfa, 0x56, 0xf5, 0xd4, 0x43, 0x0f, + 0xed, 0x1b, 0xf4, 0x11, 0xe8, 0x3b, 0xf4, 0xc0, 0x91, 0x63, 0x4f, 0xa8, 0x82, 0x03, 0x6f, 0xd0, + 0x73, 0xb5, 0xf6, 0xda, 0x35, 0xa1, 0x41, 0x69, 0xa5, 0xde, 0x3c, 0x3b, 0xdf, 0x7e, 0x33, 0xdf, + 0xe7, 0xd9, 0x81, 0x35, 0xb7, 0x45, 0x4d, 0xcb, 0xf7, 0x3b, 0x2e, 0xb5, 0x42, 0x97, 0x79, 0xdc, + 0x6c, 0x23, 0x9a, 0xfd, 0x9a, 0x19, 0xbe, 0x31, 0xfc, 0x80, 0x85, 0x8c, 0x94, 0xdd, 0x16, 0x35, + 0xf2, 0x08, 0xa3, 0x8d, 0x68, 0xf4, 0x6b, 0xda, 0xa2, 0xc3, 0x1c, 0x16, 0x63, 0x4c, 0xf1, 0x95, + 0xc0, 0xb5, 0xf5, 0x61, 0x84, 0xe2, 0x56, 0x0e, 0x42, 0x59, 0x80, 0x26, 0x3d, 0xb6, 0x3c, 0x0f, + 0x3b, 0x22, 0x2d, 0x3f, 0x25, 0xa4, 0x4c, 0x19, 0xef, 0x32, 0x6e, 0x76, 0xb9, 0x23, 0x92, 0x5d, + 0xee, 0x24, 0x89, 0xca, 0x07, 0x05, 0xe6, 0x0f, 0xb9, 0xd3, 0x44, 0xc7, 0xe5, 0x21, 0x06, 0x0d, + 0x2b, 0x42, 0x24, 0x65, 0x98, 0xf2, 0x59, 0x10, 0x1e, 0xb9, 0xb6, 0xaa, 0xac, 0x29, 0x9b, 0xa5, + 0xe6, 0xa4, 0x08, 0x0f, 0x6c, 0xb2, 0x02, 0x20, 0x79, 0x45, 0x6e, 0x2c, 0xce, 0x95, 0xe4, 0xc9, + 0x81, 0x4d, 0x54, 0x98, 0x0a, 0xb0, 0x63, 0x45, 0x18, 0xa8, 0xc5, 0x38, 0x97, 0x86, 0x64, 0x11, + 0x26, 0x7c, 0x41, 0xad, 0x8e, 0xc7, 0xe7, 0x49, 0xb0, 0x33, 0xff, 0xfe, 0xf3, 0x6a, 0xe1, 0xdd, + 0xd5, 0xc9, 0x56, 0x8a, 0xab, 0x68, 0xa0, 0x0e, 0x76, 0xd3, 0x44, 0xee, 0x33, 0x8f, 0x63, 0xe5, + 0x8b, 0x02, 0xcb, 0xb9, 0xe4, 0x1e, 0xeb, 0x79, 0x21, 0x06, 0xbe, 0x15, 0x84, 0xd1, 0xbf, 0x6a, + 0xbb, 0x0a, 0x84, 0xe6, 0xca, 0x1c, 0xe5, 0x35, 0x2c, 0xd0, 0xc1, 0x06, 0x7e, 0xa3, 0xe7, 0x2e, + 0x6c, 0xdc, 0xd6, 0x72, 0xa6, 0xed, 0x5c, 0x81, 0xb9, 0x43, 0xee, 0x34, 0xac, 0xa8, 0x61, 0xd1, + 0xd7, 0x18, 0xee, 0x23, 0x92, 0x87, 0x50, 0x6c, 0x23, 0xc6, 0x52, 0x66, 0xea, 0xcb, 0xc6, 0x90, + 0xb1, 0x31, 0xf6, 0x11, 0x77, 0xc7, 0x4f, 0xcf, 0x57, 0x0b, 0x4d, 0x01, 0x27, 0x1b, 0xf0, 0x3f, + 0x67, 0xbd, 0x80, 0xe2, 0x51, 0xea, 0x45, 0xa2, 0x77, 0x36, 0x39, 0x6d, 0x24, 0x8e, 0x6c, 0xc1, + 0x82, 0x44, 0xe5, 0x8c, 0x49, 0xc4, 0xcf, 0x25, 0x89, 0xbd, 0xcc, 0x9e, 0x3b, 0x30, 0xc9, 0x5d, + 0xc7, 0xc3, 0x40, 0x0a, 0x97, 0x11, 0xd1, 0x60, 0x5a, 0xca, 0xe4, 0xea, 0xc4, 0x5a, 0x71, 0xb3, + 0xd4, 0xcc, 0xe2, 0x9d, 0xb9, 0xd4, 0x09, 0x09, 0xae, 0x2c, 0x41, 0x79, 0x40, 0x5f, 0xa6, 0xfd, + 0xab, 0x02, 0x8b, 0x03, 0xb9, 0x67, 0x3c, 0xf2, 0x28, 0x79, 0x0a, 0x25, 0x3f, 0x3e, 0x49, 0xff, + 0xe8, 0x4c, 0x7d, 0x25, 0xb6, 0x41, 0xcc, 0xba, 0x91, 0x0e, 0x78, 0xbf, 0x66, 0x24, 0xf7, 0x0e, + 0x6c, 0xe9, 0xc3, 0xb4, 0x2f, 0x63, 0xf2, 0x1c, 0x40, 0x32, 0x08, 0x27, 0xc7, 0x62, 0x8a, 0xca, + 0x50, 0x27, 0xb3, 0xf2, 0x92, 0x47, 0x56, 0xdf, 0x47, 0xdc, 0x59, 0x4f, 0xf5, 0xa8, 0xbf, 0xf8, + 0x8c, 0x00, 0xdb, 0x3d, 0xcf, 0xb6, 0x6c, 0x3b, 0x40, 0xce, 0x2b, 0x7a, 0x3c, 0x9d, 0x37, 0x54, + 0xa4, 0x32, 0xeb, 0x3f, 0x8a, 0x50, 0x3c, 0xe4, 0x0e, 0xe9, 0xc2, 0x7f, 0xd7, 0x5f, 0xdb, 0xbd, + 0xa1, 0x0d, 0x0d, 0x3e, 0x05, 0xad, 0x36, 0x32, 0x34, 0x2d, 0x4b, 0x3e, 0x29, 0xb0, 0x34, 0xfc, + 0xc9, 0x6c, 0x8f, 0x42, 0x78, 0xe3, 0x9a, 0xf6, 0xe4, 0xaf, 0xae, 0x65, 0x3d, 0xbd, 0x82, 0xd9, + 0x6b, 0x93, 0xbe, 0x79, 0x1b, 0x5d, 0x1e, 0xa9, 0xdd, 0x1f, 0x15, 0x99, 0xd5, 0x8a, 0x60, 0xe1, + 0xe6, 0x64, 0x55, 0x47, 0xa5, 0x89, 0xe1, 0xda, 0xf6, 0x1f, 0xc1, 0xd3, 0xd2, 0xda, 0xc4, 0xdb, + 0xab, 0x93, 0x2d, 0x65, 0xf7, 0xc5, 0xe9, 0x85, 0xae, 0x9c, 0x5d, 0xe8, 0xca, 0xf7, 0x0b, 0x5d, + 0xf9, 0x78, 0xa9, 0x17, 0xce, 0x2e, 0xf5, 0xc2, 0xb7, 0x4b, 0xbd, 0xf0, 0x72, 0xdb, 0x71, 0xc3, + 0xe3, 0x5e, 0xcb, 0xa0, 0xac, 0x6b, 0xca, 0x05, 0xed, 0xb6, 0x68, 0xd5, 0x61, 0x66, 0xff, 0x91, + 0xd9, 0x65, 0x76, 0xaf, 0x83, 0x5c, 0xec, 0x7e, 0x6e, 0xd6, 0x1f, 0x57, 0xc5, 0xda, 0x0f, 0x23, + 0x1f, 0x79, 0x6b, 0x32, 0x5e, 0xdd, 0x0f, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x07, 0x0e, 0x63, + 0x53, 0x6c, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/transfer/client/cli/cli.go b/modules/apps/transfer/client/cli/cli.go index 8412c331fc8..a0fe3564b60 100644 --- a/modules/apps/transfer/client/cli/cli.go +++ b/modules/apps/transfer/client/cli/cli.go @@ -1,8 +1,9 @@ package cli import ( - "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" ) // GetQueryCmd returns the query commands for IBC connections diff --git a/modules/apps/transfer/client/cli/query.go b/modules/apps/transfer/client/cli/query.go index 8ebab138c66..c81e6ee921d 100644 --- a/modules/apps/transfer/client/cli/query.go +++ b/modules/apps/transfer/client/cli/query.go @@ -3,10 +3,11 @@ package cli import ( "fmt" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) diff --git a/modules/apps/transfer/client/cli/tx.go b/modules/apps/transfer/client/cli/tx.go index c9024f03886..acd80760f88 100644 --- a/modules/apps/transfer/client/cli/tx.go +++ b/modules/apps/transfer/client/cli/tx.go @@ -6,12 +6,13 @@ import ( "strings" "time" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clientutils "github.com/cosmos/ibc-go/v7/modules/core/02-client/client/utils" diff --git a/modules/apps/transfer/ibc_module.go b/modules/apps/transfer/ibc_module.go index 1d5afed8935..41fdd604926 100644 --- a/modules/apps/transfer/ibc_module.go +++ b/modules/apps/transfer/ibc_module.go @@ -6,9 +6,10 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/transfer/ibc_module_test.go b/modules/apps/transfer/ibc_module_test.go index e62f7b421b7..4988d52b0af 100644 --- a/modules/apps/transfer/ibc_module_test.go +++ b/modules/apps/transfer/ibc_module_test.go @@ -4,7 +4,6 @@ import ( "math" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/cosmos/ibc-go/v7/modules/apps/transfer" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/transfer/keeper/genesis_test.go b/modules/apps/transfer/keeper/genesis_test.go index 8b8aac62c67..b2e42d367ba 100644 --- a/modules/apps/transfer/keeper/genesis_test.go +++ b/modules/apps/transfer/keeper/genesis_test.go @@ -4,6 +4,7 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/modules/apps/transfer/keeper/grpc_query.go b/modules/apps/transfer/keeper/grpc_query.go index 87648d2f9dc..f33db868d35 100644 --- a/modules/apps/transfer/keeper/grpc_query.go +++ b/modules/apps/transfer/keeper/grpc_query.go @@ -5,12 +5,14 @@ import ( "fmt" "strings" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) diff --git a/modules/apps/transfer/keeper/grpc_query_test.go b/modules/apps/transfer/keeper/grpc_query_test.go index ae741a9b714..8df7babc69c 100644 --- a/modules/apps/transfer/keeper/grpc_query_test.go +++ b/modules/apps/transfer/keeper/grpc_query_test.go @@ -4,6 +4,7 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/modules/apps/transfer/keeper/invariants_test.go b/modules/apps/transfer/keeper/invariants_test.go index 28c2f9f0e2d..dd459db6de2 100644 --- a/modules/apps/transfer/keeper/invariants_test.go +++ b/modules/apps/transfer/keeper/invariants_test.go @@ -2,6 +2,7 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" diff --git a/modules/apps/transfer/keeper/keeper.go b/modules/apps/transfer/keeper/keeper.go index 4e5760cbf5b..be5ccd148ed 100644 --- a/modules/apps/transfer/keeper/keeper.go +++ b/modules/apps/transfer/keeper/keeper.go @@ -5,15 +5,17 @@ import ( "strings" sdkmath "cosmossdk.io/math" - tmbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" + "github.com/cometbft/cometbft/libs/log" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/apps/transfer/keeper/keeper_test.go b/modules/apps/transfer/keeper/keeper_test.go index fc469b06c75..ead002a72c2 100644 --- a/modules/apps/transfer/keeper/keeper_test.go +++ b/modules/apps/transfer/keeper/keeper_test.go @@ -4,12 +4,14 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/suite" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" diff --git a/modules/apps/transfer/keeper/mbt_relay_test.go b/modules/apps/transfer/keeper/mbt_relay_test.go index 80a99eada08..aad7366dcca 100644 --- a/modules/apps/transfer/keeper/mbt_relay_test.go +++ b/modules/apps/transfer/keeper/mbt_relay_test.go @@ -13,9 +13,11 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - "github.com/cometbft/cometbft/crypto" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cometbft/cometbft/crypto" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/apps/transfer/keeper/migrations_test.go b/modules/apps/transfer/keeper/migrations_test.go index 577fe8d2ba6..9548052c437 100644 --- a/modules/apps/transfer/keeper/migrations_test.go +++ b/modules/apps/transfer/keeper/migrations_test.go @@ -4,6 +4,7 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" diff --git a/modules/apps/transfer/keeper/msg_server.go b/modules/apps/transfer/keeper/msg_server.go index f930c929b42..41961e57261 100644 --- a/modules/apps/transfer/keeper/msg_server.go +++ b/modules/apps/transfer/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/modules/apps/transfer/keeper/msg_server_test.go b/modules/apps/transfer/keeper/msg_server_test.go index 73c94bc0ca3..552d43be0d4 100644 --- a/modules/apps/transfer/keeper/msg_server_test.go +++ b/modules/apps/transfer/keeper/msg_server_test.go @@ -2,11 +2,12 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibctesting "github.com/cosmos/ibc-go/v7/testing" ) // TestMsgTransfer tests Transfer rpc handler diff --git a/modules/apps/transfer/keeper/relay.go b/modules/apps/transfer/keeper/relay.go index 0bef4fa81f9..f6abdd61bd2 100644 --- a/modules/apps/transfer/keeper/relay.go +++ b/modules/apps/transfer/keeper/relay.go @@ -4,9 +4,11 @@ import ( "fmt" "strings" + metrics "github.com/armon/go-metrics" + errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - metrics "github.com/armon/go-metrics" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/apps/transfer/keeper/relay_test.go b/modules/apps/transfer/keeper/relay_test.go index 57f594d4711..6d723cd107c 100644 --- a/modules/apps/transfer/keeper/relay_test.go +++ b/modules/apps/transfer/keeper/relay_test.go @@ -4,6 +4,7 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" diff --git a/modules/apps/transfer/module.go b/modules/apps/transfer/module.go index 43359bf9681..8d84ff0311b 100644 --- a/modules/apps/transfer/module.go +++ b/modules/apps/transfer/module.go @@ -5,15 +5,17 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/client/cli" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" diff --git a/modules/apps/transfer/simulation/decoder_test.go b/modules/apps/transfer/simulation/decoder_test.go index 26d7dbf4b94..72dd721fac4 100644 --- a/modules/apps/transfer/simulation/decoder_test.go +++ b/modules/apps/transfer/simulation/decoder_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/types/kv" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/simulation" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/cosmos/ibc-go/v7/testing/simapp" diff --git a/modules/apps/transfer/simulation/genesis_test.go b/modules/apps/transfer/simulation/genesis_test.go index 6b56251e97f..11c61aca767 100644 --- a/modules/apps/transfer/simulation/genesis_test.go +++ b/modules/apps/transfer/simulation/genesis_test.go @@ -5,13 +5,15 @@ import ( "math/rand" "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/simulation" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" diff --git a/modules/apps/transfer/transfer_test.go b/modules/apps/transfer/transfer_test.go index eec87eb60cd..74315f35fd6 100644 --- a/modules/apps/transfer/transfer_test.go +++ b/modules/apps/transfer/transfer_test.go @@ -3,9 +3,11 @@ package transfer_test import ( "testing" + "github.com/stretchr/testify/suite" + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/apps/transfer/types/codec.go b/modules/apps/transfer/types/codec.go index 2d66ca534a7..e04fb6fab0c 100644 --- a/modules/apps/transfer/types/codec.go +++ b/modules/apps/transfer/types/codec.go @@ -3,7 +3,6 @@ package types import ( "bytes" - "github.com/cosmos/cosmos-sdk/x/authz" "github.com/cosmos/gogoproto/jsonpb" "github.com/cosmos/gogoproto/proto" @@ -11,6 +10,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" + "github.com/cosmos/cosmos-sdk/x/authz" ) // RegisterLegacyAminoCodec registers the necessary x/ibc transfer interfaces and concrete types diff --git a/modules/apps/transfer/types/coin.go b/modules/apps/transfer/types/coin.go index 6799b763013..fad6532af81 100644 --- a/modules/apps/transfer/types/coin.go +++ b/modules/apps/transfer/types/coin.go @@ -5,6 +5,7 @@ import ( "strings" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/modules/apps/transfer/types/expected_keepers.go b/modules/apps/transfer/types/expected_keepers.go index 389d423a18f..e4997fd879f 100644 --- a/modules/apps/transfer/types/expected_keepers.go +++ b/modules/apps/transfer/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/apps/transfer/types/msgs.go b/modules/apps/transfer/types/msgs.go index a9d9c1d7adf..08eeaff89f9 100644 --- a/modules/apps/transfer/types/msgs.go +++ b/modules/apps/transfer/types/msgs.go @@ -4,14 +4,25 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" ) -var _ sdk.Msg = (*MsgUpdateParams)(nil) +// msg types +const ( + TypeMsgTransfer = "transfer" +) + +var ( + _ sdk.Msg = (*MsgUpdateParams)(nil) + _ sdk.Msg = (*MsgTransfer)(nil) + _ legacytx.LegacyMsg = (*MsgTransfer)(nil) +) // NewMsgUpdateParams creates a new MsgUpdateParams instance func NewMsgUpdateParams(authority string, params Params) *MsgUpdateParams { @@ -60,7 +71,12 @@ func NewMsgTransfer( } } -// Route implements sdk.Msg +// Type implements legacytx.LegacyMsg +func (MsgTransfer) Type() string { + return TypeMsgTransfer +} + +// Route implements legacytx.LegacyMsg func (MsgTransfer) Route() string { return RouterKey } @@ -93,7 +109,7 @@ func (msg MsgTransfer) ValidateBasic() error { return ValidateIBCDenom(msg.Token.Denom) } -// GetSignBytes implements sdk.Msg. +// GetSignBytes implements legacytx.LegacyMsg func (msg MsgTransfer) GetSignBytes() []byte { return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) } diff --git a/modules/apps/transfer/types/msgs_test.go b/modules/apps/transfer/types/msgs_test.go index 22423d403f9..b967e699fa8 100644 --- a/modules/apps/transfer/types/msgs_test.go +++ b/modules/apps/transfer/types/msgs_test.go @@ -4,10 +4,12 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/apps/transfer/types/packet.go b/modules/apps/transfer/types/packet.go index 92e60a646ea..66f3e5730e1 100644 --- a/modules/apps/transfer/types/packet.go +++ b/modules/apps/transfer/types/packet.go @@ -6,6 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" diff --git a/modules/apps/transfer/types/trace.go b/modules/apps/transfer/types/trace.go index 2c9581d9078..f539ba65cf4 100644 --- a/modules/apps/transfer/types/trace.go +++ b/modules/apps/transfer/types/trace.go @@ -8,9 +8,11 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + + sdk "github.com/cosmos/cosmos-sdk/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" tmtypes "github.com/cometbft/cometbft/types" - sdk "github.com/cosmos/cosmos-sdk/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/apps/transfer/types/transfer_authorization.go b/modules/apps/transfer/types/transfer_authorization.go index 119b148e8cb..c276064e422 100644 --- a/modules/apps/transfer/types/transfer_authorization.go +++ b/modules/apps/transfer/types/transfer_authorization.go @@ -5,6 +5,7 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" diff --git a/modules/apps/transfer/types/transfer_authorization_test.go b/modules/apps/transfer/types/transfer_authorization_test.go index eb50f2e5f8a..da2764cba39 100644 --- a/modules/apps/transfer/types/transfer_authorization_test.go +++ b/modules/apps/transfer/types/transfer_authorization_test.go @@ -2,8 +2,10 @@ package types_test import ( sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/cosmos/ibc-go/v7/testing/mock" diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go index 4b610121694..95069745f2c 100644 --- a/modules/apps/transfer/types/tx.pb.go +++ b/modules/apps/transfer/types/tx.pb.go @@ -127,13 +127,6 @@ func (m *MsgTransferResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgTransferResponse proto.InternalMessageInfo -func (m *MsgTransferResponse) GetSequence() uint64 { - if m != nil { - return m.Sequence - } - return 0 -} - // MsgUpdateParams is the Msg/UpdateParams request type. type MsgUpdateParams struct { // authority is the address that controls the module (defaults to x/gov unless overwritten). @@ -177,20 +170,6 @@ func (m *MsgUpdateParams) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // MsgUpdateParamsResponse defines the response structure for executing a // MsgUpdateParams message. type MsgUpdateParamsResponse struct { @@ -243,42 +222,42 @@ func init() { var fileDescriptor_7401ed9bed2f8e09 = []byte{ // 589 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x4f, 0xd4, 0x40, - 0x14, 0xde, 0xc2, 0xb2, 0xc2, 0xac, 0xa0, 0x0e, 0x46, 0x4a, 0x43, 0xba, 0x64, 0x23, 0x09, 0x42, + 0x14, 0xde, 0xc2, 0xb2, 0xc2, 0xac, 0x80, 0x8e, 0x46, 0x4a, 0x43, 0xba, 0x64, 0x23, 0x09, 0x42, 0x98, 0x49, 0x31, 0x84, 0x84, 0x23, 0x1c, 0xf4, 0x42, 0x82, 0x1b, 0xbc, 0x78, 0x21, 0xed, 0xf0, - 0x6c, 0x27, 0x6e, 0x3b, 0x75, 0x66, 0xda, 0xc8, 0xcd, 0xe8, 0xc5, 0xa3, 0x3f, 0x81, 0x9f, 0xc0, - 0xcf, 0xe0, 0xc8, 0xd1, 0x93, 0x1a, 0x38, 0xe0, 0xc1, 0x1f, 0x61, 0x3a, 0x9d, 0x2e, 0xab, 0x07, - 0xd4, 0x53, 0x67, 0xbe, 0xf7, 0xbd, 0xf7, 0xbe, 0xf7, 0x4d, 0x1f, 0x5a, 0xe1, 0x11, 0xa3, 0x61, - 0x9e, 0x0f, 0x39, 0x0b, 0x35, 0x17, 0x99, 0xa2, 0x5a, 0x86, 0x99, 0x7a, 0x0d, 0x92, 0x96, 0x01, - 0xd5, 0xef, 0x48, 0x2e, 0x85, 0x16, 0x78, 0x89, 0x47, 0x8c, 0x8c, 0xd3, 0x48, 0x43, 0x23, 0x65, - 0xe0, 0x3d, 0x8c, 0x45, 0x2c, 0x0c, 0x91, 0x56, 0xa7, 0x3a, 0xc7, 0x5b, 0x60, 0x42, 0xa5, 0x42, - 0xd1, 0x54, 0xc5, 0x55, 0xad, 0x54, 0xc5, 0x36, 0xe0, 0xdb, 0x40, 0x14, 0x2a, 0xa0, 0x65, 0x10, - 0x81, 0x0e, 0x03, 0xca, 0x04, 0xcf, 0x6c, 0xbc, 0x57, 0x69, 0x62, 0x42, 0x02, 0x65, 0x43, 0x0e, - 0x99, 0xae, 0xb2, 0xeb, 0x93, 0x25, 0xac, 0xdf, 0x2e, 0xba, 0x51, 0x66, 0xc8, 0xfd, 0x6f, 0x13, - 0xa8, 0xbb, 0xaf, 0xe2, 0x43, 0x8b, 0xe2, 0x1e, 0xea, 0x2a, 0x51, 0x48, 0x06, 0x47, 0xb9, 0x90, - 0xda, 0x75, 0x96, 0x9d, 0xd5, 0x99, 0x01, 0xaa, 0xa1, 0x03, 0x21, 0x35, 0x5e, 0x41, 0x73, 0x96, - 0xc0, 0x92, 0x30, 0xcb, 0x60, 0xe8, 0x4e, 0x18, 0xce, 0x6c, 0x8d, 0xee, 0xd5, 0x20, 0xde, 0x42, - 0x53, 0x5a, 0xbc, 0x81, 0xcc, 0x9d, 0x5c, 0x76, 0x56, 0xbb, 0x9b, 0x8b, 0xa4, 0x9e, 0x8a, 0x54, - 0x53, 0x11, 0x3b, 0x15, 0xd9, 0x13, 0x3c, 0xdb, 0x6d, 0x9f, 0x7f, 0xed, 0xb5, 0x06, 0x35, 0x1b, - 0x3f, 0x42, 0x1d, 0x05, 0xd9, 0x31, 0x48, 0xb7, 0x6d, 0xaa, 0xda, 0x1b, 0xf6, 0xd0, 0xb4, 0x04, - 0x06, 0xbc, 0x04, 0xe9, 0x4e, 0x99, 0xc8, 0xe8, 0x8e, 0x9f, 0xa1, 0x39, 0xcd, 0x53, 0x10, 0x85, - 0x3e, 0x4a, 0x80, 0xc7, 0x89, 0x76, 0x3b, 0xa6, 0xa7, 0x47, 0xaa, 0x67, 0xa9, 0x9c, 0x22, 0xd6, - 0x9f, 0x32, 0x20, 0xcf, 0x0d, 0xc3, 0x36, 0x9d, 0xb5, 0x79, 0x35, 0x88, 0xd7, 0xd1, 0x83, 0xa6, - 0x50, 0xf5, 0x55, 0x3a, 0x4c, 0x73, 0xf7, 0xce, 0xb2, 0xb3, 0xda, 0x1e, 0xdc, 0xb7, 0x81, 0xc3, - 0x06, 0xc7, 0x18, 0xb5, 0x53, 0x48, 0x85, 0x3b, 0x6d, 0xd4, 0x98, 0xf3, 0xce, 0xfc, 0xa7, 0xd3, - 0x5e, 0xeb, 0xc7, 0x69, 0xaf, 0xf5, 0xe1, 0xfa, 0x6c, 0xcd, 0x4a, 0xef, 0x07, 0x68, 0x7e, 0xcc, - 0xe0, 0x01, 0xa8, 0x5c, 0x64, 0x0a, 0xaa, 0x89, 0x14, 0xbc, 0x2d, 0x20, 0x63, 0x60, 0x5c, 0x6e, - 0x0f, 0x46, 0xf7, 0xfe, 0x47, 0x07, 0xdd, 0xdb, 0x57, 0xf1, 0xcb, 0xfc, 0x38, 0xd4, 0x70, 0x10, - 0xca, 0x30, 0x55, 0x78, 0x09, 0xcd, 0x84, 0x85, 0x4e, 0x84, 0xe4, 0xfa, 0xc4, 0x3e, 0xcb, 0x0d, - 0x80, 0x77, 0x51, 0x27, 0x37, 0x3c, 0xf3, 0x1a, 0xdd, 0xcd, 0xc7, 0xe4, 0xb6, 0x5f, 0x92, 0xd4, - 0x35, 0xad, 0x0b, 0x36, 0x73, 0x67, 0xae, 0x52, 0x7d, 0x53, 0xb3, 0xbf, 0x88, 0x16, 0xfe, 0x10, - 0xd1, 0x88, 0xdf, 0xfc, 0xe9, 0xa0, 0xc9, 0x7d, 0x15, 0xe3, 0x04, 0x4d, 0x8f, 0xfe, 0x9c, 0x27, - 0xb7, 0xb7, 0x1c, 0xf3, 0xc0, 0x0b, 0xfe, 0x99, 0x3a, 0xb2, 0x4b, 0xa3, 0xbb, 0xbf, 0xd9, 0xb1, - 0xf1, 0xd7, 0x12, 0xe3, 0x74, 0x6f, 0xeb, 0xbf, 0xe8, 0x4d, 0x57, 0x6f, 0xea, 0xfd, 0xf5, 0xd9, - 0x9a, 0xb3, 0xfb, 0xe2, 0xfc, 0xd2, 0x77, 0x2e, 0x2e, 0x7d, 0xe7, 0xfb, 0xa5, 0xef, 0x7c, 0xbe, - 0xf2, 0x5b, 0x17, 0x57, 0x7e, 0xeb, 0xcb, 0x95, 0xdf, 0x7a, 0xb5, 0x1d, 0x73, 0x9d, 0x14, 0x11, - 0x61, 0x22, 0xa5, 0x76, 0x6f, 0x79, 0xc4, 0x36, 0x62, 0x41, 0xcb, 0x6d, 0x9a, 0x8a, 0xe3, 0x62, - 0x08, 0xaa, 0xda, 0xc5, 0xb1, 0x1d, 0xd4, 0x27, 0x39, 0xa8, 0xa8, 0x63, 0xd6, 0xef, 0xe9, 0xaf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x13, 0x85, 0x07, 0x62, 0x04, 0x00, 0x00, + 0x6c, 0x27, 0x6e, 0x3b, 0x75, 0x66, 0xda, 0xc8, 0xcd, 0x78, 0xd1, 0xa3, 0x3f, 0xc1, 0x9f, 0xc0, + 0xcf, 0xe0, 0xc8, 0xd1, 0xc4, 0xc4, 0x18, 0x38, 0x70, 0xf1, 0x47, 0x98, 0x4e, 0xa7, 0xcb, 0xea, + 0x61, 0xd5, 0x53, 0x67, 0xde, 0xfb, 0xde, 0xf7, 0xbe, 0xf7, 0x4d, 0x1f, 0x5a, 0xe3, 0x11, 0xa3, + 0x61, 0x9e, 0x0f, 0x39, 0x0b, 0x35, 0x17, 0x99, 0xa2, 0x5a, 0x86, 0x99, 0x7a, 0x0d, 0x92, 0x96, + 0x01, 0xd5, 0xef, 0x48, 0x2e, 0x85, 0x16, 0x78, 0x85, 0x47, 0x8c, 0x8c, 0xc3, 0x48, 0x03, 0x23, + 0x65, 0xe0, 0x3d, 0x8c, 0x45, 0x2c, 0x0c, 0x90, 0x56, 0xa7, 0xba, 0xc6, 0x5b, 0x62, 0x42, 0xa5, + 0x42, 0xd1, 0x54, 0xc5, 0x15, 0x57, 0xaa, 0x62, 0x9b, 0xf0, 0x6d, 0x22, 0x0a, 0x15, 0xd0, 0x32, + 0x88, 0x40, 0x87, 0x01, 0x65, 0x82, 0x67, 0x36, 0xdf, 0xab, 0x34, 0x31, 0x21, 0x81, 0xb2, 0x21, + 0x87, 0x4c, 0x57, 0xd5, 0xf5, 0xc9, 0x02, 0x36, 0x27, 0x8b, 0x6e, 0x94, 0x19, 0x70, 0xff, 0xdb, + 0x14, 0xea, 0x1e, 0xaa, 0xf8, 0xd8, 0x46, 0x71, 0x0f, 0x75, 0x95, 0x28, 0x24, 0x83, 0x93, 0x5c, + 0x48, 0xed, 0x3a, 0xab, 0xce, 0xfa, 0xdc, 0x00, 0xd5, 0xa1, 0x23, 0x21, 0x35, 0x5e, 0x43, 0x0b, + 0x16, 0xc0, 0x92, 0x30, 0xcb, 0x60, 0xe8, 0x4e, 0x19, 0xcc, 0x7c, 0x1d, 0x3d, 0xa8, 0x83, 0x78, + 0x07, 0xcd, 0x68, 0xf1, 0x06, 0x32, 0x77, 0x7a, 0xd5, 0x59, 0xef, 0x6e, 0x2f, 0x93, 0x7a, 0x2a, + 0x52, 0x4d, 0x45, 0xec, 0x54, 0xe4, 0x40, 0xf0, 0x6c, 0xbf, 0x7d, 0xf1, 0xbd, 0xd7, 0x1a, 0xd4, + 0x68, 0xfc, 0x08, 0x75, 0x14, 0x64, 0xa7, 0x20, 0xdd, 0xb6, 0x61, 0xb5, 0x37, 0xec, 0xa1, 0x59, + 0x09, 0x0c, 0x78, 0x09, 0xd2, 0x9d, 0x31, 0x99, 0xd1, 0x1d, 0x3f, 0x43, 0x0b, 0x9a, 0xa7, 0x20, + 0x0a, 0x7d, 0x92, 0x00, 0x8f, 0x13, 0xed, 0x76, 0x4c, 0x4f, 0x8f, 0x54, 0xcf, 0x52, 0x39, 0x45, + 0xac, 0x3f, 0x65, 0x40, 0x9e, 0x1b, 0x84, 0x6d, 0x3a, 0x6f, 0xeb, 0xea, 0x20, 0xde, 0x44, 0xf7, + 0x1b, 0xa2, 0xea, 0xab, 0x74, 0x98, 0xe6, 0xee, 0x9d, 0x55, 0x67, 0xbd, 0x3d, 0xb8, 0x67, 0x13, + 0xc7, 0x4d, 0x1c, 0x63, 0xd4, 0x4e, 0x21, 0x15, 0xee, 0xac, 0x51, 0x63, 0xce, 0x7b, 0x8b, 0x9f, + 0xbe, 0xf4, 0x5a, 0x1f, 0x6e, 0xce, 0x37, 0xac, 0xec, 0xfe, 0x2e, 0x7a, 0x30, 0x66, 0xee, 0x00, + 0x54, 0x2e, 0x32, 0x05, 0xd5, 0x34, 0x0a, 0xde, 0x16, 0x90, 0x31, 0x30, 0x0e, 0xb7, 0x07, 0xa3, + 0xfb, 0x5e, 0xbb, 0xe2, 0xe8, 0x7f, 0x74, 0xd0, 0xe2, 0xa1, 0x8a, 0x5f, 0xe6, 0xa7, 0xa1, 0x86, + 0xa3, 0x50, 0x86, 0xa9, 0xc2, 0x2b, 0x68, 0x2e, 0x2c, 0x74, 0x22, 0x24, 0xd7, 0x67, 0xf6, 0x61, + 0x6e, 0x03, 0x78, 0x1f, 0x75, 0x72, 0x83, 0x33, 0xef, 0xd1, 0xdd, 0x7e, 0x4c, 0x26, 0xfd, 0x94, + 0xa4, 0xe6, 0xb4, 0x3e, 0xd8, 0xca, 0x3d, 0xdc, 0xe8, 0xbf, 0xe5, 0xed, 0x2f, 0xa3, 0xa5, 0x3f, + 0x84, 0x34, 0x63, 0x6c, 0xff, 0x74, 0xd0, 0xf4, 0xa1, 0x8a, 0x71, 0x82, 0x66, 0x47, 0xff, 0xcf, + 0x93, 0xc9, 0x6d, 0xc7, 0xdc, 0xf0, 0x82, 0x7f, 0x86, 0x8e, 0x8c, 0xd3, 0xe8, 0xee, 0x6f, 0x96, + 0x6c, 0xfd, 0x95, 0x62, 0x1c, 0xee, 0xed, 0xfc, 0x17, 0xbc, 0xe9, 0xea, 0xcd, 0xbc, 0xbf, 0x39, + 0xdf, 0x70, 0xf6, 0x5f, 0x5c, 0x5c, 0xf9, 0xce, 0xe5, 0x95, 0xef, 0xfc, 0xb8, 0xf2, 0x9d, 0xcf, + 0xd7, 0x7e, 0xeb, 0xf2, 0xda, 0x6f, 0x7d, 0xbd, 0xf6, 0x5b, 0xaf, 0x76, 0x63, 0xae, 0x93, 0x22, + 0x22, 0x4c, 0xa4, 0xd4, 0x6e, 0x2f, 0x8f, 0xd8, 0x56, 0x2c, 0x68, 0xb9, 0x4b, 0x53, 0x71, 0x5a, + 0x0c, 0x41, 0x55, 0x1b, 0x39, 0xb6, 0x89, 0xfa, 0x2c, 0x07, 0x15, 0x75, 0xcc, 0x12, 0x3e, 0xfd, + 0x15, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x2f, 0xbe, 0x20, 0x68, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/capability/go.mod b/modules/capability/go.mod index 9583b39b0bb..5e82bd40fce 100644 --- a/modules/capability/go.mod +++ b/modules/capability/go.mod @@ -162,7 +162,7 @@ require ( google.golang.org/api v0.122.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.0 // indirect + google.golang.org/grpc v1.56.1 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/modules/capability/go.sum b/modules/capability/go.sum index c45a0ce333f..8e4f46fd4e3 100644 --- a/modules/capability/go.sum +++ b/modules/capability/go.sum @@ -1552,8 +1552,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE= -google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/modules/core/02-client/abci_test.go b/modules/core/02-client/abci_test.go index 170f5a63524..b825acee6ba 100644 --- a/modules/core/02-client/abci_test.go +++ b/modules/core/02-client/abci_test.go @@ -4,11 +4,13 @@ import ( "strings" "testing" - abci "github.com/cometbft/cometbft/abci/types" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/stretchr/testify/suite" + + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" client "github.com/cosmos/ibc-go/v7/modules/core/02-client" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/core/02-client/client/cli/cli.go b/modules/core/02-client/client/cli/cli.go index f1017e2df0f..fd5b4b95338 100644 --- a/modules/core/02-client/client/cli/cli.go +++ b/modules/core/02-client/client/cli/cli.go @@ -1,9 +1,10 @@ package cli import ( - "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ) diff --git a/modules/core/02-client/client/cli/query.go b/modules/core/02-client/client/cli/query.go index 337b142419c..692e5517522 100644 --- a/modules/core/02-client/client/cli/query.go +++ b/modules/core/02-client/client/cli/query.go @@ -4,10 +4,11 @@ import ( "errors" "fmt" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/core/02-client/client/utils" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/core/02-client/client/cli/tx.go b/modules/core/02-client/client/cli/tx.go index 14401a659fc..7966daf7dac 100644 --- a/modules/core/02-client/client/cli/tx.go +++ b/modules/core/02-client/client/cli/tx.go @@ -5,6 +5,8 @@ import ( "os" "strconv" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" @@ -14,7 +16,6 @@ import ( govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/02-client/client/utils/utils.go b/modules/core/02-client/client/utils/utils.go index f776bb00ae2..5caf7679712 100644 --- a/modules/core/02-client/client/utils/utils.go +++ b/modules/core/02-client/client/utils/utils.go @@ -4,10 +4,12 @@ import ( "context" errorsmod "cosmossdk.io/errors" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" + tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/02-client/keeper/client.go b/modules/core/02-client/keeper/client.go index 1be50fdb820..34b8ff8c528 100644 --- a/modules/core/02-client/keeper/client.go +++ b/modules/core/02-client/keeper/client.go @@ -1,8 +1,10 @@ package keeper import ( - errorsmod "cosmossdk.io/errors" metrics "github.com/armon/go-metrics" + + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/02-client/keeper/grpc_query.go b/modules/core/02-client/keeper/grpc_query.go index 009439381bd..3b0b671c18c 100644 --- a/modules/core/02-client/keeper/grpc_query.go +++ b/modules/core/02-client/keeper/grpc_query.go @@ -7,12 +7,14 @@ import ( "sort" "strings" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/02-client/keeper/keeper.go b/modules/core/02-client/keeper/keeper.go index 9a79011cd1a..b26aa5eaf0d 100644 --- a/modules/core/02-client/keeper/keeper.go +++ b/modules/core/02-client/keeper/keeper.go @@ -6,8 +6,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -15,6 +14,9 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/cometbft/cometbft/libs/log" + "github.com/cometbft/cometbft/light" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/02-client/keeper/keeper_test.go b/modules/core/02-client/keeper/keeper_test.go index 50d6fedc23e..fd67d93286c 100644 --- a/modules/core/02-client/keeper/keeper_test.go +++ b/modules/core/02-client/keeper/keeper_test.go @@ -5,14 +5,19 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + sdkmath "cosmossdk.io/math" - tmbytes "github.com/cometbft/cometbft/libs/bytes" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + tmbytes "github.com/cometbft/cometbft/libs/bytes" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" @@ -23,7 +28,6 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" ibctestingmock "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/cosmos/ibc-go/v7/testing/simapp" - "github.com/stretchr/testify/suite" ) const ( diff --git a/modules/core/02-client/keeper/proposal.go b/modules/core/02-client/keeper/proposal.go index 2cb0787be47..f35f00d616d 100644 --- a/modules/core/02-client/keeper/proposal.go +++ b/modules/core/02-client/keeper/proposal.go @@ -1,8 +1,10 @@ package keeper import ( - errorsmod "cosmossdk.io/errors" metrics "github.com/armon/go-metrics" + + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/02-client/migrations/v7/genesis.go b/modules/core/02-client/migrations/v7/genesis.go index e2f803dd35d..13eec1df18f 100644 --- a/modules/core/02-client/migrations/v7/genesis.go +++ b/modules/core/02-client/migrations/v7/genesis.go @@ -2,6 +2,7 @@ package v7 import ( errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/core/02-client/migrations/v7/store.go b/modules/core/02-client/migrations/v7/store.go index 280431dc5e7..e8794dd9c17 100644 --- a/modules/core/02-client/migrations/v7/store.go +++ b/modules/core/02-client/migrations/v7/store.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/modules/core/02-client/migrations/v7/store_test.go b/modules/core/02-client/migrations/v7/store_test.go index cb8be6e0f6d..524e439a4f6 100644 --- a/modules/core/02-client/migrations/v7/store_test.go +++ b/modules/core/02-client/migrations/v7/store_test.go @@ -4,9 +4,10 @@ import ( "strconv" "testing" - "github.com/cosmos/cosmos-sdk/codec" "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/codec" + v7 "github.com/cosmos/ibc-go/v7/modules/core/02-client/migrations/v7" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/02-client/proposal_handler.go b/modules/core/02-client/proposal_handler.go index e777d4fe71d..af6393c7f96 100644 --- a/modules/core/02-client/proposal_handler.go +++ b/modules/core/02-client/proposal_handler.go @@ -2,6 +2,7 @@ package client import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" diff --git a/modules/core/02-client/proposal_handler_test.go b/modules/core/02-client/proposal_handler_test.go index a4914f282cf..b96ee2a05fb 100644 --- a/modules/core/02-client/proposal_handler_test.go +++ b/modules/core/02-client/proposal_handler_test.go @@ -2,6 +2,7 @@ package client_test import ( sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" diff --git a/modules/core/02-client/simulation/decoder_test.go b/modules/core/02-client/simulation/decoder_test.go index 0fbaef2693c..543f77f2a4f 100644 --- a/modules/core/02-client/simulation/decoder_test.go +++ b/modules/core/02-client/simulation/decoder_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/types/kv" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/simulation" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/02-client/types/client.go b/modules/core/02-client/types/client.go index f572adf526a..8fc6b63ee98 100644 --- a/modules/core/02-client/types/client.go +++ b/modules/core/02-client/types/client.go @@ -6,9 +6,11 @@ import ( "sort" "strings" + proto "github.com/cosmos/gogoproto/proto" + errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" - proto "github.com/cosmos/gogoproto/proto" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/02-client/types/codec.go b/modules/core/02-client/types/codec.go index aba50a3b3a5..c71caaede98 100644 --- a/modules/core/02-client/types/codec.go +++ b/modules/core/02-client/types/codec.go @@ -1,12 +1,14 @@ package types import ( + proto "github.com/cosmos/gogoproto/proto" + errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - proto "github.com/cosmos/gogoproto/proto" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/02-client/types/height.go b/modules/core/02-client/types/height.go index 75a840e5e13..94e9f4acd6f 100644 --- a/modules/core/02-client/types/height.go +++ b/modules/core/02-client/types/height.go @@ -8,6 +8,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" diff --git a/modules/core/02-client/types/msgs.go b/modules/core/02-client/types/msgs.go index be1c0a83090..764154afcb5 100644 --- a/modules/core/02-client/types/msgs.go +++ b/modules/core/02-client/types/msgs.go @@ -2,6 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/02-client/types/msgs_test.go b/modules/core/02-client/types/msgs_test.go index 2cb871c87e5..2d265dcbc6c 100644 --- a/modules/core/02-client/types/msgs_test.go +++ b/modules/core/02-client/types/msgs_test.go @@ -4,11 +4,12 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/protobuf/proto" //nolint:staticcheck "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" diff --git a/modules/core/02-client/types/proposal.go b/modules/core/02-client/types/proposal.go index 0b22200242f..c51f4cf1900 100644 --- a/modules/core/02-client/types/proposal.go +++ b/modules/core/02-client/types/proposal.go @@ -5,6 +5,7 @@ import ( "reflect" errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/modules/core/02-client/types/tx.pb.go b/modules/core/02-client/types/tx.pb.go index 93658401e3b..b7bda73776a 100644 --- a/modules/core/02-client/types/tx.pb.go +++ b/modules/core/02-client/types/tx.pb.go @@ -282,14 +282,16 @@ var xxx_messageInfo_MsgUpgradeClientResponse proto.InternalMessageInfo // MsgSubmitMisbehaviour defines an sdk.Msg type that submits Evidence for // light client misbehaviour. -// Warning: DEPRECATED +// This message has been deprecated. Use MsgUpdateClient instead. +// +// Deprecated: Do not use. type MsgSubmitMisbehaviour struct { // client unique identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: Do not use. + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // misbehaviour used for freezing the light client - Misbehaviour *types.Any `protobuf:"bytes,2,opt,name=misbehaviour,proto3" json:"misbehaviour,omitempty"` // Deprecated: Do not use. + Misbehaviour *types.Any `protobuf:"bytes,2,opt,name=misbehaviour,proto3" json:"misbehaviour,omitempty"` // signer address - Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` // Deprecated: Do not use. + Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` } func (m *MsgSubmitMisbehaviour) Reset() { *m = MsgSubmitMisbehaviour{} } @@ -406,20 +408,6 @@ func (m *MsgUpdateParams) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // MsgUpdateParamsResponse defines the MsgUpdateParams response type. type MsgUpdateParamsResponse struct { } @@ -473,49 +461,49 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/tx.proto", fileDescriptor_cb5dc4651eb49a04) } var fileDescriptor_cb5dc4651eb49a04 = []byte{ - // 667 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xbf, 0x53, 0xd4, 0x40, - 0x14, 0xc7, 0x93, 0x03, 0x6e, 0xbc, 0xe5, 0x00, 0x67, 0x45, 0x39, 0x82, 0x24, 0x0c, 0x5a, 0x20, - 0x4a, 0x02, 0x58, 0xc0, 0xa0, 0x16, 0x40, 0x65, 0x71, 0x33, 0x4e, 0x18, 0x1b, 0x1b, 0x4c, 0x72, - 0xcb, 0x92, 0x19, 0x92, 0xcd, 0x64, 0x93, 0x1b, 0xaf, 0x73, 0xac, 0x2c, 0xb5, 0xb3, 0xa4, 0xb3, - 0xa5, 0xf2, 0x6f, 0xc0, 0x8e, 0xd2, 0xca, 0x71, 0xee, 0x0a, 0xfc, 0x33, 0x9c, 0xec, 0xee, 0xe5, - 0x92, 0xdc, 0x0f, 0x4e, 0xed, 0x92, 0x7d, 0x9f, 0xb7, 0xdf, 0xef, 0x7b, 0x79, 0x9b, 0x05, 0x4b, - 0xae, 0xed, 0x18, 0x0e, 0x09, 0x91, 0xe1, 0x9c, 0xb9, 0xc8, 0x8f, 0x8c, 0xe6, 0x96, 0x11, 0xbd, - 0xd3, 0x83, 0x90, 0x44, 0x04, 0x42, 0xd7, 0x76, 0xf4, 0x24, 0xa8, 0xf3, 0xa0, 0xde, 0xdc, 0x52, - 0x16, 0x1c, 0x42, 0x3d, 0x42, 0x0d, 0x8f, 0xe2, 0x84, 0xf5, 0x28, 0xe6, 0xb0, 0x32, 0x8f, 0x09, - 0x26, 0xec, 0xd1, 0x48, 0x9e, 0xc4, 0xea, 0x22, 0x26, 0x04, 0x9f, 0x21, 0x83, 0xbd, 0xd9, 0xf1, - 0x89, 0x61, 0xf9, 0x2d, 0x11, 0xd2, 0x06, 0x48, 0x0b, 0x1d, 0x06, 0xac, 0x7e, 0x93, 0xc1, 0x5c, - 0x9d, 0xe2, 0xc3, 0x10, 0x59, 0x11, 0x3a, 0x64, 0x11, 0xb8, 0x03, 0xaa, 0x9c, 0x39, 0xa6, 0x91, - 0x15, 0xa1, 0x9a, 0xbc, 0x22, 0xaf, 0x4d, 0x6f, 0xcf, 0xeb, 0x5c, 0x46, 0xef, 0xca, 0xe8, 0xfb, - 0x7e, 0xcb, 0x9c, 0xe6, 0xe4, 0x51, 0x02, 0xc2, 0x17, 0x60, 0xce, 0x21, 0x3e, 0x45, 0x3e, 0x8d, - 0xa9, 0xc8, 0x2d, 0x8d, 0xc8, 0x9d, 0x4d, 0x61, 0x9e, 0x7e, 0x0f, 0x94, 0xa9, 0x8b, 0x7d, 0x14, - 0xd6, 0x26, 0x56, 0xe4, 0xb5, 0x8a, 0x29, 0xde, 0xf6, 0xee, 0x7c, 0x3c, 0xd7, 0xa4, 0xdf, 0xe7, - 0x9a, 0xf4, 0xe1, 0xfa, 0x62, 0x5d, 0x2c, 0xae, 0x2e, 0x82, 0x85, 0x82, 0x6f, 0x13, 0xd1, 0x20, - 0xd9, 0x70, 0xf5, 0x0b, 0xaf, 0xe9, 0x75, 0xd0, 0xe8, 0xd5, 0xb4, 0x04, 0x2a, 0xa2, 0x26, 0xb7, - 0xc1, 0x0a, 0xaa, 0x98, 0xb7, 0xf8, 0xc2, 0xcb, 0x06, 0x7c, 0x06, 0x66, 0x45, 0xd0, 0x43, 0x94, - 0x5a, 0x78, 0xb4, 0xed, 0x19, 0xce, 0xd6, 0x39, 0xfa, 0x2f, 0xae, 0xb3, 0xce, 0x52, 0xd7, 0xdf, - 0x4b, 0xe0, 0x36, 0x8b, 0xe1, 0xd0, 0x6a, 0x8c, 0x65, 0xbb, 0xf8, 0x9d, 0x4a, 0xff, 0xf1, 0x9d, - 0x26, 0xfe, 0xe2, 0x3b, 0x6d, 0x82, 0xf9, 0x20, 0x24, 0xe4, 0xe4, 0x38, 0xe6, 0x5e, 0x8f, 0xf9, - 0xde, 0xb5, 0xc9, 0x15, 0x79, 0xad, 0x6a, 0x42, 0x16, 0xcb, 0x97, 0xb1, 0x0f, 0x96, 0x0b, 0x19, - 0x05, 0xf9, 0x29, 0x96, 0xaa, 0xe4, 0x52, 0x87, 0x0d, 0x47, 0xf9, 0xe6, 0x36, 0x2b, 0xa0, 0x56, - 0x6c, 0x65, 0xda, 0xe7, 0xaf, 0x32, 0xb8, 0x5b, 0xa7, 0xf8, 0x28, 0xb6, 0x3d, 0x37, 0xaa, 0xbb, - 0xd4, 0x46, 0xa7, 0x56, 0xd3, 0x25, 0x71, 0x08, 0xb5, 0xbe, 0x66, 0x1f, 0x94, 0x6a, 0x72, 0xa6, - 0xe1, 0xcf, 0x41, 0xd5, 0xcb, 0x24, 0x8c, 0x6a, 0x38, 0xcb, 0xcc, 0xd1, 0x50, 0xc9, 0x0f, 0x0a, - 0x23, 0x46, 0x56, 0xa1, 0x81, 0xe5, 0x81, 0x46, 0xd3, 0x52, 0x5a, 0x99, 0x39, 0x7f, 0x65, 0x85, - 0x96, 0x47, 0xe1, 0x7d, 0x50, 0xb1, 0xe2, 0xe8, 0x94, 0x84, 0x6e, 0xd4, 0x12, 0x03, 0xd3, 0x5b, - 0x80, 0xbb, 0xa0, 0x1c, 0x30, 0x4e, 0x58, 0x57, 0xf4, 0xfe, 0xbf, 0x8f, 0xce, 0x77, 0x3a, 0x98, - 0xbc, 0xfc, 0xa9, 0x49, 0xa6, 0xe0, 0xf7, 0x66, 0x13, 0x63, 0xbd, 0x9d, 0x72, 0x83, 0xcc, 0x13, - 0xba, 0xae, 0xb6, 0x3f, 0x4f, 0x82, 0x89, 0x3a, 0xc5, 0xf0, 0x2d, 0xa8, 0xe6, 0x7e, 0x2b, 0x0f, - 0x06, 0x89, 0x15, 0xce, 0xb0, 0xf2, 0x78, 0x0c, 0xa8, 0xab, 0x94, 0x28, 0xe4, 0x0e, 0xf9, 0x30, - 0x85, 0x2c, 0x34, 0x54, 0x61, 0xd0, 0xa1, 0x84, 0x0e, 0x98, 0xc9, 0x4f, 0xf2, 0xc3, 0xa1, 0xd9, - 0x19, 0x4a, 0x79, 0x32, 0x0e, 0x95, 0x8a, 0x84, 0x00, 0x0e, 0x98, 0xc6, 0x47, 0x43, 0xf6, 0xe8, - 0x47, 0x95, 0xad, 0xb1, 0xd1, 0x54, 0xf3, 0x04, 0xc0, 0x6c, 0xc1, 0x62, 0x7a, 0x46, 0x37, 0x90, - 0x43, 0x37, 0x34, 0x30, 0x3f, 0x0c, 0xca, 0xd4, 0xfb, 0xeb, 0x8b, 0x75, 0xf9, 0xc0, 0xbc, 0x6c, - 0xab, 0xf2, 0x55, 0x5b, 0x95, 0x7f, 0xb5, 0x55, 0xf9, 0x53, 0x47, 0x95, 0xae, 0x3a, 0xaa, 0xf4, - 0xa3, 0xa3, 0x4a, 0x6f, 0x76, 0xb1, 0x1b, 0x9d, 0xc6, 0xb6, 0xee, 0x10, 0xcf, 0x10, 0xd7, 0x9e, - 0x6b, 0x3b, 0x1b, 0x98, 0x18, 0xcd, 0x1d, 0xc3, 0x23, 0x8d, 0xf8, 0x0c, 0x51, 0x7e, 0x83, 0x6d, - 0x6e, 0x6f, 0x88, 0x4b, 0x2c, 0x6a, 0x05, 0x88, 0xda, 0x65, 0x76, 0xde, 0x9e, 0xfe, 0x09, 0x00, - 0x00, 0xff, 0xff, 0xe6, 0x7c, 0xe1, 0x7d, 0x5f, 0x07, 0x00, 0x00, + // 658 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0xc7, 0xe3, 0xfe, 0x89, 0x7e, 0xb9, 0xa6, 0xed, 0x8f, 0x53, 0xa1, 0xa9, 0x4b, 0x9d, 0x2a, + 0x30, 0x94, 0x42, 0xed, 0x26, 0x0c, 0x8d, 0x8a, 0x18, 0xda, 0x4e, 0x0c, 0x91, 0x90, 0x2b, 0x16, + 0x96, 0x60, 0x3b, 0x97, 0x8b, 0xa5, 0xd8, 0x67, 0xf9, 0xec, 0x88, 0x0c, 0x48, 0x88, 0x89, 0x11, + 0x24, 0x16, 0x36, 0x5e, 0x42, 0xc5, 0x7b, 0x40, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0x64, 0xe8, 0xdb, + 0x40, 0xf6, 0x5d, 0x1c, 0xdb, 0x8d, 0x4d, 0x2a, 0x36, 0xfb, 0x9e, 0xcf, 0x73, 0xdf, 0xef, 0xf3, + 0xf8, 0x39, 0x1f, 0xd8, 0x36, 0x75, 0x43, 0x31, 0x88, 0x8b, 0x14, 0xa3, 0x6f, 0x22, 0xdb, 0x53, + 0x06, 0x75, 0xc5, 0x7b, 0x2b, 0x3b, 0x2e, 0xf1, 0x08, 0x84, 0xa6, 0x6e, 0xc8, 0x41, 0x50, 0x66, + 0x41, 0x79, 0x50, 0x17, 0x37, 0x0d, 0x42, 0x2d, 0x42, 0x15, 0x8b, 0xe2, 0x80, 0xb5, 0x28, 0x66, + 0xb0, 0xb8, 0x81, 0x09, 0x26, 0xe1, 0xa3, 0x12, 0x3c, 0xf1, 0xd5, 0x2d, 0x4c, 0x08, 0xee, 0x23, + 0x25, 0x7c, 0xd3, 0xfd, 0xae, 0xa2, 0xd9, 0x43, 0x1e, 0xaa, 0xce, 0x90, 0xe6, 0x3a, 0x21, 0x50, + 0xfb, 0x2e, 0x80, 0xf5, 0x16, 0xc5, 0x67, 0x2e, 0xd2, 0x3c, 0x74, 0x16, 0x46, 0xe0, 0x11, 0x28, + 0x33, 0xa6, 0x4d, 0x3d, 0xcd, 0x43, 0x15, 0x61, 0x57, 0xd8, 0x5b, 0x69, 0x6c, 0xc8, 0x4c, 0x46, + 0x9e, 0xc8, 0xc8, 0x27, 0xf6, 0x50, 0x5d, 0x61, 0xe4, 0x79, 0x00, 0xc2, 0xe7, 0x60, 0xdd, 0x20, + 0x36, 0x45, 0x36, 0xf5, 0x29, 0xcf, 0x5d, 0xc8, 0xc9, 0x5d, 0x8b, 0x60, 0x96, 0x7e, 0x0f, 0x14, + 0xa9, 0x89, 0x6d, 0xe4, 0x56, 0x16, 0x77, 0x85, 0xbd, 0x92, 0xca, 0xdf, 0x8e, 0xd7, 0x3f, 0x7e, + 0xab, 0x16, 0x3e, 0x5c, 0x5f, 0xec, 0xf3, 0x85, 0xda, 0x16, 0xd8, 0x4c, 0x79, 0x56, 0x11, 0x75, + 0x82, 0xcd, 0x6a, 0x5f, 0x58, 0x3d, 0xaf, 0x9c, 0xce, 0xb4, 0x9e, 0x6d, 0x50, 0xe2, 0xf5, 0x98, + 0x9d, 0xb0, 0x98, 0x92, 0xfa, 0x1f, 0x5b, 0x78, 0xd1, 0x81, 0xcf, 0xc0, 0x1a, 0x0f, 0x5a, 0x88, + 0x52, 0x0d, 0xe7, 0x5b, 0x5e, 0x65, 0x6c, 0x8b, 0xa1, 0xb7, 0x75, 0x1c, 0x77, 0x15, 0x39, 0xfe, + 0xb1, 0x00, 0xfe, 0x0f, 0x63, 0xd8, 0xd5, 0x3a, 0x73, 0x59, 0x4e, 0x7f, 0x9f, 0x85, 0x7f, 0xf8, + 0x3e, 0x8b, 0xb7, 0xf8, 0x3e, 0x87, 0x60, 0xc3, 0x71, 0x09, 0xe9, 0xb6, 0x7d, 0xe6, 0xb5, 0xcd, + 0xf6, 0xae, 0x2c, 0xed, 0x0a, 0x7b, 0x65, 0x15, 0x86, 0xb1, 0x64, 0x19, 0x27, 0x60, 0x27, 0x95, + 0x91, 0x92, 0x5f, 0x0e, 0x53, 0xc5, 0x44, 0x6a, 0xd6, 0x50, 0x14, 0xf3, 0x5b, 0x2c, 0x82, 0x4a, + 0xba, 0x8d, 0x51, 0x8f, 0xbf, 0x0a, 0xe0, 0x6e, 0x8b, 0xe2, 0x73, 0x5f, 0xb7, 0x4c, 0xaf, 0x65, + 0x52, 0x1d, 0xf5, 0xb4, 0x81, 0x49, 0x7c, 0x37, 0xbf, 0xd1, 0x4d, 0x50, 0xb6, 0x62, 0x70, 0x6e, + 0xa3, 0x13, 0x64, 0xe6, 0x60, 0xdc, 0x49, 0xb9, 0xae, 0x08, 0xb5, 0x2a, 0xd8, 0x99, 0x69, 0x2d, + 0x32, 0xff, 0x2e, 0x36, 0xd1, 0x2f, 0x35, 0x57, 0xb3, 0x28, 0xbc, 0x0f, 0x4a, 0x9a, 0xef, 0xf5, + 0x88, 0x6b, 0x7a, 0x43, 0xee, 0x7a, 0xba, 0x00, 0x9b, 0xa0, 0xe8, 0x84, 0x1c, 0x37, 0x2c, 0xca, + 0x37, 0xff, 0x31, 0x32, 0xdb, 0xe9, 0x74, 0xe9, 0xf2, 0x57, 0xb5, 0xa0, 0x72, 0xfe, 0x18, 0x4e, + 0xec, 0x4d, 0x77, 0x4b, 0x8c, 0x2e, 0x4b, 0x9a, 0x38, 0x6b, 0x7c, 0x5e, 0x02, 0x8b, 0x2d, 0x8a, + 0xe1, 0x1b, 0x50, 0x4e, 0xfc, 0x40, 0x1e, 0xcc, 0x12, 0x4c, 0x9d, 0x58, 0xf1, 0xf1, 0x1c, 0xd0, + 0x44, 0x29, 0x50, 0x48, 0x1c, 0xe9, 0x2c, 0x85, 0x38, 0x94, 0xa9, 0x30, 0xeb, 0x18, 0x42, 0x03, + 0xac, 0x26, 0x67, 0xf7, 0x61, 0x66, 0x76, 0x8c, 0x12, 0x9f, 0xcc, 0x43, 0x45, 0x22, 0x2e, 0x80, + 0x33, 0x66, 0xf0, 0x51, 0xc6, 0x1e, 0x37, 0x51, 0xb1, 0x3e, 0x37, 0x1a, 0x69, 0x76, 0x01, 0x8c, + 0x17, 0xcc, 0x27, 0x28, 0xbf, 0x81, 0x0c, 0xfa, 0x4b, 0x03, 0x93, 0xc3, 0x20, 0x2e, 0xbf, 0xbf, + 0xbe, 0xd8, 0x17, 0x4e, 0xd5, 0xcb, 0x91, 0x24, 0x5c, 0x8d, 0x24, 0xe1, 0xf7, 0x48, 0x12, 0x3e, + 0x8d, 0xa5, 0xc2, 0xd5, 0x58, 0x2a, 0xfc, 0x1c, 0x4b, 0x85, 0xd7, 0x4d, 0x6c, 0x7a, 0x3d, 0x5f, + 0x97, 0x0d, 0x62, 0x29, 0xfc, 0x82, 0x33, 0x75, 0xe3, 0x00, 0x13, 0x65, 0x70, 0xa4, 0x58, 0xa4, + 0xe3, 0xf7, 0x11, 0x65, 0x77, 0xd5, 0x61, 0xe3, 0x80, 0x5f, 0x57, 0xde, 0xd0, 0x41, 0x54, 0x2f, + 0x86, 0x27, 0xed, 0xe9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x70, 0x00, 0x5d, 0xdc, 0x49, 0x07, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/03-connection/client/cli/query.go b/modules/core/03-connection/client/cli/query.go index e0d6d917d5b..9fe3250208f 100644 --- a/modules/core/03-connection/client/cli/query.go +++ b/modules/core/03-connection/client/cli/query.go @@ -3,10 +3,11 @@ package cli import ( "fmt" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/client/utils" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/core/03-connection/client/utils/utils.go b/modules/core/03-connection/client/utils/utils.go index a7cab07d6bf..729ad18783d 100644 --- a/modules/core/03-connection/client/utils/utils.go +++ b/modules/core/03-connection/client/utils/utils.go @@ -7,6 +7,7 @@ import ( "os" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/modules/core/03-connection/keeper/grpc_query.go b/modules/core/03-connection/keeper/grpc_query.go index d095e2537f3..9cd1830d1e5 100644 --- a/modules/core/03-connection/keeper/grpc_query.go +++ b/modules/core/03-connection/keeper/grpc_query.go @@ -3,12 +3,14 @@ package keeper import ( "context" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/core/03-connection/keeper/handshake.go b/modules/core/03-connection/keeper/handshake.go index bea6d74ce15..61e50b7a55d 100644 --- a/modules/core/03-connection/keeper/handshake.go +++ b/modules/core/03-connection/keeper/handshake.go @@ -2,6 +2,7 @@ package keeper import ( errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/03-connection/keeper/keeper.go b/modules/core/03-connection/keeper/keeper.go index ee37f913ef0..075ae4e4465 100644 --- a/modules/core/03-connection/keeper/keeper.go +++ b/modules/core/03-connection/keeper/keeper.go @@ -2,12 +2,14 @@ package keeper import ( errorsmod "cosmossdk.io/errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + "github.com/cometbft/cometbft/libs/log" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" diff --git a/modules/core/03-connection/keeper/verify.go b/modules/core/03-connection/keeper/verify.go index c1316fb9ea2..b02f8b82d0f 100644 --- a/modules/core/03-connection/keeper/verify.go +++ b/modules/core/03-connection/keeper/verify.go @@ -4,6 +4,7 @@ import ( "math" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/core/03-connection/simulation/decoder_test.go b/modules/core/03-connection/simulation/decoder_test.go index d93c1f10742..a511abeee74 100644 --- a/modules/core/03-connection/simulation/decoder_test.go +++ b/modules/core/03-connection/simulation/decoder_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/types/kv" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/cosmos/ibc-go/v7/modules/core/03-connection/simulation" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/03-connection/types/msgs.go b/modules/core/03-connection/types/msgs.go index 0d9c808cf27..67837a2133f 100644 --- a/modules/core/03-connection/types/msgs.go +++ b/modules/core/03-connection/types/msgs.go @@ -2,6 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/03-connection/types/msgs_test.go b/modules/core/03-connection/types/msgs_test.go index 2f609c8bbc9..7e1749a8e26 100644 --- a/modules/core/03-connection/types/msgs_test.go +++ b/modules/core/03-connection/types/msgs_test.go @@ -5,15 +5,17 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - log "github.com/cometbft/cometbft/libs/log" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/store/iavl" "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + log "github.com/cometbft/cometbft/libs/log" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/core/03-connection/types/tx.pb.go b/modules/core/03-connection/types/tx.pb.go index be7cf0c1e24..8be9326652a 100644 --- a/modules/core/03-connection/types/tx.pb.go +++ b/modules/core/03-connection/types/tx.pb.go @@ -421,20 +421,6 @@ func (m *MsgUpdateParams) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // MsgUpdateParamsResponse defines the MsgUpdateParams response type. type MsgUpdateParamsResponse struct { } @@ -488,67 +474,66 @@ func init() { func init() { proto.RegisterFile("ibc/core/connection/v1/tx.proto", fileDescriptor_5d00fde5fc97399e) } var fileDescriptor_5d00fde5fc97399e = []byte{ - // 948 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xc7, 0xbd, 0x89, 0xed, 0xc4, 0x8f, 0xdd, 0x06, 0x06, 0x27, 0xd9, 0x6e, 0x5b, 0xdb, 0x35, - 0x48, 0x89, 0x2a, 0xb2, 0xdb, 0xb4, 0xa0, 0x96, 0x92, 0x4b, 0xe2, 0x0b, 0x11, 0x0a, 0x54, 0x4b, - 0xe8, 0x81, 0x8b, 0x65, 0xaf, 0x37, 0xeb, 0x51, 0xe2, 0x9d, 0xd5, 0xce, 0xd8, 0xb0, 0x48, 0x48, - 0x08, 0x2e, 0xdc, 0xe0, 0x23, 0xf4, 0x23, 0xf4, 0x63, 0xf4, 0x84, 0x2a, 0x0e, 0x88, 0x13, 0x42, - 0xc9, 0xa1, 0x7c, 0x00, 0x3e, 0x00, 0xda, 0x99, 0xd9, 0x97, 0xd8, 0xeb, 0xb2, 0x6e, 0xb8, 0xed, - 0x3e, 0xfb, 0x7f, 0x9e, 0x79, 0x5e, 0x7e, 0xb3, 0x33, 0xd0, 0xc4, 0x7d, 0xcb, 0xb0, 0x88, 0x6f, - 0x1b, 0x16, 0x71, 0x5d, 0xdb, 0x62, 0x98, 0xb8, 0xc6, 0x64, 0xd7, 0x60, 0xdf, 0xe8, 0x9e, 0x4f, - 0x18, 0x41, 0x1b, 0xb8, 0x6f, 0xe9, 0xa1, 0x40, 0x4f, 0x04, 0xfa, 0x64, 0x57, 0xab, 0x3b, 0xc4, - 0x21, 0x5c, 0x62, 0x84, 0x4f, 0x42, 0xad, 0x6d, 0x5a, 0x84, 0x8e, 0x08, 0x35, 0x46, 0xd4, 0x09, - 0xa3, 0x8c, 0xa8, 0x23, 0x3f, 0xdc, 0x70, 0x08, 0x71, 0xce, 0x6c, 0x83, 0xbf, 0xf5, 0xc7, 0x27, - 0x46, 0xcf, 0x0d, 0xe4, 0xa7, 0x54, 0x0a, 0x67, 0xd8, 0x76, 0x59, 0xe8, 0x28, 0x9e, 0xa4, 0x60, - 0x6b, 0x4e, 0x8e, 0xa9, 0x84, 0xb8, 0xb0, 0xfd, 0xf3, 0x12, 0xac, 0x1f, 0x51, 0xa7, 0x13, 0xdb, - 0x3f, 0xf7, 0x6c, 0xf7, 0xd0, 0xc5, 0x0c, 0xdd, 0x84, 0x8a, 0x08, 0xd9, 0xc5, 0x03, 0x55, 0x69, - 0x29, 0xdb, 0x15, 0x73, 0x55, 0x18, 0x0e, 0x07, 0xe8, 0x33, 0xa8, 0x59, 0x64, 0xec, 0x32, 0xdb, - 0xf7, 0x7a, 0x3e, 0x0b, 0xd4, 0xa5, 0x96, 0xb2, 0x5d, 0xbd, 0xff, 0x9e, 0x9e, 0x5d, 0xb9, 0xde, - 0x49, 0x69, 0x0f, 0x8a, 0x2f, 0xfe, 0x6c, 0x16, 0xcc, 0x4b, 0xfe, 0xe8, 0x23, 0x58, 0x99, 0xd8, - 0x3e, 0xc5, 0xc4, 0x55, 0x97, 0x79, 0xa8, 0xe6, 0xbc, 0x50, 0x4f, 0x85, 0xcc, 0x8c, 0xf4, 0xe8, - 0x0e, 0xd4, 0x06, 0xf6, 0x59, 0x2f, 0xe8, 0x7a, 0xb6, 0x8f, 0xc9, 0x40, 0x2d, 0xb6, 0x94, 0xed, - 0xa2, 0x59, 0xe5, 0xb6, 0x27, 0xdc, 0x84, 0x36, 0xa0, 0x4c, 0xb1, 0xe3, 0xda, 0xbe, 0x5a, 0xe2, - 0x75, 0xc8, 0xb7, 0xc7, 0xef, 0xfc, 0xf4, 0xac, 0x59, 0xf8, 0xfb, 0x59, 0xb3, 0xf0, 0xc3, 0xab, - 0xe7, 0x77, 0xa5, 0xb1, 0xdd, 0x84, 0xdb, 0x99, 0x0d, 0x31, 0x6d, 0xea, 0x11, 0x97, 0xda, 0xed, - 0xdf, 0x4b, 0x50, 0x9f, 0x51, 0x1c, 0xfb, 0xc1, 0xeb, 0x3b, 0xf6, 0x08, 0x36, 0x3c, 0xdf, 0x9e, - 0x60, 0x32, 0xa6, 0xdd, 0xa4, 0xa2, 0x50, 0x19, 0xf6, 0xae, 0x72, 0xb0, 0xa4, 0x2a, 0x66, 0x3d, - 0x52, 0x24, 0xb1, 0x0f, 0x07, 0xe8, 0x21, 0xd4, 0x64, 0x58, 0xca, 0x7a, 0xcc, 0x96, 0x0d, 0xaa, - 0xeb, 0x02, 0x0f, 0x3d, 0xc2, 0x43, 0xdf, 0x77, 0x03, 0xb3, 0x2a, 0x94, 0x5f, 0x84, 0xc2, 0x99, - 0x21, 0x15, 0xaf, 0x38, 0xa4, 0xe9, 0x4e, 0x97, 0x66, 0x3b, 0x7d, 0x0c, 0xeb, 0x69, 0x97, 0xae, - 0x1c, 0x12, 0x55, 0xcb, 0xad, 0xe5, 0x3c, 0x53, 0xad, 0xa7, 0xbd, 0xa5, 0x91, 0xa2, 0x0e, 0xd4, - 0x3c, 0x9f, 0x90, 0x93, 0xee, 0xd0, 0xc6, 0xce, 0x90, 0xa9, 0x2b, 0xbc, 0x10, 0x2d, 0x15, 0x4c, - 0xb0, 0x3f, 0xd9, 0xd5, 0x3f, 0xe1, 0x0a, 0x99, 0x7e, 0x95, 0x7b, 0x09, 0x13, 0xba, 0x0d, 0x20, - 0x82, 0x60, 0x17, 0x33, 0x75, 0xb5, 0xa5, 0x6c, 0xd7, 0xcc, 0x0a, 0xb7, 0x70, 0xdc, 0xef, 0x44, - 0x6b, 0x88, 0x58, 0x6a, 0x85, 0x0b, 0x44, 0x84, 0x0e, 0x37, 0xa1, 0x2d, 0x58, 0x93, 0x92, 0x90, - 0x03, 0x97, 0x8e, 0xa9, 0x0a, 0x5c, 0x75, 0x5d, 0xa8, 0x22, 0x2b, 0xfa, 0x14, 0xde, 0x8a, 0x25, - 0x51, 0xce, 0xd5, 0x9c, 0x39, 0xaf, 0xc5, 0x9e, 0x32, 0xef, 0x04, 0xde, 0x5a, 0x1a, 0x5e, 0xf4, - 0x31, 0x68, 0x43, 0x42, 0x59, 0x92, 0x8c, 0xc0, 0xa3, 0xcb, 0x73, 0x51, 0xaf, 0xf1, 0xc4, 0x36, - 0x43, 0x45, 0x9c, 0x17, 0xa7, 0xe2, 0x49, 0xf8, 0x39, 0x9b, 0xfc, 0x06, 0xdc, 0xca, 0xe2, 0x3a, - 0x06, 0xff, 0xb7, 0x62, 0x06, 0xf8, 0xfb, 0xd6, 0x29, 0x7a, 0x17, 0xae, 0x5d, 0x46, 0x5a, 0xc0, - 0x5f, 0xb3, 0xd2, 0x18, 0xef, 0x81, 0x76, 0x09, 0x8d, 0x8c, 0x4d, 0x60, 0xaa, 0x69, 0xc5, 0xa5, - 0x4d, 0x70, 0x85, 0x1f, 0xc4, 0xf4, 0xfe, 0x29, 0xe6, 0xdd, 0x3f, 0xd3, 0xd8, 0x95, 0xde, 0x04, - 0xbb, 0x9b, 0x20, 0x20, 0xeb, 0x32, 0x3f, 0x50, 0xcb, 0x7c, 0x2a, 0xab, 0xdc, 0x10, 0xfe, 0x31, - 0xa6, 0xa1, 0x5b, 0xc9, 0x05, 0xdd, 0x6a, 0x6e, 0xe8, 0x2a, 0x57, 0x87, 0x0e, 0x16, 0x80, 0xae, - 0xfa, 0x3f, 0x41, 0xb7, 0x6f, 0x9d, 0xc6, 0xd0, 0xfd, 0xaa, 0x80, 0x3a, 0x23, 0xe8, 0x10, 0xf7, - 0x04, 0xfb, 0xa3, 0x7c, 0xe0, 0xc5, 0x13, 0xe8, 0x59, 0xa7, 0x9c, 0xb3, 0x68, 0x02, 0x21, 0xba, - 0xd3, 0x33, 0x5e, 0x7e, 0x93, 0x19, 0x27, 0xdd, 0x2a, 0xfe, 0xf7, 0xf9, 0xd2, 0x86, 0xd6, 0xbc, - 0x7a, 0xe2, 0xa2, 0xbf, 0x83, 0xb5, 0x23, 0xea, 0x7c, 0xe9, 0x0d, 0xc2, 0xde, 0xf5, 0xfc, 0xde, - 0x88, 0xa2, 0x5b, 0x50, 0xe9, 0x8d, 0xd9, 0x90, 0xf8, 0x98, 0x05, 0xb2, 0xcc, 0xc4, 0x80, 0xf6, - 0xa0, 0xec, 0x71, 0x9d, 0x3c, 0x89, 0x1b, 0xf3, 0x76, 0x87, 0x88, 0x26, 0x8b, 0x90, 0x3e, 0x8f, - 0xaf, 0x87, 0xf9, 0x25, 0xd1, 0xda, 0x37, 0x60, 0x73, 0x6a, 0xf9, 0x28, 0xb3, 0xfb, 0xff, 0x14, - 0x61, 0xf9, 0x88, 0x3a, 0xe8, 0x5b, 0x40, 0x19, 0x77, 0x86, 0x9d, 0x79, 0xcb, 0x66, 0x9e, 0xa8, - 0xda, 0x87, 0x0b, 0xc9, 0xa3, 0x1c, 0xd0, 0xd7, 0xf0, 0xf6, 0xec, 0xe1, 0xfb, 0x7e, 0xee, 0x58, - 0xc7, 0x7e, 0xa0, 0x7d, 0xb0, 0x88, 0x7a, 0xfe, 0xc2, 0x21, 0x41, 0xf9, 0x17, 0xde, 0xb7, 0x4e, - 0x17, 0x58, 0x38, 0xb5, 0x09, 0xd0, 0x8f, 0x0a, 0xac, 0x67, 0xef, 0x80, 0x7b, 0xb9, 0xe3, 0x49, - 0x0f, 0xed, 0xd1, 0xa2, 0x1e, 0x71, 0x16, 0x3e, 0x6c, 0x08, 0x26, 0x12, 0x99, 0x84, 0x73, 0xeb, - 0x35, 0x31, 0xd3, 0x18, 0x69, 0x46, 0x4e, 0x61, 0xb4, 0xa6, 0x56, 0xfa, 0xfe, 0xd5, 0xf3, 0xbb, - 0xca, 0xc1, 0xd3, 0x17, 0xe7, 0x0d, 0xe5, 0xe5, 0x79, 0x43, 0xf9, 0xeb, 0xbc, 0xa1, 0xfc, 0x72, - 0xd1, 0x28, 0xbc, 0xbc, 0x68, 0x14, 0xfe, 0xb8, 0x68, 0x14, 0xbe, 0xda, 0x73, 0x30, 0x1b, 0x8e, - 0xfb, 0xba, 0x45, 0x46, 0x86, 0xbc, 0x49, 0xe3, 0xbe, 0xb5, 0xe3, 0x10, 0x63, 0xf2, 0xd0, 0x18, - 0x91, 0xc1, 0xf8, 0xcc, 0xa6, 0xe2, 0x26, 0x7c, 0xef, 0xc1, 0x4e, 0xea, 0x32, 0xcc, 0x02, 0xcf, - 0xa6, 0xfd, 0x32, 0xff, 0xfb, 0x3f, 0xf8, 0x37, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x09, 0xa7, 0xf6, - 0xd4, 0x0b, 0x00, 0x00, + // 944 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0xc7, 0x45, 0x5b, 0x92, 0xad, 0x91, 0x52, 0xb7, 0x0b, 0xd9, 0x66, 0x98, 0x44, 0x52, 0xd4, + 0x02, 0x36, 0x82, 0x9a, 0x8c, 0x93, 0x16, 0x49, 0x53, 0x5f, 0x6c, 0x5d, 0x6a, 0x14, 0x6e, 0x03, + 0xd5, 0xcd, 0xa1, 0x17, 0x41, 0xa2, 0xd6, 0xd4, 0xc2, 0x16, 0x97, 0xe0, 0xae, 0xd4, 0xb2, 0xa7, + 0x7e, 0x5c, 0x0a, 0xf4, 0xd2, 0x47, 0xe8, 0x23, 0xe4, 0x31, 0x82, 0x1e, 0x8a, 0xa0, 0xa7, 0x9e, + 0x8a, 0xc2, 0x3e, 0xe4, 0x05, 0xfa, 0x00, 0x05, 0x77, 0x97, 0x1f, 0xd6, 0x87, 0x41, 0xd9, 0xb9, + 0x49, 0xc3, 0xff, 0xcc, 0xfe, 0x67, 0xf6, 0xb7, 0xe4, 0x42, 0x9d, 0xf4, 0x6c, 0xcb, 0xa6, 0x3e, + 0xb6, 0x6c, 0xea, 0xba, 0xd8, 0xe6, 0x84, 0xba, 0xd6, 0x78, 0xd7, 0xe2, 0xdf, 0x99, 0x9e, 0x4f, + 0x39, 0x45, 0x1b, 0xa4, 0x67, 0x9b, 0xa1, 0xc0, 0x4c, 0x04, 0xe6, 0x78, 0xd7, 0xa8, 0x3a, 0xd4, + 0xa1, 0x42, 0x62, 0x85, 0xbf, 0xa4, 0xda, 0xd8, 0xb4, 0x29, 0x1b, 0x52, 0x66, 0x0d, 0x99, 0x13, + 0x56, 0x19, 0x32, 0x47, 0x3d, 0xb8, 0xed, 0x50, 0xea, 0x9c, 0x61, 0x4b, 0xfc, 0xeb, 0x8d, 0x4e, + 0xac, 0xae, 0x1b, 0xa8, 0x47, 0x29, 0x0b, 0x67, 0x04, 0xbb, 0x3c, 0x4c, 0x94, 0xbf, 0x94, 0x60, + 0x6b, 0x8e, 0xc7, 0x94, 0x21, 0x21, 0x6c, 0xfe, 0xba, 0x04, 0xeb, 0x47, 0xcc, 0x69, 0xc5, 0xf1, + 0x2f, 0x3d, 0xec, 0x1e, 0xba, 0x84, 0xa3, 0x3b, 0x50, 0x92, 0x25, 0x3b, 0xa4, 0xaf, 0x6b, 0x0d, + 0x6d, 0xbb, 0xd4, 0x5e, 0x95, 0x81, 0xc3, 0x3e, 0xfa, 0x02, 0x2a, 0x36, 0x1d, 0xb9, 0x1c, 0xfb, + 0x5e, 0xd7, 0xe7, 0x81, 0xbe, 0xd4, 0xd0, 0xb6, 0xcb, 0x8f, 0x3e, 0x30, 0x67, 0x77, 0x6e, 0xb6, + 0x52, 0xda, 0x83, 0xfc, 0xab, 0x7f, 0xea, 0xb9, 0xf6, 0xa5, 0x7c, 0xf4, 0x09, 0xac, 0x8c, 0xb1, + 0xcf, 0x08, 0x75, 0xf5, 0x65, 0x51, 0xaa, 0x3e, 0xaf, 0xd4, 0x0b, 0x29, 0x6b, 0x47, 0x7a, 0x74, + 0x1f, 0x2a, 0x7d, 0x7c, 0xd6, 0x0d, 0x3a, 0x1e, 0xf6, 0x09, 0xed, 0xeb, 0xf9, 0x86, 0xb6, 0x9d, + 0x6f, 0x97, 0x45, 0xec, 0xb9, 0x08, 0xa1, 0x0d, 0x28, 0x32, 0xe2, 0xb8, 0xd8, 0xd7, 0x0b, 0xa2, + 0x0f, 0xf5, 0xef, 0xd9, 0xda, 0x2f, 0xbf, 0xd7, 0x73, 0x3f, 0xbd, 0x79, 0xf9, 0x40, 0x05, 0x9a, + 0x75, 0xb8, 0x37, 0x73, 0x18, 0x6d, 0xcc, 0x3c, 0xea, 0x32, 0xdc, 0xfc, 0xab, 0x00, 0xd5, 0x29, + 0xc5, 0xb1, 0x1f, 0x5c, 0x3d, 0xad, 0xa7, 0xb0, 0xe1, 0xf9, 0x78, 0x4c, 0xe8, 0x88, 0x75, 0x92, + 0x6e, 0x42, 0x65, 0x38, 0xb7, 0xd2, 0xc1, 0x92, 0xae, 0xb5, 0xab, 0x91, 0x22, 0xa9, 0x7d, 0xd8, + 0x47, 0x4f, 0xa0, 0xa2, 0xca, 0x32, 0xde, 0xe5, 0x58, 0x0d, 0xa7, 0x6a, 0x4a, 0x34, 0xcc, 0x08, + 0x0d, 0x73, 0xdf, 0x0d, 0xda, 0x65, 0xa9, 0xfc, 0x2a, 0x14, 0x4e, 0x6d, 0x50, 0xfe, 0x86, 0x1b, + 0x34, 0x39, 0xe5, 0xc2, 0xf4, 0x94, 0x8f, 0x61, 0x3d, 0x9d, 0xd2, 0x51, 0x1b, 0xc4, 0xf4, 0x62, + 0x63, 0x39, 0xcb, 0x8e, 0x56, 0xd3, 0xd9, 0x2a, 0xc8, 0x50, 0x0b, 0x2a, 0x9e, 0x4f, 0xe9, 0x49, + 0x67, 0x80, 0x89, 0x33, 0xe0, 0xfa, 0x8a, 0x68, 0xc4, 0x48, 0x15, 0x93, 0xdc, 0x8f, 0x77, 0xcd, + 0xcf, 0x84, 0x42, 0xd9, 0x2f, 0x8b, 0x2c, 0x19, 0x42, 0xf7, 0x00, 0x64, 0x11, 0xe2, 0x12, 0xae, + 0xaf, 0x36, 0xb4, 0xed, 0x4a, 0xbb, 0x24, 0x22, 0x02, 0xf5, 0xfb, 0xd1, 0x1a, 0xb2, 0x96, 0x5e, + 0x12, 0x02, 0x59, 0xa1, 0x25, 0x42, 0x68, 0x0b, 0xd6, 0x94, 0x24, 0xe4, 0xc0, 0x65, 0x23, 0xa6, + 0x83, 0x50, 0xbd, 0x23, 0x55, 0x51, 0x14, 0x7d, 0x0e, 0xef, 0xc6, 0x92, 0xc8, 0x73, 0x39, 0xa3, + 0xe7, 0xb5, 0x38, 0x53, 0xf9, 0x4e, 0xc0, 0xad, 0xa4, 0xc1, 0x45, 0x9f, 0x82, 0x31, 0xa0, 0x8c, + 0x27, 0x66, 0x24, 0x1e, 0x1d, 0xe1, 0x45, 0xbf, 0x25, 0x8c, 0x6d, 0x86, 0x8a, 0xd8, 0x97, 0xa0, + 0xe2, 0x79, 0xf8, 0x78, 0x9a, 0xfa, 0x1a, 0xdc, 0x9d, 0xc5, 0x74, 0x0c, 0xfd, 0x9f, 0xf9, 0x19, + 0xd0, 0xef, 0xdb, 0xa7, 0xe8, 0x7d, 0xb8, 0x75, 0x19, 0x67, 0x09, 0x7e, 0xc5, 0x4e, 0x23, 0xbc, + 0x07, 0xc6, 0x25, 0x2c, 0x66, 0x1c, 0x80, 0xb6, 0x9e, 0x56, 0x5c, 0x3a, 0x00, 0x37, 0x78, 0x31, + 0x4c, 0x9e, 0x9d, 0x7c, 0xd6, 0xb3, 0x33, 0x89, 0x5c, 0xe1, 0x3a, 0xc8, 0xdd, 0x01, 0x09, 0x58, + 0x87, 0xfb, 0x81, 0x5e, 0x14, 0x3b, 0xb2, 0x2a, 0x02, 0xe1, 0xdb, 0x62, 0x12, 0xb8, 0x95, 0x4c, + 0xc0, 0xad, 0x66, 0x06, 0xae, 0x74, 0x73, 0xe0, 0x60, 0x01, 0xe0, 0xca, 0x6f, 0x01, 0xb8, 0x7d, + 0xfb, 0x34, 0x06, 0xee, 0x0f, 0x0d, 0xf4, 0x29, 0x41, 0x8b, 0xba, 0x27, 0xc4, 0x1f, 0x66, 0x83, + 0x2e, 0x9e, 0x7e, 0xd7, 0x3e, 0x15, 0x8c, 0x45, 0xd3, 0x0f, 0xb1, 0x9d, 0xdc, 0xdf, 0xe5, 0xeb, + 0xec, 0x6f, 0x32, 0xa9, 0xfc, 0xd5, 0xdf, 0x94, 0x26, 0x34, 0xe6, 0xf5, 0x12, 0x37, 0xfc, 0xa3, + 0x06, 0x6b, 0x47, 0xcc, 0xf9, 0xda, 0xeb, 0x87, 0x43, 0xeb, 0xfa, 0xdd, 0x21, 0x43, 0x77, 0xa1, + 0xd4, 0x1d, 0xf1, 0x01, 0xf5, 0x09, 0x0f, 0x54, 0x8f, 0x49, 0x00, 0xed, 0x41, 0xd1, 0x13, 0x3a, + 0xf5, 0xe9, 0xad, 0xcd, 0x3b, 0x16, 0xb2, 0x9a, 0xea, 0x40, 0xe5, 0x3c, 0x43, 0x91, 0xc9, 0xa4, + 0x62, 0xf3, 0x36, 0x6c, 0x4e, 0x58, 0x88, 0xec, 0x3d, 0xfa, 0x2f, 0x0f, 0xcb, 0x47, 0xcc, 0x41, + 0xdf, 0x03, 0x9a, 0x71, 0x51, 0xd8, 0x99, 0xb7, 0xf4, 0xcc, 0x4f, 0xa9, 0xf1, 0xf1, 0x42, 0xf2, + 0xc8, 0x03, 0xfa, 0x16, 0xde, 0x9b, 0xfe, 0xea, 0x7e, 0x98, 0xb9, 0xd6, 0xb1, 0x1f, 0x18, 0x1f, + 0x2d, 0xa2, 0x9e, 0xbf, 0x70, 0x88, 0x50, 0xf6, 0x85, 0xf7, 0xed, 0xd3, 0x05, 0x16, 0x4e, 0x9d, + 0x02, 0xf4, 0xb3, 0x06, 0xeb, 0xb3, 0x8f, 0xc0, 0xc3, 0xcc, 0xf5, 0x54, 0x86, 0xf1, 0x74, 0xd1, + 0x8c, 0xd8, 0x85, 0x0f, 0x1b, 0x92, 0x89, 0x44, 0xa6, 0x00, 0xdd, 0xba, 0xa2, 0x66, 0x1a, 0x23, + 0xc3, 0xca, 0x28, 0x8c, 0xd6, 0x34, 0x0a, 0x3f, 0xbc, 0x79, 0xf9, 0x40, 0x3b, 0x78, 0xf1, 0xea, + 0xbc, 0xa6, 0xbd, 0x3e, 0xaf, 0x69, 0xff, 0x9e, 0xd7, 0xb4, 0xdf, 0x2e, 0x6a, 0xb9, 0xd7, 0x17, + 0xb5, 0xdc, 0xdf, 0x17, 0xb5, 0xdc, 0x37, 0x7b, 0x0e, 0xe1, 0x83, 0x51, 0xcf, 0xb4, 0xe9, 0xd0, + 0x52, 0xd7, 0x67, 0xd2, 0xb3, 0x77, 0x1c, 0x6a, 0x8d, 0x9f, 0x58, 0x43, 0xda, 0x1f, 0x9d, 0x61, + 0x26, 0xaf, 0xbf, 0x0f, 0x1f, 0xef, 0xa4, 0x6e, 0xc0, 0x3c, 0xf0, 0x30, 0xeb, 0x15, 0xc5, 0xab, + 0xff, 0xf1, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xb0, 0x86, 0xad, 0xc9, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/04-channel/client/cli/cli.go b/modules/core/04-channel/client/cli/cli.go index f8c8afd4d39..b4d777d4b18 100644 --- a/modules/core/04-channel/client/cli/cli.go +++ b/modules/core/04-channel/client/cli/cli.go @@ -1,9 +1,10 @@ package cli import ( - "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) diff --git a/modules/core/04-channel/client/cli/query.go b/modules/core/04-channel/client/cli/query.go index bac6660ed4e..1d51ef59a41 100644 --- a/modules/core/04-channel/client/cli/query.go +++ b/modules/core/04-channel/client/cli/query.go @@ -4,10 +4,11 @@ import ( "fmt" "strconv" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/client/utils" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/client/utils/utils.go b/modules/core/04-channel/client/utils/utils.go index 7110ee2879b..980a261640e 100644 --- a/modules/core/04-channel/client/utils/utils.go +++ b/modules/core/04-channel/client/utils/utils.go @@ -5,6 +5,7 @@ import ( "encoding/binary" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/modules/core/04-channel/keeper/grpc_query.go b/modules/core/04-channel/keeper/grpc_query.go index bf867810411..d0415e1bb63 100644 --- a/modules/core/04-channel/keeper/grpc_query.go +++ b/modules/core/04-channel/keeper/grpc_query.go @@ -5,12 +5,14 @@ import ( "strconv" "strings" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/core/04-channel/keeper/handshake.go b/modules/core/04-channel/keeper/handshake.go index 69213a0884c..3bc06ba83a4 100644 --- a/modules/core/04-channel/keeper/handshake.go +++ b/modules/core/04-channel/keeper/handshake.go @@ -4,10 +4,11 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/keeper/handshake_test.go b/modules/core/04-channel/keeper/handshake_test.go index ad349834e16..3b0c8057edc 100644 --- a/modules/core/04-channel/keeper/handshake_test.go +++ b/modules/core/04-channel/keeper/handshake_test.go @@ -4,7 +4,6 @@ import ( "fmt" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/keeper/keeper.go b/modules/core/04-channel/keeper/keeper.go index d628abbed83..5a02b9e0fb3 100644 --- a/modules/core/04-channel/keeper/keeper.go +++ b/modules/core/04-channel/keeper/keeper.go @@ -4,14 +4,15 @@ import ( "strconv" "strings" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" errorsmod "github.com/cosmos/cosmos-sdk/types/errors" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + db "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/keeper/packet.go b/modules/core/04-channel/keeper/packet.go index 1ec5e94521c..d448d45b822 100644 --- a/modules/core/04-channel/keeper/packet.go +++ b/modules/core/04-channel/keeper/packet.go @@ -6,9 +6,10 @@ import ( "time" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/keeper/packet_test.go b/modules/core/04-channel/keeper/packet_test.go index 82cb113ae6a..6077127d432 100644 --- a/modules/core/04-channel/keeper/packet_test.go +++ b/modules/core/04-channel/keeper/packet_test.go @@ -5,8 +5,8 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/keeper/timeout.go b/modules/core/04-channel/keeper/timeout.go index a0783131d9e..c0248917306 100644 --- a/modules/core/04-channel/keeper/timeout.go +++ b/modules/core/04-channel/keeper/timeout.go @@ -5,9 +5,10 @@ import ( "strconv" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/04-channel/keeper/timeout_test.go b/modules/core/04-channel/keeper/timeout_test.go index 337949b0288..3f834f4674b 100644 --- a/modules/core/04-channel/keeper/timeout_test.go +++ b/modules/core/04-channel/keeper/timeout_test.go @@ -5,8 +5,8 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/simulation/decoder_test.go b/modules/core/04-channel/simulation/decoder_test.go index 64fd06d89f9..1e7bba78189 100644 --- a/modules/core/04-channel/simulation/decoder_test.go +++ b/modules/core/04-channel/simulation/decoder_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/simulation" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/types/acknowledgement.go b/modules/core/04-channel/types/acknowledgement.go index 3e4d02a1180..27617d391f5 100644 --- a/modules/core/04-channel/types/acknowledgement.go +++ b/modules/core/04-channel/types/acknowledgement.go @@ -6,6 +6,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/modules/core/04-channel/types/acknowledgement_test.go b/modules/core/04-channel/types/acknowledgement_test.go index 3d7c6222d08..b5ff0af3141 100644 --- a/modules/core/04-channel/types/acknowledgement_test.go +++ b/modules/core/04-channel/types/acknowledgement_test.go @@ -4,10 +4,12 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + abcitypes "github.com/cometbft/cometbft/abci/types" tmprotostate "github.com/cometbft/cometbft/proto/tendermint/state" tmstate "github.com/cometbft/cometbft/state" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcerrors "github.com/cosmos/ibc-go/v7/modules/core/errors" diff --git a/modules/core/04-channel/types/expected_keepers.go b/modules/core/04-channel/types/expected_keepers.go index 3230929bd98..342164e9393 100644 --- a/modules/core/04-channel/types/expected_keepers.go +++ b/modules/core/04-channel/types/expected_keepers.go @@ -2,8 +2,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/core/04-channel/types/msgs.go b/modules/core/04-channel/types/msgs.go index 893b82156d0..a7afc17c71c 100644 --- a/modules/core/04-channel/types/msgs.go +++ b/modules/core/04-channel/types/msgs.go @@ -4,6 +4,7 @@ import ( "encoding/base64" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -22,6 +23,7 @@ var ( _ sdk.Msg = (*MsgRecvPacket)(nil) _ sdk.Msg = (*MsgAcknowledgement)(nil) _ sdk.Msg = (*MsgTimeout)(nil) + _ sdk.Msg = (*MsgTimeoutOnClose)(nil) ) // NewMsgChannelOpenInit creates a new MsgChannelOpenInit. It sets the counterparty channel diff --git a/modules/core/04-channel/types/msgs_test.go b/modules/core/04-channel/types/msgs_test.go index 0d459dde865..9a80c8e68eb 100644 --- a/modules/core/04-channel/types/msgs_test.go +++ b/modules/core/04-channel/types/msgs_test.go @@ -4,14 +4,16 @@ import ( "fmt" "testing" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - log "github.com/cometbft/cometbft/libs/log" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/store/iavl" "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + log "github.com/cometbft/cometbft/libs/log" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/types/packet.go b/modules/core/04-channel/types/packet.go index c007f3af9b0..26006f1fd20 100644 --- a/modules/core/04-channel/types/packet.go +++ b/modules/core/04-channel/types/packet.go @@ -4,6 +4,7 @@ import ( "crypto/sha256" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/04-channel/types/packet_test.go b/modules/core/04-channel/types/packet_test.go index 780844dbb54..a33c6fb75bd 100644 --- a/modules/core/04-channel/types/packet_test.go +++ b/modules/core/04-channel/types/packet_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/stretchr/testify/require" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go index 4674453a7f5..74ea4e61fd8 100644 --- a/modules/core/04-channel/types/tx.pb.go +++ b/modules/core/04-channel/types/tx.pb.go @@ -142,20 +142,6 @@ func (m *MsgChannelOpenInitResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgChannelOpenInitResponse proto.InternalMessageInfo -func (m *MsgChannelOpenInitResponse) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - -func (m *MsgChannelOpenInitResponse) GetVersion() string { - if m != nil { - return m.Version - } - return "" -} - // MsgChannelOpenInit defines a msg sent by a Relayer to try to open a channel // on Chain B. The version field within the Channel field has been deprecated. Its // value will be ignored by core IBC. @@ -243,20 +229,6 @@ func (m *MsgChannelOpenTryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgChannelOpenTryResponse proto.InternalMessageInfo -func (m *MsgChannelOpenTryResponse) GetVersion() string { - if m != nil { - return m.Version - } - return "" -} - -func (m *MsgChannelOpenTryResponse) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge // the change of channel state to TRYOPEN on Chain B. type MsgChannelOpenAck struct { @@ -926,82 +898,82 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1195 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xbb, 0x6f, 0xdb, 0x46, - 0x18, 0x17, 0x65, 0x59, 0xb2, 0x3f, 0xb9, 0xb1, 0x42, 0x25, 0xb1, 0x42, 0xdb, 0x92, 0xaa, 0x21, - 0x76, 0xdd, 0x5a, 0x8a, 0x95, 0x3e, 0x90, 0xa0, 0x40, 0x61, 0xab, 0x2a, 0x6a, 0xa0, 0x7e, 0x80, - 0x92, 0x0b, 0xf4, 0x81, 0x0a, 0x16, 0x75, 0xa1, 0x09, 0x49, 0x3c, 0x95, 0xa4, 0x94, 0xa8, 0x53, - 0xd1, 0x29, 0x30, 0x3a, 0x14, 0x9d, 0xba, 0x18, 0x08, 0xd0, 0xa9, 0x5b, 0xa6, 0x0e, 0xdd, 0x0b, - 0x64, 0xcc, 0xd8, 0x29, 0x68, 0xed, 0xc1, 0xfd, 0x33, 0x0a, 0xde, 0x1d, 0x29, 0x8a, 0x22, 0x43, - 0x39, 0x56, 0x93, 0x8d, 0xfc, 0xbe, 0xdf, 0x7d, 0x8f, 0xdf, 0xef, 0xee, 0x78, 0x3c, 0x58, 0x52, - 0xea, 0x52, 0x41, 0xc2, 0x1a, 0x2a, 0x48, 0x47, 0x87, 0xaa, 0x8a, 0x5a, 0x85, 0xde, 0x46, 0xc1, - 0x78, 0x98, 0xef, 0x68, 0xd8, 0xc0, 0x7c, 0x52, 0xa9, 0x4b, 0x79, 0xd3, 0x9b, 0x67, 0xde, 0x7c, - 0x6f, 0x43, 0xb8, 0x26, 0x63, 0x19, 0x13, 0x7f, 0xc1, 0x7c, 0xa2, 0x50, 0x21, 0x33, 0x08, 0xd4, - 0x52, 0x90, 0x6a, 0x98, 0x71, 0xe8, 0x13, 0x03, 0xbc, 0xe9, 0x95, 0xc9, 0x0a, 0x4b, 0x21, 0x0b, - 0x12, 0xd6, 0xdb, 0x58, 0x2f, 0xb4, 0x75, 0xd9, 0x74, 0xb6, 0x75, 0x99, 0x3a, 0x72, 0xbf, 0x70, - 0xc0, 0xef, 0xe8, 0x72, 0x89, 0xa2, 0xf7, 0x3a, 0x48, 0xdd, 0x56, 0x15, 0x83, 0x5f, 0x80, 0x58, - 0x07, 0x6b, 0x46, 0x4d, 0x69, 0xa4, 0xb8, 0x2c, 0xb7, 0x3a, 0x2b, 0x46, 0xcd, 0xd7, 0xed, 0x06, - 0xff, 0x21, 0xc4, 0x58, 0xe4, 0x54, 0x38, 0xcb, 0xad, 0xc6, 0x8b, 0x4b, 0x79, 0x8f, 0x4e, 0xf2, - 0x2c, 0xde, 0x56, 0xe4, 0xe9, 0xf3, 0x4c, 0x48, 0xb4, 0x86, 0xf0, 0x37, 0x20, 0xaa, 0x2b, 0xb2, - 0x8a, 0xb4, 0xd4, 0x14, 0x8d, 0x4a, 0xdf, 0xee, 0x25, 0x1f, 0x3d, 0xce, 0x84, 0xfe, 0x7d, 0x9c, - 0x09, 0xfd, 0x70, 0xfe, 0x64, 0x8d, 0x19, 0x73, 0x07, 0x20, 0x8c, 0x56, 0x26, 0x22, 0xbd, 0x83, - 0x55, 0x1d, 0xf1, 0xcb, 0x00, 0x2c, 0xea, 0xa0, 0xc8, 0x59, 0x66, 0xd9, 0x6e, 0xf0, 0x29, 0x88, - 0xf5, 0x90, 0xa6, 0x2b, 0x58, 0x25, 0x75, 0xce, 0x8a, 0xd6, 0x6b, 0xee, 0x34, 0x0c, 0x57, 0x87, - 0xe3, 0x56, 0xb5, 0xbe, 0x7f, 0xc3, 0x45, 0x48, 0x76, 0x34, 0xd4, 0x53, 0x70, 0x57, 0xaf, 0x39, - 0x12, 0x92, 0xa0, 0x5b, 0xe1, 0x14, 0x27, 0x5e, 0xb5, 0xdc, 0x25, 0x3b, 0xb9, 0x83, 0xa4, 0xa9, - 0x8b, 0x93, 0xb4, 0x01, 0xd7, 0x24, 0xdc, 0x55, 0x0d, 0xa4, 0x75, 0x0e, 0x35, 0xa3, 0x5f, 0xb3, - 0xfa, 0x88, 0x90, 0xba, 0x92, 0x4e, 0xdf, 0xe7, 0xd4, 0x65, 0x92, 0xd1, 0xd1, 0x30, 0xbe, 0x5f, - 0x53, 0x54, 0xc5, 0x48, 0x4d, 0x67, 0xb9, 0xd5, 0x39, 0x71, 0x96, 0x58, 0x88, 0x9a, 0x25, 0x98, - 0xa3, 0xee, 0x23, 0xa4, 0xc8, 0x47, 0x46, 0x2a, 0x4a, 0x8a, 0x12, 0x1c, 0x45, 0xd1, 0xe9, 0xd4, - 0xdb, 0xc8, 0x7f, 0x4a, 0x10, 0xac, 0xa4, 0x38, 0x19, 0x45, 0x4d, 0x0e, 0xed, 0x62, 0xc1, 0xda, - 0x55, 0xe1, 0xe6, 0x08, 0xc7, 0xb6, 0x74, 0x0e, 0x6d, 0xb8, 0x21, 0x6d, 0x5c, 0xa2, 0x86, 0x5d, - 0xa2, 0xe6, 0xfe, 0x1c, 0x91, 0x6e, 0x53, 0x6a, 0xfa, 0x4b, 0xf7, 0xe2, 0x68, 0xfc, 0xfb, 0xb0, - 0x30, 0xc4, 0xb3, 0x03, 0x4b, 0x67, 0xe7, 0x75, 0xa7, 0x7b, 0xa0, 0xee, 0x4b, 0xe8, 0xb3, 0x08, - 0x54, 0x8d, 0x9a, 0xa1, 0xf5, 0x99, 0x3c, 0x33, 0xc4, 0x60, 0x4e, 0xbd, 0x57, 0xaf, 0xce, 0xa2, - 0x5b, 0x9d, 0x4d, 0xa9, 0x69, 0xa9, 0x93, 0x7b, 0xce, 0xc1, 0xf5, 0x61, 0x6f, 0x09, 0xab, 0xf7, - 0x15, 0xad, 0xfd, 0xd2, 0x44, 0xdb, 0xdd, 0x1f, 0x4a, 0x4d, 0x42, 0xad, 0xd5, 0xbd, 0xa9, 0x9e, - 0xbb, 0xfb, 0xc8, 0xe5, 0xba, 0x9f, 0x0e, 0xee, 0x3e, 0x03, 0xcb, 0x9e, 0xfd, 0xd9, 0x0c, 0x7c, - 0x07, 0xc9, 0x01, 0xa0, 0xd4, 0xc2, 0x3a, 0x7a, 0xf1, 0x9e, 0x18, 0xd0, 0xfe, 0x85, 0x36, 0xbd, - 0x65, 0x58, 0xf4, 0xc8, 0x6d, 0x97, 0xf6, 0x0f, 0x07, 0x37, 0x5c, 0xfe, 0xcb, 0xaa, 0x33, 0xbc, - 0x77, 0x4c, 0x05, 0xed, 0x1d, 0xff, 0xbf, 0x3e, 0x59, 0x48, 0x7b, 0xb7, 0x68, 0xb3, 0x70, 0xce, - 0xc1, 0x1b, 0x3b, 0xba, 0x2c, 0x22, 0xa9, 0xb7, 0x7f, 0x28, 0x35, 0x91, 0xc1, 0xdf, 0x85, 0x68, - 0x87, 0x3c, 0x91, 0xde, 0xe3, 0xc5, 0x45, 0xcf, 0x0d, 0x97, 0x82, 0x59, 0x81, 0x6c, 0x00, 0xff, - 0x16, 0x24, 0x68, 0x83, 0x12, 0x6e, 0xb7, 0x15, 0xa3, 0x8d, 0x54, 0x83, 0x90, 0x34, 0x27, 0xce, - 0x13, 0x7b, 0xc9, 0x36, 0x8f, 0x70, 0x31, 0x75, 0x39, 0x2e, 0x22, 0xc1, 0x5c, 0x7c, 0x43, 0xd6, - 0xe2, 0xa0, 0x51, 0x7b, 0x0f, 0xfd, 0x08, 0xa2, 0x1a, 0xd2, 0xbb, 0x2d, 0xda, 0xf0, 0x95, 0xe2, - 0x8a, 0x67, 0xc3, 0x16, 0x5c, 0x24, 0xd0, 0x6a, 0xbf, 0x83, 0x44, 0x36, 0xec, 0x5e, 0xc4, 0x4c, - 0x97, 0xfb, 0x39, 0x0c, 0xb0, 0xa3, 0xcb, 0x55, 0xa5, 0x8d, 0x70, 0x77, 0x32, 0x34, 0x76, 0x55, - 0x0d, 0x49, 0x48, 0xe9, 0xa1, 0xc6, 0x10, 0x8d, 0x07, 0xb6, 0x79, 0x32, 0x34, 0xbe, 0x03, 0xbc, - 0x8a, 0x1e, 0x1a, 0x35, 0x1d, 0x7d, 0xdb, 0x45, 0xaa, 0x84, 0x6a, 0x1a, 0x92, 0x7a, 0x84, 0xd2, - 0x88, 0x98, 0x30, 0x3d, 0x15, 0xe6, 0x30, 0xc9, 0xbb, 0xd8, 0x04, 0xfc, 0x8a, 0x1c, 0x89, 0x18, - 0x27, 0x93, 0x66, 0xfc, 0x0f, 0xfa, 0x0d, 0x63, 0xd1, 0xf7, 0x54, 0x32, 0xc1, 0x5f, 0x11, 0xf1, - 0x19, 0x88, 0xb3, 0xa9, 0x6e, 0x26, 0x65, 0x6b, 0x9d, 0xae, 0x7e, 0x5a, 0xc6, 0x44, 0x16, 0xbb, - 0xb7, 0x32, 0xd3, 0x81, 0xca, 0x44, 0x83, 0x95, 0xa9, 0x93, 0x0f, 0xd7, 0x30, 0x77, 0x93, 0x16, - 0xe8, 0xc7, 0x30, 0x91, 0x7f, 0x53, 0x6a, 0xaa, 0xf8, 0x41, 0x0b, 0x35, 0x64, 0x44, 0xd6, 0xfe, - 0x25, 0x14, 0x5a, 0x85, 0xf9, 0xc3, 0xe1, 0x68, 0x96, 0x40, 0x2e, 0xf3, 0x40, 0x20, 0x73, 0x60, - 0x63, 0x48, 0xa0, 0x4d, 0xd3, 0xf2, 0x1a, 0x76, 0x63, 0x89, 0x9c, 0xc2, 0x5d, 0x6c, 0x4c, 0x98, - 0xf3, 0xb5, 0xdf, 0x38, 0xe0, 0x47, 0x41, 0xfc, 0x7b, 0x90, 0x15, 0xcb, 0x95, 0xfd, 0xbd, 0xdd, - 0x4a, 0xb9, 0x26, 0x96, 0x2b, 0x07, 0x9f, 0x55, 0x6b, 0xd5, 0x2f, 0xf6, 0xcb, 0xb5, 0x83, 0xdd, - 0xca, 0x7e, 0xb9, 0xb4, 0xfd, 0xc9, 0x76, 0xf9, 0xe3, 0x44, 0x48, 0x98, 0x3f, 0x3e, 0xc9, 0xc6, - 0x1d, 0x26, 0x7e, 0x05, 0x6e, 0x7a, 0x0e, 0xdb, 0xdd, 0xdb, 0xdb, 0x4f, 0x70, 0xc2, 0xcc, 0xf1, - 0x49, 0x36, 0x62, 0x3e, 0xf3, 0xeb, 0xb0, 0xe4, 0x09, 0xac, 0x1c, 0x94, 0x4a, 0xe5, 0x4a, 0x25, - 0x11, 0x16, 0xe2, 0xc7, 0x27, 0xd9, 0x18, 0x7b, 0x15, 0x22, 0x8f, 0x7e, 0x4d, 0x87, 0x8a, 0xbf, - 0xcf, 0xc0, 0xd4, 0x8e, 0x2e, 0xf3, 0x4d, 0x98, 0x77, 0xff, 0x35, 0x79, 0x77, 0x3f, 0xfa, 0x13, - 0x23, 0x14, 0xc6, 0x04, 0xda, 0x3c, 0x1f, 0xc1, 0x15, 0xd7, 0x0f, 0xcb, 0xad, 0x31, 0x42, 0x54, - 0xb5, 0xbe, 0x90, 0x1f, 0x0f, 0xe7, 0x93, 0xc9, 0x3c, 0xa1, 0x8d, 0x93, 0x69, 0x53, 0x6a, 0x8e, - 0x95, 0xc9, 0x71, 0xd0, 0xe4, 0x0d, 0xe0, 0x3d, 0x0e, 0x99, 0x6b, 0x63, 0x44, 0x61, 0x58, 0xa1, - 0x38, 0x3e, 0xd6, 0xce, 0xaa, 0x42, 0x62, 0xe4, 0x64, 0xb7, 0x1a, 0x10, 0xc7, 0x46, 0x0a, 0xb7, - 0xc7, 0x45, 0xda, 0xf9, 0x1e, 0x40, 0xd2, 0xeb, 0xb4, 0xf6, 0xf6, 0x38, 0x81, 0xac, 0x3e, 0xef, - 0x5c, 0x00, 0x6c, 0x27, 0xfe, 0x1a, 0xc0, 0x71, 0x40, 0xca, 0xf9, 0x85, 0x18, 0x60, 0x84, 0xb5, - 0x60, 0x8c, 0x1d, 0xbd, 0x02, 0x31, 0xeb, 0xd0, 0x90, 0xf1, 0x1b, 0xc6, 0x00, 0xc2, 0x4a, 0x00, - 0xc0, 0x39, 0xf7, 0x5c, 0xdf, 0xc5, 0x5b, 0x01, 0x43, 0x19, 0xce, 0x7f, 0xee, 0xf9, 0x7c, 0x2b, - 0x9a, 0x30, 0xef, 0xde, 0xe0, 0x7d, 0xab, 0x74, 0x01, 0xfd, 0x17, 0xaf, 0xcf, 0x26, 0x29, 0x4c, - 0x7f, 0x7f, 0xfe, 0x64, 0x8d, 0xdb, 0xaa, 0x3c, 0x3d, 0x4d, 0x73, 0xcf, 0x4e, 0xd3, 0xdc, 0xdf, - 0xa7, 0x69, 0xee, 0xa7, 0xb3, 0x74, 0xe8, 0xd9, 0x59, 0x3a, 0xf4, 0xd7, 0x59, 0x3a, 0xf4, 0xe5, - 0x5d, 0x59, 0x31, 0x8e, 0xba, 0xf5, 0xbc, 0x84, 0xdb, 0x05, 0x76, 0x51, 0xa3, 0xd4, 0xa5, 0x75, - 0x19, 0x17, 0x7a, 0x1f, 0x14, 0xda, 0xb8, 0xd1, 0x6d, 0x21, 0x9d, 0x5e, 0xf0, 0xdc, 0x7e, 0x77, - 0xdd, 0xba, 0xe3, 0x31, 0xfa, 0x1d, 0xa4, 0xd7, 0xa3, 0xe4, 0x1a, 0xe7, 0xce, 0x7f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x3c, 0xdb, 0x68, 0xa8, 0x6e, 0x12, 0x00, 0x00, + // 1191 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xbd, 0x6f, 0xdb, 0x46, + 0x14, 0x17, 0x65, 0x59, 0xb2, 0x9f, 0xdc, 0x48, 0xa1, 0x93, 0x58, 0xa1, 0x6d, 0x49, 0xf5, 0x10, + 0xbb, 0x6e, 0x2d, 0xc5, 0x4a, 0x3f, 0x90, 0xa0, 0x40, 0x61, 0xab, 0x2a, 0x6a, 0xa0, 0xfe, 0x00, + 0x25, 0x17, 0x68, 0x52, 0x54, 0xb0, 0xa8, 0x0b, 0x4d, 0x48, 0xe2, 0xa9, 0x24, 0xa5, 0x44, 0x5b, + 0xd1, 0xc9, 0xf0, 0x50, 0x74, 0xe8, 0x6a, 0xa0, 0x40, 0xa7, 0x6e, 0x99, 0xb2, 0x77, 0xcb, 0x98, + 0xb1, 0x28, 0xd0, 0xa0, 0xb0, 0x87, 0xfc, 0x1b, 0x05, 0xef, 0x8e, 0x14, 0x45, 0x91, 0x12, 0x13, + 0x2b, 0xde, 0xc8, 0xf7, 0x7e, 0xf7, 0x3e, 0x7e, 0xbf, 0xe3, 0xe3, 0x91, 0xb0, 0xa4, 0xd4, 0xa4, + 0xbc, 0x84, 0x35, 0x94, 0x97, 0x8e, 0x8f, 0x54, 0x15, 0x35, 0xf3, 0xdd, 0xcd, 0xbc, 0xf1, 0x34, + 0xd7, 0xd6, 0xb0, 0x81, 0xf9, 0x79, 0xa5, 0x26, 0xe5, 0x4c, 0x6f, 0x8e, 0x79, 0x73, 0xdd, 0x4d, + 0xe1, 0x86, 0x8c, 0x65, 0x4c, 0xfc, 0x79, 0xf3, 0x8a, 0x42, 0x85, 0x4c, 0x3f, 0x50, 0x53, 0x41, + 0xaa, 0x61, 0xc6, 0xa1, 0x57, 0x0c, 0xf0, 0xbe, 0x57, 0x26, 0x2b, 0x2c, 0x85, 0x2c, 0x48, 0x58, + 0x6f, 0x61, 0x3d, 0xdf, 0xd2, 0x65, 0xd3, 0xd9, 0xd2, 0x65, 0xea, 0x58, 0xf9, 0x8d, 0x03, 0x7e, + 0x57, 0x97, 0x8b, 0x14, 0xbd, 0xdf, 0x46, 0xea, 0x8e, 0xaa, 0x18, 0xfc, 0x02, 0xc4, 0xda, 0x58, + 0x33, 0xaa, 0x4a, 0x3d, 0xc5, 0x65, 0xb9, 0xb5, 0x59, 0x31, 0x6a, 0xde, 0xee, 0xd4, 0xf9, 0xcf, + 0x21, 0xc6, 0x22, 0xa7, 0xc2, 0x59, 0x6e, 0x2d, 0x5e, 0x58, 0xca, 0x79, 0x74, 0x92, 0x63, 0xf1, + 0xb6, 0x23, 0x2f, 0x5e, 0x65, 0x42, 0xa2, 0xb5, 0x84, 0xbf, 0x05, 0x51, 0x5d, 0x91, 0x55, 0xa4, + 0xa5, 0xa6, 0x68, 0x54, 0x7a, 0xf7, 0x20, 0x71, 0xf2, 0x7b, 0x26, 0xf4, 0xf3, 0xeb, 0x67, 0xeb, + 0xcc, 0xb0, 0xf2, 0x08, 0x84, 0xe1, 0xaa, 0x44, 0xa4, 0xb7, 0xb1, 0xaa, 0x23, 0x7e, 0x19, 0x80, + 0x45, 0xec, 0x17, 0x38, 0xcb, 0x2c, 0x3b, 0x75, 0x3e, 0x05, 0xb1, 0x2e, 0xd2, 0x74, 0x05, 0xab, + 0xa4, 0xc6, 0x59, 0xd1, 0xba, 0x7d, 0x10, 0x31, 0xf3, 0xac, 0xbc, 0x0a, 0xc3, 0xf5, 0xc1, 0xe8, + 0x15, 0xad, 0xe7, 0xdf, 0x72, 0x01, 0xe6, 0xdb, 0x1a, 0xea, 0x2a, 0xb8, 0xa3, 0x57, 0x1d, 0x69, + 0x49, 0xe8, 0xed, 0x70, 0x8a, 0x13, 0xaf, 0x5b, 0xee, 0xa2, 0x5d, 0x82, 0x83, 0xa6, 0xa9, 0x37, + 0xa7, 0x69, 0x13, 0x6e, 0x48, 0xb8, 0xa3, 0x1a, 0x48, 0x6b, 0x1f, 0x69, 0x46, 0xaf, 0x6a, 0x75, + 0x13, 0x21, 0x75, 0xcd, 0x3b, 0x7d, 0xdf, 0x52, 0x97, 0x49, 0x49, 0x5b, 0xc3, 0xf8, 0x71, 0x55, + 0x51, 0x15, 0x23, 0x35, 0x9d, 0xe5, 0xd6, 0xe6, 0xc4, 0x59, 0x62, 0x21, 0x7a, 0x16, 0x61, 0x8e, + 0xba, 0x8f, 0x91, 0x22, 0x1f, 0x1b, 0xa9, 0x28, 0x29, 0x4a, 0x70, 0x14, 0x45, 0x37, 0x54, 0x77, + 0x33, 0xf7, 0x35, 0x41, 0xb0, 0x92, 0xe2, 0x64, 0x15, 0x35, 0x39, 0xd4, 0x8b, 0x8d, 0x56, 0xef, + 0x21, 0xdc, 0x1e, 0xe2, 0xd7, 0x16, 0xcf, 0xa1, 0x0e, 0x37, 0xa0, 0x8e, 0x4b, 0xd6, 0xb0, 0x4b, + 0x56, 0x26, 0xde, 0x5f, 0x43, 0xe2, 0x6d, 0x49, 0x0d, 0x7f, 0xf1, 0x46, 0xc7, 0xe4, 0x3f, 0x85, + 0x85, 0x01, 0xa6, 0x1d, 0x58, 0xba, 0x43, 0x6f, 0x3a, 0xdd, 0x7d, 0x7d, 0xdf, 0x42, 0xa1, 0x45, + 0xa0, 0x7a, 0x54, 0x0d, 0xad, 0xc7, 0x04, 0x9a, 0x21, 0x06, 0x73, 0xf3, 0x5d, 0xad, 0x3e, 0x8b, + 0x6e, 0x7d, 0xb6, 0xa4, 0x86, 0xa5, 0xcf, 0xca, 0x3f, 0x1c, 0xdc, 0x1c, 0xf4, 0x16, 0xb1, 0xfa, + 0x58, 0xd1, 0x5a, 0x6f, 0x4d, 0xb2, 0xdd, 0xf9, 0x91, 0xd4, 0x20, 0xb4, 0x5a, 0x9d, 0x9b, 0xca, + 0xb9, 0x3b, 0x8f, 0x5c, 0xae, 0xf3, 0xe9, 0xd1, 0x9d, 0x67, 0x60, 0xd9, 0xb3, 0x37, 0xbb, 0xfb, + 0x2e, 0xcc, 0xf7, 0x01, 0xc5, 0x26, 0xd6, 0xd1, 0xe8, 0x79, 0x38, 0xa6, 0xf5, 0xc0, 0x03, 0x6f, + 0x19, 0x16, 0x3d, 0xf2, 0xda, 0x65, 0xfd, 0xcb, 0xc1, 0x2d, 0x97, 0xff, 0xb2, 0xaa, 0x0c, 0x4e, + 0x8c, 0xa9, 0x71, 0x13, 0xe3, 0xdd, 0xea, 0x92, 0x85, 0xb4, 0x77, 0x7b, 0x36, 0x03, 0x17, 0x1c, + 0xbc, 0xb7, 0xab, 0xcb, 0x22, 0x92, 0xba, 0x07, 0x47, 0x52, 0x03, 0x19, 0xfc, 0x7d, 0x88, 0xb6, + 0xc9, 0x15, 0xe9, 0x3b, 0x5e, 0x58, 0xf4, 0x1c, 0xb1, 0x14, 0xcc, 0x8a, 0x63, 0x0b, 0xf8, 0x0f, + 0x20, 0x49, 0x9b, 0x93, 0x70, 0xab, 0xa5, 0x18, 0x2d, 0xa4, 0x1a, 0x84, 0xa0, 0x39, 0x31, 0x41, + 0xec, 0x45, 0xdb, 0x3c, 0xc4, 0xc3, 0xd4, 0xe5, 0x78, 0x88, 0x8c, 0xe6, 0xe1, 0x07, 0xf2, 0xec, + 0xf5, 0x9b, 0xb4, 0xa7, 0xe6, 0x17, 0x10, 0xd5, 0x90, 0xde, 0x69, 0xd2, 0x66, 0xaf, 0x15, 0x56, + 0x3d, 0x9b, 0xb5, 0xe0, 0x22, 0x81, 0x56, 0x7a, 0x6d, 0x24, 0xb2, 0x65, 0x6c, 0x7a, 0xfe, 0x12, + 0x06, 0xd8, 0xd5, 0xe5, 0x8a, 0xd2, 0x42, 0xb8, 0x33, 0x19, 0x0a, 0x3b, 0xaa, 0x86, 0x24, 0xa4, + 0x74, 0x51, 0x7d, 0x80, 0xc2, 0x43, 0xdb, 0x3c, 0x19, 0x0a, 0x3f, 0x02, 0x5e, 0x45, 0x4f, 0x8d, + 0xaa, 0x8e, 0x7e, 0xec, 0x20, 0x55, 0x42, 0x55, 0x0d, 0x49, 0x5d, 0x42, 0x67, 0x44, 0x4c, 0x9a, + 0x9e, 0x32, 0x73, 0x98, 0xe4, 0x05, 0xdf, 0x78, 0x8f, 0xc8, 0xf1, 0x87, 0xf1, 0x31, 0x69, 0xb6, + 0x9f, 0xd3, 0x77, 0x15, 0x8b, 0xbe, 0xaf, 0x92, 0x8d, 0x7d, 0x45, 0xa4, 0x67, 0x20, 0xce, 0xb6, + 0xb8, 0x99, 0x94, 0x3d, 0xdf, 0xf4, 0x89, 0xa7, 0x65, 0x4c, 0xe4, 0x01, 0xf7, 0x56, 0x65, 0x7a, + 0xac, 0x2a, 0xd1, 0xd1, 0xaa, 0xd4, 0xc8, 0x0b, 0x6a, 0x90, 0xb7, 0x49, 0x8b, 0x73, 0x12, 0x26, + 0xd2, 0x6f, 0x49, 0x0d, 0x15, 0x3f, 0x69, 0xa2, 0xba, 0x8c, 0xc8, 0xf3, 0x7e, 0x09, 0x75, 0xd6, + 0x20, 0x71, 0x34, 0x18, 0xcd, 0x12, 0xc7, 0x65, 0xee, 0x8b, 0x63, 0x2e, 0xac, 0x0f, 0x88, 0xb3, + 0x65, 0x5a, 0xae, 0x78, 0xfa, 0x4a, 0xe4, 0xb4, 0xed, 0x62, 0x62, 0xc2, 0x7c, 0xaf, 0xff, 0xc9, + 0x01, 0x3f, 0x0c, 0xe2, 0x3f, 0x81, 0xac, 0x58, 0x2a, 0x1f, 0xec, 0xef, 0x95, 0x4b, 0x55, 0xb1, + 0x54, 0x3e, 0xfc, 0xa6, 0x52, 0xad, 0x7c, 0x77, 0x50, 0xaa, 0x1e, 0xee, 0x95, 0x0f, 0x4a, 0xc5, + 0x9d, 0xaf, 0x76, 0x4a, 0x5f, 0x26, 0x43, 0x42, 0xe2, 0xf4, 0x2c, 0x1b, 0x77, 0x98, 0xf8, 0x55, + 0xb8, 0xed, 0xb9, 0x6c, 0x6f, 0x7f, 0xff, 0x20, 0xc9, 0x09, 0x33, 0xa7, 0x67, 0xd9, 0x88, 0x79, + 0xcd, 0x6f, 0xc0, 0x92, 0x27, 0xb0, 0x7c, 0x58, 0x2c, 0x96, 0xca, 0xe5, 0x64, 0x58, 0x88, 0x9f, + 0x9e, 0x65, 0x63, 0xec, 0x56, 0x88, 0x9c, 0xfc, 0x91, 0x0e, 0x15, 0x9e, 0xcf, 0xc0, 0xd4, 0xae, + 0x2e, 0xf3, 0x0d, 0x48, 0xb8, 0xbf, 0x8c, 0xbc, 0xbb, 0x1f, 0xfe, 0x58, 0x11, 0xf2, 0x01, 0x81, + 0x36, 0xcf, 0xc7, 0x70, 0xcd, 0xf5, 0x49, 0x72, 0x27, 0x40, 0x88, 0x8a, 0xd6, 0x13, 0x72, 0xc1, + 0x70, 0x3e, 0x99, 0xcc, 0x53, 0x58, 0x90, 0x4c, 0x5b, 0x52, 0x23, 0x50, 0x26, 0xc7, 0x61, 0x92, + 0x37, 0x80, 0xf7, 0x38, 0x48, 0xae, 0x07, 0x88, 0xc2, 0xb0, 0x42, 0x21, 0x38, 0xd6, 0xce, 0xaa, + 0x42, 0x72, 0xe8, 0x04, 0xb7, 0x36, 0x26, 0x8e, 0x8d, 0x14, 0xee, 0x06, 0x45, 0xda, 0xf9, 0x9e, + 0xc0, 0xbc, 0xd7, 0xc9, 0xec, 0xc3, 0x20, 0x81, 0xac, 0x3e, 0xef, 0xbd, 0x01, 0xd8, 0x4e, 0xfc, + 0x3d, 0x80, 0xe3, 0x40, 0xb4, 0xe2, 0x17, 0xa2, 0x8f, 0x11, 0xd6, 0xc7, 0x63, 0xec, 0xe8, 0x65, + 0x88, 0x59, 0x07, 0x85, 0x8c, 0xdf, 0x32, 0x06, 0x10, 0x56, 0xc7, 0x00, 0x9c, 0x7b, 0xcf, 0xf5, + 0x3e, 0xbc, 0x33, 0x66, 0x29, 0xc3, 0xf9, 0xef, 0x3d, 0x9f, 0xf7, 0x44, 0x03, 0x12, 0xee, 0xe1, + 0xee, 0x5b, 0xa5, 0x0b, 0xe8, 0xff, 0xf0, 0xfa, 0x0c, 0x49, 0x61, 0xfa, 0xa7, 0xd7, 0xcf, 0xd6, + 0xb9, 0xed, 0xf2, 0x8b, 0xf3, 0x34, 0xf7, 0xf2, 0x3c, 0xcd, 0xfd, 0x77, 0x9e, 0xe6, 0x7e, 0xbd, + 0x48, 0x87, 0x5e, 0x5e, 0xa4, 0x43, 0x7f, 0x5f, 0xa4, 0x43, 0x0f, 0xef, 0xcb, 0x8a, 0x71, 0xdc, + 0xa9, 0xe5, 0x24, 0xdc, 0xca, 0xb3, 0x9f, 0x31, 0x4a, 0x4d, 0xda, 0x90, 0x71, 0xbe, 0xfb, 0x59, + 0xbe, 0x85, 0xeb, 0x9d, 0x26, 0xd2, 0xe9, 0x4f, 0x9c, 0xbb, 0x1f, 0x6f, 0x58, 0xff, 0x71, 0x8c, + 0x5e, 0x1b, 0xe9, 0xb5, 0x28, 0xf9, 0x55, 0x73, 0xef, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, + 0xc3, 0x02, 0x4e, 0x52, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/05-port/keeper/keeper.go b/modules/core/05-port/keeper/keeper.go index 802b818c8cc..f83c42af64b 100644 --- a/modules/core/05-port/keeper/keeper.go +++ b/modules/core/05-port/keeper/keeper.go @@ -3,10 +3,11 @@ package keeper import ( "fmt" - "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + "github.com/cometbft/cometbft/libs/log" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/05-port/keeper/keeper_test.go b/modules/core/05-port/keeper/keeper_test.go index b0459afa564..013f90868d9 100644 --- a/modules/core/05-port/keeper/keeper_test.go +++ b/modules/core/05-port/keeper/keeper_test.go @@ -3,11 +3,13 @@ package keeper_test import ( "testing" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/ibc-go/v7/modules/core/05-port/keeper" "github.com/cosmos/ibc-go/v7/testing/simapp" ) diff --git a/modules/core/05-port/types/module.go b/modules/core/05-port/types/module.go index e6fef6420af..33465bf6f98 100644 --- a/modules/core/05-port/types/module.go +++ b/modules/core/05-port/types/module.go @@ -2,8 +2,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/23-commitment/types/commitment_test.go b/modules/core/23-commitment/types/commitment_test.go index 093e7df674c..9d204e108bf 100644 --- a/modules/core/23-commitment/types/commitment_test.go +++ b/modules/core/23-commitment/types/commitment_test.go @@ -3,12 +3,14 @@ package types_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/store/iavl" "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/stretchr/testify/suite" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" ) type MerkleTestSuite struct { diff --git a/modules/core/23-commitment/types/merkle.go b/modules/core/23-commitment/types/merkle.go index 07c91deabc2..79a2c113fc6 100644 --- a/modules/core/23-commitment/types/merkle.go +++ b/modules/core/23-commitment/types/merkle.go @@ -5,11 +5,13 @@ import ( "fmt" "net/url" - errorsmod "cosmossdk.io/errors" - tmcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" "github.com/cosmos/gogoproto/proto" ics23 "github.com/cosmos/ics23/go" + errorsmod "cosmossdk.io/errors" + + tmcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/core/23-commitment/types/merkle_test.go b/modules/core/23-commitment/types/merkle_test.go index 90fee1a8761..5b80c7ce266 100644 --- a/modules/core/23-commitment/types/merkle_test.go +++ b/modules/core/23-commitment/types/merkle_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/require" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ) diff --git a/modules/core/23-commitment/types/utils.go b/modules/core/23-commitment/types/utils.go index 83844d35960..79530fc51fd 100644 --- a/modules/core/23-commitment/types/utils.go +++ b/modules/core/23-commitment/types/utils.go @@ -1,9 +1,11 @@ package types import ( + ics23 "github.com/cosmos/ics23/go" + errorsmod "cosmossdk.io/errors" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - ics23 "github.com/cosmos/ics23/go" ) // ConvertProofs converts crypto.ProofOps into MerkleProof diff --git a/modules/core/23-commitment/types/utils_test.go b/modules/core/23-commitment/types/utils_test.go index 4f5b4f89f5c..f82dce0ad82 100644 --- a/modules/core/23-commitment/types/utils_test.go +++ b/modules/core/23-commitment/types/utils_test.go @@ -3,9 +3,10 @@ package types_test import ( "fmt" + "github.com/stretchr/testify/require" + abci "github.com/cometbft/cometbft/abci/types" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ) diff --git a/modules/core/ante/ante_test.go b/modules/core/ante/ante_test.go index 20ed350a053..1ec224abe58 100644 --- a/modules/core/ante/ante_test.go +++ b/modules/core/ante/ante_test.go @@ -3,10 +3,11 @@ package ante_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/core/client/cli/cli.go b/modules/core/client/cli/cli.go index 6d5da971264..08871519579 100644 --- a/modules/core/client/cli/cli.go +++ b/modules/core/client/cli/cli.go @@ -1,9 +1,10 @@ package cli import ( - "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" connection "github.com/cosmos/ibc-go/v7/modules/core/03-connection" channel "github.com/cosmos/ibc-go/v7/modules/core/04-channel" diff --git a/modules/core/client/query.go b/modules/core/client/query.go index 19b490a1c25..57e06d56c3c 100644 --- a/modules/core/client/query.go +++ b/modules/core/client/query.go @@ -3,10 +3,11 @@ package client import ( "fmt" - abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" + abci "github.com/cometbft/cometbft/abci/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/modules/core/exported/client.go b/modules/core/exported/client.go index 731d7e5edf7..1655df03141 100644 --- a/modules/core/exported/client.go +++ b/modules/core/exported/client.go @@ -1,9 +1,10 @@ package exported import ( + proto "github.com/cosmos/gogoproto/proto" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - proto "github.com/cosmos/gogoproto/proto" ) // Status represents the status of a client diff --git a/modules/core/exported/expected_keepers.go b/modules/core/exported/expected_keepers.go index afd4bce4e56..f1496c7f2b2 100644 --- a/modules/core/exported/expected_keepers.go +++ b/modules/core/exported/expected_keepers.go @@ -2,6 +2,7 @@ package exported import ( sdk "github.com/cosmos/cosmos-sdk/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" ) diff --git a/modules/core/genesis_test.go b/modules/core/genesis_test.go index 51ba25a9ea0..64e60ee231c 100644 --- a/modules/core/genesis_test.go +++ b/modules/core/genesis_test.go @@ -4,10 +4,12 @@ import ( "fmt" "testing" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/codec" "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/codec" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + ibc "github.com/cosmos/ibc-go/v7/modules/core" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/modules/core/keeper/keeper.go b/modules/core/keeper/keeper.go index fb2583a72c4..3c3d30a9ddf 100644 --- a/modules/core/keeper/keeper.go +++ b/modules/core/keeper/keeper.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectionkeeper "github.com/cosmos/ibc-go/v7/modules/core/03-connection/keeper" diff --git a/modules/core/keeper/keeper_test.go b/modules/core/keeper/keeper_test.go index 8f927fb1815..19fb8132a07 100644 --- a/modules/core/keeper/keeper_test.go +++ b/modules/core/keeper/keeper_test.go @@ -4,13 +4,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" - capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" - "github.com/stretchr/testify/suite" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index c75f11b8d87..dc2690e4e97 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -3,8 +3,10 @@ package keeper import ( "context" - errorsmod "cosmossdk.io/errors" metrics "github.com/armon/go-metrics" + + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/migrations/v7/genesis_test.go b/modules/core/migrations/v7/genesis_test.go index 943a9d9593f..bdbacb066b8 100644 --- a/modules/core/migrations/v7/genesis_test.go +++ b/modules/core/migrations/v7/genesis_test.go @@ -3,10 +3,11 @@ package v7_test import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/stretchr/testify/suite" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" clientv7 "github.com/cosmos/ibc-go/v7/modules/core/02-client/migrations/v7" diff --git a/modules/core/module.go b/modules/core/module.go index 08bec4991fb..501e5459f5b 100644 --- a/modules/core/module.go +++ b/modules/core/module.go @@ -5,15 +5,17 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" + + abci "github.com/cometbft/cometbft/abci/types" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" diff --git a/modules/core/simulation/decoder_test.go b/modules/core/simulation/decoder_test.go index bf0388ccd69..1c8787698e0 100644 --- a/modules/core/simulation/decoder_test.go +++ b/modules/core/simulation/decoder_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/types/kv" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types/kv" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/core/simulation/genesis_test.go b/modules/core/simulation/genesis_test.go index f3bbf9ecc1c..bc589d016eb 100644 --- a/modules/core/simulation/genesis_test.go +++ b/modules/core/simulation/genesis_test.go @@ -5,13 +5,15 @@ import ( "math/rand" "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/stretchr/testify/require" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/cosmos/ibc-go/v7/modules/core/simulation" diff --git a/modules/light-clients/06-solomachine/client_state.go b/modules/light-clients/06-solomachine/client_state.go index fbd84e62534..282c421807a 100644 --- a/modules/light-clients/06-solomachine/client_state.go +++ b/modules/light-clients/06-solomachine/client_state.go @@ -4,6 +4,7 @@ import ( "reflect" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/06-solomachine/codec.go b/modules/light-clients/06-solomachine/codec.go index e18cd8b563c..2050df17d31 100644 --- a/modules/light-clients/06-solomachine/codec.go +++ b/modules/light-clients/06-solomachine/codec.go @@ -2,6 +2,7 @@ package solomachine import ( errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" diff --git a/modules/light-clients/06-solomachine/consensus_state.go b/modules/light-clients/06-solomachine/consensus_state.go index 8925ec3a5c2..3394311ab96 100644 --- a/modules/light-clients/06-solomachine/consensus_state.go +++ b/modules/light-clients/06-solomachine/consensus_state.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/light-clients/06-solomachine/header.go b/modules/light-clients/06-solomachine/header.go index 87d90dee48b..38c59ba7054 100644 --- a/modules/light-clients/06-solomachine/header.go +++ b/modules/light-clients/06-solomachine/header.go @@ -4,6 +4,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/light-clients/06-solomachine/misbehaviour_handle.go b/modules/light-clients/06-solomachine/misbehaviour_handle.go index f65f3c95350..0d1d2a3a618 100644 --- a/modules/light-clients/06-solomachine/misbehaviour_handle.go +++ b/modules/light-clients/06-solomachine/misbehaviour_handle.go @@ -1,9 +1,9 @@ package solomachine import ( - "github.com/cosmos/cosmos-sdk/codec" - errorsmod "cosmossdk.io/errors" + + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" diff --git a/modules/light-clients/06-solomachine/module.go b/modules/light-clients/06-solomachine/module.go index 69c04e46f04..fea0450e1fd 100644 --- a/modules/light-clients/06-solomachine/module.go +++ b/modules/light-clients/06-solomachine/module.go @@ -3,12 +3,13 @@ package solomachine import ( "encoding/json" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" ) var _ module.AppModuleBasic = (*AppModuleBasic)(nil) diff --git a/modules/light-clients/06-solomachine/proof.go b/modules/light-clients/06-solomachine/proof.go index aab15c17d3c..f156e353408 100644 --- a/modules/light-clients/06-solomachine/proof.go +++ b/modules/light-clients/06-solomachine/proof.go @@ -2,6 +2,7 @@ package solomachine import ( errorsmod "cosmossdk.io/errors" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/crypto/types/multisig" "github.com/cosmos/cosmos-sdk/types/tx/signing" diff --git a/modules/light-clients/06-solomachine/proposal_handle.go b/modules/light-clients/06-solomachine/proposal_handle.go index 2e6fdfd7ed8..4ad6071cba0 100644 --- a/modules/light-clients/06-solomachine/proposal_handle.go +++ b/modules/light-clients/06-solomachine/proposal_handle.go @@ -4,6 +4,7 @@ import ( "reflect" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/06-solomachine/solomachine_test.go b/modules/light-clients/06-solomachine/solomachine_test.go index 824872df26e..b4b37b54857 100644 --- a/modules/light-clients/06-solomachine/solomachine_test.go +++ b/modules/light-clients/06-solomachine/solomachine_test.go @@ -4,13 +4,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/light-clients/06-solomachine/update.go b/modules/light-clients/06-solomachine/update.go index 8d044e0a2e9..c08a3de3fb3 100644 --- a/modules/light-clients/06-solomachine/update.go +++ b/modules/light-clients/06-solomachine/update.go @@ -4,6 +4,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/07-tendermint/client_state.go b/modules/light-clients/07-tendermint/client_state.go index 50284b84f48..722e2676415 100644 --- a/modules/light-clients/07-tendermint/client_state.go +++ b/modules/light-clients/07-tendermint/client_state.go @@ -4,12 +4,15 @@ import ( "strings" "time" + ics23 "github.com/cosmos/ics23/go" + errorsmod "cosmossdk.io/errors" - "github.com/cometbft/cometbft/light" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - ics23 "github.com/cosmos/ics23/go" + + "github.com/cometbft/cometbft/light" + tmtypes "github.com/cometbft/cometbft/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" diff --git a/modules/light-clients/07-tendermint/client_state_test.go b/modules/light-clients/07-tendermint/client_state_test.go index 9df8c6047ba..0eee6512d0c 100644 --- a/modules/light-clients/07-tendermint/client_state_test.go +++ b/modules/light-clients/07-tendermint/client_state_test.go @@ -3,9 +3,10 @@ package tendermint_test import ( "time" - sdk "github.com/cosmos/cosmos-sdk/types" ics23 "github.com/cosmos/ics23/go" + sdk "github.com/cosmos/cosmos-sdk/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/modules/light-clients/07-tendermint/consensus_state.go b/modules/light-clients/07-tendermint/consensus_state.go index 86eb9a9fc58..b52fec596f9 100644 --- a/modules/light-clients/07-tendermint/consensus_state.go +++ b/modules/light-clients/07-tendermint/consensus_state.go @@ -4,6 +4,7 @@ import ( "time" errorsmod "cosmossdk.io/errors" + tmbytes "github.com/cometbft/cometbft/libs/bytes" tmtypes "github.com/cometbft/cometbft/types" diff --git a/modules/light-clients/07-tendermint/header.go b/modules/light-clients/07-tendermint/header.go index 8b0528a1f6c..1014c8a75ee 100644 --- a/modules/light-clients/07-tendermint/header.go +++ b/modules/light-clients/07-tendermint/header.go @@ -5,6 +5,7 @@ import ( "time" errorsmod "cosmossdk.io/errors" + tmtypes "github.com/cometbft/cometbft/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/modules/light-clients/07-tendermint/migrations/expected_keepers.go b/modules/light-clients/07-tendermint/migrations/expected_keepers.go index e68bdbc97da..b655b187a27 100644 --- a/modules/light-clients/07-tendermint/migrations/expected_keepers.go +++ b/modules/light-clients/07-tendermint/migrations/expected_keepers.go @@ -1,9 +1,10 @@ package migrations import ( - "github.com/cometbft/cometbft/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/light-clients/07-tendermint/migrations/migrations.go b/modules/light-clients/07-tendermint/migrations/migrations.go index f5d28fe468f..bcb1deebeb1 100644 --- a/modules/light-clients/07-tendermint/migrations/migrations.go +++ b/modules/light-clients/07-tendermint/migrations/migrations.go @@ -2,6 +2,7 @@ package migrations import ( errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/07-tendermint/misbehaviour.go b/modules/light-clients/07-tendermint/misbehaviour.go index f81f5a01385..bce812e4537 100644 --- a/modules/light-clients/07-tendermint/misbehaviour.go +++ b/modules/light-clients/07-tendermint/misbehaviour.go @@ -4,6 +4,7 @@ import ( "time" errorsmod "cosmossdk.io/errors" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" diff --git a/modules/light-clients/07-tendermint/misbehaviour_handle.go b/modules/light-clients/07-tendermint/misbehaviour_handle.go index 46b962fcabc..edc000dd0d5 100644 --- a/modules/light-clients/07-tendermint/misbehaviour_handle.go +++ b/modules/light-clients/07-tendermint/misbehaviour_handle.go @@ -6,10 +6,12 @@ import ( "time" errorsmod "cosmossdk.io/errors" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" + tmtypes "github.com/cometbft/cometbft/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/modules/light-clients/07-tendermint/module.go b/modules/light-clients/07-tendermint/module.go index e2201fc2876..516d7368afe 100644 --- a/modules/light-clients/07-tendermint/module.go +++ b/modules/light-clients/07-tendermint/module.go @@ -3,12 +3,13 @@ package tendermint import ( "encoding/json" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" ) var _ module.AppModuleBasic = (*AppModuleBasic)(nil) diff --git a/modules/light-clients/07-tendermint/proposal_handle.go b/modules/light-clients/07-tendermint/proposal_handle.go index 98b37ebf019..8205ef07893 100644 --- a/modules/light-clients/07-tendermint/proposal_handle.go +++ b/modules/light-clients/07-tendermint/proposal_handle.go @@ -5,6 +5,7 @@ import ( "time" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/light-clients/07-tendermint/tendermint_test.go b/modules/light-clients/07-tendermint/tendermint_test.go index 3879282ef35..f3c5bb10c8a 100644 --- a/modules/light-clients/07-tendermint/tendermint_test.go +++ b/modules/light-clients/07-tendermint/tendermint_test.go @@ -4,12 +4,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" diff --git a/modules/light-clients/07-tendermint/update.go b/modules/light-clients/07-tendermint/update.go index c3cd8144ff2..a82ea3acfcf 100644 --- a/modules/light-clients/07-tendermint/update.go +++ b/modules/light-clients/07-tendermint/update.go @@ -5,11 +5,13 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" - "github.com/cometbft/cometbft/light" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cometbft/cometbft/light" + tmtypes "github.com/cometbft/cometbft/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/light-clients/07-tendermint/update_test.go b/modules/light-clients/07-tendermint/update_test.go index b4e072ecbef..dc7e68629c1 100644 --- a/modules/light-clients/07-tendermint/update_test.go +++ b/modules/light-clients/07-tendermint/update_test.go @@ -3,9 +3,10 @@ package tendermint_test import ( "time" - tmtypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" + tmtypes "github.com/cometbft/cometbft/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/modules/light-clients/07-tendermint/upgrade.go b/modules/light-clients/07-tendermint/upgrade.go index 912a11d80a5..a8f18c5df9a 100644 --- a/modules/light-clients/07-tendermint/upgrade.go +++ b/modules/light-clients/07-tendermint/upgrade.go @@ -4,6 +4,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/modules/light-clients/09-localhost/client_state.go b/modules/light-clients/09-localhost/client_state.go index 902180a9292..a28ff2a942f 100644 --- a/modules/light-clients/09-localhost/client_state.go +++ b/modules/light-clients/09-localhost/client_state.go @@ -4,6 +4,7 @@ import ( "bytes" errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/proto/buf.lock b/proto/buf.lock index 373656974b8..7906031c41a 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -5,19 +5,24 @@ deps: owner: cosmos repository: cosmos-proto commit: 1935555c206d4afb9e94615dfd0fad31 + digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377 - remote: buf.build owner: cosmos repository: cosmos-sdk commit: 954f7b05f38440fc8250134b15adec47 + digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 - remote: buf.build owner: cosmos repository: gogo-proto commit: 34d970b699f84aa382f3c29773a60836 + digest: shake256:3d3bee5229ba579e7d19ffe6e140986a228b48a8c7fe74348f308537ab95e9135210e81812489d42cd8941d33ff71f11583174ccc5972e86e6112924b6ce9f04 - remote: buf.build owner: cosmos repository: ics23 commit: 55085f7c710a45f58fa09947208eb70b + digest: shake256:9bf0bc495b5a11c88d163d39ef521bc4b00bc1374a05758c91d82821bdc61f09e8c2c51dda8452529bf80137f34d852561eacbe9550a59015d51cecb0dacb628 - remote: buf.build owner: googleapis repository: googleapis commit: 8d7204855ec14631a499bd7393ce1970 + digest: shake256:40bf4112960cad01281930beed85829910768e32e80e986791596853eccd42c0cbd9d96690b918f658020d2d427e16f8b6514e2ac7f4a10306fd32e77be44329 diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto index bec16873897..9c48974931b 100644 --- a/proto/ibc/applications/fee/v1/tx.proto +++ b/proto/ibc/applications/fee/v1/tx.proto @@ -44,7 +44,6 @@ service Msg { message MsgRegisterPayee { option (cosmos.msg.v1.signer) = "relayer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // unique port identifier @@ -64,7 +63,6 @@ message MsgRegisterPayeeResponse {} message MsgRegisterCounterpartyPayee { option (cosmos.msg.v1.signer) = "relayer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // unique port identifier @@ -86,7 +84,6 @@ message MsgRegisterCounterpartyPayeeResponse {} message MsgPayPacketFee { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // fee encapsulates the recv, ack and timeout fees associated with an IBC packet @@ -108,7 +105,6 @@ message MsgPayPacketFeeResponse {} // This Msg can be used to pay for a packet at a specified sequence (instead of the next sequence send) message MsgPayPacketFeeAsync { option (cosmos.msg.v1.signer) = "packet_fee.refundaddress"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // unique packet identifier comprised of the channel ID, port ID and sequence diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto index 01f7fc8a3e6..ed47b6e385d 100644 --- a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto +++ b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto @@ -25,7 +25,6 @@ service Msg { message MsgRegisterInterchainAccount { option (cosmos.msg.v1.signer) = "owner"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string owner = 1; @@ -35,6 +34,8 @@ message MsgRegisterInterchainAccount { // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount message MsgRegisterInterchainAccountResponse { + option (gogoproto.goproto_getters) = false; + string channel_id = 1; string port_id = 2; } @@ -43,7 +44,6 @@ message MsgRegisterInterchainAccountResponse { message MsgSendTx { option (cosmos.msg.v1.signer) = "owner"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string owner = 1; @@ -56,12 +56,17 @@ message MsgSendTx { // MsgSendTxResponse defines the response for MsgSendTx message MsgSendTxResponse { + option (gogoproto.goproto_getters) = false; + uint64 sequence = 1; } + // MsgUpdateParams defines the payload for Msg/UpdateParams message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; + option (gogoproto.goproto_getters) = false; + // authority is the address that controls the module (defaults to x/gov unless overwritten). string authority = 1; diff --git a/proto/ibc/applications/interchain_accounts/host/v1/tx.proto b/proto/ibc/applications/interchain_accounts/host/v1/tx.proto index 9c9f497b537..727c50149d5 100644 --- a/proto/ibc/applications/interchain_accounts/host/v1/tx.proto +++ b/proto/ibc/applications/interchain_accounts/host/v1/tx.proto @@ -20,6 +20,8 @@ service Msg { message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; + option (gogoproto.goproto_getters) = false; + // authority is the address that controls the module (defaults to x/gov unless overwritten). string authority = 1; diff --git a/proto/ibc/applications/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto index a75f9b2190a..61bbaa79e5d 100644 --- a/proto/ibc/applications/transfer/v1/tx.proto +++ b/proto/ibc/applications/transfer/v1/tx.proto @@ -27,7 +27,6 @@ service Msg { message MsgTransfer { option (cosmos.msg.v1.signer) = "sender"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // the port on which the packet will be sent @@ -52,6 +51,8 @@ message MsgTransfer { // MsgTransferResponse defines the Msg/Transfer response type. message MsgTransferResponse { + option (gogoproto.goproto_getters) = false; + // sequence number of the transfer packet sent uint64 sequence = 1; } @@ -60,6 +61,8 @@ message MsgTransferResponse { message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; + option (gogoproto.goproto_getters) = false; + // authority is the address that controls the module (defaults to x/gov unless overwritten). string authority = 1; diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto index b7899f22278..66c6b2a48df 100644 --- a/proto/ibc/core/channel/v1/tx.proto +++ b/proto/ibc/core/channel/v1/tx.proto @@ -62,7 +62,6 @@ enum ResponseResultType { message MsgChannelOpenInit { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -72,6 +71,8 @@ message MsgChannelOpenInit { // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. message MsgChannelOpenInitResponse { + option (gogoproto.goproto_getters) = false; + string channel_id = 1; string version = 2; } @@ -82,7 +83,6 @@ message MsgChannelOpenInitResponse { message MsgChannelOpenTry { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -98,6 +98,8 @@ message MsgChannelOpenTry { // MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. message MsgChannelOpenTryResponse { + option (gogoproto.goproto_getters) = false; + string version = 1; string channel_id = 2; } @@ -107,7 +109,6 @@ message MsgChannelOpenTryResponse { message MsgChannelOpenAck { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -127,7 +128,6 @@ message MsgChannelOpenAckResponse {} message MsgChannelOpenConfirm { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -146,7 +146,6 @@ message MsgChannelOpenConfirmResponse {} message MsgChannelCloseInit { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -162,7 +161,6 @@ message MsgChannelCloseInitResponse {} message MsgChannelCloseConfirm { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string port_id = 1; @@ -180,7 +178,6 @@ message MsgChannelCloseConfirmResponse {} message MsgRecvPacket { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; Packet packet = 1 [(gogoproto.nullable) = false]; @@ -200,7 +197,6 @@ message MsgRecvPacketResponse { message MsgTimeout { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; Packet packet = 1 [(gogoproto.nullable) = false]; @@ -221,7 +217,6 @@ message MsgTimeoutResponse { message MsgTimeoutOnClose { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; Packet packet = 1 [(gogoproto.nullable) = false]; @@ -243,7 +238,6 @@ message MsgTimeoutOnCloseResponse { message MsgAcknowledgement { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; Packet packet = 1 [(gogoproto.nullable) = false]; diff --git a/proto/ibc/core/client/v1/tx.proto b/proto/ibc/core/client/v1/tx.proto index ad0622518e2..76efcc7e7b1 100644 --- a/proto/ibc/core/client/v1/tx.proto +++ b/proto/ibc/core/client/v1/tx.proto @@ -33,7 +33,6 @@ service Msg { message MsgCreateClient { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // light client state @@ -53,7 +52,6 @@ message MsgCreateClientResponse {} message MsgUpdateClient { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // client unique identifier @@ -72,7 +70,6 @@ message MsgUpdateClientResponse {} message MsgUpgradeClient { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // client unique identifier @@ -95,19 +92,19 @@ message MsgUpgradeClientResponse {} // MsgSubmitMisbehaviour defines an sdk.Msg type that submits Evidence for // light client misbehaviour. -// Warning: DEPRECATED +// This message has been deprecated. Use MsgUpdateClient instead. message MsgSubmitMisbehaviour { + option deprecated = true; option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [deprecated = true]; + string client_id = 1; // misbehaviour used for freezing the light client - google.protobuf.Any misbehaviour = 2 [deprecated = true]; + google.protobuf.Any misbehaviour = 2; // signer address - string signer = 3 [deprecated = true]; + string signer = 3; } // MsgSubmitMisbehaviourResponse defines the Msg/SubmitMisbehaviour response @@ -118,6 +115,8 @@ message MsgSubmitMisbehaviourResponse {} message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; + option (gogoproto.goproto_getters) = false; + // authority is the address of the governance account. string authority = 1; diff --git a/proto/ibc/core/connection/v1/tx.proto b/proto/ibc/core/connection/v1/tx.proto index f1aaeea7b67..5bba1821980 100644 --- a/proto/ibc/core/connection/v1/tx.proto +++ b/proto/ibc/core/connection/v1/tx.proto @@ -37,7 +37,6 @@ service Msg { message MsgConnectionOpenInit { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string client_id = 1; @@ -56,7 +55,6 @@ message MsgConnectionOpenInitResponse {} message MsgConnectionOpenTry { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string client_id = 1; @@ -88,7 +86,6 @@ message MsgConnectionOpenTryResponse {} message MsgConnectionOpenAck { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string connection_id = 1; @@ -117,7 +114,6 @@ message MsgConnectionOpenAckResponse {} message MsgConnectionOpenConfirm { option (cosmos.msg.v1.signer) = "signer"; - option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; string connection_id = 1; @@ -135,6 +131,8 @@ message MsgConnectionOpenConfirmResponse {} message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; + option (gogoproto.goproto_getters) = false; + // authority is the address that controls the module (defaults to x/gov unless overwritten). string authority = 1; diff --git a/scripts/update_compatibility_tests.py b/scripts/update_compatibility_tests.py new file mode 100755 index 00000000000..fa43397a451 --- /dev/null +++ b/scripts/update_compatibility_tests.py @@ -0,0 +1,192 @@ +#!/usr/bin/python3 +""" +The following script takes care of adding new/removing versions or +replacing a version in the compatibility-test-matrices JSON files. + +To use this script, you'll need to have Python 3.9+ installed. + +Invocation: + +By default, the script assumes that adding a new version is the desired operation. +Furthermore, it assumes that the compatibility-test-matrices directory is located +in the .github directory and the script is invoked from the root of the repository. + +If any of the above is not true, you can use the '--type' and '--directory' flags +to specify the operation and the directory respectively. + +Typically, an invocation would look like: + + scripts/update_compatibility_tests.py --recent_version v4.3.0 --new_version v4.4.0 + +The three operations currently added are: + + - ADD: Add a new version to the JSON files. Requires both '--recent_version' and + '--new_version' options to be set. + - REPLACE: Replace an existing version with a new one. Requires both '--recent_version' + and '--new_version' options to be set. + - REMOVE: Remove an existing version from the JSON files. Requires only the + '--recent_version' options to be set. + +For more information, use the '--help' flag to see the available options. +""" +import argparse +import os +import json +import enum +from collections import defaultdict +from typing import Tuple, Generator, Optional, Dict, List, Any + +# Directory to operate in +DIRECTORY: str = ".github/compatibility-test-matrices" +# JSON keys to search in. +KEYS: Tuple[str, str] = ("chain-a", "chain-b") +# Toggle if required. Indent = 2 matches our current formatting. +DUMP_ARGS: Dict[Any, Any] = { + "indent": 2, + "sort_keys": False, + "ensure_ascii": False, +} +# Suggestions for recent and new versions. +SUGGESTION: str = "for example, v4.3.0 or 4.3.0" +# Supported Operations. +Operation = enum.Enum("Operation", ["ADD", "REMOVE", "REPLACE"]) + + +def find_json_files( + directory: str, ignores: Tuple[str] = (".",) +) -> Generator[str, None, None]: + """Find JSON files in a directory. By default, ignore hidden directories.""" + for root, dirs, files in os.walk(directory): + dirs[:] = (d for d in dirs if not d.startswith(ignores)) + for file_ in files: + if file_.endswith(".json"): + yield os.path.join(root, file_) + + +def has_release_version(json_file: Any, keys: Tuple[str, str], version: str) -> bool: + """Check if the json file has the version in question.""" + rows = (json_file[key] for key in keys) + return any(version in row for row in rows) + + +def sorter(key: str) -> str: + """Since 'main' < 'vX.X.X' and we want to have 'main' as the first entry + in the list, we return a version that is considerably large. If ibc-go + reaches this version I'll wear my dunce hat and go sit in the corner. + """ + return "v99999.9.9" if key == "main" else key + + +def update_version(json_file: Any, keys: Tuple[str, str], args: argparse.Namespace): + """Update the versions as required in the json file.""" + recent, new, op = args.recent, args.new, args.type + for row in (json_file[key] for key in keys): + if recent not in row: + continue + if op == Operation.ADD: + row.append(new) + row.sort(key=sorter, reverse=True) + else: + index = row.index(recent) + if op == Operation.REPLACE: + row[index] = new + elif op == Operation.REMOVE: + del row[index] + + +def version_input(prompt: str, version: Optional[str]) -> str: + """Input version if not supplied, make it start with a 'v' if it doesn't.""" + if version is None: + version = input(prompt) + return version if version.startswith(("v", "V")) else f"v{version}" + + +def require_version(args: argparse.Namespace): + """Allow non-required version in argparse but request it if not provided.""" + args.recent = version_input(f"Recent version ({SUGGESTION}): ", args.recent) + if args.type == Operation.REMOVE: + return + args.new = version_input(f"New version ({SUGGESTION}): ", args.new) + + +def parse_args() -> argparse.Namespace: + """Parse command line arguments.""" + parser = argparse.ArgumentParser(description="Update JSON files.") + parser.add_argument( + "--type", + choices=[Operation.ADD.name, Operation.REPLACE.name, Operation.REMOVE.name], + default="ADD", + help="Type of version update: add a version, replace one or remove one.", + ) + parser.add_argument( + "--directory", + default=DIRECTORY, + help="Directory path where JSON files are located", + ) + parser.add_argument( + "--recent_version", + dest="recent", + help=f"Recent version to search in JSON files ({SUGGESTION})", + ) + parser.add_argument( + "--new_version", + dest="new", + help=f"New version to add in JSON files ({SUGGESTION})", + ) + parser.add_argument( + "--verbose", + "-v", + action="store_true", + help="Allow for verbose output", + default=False, + ) + + args = parser.parse_args() + args.type = Operation[args.type.upper()] + require_version(args) + return args + + +def print_logs(logs: Dict[str, List[str]], verbose: bool): + """Print the logs. Verbosity controls if each individual + file is printed or not. + """ + updated, skipped = logs["updated"], logs["skipped"] + if updated: + if verbose: + print("Updated files:", *updated, sep="\n - ") + else: + print("No files were updated.") + if skipped: + if verbose: + print("The following files were skipped:", *skipped, sep="\n - ") + else: + print("No files skipped.") + + +def main(args: argparse.Namespace): + """ Main driver function.""" + # Hold logs for 'updated' and 'skipped' files. + logs = defaultdict(list) + # Go through each file and operate on it, if applicable. + for file_ in find_json_files(args.directory): + with open(file_, "r+") as fp: + json_file = json.load(fp) + if not has_release_version(json_file, KEYS, args.recent): + logs["skipped"].append( + f"Version '{args.recent}' not found in '{file_}'" + ) + continue + update_version(json_file, KEYS, args) + fp.seek(0) + fp.truncate() + json.dump(json_file, fp, **DUMP_ARGS) + logs["updated"].append(f"Updated '{file_}'") + + # Print logs collected. + print_logs(logs, args.verbose) + + +if __name__ == "__main__": + args = parse_args() + main(args) diff --git a/testing/app.go b/testing/app.go index 2f188d2770a..61f804c4a8d 100644 --- a/testing/app.go +++ b/testing/app.go @@ -5,12 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -22,9 +20,14 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" - "github.com/stretchr/testify/require" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" + + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/cosmos/ibc-go/v7/testing/simapp" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" diff --git a/testing/chain.go b/testing/chain.go index 13ce21a8ec4..17513334525 100644 --- a/testing/chain.go +++ b/testing/chain.go @@ -5,14 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/tmhash" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version" - tmtypes "github.com/cometbft/cometbft/types" - tmversion "github.com/cometbft/cometbft/version" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -22,10 +19,16 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/tmhash" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version" + tmtypes "github.com/cometbft/cometbft/types" + tmversion "github.com/cometbft/cometbft/version" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/stretchr/testify/require" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/testing/chain_test.go b/testing/chain_test.go index e0a97795e38..8eb6315716c 100644 --- a/testing/chain_test.go +++ b/testing/chain_test.go @@ -3,9 +3,11 @@ package ibctesting_test import ( "testing" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" ibctesting "github.com/cosmos/ibc-go/v7/testing" ) diff --git a/testing/coordinator.go b/testing/coordinator.go index 0ad4b05a40e..1f3418a983c 100644 --- a/testing/coordinator.go +++ b/testing/coordinator.go @@ -6,8 +6,9 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/require" + + abci "github.com/cometbft/cometbft/abci/types" ) var ( diff --git a/testing/endpoint.go b/testing/endpoint.go index 98c8d22f6f6..c938f99d5e6 100644 --- a/testing/endpoint.go +++ b/testing/endpoint.go @@ -4,9 +4,10 @@ import ( "fmt" "strings" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" diff --git a/testing/events.go b/testing/events.go index ac1fdd71954..69fef9d1f8c 100644 --- a/testing/events.go +++ b/testing/events.go @@ -4,9 +4,10 @@ import ( "fmt" "strconv" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/testing/mock/ibc_app.go b/testing/mock/ibc_app.go index 530bfaae4b5..ada64edfb40 100644 --- a/testing/mock/ibc_app.go +++ b/testing/mock/ibc_app.go @@ -2,9 +2,9 @@ package mock import ( sdk "github.com/cosmos/cosmos-sdk/types" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/testing/mock/ibc_module.go b/testing/mock/ibc_module.go index 698fad5f623..ec03110e164 100644 --- a/testing/mock/ibc_module.go +++ b/testing/mock/ibc_module.go @@ -7,8 +7,8 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/testing/mock/mock.go b/testing/mock/mock.go index 871996a9293..ca6e9c49eee 100644 --- a/testing/mock/mock.go +++ b/testing/mock/mock.go @@ -4,16 +4,18 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" diff --git a/testing/mock/privval.go b/testing/mock/privval.go index a92cc1fc5fa..660fb481416 100644 --- a/testing/mock/privval.go +++ b/testing/mock/privval.go @@ -1,12 +1,13 @@ package mock import ( - "github.com/cometbft/cometbft/crypto" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + + "github.com/cometbft/cometbft/crypto" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" ) var _ tmtypes.PrivValidator = PV{} diff --git a/testing/mock/privval_test.go b/testing/mock/privval_test.go index d8ef0e4409b..0814c265b03 100644 --- a/testing/mock/privval_test.go +++ b/testing/mock/privval_test.go @@ -3,9 +3,10 @@ package mock_test import ( "testing" + "github.com/stretchr/testify/require" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/testing/mock" ) diff --git a/testing/simapp/ante_handler.go b/testing/simapp/ante_handler.go index 1a0e2106045..1214324e66b 100644 --- a/testing/simapp/ante_handler.go +++ b/testing/simapp/ante_handler.go @@ -2,6 +2,7 @@ package simapp import ( errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 63a7c522f18..90b9e5ab5bd 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -8,15 +8,17 @@ import ( "os" "path/filepath" + "github.com/gorilla/mux" + "github.com/rakyll/statik/fs" + "github.com/spf13/cast" + + _ "github.com/cosmos/cosmos-sdk/client/docs/statik" // this is used for serving docs + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmos "github.com/cometbft/cometbft/libs/os" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" - _ "github.com/cosmos/cosmos-sdk/client/docs/statik" // this is used for serving docs nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/codec" @@ -88,14 +90,15 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/gorilla/mux" - "github.com/rakyll/statik/fs" - "github.com/spf13/cast" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmos "github.com/cometbft/cometbft/libs/os" "github.com/cosmos/ibc-go/modules/capability" capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" diff --git a/testing/simapp/export.go b/testing/simapp/export.go index 444c21c706e..05f8ffb4768 100644 --- a/testing/simapp/export.go +++ b/testing/simapp/export.go @@ -4,12 +4,13 @@ import ( "encoding/json" "log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis diff --git a/testing/simapp/genesis_account_test.go b/testing/simapp/genesis_account_test.go index be767553606..c4488bb2826 100644 --- a/testing/simapp/genesis_account_test.go +++ b/testing/simapp/genesis_account_test.go @@ -4,11 +4,13 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/stretchr/testify/require" + + "github.com/cometbft/cometbft/crypto" "github.com/cosmos/ibc-go/v7/testing/simapp" ) diff --git a/testing/simapp/sim_bench_test.go b/testing/simapp/sim_bench_test.go index 4146da0a4b8..51f6ba5d410 100644 --- a/testing/simapp/sim_bench_test.go +++ b/testing/simapp/sim_bench_test.go @@ -5,11 +5,12 @@ import ( "os" "testing" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" ) // Profile with: diff --git a/testing/simapp/sim_test.go b/testing/simapp/sim_test.go index 5e4bcaa9d69..2122d46d79f 100644 --- a/testing/simapp/sim_test.go +++ b/testing/simapp/sim_test.go @@ -7,10 +7,8 @@ import ( "os" "testing" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -28,9 +26,13 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/stretchr/testify/require" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/testing/simapp/simd/cmd/cmd_test.go b/testing/simapp/simd/cmd/cmd_test.go index 4ac8843035a..1ffb1ec7243 100644 --- a/testing/simapp/simd/cmd/cmd_test.go +++ b/testing/simapp/simd/cmd/cmd_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/stretchr/testify/require" "github.com/cosmos/ibc-go/v7/testing/simapp" "github.com/cosmos/ibc-go/v7/testing/simapp/simd/cmd" diff --git a/testing/simapp/simd/cmd/root.go b/testing/simapp/simd/cmd/root.go index ad020c353bc..7a7d59a5453 100644 --- a/testing/simapp/simd/cmd/root.go +++ b/testing/simapp/simd/cmd/root.go @@ -6,11 +6,9 @@ import ( "os" "path/filepath" - dbm "github.com/cometbft/cometbft-db" - tmcfg "github.com/cometbft/cometbft/config" - tmcli "github.com/cometbft/cometbft/libs/cli" - "github.com/cometbft/cometbft/libs/log" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/spf13/cast" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -29,8 +27,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/spf13/cast" - "github.com/spf13/cobra" + + dbm "github.com/cometbft/cometbft-db" + tmcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" + "github.com/cometbft/cometbft/libs/log" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/ibc-go/v7/testing/simapp" "github.com/cosmos/ibc-go/v7/testing/simapp/params" diff --git a/testing/simapp/state.go b/testing/simapp/state.go index fb69deb7512..d7e5853d162 100644 --- a/testing/simapp/state.go +++ b/testing/simapp/state.go @@ -9,8 +9,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - tmjson "github.com/cometbft/cometbft/libs/json" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" @@ -20,6 +19,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + tmjson "github.com/cometbft/cometbft/libs/json" + tmtypes "github.com/cometbft/cometbft/types" + simappparams "github.com/cosmos/ibc-go/v7/testing/simapp/params" ) diff --git a/testing/simapp/test_helpers.go b/testing/simapp/test_helpers.go index 64226ae9d74..7399cf697c6 100644 --- a/testing/simapp/test_helpers.go +++ b/testing/simapp/test_helpers.go @@ -6,12 +6,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" + bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -23,7 +21,12 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/ibc-go/v7/testing/mock" ) diff --git a/testing/simapp/upgrades/upgrades.go b/testing/simapp/upgrades/upgrades.go index fef17bce5a0..1a8a8a9052c 100644 --- a/testing/simapp/upgrades/upgrades.go +++ b/testing/simapp/upgrades/upgrades.go @@ -10,8 +10,8 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/testing/simapp/utils.go b/testing/simapp/utils.go index faa7bbcf820..31f4b1aa05a 100644 --- a/testing/simapp/utils.go +++ b/testing/simapp/utils.go @@ -3,9 +3,10 @@ package simapp import ( "os" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" ) // SetupSimulation creates the config, db (levelDB), temporary directory and logger for diff --git a/testing/simapp/utils_test.go b/testing/simapp/utils_test.go index 4b828a2e4d7..b9f07a0b9bb 100644 --- a/testing/simapp/utils_test.go +++ b/testing/simapp/utils_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -11,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/kv" "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/stretchr/testify/require" ) func makeCodec(bm module.BasicManager) *codec.LegacyAmino { diff --git a/testing/solomachine.go b/testing/solomachine.go index 313e93de696..df683d3ea0c 100644 --- a/testing/solomachine.go +++ b/testing/solomachine.go @@ -4,7 +4,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig" @@ -13,7 +16,6 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/types/multisig" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" - "github.com/stretchr/testify/require" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/testing/utils.go b/testing/utils.go index 08d483a218d..302d0e70822 100644 --- a/testing/utils.go +++ b/testing/utils.go @@ -3,9 +3,10 @@ package ibctesting import ( "testing" + "github.com/stretchr/testify/require" + abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/stretchr/testify/require" ) // ApplyValSetChanges takes in tmtypes.ValidatorSet and []abci.ValidatorUpdate and will return a new tmtypes.ValidatorSet which has the diff --git a/testing/values.go b/testing/values.go index 0251e40bc81..3e933053c23 100644 --- a/testing/values.go +++ b/testing/values.go @@ -8,6 +8,7 @@ import ( "time" sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"