fix race condition on blockcontext

unclezoro · Dec 23, 2021 · 7e2c1d9 · 7e2c1d9
1 parent 62a3bc2
commit 7e2c1d9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
@@ -604,7 +604,6 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
  if threads > len(txs) {
  threads = len(txs)
  }
- blockCtx := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
  blockHash := block.Hash()
  for th := 0; th < threads; th++ {
  pend.Add(1)
@@ -618,6 +617,7 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
  TxIndex: task.index,
  TxHash: txs[task.index].Hash(),
  }
+ blockCtx := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
  res, err := api.traceTx(ctx, msg, txctx, blockCtx, task.statedb, config)
  if err != nil {
  results[task.index] = &txTraceResult{Error: err.Error()}
@@ -647,6 +647,7 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
  }
 
  statedb.Prepare(tx.Hash(), block.Hash(), i)
+ blockCtx := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
  vmenv := vm.NewEVM(blockCtx, core.NewEVMTxContext(msg), statedb, api.backend.ChainConfig(), vm.Config{})
  if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas())); err != nil {
  failed = err