core: ignore basefee when comparing with pool gasprice in txpool (eth…

…ereum#24080)
gzliudan · Sep 19, 2024 · a61ff8b · a61ff8b
1 parent ff8bfd7
commit a61ff8b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/core/tx_pool.go b/core/tx_pool.go
@@ -673,9 +673,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 	if err != nil {
 		return ErrInvalidSender
 	}
-	// Drop non-local transactions under our own minimal accepted gas price or tip.
-	pendingBaseFee := pool.priced.urgent.baseFee
-	if !local && tx.EffectiveGasTipIntCmp(pool.gasPrice, pendingBaseFee) < 0 {
+	// Drop non-local transactions under our own minimal accepted gas price or tip
+	if !local && tx.GasTipCapIntCmp(pool.gasPrice) < 0 {
 		if !tx.IsSpecialTransaction() || (pool.IsSigner != nil && !pool.IsSigner(from)) {
 			return ErrUnderpriced
 		}