From 58f65c60c29873f480f5a6f2718b1fe68a8da9bd Mon Sep 17 00:00:00 2001
From: jwasinger <j-wasinger@hotmail.com>
Date: Tue, 11 Feb 2025 17:55:00 -0800
Subject: [PATCH] trie: copy preimage store pointer in StateTrie.Copy (#31158)

This fixes an error where executing `evm run --dump ...` omits preimages
from the dump (because the statedb used for execution is a copy of
another instance).
---
 cmd/evm/testdata/evmrun/3.out.1.txt | 3 ++-
 cmd/evm/testdata/evmrun/4.out.1.txt | 3 ++-
 trie/secure_trie.go                 | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmd/evm/testdata/evmrun/3.out.1.txt b/cmd/evm/testdata/evmrun/3.out.1.txt
index 44956f54f6..25dd8da5a1 100644
--- a/cmd/evm/testdata/evmrun/3.out.1.txt
+++ b/cmd/evm/testdata/evmrun/3.out.1.txt
@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }
diff --git a/cmd/evm/testdata/evmrun/4.out.1.txt b/cmd/evm/testdata/evmrun/4.out.1.txt
index 44956f54f6..25dd8da5a1 100644
--- a/cmd/evm/testdata/evmrun/4.out.1.txt
+++ b/cmd/evm/testdata/evmrun/4.out.1.txt
@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index f53b10758f..45d5fd63e7 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -275,6 +275,7 @@ func (t *StateTrie) Copy() *StateTrie {
 		trie:        *t.trie.Copy(),
 		db:          t.db,
 		secKeyCache: t.secKeyCache,
+		preimages:   t.preimages,
 	}
 }