forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 22:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

miner: reset ctx timeout before commit tx on new tx notif (#1434)

Browse source 
* miner: reset ctx before commit transactions in main loop

* miner: log error in tx interrupt

* miner: typo

* worker: handle commit interrupt for new tx processing
This commit is contained in:
Manav Darji 2025-02-10 21:41:59 +05:30 committed by GitHub
parent d274e62c1e
commit 466ff66f4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
miner/worker.go
View file

@ -615,6 +615,11 @@ func (w *worker) mainLoop() {
if gp := w.current.gasPool; gp != nil && gp.Gas() < params.TxGas { if gp := w.current.gasPool; gp != nil && gp.Gas() < params.TxGas {
continue continue
} }
// If we don't have time to execute (i.e. we're past header timestamp), abort
delay := time.Until(time.Unix(int64(w.current.header.Time), 0))
if delay <= 0 {
continue
}
txs := make(map[common.Address][]*txpool.LazyTransaction, len(ev.Txs)) txs := make(map[common.Address][]*txpool.LazyTransaction, len(ev.Txs))
for _, tx := range ev.Txs { for _, tx := range ev.Txs {
acc, _ := types.Sender(w.current.signer, tx) acc, _ := types.Sender(w.current.signer, tx)
@ -634,7 +639,14 @@ func (w *worker) mainLoop() {
tcount := w.current.tcount tcount := w.current.tcount
w.interruptCtx = resetAndCopyInterruptCtx(w.interruptCtx)
stopFn := func() {}
if w.interruptCommitFlag {
w.interruptCtx, stopFn = getInterruptTimer(w.interruptCtx, w.current.header.Number.Uint64(), w.current.header.Time)
w.interruptCtx = vm.PutCache(w.interruptCtx, w.interruptedTxCache)
}
w.commitTransactions(w.current, plainTxs, blobTxs, nil, new(uint256.Int)) w.commitTransactions(w.current, plainTxs, blobTxs, nil, new(uint256.Int))
stopFn()
// Only update the snapshot if any new transactons were added // Only update the snapshot if any new transactons were added
// to the pending block // to the pending block
@ -939,7 +951,7 @@ mainloop:
select { select {
case <-w.interruptCtx.Done(): case <-w.interruptCtx.Done():
txCommitInterruptCounter.Inc(1) txCommitInterruptCounter.Inc(1)
log.Warn("Tx Level Interrupt", "hash", lastTxHash) log.Warn("Tx Level Interrupt", "hash", lastTxHash, "err", w.interruptCtx.Err())
break mainloop break mainloop
default: default:
} }
@ -1046,7 +1058,7 @@ mainloop:
logs, err := w.commitTransaction(env, tx) logs, err := w.commitTransaction(env, tx)
// Check if we have a `delay` set in interrup context. It's only set during tests. // Check if we have a `delay` set in interrupt context. It's only set during tests.
if w.interruptCtx != nil { if w.interruptCtx != nil {
if delay := w.interruptCtx.Value(vm.InterruptCtxDelayKey); delay != nil { if delay := w.interruptCtx.Value(vm.InterruptCtxDelayKey); delay != nil {
// nolint : durationcheck // nolint : durationcheck
@ -1428,8 +1440,7 @@ func (w *worker) commitWork(interrupt *atomic.Int32, noempty bool, timestamp int
}() }()
if !noempty && w.interruptCommitFlag { if !noempty && w.interruptCommitFlag {
block := w.chain.GetBlockByHash(w.chain.CurrentBlock().Hash()) w.interruptCtx, stopFn = getInterruptTimer(w.interruptCtx, work.header.Number.Uint64(), work.header.Time)
w.interruptCtx, stopFn = getInterruptTimer(w.interruptCtx, work, block)
w.interruptCtx = vm.PutCache(w.interruptCtx, w.interruptedTxCache) w.interruptCtx = vm.PutCache(w.interruptCtx, w.interruptedTxCache)
} }
@ -1497,16 +1508,14 @@ func resetAndCopyInterruptCtx(interruptCtx context.Context) context.Context {
return newCtx return newCtx
} }
func getInterruptTimer(interruptCtx context.Context, work *environment, current *types.Block) (context.Context, func()) { func getInterruptTimer(interruptCtx context.Context, number, timestamp uint64) (context.Context, func()) {
delay := time.Until(time.Unix(int64(work.header.Time), 0)) delay := time.Until(time.Unix(int64(timestamp), 0))
interruptCtx, cancel := context.WithTimeout(interruptCtx, delay) interruptCtx, cancel := context.WithTimeout(interruptCtx, delay)
blockNumber := current.NumberU64() + 1
go func() { go func() {
<-interruptCtx.Done() <-interruptCtx.Done()
if interruptCtx.Err() != context.Canceled { if interruptCtx.Err() != context.Canceled {
log.Info("Commit Interrupt. Pre-committing the current block", "block", blockNumber) log.Info("Commit Interrupt. Pre-committing the current block", "block", number)
cancel() cancel()
} }
}() }()