Skip to content

G
Geth-Modification
Unverified Commit 2d20fed8 authored by rjl493456442's avatar rjl493456442 Committed by GitHub
Browse files
Options

miner: avoid data race in miner (#24349)

parent 6ce4670b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
miner/worker.go
View file @ 2d20fed8
...@@ -1134,6 +1134,9 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti ...@@ -1134,6 +1134,9 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti
if interval != nil { if interval != nil {
interval() interval()
} }
// Create a local environment copy, avoid the data race with snapshot state.
// https://github.com/ethereum/go-ethereum/issues/24299
env := env.copy()
block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, env.unclelist(), env.receipts) block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, env.unclelist(), env.receipts)
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment