mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-18 21:01:38 +00:00
add missing accessList nil guards
This commit is contained in:
parent
1c60be1bbf
commit
fb45562961
1 changed files with 7 additions and 3 deletions
|
|
@ -217,8 +217,10 @@ func (miner *Miner) generateWork(ctx context.Context, genParam *generateParams,
|
||||||
}
|
}
|
||||||
postMut.Merge(mut)
|
postMut.Merge(mut)
|
||||||
|
|
||||||
work.accessList.AccumulateMutations(postMut, uint16(work.tcount)+1)
|
if work.accessList != nil {
|
||||||
work.accessList.AccumulateReads(work.state.Reader().(state.StateReaderTracker).GetStateAccessList())
|
work.accessList.AccumulateMutations(postMut, uint16(work.tcount)+1)
|
||||||
|
work.accessList.AccumulateReads(work.state.Reader().(state.StateReaderTracker).GetStateAccessList())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if requests != nil {
|
if requests != nil {
|
||||||
reqHash := types.CalcRequestsHash(requests)
|
reqHash := types.CalcRequestsHash(requests)
|
||||||
|
|
@ -348,7 +350,9 @@ func (miner *Miner) prepareWork(ctx context.Context, genParams *generateParams,
|
||||||
if miner.chainConfig.IsPrague(header.Number, header.Time) {
|
if miner.chainConfig.IsPrague(header.Number, header.Time) {
|
||||||
mut.Merge(core.ProcessParentBlockHash(header.ParentHash, env.evm))
|
mut.Merge(core.ProcessParentBlockHash(header.ParentHash, env.evm))
|
||||||
}
|
}
|
||||||
env.accessList.AccumulateMutations(mut, 0)
|
if env.accessList != nil {
|
||||||
|
env.accessList.AccumulateMutations(mut, 0)
|
||||||
|
}
|
||||||
return env, nil
|
return env, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue