Refactor: Convert iterators to array getters

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

@@ -22,7 +22,7 @@ message GenesisState {
     (gogoproto.moretags) = "yaml:\"consumer_states\""
   ];
   // empty for a new chain
-  repeated interchain_security.ccv.v1.UnbondingOp unbonding_ops = 3
+  repeated interchain_security.ccv.provider.v1.UnbondingOp unbonding_ops = 3
   [ (gogoproto.nullable) = false ];
   // empty for a new chain
   interchain_security.ccv.v1.MaturedUnbondingOps mature_unbonding_ops = 4;
@@ -65,18 +65,11 @@ message ConsumerState {
   repeated interchain_security.ccv.v1.ValidatorSetChangePacketData pending_valset_changes = 6
   [ (gogoproto.nullable) = false ];
   repeated string slash_downtime_ack = 7;
-  // UnbondingOpsIndex defines the unbonding operations on the consumer chain
-  repeated UnbondingOpIndex unbonding_ops_index = 8
+  // UnbondingOpsIndex defines the unbonding operations waiting on this consumer chain
+  repeated interchain_security.ccv.provider.v1.VscUnbondingOps unbonding_ops_index = 8
   [ (gogoproto.nullable) = false ];
 }
 
-// UnbondingOpIndex defines the genesis information for each unbonding operations index 
-// referenced by chain id and valset udpate id
-message UnbondingOpIndex {
-  uint64 valset_update_id = 1;
-  repeated uint64 unbonding_op_index = 2;
-}
-
 // ValsetUpdateIdToHeight defines the genesis information for the mapping 
 // of each valset udpate id to a block height
 message ValsetUpdateIdToHeight {

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

@@ -9,6 +9,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "ibc/core/client/v1/client.proto";
 import "ibc/lightclients/tendermint/v1/tendermint.proto";
+import "tendermint/crypto/keys.proto";
 
 // ConsumerAdditionProposal is a governance proposal on the provider chain to spawn a new consumer chain.
 // If it passes, then all validators on the provider chain are expected to validate the consumer chain at spawn time
@@ -153,4 +154,41 @@ message ConsumerRemovalProposals {
 // AddressList contains a list of consensus addresses
 message AddressList {
   repeated bytes addresses = 1;
-}
+}
+
+message ChannelToChain {
+  string channel_id = 1;
+  string chain_id = 2;
+}
+
+// VscUnbondingOps contains the IDs of unbonding operations that are waiting for
+// at least one VSCMaturedPacket with vscID from a consumer chain 
+message VscUnbondingOps {
+  uint64 vsc_id = 1;
+  repeated uint64 unbonding_op_ids = 2;
+}
+
+// UnbondingOp contains the ids of consumer chains that need to unbond before 
+// the unbonding operation with the given ID can unbond
+message UnbondingOp {
+  uint64 id = 1;
+  // consumer chains that are still unbonding
+  repeated string unbonding_consumer_chains = 2;
+}
+
+message InitTimeoutTimestamp {
+  string chain_id = 1;
+  uint64 timestamp = 2;
+}
+
+message VscSendTimestamp {
+  uint64 vsc_id = 1;
+  google.protobuf.Timestamp timestamp = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
+}
+
+message KeyAssignmentReplacement {
+  bytes provider_addr = 1;
+  tendermint.crypto.PublicKey prev_c_key = 2;
+  int64 power = 3;
+}
+

proto/interchain_security/ccv/v1/ccv.proto

@@ -32,13 +32,6 @@ message ValidatorSetChangePackets {
   ];
 }
 
-
-message UnbondingOp {
-  uint64 id = 1;
-  // consumer chains that are still unbonding
-  repeated string unbonding_consumer_chains = 2;
-}
-
 // This packet is sent from the consumer chain to the provider chain
 // to notify that a VSC packet reached maturity on the consumer chain.
 message VSCMaturedPacketData {
@@ -60,11 +53,6 @@ message SlashPacketData {
   cosmos.staking.v1beta1.InfractionType infraction = 3;
 }
 
-// UnbondingOpsIndex defines a list of unbonding operation ids.
-message UnbondingOpsIndex {
-  repeated uint64 ids = 1;
-}
-
 // MaturedUnbondingOps defines a list of ids corresponding to ids of matured unbonding operations. 
 message MaturedUnbondingOps {
   repeated uint64 ids = 1;

tests/difference/core/driver/core_test.go

@@ -390,11 +390,9 @@ func (s *CoreSuite) TestAssumptions() {
 	s.Require().Empty(s.consumerKeeper().GetPendingPackets(s.ctx(C)))
 
 	// Consumer has no maturities
-	s.consumerKeeper().IteratePacketMaturityTime(s.ctx(C),
-		func(vscId uint64, timeNs uint64) (stop bool) {
-			s.T().Fatal(FAIL_MSG)
-			return false // Don't stop
-		})
+	for range s.consumerKeeper().GetAllPacketMaturityTimes(s.ctx(C)) {
+		s.T().Fatal(FAIL_MSG)
+	}
 
 	// Consumer power
 	for i := 0; i < len(initState.ValStates.Status); i++ {

tests/e2e/stop_consumer.go

@@ -170,21 +170,16 @@ func (s *CCVTestSuite) checkConsumerChainIsRemoved(chainID string, checkChannel
 	}
 
 	// check UnbondingOps were deleted and undelegation entries aren't onHold
-	providerKeeper.IterateOverUnbondingOpIndex(
-		s.providerCtx(),
-		chainID,
-		func(vscID uint64, ubdIndex []uint64) (stop bool) {
-			_, found := providerKeeper.GetUnbondingOpIndex(s.providerCtx(), chainID, uint64(vscID))
+	for _, unbondingOpsIndex := range providerKeeper.GetAllUnbondingOpIndexes(s.providerCtx(), chainID) {
+		_, found := providerKeeper.GetUnbondingOpIndex(s.providerCtx(), chainID, unbondingOpsIndex.VscId)
+		s.Require().False(found)
+		for _, ubdID := range unbondingOpsIndex.UnbondingOpIds {
+			_, found = providerKeeper.GetUnbondingOp(s.providerCtx(), unbondingOpsIndex.UnbondingOpIds[ubdID])
 			s.Require().False(found)
-			for _, ubdID := range ubdIndex {
-				_, found = providerKeeper.GetUnbondingOp(s.providerCtx(), ubdIndex[ubdID])
-				s.Require().False(found)
-				ubd, _ := providerStakingKeeper.GetUnbondingDelegationByUnbondingID(s.providerCtx(), ubdIndex[ubdID])
-				s.Require().Zero(ubd.Entries[ubdID].UnbondingOnHoldRefCount)
-			}
-			return false // do not stop the iteration
-		},
-	)
+			ubd, _ := providerStakingKeeper.GetUnbondingDelegationByUnbondingID(s.providerCtx(), unbondingOpsIndex.UnbondingOpIds[ubdID])
+			s.Require().Zero(ubd.Entries[ubdID].UnbondingOnHoldRefCount)
+		}
+	}
 
 	// verify consumer chain's states are removed
 	_, found := providerKeeper.GetConsumerGenesis(s.providerCtx(), chainID)

testutil/keeper/unit_test_helpers.go

@@ -254,3 +254,14 @@ func GetTestConsumerAdditionProp() *providertypes.ConsumerAdditionProposal {
 
 	return prop
 }
+
+// Obtains a CrossChainValidator with a newly generated key, and randomized field values
+func GetNewCrossChainValidator(t *testing.T) consumertypes.CrossChainValidator {
+	b1 := make([]byte, 8)
+	_, _ = rand.Read(b1)
+	power := int64(binary.BigEndian.Uint64(b1))
+	privKey := ed25519.GenPrivKey()
+	validator, err := consumertypes.NewCCValidator(privKey.PubKey().Address(), power, privKey.PubKey())
+	require.NoError(t, err)
+	return validator
+}

x/ccv/consumer/keeper/genesis.go

@@ -118,35 +118,6 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 			panic("provider client does not exist")
 		}
 
-		maturingPackets := []consumertypes.MaturingVSCPacket{}
-		k.IteratePacketMaturityTime(ctx, func(vscId, timeNs uint64) (stop bool) {
-			mat := consumertypes.MaturingVSCPacket{
-				VscId:        vscId,
-				MaturityTime: timeNs,
-			}
-			maturingPackets = append(maturingPackets, mat)
-			return false // do not stop the iteration
-		})
-
-		heightToVCIDs := []consumertypes.HeightToValsetUpdateID{}
-		k.IterateHeightToValsetUpdateID(ctx, func(height, vscID uint64) (stop bool) {
-			hv := consumertypes.HeightToValsetUpdateID{
-				Height:         height,
-				ValsetUpdateId: vscID,
-			}
-			heightToVCIDs = append(heightToVCIDs, hv)
-			return false // do not stop the iteration
-		})
-
-		outstandingDowntimes := []consumertypes.OutstandingDowntime{}
-		k.IterateOutstandingDowntime(ctx, func(addr string) (stop bool) {
-			od := consumertypes.OutstandingDowntime{
-				ValidatorConsensusAddress: addr,
-			}
-			outstandingDowntimes = append(outstandingDowntimes, od)
-			return false // do not stop the iteration
-		})
-
 		// TODO: update GetLastTransmissionBlockHeight to not return an error
 		ltbh, err := k.GetLastTransmissionBlockHeight(ctx)
 		if err != nil {
@@ -156,11 +127,11 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 		genesis = consumertypes.NewRestartGenesisState(
 			clientID,
 			channelID,
-			maturingPackets,
+			k.GetAllPacketMaturityTimes(ctx),
 			valset,
-			k.GetHeightToValsetUpdateIDs(ctx),
+			k.GetAllHeightToValsetUpdateIDs(ctx),
 			k.GetPendingPackets(ctx),
-			outstandingDowntimes,
+			k.GetAllOutstandingDowntimes(ctx),
 			*ltbh,
 			params,
 		)
@@ -178,7 +149,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 			"",
 			nil,
 			valset,
-			k.GetHeightToValsetUpdateIDs(ctx),
+			k.GetAllHeightToValsetUpdateIDs(ctx),
 			k.GetPendingPackets(ctx),
 			nil,
 			consumertypes.LastTransmissionBlockHeight{},

x/ccv/consumer/keeper/genesis_test.go

@@ -187,7 +187,7 @@ func TestInitGenesis(t *testing.T) {
 				require.Equal(t, vscID, ck.GetPacketMaturityTime(ctx, vscID))
 				require.Equal(t, pendingDataPackets, ck.GetPendingPackets(ctx))
 
-				require.Equal(t, gs.OutstandingDowntimeSlashing, ck.GetOutstandingDowntimes(ctx))
+				require.Equal(t, gs.OutstandingDowntimeSlashing, ck.GetAllOutstandingDowntimes(ctx))
 
 				ltbh, err := ck.GetLastTransmissionBlockHeight(ctx)
 				require.NoError(t, err)
@@ -382,10 +382,10 @@ func assertProviderClientID(t *testing.T, ctx sdk.Context, ck *consumerkeeper.Ke
 // assert that the given input match the height to valset update ID mappings in the store
 func assertHeightValsetUpdateIDs(t *testing.T, ctx sdk.Context, ck *consumerkeeper.Keeper, heighValsetUpdateIDs []consumertypes.HeightToValsetUpdateID) {
 	ctr := 0
-	ck.IterateHeightToValsetUpdateID(ctx, func(height uint64, vscID uint64) (stop bool) {
-		require.Equal(t, heighValsetUpdateIDs[ctr].Height, height)
-		require.Equal(t, heighValsetUpdateIDs[ctr].ValsetUpdateId, vscID)
+
+	for _, heightToValsetUpdateID := range ck.GetAllHeightToValsetUpdateIDs(ctx) {
+		require.Equal(t, heighValsetUpdateIDs[ctr].Height, heightToValsetUpdateID.Height)
+		require.Equal(t, heighValsetUpdateIDs[ctr].ValsetUpdateId, heightToValsetUpdateID.ValsetUpdateId)
 		ctr++
-		return false
-	})
+	}
 }