fix pendingEVMTxEvents

onflow · Dec 2, 2024 · 52c08c6 · 52c08c6
1 parent a9e9004
commit 52c08c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/fvm/evm/offchain/utils/replay.go b/fvm/evm/offchain/utils/replay.go
@@ -96,6 +96,9 @@ func (a *EVMEventsAccumulator) HasBlockEvent(
 		return evmBlockEvent, a.pendingEVMTxEvents, false
 	}
 
+	pendingEVMTxEvents := a.pendingEVMTxEvents
+	// reset pending events
+	a.pendingEVMTxEvents = make([]events.TransactionEventPayload, 0)
 	// if there is an EVM block event, we return the EVM block and the accumulated tx events
-	return evmBlockEvent, a.pendingEVMTxEvents, true
+	return evmBlockEvent, pendingEVMTxEvents, true
 }
diff --git a/fvm/evm/offchain/utils/verify.go b/fvm/evm/offchain/utils/verify.go
@@ -79,6 +79,8 @@ func OffchainReplayBackwardCompatibilityTest(
 			if err != nil {
 				return err
 			}
+
+			continue
 		}
 
 		if IsSporkHeight(chainID, height) {