trie: copy preimage store pointer in StateTrie.Copy (#31158)

jwasinger · web-flow · commit 58f65c60c298 · 2025-02-12T09:55:00.000+08:00
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).
diff --git 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
@@ -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
@@ -275,6 +275,7 @@ func (t *StateTrie) Copy() *StateTrie {
 		trie:        *t.trie.Copy(),
 		db:          t.db,
 		secKeyCache: t.secKeyCache,
+		preimages:   t.preimages,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",`
`3`	`3`	`"accounts": {`
`4`		`- "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {`
	`4`	`+ "0x0000000000000000000000007265636569766572": {`
`5`	`5`	`"balance": "0",`
`6`	`6`	`"nonce": 0,`
`7`	`7`	`"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",`
`8`	`8`	`"codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",`
`9`	`9`	`"code": "0x6040",`
	`10`	`+ "address": "0x0000000000000000000000007265636569766572",`
`10`	`11`	`"key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ func (t StateTrie) Copy() StateTrie {`
`275`	`275`	`trie: *t.trie.Copy(),`
`276`	`276`	`db: t.db,`
`277`	`277`	`secKeyCache: t.secKeyCache,`
	`278`	`+ preimages: t.preimages,`
`278`	`279`	`}`
`279`	`280`	`}`
`280`	`281`