Minor fixes

src/bucket/BucketListSnapshotBase.cpp

@@ -16,7 +16,8 @@ namespace stellar
 {
 template <class BucketT>
 BucketListSnapshot<BucketT>::BucketListSnapshot(
-    BucketListBase<BucketT> const& bl, std::shared_ptr<LastClosedLedger const> lastClosed)
+    BucketListBase<BucketT> const& bl,
+    std::shared_ptr<LastClosedLedger const> lastClosed)
     : mLastClosedLedger(lastClosed)
 {
     releaseAssert(threadIsMain());
@@ -142,8 +143,7 @@ BucketLevelSnapshot<BucketT>::BucketLevelSnapshot(
 template <class BucketT>
 SearchableBucketListSnapshotBase<BucketT>::SearchableBucketListSnapshotBase(
     BucketSnapshotManager const& snapshotManager)
-    : mSnapshotManager(snapshotManager)
-    , mHistoricalSnapshots()
+    : mSnapshotManager(snapshotManager), mHistoricalSnapshots()
 {
     mSnapshotManager.maybeUpdateSnapshot(mSnapshot, mHistoricalSnapshots);
 }

src/bucket/BucketSnapshotManager.cpp

@@ -56,7 +56,7 @@ std::shared_ptr<SearchableLiveBucketListSnapshot const>
 BucketSnapshotManager::copySearchableLiveBucketListSnapshot() const
 {
     // Can't use std::make_shared due to private constructor
-    return std::shared_ptr<SearchableLiveBucketListSnapshot>(
+    return std::shared_ptr<SearchableLiveBucketListSnapshot const>(
         new SearchableLiveBucketListSnapshot(*this));
 }
 
@@ -65,7 +65,7 @@ BucketSnapshotManager::copySearchableHotArchiveBucketListSnapshot() const
 {
     releaseAssert(mCurrHotArchiveSnapshot);
     // Can't use std::make_shared due to private constructor
-    return std::shared_ptr<SearchableHotArchiveBucketListSnapshot>(
+    return std::shared_ptr<SearchableHotArchiveBucketListSnapshot const>(
         new SearchableHotArchiveBucketListSnapshot(*this));
 }
 

src/bucket/test/BucketTestUtils.cpp

@@ -46,7 +46,8 @@ addLiveBatchAndUpdateSnapshot(Application& app, LedgerHeader header,
                              : nullptr;
     addLiveBatchAndUpdateSnapshot(
         app,
-        std::make_shared<LastClosedLedger>(lhe, app.getLedgerManager().getLastClosedLedgerHAS(),
+        std::make_shared<LastClosedLedger>(
+            lhe, app.getLedgerManager().getLastClosedLedgerHAS(),
             sorobanConfig),
         initEntries, liveEntries, deadEntries);
 }

src/catchup/CatchupWork.cpp

@@ -143,7 +143,7 @@ CatchupWork::doReset()
     mGetBucketStateWork.reset();
     mVerifyTxResults.reset();
     mVerifyLedgers.reset();
-    mLastApplied = mApp.getLedgerManager().getLastClosedLedgerHeader();
+    mLastApplied = lcl;
     mCurrentWork.reset();
     mHAS.reset();
     mBucketHAS.reset();

src/catchup/DownloadApplyTxsWork.cpp

@@ -22,7 +22,7 @@ namespace stellar
 
 DownloadApplyTxsWork::DownloadApplyTxsWork(
     Application& app, TmpDir const& downloadDir, LedgerRange const& range,
-    std::shared_ptr<LedgerHeaderHistoryEntry> lastApplied, bool waitForPublish,
+    std::shared_ptr<LedgerHeaderHistoryEntry>& lastApplied, bool waitForPublish,
     std::shared_ptr<HistoryArchive> archive)
     : BatchWork(app, "download-apply-ledgers")
     , mRange(range)

src/catchup/DownloadApplyTxsWork.h

@@ -25,7 +25,7 @@ class DownloadApplyTxsWork : public BatchWork
 {
     LedgerRange const mRange;
     TmpDir const& mDownloadDir;
-    std::shared_ptr<LedgerHeaderHistoryEntry> mLastApplied;
+    std::shared_ptr<LedgerHeaderHistoryEntry>& mLastApplied;
     uint32_t mCheckpointToQueue;
     std::shared_ptr<BasicWork> mLastYieldedWork;
     bool const mWaitForPublish;
@@ -34,7 +34,7 @@ class DownloadApplyTxsWork : public BatchWork
   public:
     DownloadApplyTxsWork(Application& app, TmpDir const& downloadDir,
                          LedgerRange const& range,
-                         std::shared_ptr<LedgerHeaderHistoryEntry> lastApplied,
+                         std::shared_ptr<LedgerHeaderHistoryEntry>& lastApplied,
                          bool waitForPublish,
                          std::shared_ptr<HistoryArchive> archive = nullptr);
 

src/herder/TransactionQueue.cpp

@@ -437,6 +437,8 @@ TransactionQueue::canAdd(
         ban({tx});
         if (canAddRes.second != 0)
         {
+            CLOG_INFO(Tx, "Transaction rejected: {} insufficient fee",
+                      hexAbbrev(tx->getFullHash()));
             AddResult result(TransactionQueue::AddResultCode::ADD_STATUS_ERROR,
                              tx, txINSUFFICIENT_FEE);
             result.txResult->getResult().feeCharged = canAddRes.second;

src/herder/test/HerderTests.cpp

@@ -2641,6 +2641,13 @@ TEST_CASE("SCP State", "[herder]")
         sim->addConnection(nodeIDs[0], nodeIDs[2]);
         sim->addConnection(nodeIDs[1], nodeIDs[2]);
         sim->addConnection(nodeIDs[0], nodeIDs[1]);
+
+        REQUIRE(sim->getNode(nodeIDs[0])
+                    ->getLedgerManager()
+                    .getLastClosedLedgerNum() == expectedLedger);
+        REQUIRE(sim->getNode(nodeIDs[1])
+                    ->getLedgerManager()
+                    .getLastClosedLedgerNum() == expectedLedger);
     };
 
     SECTION("Force SCP")
@@ -2693,10 +2700,10 @@ TEST_CASE("SCP State", "[herder]")
 
         for (int i = 0; i <= 2; i++)
         {
-            auto const& actual = sim->getNode(nodeIDs[i])
-                                     ->getLedgerManager()
-                                     .getLastClosedLedgerHeader()
-                                     ->header;
+            auto actual = sim->getNode(nodeIDs[i])
+                              ->getLedgerManager()
+                              .getLastClosedLedgerHeader()
+                              ->header;
             REQUIRE(actual == lcl.header);
         }
 
@@ -3087,10 +3094,10 @@ TEST_CASE("soroban txs each parameter surge priced", "[soroban][herder]")
             bool hadSorobanSurgePricing = false;
             simulation->crankUntil(
                 [&]() {
-                    auto& lclHeader = nodes[0]
-                                          ->getLedgerManager()
-                                          .getLastClosedLedgerHeader()
-                                          ->header;
+                    auto lclHeader = nodes[0]
+                                         ->getLedgerManager()
+                                         .getLastClosedLedgerHeader()
+                                         ->header;
                     auto txSet = nodes[0]->getHerder().getTxSet(
                         lclHeader.scpValue.txSetHash);
                     GeneralizedTransactionSet xdrTxSet;

src/herder/test/UpgradesTests.cpp

@@ -294,8 +294,9 @@ testListUpgrades(VirtualClock::system_time_point preferredUpgradeDatetime,
 
     VirtualClock clock;
     auto app = createTestApplication(clock, cfg);
+    auto ls = LedgerSnapshot(*app);
 
-    auto header = LedgerHeader{};
+    auto& header = ls.getLedgerHeader().currentToModify();
     header.ledgerVersion = cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION;
     header.baseFee = cfg.TESTING_UPGRADE_DESIRED_FEE;
     header.baseReserve = cfg.TESTING_UPGRADE_RESERVE;
@@ -309,7 +310,6 @@ testListUpgrades(VirtualClock::system_time_point preferredUpgradeDatetime,
         makeTxCountUpgrade(cfg.TESTING_UPGRADE_MAX_TX_SET_SIZE);
     auto baseReserveUpgrade =
         makeBaseReserveUpgrade(cfg.TESTING_UPGRADE_RESERVE);
-    auto ls = LedgerSnapshot(*app);
 
     SECTION("protocol version upgrade needed")
     {

src/ledger/LedgerManagerImpl.cpp

@@ -513,7 +513,8 @@ std::shared_ptr<LedgerHeaderHistoryEntry>
 LedgerManagerImpl::getLastClosedLedgerHeader() const
 {
     releaseAssert(threadIsMain());
-    return std::make_shared<LedgerHeaderHistoryEntry>(getLastClosedLedger(mApp)->lhhe);
+    return std::make_shared<LedgerHeaderHistoryEntry>(
+        getLastClosedLedger(mApp)->lhhe);
 }
 
 HistoryArchiveState
@@ -1299,7 +1300,8 @@ LedgerManagerImpl::advanceReadOnlyLedgerState(LedgerHeader const& header,
     lhhe.hash = ledgerHash;
 
     auto& bm = mApp.getBucketManager();
-    auto lcl = std::make_shared<LastClosedLedger>(lhhe, getLastClosedLedgerHAS(), mSorobanNetworkConfig);
+    auto lcl = std::make_shared<LastClosedLedger>(
+        lhhe, getLastClosedLedgerHAS(), mSorobanNetworkConfig);
     auto liveSnapshot = std::make_unique<BucketListSnapshot<LiveBucket>>(
         bm.getLiveBucketList(), lcl);
     auto hotArchiveSnapshot =

src/ledger/LedgerStateSnapshot.cpp

@@ -179,9 +179,8 @@ BucketSnapshotState::BucketSnapshotState(
             "BucketSnapshotState::BucketSnapshotState: snapshot is missing "
             "last closed ledger");
     }
-    mLedgerHeader = LedgerHeaderWrapper(
-        std::make_shared<LedgerHeader>(snapshot->getLastClosedLedger()
-                                           ->getLedgerHeaderHistoryEntry().header));
+    mLedgerHeader = LedgerHeaderWrapper(std::make_shared<LedgerHeader>(
+        snapshot->getLastClosedLedger()->getLedgerHeaderHistoryEntry().header));
 }
 
 BucketSnapshotState::~BucketSnapshotState()

src/ledger/LedgerStateSnapshot.h

@@ -65,7 +65,8 @@ class AbstractLedgerStateSnapshot
 {
   public:
     virtual ~AbstractLedgerStateSnapshot() = default;
-    virtual std::shared_ptr<LastClosedLedger const> getLastClosedLedger() const = 0;
+    virtual std::shared_ptr<LastClosedLedger const>
+    getLastClosedLedger() const = 0;
     virtual LedgerHeaderWrapper getLedgerHeader() const = 0;
     virtual LedgerEntryWrapper getAccount(AccountID const& account) const = 0;
     virtual LedgerEntryWrapper getAccount(LedgerHeaderWrapper const& header,
@@ -92,7 +93,8 @@ class LedgerTxnReadOnly : public AbstractLedgerStateSnapshot
   public:
     LedgerTxnReadOnly(AbstractLedgerTxn& ltx);
     ~LedgerTxnReadOnly() override;
-    std::shared_ptr<LastClosedLedger const> getLastClosedLedger() const override;
+    std::shared_ptr<LastClosedLedger const>
+    getLastClosedLedger() const override;
     LedgerHeaderWrapper getLedgerHeader() const override;
     LedgerEntryWrapper getAccount(AccountID const& account) const override;
     LedgerEntryWrapper getAccount(LedgerHeaderWrapper const& header,
@@ -119,7 +121,8 @@ class BucketSnapshotState : public AbstractLedgerStateSnapshot
         std::shared_ptr<SearchableLiveBucketListSnapshot const> snapshot);
     ~BucketSnapshotState() override;
 
-    std::shared_ptr<LastClosedLedger const> getLastClosedLedger() const override;
+    std::shared_ptr<LastClosedLedger const>
+    getLastClosedLedger() const override;
     LedgerHeaderWrapper getLedgerHeader() const override;
     LedgerEntryWrapper getAccount(AccountID const& account) const override;
     LedgerEntryWrapper getAccount(LedgerHeaderWrapper const& header,

src/test/TestUtils.cpp

@@ -230,9 +230,9 @@ upgradeSorobanNetworkConfig(std::function<void(SorobanNetworkConfig&)> modifyFn,
         LoadGenMode::SOROBAN_CREATE_UPGRADE, 1, 1, 1);
     createUpgradeLoadGenConfig.offset = offset;
     // Get current network config.
-    auto cfg = nodes[0]->getLedgerManager().getSorobanNetworkConfig();
-    modifyFn(*cfg);
-    createUpgradeLoadGenConfig.copySorobanNetworkConfigToUpgradeConfig(*cfg);
+    auto cfg = *(nodes[0]->getLedgerManager().getSorobanNetworkConfig());
+    modifyFn(cfg);
+    createUpgradeLoadGenConfig.copySorobanNetworkConfigToUpgradeConfig(cfg);
     auto upgradeSetKey = lg.getConfigUpgradeSetKey(
         createUpgradeLoadGenConfig.getSorobanUpgradeConfig());
     lg.generateLoad(createUpgradeLoadGenConfig);
@@ -259,7 +259,7 @@ upgradeSorobanNetworkConfig(std::function<void(SorobanNetworkConfig&)> modifyFn,
         simulation->crankUntil(
             [&]() {
                 auto netCfg = app.getLedgerManager().getSorobanNetworkConfig();
-                return netCfg == cfg;
+                return *netCfg == cfg;
             },
             2 * Herder::EXP_LEDGER_TIMESPAN_SECONDS, false);
     }

src/test/test.cpp

@@ -845,6 +845,7 @@ saveTestTxMeta(stdfs::path const& dir)
         }
         out.exceptions(std::ios::failbit | std::ios::badbit);
         out << fileRoot;
+        CLOG_INFO(Tx, "Wrote {} TxMetas to {}", filePair.second.size(), path);
     }
 }