removed #77 (no longer works) (#92)

Cargo.toml

@@ -7,15 +7,13 @@ edition = "2021"
 [workspace]
 members = [
   "state-reconstruct-fetcher",
-  "state-reconstruct-fetcher/blobscan-client",
   "state-reconstruct-storage",
 ]
 
 [dependencies]
 async-trait = "0.1.74"
 bincode = "1"
 blake2 = "0.10.6"
-blobscan-client = { path = "./state-reconstruct-fetcher/blobscan-client" }
 chrono = "0.4.31"
 clap = { version = "4.4.7", features = ["derive", "env"] }
 ethers = "1.0.2"

state-reconstruct-fetcher/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 blake2 = "0.10.6"
-blobscan-client = { path = "./blobscan-client" }
 ethers = "1.0.2"
 eyre = "0.6.8"
 indexmap = { version = "2.0.2", features = ["serde"] }

state-reconstruct-fetcher/src/blob_http_client.rs

@@ -1,4 +1,4 @@
-use blobscan_client::{BlobResponseFormatError, BlobSupport};
+use serde::Deserialize;
 use tokio::time::{sleep, Duration};
 
 use crate::types::ParseError;
@@ -8,13 +8,18 @@ const MAX_RETRIES: u8 = 5;
 /// The interval in seconds to wait before retrying to fetch a blob.
 const FAILED_FETCH_RETRY_INTERVAL_S: u64 = 10;
 
+#[derive(Deserialize)]
+struct JsonResponse {
+    data: String,
+}
+
 pub struct BlobHttpClient {
     client: reqwest::Client,
-    support: Box<dyn BlobSupport + Send + Sync>,
+    url_base: String,
 }
 
 impl BlobHttpClient {
-    pub fn new(support: Box<dyn BlobSupport + Send + Sync>) -> eyre::Result<Self> {
+    pub fn new(blob_url: String) -> eyre::Result<Self> {
         let mut headers = reqwest::header::HeaderMap::new();
         headers.insert(
             "Accept",
@@ -23,28 +28,31 @@ impl BlobHttpClient {
         let client = reqwest::Client::builder()
             .default_headers(headers)
             .build()?;
-        Ok(Self { client, support })
+        Ok(Self {
+            client,
+            url_base: blob_url,
+        })
     }
 
     pub async fn get_blob(&self, kzg_commitment: &[u8]) -> Result<Vec<u8>, ParseError> {
-        let url = self.support.format_url(kzg_commitment);
+        let url = self.format_url(kzg_commitment);
         for attempt in 1..=MAX_RETRIES {
             match self.client.get(&url).send().await {
                 Ok(response) => match response.text().await {
-                    Ok(text) => match self.support.get_blob_data(&text) {
+                    Ok(text) => match get_blob_data(&text) {
                         Ok(data) => {
                             let plain = if let Some(p) = data.strip_prefix("0x") {
                                 p
                             } else {
                                 &data
                             };
                             return hex::decode(plain).map_err(|e| {
-                                BlobResponseFormatError(plain.to_string(), e.to_string()).into()
+                                ParseError::BlobFormatError(plain.to_string(), e.to_string())
                             });
                         }
                         Err(e) => {
                             tracing::error!("failed parsing response of {url}");
-                            return Err(e.into());
+                            return Err(e);
                         }
                     },
                     Err(e) => {
@@ -60,4 +68,18 @@ impl BlobHttpClient {
         }
         Err(ParseError::BlobStorageError(url))
     }
+
+    fn format_url(&self, kzg_commitment: &[u8]) -> String {
+        format!("{}0x{}", self.url_base, hex::encode(kzg_commitment))
+    }
+}
+
+fn get_blob_data(json_str: &str) -> Result<String, ParseError> {
+    match serde_json::from_str::<JsonResponse>(json_str) {
+        Ok(data) => Ok(data.data),
+        Err(e) => Err(ParseError::BlobFormatError(
+            json_str.to_string(),
+            e.to_string(),
+        )),
+    }
 }

state-reconstruct-fetcher/src/l1_fetcher.rs

@@ -1,6 +1,5 @@
 use std::{cmp, fs::File, future::Future, sync::Arc};
 
-use blobscan_client::{BlobSupport, ScrapingSupport};
 use ethers::{
     abi::{Contract, Function},
     prelude::*,
@@ -16,7 +15,6 @@ use tokio::{
 use tokio_util::sync::CancellationToken;
 
 use crate::{
-    api_support::ApiSupport,
     blob_http_client::BlobHttpClient,
     constants::ethereum::{BLOB_BLOCK, BLOCK_STEP, BOOJUM_BLOCK, GENESIS_BLOCK, ZK_SYNC_ADDR},
     metrics::L1Metrics,
@@ -468,7 +466,7 @@ impl L1Fetcher {
     ) -> Result<tokio::task::JoinHandle<Option<u64>>> {
         let metrics = self.metrics.clone();
         let contracts = self.contracts.clone();
-        let client = BlobHttpClient::new(make_support(self.config.blobs_url.clone()))?;
+        let client = BlobHttpClient::new(self.config.blobs_url.clone())?;
         Ok(tokio::spawn({
             async move {
                 let mut boojum_mode = false;
@@ -507,8 +505,8 @@ impl L1Fetcher {
                                     }
                                     sleep(Duration::from_secs(LONG_POLLING_INTERVAL_S)).await;
                                 }
-                                ParseError::BlobFormatError(inner) => {
-                                    tracing::error!("Cannot parse {}: {}", inner.0, inner.1);
+                                ParseError::BlobFormatError(data, inner) => {
+                                    tracing::error!("Cannot parse {}: {}", data, inner);
                                     cancellation_token.cancel();
                                     return last_block_number_processed;
                                 }
@@ -564,14 +562,6 @@ impl L1Fetcher {
     }
 }
 
-fn make_support(url: String) -> Box<dyn BlobSupport + Send + Sync> {
-    if url.starts_with("https://blobscan.com") {
-        Box::<ScrapingSupport>::default()
-    } else {
-        Box::new(ApiSupport::new(url))
-    }
-}
-
 pub async fn parse_calldata(
     l1_block_number: u64,
     commit_blocks_fn: &Function,

state-reconstruct-fetcher/src/lib.rs

@@ -1,7 +1,6 @@
 #![feature(array_chunks)]
 #![feature(iter_next_chunk)]
 
-pub mod api_support;
 pub mod blob_http_client;
 pub mod constants;
 pub mod l1_fetcher;

state-reconstruct-fetcher/src/types/mod.rs

@@ -1,4 +1,3 @@
-use blobscan_client::BlobResponseFormatError;
 use ethers::{abi, types::U256};
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
@@ -41,7 +40,7 @@ pub enum ParseError {
     BlobStorageError(String),
 
     #[error("blob format error: {0}")]
-    BlobFormatError(#[from] BlobResponseFormatError),
+    BlobFormatError(String, String),
 }
 
 #[derive(Debug, Serialize, Deserialize)]