From 7649860d764e3e1141a555b5badc5e9643804cb0 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 24 Jul 2024 14:45:30 +0200
Subject: [PATCH] guard access events merge

---
 core/state_processor.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/state_processor.go b/core/state_processor.go
index 09cc4b1722..c13b696022 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -155,7 +155,9 @@ func ApplyTransactionWithEVM(msg *Message, config *params.ChainConfig, gp *GasPo
 
 	// Merge the tx-local access event into the "block-local" one, in order to collect
 	// all values, so that the witness can be built.
-	statedb.AccessEvents().Merge(evm.AccessEvents)
+	if statedb.GetTrie().IsVerkle() {
+		statedb.AccessEvents().Merge(evm.AccessEvents)
+	}
 
 	// Set the receipt logs and create the bloom filter.
 	receipt.Logs = statedb.GetLogs(tx.Hash(), blockNumber.Uint64(), blockHash)