Remove MinimumSorobanNetworkConfig::TX_MAX_CONTRACT_EVENTS_SIZE_BYTES

stellar · Aug 8, 2023 · e5deeaa · e5deeaa
1 parent c34f740
commit e5deeaa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/src/herder/Upgrades.cpp b/src/herder/Upgrades.cpp
@@ -1560,9 +1560,7 @@ ConfigUpgradeSetFrame::isValidForApply() const
                                  cfg.contractLedgerCost().txMaxWriteBytes;
             break;
         case ConfigSettingID::CONFIG_SETTING_CONTRACT_EVENTS_V0:
-            valid = cfg.contractEvents().txMaxContractEventsSizeBytes >=
-                        MinimumSorobanNetworkConfig::
-                            TX_MAX_CONTRACT_EVENTS_SIZE_BYTES &&
+            valid = cfg.contractEvents().txMaxContractEventsSizeBytes >= 0 &&
                     cfg.contractEvents().feeContractEvents1KB >= 0;
             break;
         case ConfigSettingID::CONFIG_SETTING_STATE_EXPIRATION:

diff --git a/src/invariant/LedgerEntryIsValid.cpp b/src/invariant/LedgerEntryIsValid.cpp
@@ -718,10 +718,7 @@ LedgerEntryIsValid::checkIsValid(ConfigSettingEntry const& cfg,
         }
         break;
     case ConfigSettingID::CONFIG_SETTING_CONTRACT_EVENTS_V0:
-        if (cfg.contractEvents().txMaxContractEventsSizeBytes <
-                MinimumSorobanNetworkConfig::
-                    TX_MAX_CONTRACT_EVENTS_SIZE_BYTES ||
-            cfg.contractEvents().feeContractEvents1KB < 0)
+        if (cfg.contractEvents().feeContractEvents1KB < 0)
         {
             return "Invalid contractMetaData";
         }

diff --git a/src/ledger/NetworkConfig.h b/src/ledger/NetworkConfig.h
@@ -117,8 +117,6 @@ struct MinimumSorobanNetworkConfig
     static constexpr uint32_t LEDGER_MAX_WRITE_LEDGER_ENTRIES = 2;
     static constexpr uint32_t LEDGER_MAX_WRITE_BYTES = 5000;
 
-    static constexpr uint32_t TX_MAX_CONTRACT_EVENTS_SIZE_BYTES = 0;
-
     static constexpr uint32_t TX_MAX_SIZE_BYTES = 10000;
     static constexpr uint32_t LEDGER_MAX_TX_SIZE_BYTES = 10000;
 

diff --git a/src/transactions/test/InvokeHostFunctionTests.cpp b/src/transactions/test/InvokeHostFunctionTests.cpp
@@ -1779,8 +1779,6 @@ overrideSettingsToMin(Application& app)
         .contractLedgerCost() = costEntry;
 
     ConfigSettingContractEventsV0 events;
-    events.txMaxContractEventsSizeBytes =
-        MinimumSorobanNetworkConfig::TX_MAX_CONTRACT_EVENTS_SIZE_BYTES;
     ltx.load(
            configSettingKey(ConfigSettingID::CONFIG_SETTING_CONTRACT_EVENTS_V0))
         .current()
@@ -1856,6 +1854,7 @@ TEST_CASE("settings upgrade with minimum settings", "[tx][soroban][upgrades]")
 
     // check a couple settings to make sure they're at the minimum
     REQUIRE(cost.contractLedgerCost().feeRead1KB == 0);
+    REQUIRE(cost.contractLedgerCost().writeFee1KBBucketListLow == 0);
     REQUIRE(cost.contractLedgerCost().ledgerMaxReadLedgerEntries ==
             MinimumSorobanNetworkConfig::LEDGER_MAX_READ_LEDGER_ENTRIES);
     REQUIRE(cost.contractLedgerCost().ledgerMaxReadBytes ==