pool: add underpriced to pool2 or 3

core/txpool/legacypool/legacypool.go

@@ -56,8 +56,8 @@
 	// txReannoMaxNum is the maximum number of transactions a reannounce action can include.
 	txReannoMaxNum = 1024
 
 	maxPool2Size = 10000 // todo might have to set it in config // This is in slots and not in no of transactions
 	maxPool3Size = 50000
 )
 
 var (
@@ -259,7 +259,7 @@
 	static bool
 }
 
 func newQueueTxEventCh() QueueTxEventCh {
 	return QueueTxEventCh{
 		tx: new(types.Transaction),
 	}
@@ -822,18 +822,23 @@
 	}
 
 	// If the transaction pool is full, discard underpriced transactions
-	if uint64(pool.all.Slots()+numSlots(tx)) > maxPool1Size { // todo 3 maybe a check here for pool2? // try addToPool2OrPool3() and only if unsuccessful then do the other things!!!
+	if uint64(pool.all.Slots()+numSlots(tx)) > maxPool1Size {
+		// todo 3 -> done maybe a check here for pool2? // try addToPool2OrPool3() and only if unsuccessful then do the other things!!!
+		// Try adding to pool2 or pool3 first
 		// If the new transaction is underpriced, don't accept it
-		if true || (!isLocal && pool.priced.Underpriced(tx)) {
+		// todo 5 actually if underpriced then add to pool2 or 3. Otherwise find out which one will be replaced with and that one will go to pool2 or 3
+		if !isLocal && pool.priced.Underpriced(tx) {
 			addedToAnyPool, err := pool.addToPool2OrPool3(tx, from, isLocal, includePool1, includePool2, includePool3)
-			if !addedToAnyPool {
-				log.Trace("Discarding underpriced transaction", "hash", hash, "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
-				underpricedTxMeter.Mark(1)
-				return false, err
-				//return false, txpool.ErrUnderpriced
+			if addedToAnyPool {
+				return false, nil
+			}
+			if err != nil {
+				log.Error("Error while trying to add to pool2 or pool3", "error", err)
 			}
-			return false, nil // since it is not replacing a transaction
 
+			log.Trace("Discarding underpriced transaction", "hash", hash, "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
+			underpricedTxMeter.Mark(1)
+			return false, txpool.ErrUnderpriced
 		}
 
 		// We're about to replace a transaction. The reorg does a more thorough
@@ -897,7 +902,7 @@
 					remainingDrop = append(remainingDrop, tx)
 				}
 			}
 
 		}
 
 		// Kick out the underpriced remote transactions.
@@ -915,7 +920,7 @@
 		}
 	}
 
-	// Try to replace an existing transaction in the pending pool
+	// Try to replace an existing transaction in the pending pool // todo 4 why we are replacing a pending tx if the we can put in pool3 or so?
 	if list := pool.pending[from]; list != nil && list.Contains(tx.Nonce()) {
 		// Nonce already pending, check if required price bump is met
 		inserted, old := list.Add(tx, pool.config.PriceBump, includePool2)
@@ -2189,7 +2194,7 @@
 }
 
 // transferTransactions mainly moves from pool 3 to pool 2
 func (pool *LegacyPool) transferTransactions() {
 
 	maxPool1Size := pool.config.GlobalSlots + pool.config.GlobalQueue
 	maxPool2Size := pool.config.Pool2Slots