Switch to using AppConnector in apply

Author: marta-lokhova

src/transactions/InvokeHostFunctionOpFrame.cpp

@@ -330,10 +330,9 @@ InvokeHostFunctionOpFrame::doApply(
     ZoneNamedN(applyZone, "InvokeHostFunctionOpFrame apply", true);
 
     Config const& appConfig = app.getConfig();
-    HostFunctionMetrics metrics(app.getLedgerManager().getSorobanMetrics());
+    HostFunctionMetrics metrics(app.getSorobanMetrics());
     auto timeScope = metrics.getExecTimer();
-    auto const& sorobanConfig =
-        app.getLedgerManager().getSorobanNetworkConfig();
+    auto sorobanConfig = app.getSorobanNetworkConfig();
 
     // Get the entries for the footprint
     rust::Vec<CxxBuf> ledgerEntryCxxBufs;

src/transactions/RestoreFootprintOpFrame.cpp

@@ -57,14 +57,13 @@ RestoreFootprintOpFrame::doApply(
 {
     ZoneNamedN(applyZone, "RestoreFootprintOpFrame apply", true);
 
-    RestoreFootprintMetrics metrics(app.getLedgerManager().getSorobanMetrics());
+    RestoreFootprintMetrics metrics(app.getSorobanMetrics());
     auto timeScope = metrics.getExecTimer();
 
     auto const& resources = mParentTx.sorobanResources();
     auto const& footprint = resources.footprint;
     auto ledgerSeq = ltx.loadHeader().current().ledgerSeq;
-    auto const& sorobanConfig =
-        app.getLedgerManager().getSorobanNetworkConfig();
+    auto sorobanConfig = app.getSorobanNetworkConfig();
     auto const& appConfig = app.getConfig();
 
     auto const& archivalSettings = sorobanConfig.stateArchivalSettings();
@@ -148,14 +147,11 @@ RestoreFootprintOpFrame::doApply(
     int64_t rentFee = rust_bridge::compute_rent_fee(
         app.getConfig().CURRENT_LEDGER_PROTOCOL_VERSION, ledgerVersion,
         rustEntryRentChanges,
-        app.getLedgerManager()
-            .getSorobanNetworkConfig()
-            .rustBridgeRentFeeConfiguration(),
+        app.getSorobanNetworkConfig().rustBridgeRentFeeConfiguration(),
         ledgerSeq);
     if (!sorobanData->consumeRefundableSorobanResources(
             0, rentFee, ltx.loadHeader().current().ledgerVersion,
-            app.getLedgerManager().getSorobanNetworkConfig(), app.getConfig(),
-            mParentTx))
+            app.getSorobanNetworkConfig(), app.getConfig(), mParentTx))
     {
         innerResult(res).code(RESTORE_FOOTPRINT_INSUFFICIENT_REFUNDABLE_FEE);
         return false;

src/transactions/TransactionFrame.cpp

@@ -1445,7 +1445,7 @@ TransactionFrame::checkValidWithOptionallyChargedFee(
     {
         sorobanResourceFee = computePreApplySorobanResourceFee(
             ls.getLedgerHeader().current().ledgerVersion,
-            app.getLedgerManager().getSorobanNetworkConfig(), app.getConfig());
+            app.getSorobanNetworkConfig(), app.getConfig());
     }
     bool res = commonValid(app, signatureChecker, ls, current, false, chargeFee,
                            lowerBoundCloseTimeOffset, upperBoundCloseTimeOffset,
@@ -1504,8 +1504,7 @@ TransactionFrame::checkSorobanResourceAndSetError(
     AppConnector& app, uint32_t ledgerVersion,
     MutableTxResultPtr txResult) const
 {
-    auto const& sorobanConfig =
-        app.getLedgerManager().getSorobanNetworkConfig();
+    auto sorobanConfig = app.getSorobanNetworkConfig();
     if (!validateSorobanResources(sorobanConfig, app.getConfig(), ledgerVersion,
                                   *txResult->getSorobanData()))
     {
@@ -1712,8 +1711,7 @@ TransactionFrame::applyOperations(SignatureChecker& signatureChecker,
                 // If transaction fails, we don't charge for any
                 // refundable resources.
                 auto preApplyFee = computePreApplySorobanResourceFee(
-                    ledgerVersion,
-                    app.getLedgerManager().getSorobanNetworkConfig(),
+                    ledgerVersion, app.getSorobanNetworkConfig(),
                     app.getConfig());
 
                 txResult.getSorobanData()->setSorobanFeeRefund(
@@ -1831,8 +1829,7 @@ TransactionFrame::apply(AppConnector& app, AbstractLedgerTxn& ltx,
             isSoroban())
         {
             sorobanResourceFee = computePreApplySorobanResourceFee(
-                ledgerVersion, app.getLedgerManager().getSorobanNetworkConfig(),
-                app.getConfig());
+                ledgerVersion, app.getSorobanNetworkConfig(), app.getConfig());
 
             auto& sorobanData = *txResult->getSorobanData();
             sorobanData.setSorobanConsumedNonRefundableFee(

src/transactions/TransactionSQL.cpp

@@ -348,20 +348,23 @@ void
 dropSupportTransactionFeeHistory(Database& db)
 {
     ZoneScoped;
-    db.getSession() << "DROP TABLE IF EXISTS txfeehistory";
+    releaseAssert(threadIsMain());
+    db.getRawSession() << "DROP TABLE IF EXISTS txfeehistory";
 }
 
 void
 dropSupportTxSetHistory(Database& db)
 {
     ZoneScoped;
-    db.getSession() << "DROP TABLE IF EXISTS txsethistory";
+    releaseAssert(threadIsMain());
+    db.getRawSession() << "DROP TABLE IF EXISTS txsethistory";
 }
 
 void
 dropSupportTxHistory(Database& db)
 {
     ZoneScoped;
-    db.getSession() << "DROP TABLE IF EXISTS txhistory";
+    releaseAssert(threadIsMain());
+    db.getRawSession() << "DROP TABLE IF EXISTS txhistory";
 }
 }

src/transactions/TransactionUtils.cpp

@@ -1985,7 +1985,7 @@ isTransactionXDRValidForCurrentProtocol(AppConnector& app,
 {
     uint32_t maxProtocol = app.getConfig().CURRENT_LEDGER_PROTOCOL_VERSION;
     uint32_t currProtocol =
-        app.getLedgerManager().getLastClosedLedgerHeader().header.ledgerVersion;
+        app.getLastClosedLedgerHeader().header.ledgerVersion;
     // If we could parse the XDR when ledger is using the maximum supported
     // protocol version, then XDR has to be valid.
     // This check also is pointless before protocol 21 as Soroban environment