apollo_starknet_os_program: add OsGlobalContext as a flat member of BlockContext (#10674)

Author: Yoni-Starkware

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

@@ -22,43 +22,14 @@ struct CompiledClassFactsBundle {
     deprecated_compiled_class_facts: DeprecatedCompiledClassFact*,
 }
 
-// Represents information that is the same throughout the block.
-struct BlockContext {
-    // Parameters for select_builtins.
-    builtin_params: BuiltinParams*,
-
-    // A list of (compiled_class_hash, compiled_class) with the classes that are executed
-    // in this block.
-    n_compiled_class_facts: felt,
-    compiled_class_facts: CompiledClassFact*,
-
-    // A list of (deprecated_compiled_class_hash, deprecated_compiled_class) with
-    // the classes that are executed in this block.
-    n_deprecated_compiled_class_facts: felt,
-    deprecated_compiled_class_facts: DeprecatedCompiledClassFact*,
-
-    // Information about the block.
-    block_info_for_execute: BlockInfo*,
-    // A version of `block_info` that will be returned by the 'get_execution_info'
-    // syscall during '__validate__'.
-    // Some of the fields, which cannot be used in validate mode, are zeroed out.
-    block_info_for_validate: BlockInfo*,
-    // StarknetOsConfig instance.
-    starknet_os_config: StarknetOsConfig,
-    // 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*,
-}
-
 // Holds global context for the OS execution.
 struct OsGlobalContext {
     // OS config available globally for all blocks.
-    starknet_os_config: StarknetOsConfig*,
+    starknet_os_config: StarknetOsConfig,
     starknet_os_config_hash: felt,
 
     // Compiled class facts available globally for all blocks.
-    compiled_class_facts_bundle: CompiledClassFactsBundle*,
+    compiled_class_facts_bundle: CompiledClassFactsBundle,
 
     // Parameters for select_builtins.
     builtin_params: BuiltinParams*,
@@ -68,6 +39,17 @@ struct OsGlobalContext {
     execute_deprecated_syscalls_ptr: felt*,
 }
 
+// Represents information that is the same throughout the block.
+struct BlockContext {
+    os_global_context: OsGlobalContext,
+    // Information about the block.
+    block_info_for_execute: BlockInfo*,
+    // A version of `block_info` that will be returned by the 'get_execution_info'
+    // syscall during '__validate__'.
+    // Some of the fields, which cannot be used in validate mode, are zeroed out.
+    block_info_for_validate: BlockInfo*,
+}
+
 // Returns a BlockContext instance.
 //
 // 'syscall_handler' should be passed as a hint variable.
@@ -85,11 +67,7 @@ func get_block_context{range_check_ptr}(os_global_context: OsGlobalContext*) ->
     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=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,
-        deprecated_compiled_class_facts=compiled_class_facts_bundle.deprecated_compiled_class_facts,
+        os_global_context=[os_global_context],
         block_info_for_execute=new BlockInfo(
             block_number=block_number,
             block_timestamp=block_timestamp,
@@ -100,9 +78,6 @@ func get_block_context{range_check_ptr}(os_global_context: OsGlobalContext*) ->
             block_timestamp=block_timestamp_for_validate,
             sequencer_address=0,
         ),
-        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/execution/deprecated_execute_entry_point.cairo

@@ -96,7 +96,7 @@ func call_execute_deprecated_syscalls{
     syscall_size,
     syscall_ptr: felt*,
 ) {
-    jmp abs block_context.execute_deprecated_syscalls_ptr;
+    jmp abs block_context.os_global_context.execute_deprecated_syscalls_ptr;
 }
 
 // Executes an entry point in a contract.
@@ -120,10 +120,11 @@ func deprecated_execute_entry_point{
 
     // The key must be at offset 0.
     static_assert DeprecatedCompiledClassFact.hash == 0;
+    let compiled_class_facts_bundle = block_context.os_global_context.compiled_class_facts_bundle;
     let (compiled_class_fact: DeprecatedCompiledClassFact*) = find_element(
-        array_ptr=block_context.deprecated_compiled_class_facts,
+        array_ptr=compiled_class_facts_bundle.deprecated_compiled_class_facts,
         elm_size=DeprecatedCompiledClassFact.SIZE,
-        n_elms=block_context.n_deprecated_compiled_class_facts,
+        n_elms=compiled_class_facts_bundle.n_deprecated_compiled_class_facts,
         key=execution_context.class_hash,
     );
     local compiled_class: DeprecatedCompiledClass* = compiled_class_fact.compiled_class;
@@ -155,7 +156,7 @@ func deprecated_execute_entry_point{
     assert [os_context] = cast(syscall_ptr, felt);
 
     let n_builtins = BuiltinEncodings.SIZE;
-    local builtin_params: BuiltinParams* = block_context.builtin_params;
+    local builtin_params: BuiltinParams* = block_context.os_global_context.builtin_params;
     select_builtins(
         n_builtins=n_builtins,
         all_encodings=builtin_params.builtin_encodings,

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

@@ -90,7 +90,7 @@ func call_execute_syscalls{
     revert_log: RevertLogEntry*,
     outputs: OsCarriedOutputs*,
 }(block_context: BlockContext*, execution_context: ExecutionContext*, syscall_ptr_end: felt*) {
-    jmp abs block_context.execute_syscalls_ptr;
+    jmp abs block_context.os_global_context.execute_syscalls_ptr;
 }
 
 // Returns the CompiledClassEntryPoint, based on 'compiled_class' and 'execution_context'.
@@ -163,10 +163,11 @@ func execute_entry_point{
 
     // The key must be at offset 0.
     static_assert CompiledClassFact.hash == 0;
+    let compiled_class_facts_bundle = block_context.os_global_context.compiled_class_facts_bundle;
     let (compiled_class_fact: CompiledClassFact*) = find_element(
-        array_ptr=block_context.compiled_class_facts,
+        array_ptr=compiled_class_facts_bundle.compiled_class_facts,
         elm_size=CompiledClassFact.SIZE,
-        n_elms=block_context.n_compiled_class_facts,
+        n_elms=compiled_class_facts_bundle.n_compiled_class_facts,
         key=compiled_class_hash,
     );
     local compiled_class: CompiledClass* = compiled_class_fact.compiled_class;
@@ -213,7 +214,7 @@ func execute_entry_point{
     let builtin_ptrs: BuiltinPointers* = prepare_builtin_ptrs_for_execute(builtin_ptrs);
 
     let n_builtins = BuiltinEncodings.SIZE;
-    local builtin_params: BuiltinParams* = block_context.builtin_params;
+    local builtin_params: BuiltinParams* = block_context.os_global_context.builtin_params;
     local calldata_size: felt = execution_context.calldata_size;
     local calldata_start: felt* = execution_context.calldata;
     local calldata_end: felt* = calldata_start + calldata_size;

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

@@ -337,7 +337,7 @@ func charge_fee{
     assert_nn_le(calldata.amount.low, max_fee);
 
     // TODO(ilya, 01/01/2026): Consider caching the fee_token_class_hash.
-    local fee_token_address = block_context.starknet_os_config.fee_token_address;
+    local fee_token_address = block_context.os_global_context.starknet_os_config.fee_token_address;
     let (fee_state_entry: StateEntry*) = dict_read{dict_ptr=contract_state_changes}(
         key=fee_token_address
     );
@@ -387,7 +387,7 @@ func get_account_tx_common_fields(
         tx_hash_prefix=tx_hash_prefix,
         version=3,
         sender_address=sender_address,
-        chain_id=block_context.starknet_os_config.chain_id,
+        chain_id=block_context.os_global_context.starknet_os_config.chain_id,
         nonce=nondet %{ tx.nonce %},
         tip=nondet %{ tx.tip %},
         n_resource_bounds=3,
@@ -593,7 +593,7 @@ func execute_l1_handler_transaction{
     local tx_execution_info: ExecutionInfo* = tx_execution_context.execution_info;
 
     local nonce = nondet %{ tx.nonce %};
-    local chain_id = block_context.starknet_os_config.chain_id;
+    local chain_id = block_context.os_global_context.starknet_os_config.chain_id;
 
     let pedersen_ptr = builtin_ptrs.selectable.pedersen;
     with pedersen_ptr {

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

@@ -497,9 +497,9 @@ func get_os_global_context{
         label_value=execute_deprecated_syscalls
     );
     tempvar os_global_context: OsGlobalContext* = new OsGlobalContext(
-        starknet_os_config=starknet_os_config,
+        starknet_os_config=[starknet_os_config],
         starknet_os_config_hash=starknet_os_config_hash,
-        compiled_class_facts_bundle=new CompiledClassFactsBundle(
+        compiled_class_facts_bundle=CompiledClassFactsBundle(
             n_compiled_class_facts=n_compiled_class_facts,
             compiled_class_facts=compiled_class_facts,
             builtin_costs=builtin_costs,

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,5 +1,5 @@
 {
-  "os": "0x49bd34ac72e2a7287a8acd58abc80f0fd200b15fc98b87a083b34132e9ac4e6",
+  "os": "0x4e96973924663401010103d46b585b71995195402b671b43e8ab21c8bd08105",
   "aggregator": "0x48f2eacd9ca42f9ec5ed541c48c5b4450abee50df44e9cbb5ebf7f61e87d0cc",
   "aggregator_with_prefix": "0x683eebd5b16190d5f9c73cc8b17d1498172494fa7d7bd0dc889378e01f15a98"
 }