Improvements to transaction queue and tests

src/herder/SurgePricingUtils.cpp

@@ -349,12 +349,7 @@ SurgePricingPriorityQueue::canFitWithEviction(
     auto txNewResources = mLaneConfig->getTxResources(tx);
     if (txDiscount)
     {
-        if (anyLessThan(txNewResources, *txDiscount))
-        {
-            throw std::invalid_argument("Discount shouldn't be larger than "
-                                        "transaction operations count");
-        }
-        txNewResources -= *txDiscount;
+        txNewResources = subtractNonNegative(txNewResources, *txDiscount);
     }
 
     if (anyGreater(txNewResources, mLaneLimits[GENERIC_LANE]) ||

src/herder/TransactionQueue.cpp

@@ -245,8 +245,8 @@ TransactionQueue::canAdd(TransactionFrameBasePtr tx,
             mApp.getConfig());
     }
 
-    int64_t newInclusionFee = tx->getInclusionFee();
-    if (newInclusionFee < 0)
+    int64_t newFullFee = tx->getFullFee();
+    if (tx->getInclusionFee() < 0 || newFullFee < 0)
     {
         return TransactionQueue::AddResult::ADD_STATUS_ERROR;
     }
@@ -312,10 +312,9 @@ TransactionQueue::canAdd(TransactionFrameBasePtr tx,
                     }
 
                     oldTx = txToReplaceIter->mTx;
-                    int64_t oldInclusionFee = oldTx->getInclusionFee();
                     if (oldTx->getFeeSourceID() == tx->getFeeSourceID())
                     {
-                        newInclusionFee -= oldInclusionFee;
+                        newFullFee -= oldTx->getFullFee();
                     }
                 }
 
@@ -397,7 +396,7 @@ TransactionQueue::canAdd(TransactionFrameBasePtr tx,
     int64_t totalFees = feeStateIter == mAccountStates.end()
                             ? 0
                             : feeStateIter->second.mTotalFees;
-    if (getAvailableBalance(ltx.loadHeader(), feeSource) - newInclusionFee <
+    if (getAvailableBalance(ltx.loadHeader(), feeSource) - newFullFee <
         totalFees)
     {
         tx->getResult().result.code(txINSUFFICIENT_BALANCE);

src/herder/TransactionQueue.h

@@ -159,6 +159,7 @@ class TransactionQueue
 
     void shutdown();
     bool sourceAccountPending(AccountID const& accountID) const;
+    virtual size_t getMaxQueueSizeOps() const = 0;
 
   protected:
     /**
@@ -201,7 +202,6 @@ class TransactionQueue
     getMaxResourcesToFloodThisPeriod() const = 0;
     virtual bool broadcastSome() = 0;
     virtual int getFloodPeriod() const = 0;
-    virtual size_t getMaxQueueSizeOps() const = 0;
 
     void broadcast(bool fromCallback);
     // broadcasts a single transaction

src/herder/TxQueueLimiter.cpp

@@ -56,7 +56,6 @@ TxQueueLimiter::~TxQueueLimiter()
 size_t
 TxQueueLimiter::size() const
 {
-    releaseAssert(!mIsSoroban);
     return mTxs->totalResources().getVal(Resource::Type::OPERATIONS);
 }
 #endif
@@ -171,24 +170,19 @@ TxQueueLimiter::canAddTx(TransactionFrameBasePtr const& newTx,
                        (newTx->getFullFee() - newTx->getInclusionFee()));
     }
 
-    uint32_t txOpsDiscount = 0;
+    // For eviction purposes, treat old tx resources as a "discount", since it
+    // will be replaced by the new transaction
+    std::optional<Resource> oldTxDiscount = std::nullopt;
     if (oldTx)
     {
-        auto newTxOps = newTx->getNumOperations();
-        auto oldTxOps = oldTx->getNumOperations();
-        // Bump transactions must have at least the old amount of operations.
-        releaseAssert(oldTxOps <= newTxOps);
-        txOpsDiscount = newTxOps - oldTxOps;
+        oldTxDiscount = oldTx->getResources(false);
     }
 
-    auto discount = newTx->isSoroban()
-                        ? std::nullopt
-                        : std::make_optional<Resource>(txOpsDiscount);
     // Update the operation limit in case upgrade happened. This is cheap
     // enough to happen unconditionally without relying on upgrade triggers.
     mSurgePricingLaneConfig->updateGenericLaneLimit(
         Resource(maxScaledLedgerResources(newTx->isSoroban(), ltxOuter)));
-    return mTxs->canFitWithEviction(*newTx, discount, txsToEvict);
+    return mTxs->canFitWithEviction(*newTx, oldTxDiscount, txsToEvict);
 }
 
 void