Merge pull request #10652 from starkware-libs/yonatan/merge-main-v0.14.1-committer-into-main-1765273972

Merge main-v0.14.1-committer into main

Author: Yoni-Starkware

.gitattributes

@@ -2,3 +2,7 @@
 crates/blockifier_test_utils/resources/feature_contracts/cairo0/compiled/*.json -diff
 crates/blockifier_test_utils/resources/feature_contracts/cairo1/compiled/*.json -diff
 crates/blockifier_test_utils/resources/feature_contracts/cairo1/sierra/*.json -diff
+
+# Hint coverage of specific test cases do not require review - we use these artifacts to compute the
+# list of all uncovered hints, which *should* be reviewed.
+crates/starknet_os_flow_tests/resources/hint_coverage/*.json -diff

.github/workflows/sequencer_docker-test.yml

@@ -2,14 +2,11 @@ name: Sequencer-Docker-Test
 
 on:
   workflow_dispatch:
-  push:
+
+  pull_request:
     branches:
       - main
       - main-v[0-9].**
-    tags:
-      - v[0-9].**
-
-  pull_request:
 
 env:
   crate_triggers: "apollo_node,apollo_dashboard,apollo_integration_tests"
@@ -70,15 +67,17 @@ jobs:
       SIMULATOR_RUN_FOREVER: false
       FOLLOW_LOGS: false
       SIMULATOR_TIMEOUT: 300
+      COMPOSE_PARALLEL_LIMIT: 2
+      COMPOSE_BAKE: false
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Run docker compose
-        run: ./deployments/monitoring/deploy_local_stack.sh up -d --build --yes
-        env:
-          COMPOSE_BAKE: true
+        run: |
+          echo "Docker compose version: $(docker compose version)"
+          ./deployments/monitoring/deploy_local_stack.sh up -d --build --yes
 
       # Getting the sequencer_simulator container id, then
       # Invoking `docker wait $container_id`.

Cargo.lock

@@ -14,6 +14,7 @@ members = [
   "crates/apollo_class_manager_config",
   "crates/apollo_class_manager_types",
   "crates/apollo_committer",
+  "crates/apollo_committer_config",
   "crates/apollo_committer_types",
   "crates/apollo_compilation_utils",
   "crates/apollo_compile_to_casm",
@@ -131,6 +132,7 @@ apollo_class_manager.path = "crates/apollo_class_manager"
 apollo_class_manager_config.path = "crates/apollo_class_manager_config"
 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"
 apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.0.0" }
 apollo_compile_to_casm.path = "crates/apollo_compile_to_casm"

Cargo.toml

@@ -8,6 +8,7 @@ const AllowedScopes = ['apollo_base_layer_tests',
     'apollo_class_manager_config',
     'apollo_class_manager_types',
     'apollo_committer',
+    'apollo_committer_config',
     'apollo_committer_types',
     'apollo_compilation_utils',
     'apollo_compile_to_casm',

commitlint.config.js

@@ -637,6 +637,7 @@ impl Batcher {
         .expect("Number of reverted transactions should fit in u64");
         let partial_block_hash_components =
             block_execution_artifacts.partial_block_hash_components().await;
+        let block_header_commitments = partial_block_hash_components.header_commitments.clone();
         self.commit_proposal_and_block(
             height,
             state_diff.clone(),
@@ -676,6 +677,7 @@ impl Batcher {
                 compiled_class_hashes_for_migration: block_execution_artifacts
                     .compiled_class_hashes_for_migration,
             },
+            block_header_commitments,
         })
     }
 

crates/apollo_batcher/src/batcher.rs

@@ -8,6 +8,7 @@ use chrono::prelude::*;
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use starknet_api::block::{BlockHashAndNumber, BlockHeader, BlockInfo, BlockNumber};
+use starknet_api::block_hash::block_hash_calculator::BlockHeaderCommitments;
 use starknet_api::consensus_transaction::InternalConsensusTransaction;
 use starknet_api::core::StateDiffCommitment;
 use starknet_api::execution_resources::GasAmount;
@@ -118,6 +119,7 @@ pub struct DecisionReachedResponse {
     pub state_diff: ThinStateDiff,
     pub l2_gas_used: GasAmount,
     pub central_objects: CentralObjects,
+    pub block_header_commitments: BlockHeaderCommitments,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]

crates/apollo_batcher_types/src/batcher_types.rs

@@ -17,6 +17,10 @@ impl ComponentRequestHandler<CommitterRequest, CommitterResponse> for Committer
                 // TODO(Yoav): Call the committer.
                 unimplemented!()
             }
+            CommitterRequest::RevertBlock(_) => {
+                // TODO(Yoav): Call the committer.
+                unimplemented!()
+            }
         }
     }
 }

crates/apollo_committer/src/communication.rs

@@ -0,0 +1,15 @@
+[package]
+name = "apollo_committer_config"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+description = "Configuration types for Apollo committer"
+
+[dependencies]
+apollo_config.workspace = true
+serde = { workspace = true, features = ["derive"] }
+validator.workspace = true
+
+[lints]
+workspace = true

crates/apollo_committer_config/Cargo.toml

@@ -0,0 +1,23 @@
+use std::collections::BTreeMap;
+
+use apollo_config::dumping::{ser_param, SerializeConfig};
+use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Validate)]
+pub struct CommitterConfig {
+    // TODO(Yoav): Replace with real committer configuration parameters.
+    pub enable_committer: bool,
+}
+
+impl SerializeConfig for CommitterConfig {
+    fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
+        BTreeMap::from_iter([ser_param(
+            "enable_committer",
+            &self.enable_committer,
+            "Placeholder configuration.",
+            ParamPrivacyInput::Public,
+        )])
+    }
+}