feat(eigen-client-m0): Extract EigenDA client (#373)

* feat(state-keeper): mempool io opens batch if there is protocol upgrade tx (matter-labs#3360) ## What ❔ Mempool io opens batch if there is protocol upgrade tx ## Why ❔ Currently if mempool is empty but there is protocol upgrade tx, then batch is not opened ## Checklist   - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. * fix: Fixed cargo deny (matter-labs#3372) ## What ❔ Fixes cargo deny CI fail. * docs: interop docs update (matter-labs#3366) ## What ❔    ## Why ❔   ## Checklist   - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. * fix(tracer): adds vm error to flatCallTracer error field if exists (matter-labs#3374) ## What ❔    - Updates `flatCallTracer` error to include vm error if it exists ## Why ❔   - MM has requested that if an error exists we should populate within `flatCallTracer` as this is what others do, prior to this PR it was only revert_reason introduced here: matter-labs#3306. However, if we have a vm error the error field is not populated as seen in this tx: `0x6c85bf34666dcdaa885f2bc6e95186029d2b25f2a3bbdff21c36878e2d4a19ed` which failed due to a vm panic. ## Checklist   - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. * chore(main): release core 25.3.0 (matter-labs#3313) :robot: I have created a release *beep* *boop* --- ## [25.3.0](matter-labs/zksync-era@core-v25.2.0...core-v25.3.0) (2024-12-11) ### Features * change seal criteria for gateway ([matter-labs#3320](matter-labs#3320)) ([a0a74aa](matter-labs@a0a74aa)) * **contract-verifier:** Download compilers from GH automatically ([matter-labs#3291](matter-labs#3291)) ([a10c4ba](matter-labs@a10c4ba)) * integrate gateway changes for some components ([matter-labs#3274](matter-labs#3274)) ([cbc91e3](matter-labs@cbc91e3)) * **proof-data-handler:** exclude batches without object file in GCS ([matter-labs#2980](matter-labs#2980)) ([3e309e0](matter-labs@3e309e0)) * **pruning:** Record L1 batch root hash in pruning logs ([matter-labs#3266](matter-labs#3266)) ([7b6e590](matter-labs@7b6e590)) * **state-keeper:** mempool io opens batch if there is protocol upgrade tx ([matter-labs#3360](matter-labs#3360)) ([f6422cd](matter-labs@f6422cd)) * **tee:** add error handling for unstable_getTeeProofs API endpoint ([matter-labs#3321](matter-labs#3321)) ([26f630c](matter-labs@26f630c)) * **zksync_cli:** Health checkpoint improvements ([matter-labs#3193](matter-labs#3193)) ([440fe8d](matter-labs@440fe8d)) ### Bug Fixes * **api:** batch fee input scaling for `debug_traceCall` ([matter-labs#3344](matter-labs#3344)) ([7ace594](matter-labs@7ace594)) * **tee:** correct previous fix for race condition in batch locking ([matter-labs#3358](matter-labs#3358)) ([b12da8d](matter-labs@b12da8d)) * **tee:** fix race condition in batch locking ([matter-labs#3342](matter-labs#3342)) ([a7dc0ed](matter-labs@a7dc0ed)) * **tracer:** adds vm error to flatCallTracer error field if exists ([matter-labs#3374](matter-labs#3374)) ([5d77727](matter-labs@5d77727)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: zksync-era-bot <[email protected]> * feat(eigen-client-extra-features): Fix PR comments (#369) * Add envy load * Readd proto reference * Rename blob id to request id * Make literals constants * Make point size constant * Get pool unique * Remaining comments * Fix comment * Add check for failed states * Change l1 name * Cargo lock conflicts * remove concurrent dispatcher leftovers * Solve comments (#372) * Remove eigen client for external crate * Add real repo * remove METRICS var * Change proxy name and remove generic * feat(eigen-client-extra-features): address PR comments (#375) * Change settlement layer for u32 * Change string to address * Remove unwraps * Remove error from name * Remove unused to bytes * Rename call for get blob data * Revert "Change string to address" This reverts commit 6dd94d4. * Change string for address * feat(eigen-client-extra-features): address PR comments (part 2) (#374) * initial commit * clippy suggestion * feat(eigen-client-extra-features): address PR comments (part 3) (#376) * use keccak256 fn * simplify get_context_block * use saturating sub * feat(eigen-client-extra-features): address PR comments (part 4) (#378) * Replace decode bytes for ethabi * Add default to eigenconfig * Change str to url * Add index to data availability table * Address comments * Change error to verificationerror * Format code * feat(eigen-client-extra-features): address PR comments (part 5) (#377) * use trait object * prevent blocking non async code * clippy suggestion --------- Co-authored-by: juan518munoz <[email protected]> --------- Co-authored-by: Gianbelinche <[email protected]> --------- Co-authored-by: Gianbelinche <[email protected]> * Format code --------- Co-authored-by: juan518munoz <[email protected]> * Fix compilation * Update branch --------- Co-authored-by: perekopskiy <[email protected]> Co-authored-by: Bruno França <[email protected]> Co-authored-by: kelemeno <[email protected]> Co-authored-by: Dustin Brickwood <[email protected]> Co-authored-by: zksync-era-bot <[email protected]> Co-authored-by: zksync-era-bot <[email protected]> Co-authored-by: Juan Munoz <[email protected]> Co-authored-by: juan518munoz <[email protected]>
lambdaclass · Jan 3, 2025 · 1a35d67 · 1a35d67
1 parent 93d8c02
commit 1a35d67
Show file tree

Hide file tree

Showing 13 changed files with 1,144 additions and 3,689 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -222,11 +222,7 @@ tonic = { version = "0.11.0", default-features = false }
 pbjson-types = "0.6.0"
 
 # Eigen
-tokio-stream = "0.1.16"
-rust-kzg-bn254 = "0.2.1"
-ark-bn254 = "0.5.0"
-num-bigint = "0.4.6"
-serial_test = "3.1.1"
+eigenda-client-rs = {git = "https://github.com/lambdaclass/eigenda-client-rs", branch = "client-implementation", package = "eigen-client"}
 
 # Here and below:
 # We *always* pin the latest version of protocol to disallow accidental changes in the execution logic.

diff --git a/core/node/da_clients/Cargo.toml b/core/node/da_clients/Cargo.toml
@@ -54,17 +54,5 @@ tonic = { workspace = true, features = ["tls-roots", "prost", "codegen"] }
 pbjson-types.workspace = true
 
 # Eigen dependencies
-tokio-stream.workspace = true
-rand.workspace = true
-sha3.workspace = true
-tiny-keccak.workspace = true
-ethabi.workspace = true
-rust-kzg-bn254.workspace = true
-ark-bn254.workspace = true
-num-bigint.workspace = true
-zksync_web3_decl.workspace = true
-zksync_eth_client.workspace = true
-url.workspace = true
-
-[dev-dependencies]
-serial_test.workspace = true
+eigenda-client-rs.workspace = true
+zksync_dal.workspace = true
diff --git a/core/node/da_clients/src/eigen/blob_info.rs b/core/node/da_clients/src/eigen/blob_info.rs
diff --git a/core/node/da_clients/src/eigen/client.rs b/core/node/da_clients/src/eigen/client.rs
@@ -1,48 +1,77 @@
-use std::{str::FromStr, sync::Arc};
+use std::{error::Error, str::FromStr};
 
-use async_trait::async_trait;
-use secp256k1::SecretKey;
+use eigenda_client_rs::{client::GetBlobData, EigenClient};
 use subxt_signer::ExposeSecret;
 use zksync_config::{configs::da_client::eigen::EigenSecrets, EigenConfig};
 use zksync_da_client::{
     types::{DAError, DispatchResponse, InclusionData},
     DataAvailabilityClient,
 };
+use zksync_dal::{ConnectionPool, Core, CoreDal};
 
-use super::sdk::RawEigenClient;
 use crate::utils::to_retriable_da_error;
 
-#[async_trait]
-pub trait GetBlobData: std::fmt::Debug + Send + Sync {
-    async fn get_blob_data(&self, input: &str) -> anyhow::Result<Option<Vec<u8>>>;
-
-    fn clone_boxed(&self) -> Box<dyn GetBlobData>;
-}
-
-/// EigenClient is a client for the Eigen DA service.
+// We can't implement DataAvailabilityClient for an outside struct, so it is needed to defined this intermediate struct
 #[derive(Debug, Clone)]
-pub struct EigenClient {
-    pub(crate) client: Arc<RawEigenClient>,
+pub struct EigenDAClient {
+    client: EigenClient,
 }
-
-impl EigenClient {
+impl EigenDAClient {
     pub async fn new(
         config: EigenConfig,
         secrets: EigenSecrets,
-        get_blob_data: Box<dyn GetBlobData>,
+        pool: ConnectionPool<Core>,
     ) -> anyhow::Result<Self> {
-        let private_key = SecretKey::from_str(secrets.private_key.0.expose_secret().as_str())
-            .map_err(|e| anyhow::anyhow!("Failed to parse private key: {}", e))?;
+        let eigen_config = eigenda_client_rs::config::EigenConfig {
+            disperser_rpc: config.disperser_rpc,
+            settlement_layer_confirmation_depth: config.settlement_layer_confirmation_depth,
+            eigenda_eth_rpc: config.eigenda_eth_rpc.ok_or(anyhow::anyhow!(
+                "eigenda_eth_rpc is required for EigenClient"
+            ))?,
+            eigenda_svc_manager_address: config.eigenda_svc_manager_address,
+            wait_for_finalization: config.wait_for_finalization,
+            authenticated: config.authenticated,
+            g1_url: config.g1_url,
+            g2_url: config.g2_url,
+        };
+        let private_key =
+            eigenda_client_rs::config::PrivateKey::from_str(secrets.private_key.0.expose_secret())
+                .map_err(|_| anyhow::anyhow!("Invalid private key"))?;
+        let eigen_secrets = eigenda_client_rs::config::EigenSecrets { private_key };
+        let get_blob_data = GetBlobFromDB { pool };
+        let client = EigenClient::new(eigen_config, eigen_secrets, Box::new(get_blob_data))
+            .await
+            .map_err(|e| anyhow::anyhow!("Eigen client Error: {:?}", e))?;
+        Ok(Self { client })
+    }
+}
 
-        let client = RawEigenClient::new(private_key, config, get_blob_data).await?;
-        Ok(Self {
-            client: Arc::new(client),
-        })
+#[derive(Debug, Clone)]
+pub struct GetBlobFromDB {
+    pool: ConnectionPool<Core>,
+}
+
+#[async_trait::async_trait]
+impl GetBlobData for GetBlobFromDB {
+    async fn get_blob_data(
+        &self,
+        input: &str,
+    ) -> Result<Option<Vec<u8>>, Box<dyn Error + Send + Sync>> {
+        let mut conn = self.pool.connection_tagged("eigen_client").await?;
+        let batch = conn
+            .data_availability_dal()
+            .get_blob_data_by_blob_id(input)
+            .await?;
+        Ok(batch.map(|b| b.pubdata))
+    }
+
+    fn clone_boxed(&self) -> Box<dyn GetBlobData> {
+        Box::new(self.clone())
     }
 }
 
-#[async_trait]
-impl DataAvailabilityClient for EigenClient {
+#[async_trait::async_trait]
+impl DataAvailabilityClient for EigenDAClient {
     async fn dispatch_blob(
         &self,
         _: u32, // batch number
@@ -77,6 +106,6 @@ impl DataAvailabilityClient for EigenClient {
     }
 
     fn blob_size_limit(&self) -> Option<usize> {
-        Some(RawEigenClient::blob_size_limit())
+        self.client.blob_size_limit()
     }
 }