forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'ethereum:master' into build/go1.24.0

Browse source
This commit is contained in:
levisyin 2025-02-13 08:59:45 +08:00 committed by GitHub
commit d1e5d9bf96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/evm/testdata/evmrun/3.out.1.txt vendored
View file

@ -1,12 +1,13 @@
{ {
"root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9", "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
"accounts": { "accounts": {
"pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": { "0x0000000000000000000000007265636569766572": {
"balance": "0", "balance": "0",
"nonce": 0, "nonce": 0,
"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6", "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
"code": "0x6040", "code": "0x6040",
"address": "0x0000000000000000000000007265636569766572",
"key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142" "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
} }
} }

3
cmd/evm/testdata/evmrun/4.out.1.txt vendored
View file

@ -1,12 +1,13 @@
{ {
"root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9", "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
"accounts": { "accounts": {
"pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": { "0x0000000000000000000000007265636569766572": {
"balance": "0", "balance": "0",
"nonce": 0, "nonce": 0,
"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6", "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
"code": "0x6040", "code": "0x6040",
"address": "0x0000000000000000000000007265636569766572",
"key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142" "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
} }
} }

1
trie/secure_trie.go
View file

@ -275,6 +275,7 @@ func (t *StateTrie) Copy() *StateTrie {
trie: *t.trie.Copy(), trie: *t.trie.Copy(),
db: t.db, db: t.db,
secKeyCache: t.secKeyCache, secKeyCache: t.secKeyCache,
preimages: t.preimages,
} }
} }