Merge branch 'main' into evalir/bump-reth-1.8

Author: Evalir

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.9.1"
+version = "0.10.4"
 edition = "2024"
 rust-version = "1.88"
 authors = ["init4"]
@@ -34,12 +34,13 @@ debug = false
 incremental = false
 
 [workspace.dependencies]
-signet-blobber = { version = "0.9.0", path = "crates/blobber" }
-signet-db = { version = "0.9.0", path = "crates/db" }
-signet-node-types = { version = "0.9.0", path = "crates/node-types" }
-signet-rpc = { version = "0.9.0", path = "crates/rpc" }
+signet-blobber = { version = "0.10", path = "crates/blobber" }
+signet-block-processor = { version = "0.10", path = "crates/block-processor" }
+signet-db = { version = "0.10", path = "crates/db" }
+signet-node-types = { version = "0.10", path = "crates/node-types" }
+signet-rpc = { version = "0.10", path = "crates/rpc" }
 
-init4-bin-base = { version = "0.10.0", features = ["alloy"] }
+init4-bin-base = { version = "0.13.0", features = ["alloy"] }
 
 signet-bundle = "0.11.0"
 signet-constants = "0.11.0"
@@ -48,6 +49,7 @@ signet-extract = "0.11.0"
 signet-tx-cache = "0.11.0"
 signet-types = "0.11.0"
 signet-zenith = "0.11.0"
+signet-journal = "0.11.0"
 
 # ajj
 ajj = { version = "0.3.4" }
@@ -56,7 +58,6 @@ ajj = { version = "0.3.4" }
 trevm = { version = "0.29.0", features = ["full_env_cfg"] }
 
 # Alloy periphery crates
-alloy-core = { version = "1.4" }
 alloy = { version = "1.0.35", features = [
     "full",
     "rpc-types-beacon",
@@ -118,5 +119,13 @@ uuid = "1.16.0"
 alloy-rlp = "0.3.11"
 tempfile = "3.17.0"
 
-[patch.crates-io]
-init4-bin-base = {path = "../bin-base" }
+# [patch.crates-io]
+# signet-bundle = { path = "../sdk/crates/bundle"}
+# signet-constants = { path = "../sdk/crates/constants"}
+# signet-evm = { path = "../sdk/crates/evm"}
+# signet-extract = { path = "../sdk/crates/extract"}
+# signet-tx-cache = { path = "../sdk/crates/tx-cache"}
+# signet-types = { path = "../sdk/crates/types"}
+# signet-zenith = { path = "../sdk/crates/zenith"}
+
+# init4-bin-base = { path = "../shared" }

crates/blobber/src/builder.rs renamed to crates/blobber/src/blobs/builder.rs

@@ -1,5 +1,4 @@
 use crate::{BlobCacher, BlobFetcher, BlobFetcherConfig};
-use init4_bin_base::utils::calc::SlotCalculator;
 use reth::transaction_pool::TransactionPool;
 use url::Url;
 
@@ -35,7 +34,6 @@ pub struct BlobFetcherBuilder<Pool> {
     client: Option<reqwest::Client>,
     cl_url: Option<String>,
     pylon_url: Option<String>,
-    slot_calculator: Option<SlotCalculator>,
 }
 
 impl<Pool> BlobFetcherBuilder<Pool> {
@@ -47,7 +45,6 @@ impl<Pool> BlobFetcherBuilder<Pool> {
             client: self.client,
             cl_url: self.cl_url,
             pylon_url: self.pylon_url,
-            slot_calculator: self.slot_calculator,
         }
     }
 
@@ -107,22 +104,6 @@ impl<Pool> BlobFetcherBuilder<Pool> {
         self.pylon_url = Some(pylon_url.to_string());
         Ok(self)
     }
-
-    /// Set the slot calculator to use for the extractor.
-    pub const fn with_slot_calculator(
-        mut self,
-        slot_calculator: SlotCalculator,
-    ) -> BlobFetcherBuilder<Pool> {
-        self.slot_calculator = Some(slot_calculator);
-        self
-    }
-
-    /// Set the slot calculator to use for the extractor, using the Pecornino
-    /// host configuration.
-    pub const fn with_pecornino_slots(mut self) -> BlobFetcherBuilder<Pool> {
-        self.slot_calculator = Some(SlotCalculator::pecorino_host());
-        self
-    }
 }
 
 impl<Pool: TransactionPool> BlobFetcherBuilder<Pool> {
@@ -141,9 +122,7 @@ impl<Pool: TransactionPool> BlobFetcherBuilder<Pool> {
         let explorer =
             foundry_blob_explorers::Client::new_with_client(explorer_url, client.clone());
 
-        let slot_calculator = self.slot_calculator.ok_or(BuilderError::MissingSlotCalculator)?;
-
-        Ok(BlobFetcher::new(pool, explorer, client, cl_url, pylon_url, slot_calculator))
+        Ok(BlobFetcher::new(pool, explorer, client, cl_url, pylon_url))
     }
 
     /// Build a [`BlobCacher`] with the provided parameters.