merge main (#272)

lambdaclass · Sep 17, 2024 · 9193313 · 9193313
1 parent 6178498
commit 9193313
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -465,6 +465,9 @@ jobs:
           wait $PID3
           wait $PID4
 
+          ci_run zk_supervisor test recovery --no-deps --no-kill --ignore-prerequisites --verbose --chain validium &> ${{ env.GENESIS_RECOVERY_LOGS_DIR }}/validium.log &
+          PID2=$!
+
       # Upgrade tests should run last, because as soon as they
       # finish the bootloader will be different
       # TODO make upgrade tests safe to run multiple times
@@ -475,7 +478,6 @@ jobs:
       - name: Upload logs
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: always()
-
         with:
           name: logs
           path: logs
diff --git a/core/lib/config/src/configs/da_client/mod.rs b/core/lib/config/src/configs/da_client/mod.rs
@@ -7,6 +7,7 @@ pub mod avail;
 pub mod eigen_da;
 
 pub const EIGENDA_CLIENT_CONFIG_NAME: &str = "EigenDA";
+
 pub const AVAIL_CLIENT_CONFIG_NAME: &str = "Avail";
 pub const OBJECT_STORE_CLIENT_CONFIG_NAME: &str = "ObjectStore";
 

diff --git a/core/lib/protobuf_config/src/da_client.rs b/core/lib/protobuf_config/src/da_client.rs
@@ -1,11 +1,9 @@
 use anyhow::Context;
 use zksync_config::{
-    configs::{
-        da_client::{
-            eigen_da::EigenDAConfig,
-            DAClient::{Avail, EigenDA, ObjectStore},
-        },
-        {self},
+    configs,
+    configs::da_client::{
+        eigen_da::EigenDAConfig,
+        DAClient::{Avail, EigenDA, ObjectStore},
     },
     AvailConfig,
 };

diff --git a/core/node/da_clients/Cargo.toml b/core/node/da_clients/Cargo.toml
@@ -39,5 +39,5 @@ parity-scale-codec = { workspace = true, features = ["derive"] }
 subxt-signer = { workspace = true, features = ["sr25519", "native"] }
 
 # EigenDA dependencies
-reqwest = { version= "0.12" }
+reqwest = { version = "0.12" }
 http = "1"