Skip to content

Commit c776a98

Browse files
jsvisajsvisa
authored
eth/tracers: fix the issue of panic in prestate with diffmode (#25957)
In some cases, inner contract creation may not be successful, and an inner contract was not created. This PR fixes a crash that could occur when doing tracing in such situations.
1 parent 9207e34 commit c776a98

File tree

4 files changed

+102
-5
lines changed

4 files changed

+102
-5
lines changed

‎eth/tracers/internal/tracetest/calltrace_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func testCallTracer(tracerName string, dirPath string, t *testing.T) {
103103
} else if err := json.Unmarshal(blob, test); err != nil {
104104
t.Fatalf("failed to parse testcase: %v", err)
105105
}
106-
if err := rlp.DecodeBytes(common.FromHex(test.Input), tx); err != nil {
106+
if err := tx.UnmarshalBinary(common.FromHex(test.Input)); err != nil {
107107
t.Fatalf("failed to parse testcase input: %v", err)
108108
}
109109
// Configure a blockchain with the given prestate
@@ -122,6 +122,7 @@ func testCallTracer(tracerName string, dirPath string, t *testing.T) {
122122
Time: new(big.Int).SetUint64(uint64(test.Context.Time)),
123123
Difficulty: (*big.Int)(test.Context.Difficulty),
124124
GasLimit: uint64(test.Context.GasLimit),
125+
BaseFee: test.Genesis.BaseFee,
125126
}
126127
_, statedb = tests.MakePreState(rawdb.NewMemoryDatabase(), test.Genesis.Alloc, false)
127128
)

‎eth/tracers/internal/tracetest/prestate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"github.com/ethereum/go-ethereum/core/types"
3131
"github.com/ethereum/go-ethereum/core/vm"
3232
"github.com/ethereum/go-ethereum/eth/tracers"
33-
"github.com/ethereum/go-ethereum/rlp"
3433
"github.com/ethereum/go-ethereum/tests"
3534
)
3635

@@ -87,7 +86,7 @@ func testPrestateDiffTracer(tracerName string, dirPath string, t *testing.T, typ
8786
} else if err := json.Unmarshal(blob, test); err != nil {
8887
t.Fatalf("failed to parse testcase: %v", err)
8988
}
90-
if err := rlp.DecodeBytes(common.FromHex(test.Input), tx); err != nil {
89+
if err := tx.UnmarshalBinary(common.FromHex(test.Input)); err != nil {
9190
t.Fatalf("failed to parse testcase input: %v", err)
9291
}
9392
// Configure a blockchain with the given prestate
@@ -106,6 +105,7 @@ func testPrestateDiffTracer(tracerName string, dirPath string, t *testing.T, typ
106105
Time: new(big.Int).SetUint64(uint64(test.Context.Time)),
107106
Difficulty: (*big.Int)(test.Context.Difficulty),
108107
GasLimit: uint64(test.Context.GasLimit),
108+
BaseFee: test.Genesis.BaseFee,
109109
}
110110
_, statedb = tests.MakePreState(rawdb.NewMemoryDatabase(), test.Genesis.Alloc, false)
111111
)

‎eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_failed.json

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
"genesis": {
3+
"baseFeePerGas": "51088069741",
4+
"difficulty": "14315558652874667",
5+
"extraData": "0xd883010a10846765746888676f312e31362e35856c696e7578",
6+
"gasLimit": "30058590",
7+
"hash": "0xdf6b95183f99054fb6541e3b482c0109c9f6be40553cff24efa3ac76736adbf5",
8+
"miner": "0xb7e390864a90b7b923c9f9310c6f98aafe43f707",
9+
"mixHash": "0x8d76b0d32e42ab277dbf00836eabef76674cd70ae2bb53718175069ad6b6147e",
10+
"nonce": "0x8d3a1c010ad2c687",
11+
"number": "14707767",
12+
"stateRoot": "0x8a50c896a6f7eb1f3479337db981fa10ce316281cb4dd2f07487be9ca27dae6b",
13+
"timestamp": "1651623275",
14+
"alloc": {
15+
"0x0000000000000000000000000000000000000000": {
16+
"balance": "0x268fd0b894b8c4f6d1f"
17+
},
18+
"0x13b152c9f50878ffaf3de41e192653bda545d889": {
19+
"balance": "0x0",
20+
"nonce": "1",
21+
"code": "0x363d3d373d3d3d363d73059ffafdc6ef594230de44f824e2bd0a51ca5ded5af43d82803e903d91602b57fd5bf3"
22+
},
23+
"0x808b4da0be6c9512e948521452227efc619bea52": {
24+
"balance": "0x2cdb96c56db040b43",
25+
"nonce": "1223932"
26+
},
27+
"0x8f03f1a3f10c05e7cccf75c1fd10168e06659be7": {
28+
"balance": "0x38079b28689d40240e",
29+
"nonce": "44"
30+
},
31+
"0xffa397285ce46fb78c588a9e993286aac68c37cd": {
32+
"balance": "0x0",
33+
"nonce": "747319",
34+
"code": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063b97a23191461003b578063fb90b3201461006f575b600080fd5b6100436100bd565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100bb6004803603604081101561008557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506100e1565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008282604051602001808373ffffffffffffffffffffffffffffffffffffffff1660601b815260140182815260200192505050604051602081830303815290604052805190602001209050600061015960008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168361024d565b90508073ffffffffffffffffffffffffffffffffffffffff166319ab453c856040518263ffffffff1660e01b8152600401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b1580156101c457600080fd5b505af11580156101d8573d6000803e3d6000fd5b505050507fa35ea2cc726861482a50a162c72aad60965cc64641d419cd4d675036238b52048185604051808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a150505050565b6000808360601b90506040517f3d602d80600a3d3981f3363d3d373d3d3d363d7300000000000000000000000081528160148201527f5af43d82803e903d91602b57fd5bf300000000000000000000000000000000006028820152836037826000f5925050509291505056fea2646970667358221220c87b2492828fdd7dad3175a32a98ff07fc0eedf106536f2eddd9a016971c56a764736f6c63430007050033",
35+
"storage": {
36+
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000059ffafdc6ef594230de44f824e2bd0a51ca5ded"
37+
}
38+
}
39+
},
40+
"config": {
41+
"chainId": 1,
42+
"homesteadBlock": 1150000,
43+
"daoForkBlock": 1920000,
44+
"daoForkSupport": true,
45+
"eip150Block": 2463000,
46+
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
47+
"eip155Block": 2675000,
48+
"eip158Block": 2675000,
49+
"byzantiumBlock": 4370000,
50+
"constantinopleBlock": 7280000,
51+
"petersburgBlock": 7280000,
52+
"istanbulBlock": 9069000,
53+
"muirGlacierBlock": 9200000,
54+
"berlinBlock": 12244000,
55+
"londonBlock": 12965000,
56+
"arrowGlacierBlock": 13773000,
57+
"grayGlacierBlock": 15050000,
58+
"terminalTotalDifficultyPassed": true,
59+
"ethash": {}
60+
}
61+
},
62+
"context": {
63+
"number": "14707768",
64+
"difficulty": "14322823549655084",
65+
"timestamp": "1651623279",
66+
"gasLimit": "30029237",
67+
"miner": "0x8f03f1a3f10c05e7cccf75c1fd10168e06659be7"
68+
},
69+
"input": "0x02f8b4018312acfc8459682f00851a46bcf47a8302b1a194ffa397285ce46fb78c588a9e993286aac68c37cd80b844fb90b3200000000000000000000000002a549b4af9ec39b03142da6dc32221fc390b553300000000000000000000000000000000000000000000000000000000000cb3d5c001a03002079d2873f7963c4278200c43aa71efad262b2150bc8524480acfc38b5faaa077d44aa09d56b9cf99443c7f55aaad1bbae9cfb5bbb9de31eaf7a8f9e623e980",
70+
"tracerConfig": {
71+
"diffMode": true
72+
},
73+
"result": {
74+
"pre": {
75+
"0x808b4da0be6c9512e948521452227efc619bea52": {
76+
"balance": "0x2cdb96c56db040b43",
77+
"nonce": 1223932
78+
},
79+
"0x8f03f1a3f10c05e7cccf75c1fd10168e06659be7": {
80+
"balance": "0x38079b28689d40240e",
81+
"nonce": 44
82+
}
83+
},
84+
"post": {
85+
"0x808b4da0be6c9512e948521452227efc619bea52": {
86+
"balance": "0x2cd72a36dd031f089",
87+
"nonce": 1223933
88+
},
89+
"0x8f03f1a3f10c05e7cccf75c1fd10168e06659be7": {
90+
"balance": "0x38079c19423e44b30e"
91+
}
92+
}
93+
}
94+
}

‎eth/tracers/native/prestate.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,10 @@ func (t *prestateTracer) CaptureTxEnd(restGas uint64) {
229229
// the new created contracts' prestate were empty, so delete them
230230
for a := range t.created {
231231
// the created contract maybe exists in statedb before the creating tx
232-
if s := t.pre[a]; s.Balance.Cmp(big.NewInt(0)) == 0 && len(s.Storage) == 0 && len(s.Code) == 0 {
233-
delete(t.pre, a)
232+
if s := t.pre[a]; s != nil {
233+
if s.Balance.Sign() == 0 && len(s.Storage) == 0 && len(s.Code) == 0 {
234+
delete(t.pre, a)
235+
}
234236
}
235237
}
236238
}

0 commit comments

Comments
 (0)