Refundable fee updates:

- Add result size to the events size for fee and limit accounting. - Use the proper error code - Omit redundant tx-specified limit on contract events
stellar · Aug 21, 2023 · d5c6909 · d5c6909
1 parent a5e8076
commit d5c6909
Show file tree

Hide file tree

Showing 16 changed files with 247 additions and 370 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/herder/test/HerderTests.cpp b/src/herder/test/HerderTests.cpp
@@ -1648,7 +1648,6 @@ TEST_CASE("surge pricing", "[herder][txset]")
         resources.instructions = 800'000;
         resources.readBytes = conf.txMaxReadBytes();
         resources.writeBytes = 1000;
-        resources.contractEventsSizeBytes = 0;
         auto sorobanTx =
             createUploadWasmTx(*app, acc2, baseFee,
                                /* refundableFee */ 1200, resources);
@@ -1665,8 +1664,6 @@ TEST_CASE("surge pricing", "[herder][txset]")
                     rand_uniform<uint32_t>(1, conf.txMaxReadBytes());
                 res.writeBytes =
                     rand_uniform<uint32_t>(1, conf.txMaxWriteBytes());
-                res.contractEventsSizeBytes = rand_uniform<uint32_t>(
-                    1, conf.txMaxContractEventsSizeBytes());
                 auto read =
                     rand_uniform<uint32_t>(0, conf.txMaxReadLedgerEntries());
                 auto write = rand_uniform<uint32_t>(
@@ -1690,11 +1687,10 @@ TEST_CASE("surge pricing", "[herder][txset]")
                                                     res));
                 CLOG_INFO(Herder,
                           "Generated tx with {} instructions, {} read "
-                          "bytes, {} write bytes, {} extended meta "
-                          "data bytes, {} read ledger entries, {} "
-                          "write ledger entries",
-                          res.instructions, res.readBytes, res.writeBytes,
-                          res.contractEventsSizeBytes, read, write);
+                          "bytes, {} write bytes, data bytes, {} read "
+                          "ledger entries, {} write ledger entries",
+                          res.instructions, res.readBytes, res.writeBytes, read,
+                          write);
             }
             return txs;
         };
@@ -1788,7 +1784,6 @@ TEST_CASE("surge pricing", "[herder][txset]")
             resources.instructions = 1;
             resources.readBytes = 1;
             resources.writeBytes = 1;
-            resources.contractEventsSizeBytes = 1;
 
             auto smallSorobanLowFee = createUploadWasmTx(
                 *app, acc4, baseFee / 10, /* refundableFee */ 1200, resources);
@@ -4519,7 +4514,6 @@ TEST_CASE("do not flood too many soroban transactions",
     resources.instructions = 800'000;
     resources.readBytes = 2000;
     resources.writeBytes = 1000;
-    resources.contractEventsSizeBytes = 0;
 
     auto genTx = [&](TestAccount& source, bool highFee) {
         auto txFee = baseFee;

diff --git a/src/herder/test/TransactionQueueTests.cpp b/src/herder/test/TransactionQueueTests.cpp
@@ -1120,7 +1120,6 @@ TEST_CASE("Soroban TransactionQueue limits",
     resources.instructions = 2'000'000;
     resources.readBytes = 2000;
     resources.writeBytes = 1000;
-    resources.contractEventsSizeBytes = 0;
 
     int refundableFee = 1200;
     int initialFee = 10'000'000;

diff --git a/src/herder/test/TxSetTests.cpp b/src/herder/test/TxSetTests.cpp
@@ -502,7 +502,6 @@ TEST_CASE("generalized tx set XDR conversion", "[txset]")
                 resources.instructions = 800'000;
                 resources.readBytes = 1000;
                 resources.writeBytes = 1000;
-                resources.contractEventsSizeBytes = 0;
                 txs.emplace_back(createUploadWasmTx(*app, source, fee,
                                                     /* refundableFee */ 1200,
                                                     resources));
@@ -775,7 +774,6 @@ TEST_CASE("generalized tx set with multiple txs per source account", "[txset]")
         resources.instructions = 800'000;
         resources.readBytes = 1000;
         resources.writeBytes = 1000;
-        resources.contractEventsSizeBytes = 0;
         uint32_t inclusionFee = 500;
         uint32_t refundableFee = 10'000;
         auto sorobanTx = createUploadWasmTx(*app, root, inclusionFee,
@@ -824,7 +822,6 @@ TEST_CASE("generalized tx set fees", "[txset]")
             resources.instructions = 800'000;
             resources.readBytes = 1000;
             resources.writeBytes = 1000;
-            resources.contractEventsSizeBytes = 0;
             auto tx = createUploadWasmTx(*app, source, inclusionFee,
                                          refundableFee, resources);
             setValidTotalFee(tx, inclusionFee, refundableFee, *app, source);

diff --git a/src/ledger/NetworkConfig.cpp b/src/ledger/NetworkConfig.cpp
@@ -510,7 +510,9 @@ SorobanNetworkConfig::isValidConfigSettingEntry(ConfigSettingEntry const& cfg)
                 cfg.contractLedgerCost().bucketListWriteFeeGrowthFactor >= 0;
         break;
     case ConfigSettingID::CONFIG_SETTING_CONTRACT_EVENTS_V0:
-        valid = cfg.contractEvents().txMaxContractEventsSizeBytes >= 0 &&
+        valid = cfg.contractEvents().txMaxContractEventsSizeBytes >=
+                    MinimumSorobanNetworkConfig::
+                        TX_MAX_CONTRACT_EVENTS_SIZE_BYTES &&
                 cfg.contractEvents().feeContractEvents1KB >= 0;
         break;
     case ConfigSettingID::CONFIG_SETTING_STATE_EXPIRATION:

diff --git a/src/ledger/NetworkConfig.h b/src/ledger/NetworkConfig.h
@@ -39,6 +39,8 @@ struct MinimumSorobanNetworkConfig
 
     static constexpr uint32_t MINIMUM_PERSISTENT_ENTRY_LIFETIME = 4'096;
     static constexpr uint32_t MAXIMUM_ENTRY_LIFETIME = 535'680; // 31 days
+
+    static constexpr uint32_t TX_MAX_CONTRACT_EVENTS_SIZE_BYTES = 200;
 };
 
 // Defines the initial values of the network configuration
@@ -105,7 +107,8 @@ struct InitialSorobanNetworkConfig
     static constexpr int64_t FEE_TRANSACTION_SIZE_1KB = 2'000;
 
     // Contract events settings
-    static constexpr uint32_t TX_MAX_CONTRACT_EVENTS_SIZE_BYTES = 1'000;
+    static constexpr uint32_t TX_MAX_CONTRACT_EVENTS_SIZE_BYTES =
+        MinimumSorobanNetworkConfig::TX_MAX_CONTRACT_EVENTS_SIZE_BYTES;
     static constexpr int64_t FEE_CONTRACT_EVENTS_SIZE_1KB = 200;
 
     // State expiration settings

diff --git a/src/protocol-next/xdr b/src/protocol-next/xdr
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
@@ -28,7 +28,7 @@ rustc-simple-version = "0.1.0"
 version = "0.0.17"
 git = "https://github.com/stellar/rs-soroban-env"
 package = "soroban-env-host"
-rev = "048be90e10dfda6486141f96ea86e32fb91681f4"
+rev = "dd3d39571e9fdae9af34f7f46243d0794169b411"
 
 # This copy of the soroban host is _optional_ and only enabled during protocol
 # transitions. When transitioning from protocol N to N+1, the `curr` copy
@@ -52,11 +52,11 @@ optional = true
 version = "0.0.17"
 git = "https://github.com/stellar/rs-soroban-env"
 package = "soroban-env-host"
-rev = "2069b9c10541126f7812c6f807006dfc8470ab3f"
+rev = "c2e1c21cf8d44db23a159090e3cbaab741860295"
 
 [dependencies.soroban-test-wasms]
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "048be90e10dfda6486141f96ea86e32fb91681f4"
+rev = "dd3d39571e9fdae9af34f7f46243d0794169b411"
 
 [dependencies.cargo-lock]
 git = "https://github.com/rustsec/rustsec"