apollo_starknet_os_program: define and use OsGlobalContext (#10666)

Author: Yoni-Starkware

crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/block_context.cairo

@@ -17,6 +17,7 @@ from starkware.starknet.core.os.os_config.os_config import StarknetOsConfig
 struct CompiledClassFactsBundle {
     n_compiled_class_facts: felt,
     compiled_class_facts: CompiledClassFact*,
+    builtin_costs: felt*,
     n_deprecated_compiled_class_facts: felt,
     deprecated_compiled_class_facts: DeprecatedCompiledClassFact*,
 }
@@ -50,17 +51,30 @@ struct BlockContext {
     execute_deprecated_syscalls_ptr: felt*,
 }
 
-// Returns a BlockContext instance.
-//
-// 'syscall_handler' and 'block_input' should be passed as hint variables.
-func get_block_context{range_check_ptr}(
+// Holds global context for the OS execution.
+struct OsGlobalContext {
+    // OS config available globally for all blocks.
+    starknet_os_config: StarknetOsConfig*,
+    starknet_os_config_hash: felt,
+
+    // Compiled class facts available globally for all blocks.
+    compiled_class_facts_bundle: CompiledClassFactsBundle*,
+
+    // Parameters for select_builtins.
+    builtin_params: BuiltinParams*,
+    // A function pointer to the 'execute_syscalls' function.
     execute_syscalls_ptr: felt*,
+    // A function pointer to the 'execute_deprecated_syscalls' function.
     execute_deprecated_syscalls_ptr: felt*,
-    compiled_class_facts_bundle: CompiledClassFactsBundle*,
-    starknet_os_config: StarknetOsConfig*,
-) -> (block_context: BlockContext*) {
+}
+
+// Returns a BlockContext instance.
+//
+// 'syscall_handler' should be passed as a hint variable.
+func get_block_context{range_check_ptr}(os_global_context: OsGlobalContext*) -> (
+    block_context: BlockContext*
+) {
     alloc_locals;
-    let (builtin_params) = get_builtin_params();
     tempvar block_number = nondet %{ syscall_handler.block_info.block_number %};
     tempvar block_timestamp = nondet %{ syscall_handler.block_info.block_timestamp %};
     let (divided_block_number, _) = unsigned_div_rem(block_number, VALIDATE_BLOCK_NUMBER_ROUNDING);
@@ -69,8 +83,9 @@ func get_block_context{range_check_ptr}(
         block_timestamp, VALIDATE_TIMESTAMP_ROUNDING
     );
     tempvar block_timestamp_for_validate = divided_block_timestamp * VALIDATE_TIMESTAMP_ROUNDING;
+    let compiled_class_facts_bundle = os_global_context.compiled_class_facts_bundle;
     local block_context: BlockContext = BlockContext(
-        builtin_params=builtin_params,
+        builtin_params=os_global_context.builtin_params,
         n_compiled_class_facts=compiled_class_facts_bundle.n_compiled_class_facts,
         compiled_class_facts=compiled_class_facts_bundle.compiled_class_facts,
         n_deprecated_compiled_class_facts=compiled_class_facts_bundle.n_deprecated_compiled_class_facts,
@@ -85,9 +100,9 @@ func get_block_context{range_check_ptr}(
             block_timestamp=block_timestamp_for_validate,
             sequencer_address=0,
         ),
-        starknet_os_config=[starknet_os_config],
-        execute_syscalls_ptr=execute_syscalls_ptr,
-        execute_deprecated_syscalls_ptr=execute_deprecated_syscalls_ptr,
+        starknet_os_config=[os_global_context.starknet_os_config],
+        execute_syscalls_ptr=os_global_context.execute_syscalls_ptr,
+        execute_deprecated_syscalls_ptr=os_global_context.execute_deprecated_syscalls_ptr,
     );
 
     let (__fp__, _) = get_fp_and_pc();

crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/builtins.cairo

@@ -72,7 +72,7 @@ struct BuiltinParams {
 static_assert SelectableBuiltins.SIZE == BuiltinEncodings.SIZE;
 static_assert SelectableBuiltins.SIZE == BuiltinInstanceSizes.SIZE;
 
-func get_builtin_params() -> (builtin_params: BuiltinParams*) {
+func get_builtin_params() -> BuiltinParams* {
     alloc_locals;
     let (local __fp__, _) = get_fp_and_pc();
 
@@ -105,7 +105,7 @@ func get_builtin_params() -> (builtin_params: BuiltinParams*) {
     local builtin_params: BuiltinParams = BuiltinParams(
         builtin_encodings=&builtin_encodings, builtin_instance_sizes=&builtin_instance_sizes
     );
-    return (builtin_params=&builtin_params);
+    return &builtin_params;
 }
 
 // Updates the builtins listed in `selected_encodings` (the "selected" builtins) in `builtin_ptrs`

crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/os.cairo

@@ -22,8 +22,10 @@ from starkware.starknet.core.aggregator.combine_blocks import combine_blocks
 from starkware.starknet.core.os.block_context import (
     BlockContext,
     CompiledClassFactsBundle,
+    OsGlobalContext,
     get_block_context,
 )
+from starkware.starknet.core.os.builtins import get_builtin_params
 from starkware.starknet.core.os.constants import (
     BLOCK_HASH_CONTRACT_ADDRESS,
     STORED_BLOCK_HASH_BUFFER,
@@ -94,56 +96,38 @@ func main{
     let initial_range_check_ptr = range_check_ptr;
     let range_check_ptr = range_check_ptr + 1;
 
-    local n_blocks = nondet %{ len(os_input.block_inputs) %};
-
-    let (
-        local n_compiled_class_facts, local compiled_class_facts, local builtin_costs
-    ) = guess_compiled_class_facts();
+    local public_keys: felt*;
+    local n_public_keys: felt;
+    %{ fill_public_keys_array(os_hints['public_keys'], public_keys, n_public_keys) %}
 
-    let (
-        local n_deprecated_compiled_class_facts, deprecated_compiled_class_facts
-    ) = deprecated_load_compiled_class_facts();
+    // Build OS global context.
+    let os_global_context = get_os_global_context(
+        n_public_keys=n_public_keys, public_keys=public_keys
+    );
 
+    // Execute blocks.
+    local n_blocks = nondet %{ len(os_input.block_inputs) %};
     let (local os_outputs: OsOutput*) = alloc();
     %{
         from starkware.starknet.core.os.execution_helper import StateUpdatePointers
         state_update_pointers = StateUpdatePointers(segments=segments)
     %}
-    local compiled_class_facts_bundle: CompiledClassFactsBundle* = new CompiledClassFactsBundle(
-        n_compiled_class_facts=n_compiled_class_facts,
-        compiled_class_facts=compiled_class_facts,
-        n_deprecated_compiled_class_facts=n_deprecated_compiled_class_facts,
-        deprecated_compiled_class_facts=deprecated_compiled_class_facts,
-    );
-
-    local public_keys: felt*;
-    local n_public_keys: felt;
-    %{ fill_public_keys_array(os_hints['public_keys'], public_keys, n_public_keys) %}
-    let (public_keys_hash) = get_public_keys_hash{hash_ptr=pedersen_ptr}(
-        n_public_keys=n_public_keys, public_keys=public_keys
-    );
-    local starknet_os_config: StarknetOsConfig* = new StarknetOsConfig(
-        chain_id=nondet %{ os_hints_config.starknet_os_config.chain_id %},
-        fee_token_address=nondet %{ os_hints_config.starknet_os_config.fee_token_address %},
-        public_keys_hash=public_keys_hash,
-    );
-
     local initial_txs_range_check_ptr = nondet %{ segments.add_temp_segment() %};
     let txs_range_check_ptr = initial_txs_range_check_ptr;
     with txs_range_check_ptr {
         execute_blocks(
             n_blocks=n_blocks,
             os_output_per_block_dst=os_outputs,
-            compiled_class_facts_bundle=compiled_class_facts_bundle,
-            starknet_os_config=starknet_os_config,
+            os_global_context=os_global_context,
         );
     }
 
     // Validate the guessed compile class facts.
+    let compiled_class_facts_bundle = os_global_context.compiled_class_facts_bundle;
     validate_compiled_class_facts_post_execution(
         n_compiled_class_facts=compiled_class_facts_bundle.n_compiled_class_facts,
         compiled_class_facts=compiled_class_facts_bundle.compiled_class_facts,
-        builtin_costs=builtin_costs,
+        builtin_costs=compiled_class_facts_bundle.builtin_costs,
     );
 
     // Guess whether to use KZG commitment scheme and whether to output the full state.
@@ -245,12 +229,7 @@ func execute_blocks{
     add_mod_ptr: ModBuiltin*,
     mul_mod_ptr: ModBuiltin*,
     txs_range_check_ptr,
-}(
-    n_blocks: felt,
-    os_output_per_block_dst: OsOutput*,
-    compiled_class_facts_bundle: CompiledClassFactsBundle*,
-    starknet_os_config: StarknetOsConfig*,
-) {
+}(n_blocks: felt, os_output_per_block_dst: OsOutput*, os_global_context: OsGlobalContext*) {
     %{ print(f"execute_blocks: {ids.n_blocks} blocks remaining.") %}
     if (n_blocks == 0) {
         return ();
@@ -284,17 +263,7 @@ func execute_blocks{
     let contract_class_changes_start = contract_class_changes;
 
     // Build block context.
-    let (execute_syscalls_ptr) = get_label_location(label_value=execute_syscalls);
-    let (execute_deprecated_syscalls_ptr) = get_label_location(
-        label_value=execute_deprecated_syscalls
-    );
-
-    let (block_context: BlockContext*) = get_block_context(
-        execute_syscalls_ptr=execute_syscalls_ptr,
-        execute_deprecated_syscalls_ptr=execute_deprecated_syscalls_ptr,
-        compiled_class_facts_bundle=compiled_class_facts_bundle,
-        starknet_os_config=starknet_os_config,
-    );
+    let (block_context: BlockContext*) = get_block_context(os_global_context=os_global_context);
 
     // Pre-process block.
     with contract_state_changes {
@@ -342,17 +311,6 @@ func execute_blocks{
 
     %{ vm_exit_scope() %}
 
-    // Compute the general config hash.
-    // This is done here to avoid passing pedersen_ptr to serialize_output_header.
-    let hash_ptr = pedersen_ptr;
-    with hash_ptr {
-        let (starknet_os_config_hash) = get_starknet_os_config_hash(
-            starknet_os_config=&block_context.starknet_os_config
-        );
-    }
-
-    let pedersen_ptr = hash_ptr;
-
     // All blocks inside of a multi block should be off-chain and therefore
     // should not be compressed.
     assert os_output_per_block_dst[0] = OsOutput(
@@ -363,7 +321,7 @@ func execute_blocks{
             prev_block_hash=nondet %{ block_input.prev_block_hash %},
             new_block_hash=nondet %{ block_input.new_block_hash %},
             os_program_hash=0,
-            starknet_os_config_hash=starknet_os_config_hash,
+            starknet_os_config_hash=os_global_context.starknet_os_config_hash,
             use_kzg_da=FALSE,
             full_output=TRUE,
         ),
@@ -375,8 +333,7 @@ func execute_blocks{
     return execute_blocks(
         n_blocks=n_blocks - 1,
         os_output_per_block_dst=&os_output_per_block_dst[1],
-        compiled_class_facts_bundle=compiled_class_facts_bundle,
-        starknet_os_config=starknet_os_config,
+        os_global_context=os_global_context,
     );
 }
 
@@ -499,3 +456,52 @@ func migrate_classes_to_v2_casm_hash{
     migrate_classes_to_v2_casm_hash(n_classes=n_classes - 1, block_context=block_context);
     return ();
 }
+
+// Returns an OsGlobalContext instance.
+//
+// Note: the compiled class facts are guessed here, and must be validated post-execution.
+func get_os_global_context{
+    pedersen_ptr: HashBuiltin*, range_check_ptr, poseidon_ptr: PoseidonBuiltin*
+}(n_public_keys: felt, public_keys: felt*) -> OsGlobalContext* {
+    alloc_locals;
+    // Compiled class facts bundle.
+    let (n_compiled_class_facts, compiled_class_facts, builtin_costs) = guess_compiled_class_facts(
+        );
+    let (
+        n_deprecated_compiled_class_facts, deprecated_compiled_class_facts
+    ) = deprecated_load_compiled_class_facts();
+
+    // Starknet OS config.
+    let (public_keys_hash) = get_public_keys_hash{hash_ptr=pedersen_ptr}(
+        n_public_keys=n_public_keys, public_keys=public_keys
+    );
+    tempvar starknet_os_config = new StarknetOsConfig(
+        chain_id=nondet %{ os_hints_config.starknet_os_config.chain_id %},
+        fee_token_address=nondet %{ os_hints_config.starknet_os_config.fee_token_address %},
+        public_keys_hash=public_keys_hash,
+    );
+    let (starknet_os_config_hash) = get_starknet_os_config_hash{hash_ptr=pedersen_ptr}(
+        starknet_os_config=starknet_os_config
+    );
+
+    // Function pointers.
+    let (execute_syscalls_ptr) = get_label_location(label_value=execute_syscalls);
+    let (execute_deprecated_syscalls_ptr) = get_label_location(
+        label_value=execute_deprecated_syscalls
+    );
+    tempvar os_global_context: OsGlobalContext* = new OsGlobalContext(
+        starknet_os_config=starknet_os_config,
+        starknet_os_config_hash=starknet_os_config_hash,
+        compiled_class_facts_bundle=new CompiledClassFactsBundle(
+            n_compiled_class_facts=n_compiled_class_facts,
+            compiled_class_facts=compiled_class_facts,
+            builtin_costs=builtin_costs,
+            n_deprecated_compiled_class_facts=n_deprecated_compiled_class_facts,
+            deprecated_compiled_class_facts=deprecated_compiled_class_facts,
+        ),
+        builtin_params=get_builtin_params(),
+        execute_syscalls_ptr=execute_syscalls_ptr,
+        execute_deprecated_syscalls_ptr=execute_deprecated_syscalls_ptr,
+    );
+    return os_global_context;
+}

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,5 +1,5 @@
 {
-  "os": "0x1f116bf592157589d5d2c79176d708a6340861db822635032840804250a557",
+  "os": "0x4d27b51144962502babd7b1f2e5e4f78363f96044874fdd4c75d5064cb4e8c2",
   "aggregator": "0x267b62790ec5ca1b3f8889835a87808086a2c385abc62e562c3a7910a37d313",
   "aggregator_with_prefix": "0x1780e4ffea136af2dd609b5399a7d73dd42432fd00ea9c2da146ac5269efb70"
 }

crates/starknet_os/src/hints/enum_definition.rs

@@ -600,7 +600,7 @@ vm_enter_scope(dict(
     (
         SegmentsAddTemp,
         segments_add_temp,
-        indoc! {r#"memory[fp + 12] = to_felt_or_relocatable(segments.add_temp_segment())"#
+        indoc! {r#"memory[fp + 5] = to_felt_or_relocatable(segments.add_temp_segment())"#
         }
     ),
     (
@@ -1114,7 +1114,7 @@ define_hint_enum!(
     (
         WriteUseKzgDaToMemory,
         write_use_kzg_da_to_memory,
-        indoc! {r#"memory[fp + 24] = to_felt_or_relocatable(os_hints_config.use_kzg_da and (
+        indoc! {r#"memory[fp + 17] = to_felt_or_relocatable(os_hints_config.use_kzg_da and (
     not os_hints_config.full_output
 ))"#}
     ),
@@ -1607,7 +1607,7 @@ ids.contract_class_component_hashes = segments.gen_arg(class_component_hashes)"#
     (
         GetBlocksNumber,
         get_n_blocks,
-        r#"memory[fp + 0] = to_felt_or_relocatable(len(os_input.block_inputs))"#
+        r#"memory[fp + 3] = to_felt_or_relocatable(len(os_input.block_inputs))"#
     ),
     (
         GetNClassHashesToMigrate,
@@ -1617,7 +1617,7 @@ ids.contract_class_component_hashes = segments.gen_arg(class_component_hashes)"#
     (
         WriteFullOutputToMemory,
         write_full_output_to_memory,
-        indoc! {r#"memory[fp + 25] = to_felt_or_relocatable(os_hints_config.full_output)"#}
+        indoc! {r#"memory[fp + 18] = to_felt_or_relocatable(os_hints_config.full_output)"#}
     ),
     (
         ConfigureKzgManager,

crates/starknet_os/src/hints/nondet_offsets.rs

@@ -21,12 +21,12 @@ pub(crate) static NONDET_FP_OFFSETS: LazyLock<HashMap<AllHints, usize>> = LazyLo
     HashMap::from([
         (AllHints::OsHint(OsHint::OsInputTransactions), 12),
         (AllHints::OsHint(OsHint::ReadAliasFromKey), 0),
-        (AllHints::StatelessHint(StatelessHint::SegmentsAddTemp), 12),
+        (AllHints::StatelessHint(StatelessHint::SegmentsAddTemp), 5),
         (AllHints::OsHint(OsHint::SetFpPlus4ToTxNonce), 4),
-        (AllHints::OsHint(OsHint::GetBlocksNumber), 0),
+        (AllHints::OsHint(OsHint::GetBlocksNumber), 3),
         (AllHints::OsHint(OsHint::TxAccountDeploymentDataLen), 4),
-        (AllHints::OsHint(OsHint::WriteFullOutputToMemory), 25),
-        (AllHints::OsHint(OsHint::WriteUseKzgDaToMemory), 24),
+        (AllHints::OsHint(OsHint::WriteFullOutputToMemory), 18),
+        (AllHints::OsHint(OsHint::WriteUseKzgDaToMemory), 17),
     ])
 });