fix pendingEVMTxEvents

zhangchiqing · zhangchiqing · commit 52c08c65a7ce · 2024-12-02T14:34:50.000-08:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ func (a *EVMEventsAccumulator) HasBlockEvent(`
`96`	`96`	`return evmBlockEvent, a.pendingEVMTxEvents, false`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ pendingEVMTxEvents := a.pendingEVMTxEvents`
	`100`	`+ // reset pending events`
	`101`	`+ a.pendingEVMTxEvents = make([]events.TransactionEventPayload, 0)`
`99`	`102`	`// if there is an EVM block event, we return the EVM block and the accumulated tx events`
`100`		`- return evmBlockEvent, a.pendingEVMTxEvents, true`
	`103`	`+ return evmBlockEvent, pendingEVMTxEvents, true`
`101`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ func OffchainReplayBackwardCompatibilityTest(`
`79`	`79`	`if err != nil {`
`80`	`80`	`return err`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ continue`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`if IsSporkHeight(chainID, height) {`