Dynamically determine gov genesis state (#2931)

* chore: dynamically determine gov genesis state

* chore: bump relayer version

* chore: remove duplicate event emissions  (#2934)

* chore: remove duplicate event emissions

* chore: remove additional duplicate events and fix test

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

e2e/testsuite/semver.go → e2e/semverutil/semver.go

@@ -1,4 +1,4 @@
-package testsuite
+package semverutil
 
 import (
 	"golang.org/x/mod/semver"

e2e/testsuite/semver_test.go → e2e/semverutil/semver_test.go

@@ -1,15 +1,15 @@
-package testsuite_test
+package semverutil_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/ibc-go/e2e/testsuite"
+	"github.com/cosmos/ibc-go/e2e/semverutil"
 )
 
 func TestIsSupported(t *testing.T) {
-	releases := testsuite.FeatureReleases{
+	releases := semverutil.FeatureReleases{
 		MajorVersion: "v6",
 		MinorVersions: []string{
 			"v2.5",

e2e/testconfig/testconfig.go

@@ -10,11 +10,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module/testutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+	gogoproto "github.com/cosmos/gogoproto/proto"
 	"github.com/strangelove-ventures/ibctest/v6/ibc"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	tmtypes "github.com/tendermint/tendermint/types"
 
+	"github.com/cosmos/ibc-go/e2e/semverutil"
 	"github.com/cosmos/ibc-go/e2e/testvalues"
 )
 
@@ -37,7 +40,7 @@ const (
 	defaultBinary = "simd"
 	// defaultRlyTag is the tag that will be used if no relayer tag is specified.
 	// all images are here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
-	defaultRlyTag = "v2.1.2"
+	defaultRlyTag = "v2.2.0-rc2"
 	// defaultChainTag is the tag that will be used for the chains if none is specified.
 	defaultChainTag = "main"
 )
@@ -176,6 +179,12 @@ func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string) ibc.Cha
 	}
 }
 
+// govGenesisFeatureReleases represents the releases the governance module genesis
+// was upgraded from v1beta1 to v1.
+var govGenesisFeatureReleases = semverutil.FeatureReleases{
+	MajorVersion: "v7",
+}
+
 // defaultModifyGenesis will only modify governance params to ensure the voting period and minimum deposit
 // are functional for e2e testing purposes.
 func defaultModifyGenesis() func(ibc.ChainConfig, []byte) ([]byte, error) {
@@ -190,22 +199,9 @@ func defaultModifyGenesis() func(ibc.ChainConfig, []byte) ([]byte, error) {
 			return nil, fmt.Errorf("failed to unmarshal genesis bytes into app state: %w", err)
 		}
 
-		cfg := testutil.MakeTestEncodingConfig()
-		govv1beta1.RegisterInterfaces(cfg.InterfaceRegistry)
-		cdc := codec.NewProtoCodec(cfg.InterfaceRegistry)
-
-		govGenesisState := &govv1beta1.GenesisState{}
-		if err := cdc.UnmarshalJSON(appState[govtypes.ModuleName], govGenesisState); err != nil {
-			return nil, fmt.Errorf("failed to unmarshal genesis bytes into gov genesis state: %w", err)
-		}
-
-		// set correct minimum deposit using configured denom
-		govGenesisState.DepositParams.MinDeposit = sdk.NewCoins(sdk.NewCoin(chainConfig.Denom, govv1beta1.DefaultMinDepositTokens))
-		govGenesisState.VotingParams.VotingPeriod = testvalues.VotingPeriod
-
-		govGenBz, err := cdc.MarshalJSON(govGenesisState)
+		govGenBz, err := modifyGovAppState(chainConfig, appState[govtypes.ModuleName])
 		if err != nil {
-			return nil, fmt.Errorf("failed to marshal gov genesis state: %w", err)
+			return nil, err
 		}
 
 		appState[govtypes.ModuleName] = govGenBz
@@ -223,3 +219,43 @@ func defaultModifyGenesis() func(ibc.ChainConfig, []byte) ([]byte, error) {
 		return bz, nil
 	}
 }
+
+// modifyGovAppState takes the existing gov app state and marshals it to either a govv1 GenesisState
+// or a govv1beta1 GenesisState depending on the simapp version.
+func modifyGovAppState(chainConfig ibc.ChainConfig, govAppState json.RawMessage) ([]byte, error) {
+	cfg := testutil.MakeTestEncodingConfig()
+
+	cdc := codec.NewProtoCodec(cfg.InterfaceRegistry)
+	govv1.RegisterInterfaces(cfg.InterfaceRegistry)
+	govv1beta1.RegisterInterfaces(cfg.InterfaceRegistry)
+
+	shouldUseGovV1 := govGenesisFeatureReleases.IsSupported(chainConfig.Images[0].Version)
+
+	var govGenesisState gogoproto.Message
+	if shouldUseGovV1 {
+		govGenesisState = &govv1.GenesisState{}
+	} else {
+		govGenesisState = &govv1beta1.GenesisState{}
+	}
+
+	if err := cdc.UnmarshalJSON(govAppState, govGenesisState); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal genesis bytes into gov genesis state: %w", err)
+	}
+
+	switch v := govGenesisState.(type) {
+	case *govv1.GenesisState:
+		// set correct minimum deposit using configured denom
+		v.Params.MinDeposit = sdk.NewCoins(sdk.NewCoin(chainConfig.Denom, govv1beta1.DefaultMinDepositTokens))
+		vp := testvalues.VotingPeriod
+		v.Params.VotingPeriod = &vp
+	case *govv1beta1.GenesisState:
+		v.DepositParams.MinDeposit = sdk.NewCoins(sdk.NewCoin(chainConfig.Denom, govv1beta1.DefaultMinDepositTokens))
+		v.VotingParams.VotingPeriod = testvalues.VotingPeriod
+	}
+	govGenBz, err := cdc.MarshalJSON(govGenesisState)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal gov genesis state: %w", err)
+	}
+
+	return govGenBz, nil
+}

e2e/tests/transfer/base_test.go

@@ -11,6 +11,7 @@ import (
 	test "github.com/strangelove-ventures/ibctest/v6/testutil"
 	"github.com/stretchr/testify/suite"
 
+	"github.com/cosmos/ibc-go/e2e/semverutil"
 	"github.com/cosmos/ibc-go/e2e/testsuite"
 	"github.com/cosmos/ibc-go/e2e/testvalues"
 	transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
@@ -379,7 +380,7 @@ func (s *TransferTestSuite) TestReceiveEnabledParam() {
 }
 
 // memoFeatureReleases represents the releases the memo field was released in.
-var memoFeatureReleases = testsuite.FeatureReleases{
+var memoFeatureReleases = semverutil.FeatureReleases{
 	MajorVersion: "v6",
 	MinorVersions: []string{
 		"v2.5",

modules/apps/27-interchain-accounts/controller/keeper/events.go

@@ -13,7 +13,6 @@ import (
 // details if any.
 func EmitAcknowledgementEvent(ctx sdk.Context, packet exported.PacketI, ack exported.Acknowledgement, err error) {
 	attributes := []sdk.Attribute{
-		sdk.NewAttribute(sdk.AttributeKeyModule, icatypes.ModuleName),
 		sdk.NewAttribute(icatypes.AttributeKeyControllerChannelID, packet.GetDestChannel()),
 		sdk.NewAttribute(icatypes.AttributeKeyAckSuccess, fmt.Sprintf("%t", ack.Success())),
 	}

modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go

@@ -83,9 +83,8 @@ func (suite *KeeperTestSuite) TestRegisterInterchainAccount_MsgServer() {
 			suite.Require().Equal(expectedChannelID, res.ChannelId)
 
 			events := ctx.EventManager().Events()
-			suite.Require().Len(events, 2)
+			suite.Require().Len(events, 1)
 			suite.Require().Equal(events[0].Type, channeltypes.EventTypeChannelOpenInit)
-			suite.Require().Equal(events[1].Type, sdk.EventTypeMessage)
 		} else {
 			suite.Require().Error(err)
 			suite.Require().Nil(res)

modules/apps/27-interchain-accounts/host/keeper/events.go

@@ -13,7 +13,6 @@ import (
 // details if any.
 func EmitAcknowledgementEvent(ctx sdk.Context, packet exported.PacketI, ack exported.Acknowledgement, err error) {
 	attributes := []sdk.Attribute{
-		sdk.NewAttribute(sdk.AttributeKeyModule, icatypes.ModuleName),
 		sdk.NewAttribute(icatypes.AttributeKeyHostChannelID, packet.GetDestChannel()),
 		sdk.NewAttribute(icatypes.AttributeKeyAckSuccess, fmt.Sprintf("%t", ack.Success())),
 	}

modules/apps/29-fee/keeper/events.go

@@ -37,10 +37,6 @@ func EmitIncentivizedPacketEvent(ctx sdk.Context, packetID channeltypes.PacketId
 			sdk.NewAttribute(types.AttributeKeyAckFee, totalAckFees.String()),
 			sdk.NewAttribute(types.AttributeKeyTimeoutFee, totalTimeoutFees.String()),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		),
 	})
 }
 
@@ -53,10 +49,6 @@ func EmitRegisterPayeeEvent(ctx sdk.Context, relayer, payee, channelID string) {
 			sdk.NewAttribute(types.AttributeKeyPayee, payee),
 			sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		),
 	})
 }
 
@@ -69,9 +61,5 @@ func EmitRegisterCounterpartyPayeeEvent(ctx sdk.Context, relayer, counterpartyPa
 			sdk.NewAttribute(types.AttributeKeyCounterpartyPayee, counterpartyPayee),
 			sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		),
 	})
 }

modules/apps/transfer/ibc_module.go

@@ -189,7 +189,6 @@ func (im IBCModule) OnRecvPacket(
 	}
 
 	eventAttributes := []sdk.Attribute{
-		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
 		sdk.NewAttribute(sdk.AttributeKeySender, data.Sender),
 		sdk.NewAttribute(types.AttributeKeyReceiver, data.Receiver),
 		sdk.NewAttribute(types.AttributeKeyDenom, data.Denom),
@@ -236,7 +235,6 @@ func (im IBCModule) OnAcknowledgementPacket(
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			types.EventTypePacket,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
 			sdk.NewAttribute(sdk.AttributeKeySender, data.Sender),
 			sdk.NewAttribute(types.AttributeKeyReceiver, data.Receiver),
 			sdk.NewAttribute(types.AttributeKeyDenom, data.Denom),
@@ -284,7 +282,6 @@ func (im IBCModule) OnTimeoutPacket(
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			types.EventTypeTimeout,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
 			sdk.NewAttribute(types.AttributeKeyRefundReceiver, data.Sender),
 			sdk.NewAttribute(types.AttributeKeyRefundDenom, data.Denom),
 			sdk.NewAttribute(types.AttributeKeyRefundAmount, data.Amount),

modules/apps/transfer/keeper/msg_server.go

@@ -50,10 +50,6 @@ func (k Keeper) Transfer(goCtx context.Context, msg *types.MsgTransfer) (*types.
 			sdk.NewAttribute(types.AttributeKeyDenom, msg.Token.Denom),
 			sdk.NewAttribute(types.AttributeKeyMemo, msg.Memo),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		),
 	})
 
 	return &types.MsgTransferResponse{Sequence: sequence}, nil

modules/core/02-client/keeper/events.go

@@ -23,10 +23,6 @@ func EmitCreateClientEvent(ctx sdk.Context, clientID string, clientState exporte
 			sdk.NewAttribute(types.AttributeKeyClientType, clientState.ClientType()),
 			sdk.NewAttribute(types.AttributeKeyConsensusHeight, clientState.GetLatestHeight().String()),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -58,10 +54,6 @@ func EmitUpdateClientEvent(ctx sdk.Context, clientID string, clientType string,
 			sdk.NewAttribute(types.AttributeKeyConsensusHeights, strings.Join(consensusHeightsAttr, ",")),
 			sdk.NewAttribute(types.AttributeKeyHeader, clientMsgStr),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -74,10 +66,6 @@ func EmitUpgradeClientEvent(ctx sdk.Context, clientID string, clientState export
 			sdk.NewAttribute(types.AttributeKeyClientType, clientState.ClientType()),
 			sdk.NewAttribute(types.AttributeKeyConsensusHeight, clientState.GetLatestHeight().String()),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 

modules/core/03-connection/keeper/events.go

@@ -16,10 +16,6 @@ func EmitConnectionOpenInitEvent(ctx sdk.Context, connectionID string, clientID
 			sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, counterparty.ClientId),
 			sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, counterparty.ConnectionId),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -33,10 +29,6 @@ func EmitConnectionOpenTryEvent(ctx sdk.Context, connectionID string, clientID s
 			sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, counterparty.ClientId),
 			sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, counterparty.ConnectionId),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -50,10 +42,6 @@ func EmitConnectionOpenAckEvent(ctx sdk.Context, connectionID string, connection
 			sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientId),
 			sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionId),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -67,9 +55,5 @@ func EmitConnectionOpenConfirmEvent(ctx sdk.Context, connectionID string, connec
 			sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientId),
 			sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionId),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }

modules/core/04-channel/keeper/events.go

@@ -23,13 +23,6 @@ func EmitChannelOpenInitEvent(ctx sdk.Context, portID string, channelID string,
 			sdk.NewAttribute(types.AttributeVersion, channel.Version),
 		),
 	})
-
-	ctx.EventManager().EmitEvents(sdk.Events{
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
-	})
 }
 
 // EmitChannelOpenTryEvent emits a channel open try event
@@ -45,12 +38,6 @@ func EmitChannelOpenTryEvent(ctx sdk.Context, portID string, channelID string, c
 			sdk.NewAttribute(types.AttributeVersion, channel.Version),
 		),
 	})
-	ctx.EventManager().EmitEvents(sdk.Events{
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
-	})
 }
 
 // EmitChannelOpenAckEvent emits a channel open acknowledge event
@@ -64,10 +51,6 @@ func EmitChannelOpenAckEvent(ctx sdk.Context, portID string, channelID string, c
 			sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
 			sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -82,10 +65,6 @@ func EmitChannelOpenConfirmEvent(ctx sdk.Context, portID string, channelID strin
 			sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
 			sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -100,10 +79,6 @@ func EmitChannelCloseInitEvent(ctx sdk.Context, portID string, channelID string,
 			sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
 			sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -118,10 +93,6 @@ func EmitChannelCloseConfirmEvent(ctx sdk.Context, portID string, channelID stri
 			sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
 			sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -145,10 +116,6 @@ func EmitSendPacketEvent(ctx sdk.Context, packet exported.PacketI, channel types
 			// (is it going to a chain I am connected to)
 			sdk.NewAttribute(types.AttributeKeyConnection, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -172,10 +139,6 @@ func EmitRecvPacketEvent(ctx sdk.Context, packet exported.PacketI, channel types
 			// (is it going to a chain I am connected to)
 			sdk.NewAttribute(types.AttributeKeyConnection, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -199,10 +162,6 @@ func EmitWriteAcknowledgementEvent(ctx sdk.Context, packet exported.PacketI, cha
 			// (is it going to a chain I am connected to)
 			sdk.NewAttribute(types.AttributeKeyConnection, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -224,10 +183,6 @@ func EmitAcknowledgePacketEvent(ctx sdk.Context, packet exported.PacketI, channe
 			// (is it going to a chain I am connected to)
 			sdk.NewAttribute(types.AttributeKeyConnection, channel.ConnectionHops[0]),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }
 
@@ -246,10 +201,6 @@ func EmitTimeoutPacketEvent(ctx sdk.Context, packet exported.PacketI, channel ty
 			sdk.NewAttribute(types.AttributeKeyDstChannel, packet.GetDestChannel()),
 			sdk.NewAttribute(types.AttributeKeyChannelOrdering, channel.Ordering.String()),
 		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
 	})
 }