apollo_gateway: add proof manager client

Author: einat-starkware

Cargo.lock

@@ -13,6 +13,7 @@ testing = [
   "apollo_class_manager_types/testing",
   "apollo_gateway_config/testing",
   "apollo_mempool_types/testing",
+  "apollo_proof_manager_types/testing",
   "blockifier/testing",
   "blockifier_test_utils",
 ]
@@ -27,6 +28,7 @@ apollo_mempool_types.workspace = true
 apollo_metrics.workspace = true
 apollo_network_types.workspace = true
 apollo_proc_macros.workspace = true
+apollo_proof_manager_types.workspace = true
 apollo_rpc.workspace = true
 apollo_state_sync_types.workspace = true
 async-trait.workspace = true
@@ -56,6 +58,7 @@ apollo_mempool.workspace = true
 apollo_mempool_types = { workspace = true, features = ["testing"] }
 apollo_metrics = { workspace = true, features = ["testing"] }
 apollo_network_types = { workspace = true, features = ["testing"] }
+apollo_proof_manager_types = { workspace = true, features = ["testing"] }
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
 assert_matches.workspace = true

crates/apollo_gateway/Cargo.toml

@@ -23,6 +23,7 @@ use apollo_mempool_types::communication::{AddTransactionArgsWrapper, SharedMempo
 use apollo_mempool_types::mempool_types::AddTransactionArgs;
 use apollo_network_types::network_types::BroadcastedMessageMetadata;
 use apollo_proc_macros::sequencer_latency_histogram;
+use apollo_proof_manager_types::SharedProofManagerClient;
 use apollo_state_sync_types::communication::SharedStateSyncClient;
 use axum::async_trait;
 use blockifier::state::contract_class_manager::ContractClassManager;
@@ -64,6 +65,7 @@ pub struct Gateway {
     pub stateful_tx_validator_factory: Arc<dyn StatefulTransactionValidatorFactoryTrait>,
     pub mempool_client: SharedMempoolClient,
     pub transaction_converter: Arc<dyn TransactionConverterTrait>,
+    pub proof_manager_client: SharedProofManagerClient,
 }
 
 impl Gateway {
@@ -73,6 +75,7 @@ impl Gateway {
         mempool_client: SharedMempoolClient,
         transaction_converter: Arc<dyn TransactionConverterTrait>,
         stateless_tx_validator: Arc<dyn StatelessTransactionValidatorTrait>,
+        proof_manager_client: SharedProofManagerClient,
     ) -> Self {
         Self {
             config: Arc::new(config.clone()),
@@ -87,6 +90,7 @@ impl Gateway {
             }),
             mempool_client,
             transaction_converter,
+            proof_manager_client,
         }
     }
 
@@ -225,6 +229,7 @@ pub fn create_gateway(
     shared_state_sync_client: SharedStateSyncClient,
     mempool_client: SharedMempoolClient,
     class_manager_client: SharedClassManagerClient,
+    proof_manager_client: SharedProofManagerClient,
     runtime: tokio::runtime::Handle,
 ) -> Gateway {
     let state_reader_factory = Arc::new(SyncStateReaderFactory {
@@ -246,6 +251,7 @@ pub fn create_gateway(
         mempool_client,
         transaction_converter,
         stateless_tx_validator,
+        proof_manager_client,
     )
 }
 

crates/apollo_gateway/src/gateway.rs

@@ -35,6 +35,7 @@ use apollo_mempool_types::errors::MempoolError;
 use apollo_mempool_types::mempool_types::{AccountState, AddTransactionArgs, ValidationArgs};
 use apollo_metrics::metrics::HistogramValue;
 use apollo_network_types::network_types::BroadcastedMessageMetadata;
+use apollo_proof_manager_types::MockProofManagerClient;
 use apollo_test_utils::{get_rng, GetTestInstance};
 use blockifier::blockifier::config::ContractClassManagerConfig;
 use blockifier::context::ChainInfo;
@@ -132,12 +133,14 @@ fn mock_dependencies() -> MockDependencies {
     let mock_mempool_client = MockMempoolClient::new();
     let mock_transaction_converter = MockTransactionConverterTrait::new();
     let mock_stateless_transaction_validator = mock_stateless_transaction_validator();
+    let mock_proof_manager_client = MockProofManagerClient::new();
     MockDependencies {
         config,
         state_reader_factory,
         mock_mempool_client,
         mock_transaction_converter,
         mock_stateless_transaction_validator,
+        mock_proof_manager_client,
     }
 }
 
@@ -147,6 +150,7 @@ struct MockDependencies {
     mock_mempool_client: MockMempoolClient,
     mock_transaction_converter: MockTransactionConverterTrait,
     mock_stateless_transaction_validator: MockStatelessTransactionValidatorTrait,
+    mock_proof_manager_client: MockProofManagerClient,
 }
 
 impl MockDependencies {
@@ -158,6 +162,7 @@ impl MockDependencies {
             Arc::new(self.mock_mempool_client),
             Arc::new(self.mock_transaction_converter),
             Arc::new(self.mock_stateless_transaction_validator),
+            Arc::new(self.mock_proof_manager_client),
         )
     }
 
@@ -572,6 +577,7 @@ async fn add_tx_returns_error_when_extract_state_nonce_and_run_validations_fails
         stateful_tx_validator_factory: Arc::new(mock_stateful_transaction_validator_factory),
         mempool_client: Arc::new(mock_dependencies.mock_mempool_client),
         transaction_converter: Arc::new(mock_dependencies.mock_transaction_converter),
+        proof_manager_client: Arc::new(mock_dependencies.mock_proof_manager_client),
     };
 
     let result = gateway.add_tx(tx_args.get_rpc_tx(), None).await;
@@ -624,6 +630,7 @@ async fn add_tx_returns_error_when_instantiating_validator_fails(
         stateful_tx_validator_factory: Arc::new(mock_stateful_transaction_validator_factory),
         mempool_client: Arc::new(mock_dependencies.mock_mempool_client),
         transaction_converter: Arc::new(mock_dependencies.mock_transaction_converter),
+        proof_manager_client: Arc::new(mock_dependencies.mock_proof_manager_client),
     };
 
     let result = gateway.add_tx(tx_args.get_rpc_tx(), None).await;

crates/apollo_gateway/src/gateway_test.rs

@@ -5,6 +5,7 @@ use apollo_class_manager_types::MockClassManagerClient;
 use apollo_gateway_config::compiler_version::VersionId;
 use apollo_gateway_config::config::GatewayConfig;
 use apollo_mempool_types::communication::MockMempoolClient;
+use apollo_proof_manager_types::MockProofManagerClient;
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use starknet_api::block::GasPrice;
 use starknet_api::core::ContractAddress;
@@ -163,6 +164,7 @@ pub fn gateway_for_benchmark(gateway_config: GatewayConfig) -> Gateway {
     let state_reader_factory = local_test_state_reader_factory(cairo_version, false);
     let mut mempool_client = MockMempoolClient::new();
     let class_manager_client = Arc::new(MockClassManagerClient::new());
+    let proof_manager_client = Arc::new(MockProofManagerClient::new());
     let transaction_converter = TransactionConverter::new(
         class_manager_client.clone(),
         gateway_config.chain_info.chain_id.clone(),
@@ -179,5 +181,6 @@ pub fn gateway_for_benchmark(gateway_config: GatewayConfig) -> Gateway {
         Arc::new(mempool_client),
         Arc::new(transaction_converter),
         stateless_tx_validator,
+        proof_manager_client,
     )
 }

crates/apollo_gateway/src/test_utils.rs

@@ -228,11 +228,15 @@ pub async fn create_node_components(
             let class_manager_client = clients
                 .get_class_manager_shared_client()
                 .expect("Class Manager client should be available");
+            let proof_manager_client = clients
+                .get_proof_manager_shared_client()
+                .expect("Proof Manager client should be available");
             Some(create_gateway(
                 gateway_config.clone(),
                 state_sync_client,
                 mempool_client,
                 class_manager_client,
+                proof_manager_client,
                 tokio::runtime::Handle::current(),
             ))
         }