From 46576d27209194db9e02ba38b9ab6b919679fcbd Mon Sep 17 00:00:00 2001 From: maskpp Date: Tue, 22 Oct 2024 19:09:52 +0800 Subject: [PATCH] fix(taiko-geth): revert a `tx.Shift()` change (#335) * revert change * revert change --- miner/taiko_worker.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/miner/taiko_worker.go b/miner/taiko_worker.go index 3d0ba40f98f9..7a311c62cd21 100644 --- a/miner/taiko_worker.go +++ b/miner/taiko_worker.go @@ -294,6 +294,9 @@ loop: txs.Shift() case errors.Is(err, nil): + // Everything ok, collect the logs and shift in the next transaction from the same account + txs.Shift() + data, err := rlp.EncodeToBytes(env.txs) if err != nil { log.Trace("Failed to rlp encode the pending transaction %s: %w", tx.Hash(), err) @@ -317,9 +320,7 @@ loop: } } - // Everything ok, collect the logs and shift in the next transaction from the same account env.tcount++ - txs.Shift() default: // Transaction is regarded as invalid, drop all consecutive transactions from