Update #264 - updates genesis and genesis tests

x/ccv/consumer/keeper/genesis.go

@@ -6,7 +6,6 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
-	"github.com/cosmos/interchain-security/x/ccv/consumer/types"
 	consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/x/ccv/types"
 
@@ -125,34 +124,40 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 			panic("provider client does not exist")
 		}
 
-		maturingPackets := []types.MaturingVSCPacket{}
+		maturingPackets := []consumertypes.MaturingVSCPacket{}
 		k.IteratePacketMaturityTime(ctx, func(vscId, timeNs uint64) bool {
-			mat := types.MaturingVSCPacket{
+			mat := consumertypes.MaturingVSCPacket{
 				VscId:        vscId,
 				MaturityTime: timeNs,
 			}
 			maturingPackets = append(maturingPackets, mat)
 			return false
 		})
 
-		outstandingDowntimes := []types.OutstandingDowntime{}
+		outstandingDowntimes := []consumertypes.OutstandingDowntime{}
 		k.IterateOutstandingDowntime(ctx, func(addr string) bool {
-			od := types.OutstandingDowntime{
+			od := consumertypes.OutstandingDowntime{
 				ValidatorConsensusAddress: addr,
 			}
 			outstandingDowntimes = append(outstandingDowntimes, od)
 			return true
 		})
 
-		genesis = types.NewRestartGenesisState(
+		// TODO: update GetLastTransmissionBlockHeight to not return an error
+		ltbh, err := k.GetLastTransmissionBlockHeight(ctx)
+		if err != nil {
+			panic(err)
+		}
+
+		genesis = consumertypes.NewRestartGenesisState(
 			clientID,
 			channelID,
 			maturingPackets,
 			valset,
 			k.GetHeightToValsetUpdateIDs(ctx),
 			consumertypes.SlashRequests{},
 			outstandingDowntimes,
-			consumertypes.LastTransmissionBlockHeight{},
+			*ltbh,
 			params,
 		)
 	} else {

x/ccv/consumer/keeper/genesis_test.go

@@ -166,7 +166,7 @@ func TestInitGenesis(t *testing.T) {
 				[]consumertypes.OutstandingDowntime{
 					{ValidatorConsensusAddress: sdk.ConsAddress(validator.Bytes()).String()},
 				},
-				consumertypes.LastTransmissionBlockHeight{Height: int64(blockHeight)},
+				consumertypes.LastTransmissionBlockHeight{Height: int64(100)},
 				params,
 			),
 			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *consumertypes.GenesisState) {
@@ -246,7 +246,7 @@ func TestExportGenesis(t *testing.T) {
 	updatedHeightValsetUpdateIDs := append(defaultHeightValsetUpdateIDs,
 		consumertypes.HeightToValsetUpdateID{ValsetUpdateId: vscID + 1, Height: blockHeight + 1},
 	)
-	ltbh := consumertypes.LastTransmissionBlockHeight{Height: int64(blockHeight)}
+	ltbh := consumertypes.LastTransmissionBlockHeight{Height: int64(1000)}
 	// create default parameters for a new chain
 	params := types.DefaultParams()
 	params.Enabled = true

x/ccv/consumer/types/genesis.go

@@ -45,6 +45,7 @@ func NewRestartGenesisState(clientID, channelID string,
 		HeightToValsetUpdateId:      heightToValsetUpdateIDs,
 		PendingSlashRequests:        pendingSlashRequests,
 		OutstandingDowntimeSlashing: outstandingDowntimes,
+		LastTransmissionBlockHeight: lastTransBlockHeight,
 	}
 }
 
@@ -109,6 +110,19 @@ func (gs GenesisState) Validate() error {
 		if gs.ProviderClientId == "" {
 			return sdkerrors.Wrap(ccv.ErrInvalidGenesis, "provider client id must be set for a restarting consumer genesis state")
 		}
+		// handshake is still in progress
+		if gs.ProviderChannelId == "" && (len(gs.MaturingPackets) != 0 || len(gs.OutstandingDowntimeSlashing) != 0 || gs.LastTransmissionBlockHeight.Height != 0) {
+			return sdkerrors.Wrap(
+				ccv.ErrInvalidGenesis,
+				"maturing packets, outstanding downtime slashing and last transmission block height must be empty when handshake isn't completed",
+			)
+		}
+		if gs.HeightToValsetUpdateId == nil {
+			return sdkerrors.Wrap(
+				ccv.ErrInvalidGenesis,
+				"empty height to validator set update id mapping",
+			)
+		}
 		if gs.ProviderClientState != nil || gs.ProviderConsensusState != nil {
 			return sdkerrors.Wrap(ccv.ErrInvalidGenesis, "provider client state and consensus states must be nil for a restarting genesis state")
 		}

x/ccv/consumer/types/genesis_test.go

@@ -157,11 +157,19 @@ func TestValidateInitialGenesisState(t *testing.T) {
 			types.NewInitialGenesisState(cs, consensusState, nil, params),
 			true,
 		},
+		{
+			"invalid new consumer genesis state: invalid consensus state validator set hash",
+			types.NewInitialGenesisState(
+				cs, ibctmtypes.NewConsensusState(
+					time.Now(), commitmenttypes.NewMerkleRoot([]byte("apphash")), []byte("wrong_length_hash")),
+				valUpdates, params),
+			true,
+		},
 		{
 			"invalid new consumer genesis state: initial validator set does not match validator set hash",
 			types.NewInitialGenesisState(
 				cs, ibctmtypes.NewConsensusState(
-					time.Now(), commitmenttypes.NewMerkleRoot([]byte("apphash")), []byte("wrong_hash")),
+					time.Now(), commitmenttypes.NewMerkleRoot([]byte("apphash")), []byte("9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08")),
 				valUpdates, params),
 			true,
 		},
@@ -206,6 +214,11 @@ func TestValidateRestartGenesisState(t *testing.T) {
 	valHash := valSet.Hash()
 	valUpdates := tmtypes.TM2PB.ValidatorUpdates(valSet)
 
+	// create default height to validator set update id mapping
+	heightToValsetUpdateID := []types.HeightToValsetUpdateID{
+		{Height: 0, ValsetUpdateId: 0},
+	}
+
 	cs := ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false)
 	consensusState := ibctmtypes.NewConsensusState(time.Now(), commitmenttypes.NewMerkleRoot([]byte("apphash")), valHash[:])
 
@@ -219,7 +232,7 @@ func TestValidateRestartGenesisState(t *testing.T) {
 	}{
 		{
 			"valid restart consumer genesis state: empty maturing packets",
-			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
+			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
 			false,
 		},
 		{
@@ -228,12 +241,12 @@ func TestValidateRestartGenesisState(t *testing.T) {
 				{1, uint64(time.Now().UnixNano())},
 				{3, uint64(time.Now().UnixNano())},
 				{5, uint64(time.Now().UnixNano())},
-			}, valUpdates, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
+			}, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
 			false,
 		},
 		{
-			"invalid restart consumer genesis state: channel id is empty",
-			types.NewRestartGenesisState("", "ccvchannel", nil, valUpdates, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
+			"invalid restart consumer genesis state: provider id is empty",
+			types.NewRestartGenesisState("", "ccvchannel", nil, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
@@ -291,6 +304,30 @@ func TestValidateRestartGenesisState(t *testing.T) {
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, nil, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
+		{
+			"invalid restart consumer genesis state: nil height to validator set id mapping",
+			types.NewRestartGenesisState("ccvclient", "",
+				[]types.MaturingVSCPacket{{1, 0}}, valUpdates, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
+			true,
+		}, {
+			"invalid restart consumer genesis state: maturing packet defined when handshake is still in progress",
+			types.NewRestartGenesisState("ccvclient", "",
+				[]types.MaturingVSCPacket{{1, 0}}, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{}, params),
+			true,
+		},
+		{
+			"invalid restart consumer genesis state: outstanding downtime defined when handshake is still in progress",
+			types.NewRestartGenesisState("ccvclient", "",
+				nil, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, []types.OutstandingDowntime{{ValidatorConsensusAddress: "cosmosvalconsxxx"}},
+				types.LastTransmissionBlockHeight{}, params),
+			true,
+		},
+		{
+			"invalid restart consumer genesis state: last transmission block height defined when handshake is still in progress",
+			types.NewRestartGenesisState("ccvclient", "",
+				nil, valUpdates, heightToValsetUpdateID, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{Height: int64(1)}, params),
+			true,
+		},
 		{
 			"invalid restart consumer genesis state: invalid params",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, nil, types.SlashRequests{}, nil, types.LastTransmissionBlockHeight{},