Add call to verify

core/bin/zksync_server/src/node_builder.rs

@@ -519,7 +519,7 @@ impl MainNodeBuilder {
                     .add_layer(ObjectStorageClientWiringLayer::new(config));
             }
             DAClient::EigenDA(config) => {
-                self.node.add_layer(EigenDAWiringLayer::new(config, self.contracts_config.eigenda_verifier_addr));
+                self.node.add_layer(EigenDAWiringLayer::new(config, self.contracts_config.eigenda_verifier_addr.unwrap()));
             }
         }
 

core/lib/contracts/src/lib.rs

@@ -63,7 +63,10 @@ const LOADNEXT_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json";
 const LOADNEXT_SIMPLE_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/Foo.json";
-
+const EIGENDA_VERIFIER_CONTRACT_FILE: (&str, &str) = (
+    "eigenda",
+    "EigendaVerifier.sol/EigendaVerifier.json",
+);
 fn home_path() -> PathBuf {
     Workspace::locate().core()
 }
@@ -162,6 +165,10 @@ pub fn verifier_contract() -> Contract {
     load_contract_for_both_compilers(VERIFIER_CONTRACT_FILE)
 }
 
+pub fn eigenda_verifier_contract() -> Contract {
+  load_contract_for_both_compilers(EIGENDA_VERIFIER_CONTRACT_FILE)
+}
+
 #[derive(Debug, Clone)]
 pub struct TestContract {
     /// Contract bytecode to be used for sending deploy transaction.

core/node/da_clients/src/eigen_da.rs

@@ -38,7 +38,7 @@ impl EigenDAClient {
     pub async fn verify_blob(
         &self,
         commitment: String,
-    ) -> Result<U256, ContractCallError> {
+    ) -> Result<U256, types::DAError> {
         let data = &hex::decode(commitment).unwrap()[3..];
 
         let blob_info: BlobInfo = match decode(&data) {
@@ -48,11 +48,14 @@ impl EigenDAClient {
 
         CallFunctionArgs::new("verifyBlob", blob_info)
             .for_contract(
-                self.verifier_address, //todo
-                &zksync_contracts::hyperchain_contract(), // todo
+                self.verifier_address, 
+                &zksync_contracts::eigenda_verifier_contract(),
             )
             .call(&self.eth_client)
-            .await
+            .await.map_err(|e| DAError {
+                error: e.into(),
+                is_retriable: true,
+            })
     }
 }
 
@@ -81,6 +84,7 @@ impl DataAvailabilityClient for EigenDAClient {
         self.verify_blob(
             hex::encode(request_id.clone()),
         ).await?;
+
         Ok(types::DispatchResponse {
             blob_id: hex::encode(request_id),
         })

core/node/node_framework/src/implementations/layers/da_clients/eigen_da.rs

@@ -1,10 +1,11 @@
 use zksync_config::configs::da_client::eigen_da::EigenDAConfig;
 use zksync_da_client::DataAvailabilityClient;
 use zksync_da_clients::eigen_da::EigenDAClient;
+use zksync_node_framework_derive::FromContext;
 use zksync_types::Address;
 
 use crate::{
-    implementations::resources::da_client::DAClientResource,
+    implementations::resources::{da_client::DAClientResource, eth_interface::EthInterfaceResource},
     wiring_layer::{WiringError, WiringLayer},
     IntoContext,
 };
@@ -27,9 +28,15 @@ pub struct Output {
     pub client: DAClientResource,
 }
 
+#[derive(Debug, FromContext)]
+#[context(crate = crate)]
+pub struct Input {
+    pub eth_client: EthInterfaceResource,
+}
+
 #[async_trait::async_trait]
 impl WiringLayer for EigenDAWiringLayer {
-    type Input = ();
+    type Input = Input;
     type Output = Output;
 
     fn layer_name(&self) -> &'static str {

zk_toolbox/crates/config/src/contracts.rs

@@ -71,6 +71,7 @@ impl ContractsConfig {
             .diamond_cut_data
             .clone_from(&deploy_l1_output.contracts_config.diamond_cut_data);
         self.l1.chain_admin_addr = deploy_l1_output.deployed_addresses.chain_admin;
+        self.l1.eigenda_verifier_addr = deploy_l1_output.deployed_addresses.eigenda_verifier_addr;
     }
 
     pub fn set_chain_contracts(&mut self, register_chain_output: &RegisterChainOutput) {
@@ -151,6 +152,7 @@ pub struct L1Contracts {
     pub verifier_addr: Address,
     pub validator_timelock_addr: Address,
     pub base_token_addr: Address,
+    pub eigenda_verifier_addr: Address,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]

zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs

@@ -48,6 +48,7 @@ pub struct DeployL1DeployedAddressesOutput {
     pub bridgehub: L1BridgehubOutput,
     pub bridges: L1BridgesOutput,
     pub state_transition: L1StateTransitionOutput,
+    pub eigenda_verifier_addr: Address,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]