refactor(conductor): remove websocket subscription to Celestia height…

…s in favor of periodic polling

charts/evm-rollup/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.11.0
+version: 0.11.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/evm-rollup/templates/configmap.yaml

@@ -8,11 +8,9 @@ data:
   {{- if (index .Values "celestia-node").enabled }}
   TOKEN_SERVER_URL: "{{ include "celestiaNode.service.addresses.token" (index .Subcharts "celestia-node") }}"
   ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}"
-  ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}"
   {{- else }}
   TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}"
   ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}"
-  ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}"
   {{- end }}
   ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}"
   ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}"
@@ -32,7 +30,17 @@ data:
   OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}"
   OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}"
   {{- if not .Values.global.dev }}
+
+  # This block is for removing `ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL`.
+  # 
+  {{- if (index .Values "celestia-node").enabled }}
+  ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}"
+  {{- else }}
+  ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}"
+  {{- end }}
+
   {{- else }}
+  ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "12000"
   {{- end }}
 ---
 apiVersion: v1

crates/astria-conductor/Cargo.toml

@@ -48,8 +48,10 @@ tryhard = { workspace = true }
 
 async-trait = "0.1.73"
 futures-bounded = "0.2.3"
+http = "0.2.9"
 itertools = "0.12.1"
 pin-project-lite = "0.2"
+tokio-stream = "0.1.14"
 tracing-futures = { version = "0.2.5", features = ["futures-03"] }
 
 [dev-dependencies]

crates/astria-conductor/local.env.example

@@ -2,6 +2,10 @@
 # specification as defined here:
 # https://github.com/open-telemetry/opentelemetry-specification/blob/e94af89e3d0c01de30127a0f423e912f6cda7bed/specification/protocol/exporter.md
 
+# The Celestia block time in milliseconds. Used for periodically polling Celestia for its latest network height.
+# 12000 milliseconds is the default Celestia block time.
+ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS=12000
+
 # The bearer token to retrieve sequencer blocks as blobs from Celestia.
 # The token is obtained by running `celestia bridge auth <permissions>`
 # on the host running the celestia node.
@@ -11,10 +15,6 @@ ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN="<JWT Bearer token>"
 # either http or https as scheme.
 ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL="http://127.0.0.1:26658"
 
-# The URL of the celestia node to subscribe to new network headers. This URL must contain
-# either ws or wss as scheme.
-ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL="ws://127.0.0.1:26658"
-
 # Execution RPC URL
 ASTRIA_CONDUCTOR_EXECUTION_RPC_URL="http://127.0.0.1:50051"
 

crates/astria-conductor/src/celestia/builder.rs

@@ -1,31 +1,41 @@
 //! Boilerplate to construct a [`super::Reader`] via a type-state builder.
 
-use celestia_client::celestia_types::nmt::Namespace;
-use sequencer_client::HttpClient;
+use std::time::Duration;
+
+use astria_eyre::eyre::{
+    self,
+    WrapErr as _,
+};
+use celestia_client::{
+    celestia_types::nmt::Namespace,
+    jsonrpsee::http_client::HttpClient as CelestiaClient,
+};
+use sequencer_client::HttpClient as SequencerClient;
 use tokio_util::sync::CancellationToken;
 
-use super::Reader;
-use crate::{
-    celestia::block_verifier::BlockVerifier,
-    executor,
+use super::{
+    block_verifier::BlockVerifier,
+    latest_height_stream::stream_latest_heights,
+    Reader,
 };
+use crate::executor;
 
 pub(crate) struct Builder {
+    pub(crate) celestia_block_time: Duration,
     pub(crate) celestia_http_endpoint: String,
-    pub(crate) celestia_websocket_endpoint: String,
     pub(crate) celestia_token: String,
     pub(crate) executor: executor::Handle,
-    pub(crate) sequencer_cometbft_client: HttpClient,
+    pub(crate) sequencer_cometbft_client: SequencerClient,
     pub(crate) sequencer_namespace: Namespace,
     pub(crate) shutdown: CancellationToken,
 }
 
 impl Builder {
     /// Creates a new [`Reader`] instance,
-    pub(crate) fn build(self) -> Reader {
+    pub(crate) fn build(self) -> eyre::Result<Reader> {
         let Self {
+            celestia_block_time,
             celestia_http_endpoint,
-            celestia_websocket_endpoint,
             celestia_token,
             executor,
             sequencer_cometbft_client,
@@ -35,14 +45,36 @@ impl Builder {
 
         let block_verifier = BlockVerifier::new(sequencer_cometbft_client);
 
-        Reader {
-            executor,
-            celestia_http_endpoint,
-            celestia_ws_endpoint: celestia_websocket_endpoint,
-            celestia_auth_token: celestia_token,
+        let celestia_client = create_celestia_client(celestia_http_endpoint, &celestia_token)
+            .wrap_err("failed initializing client for Celestia HTTP RPC")?;
+
+        let latest_celestia_heights =
+            stream_latest_heights(celestia_client.clone(), celestia_block_time);
+
+        Ok(Reader {
             block_verifier,
+            celestia_client,
+            latest_celestia_heights,
+            executor,
             sequencer_namespace,
             shutdown,
-        }
+        })
     }
 }
+
+fn create_celestia_client(endpoint: String, bearer_token: &str) -> eyre::Result<CelestiaClient> {
+    use celestia_client::jsonrpsee::http_client::{
+        HeaderMap,
+        HttpClientBuilder,
+    };
+    let mut headers = HeaderMap::new();
+    let auth_value = format!("Bearer {bearer_token}").parse().wrap_err(
+        "failed to construct Authorization header value from provided Celestia bearer token",
+    )?;
+    headers.insert(http::header::AUTHORIZATION, auth_value);
+    let client = HttpClientBuilder::default()
+        .set_headers(headers)
+        .build(endpoint)
+        .wrap_err("failed constructing Celestia JSONRPC HTTP Client")?;
+    Ok(client)
+}

crates/astria-conductor/src/celestia/latest_height_stream.rs

@@ -0,0 +1,63 @@
+use std::{
+    pin::Pin,
+    time::Duration,
+};
+
+use astria_eyre::eyre::{
+    Result,
+    WrapErr as _,
+};
+use celestia_client::{
+    celestia_rpc::HeaderClient as _,
+    jsonrpsee::http_client::HttpClient,
+};
+use futures::{
+    Future,
+    FutureExt as _,
+    Stream,
+    StreamExt as _,
+};
+use tokio_stream::wrappers::IntervalStream;
+
+pub(super) fn stream_latest_heights(
+    client: HttpClient,
+    poll_period: Duration,
+) -> LatestHeightStream {
+    let f = Box::new(move |_: tokio::time::Instant| {
+        let client = client.clone();
+        async move {
+            client
+                .header_network_head()
+                .await
+                .wrap_err("failed to fetch network head")
+                .map(|header| header.height().value())
+        }
+        .boxed()
+    });
+    let mut interval = tokio::time::interval(poll_period);
+    interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
+    LatestHeightStream {
+        inner: IntervalStream::new(interval).then(f),
+    }
+}
+
+type HeightFromHeaderFut = Pin<Box<dyn Future<Output = Result<u64>> + Send>>;
+
+pub(super) struct LatestHeightStream {
+    inner: futures::stream::Then<
+        IntervalStream,
+        HeightFromHeaderFut,
+        Box<dyn FnMut(tokio::time::Instant) -> HeightFromHeaderFut + Send>,
+    >,
+}
+
+impl Stream for LatestHeightStream {
+    type Item = Result<u64>;
+
+    fn poll_next(
+        mut self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        self.inner.poll_next_unpin(cx)
+    }
+}