Skip to content

Commit b8bff14

Browse files
SirTysonSirTyson
committed
Bump env and XDR
1 parent c9ce37a commit b8bff14

26 files changed

+3677
-3580
lines changed

‎src/herder/test/TxSetTests.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,9 +1824,8 @@ TEST_CASE("txset nomination", "[txset]")
18241824
protocolVersion,
18251825
PARALLEL_SOROBAN_PHASE_PROTOCOL_VERSION))
18261826
{
1827-
cfg.mTxMaxInMemoryReadEntries =
1828-
cfg.mTxMaxDiskReadEntries +
1829-
cfg.mTxMaxWriteLedgerEntries;
1827+
cfg.mTxMaxFootprintEntries = cfg.mTxMaxDiskReadEntries +
1828+
cfg.mTxMaxWriteLedgerEntries;
18301829
}
18311830
});
18321831

@@ -2128,7 +2127,7 @@ TEST_CASE("parallel tx set building", "[txset][soroban]")
21282127
sorobanCfg.mTxMaxInstructions = 100'000'000;
21292128
sorobanCfg.mLedgerMaxInstructions = 400'000'000;
21302129
sorobanCfg.mTxMaxDiskReadEntries = 3000;
2131-
sorobanCfg.mTxMaxInMemoryReadEntries = sorobanCfg.mTxMaxDiskReadEntries;
2130+
sorobanCfg.mTxMaxFootprintEntries = sorobanCfg.mTxMaxDiskReadEntries;
21322131
sorobanCfg.mledgerMaxDiskReadEntries = 3000;
21332132
sorobanCfg.mTxMaxWriteLedgerEntries = 2000;
21342133
sorobanCfg.mTxMaxWriteLedgerEntries = 2000;

‎src/ledger/NetworkConfig.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,11 @@ ConfigSettingEntry
927927
initialLedgerCostExtEntry(uint32_t txMaxDiskReadEntries)
928928
{
929929
ConfigSettingEntry entry(CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0);
930-
// Initialize `txMaxInMemoryReadEntries` with the value of the older
930+
// Initialize `txMaxFootprintEntries` with the value of the older
931931
// `txMaxDiskReadEntries` setting that used to apply to the whole
932932
// transaction footprint, so that we ensure that no transactions
933933
// will become invalid due to this limit.
934-
entry.contractLedgerCostExt().txMaxInMemoryReadEntries =
935-
txMaxDiskReadEntries;
934+
entry.contractLedgerCostExt().txMaxFootprintEntries = txMaxDiskReadEntries;
936935
entry.contractLedgerCostExt().feeWrite1KB =
937936
InitialSorobanNetworkConfig::FEE_LEDGER_WRITE_1KB;
938937
return entry;
@@ -1112,7 +1111,7 @@ SorobanNetworkConfig::isValidConfigSettingEntry(ConfigSettingEntry const& cfg,
11121111
case ConfigSettingID::CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0:
11131112
valid =
11141113
protocolVersionStartsFrom(ledgerVersion, ProtocolVersion::V_23) &&
1115-
cfg.contractLedgerCostExt().txMaxInMemoryReadEntries >=
1114+
cfg.contractLedgerCostExt().txMaxFootprintEntries >=
11161115
MinimumSorobanNetworkConfig::TX_MAX_READ_LEDGER_ENTRIES &&
11171116
cfg.contractLedgerCostExt().feeWrite1KB >= 0;
11181117
break;
@@ -1403,7 +1402,7 @@ SorobanNetworkConfig::loadLedgerAccessSettings(AbstractLedgerTxn& ltx)
14031402
auto le = ltx.loadWithoutRecord(key).current();
14041403
auto const& configSetting =
14051404
le.data.configSetting().contractLedgerCostExt();
1406-
mTxMaxInMemoryReadEntries = configSetting.txMaxInMemoryReadEntries;
1405+
mTxMaxFootprintEntries = configSetting.txMaxFootprintEntries;
14071406
mFeeFlatRateWrite1KB = configSetting.feeWrite1KB;
14081407
}
14091408
}
@@ -1545,7 +1544,7 @@ SorobanNetworkConfig::loadLedgerCostExtConfig(AbstractLedgerTxn& ltx)
15451544
ConfigSettingID::CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0;
15461545
auto le = ltx.loadWithoutRecord(key).current();
15471546
auto const& configSetting = le.data.configSetting().contractLedgerCostExt();
1548-
mTxMaxInMemoryReadEntries = configSetting.txMaxInMemoryReadEntries;
1547+
mTxMaxFootprintEntries = configSetting.txMaxFootprintEntries;
15491548
mFeeFlatRateWrite1KB = configSetting.feeWrite1KB;
15501549
}
15511550

@@ -1918,9 +1917,9 @@ SorobanNetworkConfig::ledgerMaxDependentTxClusters() const
19181917
}
19191918

19201919
uint32_t
1921-
SorobanNetworkConfig::txMaxInMemoryReadEntries() const
1920+
SorobanNetworkConfig::txMaxFootprintEntries() const
19221921
{
1923-
return mTxMaxInMemoryReadEntries;
1922+
return mTxMaxFootprintEntries;
19241923
}
19251924

19261925
int64_t
@@ -2190,7 +2189,7 @@ SorobanNetworkConfig::operator==(SorobanNetworkConfig const& other) const
21902189
mLedgerMaxTxCount == other.ledgerMaxTxCount() &&
21912190

21922191
mTxMaxDiskReadEntries == other.txMaxDiskReadEntries() &&
2193-
mTxMaxInMemoryReadEntries == other.txMaxInMemoryReadEntries() &&
2192+
mTxMaxFootprintEntries == other.txMaxFootprintEntries() &&
21942193
mTxMaxDiskReadBytes == other.txMaxDiskReadBytes() &&
21952194
mTxMaxWriteLedgerEntries == other.txMaxWriteLedgerEntries() &&
21962195
mTxMaxWriteBytes == other.txMaxWriteBytes() &&

‎src/ledger/NetworkConfig.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,9 @@ class SorobanNetworkConfig
276276
uint32_t ledgerMaxWriteBytes() const;
277277
// Maximum number of ledger entry read operations per transaction
278278
uint32_t txMaxDiskReadEntries() const;
279-
// Maximum number of in-memory ledger entries accessed by a transaction
280-
uint32_t txMaxInMemoryReadEntries() const;
279+
// Maximum number of ledger entries allowed across readOnly and readWrite
280+
// footprints
281+
uint32_t txMaxFootprintEntries() const;
281282
// Maximum number of bytes that can be read per transaction
282283
uint32_t txMaxDiskReadBytes() const;
283284
// Maximum number of ledger entry write operations per transaction
@@ -473,7 +474,7 @@ class SorobanNetworkConfig
473474
uint32_t mLedgerMaxDependentTxClusters{};
474475

475476
// Ledger cost extension settings
476-
uint32_t mTxMaxInMemoryReadEntries{};
477+
uint32_t mTxMaxFootprintEntries{};
477478

478479
// Flat rate fee for writing 1KB applies only post protocol 23
479480
int64_t mFeeFlatRateWrite1KB{};

‎src/protocol-curr/xdr

‎src/protocol-next/xdr

‎src/rust/soroban/p23

‎src/rust/src/dep-trees/p23-expect.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
soroban-env-host v23.0.0 (src/rust/soroban/p23/soroban-env-host)
1+
soroban-env-host v23.0.0-rc.1 (src/rust/soroban/p23/soroban-env-host)
22
├── ark-bls12-381 v0.4.0
33
│ ├── ark-ec v0.4.2
44
│ │ ├── ark-ff v0.4.2
@@ -224,17 +224,17 @@ soroban-env-host v23.0.0 (src/rust/soroban/p23/soroban-env-host)
224224
│ ├── digest v0.10.7 (*)
225225
│ └── keccak v0.1.4
226226
│ └── cpufeatures v0.2.8 (*)
227-
├── soroban-builtin-sdk-macros v23.0.0 (proc-macro) (src/rust/soroban/p23/soroban-builtin-sdk-macros)
227+
├── soroban-builtin-sdk-macros v23.0.0-rc.1 (proc-macro) (src/rust/soroban/p23/soroban-builtin-sdk-macros)
228228
│ ├── itertools v0.10.5
229229
│ │ └── either v1.8.1
230230
│ ├── proc-macro2 v1.0.69 (*)
231231
│ ├── quote v1.0.33 (*)
232232
│ └── syn v2.0.39 (*)
233-
├── soroban-env-common v23.0.0 (src/rust/soroban/p23/soroban-env-common)
233+
├── soroban-env-common v23.0.0-rc.1 (src/rust/soroban/p23/soroban-env-common)
234234
│ ├── ethnum v1.5.0
235235
│ ├── num-derive v0.4.1 (proc-macro) (*)
236236
│ ├── num-traits v0.2.17 (*)
237-
│ ├── soroban-env-macros v23.0.0 (proc-macro) (src/rust/soroban/p23/soroban-env-macros)
237+
│ ├── soroban-env-macros v23.0.0-rc.1 (proc-macro) (src/rust/soroban/p23/soroban-env-macros)
238238
│ │ ├── itertools v0.10.5 (*)
239239
│ │ ├── proc-macro2 v1.0.69 (*)
240240
│ │ ├── quote v1.0.33 (*)
@@ -247,7 +247,7 @@ soroban-env-host v23.0.0 (src/rust/soroban/p23/soroban-env-host)
247247
│ │ │ ├── itoa v1.0.6
248248
│ │ │ ├── ryu v1.0.13
249249
│ │ │ └── serde v1.0.192 (*)
250-
│ │ ├── stellar-xdr v22.1.0 (https://github.com/stellar/rs-stellar-xdr?rev=6ed29b99d8112f6c8609fb9c7baa9235ea896c70#6ed29b99)
250+
│ │ ├── stellar-xdr v23.0.0-rc.1
251251
│ │ │ ├── cfg_eval v0.1.2 (proc-macro)
252252
│ │ │ │ ├── proc-macro2 v1.0.69 (*)
253253
│ │ │ │ ├── quote v1.0.33 (*)
@@ -277,7 +277,7 @@ soroban-env-host v23.0.0 (src/rust/soroban/p23/soroban-env-host)
277277
│ │ └── wasmparser-nostd v0.100.2
278278
│ │ └── indexmap-nostd v0.4.0
279279
│ ├── static_assertions v1.1.0
280-
│ ├── stellar-xdr v22.1.0 (https://github.com/stellar/rs-stellar-xdr?rev=6ed29b99d8112f6c8609fb9c7baa9235ea896c70#6ed29b99)
280+
│ ├── stellar-xdr v23.0.0-rc.1
281281
│ │ ├── base64 v0.22.1
282282
│ │ ├── cfg_eval v0.1.2 (proc-macro) (*)
283283
│ │ ├── escape-bytes v0.1.1

‎src/simulation/ApplyLoad.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ getUpgradeConfig(Config const& cfg)
4343
upgradeConfig.ledgerMaxTxCount = cfg.APPLY_LOAD_MAX_TX_COUNT;
4444
upgradeConfig.txMaxDiskReadEntries =
4545
cfg.APPLY_LOAD_TX_MAX_READ_LEDGER_ENTRIES;
46-
upgradeConfig.txMaxInMemoryReadEntries =
46+
upgradeConfig.txMaxFootprintEntries =
4747
cfg.APPLY_LOAD_TX_MAX_READ_LEDGER_ENTRIES;
4848
upgradeConfig.txMaxDiskReadBytes = cfg.APPLY_LOAD_TX_MAX_READ_BYTES;
4949
upgradeConfig.txMaxWriteLedgerEntries =

‎src/simulation/LoadGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ GeneratedLoadConfig::copySorobanNetworkConfigToUpgradeConfig(
16091609
upgradeCfg.feeDiskRead1KB = cfg.feeDiskRead1KB();
16101610
upgradeCfg.feeFlatRateWrite1KB = cfg.feeFlatRateWrite1KB();
16111611
upgradeCfg.txMaxDiskReadEntries = cfg.txMaxDiskReadEntries();
1612-
upgradeCfg.txMaxInMemoryReadEntries = cfg.txMaxInMemoryReadEntries();
1612+
upgradeCfg.txMaxFootprintEntries = cfg.txMaxFootprintEntries();
16131613
upgradeCfg.txMaxDiskReadBytes = cfg.txMaxDiskReadBytes();
16141614
upgradeCfg.txMaxWriteLedgerEntries = cfg.txMaxWriteLedgerEntries();
16151615
upgradeCfg.txMaxWriteBytes = cfg.txMaxWriteBytes();

‎src/simulation/TxGenerator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -996,10 +996,10 @@ TxGenerator::getConfigUpgradeSetFromLoadConfig(
996996
}
997997
break;
998998
case CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0:
999-
if (upgradeCfg.txMaxInMemoryReadEntries.has_value())
999+
if (upgradeCfg.txMaxFootprintEntries.has_value())
10001000
{
1001-
setting.contractLedgerCostExt().txMaxInMemoryReadEntries =
1002-
*upgradeCfg.txMaxInMemoryReadEntries;
1001+
setting.contractLedgerCostExt().txMaxFootprintEntries =
1002+
*upgradeCfg.txMaxFootprintEntries;
10031003
}
10041004

10051005
if (upgradeCfg.feeFlatRateWrite1KB.has_value())

‎src/simulation/TxGenerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct SorobanUpgradeConfig
7272
std::optional<uint32_t> ledgerMaxDependentTxClusters{};
7373

7474
// Ledger cost extension settings
75-
std::optional<uint32_t> txMaxInMemoryReadEntries{};
75+
std::optional<uint32_t> txMaxFootprintEntries{};
7676
std::optional<int64_t> feeFlatRateWrite1KB{};
7777
};
7878

‎src/simulation/test/LoadGeneratorTests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ TEST_CASE("generate soroban load", "[loadgen][soroban]")
361361
ProtocolVersion::V_23))
362362
{
363363
upgradeCfg.ledgerMaxDependentTxClusters = rand_uniform<uint32_t>(2, 10);
364-
upgradeCfg.txMaxInMemoryReadEntries =
364+
upgradeCfg.txMaxFootprintEntries =
365365
rand_uniform<uint32_t>(UINT32_MAX - 10'000, UINT32_MAX);
366366
upgradeCfg.feeFlatRateWrite1KB =
367367
rand_uniform<int64_t>(INT64_MAX - 10'000, INT64_MAX);
@@ -495,8 +495,8 @@ TEST_CASE("generate soroban load", "[loadgen][soroban]")
495495
upgradeCfg.ledgerMaxDependentTxClusters);
496496
break;
497497
case CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0:
498-
REQUIRE(setting.contractLedgerCostExt().txMaxInMemoryReadEntries ==
499-
upgradeCfg.txMaxInMemoryReadEntries);
498+
REQUIRE(setting.contractLedgerCostExt().txMaxFootprintEntries ==
499+
upgradeCfg.txMaxFootprintEntries);
500500
REQUIRE(setting.contractLedgerCostExt().feeWrite1KB ==
501501
upgradeCfg.feeFlatRateWrite1KB);
502502
break;

‎src/test/TestUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ setSorobanNetworkConfigForTest(SorobanNetworkConfig& cfg,
433433
if (!ledgerVersion ||
434434
protocolVersionStartsFrom(*ledgerVersion, ProtocolVersion::V_23))
435435
{
436-
cfg.mTxMaxInMemoryReadEntries = cfg.mTxMaxDiskReadEntries;
436+
cfg.mTxMaxFootprintEntries = cfg.mTxMaxDiskReadEntries;
437437
}
438438
}
439439

0 commit comments

Comments
 (0)