workspace: fix merge conflicts

Resolve conflicts from merging main-v0.14.3 into main:
- Cargo.lock: take incoming (circuits 618db0a, hashbrown 0.17.1).
- apollo_consensus_orchestrator gas-price test: combine the SNIP-35 const
  rename (#14220) with the rand 0.10 API change (#14194).
- blockifier stack-trace fixture: drop the SierraGas VM-frame pc line,
  consistent with strip_vm_frames_in_sierra_gas at v0.14.3+ (#14251).
- blockifier_versioned_constants_0_14_4.json: add the required
  strip_vm_frames_in_sierra_gas field. Silent merge skew: the file was added
  by #14237 before #14251 made the field mandatory.
- proof_flow/proof.bin: regenerated under the v0.14.3 verifier (618db0a);
  verified by proof_flow_fixtures_verify and proof_flow_program_hash_is_allowed.
- central_systest_blobs generation: kept at 26; the cende blob must be
  regenerated+uploaded for the merged content (UPDATE_EXPECT needs GCS creds).

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

Author: nimrod-starkware

Cargo.lock

@@ -228,16 +228,8 @@ fn test_honest_proposer_always_passes_validation_fuzzed() {
         let fee_actual_value = rng.random_range(1u128..1_000_000_000_000_000_000);
         let strk_usd_rate = rng.random_range(1u128..2 * 10u128.pow(18));
         let fee_actual = GasPrice(fee_actual_value);
-<<<<<<< HEAD
-        let target = compute_fee_target(TARGET_ATTO_USD_PER_L2_GAS, strk_usd_rate);
-        let oracle_result = if rng.random_bool(0.1) { None } else { target };
-||||||| 4ce21e5639
-        let target = compute_fee_target(TARGET_ATTO_USD_PER_L2_GAS, strk_usd_rate);
-        let oracle_result = if rng.gen_bool(0.1) { None } else { target };
-=======
         let target = compute_fee_target(DEFAULT_SNIP35_TARGET_ATTO_USD_PER_L2_GAS, strk_usd_rate);
-        let oracle_result = if rng.gen_bool(0.1) { None } else { target };
->>>>>>> origin/main-v0.14.3
+        let oracle_result = if rng.random_bool(0.1) { None } else { target };
         let proposal = compute_fee_proposal(oracle_result, fee_actual, margin_ppt);
         assert!(
             validator_accepts(fee_actual, proposal, margin_ppt),

crates/apollo_consensus_orchestrator/src/dynamic_gas_price/test.rs

@@ -121,6 +121,7 @@
     "enable_reverts": true,
     "enable_casm_hash_migration": true,
     "block_casm_hash_v1_declares": true,
+    "strip_vm_frames_in_sierra_gas": true,
     "min_sierra_version_for_sierra_gas": "1.7.0",
     "enable_tip": true,
     "segment_arena_cells": false,

crates/apollo_integration_tests/resources/proof_flow/proof.bin

@@ -1,12 +1,6 @@
 Transaction execution has failed:
 0: Error in the called contract (contract address: 0x00000000000000000000000000000000000000000000000000000000c0020000, class hash: 0x0000000000000000000000000000000000000000000000000000000080020000, selector: 0x015d40a3d6ca2ac30f4031e42be28da9b056fef9bb7357ac5e85627ee876e5ad):
 1: Error in the called contract (contract address: 0x00000000000000000000000000000000000000000000000000000000c0020000, class hash: 0x0000000000000000000000000000000000000000000000000000000080020000, selector: 0x02730079d734ee55315f4f141eaed376bddd8c2133523d223a344c5604e0f7f8):
-<<<<<<< HEAD
-Error at pc=0:818:
-||||||| 4ce21e5639
-Error at pc=0:797:
-=======
->>>>>>> origin/main-v0.14.3
 2: Error in the contract class constructor (contract address: 0x0103ee82605273496eed8d9141c5b3ad967baa08be63aa5bc49ffae5eae454cc, class hash: 0x0000000000000000000000000000000000000000000000000000000080040000, selector: 0x028ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194):
 Execution failed. Failure reason:
 Error in contract (contract address: 0x0103ee82605273496eed8d9141c5b3ad967baa08be63aa5bc49ffae5eae454cc, class hash: 0x0000000000000000000000000000000000000000000000000000000080040000, selector: 0x028ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194):

crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json

@@ -1,7 +1 @@
-<<<<<<< HEAD
-26
-||||||| 4ce21e5639
-24
-=======
-25
->>>>>>> origin/main-v0.14.3
+26