apollo_http_server: reload dynamic config upon tx processing

Author: Itay-Tsabary-Starkware

crates/apollo_http_server/src/errors.rs

@@ -1,3 +1,4 @@
+use apollo_config_manager_types::communication::ConfigManagerClientError;
 use apollo_gateway_types::communication::GatewayClientError;
 use apollo_gateway_types::deprecated_gateway_error::{
     KnownStarknetErrorCode,
@@ -23,19 +24,24 @@ pub enum HttpServerRunError {
 #[derive(Error, Debug)]
 pub enum HttpServerError {
     #[error(transparent)]
-    GatewayClientError(#[from] Box<GatewayClientError>),
+    ConfigManagerClientError(#[from] ConfigManagerClientError),
+    #[error(transparent)]
+    DecompressionError(#[from] CompressionError),
     #[error(transparent)]
     DeserializationError(#[from] serde_json::Error),
     #[error(transparent)]
-    DecompressionError(#[from] CompressionError),
+    GatewayClientError(#[from] Box<GatewayClientError>),
 }
 
 impl IntoResponse for HttpServerError {
     fn into_response(self) -> Response {
         match self {
-            HttpServerError::GatewayClientError(e) => gw_client_err_into_response(*e),
-            HttpServerError::DeserializationError(e) => serde_error_into_response(e),
+            HttpServerError::ConfigManagerClientError(e) => {
+                config_manager_client_err_into_response(e)
+            }
             HttpServerError::DecompressionError(e) => compression_error_into_response(e),
+            HttpServerError::DeserializationError(e) => serde_error_into_response(e),
+            HttpServerError::GatewayClientError(e) => gw_client_err_into_response(*e),
         }
     }
 }
@@ -89,6 +95,15 @@ fn gw_client_err_into_response(err: GatewayClientError) -> Response {
     (response_code, response_body).into_response()
 }
 
+fn config_manager_client_err_into_response(err: ConfigManagerClientError) -> Response {
+    let (response_code, config_manager_error) = (
+        StatusCode::INTERNAL_SERVER_ERROR,
+        StarknetError::internal_with_logging("Failed to process client request", err),
+    );
+    let response_body = serialize_error(&config_manager_error);
+    (response_code, response_body).into_response()
+}
+
 /// Serializes a `StarknetError` into an HTTP response, encode the error message
 /// to defend potential Cross-Site risks.
 fn serialize_error(error: &StarknetError) -> Response {

crates/apollo_http_server/src/http_server.rs

@@ -57,8 +57,7 @@ pub struct HttpServer {
 
 #[derive(Clone)]
 pub struct AppState {
-    // TODO(Tsabary): use the config manager in the tx processing.
-    _config_manager_client: SharedConfigManagerClient,
+    config_manager_client: SharedConfigManagerClient,
     pub gateway_client: SharedGatewayClient,
 }
 
@@ -68,7 +67,7 @@ impl HttpServer {
         config_manager_client: SharedConfigManagerClient,
         gateway_client: SharedGatewayClient,
     ) -> Self {
-        let app_state = AppState { _config_manager_client: config_manager_client, gateway_client };
+        let app_state = AppState { config_manager_client, gateway_client };
         HttpServer { config, app_state }
     }
 
@@ -93,8 +92,7 @@ impl HttpServer {
             .with_state(self.app_state.clone())
             // Rest api endpoint
             .route("/gateway/add_transaction", post({
-                let max_sierra_program_size = self.config.dynamic_config.max_sierra_program_size;
-                move |app_state: State<AppState>, headers: HeaderMap, tx: String| add_tx(app_state, headers, tx, max_sierra_program_size)
+                move |app_state: State<AppState>, headers: HeaderMap, tx: String| add_tx(app_state, headers, tx)
             }))
             .with_state(self.app_state.clone())
             // TODO(shahak): Remove this once we fix the centralized simulator to not use is_alive
@@ -129,11 +127,12 @@ async fn add_tx(
     State(app_state): State<AppState>,
     headers: HeaderMap,
     tx: String,
-    max_sierra_program_size: usize,
 ) -> HttpServerResult<Json<GatewayOutput>> {
     ADDED_TRANSACTIONS_TOTAL.increment(1);
     debug!("ADD_TX_START: Http server received a new transaction.");
 
+    let dynamic_config = app_state.config_manager_client.get_http_server_dynamic_config().await?;
+
     let tx: DeprecatedGatewayTransactionV3 = match serde_json::from_str(&tx) {
         Ok(value) => value,
         Err(e) => {
@@ -148,7 +147,7 @@ async fn add_tx(
         }
     };
 
-    let rpc_tx = tx.convert_to_rpc_tx(max_sierra_program_size).inspect_err(|e| {
+    let rpc_tx = tx.convert_to_rpc_tx(dynamic_config.max_sierra_program_size).inspect_err(|e| {
         debug!("Error while converting deprecated gateway transaction into RPC transaction: {}", e);
     })?;