Build executable heap with baseFee when London fork is enabled

txpool/account.go

@@ -1,6 +1,7 @@
 package txpool
 
 import (
+	"math/big"
 	"sync"
 	"sync/atomic"
 
@@ -44,7 +45,7 @@ func (m *accountsMap) exists(addr types.Address) bool {
 
 // getPrimaries collects the heads (first-in-line transaction)
 // from each of the promoted queues.
-func (m *accountsMap) getPrimaries() (primaries []*types.Transaction) {
+func (m *accountsMap) getPrimaries(baseFee uint64) (primaries []*types.Transaction) {
 	m.Range(func(key, value interface{}) bool {
 		addressKey, ok := key.(types.Address)
 		if !ok {
@@ -57,7 +58,7 @@ func (m *accountsMap) getPrimaries() (primaries []*types.Transaction) {
 		defer account.promoted.unlock()
 
 		// add head of the queue
-		if tx := account.promoted.peek(); tx != nil {
+		if tx := account.promoted.peek(); tx != nil && tx.GetGasFeeCap().Cmp(new(big.Int).SetUint64(baseFee)) >= 0 {
 			primaries = append(primaries, tx)
 		}
 

txpool/txpool.go

@@ -335,7 +335,7 @@ func (p *TxPool) AddTx(tx *types.Transaction) error {
 // ready for execution. (primaries)
 func (p *TxPool) Prepare() {
 	// fetch primary from each account
-	primaries := p.accounts.getPrimaries()
+	primaries := p.accounts.getPrimaries(p.GetBaseFee())
 
 	// create new executables queue with base fee and initial transactions (primaries)
 	p.executables = newPricesQueue(p.GetBaseFee(), primaries)
@@ -385,7 +385,7 @@ func (p *TxPool) Pop(tx *types.Transaction) {
 	p.updatePending(-1)
 
 	// update executables
-	if tx := account.promoted.peek(); tx != nil {
+	if tx := account.promoted.peek(); tx != nil && tx.GetGasFeeCap().Cmp(new(big.Int).SetUint64(p.GetBaseFee())) >= 0 {
 		p.executables.push(tx)
 	}
 }