From 43110698d1379fde901061fedc7a104956dff781 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Tue, 28 Jan 2025 11:12:22 -0600 Subject: [PATCH] Only unmarshal unapproved events in gravity migration --- module/x/gravity/keeper/migrations.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/x/gravity/keeper/migrations.go b/module/x/gravity/keeper/migrations.go index 474dad915..607c86073 100644 --- 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())