Merge branch 'main' into evalir/opt-edition-change

Author: Evalir

Cargo.toml

@@ -38,17 +38,16 @@ signet-node-types = { version = "0.8.0", path = "crates/node-types" }
 signet-rpc = { version = "0.8.0", path = "crates/rpc" }
 signet-db = { version = "0.8.0", path = "crates/db" }
 
-init4-bin-base = { version = "0.7.1", features = ["alloy"] }
-
-signet-bundle = "0.8.0"
-signet-constants = "0.8.0"
-signet-evm = "0.8.0"
-signet-extract = "0.8.0"
-signet-node = "0.8.0"
-signet-sim = "0.8.0"
-signet-types = "0.8.0"
-signet-tx-cache = "0.8.0"
-signet-zenith = "0.8.0"
+init4-bin-base = { version = "0.9.0", features = ["alloy"] }
+
+signet-bundle = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-constants = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-evm = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-extract = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-tx-cache = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-types = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+signet-zenith = { git = "https://github.com/init4tech/signet-sdk", tag = "v0.8.3" }
+
 
 # ajj
 ajj = { version = "0.3.4" }

crates/blobber/Cargo.toml

@@ -20,6 +20,7 @@ reth.workspace = true
 reth-chainspec.workspace = true
 reth-transaction-pool = { workspace = true, optional = true }
 
+serde.workspace = true
 smallvec.workspace = true
 tokio.workspace = true
 tracing.workspace = true

crates/blobber/src/builder.rs

@@ -1,4 +1,4 @@
-use crate::block_data::BlockExtractor;
+use crate::{block_data::BlockExtractor, BlockExtractorConfig};
 use init4_bin_base::utils::calc::SlotCalculator;
 use reth::transaction_pool::TransactionPool;
 use url::Url;
@@ -59,6 +59,20 @@ impl<Pool> BlockExtractorBuilder<Pool> {
         self.with_pool(reth_transaction_pool::test_utils::testing_pool())
     }
 
+    /// Set the configuration for the CL url, pylon url, from the provided
+    /// [`BlockExtractorConfig`].
+    pub fn with_config(self, config: &BlockExtractorConfig) -> Result<Self, BuilderError> {
+        let this = self.with_explorer_url(config.blob_explorer_url());
+        let this =
+            if let Some(cl_url) = config.cl_url() { this.with_cl_url(cl_url)? } else { this };
+
+        if let Some(pylon_url) = config.pylon_url() {
+            this.with_pylon_url(pylon_url)
+        } else {
+            Ok(this)
+        }
+    }
+
     /// Set the blob explorer URL to use for the extractor. This will be used
     /// to construct a [`foundry_blob_explorers::Client`].
     pub fn with_explorer_url(mut self, explorer_url: &str) -> Self {

crates/blobber/src/config.rs

@@ -0,0 +1,56 @@
+use init4_bin_base::utils::from_env::FromEnv;
+use std::borrow::Cow;
+
+/// Configuration for the block extractor.
+#[derive(Debug, Clone, serde::Deserialize, FromEnv)]
+#[serde(rename_all = "camelCase")]
+pub struct BlockExtractorConfig {
+    /// URL of the blob explorer.
+    #[from_env(var = "BLOB_EXPLORER_URL", desc = "URL of the blob explorer", infallible)]
+    blob_explorer_url: Cow<'static, str>,
+
+    /// Consensus layer RPC URL
+    #[from_env(var = "SIGNET_CL_URL", desc = "Consensus layer URL", infallible, optional)]
+    cl_url: Option<Cow<'static, str>>,
+
+    /// The Pylon node URL
+    #[from_env(var = "SIGNET_PYLON_URL", desc = "Pylon node URL", infallible, optional)]
+    pylon_url: Option<Cow<'static, str>>,
+}
+
+impl BlockExtractorConfig {
+    /// Create a new `BlockExtractorConfig` with default values.
+    pub const fn new(blob_explorer_url: Cow<'static, str>) -> Self {
+        Self { blob_explorer_url, cl_url: None, pylon_url: None }
+    }
+
+    /// Get the blob explorer URL.
+    pub fn set_blob_explorer_url(&mut self, blob_explorer_url: Cow<'static, str>) {
+        self.blob_explorer_url = blob_explorer_url;
+    }
+
+    /// Get the blob explorer URL.
+    pub fn set_cl_url(&mut self, cl_url: Cow<'static, str>) {
+        self.cl_url = Some(cl_url);
+    }
+
+    /// Set the Pylon URL.
+    pub fn set_pylon_url(&mut self, pylon_url: Cow<'static, str>) {
+        self.pylon_url = Some(pylon_url);
+    }
+
+    /// Create a new `BlockExtractorConfig` with the provided CL URL, Pylon URL,
+    pub fn cl_url(&self) -> Option<&str> {
+        self.cl_url.as_deref()
+    }
+
+    /// Get the Pylon URL.
+    pub fn pylon_url(&self) -> Option<&str> {
+        self.pylon_url.as_deref()
+    }
+
+    /// Get the blob explorer URL.
+    pub fn blob_explorer_url(&self) -> &str {
+        &self.blob_explorer_url
+    }
+}

crates/blobber/src/lib.rs

@@ -15,7 +15,10 @@ mod block_data;
 pub use block_data::{Blobs, BlockExtractor};
 
 mod builder;
-pub use builder::BlockExtractorBuilder;
+pub use builder::{BlockExtractorBuilder, BuilderError as BlockExtractorBuilderError};
+
+mod config;
+pub use config::BlockExtractorConfig;
 
 mod error;
 pub use error::{BlockExtractionError, ExtractionResult};