Merge pull request #574 from PeggyJV/collin/migration-fix

Only unmarshal unapproved events in gravity migration
PeggyJV · Jan 28, 2025 · de86d6e · de86d6e
2 parents 029b0fe + 4311069
commit de86d6e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/module/x/gravity/keeper/migrations.go b/module/x/gravity/keeper/migrations.go
@@ -47,11 +47,17 @@ func (m Migrator) DeletePendingEventVoteRecords(ctx sdk.Context) error {
 	var lowestNonce uint64
 	var unapprovedEventSigners []string
 	m.keeper.IterateEthereumEventVoteRecords(ctx, func(key []byte, eventVoteRecord *types.EthereumEventVoteRecord) bool {
+		// Skip approved events
+		if eventVoteRecord.Accepted {
+			return false
+		}
+
 		event, err := types.UnpackEvent(eventVoteRecord.Event)
 		if err != nil {
 			panic(err)
 		}
-		if !eventVoteRecord.Accepted && event.GetEventNonce() > lastObservedEventNonce {
+
+		if event.GetEventNonce() > lastObservedEventNonce {
 			v5Hash := OldHash(event)
 			ctx.Logger().Info("gravity: v5 event hash: ", v5Hash)
 			ctx.Logger().Info("gravity: v6 event hash: ", event.Hash())