Skip to content

Commit

Permalink
Use latest cpu cost types (#645)
Browse files Browse the repository at this point in the history
* Use latest cpu cost types

* separate settings files by protocol version

* Add a readme for config-settings

* fix

* Update README.md

* Update out of date testnet settings

* Update testnet.json
  • Loading branch information
sisuresh authored Nov 27, 2024
1 parent e2d6347 commit e1ff6fb
Show file tree
Hide file tree
Showing 8 changed files with 1,478 additions and 156 deletions.
2 changes: 2 additions & 0 deletions local/core/etc/config-settings/README.md
Original file line number Diff line number Diff line change
@@ -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.
306 changes: 306 additions & 0 deletions local/core/etc/config-settings/p21/testnet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,306 @@
{
"updated_entry": [
{
"contract_max_size_bytes": 65536
},
{
"contract_compute_v0": {
"ledger_max_instructions": 500000000,
"tx_max_instructions": 100000000,
"fee_rate_per_instructions_increment": 25,
"tx_memory_limit": 41943040
}
},
{
"contract_ledger_cost_v0": {
"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": 200000,
"tx_max_write_ledger_entries": 25,
"tx_max_write_bytes": 132096,
"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_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
},
{
"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
}
}
]
}
Loading

0 comments on commit e1ff6fb

Please sign in to comment.