forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-13 07:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Create new block context for each parallel task

Browse source
This commit is contained in:
Jerry 2023-04-18 15:17:48 -07:00
parent 48c1f9078d
commit 5860b8e89c
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/parallel_state_processor.go
View file

@ -88,8 +88,7 @@ type ExecutionTask struct {
// next k elements in dependencies -> transaction indexes on which transaction i is dependent on // next k elements in dependencies -> transaction indexes on which transaction i is dependent on
dependencies []int dependencies []int
blockContext vm.BlockContext coinbase common.Address
coinbase common.Address
} }
func (task *ExecutionTask) Execute(mvh *blockstm.MVHashMap, incarnation int) (err error) { func (task *ExecutionTask) Execute(mvh *blockstm.MVHashMap, incarnation int) (err error) {
@ -98,7 +97,9 @@ func (task *ExecutionTask) Execute(mvh *blockstm.MVHashMap, incarnation int) (er
task.statedb.SetMVHashmap(mvh) task.statedb.SetMVHashmap(mvh)
task.statedb.SetIncarnation(incarnation) task.statedb.SetIncarnation(incarnation)
evm := vm.NewEVM(task.blockContext, vm.TxContext{}, task.statedb, task.config, task.evmConfig) blockContext := NewEVMBlockContext(task.header, task.blockChain, nil)
evm := vm.NewEVM(blockContext, vm.TxContext{}, task.statedb, task.config, task.evmConfig)
// Create a new context to be used in the EVM environment. // Create a new context to be used in the EVM environment.
txContext := NewEVMTxContext(task.msg) txContext := NewEVMTxContext(task.msg)
@ -125,8 +126,8 @@ func (task *ExecutionTask) Execute(mvh *blockstm.MVHashMap, incarnation int) (er
reads := task.statedb.MVReadMap() reads := task.statedb.MVReadMap()
if _, ok := reads[blockstm.NewSubpathKey(task.blockContext.Coinbase, state.BalancePath)]; ok { if _, ok := reads[blockstm.NewSubpathKey(blockContext.Coinbase, state.BalancePath)]; ok {
log.Info("Coinbase is in MVReadMap", "address", task.blockContext.Coinbase) log.Info("Coinbase is in MVReadMap", "address", blockContext.Coinbase)
task.shouldRerunWithoutFeeDelay = true task.shouldRerunWithoutFeeDelay = true
} }
@ -304,8 +305,6 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
metadata = true metadata = true
} }
blockContext := NewEVMBlockContext(header, p.bc, nil)
// Iterate over and process the individual transactions // Iterate over and process the individual transactions
for i, tx := range block.Transactions() { for i, tx := range block.Transactions() {
msg, err := tx.AsMessage(types.MakeSigner(p.config, header.Number), header.BaseFee) msg, err := tx.AsMessage(types.MakeSigner(p.config, header.Number), header.BaseFee)
@ -340,8 +339,6 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
receipts: &receipts, receipts: &receipts,
allLogs: &allLogs, allLogs: &allLogs,
dependencies: deps[i], dependencies: deps[i],
blockContext: blockContext,
coinbase: coinbase,
} }
tasks = append(tasks, task) tasks = append(tasks, task)
@ -365,7 +362,6 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
receipts: &receipts, receipts: &receipts,
allLogs: &allLogs, allLogs: &allLogs,
dependencies: nil, dependencies: nil,
blockContext: blockContext,
coinbase: coinbase, coinbase: coinbase,
} }
@ -419,7 +415,10 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
} }
if err != nil { if err != nil {
log.Error("blockstm error executing block", "err", err) if err != context.Canceled {
log.Error("blockstm error executing block", "err", err)
}
return nil, nil, 0, err return nil, nil, 0, err
} }