apollo_batcher: add committer client field (#11251)

Author: nimrod-starkware

crates/apollo_batcher/src/batcher.rs

@@ -1306,6 +1306,7 @@ pub async fn create_batcher(
         &config,
         &CommitmentManagerConfig::default(),
         storage_reader.as_ref(),
+        committer_client.clone(),
     )
     .await;
 

crates/apollo_batcher/src/batcher_test.rs

@@ -273,18 +273,20 @@ async fn create_batcher_impl<R: BatcherStorageReader + 'static>(
     config: BatcherConfig,
 ) -> Batcher {
     // TODO(Amos): Use commitment manager config in batcher config, once it's added there.
+    let committer_client = Arc::new(clients.committer_client);
     let commitment_manager = CommitmentManager::create_commitment_manager_or_none(
         &config,
         &CommitmentManagerConfig::default(),
         storage_reader.as_ref(),
+        committer_client.clone(),
     )
     .await;
 
     let mut batcher = Batcher::new(
         config,
         storage_reader,
         storage_writer,
-        Arc::new(clients.committer_client),
+        committer_client,
         Arc::new(clients.l1_provider_client),
         Arc::new(clients.mempool_client),
         TransactionConverter::new(clients.class_manager_client, CHAIN_ID_FOR_TESTS.clone()),

crates/apollo_batcher/src/commitment_manager/mod.rs

@@ -3,6 +3,7 @@
 use std::sync::Arc;
 
 use apollo_batcher_config::config::BatcherConfig;
+use apollo_committer_types::communication::SharedCommitterClient;
 use apollo_reverts::RevertConfig;
 use starknet_api::block::BlockNumber;
 use starknet_api::block_hash::block_hash_calculator::{
@@ -72,6 +73,7 @@ impl CommitmentManager {
         config: &CommitmentManagerConfig,
         revert_config: &RevertConfig,
         global_root_height: BlockNumber,
+        committer_client: SharedCommitterClient,
     ) -> Option<Self> {
         if revert_config.should_revert {
             info!("Revert mode is enabled, not initializing commitment manager.");
@@ -81,6 +83,7 @@ impl CommitmentManager {
             Some(CommitmentManager::initialize(
                 CommitmentManagerConfig::default(),
                 global_root_height,
+                committer_client,
             ))
         }
     }
@@ -89,12 +92,13 @@ impl CommitmentManager {
     pub(crate) fn initialize(
         config: CommitmentManagerConfig,
         global_root_height: BlockNumber,
+        committer_client: SharedCommitterClient,
     ) -> Self {
         info!("Initializing CommitmentManager with config {config:?}");
         let (tasks_sender, tasks_receiver) = channel(config.tasks_channel_size);
         let (results_sender, results_receiver) = channel(config.results_channel_size);
 
-        let state_committer = StateCommitter { tasks_receiver, results_sender };
+        let state_committer = StateCommitter { tasks_receiver, results_sender, committer_client };
 
         let commitment_task_performer = state_committer.run();
 
@@ -288,6 +292,7 @@ impl CommitmentManager {
         batcher_config: &BatcherConfig,
         commitment_manager_config: &CommitmentManagerConfig,
         storage_reader: &R,
+        committer_client: SharedCommitterClient,
     ) -> Option<Self> {
         let global_root_height = storage_reader
             .global_root_height()
@@ -296,6 +301,7 @@ impl CommitmentManager {
             commitment_manager_config,
             &batcher_config.revert_config,
             global_root_height,
+            committer_client,
         );
         if let Some(ref mut cm) = commitment_manager {
             let block_height =

crates/apollo_batcher/src/commitment_manager/state_committer.rs

@@ -1,5 +1,6 @@
 #![allow(dead_code, unused_variables, unused_mut)]
 
+use apollo_committer_types::communication::SharedCommitterClient;
 use tokio::sync::mpsc::{Receiver, Sender};
 use tokio::task::JoinHandle;
 
@@ -9,7 +10,7 @@ use crate::commitment_manager::types::{CommitmentTaskInput, CommitmentTaskOutput
 pub(crate) struct StateCommitter {
     pub(crate) tasks_receiver: Receiver<CommitmentTaskInput>,
     pub(crate) results_sender: Sender<CommitmentTaskOutput>,
-    // TODO(Nimrod): Add committer client here.
+    pub(crate) committer_client: SharedCommitterClient,
 }
 
 impl StateCommitter {