From 52c08c65a7ce53cbb42ab29f22557a5d2ed43764 Mon Sep 17 00:00:00 2001
From: "Leo Zhang (zhangchiqing)" <zhangchiqing@gmail.com>
Date: Tue, 26 Nov 2024 23:27:33 -0800
Subject: [PATCH] fix pendingEVMTxEvents

---
 fvm/evm/offchain/utils/replay.go | 5 ++++-
 fvm/evm/offchain/utils/verify.go | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fvm/evm/offchain/utils/replay.go b/fvm/evm/offchain/utils/replay.go
index 1c556f82d19..d6cb222fa73 100644
--- 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
index 3cfe410f315..9335beb6230 100644
--- 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) {