From 6da0185f43881303f04f05170b2e2aced8b47e9e Mon Sep 17 00:00:00 2001
From: Eric Bolten <eric@bolten.dev>
Date: Fri, 7 Jan 2022 18:19:13 -0800
Subject: [PATCH] Reset last ethereum event for each validator

---
 module/x/gravity/keeper/keeper.go      | 27 +++++++++++++++++++-------
 module/x/gravity/keeper/keeper_test.go |  4 ++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/module/x/gravity/keeper/keeper.go b/module/x/gravity/keeper/keeper.go
index 507d4d27c..fa812d266 100644
--- a/module/x/gravity/keeper/keeper.go
+++ b/module/x/gravity/keeper/keeper.go
@@ -572,7 +572,6 @@ func (k Keeper) CreateContractCallTx(ctx sdk.Context, invalidationNonce uint64,
 // We will have yet to implement functionality to Migrate the Cosmos ERC20 tokens or any other ERC20 tokens bridged to the gravity contracts.
 // This just does keeper state cleanup if a new gravity contract has been deployed
 func (k Keeper) MigrateGravityContract(ctx sdk.Context, newBridgeAddress string, bridgeDeploymentHeight uint64) {
-
 	// Delete Any Outgoing TXs.
 
 	prefixStoreOtx := prefix.NewStore(ctx.KVStore(k.storeKey), []byte{types.OutgoingTxKey})
@@ -598,12 +597,13 @@ func (k Keeper) MigrateGravityContract(ctx sdk.Context, newBridgeAddress string,
 		prefixStoreOtx.Delete(iterOtx.Key())
 	}
 
-	//Reset the last observed signer set nonce
-	ctx.KVStore(k.storeKey).Set([]byte{types.LatestSignerSetTxNonceKey}, sdk.Uint64ToBigEndian(0))
+	// Reset the last observed signer set nonce
+	store := ctx.KVStore(k.storeKey)
+	store.Set([]byte{types.LatestSignerSetTxNonceKey}, sdk.Uint64ToBigEndian(0))
 
 	prefixStoreEthereumEvent := prefix.NewStore(ctx.KVStore(k.storeKey), []byte{types.EthereumEventVoteRecordKey})
 
-	//Delete all Ethereum Events
+	// Delete all Ethereum Events
 
 	iterEvent := prefixStoreEthereumEvent.Iterator(nil, nil)
 	defer iterEvent.Close()
@@ -611,15 +611,28 @@ func (k Keeper) MigrateGravityContract(ctx sdk.Context, newBridgeAddress string,
 		prefixStoreEthereumEvent.Delete(iterEvent.Key())
 	}
 
-	//Rest the Ethereum Event Nonce to Zero
-	store := ctx.KVStore(k.storeKey)
-	store.Set([]byte{types.LastObservedEventNonceKey}, sdk.Uint64ToBigEndian(0))
+	// Reset all ethereum event nonces to zero
+	k.setLastObservedEventNonce(ctx, 0)
+	k.iterateEthereumEventVoteRecords(ctx, func(_ []byte, voteRecord *types.EthereumEventVoteRecord) bool {
+		for _, vote := range voteRecord.Votes {
+			val, err := sdk.ValAddressFromBech32(vote)
+
+			if err != nil {
+				panic(err)
+			}
+
+			k.setLastEventNonceByValidator(ctx, val, 0)
+		}
+
+		return true
+	})
 
 	// Set the Last oberved Ethereum Blockheight to zero
 	height := types.LatestEthereumBlockHeight{
 		EthereumHeight: (bridgeDeploymentHeight - 1),
 		CosmosHeight:   uint64(ctx.BlockHeight()),
 	}
+
 	store.Set([]byte{types.LastEthereumBlockHeightKey}, k.cdc.MustMarshal(&height))
 
 	k.setLastObservedSignerSetTx(ctx, types.SignerSetTx{
diff --git a/module/x/gravity/keeper/keeper_test.go b/module/x/gravity/keeper/keeper_test.go
index 81745d407..f51193878 100644
--- a/module/x/gravity/keeper/keeper_test.go
+++ b/module/x/gravity/keeper/keeper_test.go
@@ -634,6 +634,10 @@ func TestKeeper_Migration(t *testing.T) {
 	nonce2 := gk.GetLastObservedEventNonce(ctx)
 	require.Equal(t, uint64(0), nonce2)
 
+	for _, val := range ValAddrs {
+		require.Equal(t, uint64(0), gk.getLastEventNonceByValidator(ctx, val))
+	}
+
 	got := gk.GetLastObservedSignerSetTx(ctx)
 	require.Equal(t, got, &types.SignerSetTx{Nonce: 0x0, Height: 0x0, Signers: types.EthereumSigners(nil)})