From fc9db9f65f40d3929d5b3674c12da9b4fed4ab21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Thu, 13 Jun 2024 15:21:34 +0200 Subject: [PATCH] fix(txpool): compare gas tip cap instead of effective gas tip cap (#825) fix: compare gas tip cap instead of effective gas tip cap --- core/tx_pool.go | 3 +-- params/version.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index 7e6bdd58a1..e75258ccfe 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -648,8 +648,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { 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 { + if !local && tx.GasTipCapIntCmp(pool.gasPrice) < 0 { return ErrUnderpriced } // Ensure the transaction adheres to nonce ordering diff --git a/params/version.go b/params/version.go index abcd97e8a6..0267ef380a 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 4 // Minor version component of the current release - VersionPatch = 3 // Patch version component of the current release + VersionPatch = 4 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )