Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prestate lookup account storage update #288

Closed
wants to merge 3 commits into from
Closed

Prestate lookup account storage update #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bade40
Add lookupAccount in lookupStorage
aaronbuchwald Jul 13, 2023
a4b3c27
fix tracer regression
morrisettathena Jul 13, 2023
eba7b1c
Move tracer test to new directory
aaronbuchwald Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions eth/tracers/internal/tracetest/prestate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ func TestPrestateWithDiffModeTracer(t *testing.T) {
testPrestateDiffTracer("prestateTracer", "prestate_tracer_with_diff_mode", t)
}

func TestPrestateWithDiffModeANTTracer(t *testing.T) {
testPrestateDiffTracer("prestateTracer", "prestate_tracer_ant", t)
}

func testPrestateDiffTracer(tracerName string, dirPath string, t *testing.T) {
files, err := os.ReadDir(filepath.Join("testdata", dirPath))
if err != nil {
Expand Down Expand Up @@ -110,14 +114,16 @@ func testPrestateDiffTracer(tracerName string, dirPath string, t *testing.T) {
GasPrice: tx.GasPrice(),
}
context = vm.BlockContext{
CanTransfer: core.CanTransfer,
Transfer: core.Transfer,
Coinbase: test.Context.Miner,
BlockNumber: blockNumber,
Time: uint64(test.Context.Time),
Difficulty: (*big.Int)(test.Context.Difficulty),
GasLimit: uint64(test.Context.GasLimit),
BaseFee: test.Genesis.BaseFee,
CanTransfer: core.CanTransfer,
CanTransferMC: core.CanTransferMC,
Transfer: core.Transfer,
TransferMultiCoin: core.TransferMultiCoin,
Coinbase: test.Context.Miner,
BlockNumber: blockNumber,
Time: uint64(test.Context.Time),
Difficulty: (*big.Int)(test.Context.Difficulty),
GasLimit: uint64(test.Context.GasLimit),
BaseFee: test.Genesis.BaseFee,
}
_, statedb = tests.MakePreState(rawdb.NewMemoryDatabase(), test.Genesis.Alloc, false)
)
Expand Down
75 changes: 75 additions & 0 deletions eth/tracers/internal/tracetest/testdata/prestate_tracer_ant/sload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"context": {
"difficulty": "3755480783",
"gasLimit": "5401723",
"miner": "0xd049bfd667cb46aa3ef5df0da3e57db3be39e511",
"number": "2294702",
"timestamp": "1513676146"
},
"genesis": {
"alloc": {
"0xe296F389F90f3cF5EdeFb63690eb7a6257B69203": {
"balance": "0xcf3e0938579f00000",
"code": "0x",
"nonce": "0",
"storage": {}
},
"0x7dc9c9730689ff0b0fd506c67db815f12d90a448": {
"balance": "0x0",
"code": "0x600154",
"nonce": "0",
"storage": {}
}
},
"config": {
"chainId": 1,
"homesteadBlock": 0,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
"constantinopleBlock": 0,
"petersburgBlock": 0,
"istanbulBlock": 0,
"muirGlacierBlock": 0,
"apricotPhase1BlockTimestamp": 0,
"apricotPhase2BlockTimestamp": 0
},
"difficulty": "3757315409",
"extraData": "0x566961425443",
"gasLimit": "5406414",
"hash": "0xae107f592eebdd9ff8d6ba00363676096e6afb0e1007a7d3d0af88173077378d",
"miner": "0xd049bfd667cb46aa3ef5df0da3e57db3be39e511",
"mixHash": "0xc927aa05a38bc3de864e95c33b3ae559d3f39c4ccd51cef6f113f9c50ba0caf1",
"nonce": "0x93363bbd2c95f410",
"number": "2294701",
"stateRoot": "0x6b6737d5bde8058990483e915866bd1578014baeff57bd5e4ed228a2bfad635c",
"timestamp": "1513676127",
"totalDifficulty": "7160808139332585"
},
"input": "0xf8ba808534630b8a00834c4b4094010000000000000000000000000000000000000280b8547dc9c9730689ff0b0fd506c67db815f12d90a4480000000000000000000000007dc9c9730689ff0b0fd506c67db815f12d90a448000000000000000000000000000000000000000000000000000000000000000026a0b441b733b17156dee3ff2107978a4238bfcb5874a36d008a1bcc5b22617a3232a04212c6b26069068d604be380ace25133dab677f9d18c2010d6f92cc7491fef86",
"tracerConfig": {
"onlyTopCall": false,
"diffMode": true
},
"result": {
"post": {
"0xd049bfd667cb46aa3ef5df0da3e57db3be39e511": {
"balance": "0x231b6c08a01600"
},
"0xe296f389f90f3cf5edefb63690eb7a6257b69203": {
"balance": "0xcf3bd7819714fea00",
"nonce": 1
}
},
"pre": {
"0xd049bfd667cb46aa3ef5df0da3e57db3be39e511": {
"balance": "0x0"
},
"0xe296f389f90f3cf5edefb63690eb7a6257b69203": {
"balance": "0xcf3e0938579f00000"
}
}
}
}
8 changes: 8 additions & 0 deletions eth/tracers/native/prestate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,14 @@ func (t *prestateTracer) lookupAccount(addr common.Address) {
// it to the prestate of the given contract. It assumes `lookupAccount`
// has been performed on the contract before.
func (t *prestateTracer) lookupStorage(addr common.Address, key common.Hash) {
// lookupStorage assumes that lookupAccount has already been called.
// This assumption is violated for some historical blocks by the NativeAssetCall
// precompile. To fix this, we perform an extra call to lookupAccount here to ensure
// that the pre-state account is populated before attempting to read from the Storage
// map. When the invariant is maintained properly (since de-activation of the precompile),
// lookupAccount is a no-op. When the invariant is broken by the precompile, this avoids
// the panic and correctly captures the account prestate before the next opcode is executed.
t.lookupAccount(addr)
if _, ok := t.pre[addr].Storage[key]; ok {
return
}
Expand Down
Loading