Skip to content

Commit daea9d8

Browse files
DiegoCiviJulianGCalderon
DiegoCivi
and
JulianGCalderon
authored
Bump to cairo 2.14.1-dev.1 (#83)
* Bump to cairo 2.14.1-dev.1 * Fix fmt * Update native ref * Fix clippy * Implement get_execution_info_v3 --------- Co-authored-by: Julián González Calderón <[email protected]>
1 parent a8b0258 commit daea9d8

File tree

17 files changed

+152
-121
lines changed

17 files changed

+152
-121
lines changed

‎Cargo.lock‎

Lines changed: 74 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,15 @@ bytes = "1"
225225
c-kzg = "2.1.5"
226226
cached = "0.44.0"
227227
cairo-felt = "0.9.1"
228-
cairo-lang-casm = "2.12.3"
229-
cairo-lang-runner = "2.12.3"
230-
cairo-lang-sierra = "2.12.3"
231-
cairo-lang-sierra-to-casm = "2.12.3"
232-
cairo-lang-starknet-classes = "2.12.3"
233-
cairo-lang-utils = "2.12.3"
234-
cairo-native = { git = "https://github.com/lambdaclass/cairo_native.git", rev = "53371a953b8db9c8bc020e141591853a666cdcf3" }
235-
sierra-emu = { git = "https://github.com/lambdaclass/cairo_native.git", rev = "53371a953b8db9c8bc020e141591853a666cdcf3" }
236-
cairo-vm = "2.5.0"
228+
cairo-lang-casm = "2.14.1-dev.1"
229+
cairo-lang-runner = "2.14.1-dev.1"
230+
cairo-lang-sierra = "2.14.1-dev.1"
231+
cairo-lang-sierra-to-casm = "2.14.1-dev.1"
232+
cairo-lang-starknet-classes = "2.14.1-dev.1"
233+
cairo-lang-utils = "2.14.1-dev.1"
234+
cairo-native = { git = "https://github.com/lambdaclass/cairo_native.git", rev = "c2644a9f32169c6364e7dfb29fc3f5f1c4620e89" }
235+
sierra-emu = { git = "https://github.com/lambdaclass/cairo_native.git", rev = "c2644a9f32169c6364e7dfb29fc3f5f1c4620e89" }
236+
cairo-vm = "3.0.0"
237237
camelpaste = "0.1.0"
238238
chrono = "0.4.26"
239239
clap = "4.5.4"

‎crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::collections::{HashMap, HashSet};
1+
use std::collections::{BTreeMap, HashMap, HashSet};
22
use std::sync::Arc;
33
use std::vec;
44

@@ -473,7 +473,7 @@ fn execution_resources() -> ExecutionResources {
473473
ExecutionResources {
474474
n_steps: 2,
475475
n_memory_holes: 3,
476-
builtin_instance_counter: HashMap::from([
476+
builtin_instance_counter: BTreeMap::from([
477477
(BuiltinName::range_check, 31),
478478
(BuiltinName::pedersen, 4),
479479
]),
@@ -538,6 +538,8 @@ fn call_info() -> CallInfo {
538538
(SyscallSelector::StorageWrite, SyscallUsage { call_count: 4, linear_factor: 0 }),
539539
(SyscallSelector::EmitEvent, SyscallUsage { call_count: 2, linear_factor: 0 }),
540540
]),
541+
time: Default::default(),
542+
call_counter: Default::default(),
541543
}
542544
}
543545

‎crates/apollo_infra_utils/src/cairo_compiler_version.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#[path = "cairo_compiler_version_test.rs"]
33
mod cairo_compiler_version_test;
44

5-
pub const CAIRO1_COMPILER_VERSION: &str = "2.12.3";
5+
pub const CAIRO1_COMPILER_VERSION: &str = "2.14.1-dev.1";

‎crates/blockifier/src/bouncer.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ pub fn get_patricia_update_resources(
969969

970970
let resources_per_tree_access = ExecutionResources {
971971
n_steps: TREE_HEIGHT_UPPER_BOUND * STEPS_IN_TREE_PER_HEIGHT,
972-
builtin_instance_counter: HashMap::from([(
972+
builtin_instance_counter: BTreeMap::from([(
973973
BuiltinName::pedersen,
974974
TREE_HEIGHT_UPPER_BOUND * PEDERSENS_PER_HEIGHT,
975975
)]),

‎crates/blockifier/src/bouncer_test.rs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ fn test_get_tx_weights_with_casm_hash_computation(block_context: BlockContext) {
577577
#[case::tx_builtins_plus_os_tx_builtins(
578578
&[],
579579
ExecutionResources {
580-
builtin_instance_counter: HashMap::from([
580+
builtin_instance_counter: std::collections::BTreeMap::from([
581581
(BuiltinName::bitwise, 1),
582582
]),
583583
..Default::default()
@@ -596,7 +596,7 @@ fn test_get_tx_weights_with_casm_hash_computation(block_context: BlockContext) {
596596
(FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)), 1),
597597
],
598598
ExecutionResources {
599-
builtin_instance_counter: HashMap::from([
599+
builtin_instance_counter: std::collections::BTreeMap::from([
600600
(BuiltinName::range_check, 1),
601601
(BuiltinName::bitwise, 2),
602602
]),
@@ -607,6 +607,8 @@ fn test_proving_gas_minus_sierra_gas_equals_builtin_gas(
607607
#[case] contract_instances: &[(FeatureContract, u16)],
608608
#[case] os_vm_resources: ExecutionResources,
609609
) {
610+
use std::collections::BTreeMap;
611+
610612
let block_context = BlockContext::create_for_account_testing();
611613
let state = test_state(&block_context.chain_info, Fee(0), contract_instances);
612614

@@ -615,8 +617,8 @@ fn test_proving_gas_minus_sierra_gas_equals_builtin_gas(
615617
contract_instances.iter().map(|(contract, _)| contract.get_class_hash()).collect();
616618

617619
// Transaction builtin counters.
618-
let mut tx_builtin_counters =
619-
HashMap::from([(BuiltinName::range_check, 2), (BuiltinName::pedersen, 1)]);
620+
let tx_builtin_counters =
621+
BTreeMap::from([(BuiltinName::range_check, 2), (BuiltinName::pedersen, 1)]);
620622

621623
let tx_resources = TransactionResources {
622624
computation: ComputationResources {
@@ -661,14 +663,17 @@ fn test_proving_gas_minus_sierra_gas_equals_builtin_gas(
661663
&tx_resources,
662664
&StateMaps::default().keys(), // state changes keys
663665
&block_context.versioned_constants,
664-
&tx_builtin_counters,
666+
&tx_builtin_counters.clone().into_iter().collect(),
665667
&block_context.bouncer_config,
666668
)
667669
.unwrap();
668670

669671
// Combine TX + TX overhead (OS) + CASM and patricia builtin usage.
670-
add_maps(&mut tx_builtin_counters, &os_vm_resources.builtin_instance_counter);
671-
add_maps(&mut tx_builtin_counters, &additional_os_resources);
672+
add_maps(
673+
&mut tx_builtin_counters.clone().into_iter().collect(),
674+
&os_vm_resources.builtin_instance_counter.into_iter().collect(),
675+
);
676+
add_maps(&mut tx_builtin_counters.clone().into_iter().collect(), &additional_os_resources);
672677

673678
// Compute expected gas delta from builtin delta (absolute difference between Stwo and Stone).
674679
let (total_stwo_gas, total_stone_gas) = tx_builtin_counters

‎crates/blockifier/src/execution/casm_hash_estimation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::collections::HashMap;
1+
use std::collections::BTreeMap;
22
use std::ops::AddAssign;
33

44
use cairo_vm::types::builtin_name::BuiltinName;
@@ -448,10 +448,10 @@ impl EstimateCasmHashResources for CasmV2HashResourceEstimate {
448448
Self::estimate_steps_of_encode_felt252_data_and_calc_blake_hash(felt_size_groups);
449449
let builtin_instance_counter = match felt_size_groups.n_felts() {
450450
// The empty case does not use builtins at all.
451-
0 => HashMap::new(),
451+
0 => BTreeMap::new(),
452452
// One `range_check` per input felt to validate its size + Overhead for the non empty
453453
// case.
454-
_ => HashMap::from([(
454+
_ => BTreeMap::from([(
455455
BuiltinName::range_check,
456456
felt_size_groups.n_felts() + BASE_RANGE_CHECK_NON_EMPTY,
457457
)]),

‎crates/blockifier/src/execution/casm_hash_estimation_test.rs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::collections::HashMap;
1+
use std::collections::{BTreeMap, HashMap};
22

33
use cairo_vm::types::builtin_name::BuiltinName;
44
use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
@@ -21,7 +21,11 @@ impl EstimatedExecutionResources {
2121
builtin_instance_counter: HashMap<BuiltinName, usize>,
2222
) -> Self {
2323
Self::V1Hash {
24-
resources: ExecutionResources { n_steps, n_memory_holes, builtin_instance_counter },
24+
resources: ExecutionResources {
25+
n_steps,
26+
n_memory_holes,
27+
builtin_instance_counter: builtin_instance_counter.into_iter().collect(),
28+
},
2529
}
2630
}
2731

@@ -33,7 +37,11 @@ impl EstimatedExecutionResources {
3337
blake_count: usize,
3438
) -> Self {
3539
Self::V2Hash {
36-
resources: ExecutionResources { n_steps, n_memory_holes, builtin_instance_counter },
40+
resources: ExecutionResources {
41+
n_steps,
42+
n_memory_holes,
43+
builtin_instance_counter: builtin_instance_counter.into_iter().collect(),
44+
},
3745
blake_count,
3846
}
3947
}
@@ -64,7 +72,7 @@ fn add_assign_estimated_resources_panics_on_variant_mismatch(
6472
ExecutionResources {
6573
n_steps: 2,
6674
n_memory_holes: 2,
67-
builtin_instance_counter: HashMap::from([(BuiltinName::poseidon, 3)]),
75+
builtin_instance_counter: BTreeMap::from([(BuiltinName::poseidon, 3)]),
6876
},
6977
// Expected blake count.
7078
None,
@@ -76,7 +84,7 @@ fn add_assign_estimated_resources_panics_on_variant_mismatch(
7684
ExecutionResources {
7785
n_steps: 2,
7886
n_memory_holes: 2,
79-
builtin_instance_counter: HashMap::from([(BuiltinName::range_check, 3)]),
87+
builtin_instance_counter: BTreeMap::from([(BuiltinName::range_check, 3)]),
8088
},
8189
// Expected blake count.
8290
Some(3),

‎crates/blockifier/src/execution/contract_class.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::borrow::Cow;
2-
use std::collections::{HashMap, HashSet};
2+
use std::collections::{BTreeMap, HashMap, HashSet};
33
use std::ops::{Deref, Index};
44
use std::sync::{Arc, LazyLock};
55

@@ -356,7 +356,7 @@ impl CompiledClassV0 {
356356
ExecutionResources {
357357
n_steps,
358358
n_memory_holes: 0,
359-
builtin_instance_counter: HashMap::from([(BuiltinName::pedersen, hashed_data_size)]),
359+
builtin_instance_counter: BTreeMap::from([(BuiltinName::pedersen, hashed_data_size)]),
360360
}
361361
}
362362

‎crates/blockifier/src/execution/deprecated_syscalls/deprecated_syscalls_test.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::collections::{HashMap, HashSet};
1+
use std::collections::{BTreeMap, HashMap, HashSet};
22

33
use blockifier_test_utils::cairo_versions::CairoVersion;
44
use blockifier_test_utils::contracts::FeatureContract;
@@ -152,7 +152,7 @@ fn test_nested_library_call() {
152152
let storage_entry_point_resources = ExecutionResources {
153153
n_steps: 228,
154154
n_memory_holes: 0,
155-
builtin_instance_counter: HashMap::from([(BuiltinName::range_check, 2)]),
155+
builtin_instance_counter: BTreeMap::from([(BuiltinName::range_check, 2)]),
156156
};
157157
let storage_entry_point_syscalls_usage = HashMap::from([
158158
(SyscallSelector::StorageRead, SyscallUsage::with_call_count(1)),
@@ -176,7 +176,7 @@ fn test_nested_library_call() {
176176
+ &ExecutionResources {
177177
n_steps: 39,
178178
n_memory_holes: 0,
179-
builtin_instance_counter: HashMap::from([(BuiltinName::range_check, 1)]),
179+
builtin_instance_counter: BTreeMap::from([(BuiltinName::range_check, 1)]),
180180
};
181181
library_call_resources += &storage_entry_point_resources;
182182
let library_call_info = CallInfo {
@@ -211,7 +211,7 @@ fn test_nested_library_call() {
211211
+ &ExecutionResources {
212212
n_steps: 45,
213213
n_memory_holes: 0,
214-
builtin_instance_counter: HashMap::new(),
214+
builtin_instance_counter: BTreeMap::new(),
215215
};
216216
main_call_resources += &(&library_call_resources * 2);
217217
let expected_call_info = CallInfo {
@@ -317,7 +317,7 @@ fn test_call_contract() {
317317
resources: ExecutionResources {
318318
n_steps: 228,
319319
n_memory_holes: 0,
320-
builtin_instance_counter: HashMap::from([(BuiltinName::range_check, 2)]),
320+
builtin_instance_counter: BTreeMap::from([(BuiltinName::range_check, 2)]),
321321
},
322322
storage_access_tracker: StorageAccessTracker {
323323
storage_read_values: vec![value],
@@ -344,7 +344,7 @@ fn test_call_contract() {
344344
+ &ExecutionResources {
345345
n_steps: 267,
346346
n_memory_holes: 0,
347-
builtin_instance_counter: HashMap::from([(BuiltinName::range_check, 3)]),
347+
builtin_instance_counter: BTreeMap::from([(BuiltinName::range_check, 3)]),
348348
},
349349
builtin_counters: HashMap::from([(BuiltinName::range_check, 19)]),
350350
syscalls_usage: HashMap::from([(

0 commit comments

Comments
 (0)