Skip to content

eth: fix error in tracing if reexec is set #21830

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
holiman merged 2 commits into from
Dec 2, 2020
Merged

eth: fix error in tracing if reexec is set #21830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46ee090
eth: fix error in tracing if reexec is set
holiman Nov 11, 2020
efcc5e4
eth: change pointer embedding to value-embedding
holiman Dec 1, 2020
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: 3 additions & 5 deletions eth/api_tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ type TraceConfig struct {

// StdTraceConfig holds extra parameters to standard-json trace functions.
type StdTraceConfig struct {
*vm.LogConfig
vm.LogConfig
Reexec *uint64
TxHash common.Hash
}
Expand Down Expand Up @@ -553,9 +553,7 @@ func (api *PrivateDebugAPI) standardTraceBlockToFile(ctx context.Context, block
txHash common.Hash
)
if config != nil {
if config.LogConfig != nil {
logConfig = *config.LogConfig
}
logConfig = config.LogConfig
txHash = config.TxHash
}
logConfig.Debug = true
Expand All @@ -579,7 +577,7 @@ func (api *PrivateDebugAPI) standardTraceBlockToFile(ctx context.Context, block
chainConfigCopy := new(params.ChainConfig)
*chainConfigCopy = *chainConfig
chainConfig = chainConfigCopy
if yolov2 := config.Overrides.YoloV2Block; yolov2 != nil {
if yolov2 := config.LogConfig.Overrides.YoloV2Block; yolov2 != nil {
chainConfig.YoloV2Block = yolov2
canon = false
}
Expand Down