Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
684 changes: 377 additions & 307 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_0.json

Large diffs are not rendered by default.

730 changes: 399 additions & 331 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_1.json

Large diffs are not rendered by default.

730 changes: 399 additions & 331 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_1_1.json

Large diffs are not rendered by default.

741 changes: 404 additions & 337 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_2.json

Large diffs are not rendered by default.

741 changes: 404 additions & 337 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_2_1.json

Large diffs are not rendered by default.

741 changes: 404 additions & 337 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_3.json

Large diffs are not rendered by default.

604 changes: 304 additions & 300 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_4.json

Large diffs are not rendered by default.

638 changes: 321 additions & 317 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_5.json

Large diffs are not rendered by default.

638 changes: 321 additions & 317 deletions crates/blockifier/resources/blockifier_versioned_constants_0_13_6.json

Large diffs are not rendered by default.

662 changes: 333 additions & 329 deletions crates/blockifier/resources/blockifier_versioned_constants_0_14_0.json

Large diffs are not rendered by default.

662 changes: 333 additions & 329 deletions crates/blockifier/resources/blockifier_versioned_constants_0_14_1.json

Large diffs are not rendered by default.

502 changes: 253 additions & 249 deletions crates/blockifier/resources/blockifier_versioned_constants_0_14_2.json

Large diffs are not rendered by default.

502 changes: 253 additions & 249 deletions crates/blockifier/resources/blockifier_versioned_constants_0_14_3.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
~ /gateway/max_contract_bytecode_size: 81920
~ /ignore_inner_event_resources: true
~ /invoke_tx_max_n_steps: 4000000
+ /os_constants/syscall_gas_costs/Secp256k1Mul/memory_hole_gas_cost: 2
~ /os_constants/syscall_gas_costs/Secp256k1Mul/memory_hole_gas_cost: 2
~ /os_constants/syscall_gas_costs/Secp256k1Mul/step_gas_cost: 76501
+ /os_constants/syscall_gas_costs/Secp256r1Mul/memory_hole_gas_cost: 2
~ /os_constants/syscall_gas_costs/Secp256r1Mul/memory_hole_gas_cost: 2
~ /os_constants/syscall_gas_costs/Secp256r1Mul/step_gas_cost: 125340
~ /os_constants/validate_rounding_consts/validate_block_number_rounding: 100
~ /os_constants/validate_rounding_consts/validate_timestamp_rounding: 3600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
~ /disable_cairo0_redeclaration: true
~ /invoke_tx_max_n_steps: 10000000
~ /os_constants/builtin_gas_costs/bitwise: 594
+ /os_constants/syscall_gas_costs/Sha256ProcessBlock/bitwise: 1115
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/bitwise: 1115
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/range_check: 65
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/step_gas_cost: 1852
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/syscall_base_gas_cost: 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
+ /os_constants/v1_bound_accounts_cairo0/0: "0x06d706cfbac9b8262d601c38251c5fbe0497c3a96cc91a92b08d91b61d9e70c4"
+ /os_constants/v1_bound_accounts_cairo0/1: "0x0309c042d3729173c7f2f91a34f04d8c509c1b292d334679ef1aabf8da0899cc"
+ /os_constants/v1_bound_accounts_cairo0/2: "0x01a7820094feaf82d53f53f214b81292d717e7bb9a92bb2488092cd306f3993f"
+ /os_constants/v1_bound_accounts_cairo0/3: "0x033434ad846cdd5f23eb73ff09fe6fddd568284a0fb7d1be20ee482f044dabe2"
+ /os_constants/v1_bound_accounts_cairo1/0: "0x01a736d6ed154502257f02b1ccdf4d9d1089f80811cd6acad48e6b6a9d1f2003"
+ /os_constants/v1_bound_accounts_cairo1/1: "0x0737ee2f87ce571a58c6c8da558ec18a07ceb64a6172d5ec46171fbc80077a48"
+ /os_constants/v1_bound_accounts_cairo1/2: "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"
+ /os_constants/v1_bound_accounts_cairo1/3: "0x04c6d6cf894f8bc96bb9c525e6853e5483177841f7388f74a46cfda6f028c755"
+ /os_constants/v1_bound_accounts_cairo1/4: "0x01c0bb51e2ce73dc007601a1e7725453627254016c28f118251a71bbb0507fcb"
+ /os_constants/v1_bound_accounts_cairo1/5: "0x0251830adc3d8b4d818c2c309d71f1958308e8c745212480c26e01120c69ee49"
+ /os_constants/v1_bound_accounts_cairo1/6: "0x0251cac7b2f45d255b83b7a06dcdef70c8a8752f00ea776517c1c2243c7a06e5"
+ /os_constants/v1_bound_accounts_cairo0/0: "0x6d706cfbac9b8262d601c38251c5fbe0497c3a96cc91a92b08d91b61d9e70c4"
+ /os_constants/v1_bound_accounts_cairo0/1: "0x309c042d3729173c7f2f91a34f04d8c509c1b292d334679ef1aabf8da0899cc"
+ /os_constants/v1_bound_accounts_cairo0/2: "0x1a7820094feaf82d53f53f214b81292d717e7bb9a92bb2488092cd306f3993f"
+ /os_constants/v1_bound_accounts_cairo0/3: "0x33434ad846cdd5f23eb73ff09fe6fddd568284a0fb7d1be20ee482f044dabe2"
+ /os_constants/v1_bound_accounts_cairo1/0: "0x1a736d6ed154502257f02b1ccdf4d9d1089f80811cd6acad48e6b6a9d1f2003"
+ /os_constants/v1_bound_accounts_cairo1/1: "0x737ee2f87ce571a58c6c8da558ec18a07ceb64a6172d5ec46171fbc80077a48"
+ /os_constants/v1_bound_accounts_cairo1/2: "0x5400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c"
+ /os_constants/v1_bound_accounts_cairo1/3: "0x4c6d6cf894f8bc96bb9c525e6853e5483177841f7388f74a46cfda6f028c755"
+ /os_constants/v1_bound_accounts_cairo1/4: "0x1c0bb51e2ce73dc007601a1e7725453627254016c28f118251a71bbb0507fcb"
+ /os_constants/v1_bound_accounts_cairo1/5: "0x251830adc3d8b4d818c2c309d71f1958308e8c745212480c26e01120c69ee49"
+ /os_constants/v1_bound_accounts_cairo1/6: "0x251cac7b2f45d255b83b7a06dcdef70c8a8752f00ea776517c1c2243c7a06e5"
~ /os_constants/v1_bound_accounts_max_tip: "0x746a5288000"
+ /os_resources/execute_syscalls/Deploy/calldata_factor: {"builtin_instance_counter":{"pedersen_builtin":1},"n_memory_holes":0,"n_steps":8}
+ /os_resources/execute_syscalls/Deploy/constant: {"builtin_instance_counter":{"pedersen_builtin":7,"range_check_builtin":18},"n_memory_holes":0,"n_steps":1132}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
~ /block_direct_execute_call: true
~ /disable_deploy_in_validation_mode: true
~ /enable_tip: true
+ /os_constants/data_gas_accounts/0: "0x02c8c7e6fbcfb3e8e15a46648e8914c6aa1fc506fc1e7fb3d1e19630716174bc"
+ /os_constants/data_gas_accounts/1: "0x00816dd0297efc55dc1e7559020a3a825e81ef734b558f03c83325d4da7e6253"
+ /os_constants/data_gas_accounts/2: "0x041bf1e71792aecb9df3e9d04e1540091c5e13122a731e02bec588f71dc1a5c3"
+ /os_constants/data_gas_accounts/0: "0x2c8c7e6fbcfb3e8e15a46648e8914c6aa1fc506fc1e7fb3d1e19630716174bc"
+ /os_constants/data_gas_accounts/1: "0x816dd0297efc55dc1e7559020a3a825e81ef734b558f03c83325d4da7e6253"
+ /os_constants/data_gas_accounts/2: "0x41bf1e71792aecb9df3e9d04e1540091c5e13122a731e02bec588f71dc1a5c3"
+ /os_constants/data_gas_accounts/3: "0x6d612cac7690e6620055c617a83a5a0b43b9758d9d30f281ddbc77be1651a70"
~ /os_constants/l1_handler_max_amount_bounds/l1_data_gas: 20000
~ /os_constants/l1_handler_max_amount_bounds/l1_gas: 40000
~ /os_constants/l1_handler_max_amount_bounds/l2_gas: 100000000
+ /os_constants/v1_bound_accounts_cairo0/4: "0x041cb0280ebadaa75f996d8d92c6f265f6d040bb3ba442e5f86a554f1765244e"
+ /os_constants/v1_bound_accounts_cairo0/4: "0x41cb0280ebadaa75f996d8d92c6f265f6d040bb3ba442e5f86a554f1765244e"
+ /os_constants/v1_bound_accounts_cairo0/5: "0x3530cc4759d78042f1b543bf797f5f3d647cde0388c33734cf91b7f7b9314a9"
~ /os_resources/execute_syscalls/CallContract/builtin_instance_counter/range_check_builtin: 18
~ /os_resources/execute_syscalls/CallContract/n_steps: 903
Expand Down
3 changes: 2 additions & 1 deletion crates/blockifier/src/blockifier_versioned_constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl RawVersionedConstants {
let formatter = serde_json::ser::PrettyFormatter::with_indent(b" ");
let mut serializer = serde_json::Serializer::with_formatter(&mut buffer, formatter);
self.serialize(&mut serializer).unwrap();
String::from_utf8(buffer).unwrap()
format!("{}\n", String::from_utf8(buffer).unwrap())
}
}

Expand Down Expand Up @@ -164,6 +164,7 @@ pub struct RawOsConstants {
pub syscall_base_gas_cost: RawStepGasCost,
// Deprecated field for computation of syscall gas costs in old blocks.
// New VCs set this to null.
#[serde(skip_serializing_if = "Option::is_none")]
pub syscall_gas_costs: Option<SyscallGasCostsMap>,

// Initial costs.
Expand Down
2 changes: 2 additions & 0 deletions crates/blockifier/src/versioned_constants_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::path::PathBuf;

use apollo_infra_utils::compile_time_cargo_manifest_dir;
use cached::proc_macro::cached;
use expect_test::expect_file;
use glob::{glob, Paths};
use indexmap::IndexMap;
use pretty_assertions::assert_eq;
Expand Down Expand Up @@ -369,5 +370,6 @@ fn test_deserialize_serialize_raw_vc() {
.unwrap();
let serialized = raw_vc.to_string_pretty();
assert_eq!(raw_vc, serde_json::from_str(&serialized).unwrap());
expect_file![file].assert_eq(&serialized);
}
}
Loading