From 62dc85df867f8486e4e3e8d2cb98c405c136fe38 Mon Sep 17 00:00:00 2001
From: Nicholas Dudfield <ndudfield@gmail.com>
Date: Sun, 28 Jun 2026 15:49:06 +0700
Subject: [PATCH] test(export): cover replay witness pre-scan

---
 src/test/app/Export_test.cpp | 84 ++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/src/test/app/Export_test.cpp b/src/test/app/Export_test.cpp
index 118e40709..43d54c4c0 100644
--- a/src/test/app/Export_test.cpp
+++ b/src/test/app/Export_test.cpp
@@ -24,7 +24,9 @@
 #include <test/jtx/unl.h>
 #include <test/jtx/xpop.h>
 #include <xrpld/app/consensus/ConsensusExtensions.h>
+#include <xrpld/app/ledger/BuildLedger.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/LedgerReplay.h>
 #include <xrpld/app/ledger/OpenLedger.h>
 #include <xrpld/app/misc/CanonicalTXSet.h>
 #include <xrpld/app/misc/HashRouter.h>
@@ -45,6 +47,7 @@
 #include <xrpl/protocol/jss.h>
 
 #include <map>
+#include <set>
 
 namespace ripple {
 namespace test {
@@ -1404,6 +1407,86 @@ struct Export_test : public beast::unit_test::suite
                 st->getFieldH256(sfTransactionHash) == expectedSignedTxHash);
     }
 
+    void
+    testBuildLedgerReplayPrescansExportWitness(FeatureBitset features)
+    {
+        testcase("BuildLedger replay pre-scans persisted export witness");
+
+        using namespace jtx;
+
+        Env env{*this, exportTestConfig(), features};
+
+        Account const alice{"alice"};
+        Account const carol{"carol"};
+
+        env.fund(XRP(10000), alice, carol);
+        env.close();
+
+        auto const& valKeys = env.app().getValidatorKeys();
+        BEAST_EXPECT(valKeys.keys);
+        if (!valKeys.keys)
+            return;
+
+        seedUNLReportLedger(env, {valKeys.keys->publicKey});
+        forceNonStandalone(env.app());
+        BEAST_EXPECT(!env.app().config().standalone());
+
+        auto const parent = env.app().getLedgerMaster().getClosedLedger();
+        auto const applySeq = parent->seq() + 1;
+        auto const ticketSeq = std::uint32_t{1};
+        auto innerObj = buildExportedPayment(
+            alice.id(), carol.id(), applySeq, applySeq + 5, ticketSeq);
+        auto const innerTx = makeSTTx(innerObj);
+        auto jt = makeExportJTx(env, alice, innerObj, applySeq + 5);
+        auto const exportTx = jt.stx;
+        BEAST_EXPECT(exportTx);
+        if (!exportTx)
+            return;
+        auto const txHash = exportTx->getTransactionID();
+
+        ExportResultBuilder::SignatureSnapshot signatures;
+        signatures.emplace(
+            valKeys.keys->publicKey,
+            ExportResultBuilder::signExportedTxn(
+                innerTx, valKeys.keys->publicKey, valKeys.keys->secretKey));
+        auto const witnessTx = std::make_shared<STTx const>(
+            ExportResultBuilder::buildSignatureWitness(
+                txHash, signatures, applySeq));
+
+        CanonicalTXSet txns{parent->info().hash};
+        txns.insert(exportTx);
+        txns.insert(witnessTx);
+        std::set<TxID> failed;
+
+        auto const built = buildLedger(
+            parent,
+            env.app().timeKeeper().closeTime(),
+            true,
+            parent->info().closeTimeResolution,
+            env.app(),
+            txns,
+            failed,
+            env.journal);
+        BEAST_EXPECT(txns.empty());
+        BEAST_EXPECT(failed.empty());
+
+        auto const expectedSignedTxHash =
+            ExportResultBuilder::assembleDirect(
+                innerTx, signatures, applySeq, txHash)
+                .signedTxHash;
+        auto const builtTicket =
+            built->read(keylet::shadowTicket(alice.id(), ticketSeq));
+        BEAST_EXPECT(builtTicket);
+        if (builtTicket)
+            BEAST_EXPECT(
+                builtTicket->getFieldH256(sfTransactionHash) ==
+                expectedSignedTxHash);
+
+        auto const replayed = buildLedger(
+            LedgerReplay(parent, built), tapNONE, env.app(), env.journal);
+        BEAST_EXPECT(replayed->info().hash == built->info().hash);
+    }
+
     void
     testExportNetworkRetryWithoutUNLReport(FeatureBitset features)
     {
@@ -1950,6 +2033,7 @@ struct Export_test : public beast::unit_test::suite
         testExportNetworkApplyUsesAgreedSidecar(allWithExport);
         testExportShadowTicketInsufficientReserve(allWithExport);
         testExportHistoricalReplayIgnoresCurrentManifestMap(allWithExport);
+        testBuildLedgerReplayPrescansExportWitness(allWithExport);
         testExportNetworkRetryWithoutUNLReport(allWithExport);
         testExportNetworkLastLedgerSequenceBoundary(allWithExport);
         testOpenLedgerExportLimit(allWithExport);