diff --git a/turbo/jsonrpc/eth_api.go b/turbo/jsonrpc/eth_api.go index d70210b10d2..f53319838d2 100644 --- a/turbo/jsonrpc/eth_api.go +++ b/turbo/jsonrpc/eth_api.go @@ -379,6 +379,8 @@ type APIImpl struct { gasTracker RpcL1GasPriceTracker RejectLowGasPriceTransactions bool RejectLowGasPriceTolerance float64 + + logLevel utils.LogLevel } // NewEthAPI returns APIImpl instance diff --git a/zk/txpool/pool_zk.go b/zk/txpool/pool_zk.go index 782fb2e41a3..064d5115d8b 100644 --- a/zk/txpool/pool_zk.go +++ b/zk/txpool/pool_zk.go @@ -43,7 +43,6 @@ func (p *TxPool) Trace(msg string, ctx ...interface{}) { // for a given senderID func (p *TxPool) onSenderStateChange(senderID uint64, senderNonce uint64, senderBalance uint256.Int, byNonce *BySenderAndNonce, protocolBaseFee, blockGasLimit uint64, pending *PendingPool, baseFee, queued *SubPool, discard func(*metaTx, DiscardReason)) { - noGapsNonce := senderNonce cumulativeRequiredBalance := uint256.NewInt(0) minFeeCap := uint256.NewInt(0).SetAllOne() @@ -104,7 +103,6 @@ func (p *TxPool) onSenderStateChange(senderID uint64, senderNonce uint64, sender // the sender is M, and there are transactions for all nonces between M and N from the same // sender. Set to 0 is the transaction's nonce is divided from the state nonce by one or more nonce gaps. mt.subPool &^= NoNonceGaps - if noGapsNonce == mt.Tx.Nonce { mt.subPool |= NoNonceGaps noGapsNonce++ @@ -148,7 +146,6 @@ func (p *TxPool) onSenderStateChange(senderID uint64, senderNonce uint64, sender case QueuedSubPool: queued.Updated(mt) } - return true }) for _, mt := range toDel { @@ -338,6 +335,7 @@ func (p *TxPool) RemoveMinedTransactions(ctx context.Context, tx kv.Tx, blockGas } p.onSenderStateChange(senderID, nonce, balance, p.all, baseFee, blockGasLimit, p.pending, p.baseFee, p.queued, p.discardLocked) + } return nil }