ics29:fix: update genesis type (#913)

* fix: adding ForwardRelayerAddresses to genesis

* fix: trimspace on string check

* nit: err + trimspace error case

modules/apps/29-fee/types/genesis.go

@@ -1,18 +1,21 @@
 package types
 
 import (
+	"strings"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
 )
 
 // NewGenesisState creates a 29-fee GenesisState instance.
-func NewGenesisState(identifiedFees []IdentifiedPacketFee, feeEnabledChannels []*FeeEnabledChannel, registeredRelayers []*RegisteredRelayerAddress) *GenesisState {
+func NewGenesisState(identifiedFees []IdentifiedPacketFee, feeEnabledChannels []*FeeEnabledChannel, registeredRelayers []*RegisteredRelayerAddress, forwardRelayers []*ForwardRelayerAddress) *GenesisState {
 	return &GenesisState{
 		IdentifiedFees:     identifiedFees,
 		FeeEnabledChannels: feeEnabledChannels,
 		RegisteredRelayers: registeredRelayers,
+		ForwardRelayers:    forwardRelayers,
 	}
 }
 
@@ -22,6 +25,7 @@ func DefaultGenesisState() *GenesisState {
 		IdentifiedFees:     []IdentifiedPacketFee{},
 		FeeEnabledChannels: []*FeeEnabledChannel{},
 		RegisteredRelayers: []*RegisteredRelayerAddress{},
+		ForwardRelayers:    []*ForwardRelayerAddress{},
 	}
 }
 
@@ -48,15 +52,25 @@ func (gs GenesisState) Validate() error {
 
 	// Validate RegisteredRelayers
 	for _, rel := range gs.RegisteredRelayers {
-		_, err := sdk.AccAddressFromBech32(rel.Address)
-		if err != nil {
+		if _, err := sdk.AccAddressFromBech32(rel.Address); err != nil {
 			return sdkerrors.Wrap(err, "failed to convert source relayer address into sdk.AccAddress")
 		}
 
-		if rel.CounterpartyAddress == "" {
+		if strings.TrimSpace(rel.CounterpartyAddress) == "" {
 			return ErrCounterpartyAddressEmpty
 		}
 	}
 
+	// Validate ForwardRelayers
+	for _, rel := range gs.ForwardRelayers {
+		if _, err := sdk.AccAddressFromBech32(rel.Address); err != nil {
+			return sdkerrors.Wrap(err, "failed to convert forward relayer address into sdk.AccAddress")
+		}
+
+		if err := rel.PacketId.Validate(); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }

modules/apps/29-fee/types/genesis_test.go

@@ -23,14 +23,16 @@ var (
 
 func TestValidateGenesis(t *testing.T) {
 	var (
-		packetId     channeltypes.PacketId
-		fee          types.Fee
-		refundAcc    string
-		sender       string
-		counterparty string
-		portID       string
-		channelID    string
-		seq          uint64
+		packetId        channeltypes.PacketId
+		fee             types.Fee
+		refundAcc       string
+		sender          string
+		forwardAddr     string
+		counterparty    string
+		portID          string
+		channelID       string
+		packetChannelID string
+		seq             uint64
 	)
 
 	testCases := []struct {
@@ -118,7 +120,21 @@ func TestValidateGenesis(t *testing.T) {
 		{
 			"invalid RegisteredRelayers: invalid counterparty",
 			func() {
-				counterparty = ""
+				counterparty = " "
+			},
+			false,
+		},
+		{
+			"invalid ForwardRelayerAddress: invalid forwardAddr",
+			func() {
+				forwardAddr = ""
+			},
+			false,
+		},
+		{
+			"invalid ForwardRelayerAddress: invalid packet",
+			func() {
+				packetChannelID = "1"
 			},
 			false,
 		},
@@ -127,6 +143,7 @@ func TestValidateGenesis(t *testing.T) {
 	for _, tc := range testCases {
 		portID = transfertypes.PortID
 		channelID = ibctesting.FirstChannelID
+		packetChannelID = ibctesting.FirstChannelID
 		seq = uint64(1)
 
 		// build PacketId & Fee
@@ -146,6 +163,7 @@ func TestValidateGenesis(t *testing.T) {
 		// relayer addresses
 		sender = addr1
 		counterparty = addr2
+		forwardAddr = addr2
 
 		tc.malleate()
 
@@ -170,6 +188,12 @@ func TestValidateGenesis(t *testing.T) {
 					CounterpartyAddress: counterparty,
 				},
 			},
+			ForwardRelayers: []*types.ForwardRelayerAddress{
+				{
+					Address:  forwardAddr,
+					PacketId: channeltypes.NewPacketId(packetChannelID, portID, 1),
+				},
+			},
 		}
 
 		err := genState.Validate()