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

XWJACK · web-flow · commit 8bbf83e7a4e6 · 2021-12-17T15:44:57.000+01:00
This reverts commit 9489853.
diff --git a/core/tx_pool.go b/core/tx_pool.go
@@ -621,9 +621,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 {
 		return ErrUnderpriced
 	}
 	// Ensure the transaction adheres to nonce ordering

Original file line number	Diff line number	Diff line change
`@@ -621,9 +621,8 @@ func (pool TxPool) validateTx(tx types.Transaction, local bool) error {`
`621`	`621`	`if err != nil {`
`622`	`622`	`return ErrInvalidSender`
`623`	`623`	`}`
`624`		`- // Drop non-local transactions under our own minimal accepted gas price or tip.`
`625`		`- pendingBaseFee := pool.priced.urgent.baseFee`
`626`		`- if !local && tx.EffectiveGasTipIntCmp(pool.gasPrice, pendingBaseFee) < 0 {`
	`624`	`+ // Drop non-local transactions under our own minimal accepted gas price or tip`
	`625`	`+ if !local && tx.GasTipCapIntCmp(pool.gasPrice) < 0 {`
`627`	`626`	`return ErrUnderpriced`
`628`	`627`	`}`
`629`	`628`	`// Ensure the transaction adheres to nonce ordering`