starknet_os: remove public key hash and add public key to os hints config

Author: einat-starkware

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

@@ -57,6 +57,7 @@ func get_block_context{range_check_ptr}(
     execute_syscalls_ptr: felt*,
     execute_deprecated_syscalls_ptr: felt*,
     compiled_class_facts_bundle: CompiledClassFactsBundle*,
+    public_key_hash: felt,
 ) -> (block_context: BlockContext*) {
     alloc_locals;
     let (builtin_params) = get_builtin_params();
@@ -87,7 +88,7 @@ func get_block_context{range_check_ptr}(
         starknet_os_config=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_key_hash=nondet %{ os_hints_config.starknet_os_config.public_key_hash %},
+            public_key_hash=public_key_hash,
         ),
         execute_syscalls_ptr=execute_syscalls_ptr,
         execute_deprecated_syscalls_ptr=execute_deprecated_syscalls_ptr,

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

@@ -284,6 +284,7 @@ func execute_blocks{
         execute_syscalls_ptr=execute_syscalls_ptr,
         execute_deprecated_syscalls_ptr=execute_deprecated_syscalls_ptr,
         compiled_class_facts_bundle=compiled_class_facts_bundle,
+        public_key_hash=public_key_hash,
     );
 
     // Pre-process block.
@@ -343,7 +344,6 @@ func execute_blocks{
     }
 
     let pedersen_ptr = hash_ptr;
-    assert public_key_hash = block_context.starknet_os_config.public_key_hash;
 
     // All blocks inside of a multi block should be off-chain and therefore
     // should not be compressed.

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,5 +1,5 @@
 {
-  "os": "0x755f467f5f44c7b656ce24695938d8b0e7529d85074a67395bf55bd3b7037c5",
+  "os": "0x5945b60fb72e40cab6ebfd9cf7dd9e71276d706eeadc09004c3d7b5f1c574f2",
   "aggregator": "0x36894c1d2bdad67c9c924a4f0e13b795d2e529e0a53ffefad847749cd082216",
   "aggregator_with_prefix": "0x61fcd2f0365f1238d264da99f0ac264a6b7f7e1932eee061bb2977a0b74b1fc"
 }

crates/starknet_os/src/hint_processor/snos_hint_processor.rs

@@ -137,8 +137,6 @@ pub struct SnosHintProcessor<'a, S: StateReader> {
     da_segment: Option<Vec<Felt>>,
     // Indicates wether to create pages or not when serializing data-availability.
     pub(crate) serialize_data_availability_create_pages: bool,
-    pub(crate) public_key_x: Felt,
-    pub(crate) public_key_y: Felt,
     // For testing, track hint coverage.
     #[cfg(any(test, feature = "testing"))]
     pub unused_hints: HashSet<AllHints>,
@@ -154,8 +152,6 @@ impl<'a, S: StateReader> SnosHintProcessor<'a, S> {
         deprecated_compiled_classes: BTreeMap<CompiledClassHash, ContractClass>,
         compiled_classes: BTreeMap<CompiledClassHash, CasmContractClass>,
         state_readers: Vec<S>,
-        public_key_x: Felt,
-        public_key_y: Felt,
     ) -> Result<Self, StarknetOsError> {
         if state_readers.len() != os_block_inputs.len() {
             return Err(OsInputError::InvalidLengthOfStateReaders(
@@ -189,8 +185,6 @@ impl<'a, S: StateReader> SnosHintProcessor<'a, S> {
             state_update_pointers: None,
             commitment_type: CommitmentType::State,
             serialize_data_availability_create_pages: false,
-            public_key_x,
-            public_key_y,
             #[cfg(any(test, feature = "testing"))]
             unused_hints: AllHints::all_iter().collect(),
         })
@@ -355,8 +349,6 @@ impl<'a> SnosHintProcessor<'a, DictStateReader> {
             BTreeMap::new(),
             BTreeMap::new(),
             vec![state_reader],
-            Felt::from(0),
-            Felt::from(0),
         )?;
         hint_processor.execution_helpers_manager.increment_current_helper_index();
         Ok(hint_processor)

crates/starknet_os/src/hints/enum_definition.rs

@@ -35,7 +35,6 @@ use crate::hints::hint_implementation::block_context::{
     chain_id,
     fee_token_address,
     get_block_mapping,
-    public_key_hash,
     sequencer_address,
     write_use_kzg_da_to_memory,
 };
@@ -141,8 +140,8 @@ use crate::hints::hint_implementation::os::{
     create_block_additional_hints,
     get_n_blocks,
     get_n_class_hashes_to_migrate,
-    get_public_key_x_from_os_input,
-    get_public_key_y_from_os_input,
+    get_public_key_x_in_os,
+    get_public_key_y_in_os,
     init_state_update_pointer,
     initialize_class_hashes,
     initialize_state_changes,
@@ -1086,11 +1085,6 @@ define_hint_enum!(
         fee_token_address,
         "memory[ap] = to_felt_or_relocatable(os_hints_config.starknet_os_config.fee_token_address)"
     ),
-    (
-        PublicKeyHash,
-        public_key_hash,
-        "memory[ap] = to_felt_or_relocatable(os_hints_config.starknet_os_config.public_key_hash)"
-    ),
     (
         SequencerAddress,
         sequencer_address,
@@ -1859,13 +1853,13 @@ block_input = next(block_input_iterator)
 )"#}
     ),
     (
-        GetPublicKeyXFromOsInput,
-        get_public_key_x_from_os_input,
+        GetPublicKeyXInOs,
+        get_public_key_x_in_os,
         r#"memory[ap] = to_felt_or_relocatable(os_input.public_key_x)"#
     ),
     (
-        GetPublicKeyYFromOsInput,
-        get_public_key_y_from_os_input,
+        GetPublicKeyYInOs,
+        get_public_key_y_in_os,
         r#"memory[ap] = to_felt_or_relocatable(os_input.public_key_y)"#
     ),
 );

crates/starknet_os/src/hints/hint_implementation/block_context.rs

@@ -77,11 +77,3 @@ pub(crate) fn write_use_kzg_da_to_memory<S: StateReader>(
         Felt::from(use_kzg_da),
     )
 }
-
-pub(crate) fn public_key_hash<S: StateReader>(
-    hint_processor: &mut SnosHintProcessor<'_, S>,
-    HintArgs { vm, .. }: HintArgs<'_>,
-) -> OsHintResult {
-    let public_key_hash = hint_processor.os_hints_config.public_key_hash;
-    Ok(insert_value_into_ap(vm, public_key_hash)?)
-}

crates/starknet_os/src/hints/hint_implementation/os.rs

@@ -151,18 +151,18 @@ pub(crate) fn create_block_additional_hints<S: StateReader>(
     Ok(())
 }
 
-pub(crate) fn get_public_key_x_from_os_input<S: StateReader>(
+pub(crate) fn get_public_key_x_in_os<S: StateReader>(
     hint_processor: &mut SnosHintProcessor<'_, S>,
     HintArgs { vm, .. }: HintArgs<'_>,
 ) -> OsHintResult {
-    let public_key_x = hint_processor.public_key_x;
+    let public_key_x = hint_processor.os_hints_config.public_key_x;
     Ok(insert_value_into_ap(vm, public_key_x)?)
 }
 
-pub(crate) fn get_public_key_y_from_os_input<S: StateReader>(
+pub(crate) fn get_public_key_y_in_os<S: StateReader>(
     hint_processor: &mut SnosHintProcessor<'_, S>,
     HintArgs { vm, .. }: HintArgs<'_>,
 ) -> OsHintResult {
-    let public_key_y = hint_processor.public_key_y;
+    let public_key_y = hint_processor.os_hints_config.public_key_y;
     Ok(insert_value_into_ap(vm, public_key_y)?)
 }

crates/starknet_os/src/io/os_input.rs

@@ -60,8 +60,6 @@ pub struct StarknetOsInput {
     pub cached_state_inputs: Vec<CachedStateInput>,
     pub(crate) deprecated_compiled_classes: BTreeMap<CompiledClassHash, ContractClass>,
     pub(crate) compiled_classes: BTreeMap<CompiledClassHash, CasmContractClass>,
-    pub(crate) public_key_x: Felt,
-    pub(crate) public_key_y: Felt,
 }
 
 // TODO(Meshi): Remove Once the blockifier ChainInfo do not support deprecated fee token.
@@ -120,7 +118,8 @@ pub struct OsHintsConfig {
     pub full_output: bool,
     pub use_kzg_da: bool,
     pub chain_info: OsChainInfo,
-    pub public_key_hash: Felt,
+    pub public_key_x: Felt,
+    pub public_key_y: Felt,
 }
 
 impl OsHintsConfig {

crates/starknet_os/src/runner.rs

@@ -99,8 +99,6 @@ pub fn run_os<S: StateReader>(
                 cached_state_inputs,
                 deprecated_compiled_classes,
                 compiled_classes,
-                public_key_x,
-                public_key_y,
             },
     }: OsHints,
     state_readers: Vec<S>,
@@ -114,8 +112,6 @@ pub fn run_os<S: StateReader>(
         deprecated_compiled_classes,
         compiled_classes,
         state_readers,
-        public_key_x,
-        public_key_y,
     )?;
 
     let mut runner_output = run_program(layout, &OS_PROGRAM, &mut snos_hint_processor)?;