apollo_starknet_os_program: fix blake program hash calcuation (#12452)

Author: avi-starkware

Cargo.lock

@@ -66,7 +66,7 @@ const STORED_BLOCK_HASH_BUFFER = 10;
 
 // Allowed virtual OS program hashes for client-side proving.
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0 = (
-    0x07be1eac4e70041bf0bf257c7637e5aad6cdaa5592989f7d5e6d8c0533cf4a4c
+    0x06972cfa5c07f702981678547574e239a24ad8bb53cc081ad738ccb10839fd1a
 );
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 1;
 

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

@@ -1,6 +1,6 @@
 {
-  "os": "0x221e3c8fe84ea158c77a9ce2af5fbd9fd89882ea0e8f170c367ca475266bae6",
-  "virtual_os": "0x7be1eac4e70041bf0bf257c7637e5aad6cdaa5592989f7d5e6d8c0533cf4a4c",
+  "os": "0x6b7d04178224185274857ed833d776c184bd4b43aae7471157a50a3036d3e9c",
+  "virtual_os": "0x6972cfa5c07f702981678547574e239a24ad8bb53cc081ad738ccb10839fd1a",
   "aggregator": "0x4a50066445fdceb87b7ed1211dbff1f544ad4fa879a678a79355ed812dea346",
   "aggregator_with_prefix": "0x5af6c0904619be30798f335358f96ba742a8f23c7b0df1080d0c24e2224c6f6"
 }

crates/apollo_starknet_os_program/src/program_hash.json

@@ -49,14 +49,34 @@ fn compute_program_hash(program: &Program) -> Result<Felt, ProgramHashError> {
 }
 
 /// Computes the program hash using Blake2s.
+/// Hashes the full program header (bootloader_version, main, n_builtins, builtins) followed by
+/// program data, matching the bootloader's Cairo implementation.
+// TODO(Avi): Move this function to cairo_vm and share logic with compute_program_hash_chain.
 pub fn compute_program_hash_blake(program: &Program) -> Result<Felt, ProgramHashError> {
     let stripped_program = program.get_stripped_program()?;
+
+    let builtin_list: Vec<Felt> = stripped_program
+        .builtins
+        .iter()
+        .map(|b| Felt::from_bytes_be_slice(b.to_str().as_bytes()))
+        .collect();
+
+    let program_header = vec![
+        Felt::from(BOOTLOADER_VERSION),
+        Felt::from(stripped_program.main),
+        Felt::from(stripped_program.builtins.len()),
+    ];
+
     let program_data: Vec<Felt> = stripped_program
         .data
         .iter()
         .map(|entry| entry.get_int_ref().copied().expect("Program data must contain felts."))
         .collect();
-    Ok(Blake2Felt252::encode_felt252_data_and_calc_blake_hash(&program_data))
+
+    let data_chain: Vec<Felt> =
+        program_header.into_iter().chain(builtin_list).chain(program_data).collect();
+
+    Ok(Blake2Felt252::encode_felt252_data_and_calc_blake_hash(&data_chain))
 }
 
 pub fn compute_os_program_hash() -> Result<Felt, ProgramHashError> {

crates/apollo_starknet_os_program/src/program_hash.rs

@@ -67,7 +67,7 @@
     "segment_arena_cells": false,
     "os_constants": {
         "allowed_virtual_os_program_hashes": [
-            "0x7be1eac4e70041bf0bf257c7637e5aad6cdaa5592989f7d5e6d8c0533cf4a4c"
+            "0x6972cfa5c07f702981678547574e239a24ad8bb53cc081ad738ccb10839fd1a"
         ],
         "constructor_entry_point_selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194",
         "default_entry_point_selector": "0x0",

crates/blockifier/resources/blockifier_versioned_constants_0_14_2.json

@@ -1,5 +1,5 @@
 ~ /archival_data_gas_costs/gas_per_proof/0: 1000000000
 ~ /enable_casm_hash_migration: false
 ~ /gateway/max_proof_size: 600000
-+ /os_constants/allowed_virtual_os_program_hashes/0: "0x7be1eac4e70041bf0bf257c7637e5aad6cdaa5592989f7d5e6d8c0533cf4a4c"
++ /os_constants/allowed_virtual_os_program_hashes/0: "0x6972cfa5c07f702981678547574e239a24ad8bb53cc081ad738ccb10839fd1a"
 ~ /os_constants/builtin_gas_costs/blake: 3334

crates/blockifier/resources/versioned_constants_diff_regression/0.14.1_0.14.2.txt

@@ -43,7 +43,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 url.workspace = true
 
 [dev-dependencies]
-apollo_starknet_os_program.workspace = true
 blockifier = { workspace = true, features = ["testing"] }
 blockifier_test_utils.workspace = true
 rstest.workspace = true

crates/starknet_os_runner/Cargo.toml

@@ -1,11 +1,12 @@
 use std::fs;
 
-use apollo_starknet_os_program::program_hash::compute_program_hash_blake;
 use apollo_transaction_converter::proof_verification::stwo_verify;
 use apollo_transaction_converter::transaction_converter::BOOTLOADER_PROGRAM_HASH;
 use apollo_transaction_converter::ProgramOutput;
 use cairo_vm::types::program::Program;
 use cairo_vm::vm::runners::cairo_pie::CairoPie;
+use starknet_types_core::felt::Felt;
+use starknet_types_core::hash::Blake2Felt252;
 
 use crate::proving::prover::{prove, resolve_resource_path, BOOTLOADER_FILE};
 
@@ -64,8 +65,11 @@ fn test_simple_bootloader_program_hash_matches_expected() {
     let program_bytes = fs::read(&bootloader_path).expect("Failed to read bootloader file");
     let program =
         Program::from_bytes(&program_bytes, Some("main")).expect("Failed to load bootloader");
-    let program_hash =
-        compute_program_hash_blake(&program).expect("Failed to compute program hash");
+    let program_data: Vec<Felt> = program
+        .iter_data()
+        .map(|entry| entry.get_int_ref().copied().expect("Program data must contain felts."))
+        .collect();
+    let program_hash = Blake2Felt252::encode_felt252_data_and_calc_blake_hash(&program_data);
     assert_eq!(
         program_hash, BOOTLOADER_PROGRAM_HASH,
         "Bootloader program hash does not match expected"