workspace: fix merge conflicts

Resolve conflicts from merging main-v0.14.3 into main:
- Cargo.toml/lock: keep main's 0.0.0 placeholder versions.
- allowed_virtual_os_program_hashes (0_14_4.json): {v0.14.3 0x3407278, merged virtual_os 0x18b277f2}; regen constants.cairo.
- Add missing allowed_proof_versions to 0_14_4.json (silent skew from v0.14.3 struct).
- Regenerate OS hashes, bytecode lengths, bouncer gas, poseidons, proof-flow fixtures (stwo prover), example proof + 0.14.4 verifier regression case.
- Known follow-up: proof_flow_fixtures_match_genesis_block_hash (cairo-OS vs Rust genesis block hash divergence).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Yoni-Starkware

Cargo.lock

@@ -121,13 +121,7 @@ members = [
 ]
 
 [workspace.package]
-<<<<<<< HEAD
 version = "0.0.0"
-||||||| b392cf22a9
-version = "0.19.0-rc.0"
-=======
-version = "0.19.0-rc.1"
->>>>>>> origin/main-v0.14.3
 edition = "2021"
 repository = "https://github.com/starkware-libs/sequencer/"
 license = "Apache-2.0"
@@ -152,28 +146,12 @@ apollo_class_manager_types.path = "crates/apollo_class_manager_types"
 apollo_committer.path = "crates/apollo_committer"
 apollo_committer_config.path = "crates/apollo_committer_config"
 apollo_committer_types.path = "crates/apollo_committer_types"
-<<<<<<< HEAD
 apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.19.0-rc.0" }
-=======
-apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_compile_to_casm.path = "crates/apollo_compile_to_casm"
 apollo_compile_to_casm_types.path = "crates/apollo_compile_to_casm_types"
-<<<<<<< HEAD
 apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.0.0" }
 apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.0.0" }
 apollo_config = { path = "crates/apollo_config", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.19.0-rc.0" }
-apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.19.0-rc.0" }
-apollo_config = { path = "crates/apollo_config", version = "0.19.0-rc.0" }
-=======
-apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.19.0-rc.1" }
-apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.19.0-rc.1" }
-apollo_config = { path = "crates/apollo_config", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_config_manager.path = "crates/apollo_config_manager"
 apollo_config_manager_config.path = "crates/apollo_config_manager_config"
 apollo_config_manager_types.path = "crates/apollo_config_manager_types"
@@ -191,13 +169,7 @@ apollo_gateway_types.path = "crates/apollo_gateway_types"
 apollo_http_server.path = "crates/apollo_http_server"
 apollo_http_server_config.path = "crates/apollo_http_server_config"
 apollo_infra.path = "crates/apollo_infra"
-<<<<<<< HEAD
 apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.19.0-rc.0" }
-=======
-apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_integration_tests.path = "crates/apollo_integration_tests"
 apollo_l1_events.path = "crates/apollo_l1_events"
 apollo_l1_events_config.path = "crates/apollo_l1_events_config"
@@ -211,13 +183,7 @@ apollo_mempool_p2p.path = "crates/apollo_mempool_p2p"
 apollo_mempool_p2p_config.path = "crates/apollo_mempool_p2p_config"
 apollo_mempool_p2p_types.path = "crates/apollo_mempool_p2p_types"
 apollo_mempool_types.path = "crates/apollo_mempool_types"
-<<<<<<< HEAD
 apollo_metrics = { path = "crates/apollo_metrics", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_metrics = { path = "crates/apollo_metrics", version = "0.19.0-rc.0" }
-=======
-apollo_metrics = { path = "crates/apollo_metrics", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_monitoring_endpoint.path = "crates/apollo_monitoring_endpoint"
 apollo_monitoring_endpoint_config.path = "crates/apollo_monitoring_endpoint_config"
 apollo_network.path = "crates/apollo_network"
@@ -227,16 +193,8 @@ apollo_node.path = "crates/apollo_node"
 apollo_node_config.path = "crates/apollo_node_config"
 apollo_p2p_sync.path = "crates/apollo_p2p_sync"
 apollo_p2p_sync_config.path = "crates/apollo_p2p_sync_config"
-<<<<<<< HEAD
 apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.0.0" }
 apollo_proc_macros_lib = { path = "crates/apollo_proc_macros_lib", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.19.0-rc.0" }
-apollo_proc_macros_lib = { path = "crates/apollo_proc_macros_lib", version = "0.19.0-rc.0" }
-=======
-apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.19.0-rc.1" }
-apollo_proc_macros_lib = { path = "crates/apollo_proc_macros_lib", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_proc_macros_tests.path = "crates/apollo_proc_macros_tests"
 apollo_proof_manager.path = "crates/apollo_proof_manager"
 apollo_proof_manager_config.path = "crates/apollo_proof_manager_config"
@@ -249,26 +207,12 @@ apollo_rpc_execution.path = "crates/apollo_rpc_execution"
 apollo_sierra_compilation_config.path = "crates/apollo_sierra_compilation_config"
 apollo_signature_manager.path = "crates/apollo_signature_manager"
 apollo_signature_manager_types.path = "crates/apollo_signature_manager_types"
-<<<<<<< HEAD
 apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.0.0" }
 apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.19.0-rc.0" }
-apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.19.0-rc.0" }
-=======
-apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.19.0-rc.1" }
-apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_staking.path = "crates/apollo_staking"
 apollo_staking_config.path = "crates/apollo_staking_config"
 apollo_starknet_client.path = "crates/apollo_starknet_client"
-<<<<<<< HEAD
 apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.19.0-rc.0" }
-=======
-apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_state_reader.path = "crates/apollo_state_reader"
 apollo_state_sync.path = "crates/apollo_state_sync"
 apollo_state_sync_config.path = "crates/apollo_state_sync_config"
@@ -277,13 +221,7 @@ apollo_state_sync_types.path = "crates/apollo_state_sync_types"
 apollo_storage.path = "crates/apollo_storage"
 apollo_task_executor.path = "crates/apollo_task_executor"
 apollo_test_utils.path = "crates/apollo_test_utils"
-<<<<<<< HEAD
 apollo_time = { path = "crates/apollo_time", version = "0.0.0" }
-||||||| b392cf22a9
-apollo_time = { path = "crates/apollo_time", version = "0.19.0-rc.0" }
-=======
-apollo_time = { path = "crates/apollo_time", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 apollo_transaction_converter.path = "crates/apollo_transaction_converter"
 apollo_versioned_constants.path = "crates/apollo_versioned_constants"
 ark-bls12-381 = "0.5.0"
@@ -305,21 +243,9 @@ bhttp = "0.7"
 bincode = "1.3.3"
 bitvec = "1.0.1"
 blake2 = "0.10.6"
-<<<<<<< HEAD
 blockifier = { path = "crates/blockifier", version = "0.0.0" }
-||||||| b392cf22a9
-blockifier = { path = "crates/blockifier", version = "0.19.0-rc.0" }
-=======
-blockifier = { path = "crates/blockifier", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 blockifier_reexecution.path = "crates/blockifier_reexecution"
-<<<<<<< HEAD
 blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.0.0" }
-||||||| b392cf22a9
-blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.19.0-rc.0" }
-=======
-blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 byteorder = "1.4.3"
 bytes = "1"
 bzip2 = { version = "0.5.0", default-features = false }
@@ -451,27 +377,15 @@ starknet-ff = "0.3.7"
 starknet-rust = "0.17.0"
 starknet-rust-core = "0.16.0"
 starknet-types-core = "0.2.4"
-<<<<<<< HEAD
 starknet_api = { path = "crates/starknet_api", version = "0.0.0" }
-||||||| b392cf22a9
-starknet_api = { path = "crates/starknet_api", version = "0.19.0-rc.0" }
-=======
-starknet_api = { path = "crates/starknet_api", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 starknet_committer.path = "crates/starknet_committer"
 starknet_committer_and_os_cli.path = "crates/starknet_committer_and_os_cli"
 starknet_committer_cli.path = "crates/starknet_committer_cli"
 starknet_os.path = "crates/starknet_os"
 starknet_os_flow_tests.path = "crates/starknet_os_flow_tests"
 starknet_patricia.path = "crates/starknet_patricia"
 starknet_patricia_storage.path = "crates/starknet_patricia_storage"
-<<<<<<< HEAD
 starknet_proof_verifier = { path = "crates/starknet_proof_verifier", version = "0.0.0" }
-||||||| b392cf22a9
-starknet_proof_verifier = { path = "crates/starknet_proof_verifier", version = "0.19.0-rc.0" }
-=======
-starknet_proof_verifier = { path = "crates/starknet_proof_verifier", version = "0.19.0-rc.1" }
->>>>>>> origin/main-v0.14.3
 starknet_transaction_prover.path = "crates/starknet_transaction_prover"
 static_assertions = "1.1.0"
 strum = "0.27.2"

Cargo.toml

@@ -14,9 +14,9 @@
     ]
   },
   {
-    "big_storage_key": "proofs/2423937516222001646661741181647152765517884388953635986164148712285196226589",
+    "big_storage_key": "proofs/1039365555973299029729621356494800053437026278662329467550515332650289452626",
     "proof_facts": [
-      "0x50524f4f4630",
+      "0x50524f4f4631",
       "0x5649525455414c5f534e4f53",
       "0x1",
       "0x5649525455414c5f534e4f5330",

crates/apollo_gateway/resources/proof_facts_big_storage_keys.json

@@ -1,18 +1,10 @@
 [
   "0x50524f4f4631",
   "0x5649525455414c5f534e4f53",
-  "0x3407278ca9b0b286f26f83750dd476af19491da55691e93269792e5aed503f0",
+  "0x18b277f22918f093cd200673128c74d932fcd984b31cf7c80b6ecdd0f1f5ce0",
   "0x5649525455414c5f534e4f5330",
   "0x0",
-<<<<<<< HEAD
-  "0x3e76bfb500b664e8ced09fadf31d5700227cdd44c708a31b1134b7939d1cd9b",
-  "0x3fa93be2c305b519d654f327f920769b3c4020ea5f96548e3ab8a4dda7acade",
-||||||| b392cf22a9
-  "0x16bcf42661609d3e6095235597f329fa8e35bf79082997a40149fdb2ef6975a",
-  "0x1ad2c853941f7f8abefca26097b05c0dfdf62626254533a118936a9939397f8",
-=======
-  "0x3abe9bf84386186c934bd977b04e9ffc20cc5f4660b418e9d3315fe70b4dd4d",
-  "0x49a02886df904a120ce081cb0d3262214adda6f5d158b5dca4eb51c74048bcd",
->>>>>>> origin/main-v0.14.3
+  "0x77e0824d52e968e2422059f9d08dcde2843c0fbfd3c1bbdb567e01313666867",
+  "0x46e8308dbaf22b918b0555a8d5cdde82fbfdc36bdb32c547aa3de2f42e2e861",
   "0x0"
 ]

crates/apollo_integration_tests/resources/proof_flow/proof.bin

@@ -382,13 +382,7 @@ fn initialize_papyrus_test_state(
 /// `cargo +nightly-2025-07-14 test -p starknet_os_flow_tests --features
 /// starknet_transaction_prover/stwo_proving --release generate_proof_fixtures -- --ignored`.
 pub const EXPECTED_PROOF_FLOW_GENESIS_GLOBAL_ROOT: Expect =
-<<<<<<< HEAD
-    expect!["0x3016bfaeed7f65d42466c0c216ad9d9da23d7152ec746be3db8b627c0b7446b"];
-||||||| b392cf22a9
-    expect!["0x7d9c165e57cf22a07e90cf2a7aefdfde8d4a0caa977c898968fce3e9b4763b2"];
-=======
-    expect!["0x1f494e26800f29ed05504531c6591aea214c6e64f3ea2fcf9d896060fd141e7"];
->>>>>>> origin/main-v0.14.3
+    expect!["0x666a2f8531136a0ec2c57389f2495c5f873560ea789e3543c77415e021c1210"];
 
 pub fn integration_test_genesis_global_root() -> GlobalRoot {
     GlobalRoot(Felt::from_hex_unchecked(EXPECTED_PROOF_FLOW_GENESIS_GLOBAL_ROOT.data()))

crates/apollo_integration_tests/resources/proof_flow/proof_facts.json

@@ -68,22 +68,10 @@ const STORED_BLOCK_HASH_BUFFER = 10;
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0 = (
     0x03407278ca9b0b286f26f83750dd476af19491da55691e93269792e5aed503f0
 );
-<<<<<<< HEAD
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1 = (
-    0x06ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2
-);
-const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2 = (
-    0x065f41fa333ab7a6f65b5259a0b6fba24a912ba937652faba34c93f71bb1c00a
-);
-const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 3;
-||||||| b392cf22a9
-const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1 = (
-    0x06ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2
+    0x018b277f22918f093cd200673128c74d932fcd984b31cf7c80b6ecdd0f1f5ce0
 );
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 2;
-=======
-const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 1;
->>>>>>> origin/main-v0.14.3
 
 // Gas constants.
 

crates/apollo_integration_tests/src/state_reader.rs

@@ -5,13 +5,7 @@ from starkware.cairo.common.dict_access import DictAccess
 from starkware.cairo.common.math import assert_le, assert_nn_le, assert_not_zero
 from starkware.starknet.core.os.constants import (
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0,
-<<<<<<< HEAD
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1,
-    ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2,
-||||||| b392cf22a9
-    ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1,
-=======
->>>>>>> origin/main-v0.14.3
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN,
     STORED_BLOCK_HASH_BUFFER,
 )
@@ -30,19 +24,9 @@ func check_is_reverted(is_reverted: felt) {
 
 // Returns TRUE if the given virtual OS program hash is allowed, FALSE otherwise.
 func is_program_hash_allowed(program_hash: felt) -> felt {
-<<<<<<< HEAD
-    static_assert ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN == 3;
-    if ((program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0) *
-        (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1) *
-        (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2) == 0) {
-||||||| b392cf22a9
     static_assert ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN == 2;
     if ((program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0) *
         (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1) == 0) {
-=======
-    static_assert ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN == 1;
-    if (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0 == 0) {
->>>>>>> origin/main-v0.14.3
         return TRUE;
     }
     return FALSE;

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

@@ -1,14 +1,6 @@
 {
-<<<<<<< HEAD
-  "os": "0x2c0f1c7ff190c6efb9f586bbbf7575b982e0391e2ddf03ca919b72d8be5e2f3",
-  "virtual_os": "0x65f41fa333ab7a6f65b5259a0b6fba24a912ba937652faba34c93f71bb1c00a",
-||||||| b392cf22a9
-  "os": "0x783b9a9b8e6204534cd82ea7a594892bff6c44e0cc7cbbc09698e9c66ec9784",
-  "virtual_os": "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
-=======
-  "os": "0x6ca9b5d60ffa6def2406636ed2f20644a04c41114b3121bfb72e1eef29d02a3",
-  "virtual_os": "0x3407278ca9b0b286f26f83750dd476af19491da55691e93269792e5aed503f0",
->>>>>>> origin/main-v0.14.3
+  "os": "0x724e734c7ba51a61634f7e4aaf3c7efe71e09da59de328326dd07697b71aad6",
+  "virtual_os": "0x18b277f22918f093cd200673128c74d932fcd984b31cf7c80b6ecdd0f1f5ce0",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"
 }

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

@@ -19,23 +19,11 @@ fn test_virtual_os_swapped_files() {
 #[test]
 fn test_program_bytecode_lengths() {
     expect![[r#"
-<<<<<<< HEAD
-        16399
-||||||| b392cf22a9
-        16392
-=======
-        16367
->>>>>>> origin/main-v0.14.3
+        16374
     "#]]
     .assert_debug_eq(&OS_PROGRAM.data_len());
     expect![[r#"
-<<<<<<< HEAD
-        11447
-||||||| b392cf22a9
-        11443
-=======
-        11426
->>>>>>> origin/main-v0.14.3
+        11430
     "#]]
     .assert_debug_eq(&VIRTUAL_OS_PROGRAM.data_len());
 }