Merge main-v0.14.3 into main

Cargo.toml

@@ -121,7 +121,13 @@ 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"
@@ -146,12 +152,28 @@ 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"
@@ -169,7 +191,13 @@ 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"
@@ -183,7 +211,13 @@ 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"
@@ -193,8 +227,16 @@ 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"
@@ -207,12 +249,26 @@ 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"
@@ -221,7 +277,13 @@ 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"
@@ -243,22 +305,34 @@ 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 }
 c-kzg = "2.1.5"
 cached = "0.44.0"
 cairo-air = "1.1.0"
 cairo-felt = "0.9.1"
-cairo-lang-casm = "2.19.0-rc.0"
-cairo-lang-runner = "2.19.0-rc.0"
-cairo-lang-sierra = "2.19.0-rc.0"
-cairo-lang-sierra-to-casm = "2.19.0-rc.0"
-cairo-lang-starknet-classes = "2.19.0-rc.0"
-cairo-lang-utils = "2.19.0-rc.0"
+cairo-lang-casm = "2.19.0-rc.2"
+cairo-lang-runner = "2.19.0-rc.2"
+cairo-lang-sierra = "2.19.0-rc.2"
+cairo-lang-sierra-to-casm = "2.19.0-rc.2"
+cairo-lang-starknet-classes = "2.19.0-rc.2"
+cairo-lang-utils = "2.19.0-rc.2"
 cairo-native = "0.9.0-rc.7"
 cairo-program-runner-lib = "1.1.0"
 cairo-vm = "3.2.0"
@@ -334,9 +408,9 @@ paste = "1.0.15"
 phf = "0.11"
 pretty_assertions = "1.4.0"
 primitive-types = "0.12.1"
-privacy-circuit-verify-v0 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", rev = "580135e" }
-privacy-circuit-verify-v1 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3-rc-1" }
-privacy-prove = { git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3-rc-1" }
+privacy-circuit-verify-v0 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", rev = "18f6cac" }
+privacy-circuit-verify-v1 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3" }
+privacy-prove = { git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3" }
 proc-macro2 = "1.0"
 prometheus-parse = "0.2.4"
 prost = "0.12.1"
@@ -378,15 +452,27 @@ 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"

crates/apollo_compile_to_casm/src/allowed_libfuncs.json

@@ -199,9 +199,21 @@
         "sha256_process_block_syscall": null,
         "sha256_state_handle_digest": null,
         "sha256_state_handle_init": null,
-        "sha512_process_block_syscall": null,
-        "sha512_state_handle_digest": null,
-        "sha512_state_handle_init": null,
+        "sha512_process_block_syscall": {
+            "major": 1,
+            "minor": 9,
+            "patch": 0
+        },
+        "sha512_state_handle_digest": {
+            "major": 1,
+            "minor": 9,
+            "patch": 0
+        },
+        "sha512_state_handle_init": {
+            "major": 1,
+            "minor": 9,
+            "patch": 0
+        },
         "snapshot_take": null,
         "span_from_tuple": null,
         "squashed_felt252_dict_entries": {

crates/apollo_compile_to_casm_types/src/test.rs

@@ -22,14 +22,17 @@ fn test_size_of_serialized() {
 
 #[test]
 fn compact_serialization() {
-    const EXPECTED: &str = "{\"V1\":[{\"bytecode\":[\"0x1\",\"0x1\",\"0x1\"],\"compiler_version\":\
-                            \"\",\"entry_points_by_type\":{\"CONSTRUCTOR\":[],\"EXTERNAL\":[],\"\
-                            L1_HANDLER\":[]},\"hints\":[],\"prime\":\"0x0\"},\"1.8.0\"]}";
+    let sierra_version = format!("{}", SierraVersion::LATEST);
+    let expected = format!(
+        "{{\"V1\":[{{\"bytecode\":[\"0x1\",\"0x1\",\"0x1\"],\"compiler_version\":\"\",\"\
+         entry_points_by_type\":{{\"CONSTRUCTOR\":[],\"EXTERNAL\":[],\"L1_HANDLER\":[]}},\"hints\"\
+         :[],\"prime\":\"0x0\"}},\"{sierra_version}\"]}}"
+    );
     let raw_executable_class = RawExecutableClass::test_casm_contract_class();
     let serialized = serde_json::to_string(&raw_executable_class.0).unwrap();
 
-    assert_eq!(serialized, EXPECTED);
-    assert_eq!(raw_executable_class.size().unwrap(), EXPECTED.len());
+    assert_eq!(serialized, expected);
+    assert_eq!(raw_executable_class.size().unwrap(), expected.len());
 }
 
 #[test]

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context_test.rs

@@ -745,6 +745,55 @@ async fn decision_reached_sends_correct_values() {
         .assert_eq(&metrics, VersionedConstants::latest_constants().min_gas_price.0);
 }
 
+// The blob's `parent_proposal_commitment` must bind the parent block's `fee_proposal_fri`, which
+// is read from `fee_proposals_window`. Build/decide at HEIGHT_1 so the parent (HEIGHT_0) exists,
+// seed the window with a parent fee distinct from the current block's, and assert the blob carries
+// the V0_14_3 commitment `Poseidon(partial_block_hash, parent_fee_proposal)`.
+#[tokio::test]
+async fn blob_parent_proposal_commitment_binds_parent_fee_proposal() {
+    const PARENT_FEE_PROPOSAL: GasPrice = GasPrice(5_000_000_000);
+
+    let (mut deps, _network) = create_test_and_network_deps();
+
+    deps.setup_deps_for_build(SetupDepsArgs { start_block_number: HEIGHT_1, ..Default::default() });
+
+    deps.batcher.expect_decision_reached().times(1).return_once(move |_| {
+        Ok(DecisionReachedResponse {
+            central_objects: CentralObjects {
+                parent_proposal_commitment: Some(BatcherProposalCommitment {
+                    partial_block_hash: PARTIAL_BLOCK_HASH,
+                }),
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+    });
+
+    deps.state_sync_client.expect_add_new_block().times(1).return_once(|_| Ok(()));
+
+    let expected_parent_commitment =
+        proposal_commitment_from(PARTIAL_BLOCK_HASH, Some(PARENT_FEE_PROPOSAL));
+    deps.cende_ambassador.expect_prepare_blob_for_next_height().times(1).return_once(
+        move |params| {
+            assert_eq!(params.proposal_commitment, *TEST_PROPOSAL_COMMITMENT);
+            assert_eq!(params.parent_proposal_commitment, Some(expected_parent_commitment));
+            Ok(())
+        },
+    );
+
+    let mut context = deps.build_context();
+
+    let _fin = context
+        .build_proposal(BuildParam { height: HEIGHT_1, ..Default::default() }, TIMEOUT)
+        .await
+        .unwrap()
+        .await;
+    // Seed the parent fee after building, so the current block still uses the default fee_proposal.
+    context.fee_proposals_window.insert(HEIGHT_0, Some(PARENT_FEE_PROPOSAL));
+
+    context.decision_reached(HEIGHT_1, ROUND_0, *TEST_PROPOSAL_COMMITMENT, false).await.unwrap();
+}
+
 /// Verify that when `stop_at_height` is set and decision is reached at that height:
 /// 1. `wait_for_block_hash` retries until the batcher has computed the hash.
 /// 2. The blob contains the block hash of that height.

crates/apollo_dashboard/resources/dev_grafana.json

@@ -427,7 +427,7 @@
         {
           "title": "Fee Target (USD per 1B L2 gas)",
           "description": "Configured target USD cost per 1 billion L2 gas units (raw metric is atto-USD per L2 gas; atto-USD / 1e9 = USD per 1B L2 gas)",
-          "type": "timeseries",
+          "type": "stat",
           "exprs": [
             "snip35_fee_target_atto_usd{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
           ],

crates/apollo_dashboard/src/panels/consensus.rs

@@ -755,7 +755,7 @@ fn get_panel_snip35_fee_target_atto_usd() -> Panel {
         "Configured target USD cost per 1 billion L2 gas units (raw metric is atto-USD per L2 \
          gas; atto-USD / 1e9 = USD per 1B L2 gas)",
         format!("{} / 1e9", SNIP35_FEE_TARGET_ATTO_USD.get_name_with_filter()),
-        PanelType::TimeSeries,
+        PanelType::Stat,
     )
 }
 

crates/apollo_deployments/resources/app_configs/gateway_config.json

@@ -24,11 +24,11 @@
   "gateway_config.static_config.stateless_tx_validator_config.max_l2_gas_amount": 1210000000,
   "gateway_config.static_config.stateless_tx_validator_config.max_proof_size": 480000,
   "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.major": 1,
-  "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.minor": 8,
+  "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.minor": 9,
   "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.patch": 0,
   "gateway_config.static_config.stateless_tx_validator_config.max_signature_length": 4000,
   "gateway_config.static_config.stateless_tx_validator_config.min_gas_price": 8000000000,
   "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.major": 1,
   "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.minor": 1,
   "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.patch": 0
-}
+}

crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json

@@ -24,7 +24,7 @@
   "gateway_config.static_config.stateless_tx_validator_config.max_l2_gas_amount": 1210000000,
   "gateway_config.static_config.stateless_tx_validator_config.max_proof_size": 480000,
   "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.major": 1,
-  "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.minor": 8,
+  "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.minor": 9,
   "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.patch": 0,
   "gateway_config.static_config.stateless_tx_validator_config.max_signature_length": 4000,
   "gateway_config.static_config.stateless_tx_validator_config.min_gas_price": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-MIN_GAS_PRICE_$$$",

crates/apollo_gateway_config/src/config.rs

@@ -169,7 +169,7 @@ impl Default for StatelessTransactionValidatorConfig {
             max_contract_bytecode_size: 81920,
             max_contract_class_object_size: 4089446,
             min_sierra_version: VersionId::new(1, 1, 0),
-            max_sierra_version: VersionId::new(1, 8, usize::MAX),
+            max_sierra_version: VersionId::new(1, 9, usize::MAX),
             allow_client_side_proving: true,
             max_proof_size: 480000,
         }

crates/apollo_http_server/Cargo.toml

@@ -29,7 +29,6 @@ apollo_metrics.workspace = true
 apollo_proc_macros.workspace = true
 async-trait.workspace = true
 axum.workspace = true
-blockifier_reexecution.workspace = true
 blockifier_test_utils = { workspace = true, optional = true }
 futures.workspace = true
 http.workspace = true

crates/apollo_http_server/src/http_server.rs

@@ -27,10 +27,12 @@ use axum::handler::Handler;
 use axum::http::{HeaderMap, StatusCode};
 use axum::routing::{get, post, MethodRouter};
 use axum::{serve, Extension, Json, Router};
-use blockifier_reexecution::serde_utils::deserialize_transaction_json_to_starknet_api_tx;
 use serde::de::Error;
 use starknet_api::rpc_transaction::RpcTransaction;
-use starknet_api::serde_utils::bytes_from_hex_str;
+use starknet_api::serde_utils::{
+    bytes_from_hex_str,
+    deserialize_transaction_json_to_starknet_api_tx,
+};
 use starknet_api::transaction::fields::ValidResourceBounds;
 use tokio::net::TcpListener;
 use tokio::sync::watch::{channel, Receiver, Sender};

crates/apollo_infra_utils/src/cairo_compiler_version.txt

@@ -1 +1 @@
-2.19.0-rc.0
+2.19.0-rc.2