!fixup Add a test for verifying the phase format on protocol boundaries

stellar · Dec 13, 2024 · 77e922b · 77e922b
1 parent 3954df5
commit 77e922b
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 6 deletions.
diff --git a/src/herder/test/TestTxSetUtils.cpp b/src/herder/test/TestTxSetUtils.cpp
@@ -121,13 +121,19 @@ makeNonValidatedTxSet(std::vector<TransactionFrameBasePtr> const& txs,
 std::pair<TxSetXDRFrameConstPtr, ApplicableTxSetFrameConstPtr>
 makeNonValidatedGeneralizedTxSet(
     std::vector<ComponentPhases> const& txsPerBaseFee, Application& app,
-    Hash const& previousLedgerHash)
+    Hash const& previousLedgerHash, std::optional<bool> useParallelSorobanPhase)
 {
-    bool useParallelSorobanPhase = protocolVersionStartsFrom(
-        app.getLedgerManager().getLastClosedLedgerHeader().header.ledgerVersion,
-        PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION);
+    if (!useParallelSorobanPhase.has_value())
+    {
+        useParallelSorobanPhase =
+            protocolVersionStartsFrom(app.getLedgerManager()
+                                          .getLastClosedLedgerHeader()
+                                          .header.ledgerVersion,
+                                      PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION);
+    }
+
     auto xdrTxSet = makeGeneralizedTxSetXDR(txsPerBaseFee, previousLedgerHash,
-                                            useParallelSorobanPhase);
+                                            *useParallelSorobanPhase);
     auto txSet = TxSetXDRFrame::makeFromWire(xdrTxSet);
     return std::make_pair(txSet, txSet->prepareForApply(app));
 }

diff --git a/src/herder/test/TestTxSetUtils.h b/src/herder/test/TestTxSetUtils.h
@@ -17,7 +17,8 @@ using ComponentPhases = std::vector<
 std::pair<TxSetXDRFrameConstPtr, ApplicableTxSetFrameConstPtr>
 makeNonValidatedGeneralizedTxSet(
     std::vector<ComponentPhases> const& txsPerBaseFee, Application& app,
-    Hash const& previousLedgerHash);
+    Hash const& previousLedgerHash,
+    std::optional<bool> useParallelSorobanPhase = std::nullopt);
 
 std::pair<TxSetXDRFrameConstPtr, ApplicableTxSetFrameConstPtr>
 makeNonValidatedTxSetBasedOnLedgerVersion(

diff --git a/src/herder/test/TxSetTests.cpp b/src/herder/test/TxSetTests.cpp
@@ -786,6 +786,60 @@ SECTION("parallel soroban protocol version")
 #endif
 }
 
+TEST_CASE("soroban phase version validation", "[txset][soroban]")
+{
+    auto runTest = [](uint32_t protocolVersion,
+                      bool useParallelSorobanPhase) -> bool {
+        VirtualClock clock;
+        auto cfg = getTestConfig();
+        cfg.LEDGER_PROTOCOL_VERSION = protocolVersion;
+        cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION = protocolVersion;
+        auto app = createTestApplication(clock, cfg);
+        auto txSet =
+            testtxset::makeNonValidatedGeneralizedTxSet(
+                {{}, {}}, *app,
+                app->getLedgerManager().getLastClosedLedgerHeader().hash,
+                useParallelSorobanPhase)
+                .second;
+        REQUIRE(txSet);
+        return txSet->checkValid(*app, 0, 0);
+    };
+    SECTION("sequential phase")
+    {
+        SECTION("valid before parallel tx set protocol version")
+        {
+            REQUIRE(runTest(
+                static_cast<uint32_t>(PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION) -
+                    1,
+                false));
+        }
+    }
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+    SECTION("sequential phase invalid at parallel tx set protocol version")
+    {
+        REQUIRE(!runTest(
+            static_cast<uint32_t>(PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION),
+            false));
+    }
+    SECTION("parallel phase")
+    {
+        SECTION("valid before parallel tx set protocol version")
+        {
+            REQUIRE(!runTest(
+                static_cast<uint32_t>(PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION) -
+                    1,
+                true));
+        }
+        SECTION("invalid at parallel tx set protocol version")
+        {
+            REQUIRE(runTest(
+                static_cast<uint32_t>(PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION),
+                true));
+        }
+    }
+#endif
+}
+
 TEST_CASE("generalized tx set with multiple txs per source account",
           "[txset][soroban]")
 {