Skip to content

eth, eth/tracers: process beacon root before transactions #29402

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

Merged
merged 6 commits into from
Apr 24, 2024
Merged

eth, eth/tracers: process beacon root before transactions #29402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
599c461
The beacon root must be processed before any transactions to have cor…
maoueh Mar 29, 2024
c9c894c
Inverted wrong logic to apply beacon root in `TraceCall`
maoueh Mar 29, 2024
43b91b3
fix traceChain beacon root
s1na Apr 16, 2024
e1637b3
minor
s1na Apr 16, 2024
f7e87d1
rm traceCall beacon root insertion
s1na Apr 16, 2024
c3951c3
move down beacn root processing
s1na Apr 16, 2024
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
8 changes: 8 additions & 0 deletions eth/state_accessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ func (eth *Ethereum) stateAtTransaction(ctx context.Context, block *types.Block,
if err != nil {
return nil, vm.BlockContext{}, nil, nil, err
}

if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
context := core.NewEVMBlockContext(block.Header(), eth.blockchain, nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, eth.blockchain.Config(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}

if txIndex == 0 && len(block.Transactions()) == 0 {
return nil, vm.BlockContext{}, statedb, release, nil
}
Expand Down
39 changes: 39 additions & 0 deletions eth/tracers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,14 @@ func (api *API) traceChain(start, end *types.Block, config *TraceConfig, closed
failed = err
break
}

if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
Copy link
Contributor

@s1na s1na Apr 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

block is the parent block here. We should use next.

context := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}

// Clean out any pending release functions of trace state. Note this
// step must be done after constructing tracing state, because the
// tracing state of block next depends on the parent state and construction
Expand Down Expand Up @@ -518,6 +526,13 @@ func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config
}
defer release()

if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
context := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}

var (
roots []common.Hash
signer = types.MakeSigner(api.backend.ChainConfig(), block.Number(), block.Time())
Expand Down Expand Up @@ -585,6 +600,13 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
}
defer release()

if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
context := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}

// JS tracers have high overhead. In this case run a parallel
// process that generates states in one thread and traces txes
// in separate worker threads.
Expand Down Expand Up @@ -728,6 +750,13 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
}
defer release()

if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
context := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}

Copy link
Contributor

@holiman holiman Apr 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this down, to right before transactions are iterated. Then you can also use the chainConfig which might contain overrides, rather than api.backend.ChainConfig(),. It might not make any difference for now, but it is the correct thing to do, IMO.

Copy link
Contributor

@s1na s1na Apr 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep good idea. Applied these changes locally. Will push when I get access.

// Retrieve the tracing configurations, or use default values
var (
logConfig logger.Config
Expand Down Expand Up @@ -916,6 +945,16 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
}
defer release()

// Apply only when we have used StateAtBlock since `StateAtTransaction` already handles the beacon root
if config == nil || config.TxIndex == nil {
if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
context := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})

core.ProcessBeaconBlockRoot(*block.BeaconRoot(), vmenv, statedb)
}
}

vmctx := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
// Apply the customization rules if required.
if config != nil {
Expand Down