Skip to content

G
Geth-Modification
Unverified Commit 8bbf83e7 authored by xwjack's avatar xwjack Committed by GitHub
Browse files
Options

core: ignore basefee when comparing with pool gasprice in txpool (#24080) 

This reverts commit 94898533.
parent 2295640e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
core/tx_pool.go
View file @ 8bbf83e7
...@@ -621,9 +621,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { ...@@ -621,9 +621,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
if err != nil { if err != nil {
return ErrInvalidSender return ErrInvalidSender
} }
// Drop non-local transactions under our own minimal accepted gas price or tip. // Drop non-local transactions under our own minimal accepted gas price or tip
pendingBaseFee := pool.priced.urgent.baseFee if !local && tx.GasTipCapIntCmp(pool.gasPrice) < 0 {
if !local && tx.EffectiveGasTipIntCmp(pool.gasPrice, pendingBaseFee) < 0 {
return ErrUnderpriced return ErrUnderpriced
} }
// Ensure the transaction adheres to nonce ordering // Ensure the transaction adheres to nonce ordering
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment