chore(starknet_os): iterate classes in ascending order (#6386)

Author: nimrod-starkware

crates/starknet_os/src/hint_processor/snos_hint_processor.rs

@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 #[cfg(feature = "testing")]
 use std::collections::HashSet;
 
@@ -97,8 +98,8 @@ pub struct SnosHintProcessor<'a, S: StateReader> {
     pub(crate) execution_helpers_manager: ExecutionHelpersManager<'a, S>,
     pub(crate) os_hints_config: OsHintsConfig,
     pub syscall_hint_processor: SyscallHintProcessor,
-    pub(crate) deprecated_compiled_classes: HashMap<ClassHash, ContractClass>,
-    pub(crate) compiled_classes: HashMap<ClassHash, CasmContractClass>,
+    pub(crate) deprecated_compiled_classes: BTreeMap<ClassHash, ContractClass>,
+    pub(crate) compiled_classes: BTreeMap<ClassHash, CasmContractClass>,
     pub(crate) state_update_pointers: Option<StateUpdatePointers>,
     pub(crate) deprecated_syscall_hint_processor: DeprecatedSyscallHintProcessor,
     builtin_hint_processor: BuiltinHintProcessor,
@@ -121,8 +122,8 @@ impl<'a, S: StateReader> SnosHintProcessor<'a, S> {
         os_hints_config: OsHintsConfig,
         os_block_inputs: Vec<&'a OsBlockInput>,
         cached_state_inputs: Vec<CachedStateInput>,
-        deprecated_compiled_classes: HashMap<ClassHash, ContractClass>,
-        compiled_classes: HashMap<ClassHash, CasmContractClass>,
+        deprecated_compiled_classes: BTreeMap<ClassHash, ContractClass>,
+        compiled_classes: BTreeMap<ClassHash, CasmContractClass>,
         state_readers: Vec<S>,
         syscall_hint_processor: SyscallHintProcessor,
         deprecated_syscall_hint_processor: DeprecatedSyscallHintProcessor,
@@ -289,8 +290,8 @@ impl<'a> SnosHintProcessor<'a, DictStateReader> {
             os_hints_config,
             block_inputs,
             state_inputs,
-            HashMap::new(), // deprecated_compiled_classes.
-            HashMap::new(), // compiled_classes.
+            BTreeMap::new(),
+            BTreeMap::new(),
             vec![state_reader],
             syscall_handler,
             deprecated_syscall_handler,

crates/starknet_os/src/hints/enum_definition.rs

@@ -577,7 +577,7 @@ define_hint_enum!(
         compiled_hash: create_bytecode_segment_structure(
             bytecode=compiled_class.bytecode,
             bytecode_segment_lengths=compiled_class.bytecode_segment_lengths,
-        ) for compiled_hash, compiled_class in os_input.compiled_classes.items()
+        ) for compiled_hash, compiled_class in sorted(os_input.compiled_classes.items())
     }
     bytecode_segment_access_oracle = BytecodeAccessOracle(is_pc_accessed_callback=is_accessed)
     vm_enter_scope({
@@ -760,7 +760,7 @@ else:
     __deprecated_class_hashes=set(os_input.deprecated_compiled_classes.keys())
     ids.n_compiled_class_facts = len(os_input.deprecated_compiled_classes)
     vm_enter_scope({
-        'compiled_class_facts': iter(os_input.deprecated_compiled_classes.items()),
+        'compiled_class_facts': iter(sorted(os_input.deprecated_compiled_classes.items())),
     })"##
         }
     ),
@@ -1849,9 +1849,9 @@ define_hint_extension_enum!(
     )
 
     ids.n_compiled_class_facts = len(os_input.compiled_classes)
-    ids.compiled_class_facts = (compiled_class_facts_end := segments.add())
+    ids.compiled_class_facts = segments.add()
     for i, (compiled_class_hash, compiled_class) in enumerate(
-        os_input.compiled_classes.items()
+        sorted(os_input.compiled_classes.items())
     ):
         # Load the compiled class.
         cairo_contract = get_compiled_class_struct(

crates/starknet_os/src/hints/hint_implementation/compiled_class/implementation.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 
 use blockifier::state::state_api::StateReader;
 use cairo_vm::any_box;
@@ -52,7 +52,7 @@ pub(crate) fn assert_end_of_bytecode_segments<S: StateReader>(
 pub(crate) fn bytecode_segment_structure<S: StateReader>(
     HintArgs { hint_processor, exec_scopes, ids_data, ap_tracking, vm, .. }: HintArgs<'_, '_, S>,
 ) -> OsHintResult {
-    let bytecode_segment_structures: &HashMap<ClassHash, BytecodeSegmentNode> =
+    let bytecode_segment_structures: &BTreeMap<ClassHash, BytecodeSegmentNode> =
         exec_scopes.get_ref(Scope::BytecodeSegmentStructures.into())?;
 
     let class_hash_address = get_address_of_nested_fields(
@@ -148,7 +148,7 @@ pub(crate) fn set_ap_to_segment_hash<S: StateReader>(
 pub(crate) fn validate_compiled_class_facts_post_execution<S: StateReader>(
     HintArgs { hint_processor, exec_scopes, .. }: HintArgs<'_, '_, S>,
 ) -> OsHintResult {
-    let mut bytecode_segment_structures = HashMap::new();
+    let mut bytecode_segment_structures = BTreeMap::new();
     for (compiled_hash, compiled_class) in hint_processor.compiled_classes.iter() {
         bytecode_segment_structures.insert(
             *compiled_hash,

crates/starknet_os/src/io/os_input.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use serde::Serialize;
@@ -79,8 +79,8 @@ pub struct OsHints {
 pub struct StarknetOsInput {
     pub os_block_inputs: Vec<OsBlockInput>,
     pub cached_state_inputs: Vec<CachedStateInput>,
-    pub(crate) deprecated_compiled_classes: HashMap<ClassHash, ContractClass>,
-    pub(crate) compiled_classes: HashMap<ClassHash, CasmContractClass>,
+    pub(crate) deprecated_compiled_classes: BTreeMap<ClassHash, ContractClass>,
+    pub(crate) compiled_classes: BTreeMap<ClassHash, CasmContractClass>,
 }
 
 // TODO(Meshi): Remove Once the blockifier ChainInfo do not support deprecated fee token.