Add testing support for ledgerMaxDependentTxClusters

Author: SirTyson

src/ledger/NetworkConfig.cpp

@@ -2277,6 +2277,11 @@ SorobanNetworkConfig::operator==(SorobanNetworkConfig const& other) const
            mCpuCostParams == other.cpuCostParams() &&
            mMemCostParams == other.memCostParams() &&
 
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+           mLedgerMaxDependentTxClusters ==
+               other.ledgerMaxDependentTxClusters() &&
+#endif
+
            mStateArchivalSettings == other.stateArchivalSettings() &&
            mEvictionIterator == other.evictionIterator();
 }

src/simulation/LoadGenerator.cpp

@@ -1561,6 +1561,11 @@ GeneratedLoadConfig::copySorobanNetworkConfigToUpgradeConfig(
 
     upgradeCfg.writeFee1KBBucketListLow = cfg.writeFee1KBBucketListLow();
     upgradeCfg.writeFee1KBBucketListHigh = cfg.writeFee1KBBucketListHigh();
+
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+    upgradeCfg.ledgerMaxDependentTxClusters =
+        cfg.ledgerMaxDependentTxClusters();
+#endif
 }
 
 GeneratedLoadConfig

src/simulation/TxGenerator.cpp

@@ -713,13 +713,26 @@ TxGenerator::getConfigUpgradeSetFromLoadConfig(
     xdr::xvector<ConfigSettingEntry> updatedEntries;
 
     LedgerSnapshot lsg(mApp);
-    for (uint32_t i = 0;
-         i < static_cast<uint32_t>(CONFIG_SETTING_BUCKETLIST_SIZE_WINDOW); ++i)
+    for (auto t : xdr::xdr_traits<ConfigSettingID>::enum_values())
     {
-        auto entry = lsg.load(configSettingKey(static_cast<ConfigSettingID>(i)))
-                         .current();
+        auto type = static_cast<ConfigSettingID>(t);
+        if (SorobanNetworkConfig::isNonUpgradeableConfigSettingEntry(type))
+        {
+            continue;
+        }
+
+        auto entryPtr = lsg.load(configSettingKey(type));
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+        // This could happen if we have not yet upgraded
+        if (t == CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0 && !entryPtr)
+        {
+            continue;
+        }
+#endif
+        auto entry = entryPtr.current();
+
         auto& setting = entry.data.configSetting();
-        switch (static_cast<ConfigSettingID>(i))
+        switch (type)
         {
         case CONFIG_SETTING_CONTRACT_MAX_SIZE_BYTES:
             if (upgradeCfg.maxContractSizeBytes.has_value())
@@ -949,8 +962,16 @@ TxGenerator::getConfigUpgradeSetFromLoadConfig(
                     *upgradeCfg.ledgerMaxTxCount;
             }
             break;
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+        case CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0:
+            if (upgradeCfg.ledgerMaxDependentTxClusters.has_value())
+            {
+                setting.contractParallelCompute().ledgerMaxDependentTxClusters =
+                    *upgradeCfg.ledgerMaxDependentTxClusters;
+            }
+            break;
+#endif
         default:
-            releaseAssert(false);
             break;
         }
 

src/simulation/TxGenerator.h

@@ -67,6 +67,9 @@ struct SorobanUpgradeConfig
 
     std::optional<int64_t> writeFee1KBBucketListLow{};
     std::optional<int64_t> writeFee1KBBucketListHigh{};
+
+    // Parallel execution settings
+    std::optional<uint32_t> ledgerMaxDependentTxClusters{};
 };
 
 class TxGenerator

src/simulation/test/LoadGeneratorTests.cpp

@@ -355,6 +355,14 @@ TEST_CASE("generate soroban load", "[loadgen][soroban]")
         rand_uniform<int64_t>(INT64_MAX - 10'000, INT64_MAX);
     upgradeCfg.startingEvictionScanLevel = rand_uniform<uint32_t>(4, 8);
 
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+    if (protocolVersionStartsFrom(Config::CURRENT_LEDGER_PROTOCOL_VERSION,
+                                  ProtocolVersion::V_23))
+    {
+        upgradeCfg.ledgerMaxDependentTxClusters = rand_uniform<uint32_t>(2, 10);
+    }
+#endif
+
     auto upgradeSetKey = loadGen.getConfigUpgradeSetKey(
         createUpgradeLoadGenConfig.getSorobanUpgradeConfig());
 
@@ -398,10 +406,16 @@ TEST_CASE("generate soroban load", "[loadgen][soroban]")
                              upgrades);
     }
 
-    // Loadgen doesn't update the cost types.
-    REQUIRE(upgrades.updatedEntry.size() == 10);
     for (auto const& setting : upgrades.updatedEntry)
     {
+        // Loadgen doesn't update the cost types and non-upgradeable settings
+        REQUIRE(!SorobanNetworkConfig::isNonUpgradeableConfigSettingEntry(
+            setting.configSettingID()));
+        REQUIRE(setting.configSettingID() !=
+                CONFIG_SETTING_CONTRACT_COST_PARAMS_CPU_INSTRUCTIONS);
+        REQUIRE(setting.configSettingID() !=
+                CONFIG_SETTING_CONTRACT_COST_PARAMS_MEMORY_BYTES);
+
         switch (setting.configSettingID())
         {
         case CONFIG_SETTING_CONTRACT_MAX_SIZE_BYTES:
@@ -471,6 +485,13 @@ TEST_CASE("generate soroban load", "[loadgen][soroban]")
             REQUIRE(setting.contractExecutionLanes().ledgerMaxTxCount ==
                     upgradeCfg.ledgerMaxTxCount);
             break;
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+        case CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0:
+            REQUIRE(setting.contractParallelCompute()
+                        .ledgerMaxDependentTxClusters ==
+                    upgradeCfg.ledgerMaxDependentTxClusters);
+            break;
+#endif
         default:
             REQUIRE(false);
             break;