Fix: export InitTimeoutTimestamps and VscSendTimestamps to genesis

proto/interchain_security/ccv/consumer/v1/genesis.proto

@@ -55,4 +55,4 @@ message HeightToValsetUpdateID {
 
 // OutstandingDowntime defines the genesis information for each validator
 // flagged with an outstanding downtime slashing.
-message OutstandingDowntime { string validator_consensus_address = 1; }
+message OutstandingDowntime { string validator_consensus_address = 1; }

proto/interchain_security/ccv/provider/v1/genesis.proto

@@ -44,6 +44,12 @@ message GenesisState {
   // empty for a new chain
   repeated ConsumerAddrsToPrune consumer_addrs_to_prune = 11
       [ (gogoproto.nullable) = false ];
+
+  repeated interchain_security.ccv.provider.v1.InitTimeoutTimestamp init_timeout_timestamps = 12
+      [ (gogoproto.nullable) = false ];
+
+  repeated interchain_security.ccv.provider.v1.ExportedVscSendTimestamp exported_vsc_send_timestamps = 13
+      [ (gogoproto.nullable) = false ];
 }
 
 // consumer chain

proto/interchain_security/ccv/provider/v1/provider.proto

@@ -221,6 +221,13 @@ message VscSendTimestamp {
       [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
 }
 
+// ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis
+message ExportedVscSendTimestamp {
+  string chain_id = 1;
+  VscSendTimestamp vsc_send_timestamp = 2
+    [ (gogoproto.nullable) = false ];
+}
+
 //
 // Key assignment section
 //

proto/interchain_security/ccv/provider/v1/tx.proto

@@ -44,4 +44,4 @@ message MsgRegisterConsumerRewardDenom {
 
 // MsgRegisterConsumerRewardDenomResponse defines the
 // Msg/RegisterConsumerRewardDenom response type.
-message MsgRegisterConsumerRewardDenomResponse {}
+message MsgRegisterConsumerRewardDenomResponse {}

proto/interchain_security/ccv/v1/ccv.proto

@@ -84,4 +84,4 @@ enum ConsumerPacketDataType {
   // VSCMatured packet
   CONSUMER_PACKET_TYPE_VSCM = 2
       [ (gogoproto.enumvalue_customname) = "VscMaturedPacket" ];
-}
+}

x/ccv/provider/keeper/genesis.go

@@ -90,6 +90,14 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) {
 		}
 	}
 
+	for _, item := range genState.InitTimeoutTimestamps {
+		k.SetInitTimeoutTimestamp(ctx, item.ChainId, item.Timestamp)
+	}
+
+	for _, item := range genState.ExportedVscSendTimestamps {
+		k.SetVscSendTimestamp(ctx, item.ChainId, item.VscSendTimestamp.VscId, item.VscSendTimestamp.Timestamp)
+	}
+
 	k.SetParams(ctx, genState.Params)
 	k.InitializeSlashMeter(ctx)
 }
@@ -99,6 +107,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	// get a list of all registered consumer chains
 	registeredChains := k.GetAllConsumerChains(ctx)
 
+	var exportedVscSendTimestamps []types.ExportedVscSendTimestamp
 	// export states for each consumer chains
 	var consumerStates []types.ConsumerState
 	for _, chain := range registeredChains {
@@ -129,6 +138,10 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 		cs.PendingValsetChanges = k.GetPendingVSCPackets(ctx, chain.ChainId)
 		consumerStates = append(consumerStates, cs)
 
+		vscSendTimestamps := k.GetAllVscSendTimestamps(ctx, chain.ChainId)
+		for _, vscSendTimestamp := range vscSendTimestamps {
+			exportedVscSendTimestamps = append(exportedVscSendTimestamps, types.ExportedVscSendTimestamp{ChainId: chain.ChainId, VscSendTimestamp: vscSendTimestamp})
+		}
 	}
 
 	// ConsumerAddrsToPrune are added only for registered consumer chains
@@ -151,5 +164,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 		k.GetAllValidatorConsumerPubKeys(ctx, nil),
 		k.GetAllValidatorsByConsumerAddr(ctx, nil),
 		consumerAddrsToPrune,
+		k.GetAllInitTimeoutTimestamps(ctx),
+		exportedVscSendTimestamps,
 	)
 }

x/ccv/provider/keeper/genesis_test.go

@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	"sort"
 	"testing"
 	"time"
 
@@ -35,6 +36,22 @@ func TestInitAndExportGenesis(t *testing.T) {
 	consumerTmPubKey := consumerCryptoId.TMProtoCryptoPublicKey()
 	consumerConsAddr := consumerCryptoId.ConsumerConsAddress()
 
+	initTimeoutTimeStamps := []providertypes.InitTimeoutTimestamp{
+		{ChainId: cChainIDs[0], Timestamp: uint64(time.Now().UTC().UnixNano()) + 10},
+		{ChainId: cChainIDs[1], Timestamp: uint64(time.Now().UTC().UnixNano()) + 15},
+	}
+
+	now := time.Now().UTC()
+	exportedVscSendTimeStampsC0 := []providertypes.ExportedVscSendTimestamp{
+		{ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(time.Hour)}},
+		{ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(2 * time.Hour)}},
+	}
+
+	exportedVscSendTimeStampsC1 := []providertypes.ExportedVscSendTimestamp{
+		{ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(-time.Hour)}},
+		{ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(time.Hour)}},
+	}
+	exportedVscSendTimeStampsAll := append(exportedVscSendTimeStampsC0, exportedVscSendTimeStampsC1...)
 	// create genesis struct
 	provGenesis := providertypes.NewGenesisState(vscID,
 		[]providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}},
@@ -97,6 +114,8 @@ func TestInitAndExportGenesis(t *testing.T) {
 				ConsumerAddrs: &providertypes.AddressList{Addresses: [][]byte{consumerConsAddr.ToSdkConsAddr()}},
 			},
 		},
+		initTimeoutTimeStamps,
+		exportedVscSendTimeStampsAll,
 	)
 
 	// Instantiate in-mem provider keeper with mocks
@@ -163,6 +182,38 @@ func TestInitAndExportGenesis(t *testing.T) {
 
 	// check the exported genesis
 	require.Equal(t, provGenesis, pk.ExportGenesis(ctx))
+
+	initTimeoutTimestampInStore := pk.GetAllInitTimeoutTimestamps(ctx)
+	sort.Slice(initTimeoutTimestampInStore, func(i, j int) bool {
+		return initTimeoutTimestampInStore[i].Timestamp < initTimeoutTimestampInStore[j].Timestamp
+	})
+	require.Equal(t, initTimeoutTimestampInStore, initTimeoutTimeStamps)
+
+	vscSendTimestampsC0InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[0])
+	sort.Slice(vscSendTimestampsC0InStore, func(i, j int) bool {
+		return vscSendTimestampsC0InStore[i].VscId < vscSendTimestampsC0InStore[j].VscId
+	})
+
+	require.Equal(t, vscSendTimestampsC0InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC0))
+
+	vscSendTimestampsC1InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[1])
+	sort.Slice(vscSendTimestampsC1InStore, func(i, j int) bool {
+		return vscSendTimestampsC1InStore[i].VscId < vscSendTimestampsC1InStore[j].VscId
+	})
+	require.Equal(t, vscSendTimestampsC1InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC1))
+}
+
+func exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStamps []providertypes.ExportedVscSendTimestamp) []providertypes.VscSendTimestamp {
+	vscSendTimeStamps := []providertypes.VscSendTimestamp{}
+	for _, exportedVscSendTimeStamp := range exportedVscSendTimeStamps {
+		vscSendTimeStamps = append(vscSendTimeStamps, exportedVscSendTimeStamp.VscSendTimestamp)
+	}
+
+	sort.Slice(vscSendTimeStamps, func(i, j int) bool {
+		return vscSendTimeStamps[i].VscId < vscSendTimeStamps[j].VscId
+	})
+
+	return vscSendTimeStamps
 }
 
 func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) {

x/ccv/provider/module_test.go

@@ -109,6 +109,8 @@ func TestInitGenesis(t *testing.T) {
 			nil,
 			nil,
 			nil,
+			nil,
+			nil,
 		)
 
 		cdc := keeperParams.Cdc

x/ccv/provider/types/genesis.go

@@ -22,6 +22,8 @@ func NewGenesisState(
 	validatorConsumerPubkeys []ValidatorConsumerPubKey,
 	validatorsByConsumerAddr []ValidatorByConsumerAddr,
 	consumerAddrsToPrune []ConsumerAddrsToPrune,
+	initTimeoutTimestamps []InitTimeoutTimestamp,
+	exportedVscSendTimestamps []ExportedVscSendTimestamp,
 ) *GenesisState {
 	return &GenesisState{
 		ValsetUpdateId:            vscID,
@@ -35,6 +37,8 @@ func NewGenesisState(
 		ValidatorConsumerPubkeys:  validatorConsumerPubkeys,
 		ValidatorsByConsumerAddr:  validatorsByConsumerAddr,
 		ConsumerAddrsToPrune:      consumerAddrsToPrune,
+		InitTimeoutTimestamps:     initTimeoutTimestamps,
+		ExportedVscSendTimestamps: exportedVscSendTimestamps,
 	}
 }