apollo_starknet_os_program: output the sender address (virtual OS) (#11491)

Author: Yoni-Starkware

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

@@ -19,6 +19,9 @@ from starkware.starknet.core.os.os_config.os_config import StarknetOsConfig
 // This mode should be disabled in the Starknet sequencer.
 struct VirtualOsConfig {
     enabled: felt,
+    // The address of the account authorized to run transactions in virtual OS mode.
+    // All the transactions in the block must be sent by this account.
+    authorized_account_address: felt,
 }
 
 // Struct to group compiled class facts parameters.
@@ -37,7 +40,7 @@ struct OsGlobalContext {
     starknet_os_config_hash: felt,
 
     // Configuration for the virtual OS.
-    virtual_os_config: VirtualOsConfig,
+    virtual_os_config: VirtualOsConfig*,
 
     // Compiled class facts available globally for all blocks.
     compiled_class_facts_bundle: CompiledClassFactsBundle,

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

@@ -65,7 +65,11 @@ from starkware.starknet.core.os.execution.execute_transaction_utils import (
     run_validate,
     update_class_hash_in_execution_context,
 )
-from starkware.starknet.core.os.execution.execution_constraints import check_n_txs, check_tx_type
+from starkware.starknet.core.os.execution.execution_constraints import (
+    check_n_txs,
+    check_sender_address,
+    check_tx_type,
+)
 from starkware.starknet.core.os.execution.revert import init_revert_log
 from starkware.starknet.core.os.output import (
     MessageToL2Header,
@@ -212,29 +216,38 @@ func execute_transactions_inner{
 
     check_tx_type(tx_type=tx_type);
 
+    local sender_address: felt;
     if (tx_type == 'INVOKE_FUNCTION') {
         // Handle the invoke-function transaction.
-        execute_invoke_function_transaction(block_context=block_context);
-        %{ ExitTx %}
-        return execute_transactions_inner(block_context=block_context, n_txs=n_txs - 1);
-    }
-    if (tx_type == 'L1_HANDLER') {
-        // Handle the L1-handler transaction.
-        execute_l1_handler_transaction(block_context=block_context);
+        let (tx_sender_address) = execute_invoke_function_transaction(block_context=block_context);
         %{ ExitTx %}
-        return execute_transactions_inner(block_context=block_context, n_txs=n_txs - 1);
-    }
-    if (tx_type == 'DEPLOY_ACCOUNT') {
-        // Handle the deploy-account transaction.
-        execute_deploy_account_transaction(block_context=block_context);
-        %{ ExitTx %}
-        return execute_transactions_inner(block_context=block_context, n_txs=n_txs - 1);
+        assert sender_address = tx_sender_address;
+    } else {
+        if (tx_type == 'L1_HANDLER') {
+            // Handle the L1-handler transaction.
+            let (tx_sender_address) = execute_l1_handler_transaction(block_context=block_context);
+            %{ ExitTx %}
+            assert sender_address = tx_sender_address;
+        } else {
+            if (tx_type == 'DEPLOY_ACCOUNT') {
+                // Handle the deploy-account transaction.
+                let (tx_sender_address) = execute_deploy_account_transaction(
+                    block_context=block_context
+                );
+                %{ ExitTx %}
+                assert sender_address = tx_sender_address;
+            } else {
+                assert tx_type = 'DECLARE';
+                // Handle the declare transaction.
+                let (tx_sender_address) = execute_declare_transaction(block_context=block_context);
+                %{ ExitTx %}
+                assert sender_address = tx_sender_address;
+            }
+        }
     }
 
-    assert tx_type = 'DECLARE';
-    // Handle the declare transaction.
-    execute_declare_transaction(block_context=block_context);
-    %{ ExitTx %}
+    check_sender_address(sender_address=sender_address, block_context=block_context);
+
     return execute_transactions_inner(block_context=block_context, n_txs=n_txs - 1);
 }
 
@@ -408,13 +421,16 @@ func fill_account_tx_info{range_check_ptr}(
 //
 // Arguments:
 // block_context - a global context that is fixed throughout the block.
+//
+// Returns:
+// sender_address - the address of the transaction sender.
 func execute_invoke_function_transaction{
     range_check_ptr,
     builtin_ptrs: BuiltinPointers*,
     contract_state_changes: DictAccess*,
     contract_class_changes: DictAccess*,
     outputs: OsCarriedOutputs*,
-}(block_context: BlockContext*) {
+}(block_context: BlockContext*) -> (sender_address: felt) {
     alloc_locals;
 
     // TODO(Yoni): consider not sharing this code with L1 handler.
@@ -424,13 +440,14 @@ func execute_invoke_function_transaction{
         entry_point_selector=EXECUTE_ENTRY_POINT_SELECTOR,
     );
     local tx_execution_info: ExecutionInfo* = tx_execution_context.execution_info;
+    let sender_address = tx_execution_info.contract_address;
 
     // Guess transaction fields.
     // The version validation is done in `compute_invoke_transaction_hash()`.
     let common_tx_fields = get_account_tx_common_fields(
         block_context=block_context,
         tx_hash_prefix=INVOKE_HASH_PREFIX,
-        sender_address=tx_execution_info.contract_address,
+        sender_address=sender_address,
     );
     local account_deployment_data_size;
     local account_deployment_data: felt*;
@@ -513,7 +530,7 @@ func execute_invoke_function_transaction{
 
     %{ EndTx %}
 
-    return ();
+    return (sender_address=sender_address);
 }
 
 // Executes an L1-handler transaction.
@@ -528,7 +545,7 @@ func execute_l1_handler_transaction{
     contract_state_changes: DictAccess*,
     contract_class_changes: DictAccess*,
     outputs: OsCarriedOutputs*,
-}(block_context: BlockContext*) {
+}(block_context: BlockContext*) -> (sender_address: felt) {
     alloc_locals;
 
     %{ StartTx %}
@@ -537,7 +554,7 @@ func execute_l1_handler_transaction{
     // Skip the execution step for reverted transaction.
     if (is_reverted != FALSE) {
         %{ EndTx %}
-        return ();
+        return (sender_address=0);
     }
 
     // TODO(Yoni): currently, the contract state is not fetched for reverted L1 handlers.
@@ -599,7 +616,7 @@ func execute_l1_handler_transaction{
     );
 
     %{ EndTx %}
-    return ();
+    return (sender_address=0);
 }
 
 // Guess the execution context of an invoke transaction (either invoke function or L1 handler).
@@ -718,13 +735,15 @@ func prepare_constructor_execution_context{range_check_ptr, builtin_ptrs: Builti
     );
 }
 
+// Returns:
+// sender_address - the address of the transaction sender.
 func execute_deploy_account_transaction{
     range_check_ptr,
     builtin_ptrs: BuiltinPointers*,
     contract_state_changes: DictAccess*,
     contract_class_changes: DictAccess*,
     outputs: OsCarriedOutputs*,
-}(block_context: BlockContext*) {
+}(block_context: BlockContext*) -> (sender_address: felt) {
     alloc_locals;
 
     // Calculate address and prepare constructor execution context.
@@ -838,23 +857,25 @@ func execute_deploy_account_transaction{
     charge_fee(block_context=block_context, tx_execution_context=validate_deploy_execution_context);
 
     %{ EndTx %}
-    return ();
+    return (sender_address=sender_address);
 }
 
+// Returns:
+// sender_address - the address of the transaction sender.
 func execute_declare_transaction{
     range_check_ptr,
     builtin_ptrs: BuiltinPointers*,
     contract_state_changes: DictAccess*,
     contract_class_changes: DictAccess*,
     outputs: OsCarriedOutputs*,
-}(block_context: BlockContext*) {
+}(block_context: BlockContext*) -> (sender_address: felt) {
     alloc_locals;
 
     local tx_version;
     %{ TxVersion %}
     if (tx_version == 0) {
         %{ SkipTx %}
-        return ();
+        return (sender_address=0);
     }
 
     // Guess transaction fields.
@@ -922,7 +943,7 @@ func execute_declare_transaction{
                 key=[class_hash_ptr], prev_value=0, new_value=compiled_class_hash
             );
             %{ SkipTx %}
-            return ();
+            return (sender_address=sender_address);
         }
     }
 
@@ -975,5 +996,5 @@ func execute_declare_transaction{
     );
     %{ EndTx %}
 
-    return ();
+    return (sender_address=sender_address);
 }

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

@@ -1,10 +1,16 @@
 // Execution constraints for transaction execution.
 // These are no-op implementations for the Sequencer OS.
 
+from starkware.starknet.core.os.block_context import BlockContext
+
 func check_n_txs(n_txs: felt) {
     return ();
 }
 
 func check_tx_type(tx_type: felt) {
     return ();
 }
+
+func check_sender_address(sender_address: felt, block_context: BlockContext*) {
+    return ();
+}

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

@@ -1,5 +1,7 @@
 // Execution constraints for transaction execution (virtual OS version).
 
+from starkware.starknet.core.os.block_context import BlockContext
+
 // Checks that the number of transactions is one.
 func check_n_txs(n_txs: felt) {
     with_attr error_message("Expected exactly one transaction") {
@@ -15,3 +17,12 @@ func check_tx_type(tx_type: felt) {
     }
     return ();
 }
+
+// Checks that the sender address matches the authorized account address.
+func check_sender_address(sender_address: felt, block_context: BlockContext*) {
+    let virtual_os_config = block_context.os_global_context.virtual_os_config;
+    with_attr error_message("Sender address does not match authorized account address") {
+        assert virtual_os_config.authorized_account_address = sender_address;
+    }
+    return ();
+}

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

@@ -128,6 +128,7 @@ func main{
         os_outputs=os_outputs,
         n_public_keys=n_public_keys,
         public_keys=public_keys,
+        os_global_context=os_global_context,
     );
 
     // The following code deals with the problem that untrusted code (contract code) could

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

@@ -147,7 +147,13 @@ func get_block_os_output_header{poseidon_ptr: PoseidonBuiltin*}(
 // Processes OS outputs by combining blocks and serializing the result.
 func process_os_output{
     output_ptr: felt*, range_check_ptr, ec_op_ptr: EcOpBuiltin*, poseidon_ptr: PoseidonBuiltin*
-}(n_blocks: felt, os_outputs: OsOutput*, n_public_keys: felt, public_keys: felt*) {
+}(
+    n_blocks: felt,
+    os_outputs: OsOutput*,
+    n_public_keys: felt,
+    public_keys: felt*,
+    os_global_context: OsGlobalContext*,
+) {
     alloc_locals;
     // Guess whether to use KZG commitment scheme and whether to output the full state.
     // TODO(meshi): Once use_kzg_da field is used in the OS for the computation of fees and block
@@ -181,7 +187,9 @@ func process_os_output{
 }
 
 // Returns the virtual OS config, which is always disabled in the Starknet sequencer OS.
-func get_virtual_os_config() -> VirtualOsConfig {
-    let virtual_os_config = VirtualOsConfig(enabled=FALSE);
+func get_virtual_os_config() -> VirtualOsConfig* {
+    tempvar virtual_os_config: VirtualOsConfig* = new VirtualOsConfig(
+        enabled=FALSE, authorized_account_address=0
+    );
     return virtual_os_config;
 }

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

@@ -1,3 +1,4 @@
+from starkware.cairo.common.alloc import alloc
 from starkware.cairo.common.bool import FALSE, TRUE
 from starkware.cairo.common.cairo_builtins import EcOpBuiltin, PoseidonBuiltin
 from starkware.cairo.common.dict_access import DictAccess
@@ -51,7 +52,13 @@ func get_block_os_output_header{poseidon_ptr: PoseidonBuiltin*}(
 // Outputs the virtual OS header and the messages to L1.
 func process_os_output{
     output_ptr: felt*, range_check_ptr, ec_op_ptr: EcOpBuiltin*, poseidon_ptr: PoseidonBuiltin*
-}(n_blocks: felt, os_outputs: OsOutput*, n_public_keys: felt, public_keys: felt*) {
+}(
+    n_blocks: felt,
+    os_outputs: OsOutput*,
+    n_public_keys: felt,
+    public_keys: felt*,
+    os_global_context: OsGlobalContext*,
+) {
     alloc_locals;
     assert n_public_keys = 0;
 
@@ -65,7 +72,7 @@ func process_os_output{
     serialize_word(header.prev_block_number);
     serialize_word(header.prev_block_hash);
     serialize_word(header.starknet_os_config_hash);
-    // TODO(Yoni): output the authorized account address.
+    serialize_word(os_global_context.virtual_os_config.authorized_account_address);
 
     // TODO(Yoni): output the hash of the messages instead.
     let messages_to_l1_segment_size = (
@@ -85,7 +92,10 @@ func process_os_output{
 }
 
 // Returns the virtual OS config.
-func get_virtual_os_config() -> VirtualOsConfig {
-    let virtual_os_config = VirtualOsConfig(enabled=TRUE);
+func get_virtual_os_config() -> VirtualOsConfig* {
+    let (virtual_os_config: VirtualOsConfig*) = alloc();
+    static_assert VirtualOsConfig.SIZE == 2;
+    assert virtual_os_config.enabled = TRUE;
+    // The authorized account address will be set during transaction execution.
     return virtual_os_config;
 }

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,6 +1,6 @@
 {
-  "os": "0x78179950037794503935395abfcc7446fbdee452d388a9cc047ef7201bc2278",
-  "virtual_os": "0x6c33b6ac546a56d5f79fe7367a3c4ec550ba8bf627d97f5cfe0f6a6cf120e5c",
+  "os": "0x7edaf9251ec7a175fe40f6831b301938db479ff67a3c817dc44ad1443188d52",
+  "virtual_os": "0x3d95cf00f1d15c2dea45a3a0fbceda2560789b68283ed0480d9a6028d4ba84d",
   "aggregator": "0x63868c8dbf389119d95bae88b80043f5d237d3ddec072fb8f2095fcfacb9b1c",
   "aggregator_with_prefix": "0xd892fd2fd978d8c2749a6678457ca99161f3d1822e4c3b8c03914817c6de1a"
 }

crates/apollo_starknet_os_program/src/virtual_os_test.rs

@@ -16,11 +16,11 @@ fn test_virtual_os_swapped_files() {
 #[test]
 fn test_program_bytecode_lengths() {
     expect![[r#"
-        15535
+        15555
     "#]]
     .assert_debug_eq(&OS_PROGRAM.data_len());
     expect![[r#"
-        13184
+        13209
     "#]]
     .assert_debug_eq(&VIRTUAL_OS_PROGRAM.data_len());
 }

crates/starknet_os/src/io/virtual_os_output.rs

@@ -1,5 +1,6 @@
 use cairo_vm::vm::runners::cairo_pie::CairoPie;
 use starknet_api::block::BlockNumber;
+use starknet_api::core::ContractAddress;
 use starknet_api::hash::StarkHash;
 use starknet_api::transaction::MessageToL1;
 use starknet_types_core::felt::Felt;
@@ -21,6 +22,8 @@ pub struct VirtualOsOutput {
     pub base_block_hash: StarkHash,
     /// The hash of the Starknet OS config.
     pub starknet_os_config_hash: StarkHash,
+    /// The address of the authorized account.
+    pub authorized_account_address: ContractAddress,
     /// Messages from L2 to L1.
     pub messages_to_l1: Vec<MessageToL1>,
 }
@@ -34,6 +37,8 @@ impl VirtualOsOutput {
         let base_block_number = BlockNumber(wrap_missing_as(iter.next(), "base_block_number")?);
         let base_block_hash = wrap_missing(iter.next(), "base_block_hash")?;
         let starknet_os_config_hash = wrap_missing(iter.next(), "starknet_os_config_hash")?;
+        let authorized_account_address =
+            wrap_missing_as(iter.next(), "authorized_account_address")?;
         let messages_to_l1 = parse_messages_to_l1(&mut iter)?;
 
         // Verify that we have consumed all output.
@@ -46,6 +51,7 @@ impl VirtualOsOutput {
             base_block_number,
             base_block_hash,
             starknet_os_config_hash,
+            authorized_account_address,
             messages_to_l1,
         })
     }