fix bounds on --from-ledger output

stellar · Oct 1, 2024 · c4810de · c4810de
1 parent e94e613
commit c4810de
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/historywork/WriteVerifiedCheckpointHashesWork.cpp b/src/historywork/WriteVerifiedCheckpointHashesWork.cpp
@@ -123,7 +123,7 @@ WriteVerifiedCheckpointHashesWork::hasNext() const
 {
     if (mFromLedger)
     {
-        return mCurrCheckpoint > *mFromLedger;
+        return mCurrCheckpoint >= *mFromLedger;
     }
     else if (mLatestTrustedHashPair)
     {
@@ -152,15 +152,27 @@ WriteVerifiedCheckpointHashesWork::yieldMoreWork()
     uint32_t first = last <= span
                          ? LedgerManager::GENESIS_LEDGER_SEQ
                          : hm.firstLedgerInCheckpointContaining(last - span);
-    // If the latest trusted ledger or mFromLedger is greater than the first
-    // ledger in the range then the range should start at the trusted ledger.
+    // If the first ledger in the range is less than mFromLedger then the
+    // range should be constrained to start at mFromLedger, or the checkpoint
+    // immediately before it if mFromLedger is not a checkpoint boundary.
     if (mFromLedger && first < *mFromLedger)
     {
-        first = *mFromLedger;
+        if (hm.isLastLedgerInCheckpoint(*mFromLedger))
+        {
+            first = *mFromLedger;
+        }
+        else
+        {
+            first = hm.lastLedgerBeforeCheckpointContaining(*mFromLedger);
+        }
+        releaseAssert(first <= *mFromLedger);
     }
+    // If the latest trusted ledger is greater than the first
+    // ledger in the range then the range should start at the trusted ledger.
     else if (mLatestTrustedHashPair && first < mLatestTrustedHashPair->first)
     {
         first = mLatestTrustedHashPair->first;
+        releaseAssert(hm.isLastLedgerInCheckpoint(first));
     }
 
     LedgerRange const ledgerRange = LedgerRange::inclusive(first, last);

diff --git a/src/main/CommandLine.cpp b/src/main/CommandLine.cpp
@@ -1047,6 +1047,7 @@ runWriteVerifiedCheckpointHashes(CommandLineArgs const& args)
             {
                 LOG_ERROR(DEFAULT_LOG, "Cannot specify both --from-ledger and "
                                        "--trusted-hash-file");
+                return 1;
             }
             VirtualClock clock(VirtualClock::REAL_TIME);
             auto cfg = configOption.getConfig();