Merge remote-tracking branch 's1na/extended-tracer' into feature/firehose-extended-tracer

# Conflicts:
#	core/blockchain.go
This commit is contained in:
Matthieu Vachon 2023-07-25 10:41:22 -04:00
commit 751b984c9b

View file

@ -1763,10 +1763,9 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
throwaway, _ := state.New(parent.Root, bc.stateCache, bc.snaps)
go func(start time.Time, followup *types.Block, throwaway *state.StateDB) {
config := bc.vmConfig
config.Tracer = nil
bc.prefetcher.Prefetch(followup, throwaway, config, &followupInterrupt)
vmCfg := bc.vmConfig
vmCfg.Tracer = nil
bc.prefetcher.Prefetch(followup, throwaway, vmCfg, &followupInterrupt)
blockPrefetchExecuteTimer.Update(time.Since(start))
if followupInterrupt.Load() {