Skip to content

Commit

Permalink
eth: fix error in tracing if reexec is set (ethereum#21830)
Browse files Browse the repository at this point in the history
* eth: fix error in tracing if reexec is set

* eth: change pointer embedding to value-embedding
  • Loading branch information
holiman authored and rjl493456442 committed Dec 14, 2020
1 parent 5b936e6 commit abf9ef0
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions eth/api_tracer.go
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 @@ -549,9 +549,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 @@ -576,7 +574,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

0 comments on commit abf9ef0

Please sign in to comment.