diff --git a/e2e/tests/wasm/upgrade_test.go b/e2e/tests/wasm/upgrade_test.go index b62e592cdfe..986a73e23cb 100644 --- a/e2e/tests/wasm/upgrade_test.go +++ b/e2e/tests/wasm/upgrade_test.go @@ -12,16 +12,16 @@ import ( "testing" "time" - testifysuite "github.com/stretchr/testify/suite" - "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testutil" + testifysuite "github.com/stretchr/testify/suite" upgradetypes "cosmossdk.io/x/upgrade/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/ibc-go/e2e/testsuite" "github.com/cosmos/ibc-go/e2e/testvalues" wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" diff --git a/modules/core/04-channel/types/msgs.go b/modules/core/04-channel/types/msgs.go index 8d5944e128d..6ca9fb44a51 100644 --- a/modules/core/04-channel/types/msgs.go +++ b/modules/core/04-channel/types/msgs.go @@ -380,15 +380,6 @@ func (msg MsgAcknowledgement) ValidateBasic() error { return msg.Packet.ValidateBasic() } -// GetSigners implements sdk.Msg -func (msg MsgAcknowledgement) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeInit{} // NewMsgChannelUpgradeInit constructs a new MsgChannelUpgradeInit @@ -423,16 +414,6 @@ func (msg MsgChannelUpgradeInit) ValidateBasic() error { return msg.Fields.ValidateBasic() } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeInit) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeTry{} // NewMsgChannelUpgradeTry constructs a new MsgChannelUpgradeTry @@ -499,16 +480,6 @@ func (msg MsgChannelUpgradeTry) ValidateBasic() error { return nil } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeTry) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeAck{} // NewMsgChannelUpgradeAck constructs a new MsgChannelUpgradeAck @@ -546,16 +517,6 @@ func (msg MsgChannelUpgradeAck) ValidateBasic() error { return msg.CounterpartyUpgrade.ValidateBasic() } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeAck) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeConfirm{} // NewMsgChannelUpgradeConfirm constructs a new MsgChannelUpgradeConfirm @@ -611,16 +572,6 @@ func (msg MsgChannelUpgradeConfirm) ValidateBasic() error { return msg.CounterpartyUpgrade.ValidateBasic() } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeConfirm) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeOpen{} // NewMsgChannelUpgradeOpen constructs a new MsgChannelUpgradeOpen @@ -669,15 +620,6 @@ func (msg MsgChannelUpgradeOpen) ValidateBasic() error { return nil } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeOpen) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeTimeout{} // NewMsgChannelUpgradeTimeout constructs a new MsgChannelUpgradeTimeout @@ -725,16 +667,6 @@ func (msg MsgChannelUpgradeTimeout) ValidateBasic() error { return nil } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeTimeout) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - var _ sdk.Msg = &MsgChannelUpgradeCancel{} // NewMsgChannelUpgradeCancel constructs a new MsgChannelUpgradeCancel @@ -774,16 +706,6 @@ func (msg MsgChannelUpgradeCancel) ValidateBasic() error { return nil } -// GetSigners implements sdk.Msg -func (msg MsgChannelUpgradeCancel) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(msg.Signer) - if err != nil { - panic(err) - } - - return []sdk.AccAddress{signer} -} - // NewMsgUpdateChannelParams creates a new instance of MsgUpdateParams. func NewMsgUpdateChannelParams(authority string, params Params) *MsgUpdateParams { return &MsgUpdateParams{ @@ -792,15 +714,6 @@ func NewMsgUpdateChannelParams(authority string, params Params) *MsgUpdateParams } } -// GetSigners returns the expected signers for a MsgUpdateParams message. -func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { - accAddr, err := sdk.AccAddressFromBech32(msg.Authority) - if err != nil { - panic(err) - } - return []sdk.AccAddress{accAddr} -} - // ValidateBasic performs basic checks on a MsgUpdateParams. func (msg *MsgUpdateParams) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { diff --git a/modules/core/04-channel/types/msgs_test.go b/modules/core/04-channel/types/msgs_test.go index 6cfc4ea6447..518aae29d00 100644 --- a/modules/core/04-channel/types/msgs_test.go +++ b/modules/core/04-channel/types/msgs_test.go @@ -148,6 +148,18 @@ func (suite *TypesTestSuite) TestMsgChannelOpenInitValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelOpenInitGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelOpenInit(portid, version, types.ORDERED, connHops, cpportid, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelOpenTryValidateBasic() { counterparty := types.NewCounterparty(cpportid, cpchanid) initChannel := types.NewChannel(types.INIT, types.ORDERED, counterparty, connHops, version) @@ -190,6 +202,18 @@ func (suite *TypesTestSuite) TestMsgChannelOpenTryValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelOpenTryGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelOpenTry(portid, version, types.ORDERED, connHops, cpportid, cpchanid, version, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelOpenAckValidateBasic() { testCases := []struct { name string @@ -223,6 +247,18 @@ func (suite *TypesTestSuite) TestMsgChannelOpenAckValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelOpenAckGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelOpenAck(portid, chanid, chanid, version, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelOpenConfirmValidateBasic() { testCases := []struct { name string @@ -254,6 +290,18 @@ func (suite *TypesTestSuite) TestMsgChannelOpenConfirmValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelOpenConfirmGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelOpenConfirm(portid, chanid, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelCloseInitValidateBasic() { testCases := []struct { name string @@ -284,6 +332,18 @@ func (suite *TypesTestSuite) TestMsgChannelCloseInitValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelCloseInitGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelCloseInit(portid, chanid, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelCloseConfirmValidateBasic() { testCases := []struct { name string @@ -315,6 +375,18 @@ func (suite *TypesTestSuite) TestMsgChannelCloseConfirmValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelCloseConfirmGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelCloseConfirm(portid, chanid, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgRecvPacketValidateBasic() { testCases := []struct { name string @@ -343,14 +415,15 @@ func (suite *TypesTestSuite) TestMsgRecvPacketValidateBasic() { } func (suite *TypesTestSuite) TestMsgRecvPacketGetSigners() { - signer := sdk.AccAddress(ibctesting.TestAccAddress) - msg := types.NewMsgRecvPacket(packet, suite.proof, height, signer.String()) + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgRecvPacket(packet, suite.proof, height, addr) encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) suite.Require().NoError(err) - suite.Require().Equal(signer.Bytes(), signers[0]) + suite.Require().Equal(expSigner.Bytes(), signers[0]) } func (suite *TypesTestSuite) TestMsgTimeoutValidateBasic() { @@ -381,6 +454,18 @@ func (suite *TypesTestSuite) TestMsgTimeoutValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgTimeoutGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgTimeout(packet, 1, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgTimeoutOnCloseValidateBasic() { testCases := []struct { name string @@ -410,6 +495,18 @@ func (suite *TypesTestSuite) TestMsgTimeoutOnCloseValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgTimeoutOnCloseGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgTimeoutOnClose(packet, 1, suite.proof, suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgAcknowledgementValidateBasic() { testCases := []struct { name string @@ -438,6 +535,18 @@ func (suite *TypesTestSuite) TestMsgAcknowledgementValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgAcknowledgementGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgAcknowledgement(packet, packet.GetData(), suite.proof, height, addr) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelUpgradeInitValidateBasic() { var msg *types.MsgChannelUpgradeInit @@ -502,6 +611,22 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeInitValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelUpgradeInitGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelUpgradeInit( + ibctesting.MockPort, ibctesting.FirstChannelID, + types.NewUpgradeFields(types.UNORDERED, []string{ibctesting.FirstConnectionID}, mock.Version), + addr, + ) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelUpgradeTryValidateBasic() { var msg *types.MsgChannelUpgradeTry @@ -600,6 +725,28 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeTryValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelUpgradeTryGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + msg := types.NewMsgChannelUpgradeTry( + ibctesting.MockPort, + ibctesting.FirstChannelID, + []string{ibctesting.FirstConnectionID}, + types.NewUpgradeFields(types.UNORDERED, []string{ibctesting.FirstConnectionID}, mock.Version), + 1, + suite.proof, + suite.proof, + height, + addr, + ) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelUpgradeAckValidateBasic() { var msg *types.MsgChannelUpgradeAck @@ -676,6 +823,27 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeAckValidateBasic() { } } +func (suite *TypesTestSuite) TestMsgChannelUpgradeAckGetSigners() { + expSigner, err := sdk.AccAddressFromBech32(addr) + suite.Require().NoError(err) + upgrade := types.NewUpgrade( + types.NewUpgradeFields(types.ORDERED, []string{ibctesting.FirstConnectionID}, mock.Version), + types.NewTimeout(clienttypes.NewHeight(1, 100), 0), + ) + + msg := types.NewMsgChannelUpgradeAck( + ibctesting.MockPort, ibctesting.FirstChannelID, + upgrade, suite.proof, suite.proof, + height, addr, + ) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) +} + func (suite *TypesTestSuite) TestMsgChannelUpgradeConfirmValidateBasic() { var msg *types.MsgChannelUpgradeConfirm @@ -771,7 +939,12 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeConfirmGetSigners() { suite.Require().NoError(err) msg := &types.MsgChannelUpgradeConfirm{Signer: addr} - suite.Require().Equal([]sdk.AccAddress{expSigner}, msg.GetSigners()) + + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) } func (suite *TypesTestSuite) TestMsgChannelUpgradeOpenValidateBasic() { @@ -934,8 +1107,11 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeTimeoutGetSigners() { suite.proof, height, addr, ) + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) - suite.Require().Equal([]sdk.AccAddress{expSigner}, msg.GetSigners()) + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) } func (suite *TypesTestSuite) TestMsgChannelUpgradeCancelValidateBasic() { @@ -1003,5 +1179,9 @@ func (suite *TypesTestSuite) TestMsgChannelUpgradeCancelGetSigners() { suite.Require().NoError(err) msg := types.NewMsgChannelUpgradeCancel(ibctesting.MockPort, ibctesting.FirstChannelID, types.ErrorReceipt{Sequence: 1}, suite.proof, height, addr) - suite.Require().Equal([]sdk.AccAddress{expSigner}, msg.GetSigners()) + encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{}) + signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg) + + suite.Require().NoError(err) + suite.Require().Equal(expSigner.Bytes(), signers[0]) }