mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-15 08:23:46 +00:00
fix(taiko-geth): revert a tx.Shift() change (#335)
* revert change * revert change
This commit is contained in:
parent
1340ded381
commit
46576d2720
1 changed files with 3 additions and 2 deletions
|
|
@ -294,6 +294,9 @@ loop:
|
||||||
txs.Shift()
|
txs.Shift()
|
||||||
|
|
||||||
case errors.Is(err, nil):
|
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)
|
data, err := rlp.EncodeToBytes(env.txs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Trace("Failed to rlp encode the pending transaction %s: %w", tx.Hash(), err)
|
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++
|
env.tcount++
|
||||||
txs.Shift()
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// Transaction is regarded as invalid, drop all consecutive transactions from
|
// Transaction is regarded as invalid, drop all consecutive transactions from
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue