update key

cosmos · Sep 15, 2023 · 658b5f5 · 658b5f5
1 parent 690c61c
commit 658b5f5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 31 deletions.
diff --git a/x/ccv/provider/keeper/gov_hook.go b/x/ccv/provider/keeper/gov_hook.go
@@ -36,20 +36,22 @@ func (gh GovHooks) AfterProposalSubmission(ctx sdk.Context, proposalID uint64) {
 	}
 	msgs := p.GetMessages()
 
-	var msgLegacyContent v1.MsgExecLegacyContent
-	err := proto.Unmarshal(msgs[0].Value, &msgLegacyContent)
-	if err != nil {
-		panic(fmt.Errorf("failed to unmarshal proposal content in gov hook: %w", err))
-	}
+	for _, msg := range msgs {
+		var msgLegacyContent v1.MsgExecLegacyContent
+		err := proto.Unmarshal(msg.Value, &msgLegacyContent)
+		if err != nil {
+			panic(fmt.Errorf("failed to unmarshal proposal content in gov hook: %w", err))
+		}
 
-	// if the proposal is not ConsumerAdditionProposal, return
-	var consadditionProp types.ConsumerAdditionProposal
-	if err := proto.Unmarshal(msgLegacyContent.Content.Value, &consadditionProp); err != nil {
-		return
-	}
+		// if the proposal is not ConsumerAdditionProposal, return
+		var consAdditionProp types.ConsumerAdditionProposal
+		if err := proto.Unmarshal(msgLegacyContent.Content.Value, &consAdditionProp); err != nil {
+			return
+		}
 
-	if consadditionProp.ProposalType() == types.ProposalTypeConsumerAddition {
-		gh.k.SetChainsInProposal(ctx, consadditionProp.ChainId, proposalID)
+		if consAdditionProp.ProposalType() == types.ProposalTypeConsumerAddition {
+			gh.k.SetChainsInProposal(ctx, consAdditionProp.ChainId, proposalID)
+		}
 	}
 }
 
@@ -64,22 +66,24 @@ func (gh GovHooks) AfterProposalVotingPeriodEnded(ctx sdk.Context, proposalID ui
 	}
 	msgs := p.GetMessages()
 
-	var msgLegacyContent v1.MsgExecLegacyContent
-	err := proto.Unmarshal(msgs[0].Value, &msgLegacyContent)
-	if err != nil {
-		panic(fmt.Errorf("failed to unmarshal proposal content in gov hook: %w", err))
-	}
-	var consadditionProp types.ConsumerAdditionProposal
+	for _, msg := range msgs {
+		var msgLegacyContent v1.MsgExecLegacyContent
+		err := proto.Unmarshal(msg.Value, &msgLegacyContent)
+		if err != nil {
+			panic(fmt.Errorf("failed to unmarshal proposal content in gov hook: %w", err))
+		}
+		var consAdditionProp types.ConsumerAdditionProposal
 
-	// if the proposal is not ConsumerAdditionProposal, return
-	if err := proto.Unmarshal(msgLegacyContent.Content.Value, &consadditionProp); err != nil {
-		return
-	}
-	if consadditionProp.ProposalType() != types.ProposalTypeConsumerAddition {
-		return
-	}
+		// if the proposal is not ConsumerAdditionProposal, return
+		if err := proto.Unmarshal(msgLegacyContent.Content.Value, &consAdditionProp); err != nil {
+			return
+		}
+		if consAdditionProp.ProposalType() != types.ProposalTypeConsumerAddition {
+			return
+		}
 
-	gh.k.DeleteChainsInProposal(ctx, consadditionProp.ChainId)
+		gh.k.DeleteChainsInProposal(ctx, consAdditionProp.ChainId, proposalID)
+	}
 }
 
 func (gh GovHooks) AfterProposalDeposit(ctx sdk.Context, proposalID uint64, depositorAddr sdk.AccAddress) {}

diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go
@@ -183,14 +183,14 @@ func (k Keeper) DeleteChainToChannel(ctx sdk.Context, chainID string) {
 // does not end.
 func (k Keeper) SetChainsInProposal(ctx sdk.Context, chainID string, proposalID uint64) {
 	store := ctx.KVStore(k.storeKey)
-	store.Set(types.ChainInProposalKey(chainID), sdk.Uint64ToBigEndian(proposalID))
+	store.Set(types.ChainInProposalKey(chainID, proposalID), []byte(chainID))
 }
 
 // DeleteChainsInProposal deletes the consumer chainID from store
 // which is in gov consumerAddition proposal
-func (k Keeper) DeleteChainsInProposal(ctx sdk.Context, chainID string) {
+func (k Keeper) DeleteChainsInProposal(ctx sdk.Context, chainID string, proposalID uint64) {
 	store := ctx.KVStore(k.storeKey)
-	store.Delete(types.ChainInProposalKey(chainID))
+	store.Delete(types.ChainInProposalKey(chainID, proposalID))
 }
 
 // GetAllChainsInProposal get consumer chainId in gov consumerAddition proposal before

diff --git a/x/ccv/provider/types/keys.go b/x/ccv/provider/types/keys.go
@@ -417,8 +417,12 @@ func ChainIdWithLenKey(prefix byte, chainID string) []byte {
 }
 
 // ChainInProposalKey returns the consumer chainId in consumerAddition gov proposal submitted before voting finishes
-func ChainInProposalKey(chainID string) []byte {
-	return append([]byte{ChainInProposalByteKey}, []byte(chainID)...)
+func ChainInProposalKey(chainID string, proposalID uint64) []byte {
+	return ccvtypes.AppendMany(
+		[]byte{ChainInProposalByteKey},
+		[]byte(chainID),
+		sdk.Uint64ToBigEndian(proposalID),
+		)
 }
 
 // ParseChainIdAndTsKey returns the chain ID and time for a ChainIdAndTs key