From cd056ea1d6a0b44fcdf2001a5125ab606766e535 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 25 Nov 2024 10:57:58 -0800 Subject: [PATCH 1/7] Use latest cpu cost types --- local/core/etc/config-settings/testnet.json | 229 ++++++++++++++++++ local/core/etc/config-settings/unlimited.json | 229 ++++++++++++++++++ 2 files changed, 458 insertions(+) diff --git a/local/core/etc/config-settings/testnet.json b/local/core/etc/config-settings/testnet.json index cae277f2..9fa64f46 100644 --- a/local/core/etc/config-settings/testnet.json +++ b/local/core/etc/config-settings/testnet.json @@ -48,6 +48,235 @@ "fee_tx_size1_kb": 1624 } }, + { + "contract_cost_params_cpu_instructions": [ + { + "ext": "v0", + "const_term": 4, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 434, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 42, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 44, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 295, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 60, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 221, + "linear_term": 26 + }, + { + "ext": "v0", + "const_term": 331, + "linear_term": 4369 + }, + { + "ext": "v0", + "const_term": 3636, + "linear_term": 7013 + }, + { + "ext": "v0", + "const_term": 40256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 377551, + "linear_term": 4059 + }, + { + "ext": "v0", + "const_term": 417482, + "linear_term": 45712 + }, + { + "ext": "v0", + "const_term": 41142, + "linear_term": 634 + }, + { + "ext": "v0", + "const_term": 1945, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 6481, + "linear_term": 5943 + }, + { + "ext": "v0", + "const_term": 711, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2314804, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4176, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4716, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4680, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 884, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1059, + "linear_term": 502 + }, + { + "ext": "v0", + "const_term": 73077, + "linear_term": 25410 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 540752 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 176363 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 29989 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 1061449 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 237336 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 328476 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 701845 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 429383 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 28 + }, + { + "ext": "v0", + "const_term": 43030, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 7556 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 10711 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 3300 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 23038 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 42488 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 828974 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 297100 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 14 + }, + { + "ext": "v0", + "const_term": 1882, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3000906, + "linear_term": 0 + } + ] + }, { "contract_data_key_size_bytes": 200 }, diff --git a/local/core/etc/config-settings/unlimited.json b/local/core/etc/config-settings/unlimited.json index e9b82771..7c7864f3 100644 --- a/local/core/etc/config-settings/unlimited.json +++ b/local/core/etc/config-settings/unlimited.json @@ -48,6 +48,235 @@ "fee_tx_size1_kb": 500 } }, + { + "contract_cost_params_cpu_instructions": [ + { + "ext": "v0", + "const_term": 4, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 434, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 42, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 44, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 295, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 60, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 221, + "linear_term": 26 + }, + { + "ext": "v0", + "const_term": 331, + "linear_term": 4369 + }, + { + "ext": "v0", + "const_term": 3636, + "linear_term": 7013 + }, + { + "ext": "v0", + "const_term": 40256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 377551, + "linear_term": 4059 + }, + { + "ext": "v0", + "const_term": 417482, + "linear_term": 45712 + }, + { + "ext": "v0", + "const_term": 41142, + "linear_term": 634 + }, + { + "ext": "v0", + "const_term": 1945, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 6481, + "linear_term": 5943 + }, + { + "ext": "v0", + "const_term": 711, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2314804, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4176, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4716, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4680, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 884, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1059, + "linear_term": 502 + }, + { + "ext": "v0", + "const_term": 73077, + "linear_term": 25410 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 540752 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 176363 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 29989 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 1061449 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 237336 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 328476 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 701845 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 429383 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 28 + }, + { + "ext": "v0", + "const_term": 43030, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 7556 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 10711 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 3300 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 23038 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 42488 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 828974 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 297100 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 14 + }, + { + "ext": "v0", + "const_term": 1882, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3000906, + "linear_term": 0 + } + ] + }, { "contract_data_key_size_bytes": 4294967295 }, From 9d1a7f212a4c0e333cd803932a58c9187ecbe785 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 25 Nov 2024 16:42:54 -0800 Subject: [PATCH 2/7] separate settings files by protocol version --- .../core/etc/config-settings/p21/testnet.json | 77 +++++++++++++++++++ .../etc/config-settings/p21/unlimited.json | 77 +++++++++++++++++++ .../config-settings/{ => p22}/testnet.json | 0 .../config-settings/{ => p22}/unlimited.json | 0 start | 4 +- 5 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 local/core/etc/config-settings/p21/testnet.json create mode 100644 local/core/etc/config-settings/p21/unlimited.json rename local/core/etc/config-settings/{ => p22}/testnet.json (100%) rename local/core/etc/config-settings/{ => p22}/unlimited.json (100%) diff --git a/local/core/etc/config-settings/p21/testnet.json b/local/core/etc/config-settings/p21/testnet.json new file mode 100644 index 00000000..cae277f2 --- /dev/null +++ b/local/core/etc/config-settings/p21/testnet.json @@ -0,0 +1,77 @@ +{ + "updated_entry": [ + { + "contract_max_size_bytes": 65536 + }, + { + "contract_compute_v0": { + "ledger_max_instructions": 100000000, + "tx_max_instructions": 100000000, + "fee_rate_per_instructions_increment": 25, + "tx_memory_limit": 41943040 + } + }, + { + "contract_ledger_cost_v0": { + "ledger_max_read_ledger_entries": 40, + "ledger_max_read_bytes": 133120, + "ledger_max_write_ledger_entries": 25, + "ledger_max_write_bytes": 66560, + "tx_max_read_ledger_entries": 40, + "tx_max_read_bytes": 133120, + "tx_max_write_ledger_entries": 25, + "tx_max_write_bytes": 66560, + "fee_read_ledger_entry": 6250, + "fee_write_ledger_entry": 10000, + "fee_read1_kb": 1786, + "bucket_list_target_size_bytes": 14495514624, + "write_fee1_kb_bucket_list_low": -12034, + "write_fee1_kb_bucket_list_high": 115390, + "bucket_list_write_fee_growth_factor": 1000 + } + }, + { + "contract_historical_data_v0": { + "fee_historical1_kb": 16235 + } + }, + { + "contract_events_v0": { + "tx_max_contract_events_size_bytes": 8198, + "fee_contract_events1_kb": 10000 + } + }, + { + "contract_bandwidth_v0": { + "ledger_max_txs_size_bytes": 71680, + "tx_max_size_bytes": 71680, + "fee_tx_size1_kb": 1624 + } + }, + { + "contract_data_key_size_bytes": 200 + }, + { + "contract_data_entry_size_bytes": 65536 + }, + { + "state_archival": { + "max_entry_ttl": 3110400, + "min_temporary_ttl": 17280, + "min_persistent_ttl": 2073600, + "persistent_rent_rate_denominator": 1402, + "temp_rent_rate_denominator": 2804, + "max_entries_to_archive": 1000, + "bucket_list_size_window_sample_size": 30, + "bucket_list_window_sample_period": 64, + "eviction_scan_size": 100000, + "starting_eviction_scan_level": 7 + } + }, + { + "contract_execution_lanes": { + "ledger_max_tx_count": 100 + } + } + ] +} \ No newline at end of file diff --git a/local/core/etc/config-settings/p21/unlimited.json b/local/core/etc/config-settings/p21/unlimited.json new file mode 100644 index 00000000..e9b82771 --- /dev/null +++ b/local/core/etc/config-settings/p21/unlimited.json @@ -0,0 +1,77 @@ +{ + "updated_entry": [ + { + "contract_max_size_bytes": 4294967295 + }, + { + "contract_compute_v0": { + "ledger_max_instructions": 2305843009213693951, + "tx_max_instructions": 2305843009213693951, + "fee_rate_per_instructions_increment": 100, + "tx_memory_limit": 4294967295 + } + }, + { + "contract_ledger_cost_v0": { + "ledger_max_read_ledger_entries": 4294967295, + "ledger_max_read_bytes": 4294967295, + "ledger_max_write_ledger_entries": 4294967295, + "ledger_max_write_bytes": 4294967295, + "tx_max_read_ledger_entries": 4294967295, + "tx_max_read_bytes": 4294967295, + "tx_max_write_ledger_entries": 4294967295, + "tx_max_write_bytes": 4294967295, + "fee_read_ledger_entry": 1000, + "fee_write_ledger_entry": 3000, + "fee_read1_kb": 1000, + "bucket_list_target_size_bytes": 2305843009213694000, + "write_fee1_kb_bucket_list_low": 1000, + "write_fee1_kb_bucket_list_high": 4000000, + "bucket_list_write_fee_growth_factor": 1000 + } + }, + { + "contract_historical_data_v0": { + "fee_historical1_kb": 5000 + } + }, + { + "contract_events_v0": { + "tx_max_contract_events_size_bytes": 4294967295, + "fee_contract_events1_kb": 300 + } + }, + { + "contract_bandwidth_v0": { + "ledger_max_txs_size_bytes": 4294967295, + "tx_max_size_bytes": 4294967295, + "fee_tx_size1_kb": 500 + } + }, + { + "contract_data_key_size_bytes": 4294967295 + }, + { + "contract_data_entry_size_bytes": 4294967295 + }, + { + "state_archival": { + "max_entry_ttl": 3110400, + "min_temporary_ttl": 16, + "min_persistent_ttl": 120960, + "persistent_rent_rate_denominator": 535680, + "temp_rent_rate_denominator": 5356800, + "max_entries_to_archive": 100, + "bucket_list_size_window_sample_size": 30, + "bucket_list_window_sample_period": 64, + "eviction_scan_size": 100000, + "starting_eviction_scan_level": 6 + } + }, + { + "contract_execution_lanes": { + "ledger_max_tx_count": 4294967295 + } + } + ] +} diff --git a/local/core/etc/config-settings/testnet.json b/local/core/etc/config-settings/p22/testnet.json similarity index 100% rename from local/core/etc/config-settings/testnet.json rename to local/core/etc/config-settings/p22/testnet.json diff --git a/local/core/etc/config-settings/unlimited.json b/local/core/etc/config-settings/p22/unlimited.json similarity index 100% rename from local/core/etc/config-settings/unlimited.json rename to local/core/etc/config-settings/p22/unlimited.json diff --git a/start b/start index 399b82ad..e40ceeb7 100644 --- a/start +++ b/start @@ -59,7 +59,7 @@ function validate_before_start() { function validate_after_copy_defaults() { if [ "$NETWORK" = "local" ] && [ "$LIMITS" != "default" ]; then local config_dir="$COREHOME/etc/config-settings" - local config_path="$config_dir/$LIMITS.json" + local config_path="$config_dir/p$PROTOCOL_VERSION/$LIMITS.json" if [ ! -f "$config_path" ]; then echo "--limits '$LIMITS' unknown: must be one of: default "$(ls $config_dir | sed 's/\.json//g') exit 1 @@ -551,7 +551,7 @@ function upgrade_local() { "$NETWORK_ROOT_ACCOUNT_ID" \ 0 \ "$NETWORK_PASSPHRASE" \ - --xdr `stellar-xdr encode --type ConfigUpgradeSet < "$COREHOME/etc/config-settings/$LIMITS.json"` \ + --xdr `stellar-xdr encode --type ConfigUpgradeSet < "$COREHOME/etc/config-settings/p$PROTOCOL_VERSION/$LIMITS.json"` \ --signtxs)" let line_count=$(echo "$upgrade_output" | wc -l) From 86eca3aab17fbb3d93d7e5c834e223dd9fafd831 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 25 Nov 2024 16:54:31 -0800 Subject: [PATCH 3/7] Add a readme for config-settings --- local/core/etc/config-settings/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 local/core/etc/config-settings/README.md diff --git a/local/core/etc/config-settings/README.md b/local/core/etc/config-settings/README.md new file mode 100644 index 00000000..e99070e5 --- /dev/null +++ b/local/core/etc/config-settings/README.md @@ -0,0 +1,2 @@ +# config-settings +This directory contains Soroban settings upgrade files for each default protocol version (set with the arg `PROTOCOL_VERSION_DEFAULT`) specified on each on the three builds (`latest`, `testing`, and `future`). They need to be separated by protocol version because the number of cost types is dependant on protocol, and we specifically want to capture the cpu cost type changes we make outside of protocol boundaries. The directory for previous protocols can be deleted once the `latest` builds `PROTOCOL_VERSION_DEFAULT` is bumped. \ No newline at end of file From 372081b8dda720e4ef2dad4d68abfac106331c2b Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 25 Nov 2024 17:32:40 -0800 Subject: [PATCH 4/7] fix --- .../core/etc/config-settings/p21/testnet.json | 229 +++++++ .../etc/config-settings/p21/unlimited.json | 229 +++++++ .../core/etc/config-settings/p22/testnet.json | 125 ++++ .../etc/config-settings/p22/unlimited.json | 581 +++++++++++------- 4 files changed, 936 insertions(+), 228 deletions(-) diff --git a/local/core/etc/config-settings/p21/testnet.json b/local/core/etc/config-settings/p21/testnet.json index cae277f2..9fa64f46 100644 --- a/local/core/etc/config-settings/p21/testnet.json +++ b/local/core/etc/config-settings/p21/testnet.json @@ -48,6 +48,235 @@ "fee_tx_size1_kb": 1624 } }, + { + "contract_cost_params_cpu_instructions": [ + { + "ext": "v0", + "const_term": 4, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 434, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 42, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 44, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 295, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 60, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 221, + "linear_term": 26 + }, + { + "ext": "v0", + "const_term": 331, + "linear_term": 4369 + }, + { + "ext": "v0", + "const_term": 3636, + "linear_term": 7013 + }, + { + "ext": "v0", + "const_term": 40256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 377551, + "linear_term": 4059 + }, + { + "ext": "v0", + "const_term": 417482, + "linear_term": 45712 + }, + { + "ext": "v0", + "const_term": 41142, + "linear_term": 634 + }, + { + "ext": "v0", + "const_term": 1945, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 6481, + "linear_term": 5943 + }, + { + "ext": "v0", + "const_term": 711, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2314804, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4176, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4716, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4680, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 884, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1059, + "linear_term": 502 + }, + { + "ext": "v0", + "const_term": 73077, + "linear_term": 25410 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 540752 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 176363 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 29989 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 1061449 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 237336 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 328476 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 701845 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 429383 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 28 + }, + { + "ext": "v0", + "const_term": 43030, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 7556 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 10711 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 3300 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 23038 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 42488 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 828974 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 297100 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 14 + }, + { + "ext": "v0", + "const_term": 1882, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3000906, + "linear_term": 0 + } + ] + }, { "contract_data_key_size_bytes": 200 }, diff --git a/local/core/etc/config-settings/p21/unlimited.json b/local/core/etc/config-settings/p21/unlimited.json index e9b82771..7c7864f3 100644 --- a/local/core/etc/config-settings/p21/unlimited.json +++ b/local/core/etc/config-settings/p21/unlimited.json @@ -48,6 +48,235 @@ "fee_tx_size1_kb": 500 } }, + { + "contract_cost_params_cpu_instructions": [ + { + "ext": "v0", + "const_term": 4, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 434, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 42, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 44, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 295, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 60, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 221, + "linear_term": 26 + }, + { + "ext": "v0", + "const_term": 331, + "linear_term": 4369 + }, + { + "ext": "v0", + "const_term": 3636, + "linear_term": 7013 + }, + { + "ext": "v0", + "const_term": 40256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 377551, + "linear_term": 4059 + }, + { + "ext": "v0", + "const_term": 417482, + "linear_term": 45712 + }, + { + "ext": "v0", + "const_term": 41142, + "linear_term": 634 + }, + { + "ext": "v0", + "const_term": 1945, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 6481, + "linear_term": 5943 + }, + { + "ext": "v0", + "const_term": 711, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2314804, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4176, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4716, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4680, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 884, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1059, + "linear_term": 502 + }, + { + "ext": "v0", + "const_term": 73077, + "linear_term": 25410 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 540752 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 176363 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 29989 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 1061449 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 237336 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 328476 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 701845 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 429383 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 28 + }, + { + "ext": "v0", + "const_term": 43030, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 7556 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 10711 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 3300 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 23038 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 42488 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 828974 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 297100 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 14 + }, + { + "ext": "v0", + "const_term": 1882, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3000906, + "linear_term": 0 + } + ] + }, { "contract_data_key_size_bytes": 4294967295 }, diff --git a/local/core/etc/config-settings/p22/testnet.json b/local/core/etc/config-settings/p22/testnet.json index 9fa64f46..4493d8f3 100644 --- a/local/core/etc/config-settings/p22/testnet.json +++ b/local/core/etc/config-settings/p22/testnet.json @@ -274,6 +274,131 @@ "ext": "v0", "const_term": 3000906, "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 661, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 985, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1934, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 730510, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 5921, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1057822, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 92642, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 100742, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7689, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2458985, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2426722, + "linear_term": 96397671 + }, + { + "ext": "v0", + "const_term": 1541554, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3211191, + "linear_term": 6713 + }, + { + "ext": "v0", + "const_term": 25207, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7873219, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 8035968, + "linear_term": 309667335 + }, + { + "ext": "v0", + "const_term": 2420202, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7050564, + "linear_term": 6797 + }, + { + "ext": "v0", + "const_term": 10558948, + "linear_term": 632860943 + }, + { + "ext": "v0", + "const_term": 1994, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1155, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 74, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 332, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 691, + "linear_term": 74558 + }, + { + "ext": "v0", + "const_term": 35421, + "linear_term": 0 } ] }, diff --git a/local/core/etc/config-settings/p22/unlimited.json b/local/core/etc/config-settings/p22/unlimited.json index 7c7864f3..f862690b 100644 --- a/local/core/etc/config-settings/p22/unlimited.json +++ b/local/core/etc/config-settings/p22/unlimited.json @@ -49,234 +49,359 @@ } }, { - "contract_cost_params_cpu_instructions": [ - { - "ext": "v0", - "const_term": 4, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 434, - "linear_term": 16 - }, - { - "ext": "v0", - "const_term": 42, - "linear_term": 16 - }, - { - "ext": "v0", - "const_term": 44, - "linear_term": 16 - }, - { - "ext": "v0", - "const_term": 295, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 60, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 221, - "linear_term": 26 - }, - { - "ext": "v0", - "const_term": 331, - "linear_term": 4369 - }, - { - "ext": "v0", - "const_term": 3636, - "linear_term": 7013 - }, - { - "ext": "v0", - "const_term": 40256, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 377551, - "linear_term": 4059 - }, - { - "ext": "v0", - "const_term": 417482, - "linear_term": 45712 - }, - { - "ext": "v0", - "const_term": 41142, - "linear_term": 634 - }, - { - "ext": "v0", - "const_term": 1945, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 6481, - "linear_term": 5943 - }, - { - "ext": "v0", - "const_term": 711, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 2314804, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 4176, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 4716, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 4680, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 4256, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 884, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 1059, - "linear_term": 502 - }, - { - "ext": "v0", - "const_term": 73077, - "linear_term": 25410 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 540752 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 176363 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 29989 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 1061449 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 237336 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 328476 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 701845 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 429383 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 28 - }, - { - "ext": "v0", - "const_term": 43030, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 7556 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 10711 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 3300 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 23038 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 42488 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 828974 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 297100 - }, - { - "ext": "v0", - "const_term": 0, - "linear_term": 14 - }, - { - "ext": "v0", - "const_term": 1882, - "linear_term": 0 - }, - { - "ext": "v0", - "const_term": 3000906, - "linear_term": 0 - } - ] - }, + "contract_cost_params_cpu_instructions": [ + { + "ext": "v0", + "const_term": 4, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 434, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 42, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 44, + "linear_term": 16 + }, + { + "ext": "v0", + "const_term": 295, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 60, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 221, + "linear_term": 26 + }, + { + "ext": "v0", + "const_term": 331, + "linear_term": 4369 + }, + { + "ext": "v0", + "const_term": 3636, + "linear_term": 7013 + }, + { + "ext": "v0", + "const_term": 40256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 377551, + "linear_term": 4059 + }, + { + "ext": "v0", + "const_term": 417482, + "linear_term": 45712 + }, + { + "ext": "v0", + "const_term": 41142, + "linear_term": 634 + }, + { + "ext": "v0", + "const_term": 1945, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 6481, + "linear_term": 5943 + }, + { + "ext": "v0", + "const_term": 711, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2314804, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4176, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4716, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4680, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 4256, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 884, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1059, + "linear_term": 502 + }, + { + "ext": "v0", + "const_term": 73077, + "linear_term": 25410 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 540752 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 176363 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 29989 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 1061449 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 237336 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 328476 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 701845 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 429383 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 28 + }, + { + "ext": "v0", + "const_term": 43030, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 7556 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 10711 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 3300 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 23038 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 42488 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 828974 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 297100 + }, + { + "ext": "v0", + "const_term": 0, + "linear_term": 14 + }, + { + "ext": "v0", + "const_term": 1882, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3000906, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 661, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 985, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1934, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 730510, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 5921, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1057822, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 92642, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 100742, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7689, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2458985, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 2426722, + "linear_term": 96397671 + }, + { + "ext": "v0", + "const_term": 1541554, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 3211191, + "linear_term": 6713 + }, + { + "ext": "v0", + "const_term": 25207, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7873219, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 8035968, + "linear_term": 309667335 + }, + { + "ext": "v0", + "const_term": 2420202, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 7050564, + "linear_term": 6797 + }, + { + "ext": "v0", + "const_term": 10558948, + "linear_term": 632860943 + }, + { + "ext": "v0", + "const_term": 1994, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 1155, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 74, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 332, + "linear_term": 0 + }, + { + "ext": "v0", + "const_term": 691, + "linear_term": 74558 + }, + { + "ext": "v0", + "const_term": 35421, + "linear_term": 0 + } + ] + }, { "contract_data_key_size_bytes": 4294967295 }, From 5ba279adbac6725b7471b46b79677faad5e3f5b3 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Tue, 26 Nov 2024 10:20:20 -0800 Subject: [PATCH 5/7] Update README.md --- local/core/etc/config-settings/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/core/etc/config-settings/README.md b/local/core/etc/config-settings/README.md index e99070e5..89c8883e 100644 --- a/local/core/etc/config-settings/README.md +++ b/local/core/etc/config-settings/README.md @@ -1,2 +1,2 @@ # config-settings -This directory contains Soroban settings upgrade files for each default protocol version (set with the arg `PROTOCOL_VERSION_DEFAULT`) specified on each on the three builds (`latest`, `testing`, and `future`). They need to be separated by protocol version because the number of cost types is dependant on protocol, and we specifically want to capture the cpu cost type changes we make outside of protocol boundaries. The directory for previous protocols can be deleted once the `latest` builds `PROTOCOL_VERSION_DEFAULT` is bumped. \ No newline at end of file +This directory contains Soroban settings upgrade files for each default protocol version (set with the arg `PROTOCOL_VERSION_DEFAULT`) specified on each on the three builds (`latest`, `testing`, and `future`). They need to be separated by protocol version because the number of cost types is dependant on protocol, and we specifically want to capture the cpu cost type changes we make outside of protocol boundaries. From b061df7d682a68b8dc7e476cecf401e169bf208a Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Tue, 26 Nov 2024 12:52:26 -0800 Subject: [PATCH 6/7] Update out of date testnet settings --- local/core/etc/config-settings/p21/testnet.json | 14 +++++++------- local/core/etc/config-settings/p22/testnet.json | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/local/core/etc/config-settings/p21/testnet.json b/local/core/etc/config-settings/p21/testnet.json index 9fa64f46..bc54049e 100644 --- a/local/core/etc/config-settings/p21/testnet.json +++ b/local/core/etc/config-settings/p21/testnet.json @@ -5,7 +5,7 @@ }, { "contract_compute_v0": { - "ledger_max_instructions": 100000000, + "ledger_max_instructions": 500000000, "tx_max_instructions": 100000000, "fee_rate_per_instructions_increment": 25, "tx_memory_limit": 41943040 @@ -13,14 +13,14 @@ }, { "contract_ledger_cost_v0": { - "ledger_max_read_ledger_entries": 40, - "ledger_max_read_bytes": 133120, - "ledger_max_write_ledger_entries": 25, - "ledger_max_write_bytes": 66560, + "ledger_max_read_ledger_entries": 200, + "ledger_max_read_bytes": 500000, + "ledger_max_write_ledger_entries": 125, + "ledger_max_write_bytes": 143360, "tx_max_read_ledger_entries": 40, - "tx_max_read_bytes": 133120, + "tx_max_read_bytes": 200000, "tx_max_write_ledger_entries": 25, - "tx_max_write_bytes": 66560, + "tx_max_write_bytes": 132096, "fee_read_ledger_entry": 6250, "fee_write_ledger_entry": 10000, "fee_read1_kb": 1786, diff --git a/local/core/etc/config-settings/p22/testnet.json b/local/core/etc/config-settings/p22/testnet.json index 4493d8f3..1e1604f9 100644 --- a/local/core/etc/config-settings/p22/testnet.json +++ b/local/core/etc/config-settings/p22/testnet.json @@ -13,14 +13,14 @@ }, { "contract_ledger_cost_v0": { - "ledger_max_read_ledger_entries": 40, - "ledger_max_read_bytes": 133120, - "ledger_max_write_ledger_entries": 25, - "ledger_max_write_bytes": 66560, + "ledger_max_read_ledger_entries": 200, + "ledger_max_read_bytes": 500000, + "ledger_max_write_ledger_entries": 125, + "ledger_max_write_bytes": 143360, "tx_max_read_ledger_entries": 40, - "tx_max_read_bytes": 133120, + "tx_max_read_bytes": 200000, "tx_max_write_ledger_entries": 25, - "tx_max_write_bytes": 66560, + "tx_max_write_bytes": 132096, "fee_read_ledger_entry": 6250, "fee_write_ledger_entry": 10000, "fee_read1_kb": 1786, From 09709ec6c3a6fd9dbfa12afe7755059a031fbe42 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Tue, 26 Nov 2024 15:23:46 -0800 Subject: [PATCH 7/7] Update testnet.json --- local/core/etc/config-settings/p22/testnet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local/core/etc/config-settings/p22/testnet.json b/local/core/etc/config-settings/p22/testnet.json index 1e1604f9..d15274b6 100644 --- a/local/core/etc/config-settings/p22/testnet.json +++ b/local/core/etc/config-settings/p22/testnet.json @@ -5,7 +5,7 @@ }, { "contract_compute_v0": { - "ledger_max_instructions": 100000000, + "ledger_max_instructions": 500000000, "tx_max_instructions": 100000000, "fee_rate_per_instructions_increment": 25, "tx_memory_limit": 41943040 @@ -428,4 +428,4 @@ } } ] -} \ No newline at end of file +}