Post-rebase fixes

Author: bboston7

src/herder/TxSetFrame.cpp

@@ -1817,10 +1817,12 @@ TxSetPhaseFrame::txsAreValid(Application& app,
     LedgerSnapshot ls(app);
     ls.getLedgerHeader().currentToModify().ledgerSeq =
         app.getLedgerManager().getLastClosedLedgerNum() + 1;
+
+    // TODO: I *think* forApply should be false here? Is that right?
+    AppValidationWrapper avw(app.getAppConnector(), false, std::nullopt);
     for (auto const& tx : *this)
     {
-        auto txResult = tx->checkValid(app.getAppConnector(), ls, 0,
-                                       lowerBoundCloseTimeOffset,
+        auto txResult = tx->checkValid(avw, ls, 0, lowerBoundCloseTimeOffset,
                                        upperBoundCloseTimeOffset);
         if (!txResult->isSuccess())
         {

src/herder/test/HerderTests.cpp

@@ -3225,6 +3225,8 @@ TEST_CASE("overlay parallel processing")
 
 // Background ledger close requires postgres
 #ifdef USE_POSTGRES
+    // TODO: This is broken wtih background tx queue. Fix it. (note that this
+    // test doesn't run at all when --disable-postgres is set)
     SECTION("background ledger close")
     {
         // Set threshold to 1 so all have to vote

src/herder/test/TxSetTests.cpp

@@ -991,9 +991,10 @@ TEST_CASE("applicable txset validation - transactions belong to correct phase",
                         1)},
                     2000);
             }
+            AppValidationWrapper avw(app->getAppConnector(), false,
+                                     std::nullopt);
             LedgerSnapshot ls(*app);
-            REQUIRE(tx->checkValid(app->getAppConnector(), ls, 0, 0, 0)
-                        ->isSuccess());
+            REQUIRE(tx->checkValid(avw, ls, 0, 0, 0)->isSuccess());
             return tx;
         };
 
@@ -1117,9 +1118,10 @@ TEST_CASE("applicable txset validation - Soroban resources", "[txset][soroban]")
             auto tx = sorobanTransactionFrameFromOps(
                 app->getNetworkID(), source, {op}, {}, resources, 2000,
                 100'000'000);
+            AppValidationWrapper avw(app->getAppConnector(), false,
+                                     std::nullopt);
             LedgerSnapshot ls(*app);
-            REQUIRE(tx->checkValid(app->getAppConnector(), ls, 0, 0, 0)
-                        ->isSuccess());
+            REQUIRE(tx->checkValid(avw, ls, 0, 0, 0)->isSuccess());
             return tx;
         };
 

src/ledger/LedgerManagerImpl.cpp

@@ -145,21 +145,6 @@ LedgerManager::maxSorobanLedgerResources(SorobanNetworkConfig const& conf)
     return Resource(limits);
 }
 
-Resource
-LedgerManager::maxSorobanTransactionResources(SorobanNetworkConfig const& conf)
-{
-    ZoneScoped;
-    int64_t const opCount = 1;
-    std::vector<int64_t> limits = {opCount,
-                                   conf.txMaxInstructions(),
-                                   conf.txMaxSizeBytes(),
-                                   conf.txMaxReadBytes(),
-                                   conf.txMaxWriteBytes(),
-                                   conf.txMaxReadLedgerEntries(),
-                                   conf.txMaxWriteLedgerEntries()};
-    return Resource(limits);
-}
-
 uint32_t
 LedgerManager::getMaxTxSetSizeOps(LedgerHeader const& header)
 {
@@ -170,30 +155,11 @@ LedgerManager::getMaxTxSetSizeOps(LedgerHeader const& header)
                : (n * MAX_OPS_PER_TX);
 }
 
-Resource
-LedgerManager::maxClassicLedgerResources(LedgerHeader const& header)
-{
-    return Resource(LedgerManager::getMaxTxSetSizeOps(header));
-}
-
-Resource
-LedgerManager::maxSorobanLedgerResources(SorobanNetworkConfig const& conf)
-{
-    ZoneScoped std::vector<int64_t> limits = {
-        conf.ledgerMaxTxCount(),
-        conf.ledgerMaxInstructions(),
-        conf.ledgerMaxTransactionSizesBytes(),
-        conf.ledgerMaxReadBytes(),
-        conf.ledgerMaxWriteBytes(),
-        conf.ledgerMaxReadLedgerEntries(),
-        conf.ledgerMaxWriteLedgerEntries()};
-    return Resource(limits);
-}
-
 Resource
 LedgerManager::maxSorobanTransactionResources(SorobanNetworkConfig const& conf)
 {
-    ZoneScoped int64_t const opCount = 1;
+    ZoneScoped;
+    int64_t const opCount = 1;
     std::vector<int64_t> limits = {opCount,
                                    conf.txMaxInstructions(),
                                    conf.txMaxSizeBytes(),
@@ -204,16 +170,6 @@ LedgerManager::maxSorobanTransactionResources(SorobanNetworkConfig const& conf)
     return Resource(limits);
 }
 
-uint32_t
-LedgerManager::getMaxTxSetSizeOps(LedgerHeader const& header)
-{
-    auto n = header.maxTxSetSize;
-    return protocolVersionStartsFrom(header.ledgerVersion,
-                                     ProtocolVersion::V_11)
-               ? n
-               : (n * MAX_OPS_PER_TX);
-}
-
 LedgerManagerImpl::LedgerApplyMetrics::LedgerApplyMetrics(
     medida::MetricsRegistry& registry)
     : mTransactionApply(registry.NewTimer({"ledger", "transaction", "apply"}))
@@ -506,7 +462,7 @@ uint32_t
 LedgerManagerImpl::getLastMaxTxSetSizeOps() const
 {
     releaseAssert(threadIsMain());
-    return LedgerManager::getMaxTxSetSizeOps(mLastClosedLedger.header);
+    return LedgerManager::getMaxTxSetSizeOps(getLCLState().ledgerHeader.header);
 }
 
 Resource
@@ -518,12 +474,12 @@ LedgerManagerImpl::maxLedgerResources(bool isSoroban)
     if (isSoroban)
     {
         return LedgerManager::maxSorobanLedgerResources(
-            getSorobanNetworkConfigReadOnly());
+            getLastClosedSorobanNetworkConfig());
     }
     else
     {
         return LedgerManager::maxClassicLedgerResources(
-            mLastClosedLedger.header);
+            getLCLState().ledgerHeader.header);
     }
 }
 
@@ -533,7 +489,7 @@ LedgerManagerImpl::maxSorobanTransactionResources()
     ZoneScoped;
 
     return LedgerManager::maxSorobanTransactionResources(
-        mApp.getLedgerManager().getSorobanNetworkConfigReadOnly());
+        getLastClosedSorobanNetworkConfig());
 }
 
 int64_t

src/main/AppConnector.cpp

@@ -56,16 +56,18 @@ AppConnector::getLastClosedSorobanNetworkConfig() const
 SorobanNetworkConfig const&
 AppConnector::getSorobanNetworkConfigForApply() const
 {
+    releaseAssert(threadIsMain() ||
+                  mApp.threadIsType(Application::ThreadType::APPLY));
     return mApp.getLedgerManager().getSorobanNetworkConfigForApply();
 }
 
 std::optional<SorobanNetworkConfig>
 AppConnector::maybeGetSorobanNetworkConfigReadOnly() const
 {
     releaseAssert(threadIsMain());
-    if (mApp.getLedgerManager().hasSorobanNetworkConfig())
+    if (mApp.getLedgerManager().hasLastClosedSorobanNetworkConfig())
     {
-        return mApp.getLedgerManager().getSorobanNetworkConfigReadOnly();
+        return mApp.getLedgerManager().getLastClosedSorobanNetworkConfig();
     }
     return std::nullopt;
 }

src/main/AppConnector.h

@@ -72,7 +72,6 @@ class AppConnector
     // `getSorobanNetworkConfig` will throw an assertion error in that case.
     std::optional<SorobanNetworkConfig>
     maybeGetSorobanNetworkConfigReadOnly() const;
-    bool threadIsType(Application::ThreadType type) const;
 
     bool threadIsType(Application::ThreadType type) const;
 

src/main/Application.h

@@ -171,7 +171,7 @@ class Application
         WORKER,
         EVICTION,
         OVERLAY,
-        LEDGER_CLOSE,
+        APPLY,
         TX_QUEUE
     };
 

src/main/ApplicationImpl.cpp

@@ -199,10 +199,7 @@ ApplicationImpl::ApplicationImpl(VirtualClock& clock, Config const& cfg)
     if (mConfig.BACKGROUND_TX_QUEUE)
     {
         // TODO: Keep priority unchanged as tx queue processes time-sensitive
-        // tasks? Or should tx queue priority be downgraded? The priority
-        // locking mechanism in TransactionQueue is designed to prevent tx queue
-        // from starving other work, so it may be fine to keep priority
-        // unchanged.
+        // tasks? Or should tx queue priority be downgraded?
         mTxQueueThread = std::thread{[this]() { mTxQueueIOContext->run(); }};
         mThreadTypes[mTxQueueThread->get_id()] = ThreadType::TX_QUEUE;
     }

src/transactions/TransactionFrameBase.cpp

@@ -31,7 +31,7 @@ SorobanNetworkConfig const&
 AppValidationWrapper::getSorobanNetworkConfig() const
 {
     return mForApply ? mApp.getSorobanNetworkConfigForApply()
-                     : mApp.getSorobanNetworkConfigReadOnly();
+                     : mApp.getLastClosedSorobanNetworkConfig();
 }
 
 uint32_t

src/transactions/TransactionUtils.h

@@ -17,6 +17,7 @@ namespace stellar
 {
 
 class Application;
+class AppConnector;
 class Config;
 class ConstLedgerTxnEntry;
 class ConstTrustLineWrapper;