mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +00:00
hot fix in miner related to metadata calculation (#1159)
This commit is contained in:
parent
f5a51afa04
commit
d193b95e14
1 changed files with 4 additions and 4 deletions
|
|
@ -920,7 +920,7 @@ func (w *worker) commitTransactions(env *environment, txs *transactionsByPriceAn
|
||||||
EnableMVHashMap := w.chainConfig.IsCancun(env.header.Number)
|
EnableMVHashMap := w.chainConfig.IsCancun(env.header.Number)
|
||||||
|
|
||||||
// create and add empty mvHashMap in statedb
|
// create and add empty mvHashMap in statedb
|
||||||
if EnableMVHashMap {
|
if EnableMVHashMap && w.IsRunning() {
|
||||||
deps = map[int]map[int]bool{}
|
deps = map[int]map[int]bool{}
|
||||||
|
|
||||||
chDeps = make(chan blockstm.TxDep)
|
chDeps = make(chan blockstm.TxDep)
|
||||||
|
|
@ -956,7 +956,7 @@ func (w *worker) commitTransactions(env *environment, txs *transactionsByPriceAn
|
||||||
mainloop:
|
mainloop:
|
||||||
for {
|
for {
|
||||||
if interruptCtx != nil {
|
if interruptCtx != nil {
|
||||||
if EnableMVHashMap {
|
if EnableMVHashMap && w.IsRunning() {
|
||||||
env.state.AddEmptyMVHashMap()
|
env.state.AddEmptyMVHashMap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1055,7 +1055,7 @@ mainloop:
|
||||||
coalescedLogs = append(coalescedLogs, logs...)
|
coalescedLogs = append(coalescedLogs, logs...)
|
||||||
env.tcount++
|
env.tcount++
|
||||||
|
|
||||||
if EnableMVHashMap {
|
if EnableMVHashMap && w.IsRunning() {
|
||||||
env.depsMVFullWriteList = append(env.depsMVFullWriteList, env.state.MVFullWriteList())
|
env.depsMVFullWriteList = append(env.depsMVFullWriteList, env.state.MVFullWriteList())
|
||||||
env.mvReadMapList = append(env.mvReadMapList, env.state.MVReadMap())
|
env.mvReadMapList = append(env.mvReadMapList, env.state.MVReadMap())
|
||||||
|
|
||||||
|
|
@ -1085,7 +1085,7 @@ mainloop:
|
||||||
txs.Pop()
|
txs.Pop()
|
||||||
}
|
}
|
||||||
|
|
||||||
if EnableMVHashMap {
|
if EnableMVHashMap && w.IsRunning() {
|
||||||
env.state.ClearReadMap()
|
env.state.ClearReadMap()
|
||||||
env.state.ClearWriteMap()
|
env.state.ClearWriteMap()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue