Log waiting for earliest L1 batch in API server

matter-labs · Feb 8, 2024 · c3fe7f1 · c3fe7f1
1 parent c5ba292
commit c3fe7f1
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/core/lib/zksync_core/src/api_server/web3/mod.rs b/core/lib/zksync_core/src/api_server/web3/mod.rs
@@ -459,17 +459,30 @@ impl FullApiParams {
         local_addr_sender: oneshot::Sender<SocketAddr>,
         health_updater: HealthUpdater,
     ) -> anyhow::Result<()> {
-        // We don't want to start the server until at least one L1 batch is stored in Postgres.
+        let transport = self.transport;
+        let (transport_str, is_http, addr) = match transport {
+            ApiTransport::Http(addr) => ("HTTP", true, addr),
+            ApiTransport::WebSocket(addr) => ("WS", false, addr),
+        };
+        let transport_label = (&transport).into();
+
+        tracing::info!(
+            "Waiting for at least one L1 batch in Postgres to start {transport_str} API server"
+        );
+        // Starting the server before L1 batches are present in Postgres can lead to some invariants the server logic
+        // implicitly assumes not being upheld. The only case when we'll actually wait here is immediately after snapshot recovery.
         let earliest_l1_batch_number =
             wait_for_l1_batch(&self.pool, self.polling_interval, &mut stop_receiver)
                 .await
                 .context("error while waiting for L1 batch in Postgres")?;
 
-        if earliest_l1_batch_number.is_none() {
-            return Ok(()); // received shutdown signal
+        if let Some(number) = earliest_l1_batch_number {
+            tracing::info!("Successfully waited for at least one L1 batch in Postgres; the earliest one is #{number}");
+        } else {
+            tracing::info!("Received shutdown signal before {transport_str} API server is started; shutting down");
+            return Ok(());
         }
 
-        let transport = self.transport;
         let batch_request_config = self
             .optional
             .batch_request_size_limit
@@ -488,12 +501,6 @@ impl FullApiParams {
             .build_rpc_module(pub_sub, last_sealed_miniblock)
             .await?;
 
-        let (transport_str, is_http, addr) = match transport {
-            ApiTransport::Http(addr) => ("HTTP", true, addr),
-            ApiTransport::WebSocket(addr) => ("WS", false, addr),
-        };
-        let transport_label = (&transport).into();
-
         // Setup CORS.
         let cors = is_http.then(|| {
             CorsLayer::new()