From 8fc37686f5bd12728f7e84129e1d60150623537f Mon Sep 17 00:00:00 2001
From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:28:04 -0300
Subject: [PATCH 1/2] Remove kzgpad

---
 Cargo.lock                            |  9 -----
 core/node/da_clients/Cargo.toml       |  1 -
 core/node/da_clients/src/eigen/sdk.rs | 49 +++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 16152c6bf698..f12c8719d2bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5451,14 +5451,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "kzgpad-rs"
-version = "0.1.0"
-source = "git+https://github.com/Layr-Labs/kzgpad-rs.git?tag=v0.1.0#b5f8c8d3d6482407dc118cb1f51597a017a1cc89"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "lalrpop"
 version = "0.20.2"
@@ -12173,7 +12165,6 @@ dependencies = [
  "hex",
  "http 1.1.0",
  "jsonrpsee 0.23.2",
- "kzgpad-rs",
  "num-bigint 0.4.6",
  "parity-scale-codec 3.6.12",
  "pbjson-types",
diff --git a/core/node/da_clients/Cargo.toml b/core/node/da_clients/Cargo.toml
index 7283277d148a..a4abf758af20 100644
--- a/core/node/da_clients/Cargo.toml
+++ b/core/node/da_clients/Cargo.toml
@@ -56,7 +56,6 @@ pbjson-types.workspace = true
 # Eigen dependencies
 tokio-stream.workspace = true
 rlp.workspace = true
-kzgpad-rs = { git = "https://github.com/Layr-Labs/kzgpad-rs.git", tag = "v0.1.0" }
 rand.workspace = true
 sha3.workspace = true
 tiny-keccak.workspace = true
diff --git a/core/node/da_clients/src/eigen/sdk.rs b/core/node/da_clients/src/eigen/sdk.rs
index b7ae37260ff3..359c8e479ae3 100644
--- a/core/node/da_clients/src/eigen/sdk.rs
+++ b/core/node/da_clients/src/eigen/sdk.rs
@@ -344,8 +344,8 @@ impl RawEigenClient {
                 is_retriable: false,
             });
         }
-        //TODO: remove zkgpad_rs
-        let data = kzgpad_rs::remove_empty_byte_from_padded_bytes(&get_response.data);
+
+        let data = remove_empty_byte_from_padded_bytes(&get_response.data);
         Ok(Some(data))
     }
 }
@@ -383,3 +383,48 @@ fn convert_by_padding_empty_byte(data: &[u8]) -> Vec<u8> {
     valid_data.truncate(valid_end);
     valid_data
 }
+
+#[cfg(test)]
+fn remove_empty_byte_from_padded_bytes(data: &[u8]) -> Vec<u8> {
+    let parse_size = DATA_CHUNK_SIZE;
+
+    // Calculate the number of chunks
+    let data_len = (data.len() + parse_size - 1) / parse_size;
+
+    // Pre-allocate `valid_data` with enough space for all chunks
+    let mut valid_data = vec![0u8; data_len * (DATA_CHUNK_SIZE - 1)];
+    let mut valid_end = data_len * (DATA_CHUNK_SIZE - 1);
+
+    for (i, chunk) in data.chunks(parse_size).enumerate() {
+        let offset = i * (DATA_CHUNK_SIZE - 1);
+
+        let copy_end = offset + chunk.len() - 1;
+        valid_data[offset..copy_end].copy_from_slice(&chunk[1..]);
+
+        if i == data_len - 1 && chunk.len() < parse_size {
+            valid_end = offset + chunk.len() - 1;
+        }
+    }
+
+    valid_data.truncate(valid_end);
+    valid_data
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_pad_and_unpad() {
+        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let padded_data = super::convert_by_padding_empty_byte(&data);
+        let unpadded_data = super::remove_empty_byte_from_padded_bytes(&padded_data);
+        assert_eq!(data, unpadded_data);
+    }
+
+    #[test]
+    fn test_pad_and_unpad_large() {
+        let data = vec![1; 1000];
+        let padded_data = super::convert_by_padding_empty_byte(&data);
+        let unpadded_data = super::remove_empty_byte_from_padded_bytes(&padded_data);
+        assert_eq!(data, unpadded_data);
+    }
+}

From fbe5902bcdd0c8e5f11064a19f7734c7eb445562 Mon Sep 17 00:00:00 2001
From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:26:56 -0300
Subject: [PATCH 2/2] Move dependencies

---
 Cargo.lock                      | 245 +++++++-------------------------
 Cargo.toml                      |   5 +
 core/node/da_clients/Cargo.toml |  12 +-
 3 files changed, 63 insertions(+), 199 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f12c8719d2bd..25bd17479b5b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1767,28 +1767,16 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "bitvec"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
-dependencies = [
- "funty 1.1.0",
- "radium 0.6.2",
- "tap",
- "wyz 0.2.0",
-]
-
 [[package]]
 name = "bitvec"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
- "funty 2.0.0",
- "radium 0.7.0",
+ "funty",
+ "radium",
  "tap",
- "wyz 0.5.1",
+ "wyz",
 ]
 
 [[package]]
@@ -1958,7 +1946,7 @@ dependencies = [
  "crossbeam",
  "crypto-bigint 0.5.5",
  "derivative",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "firestorm",
  "itertools 0.10.5",
  "lazy_static",
@@ -3579,28 +3567,13 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "ethabi"
-version = "16.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5"
-dependencies = [
- "ethereum-types 0.12.1",
- "hex",
- "serde",
- "serde_json",
- "sha3 0.9.1",
- "thiserror",
- "uint",
-]
-
 [[package]]
 name = "ethabi"
 version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
 dependencies = [
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "hex",
  "once_cell",
  "regex",
@@ -3611,19 +3584,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
-dependencies = [
- "crunchy",
- "fixed-hash 0.7.0",
- "impl-rlp",
- "impl-serde 0.3.2",
- "tiny-keccak 2.0.2",
-]
-
 [[package]]
 name = "ethbloom"
 version = "0.13.0"
@@ -3631,37 +3591,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
 dependencies = [
  "crunchy",
- "fixed-hash 0.8.0",
+ "fixed-hash",
  "impl-rlp",
- "impl-serde 0.4.0",
+ "impl-serde",
  "tiny-keccak 2.0.2",
 ]
 
-[[package]]
-name = "ethereum-types"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
-dependencies = [
- "ethbloom 0.11.1",
- "fixed-hash 0.7.0",
- "impl-rlp",
- "impl-serde 0.3.2",
- "primitive-types 0.10.1",
- "uint",
-]
-
 [[package]]
 name = "ethereum-types"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
 dependencies = [
- "ethbloom 0.13.0",
- "fixed-hash 0.8.0",
+ "ethbloom",
+ "fixed-hash",
  "impl-rlp",
- "impl-serde 0.4.0",
- "primitive-types 0.12.2",
+ "impl-serde",
+ "primitive-types",
  "uint",
 ]
 
@@ -3773,18 +3719,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98"
 
-[[package]]
-name = "fixed-hash"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
-dependencies = [
- "byteorder",
- "rand 0.8.5",
- "rustc-hex",
- "static_assertions",
-]
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -3887,7 +3821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
 dependencies = [
  "cfg-if",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-info",
 ]
 
@@ -3898,7 +3832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
 dependencies = [
  "cfg-if",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-info",
  "serde",
 ]
@@ -3948,12 +3882,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -4881,22 +4809,13 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "impl-codec"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
-dependencies = [
- "parity-scale-codec 2.3.1",
-]
-
 [[package]]
 name = "impl-codec"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -4908,15 +4827,6 @@ dependencies = [
  "rlp",
 ]
 
-[[package]]
-name = "impl-serde"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "impl-serde"
 version = "0.4.0"
@@ -6551,20 +6461,6 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "parity-scale-codec"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
-dependencies = [
- "arrayvec 0.7.6",
- "bitvec 0.20.4",
- "byte-slice-cast",
- "impl-trait-for-tuples",
- "parity-scale-codec-derive 2.3.1",
- "serde",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.12"
@@ -6572,25 +6468,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
  "arrayvec 0.7.6",
- "bitvec 1.0.1",
+ "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
- "parity-scale-codec-derive 3.6.12",
+ "parity-scale-codec-derive",
  "serde",
 ]
 
-[[package]]
-name = "parity-scale-codec-derive"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.89",
- "quote 1.0.37",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "parity-scale-codec-derive"
 version = "3.6.12"
@@ -6991,29 +6875,16 @@ dependencies = [
  "elliptic-curve 0.13.8",
 ]
 
-[[package]]
-name = "primitive-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
-dependencies = [
- "fixed-hash 0.7.0",
- "impl-codec 0.5.1",
- "impl-rlp",
- "impl-serde 0.3.2",
- "uint",
-]
-
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
- "fixed-hash 0.8.0",
- "impl-codec 0.6.0",
+ "fixed-hash",
+ "impl-codec",
  "impl-rlp",
- "impl-serde 0.4.0",
+ "impl-serde",
  "scale-info",
  "uint",
 ]
@@ -7395,12 +7266,6 @@ dependencies = [
  "proc-macro2 1.0.89",
 ]
 
-[[package]]
-name = "radium"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
-
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -7780,7 +7645,7 @@ version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
- "bitvec 1.0.1",
+ "bitvec",
  "bytecheck",
  "bytes",
  "hashbrown 0.12.3",
@@ -7862,8 +7727,8 @@ dependencies = [
  "fastrlp",
  "num-bigint 0.4.6",
  "num-traits",
- "parity-scale-codec 3.6.12",
- "primitive-types 0.12.2",
+ "parity-scale-codec",
+ "primitive-types",
  "proptest",
  "rand 0.8.5",
  "rlp",
@@ -8165,7 +8030,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89"
 dependencies = [
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-info",
  "serde",
 ]
@@ -8177,8 +8042,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7caaf753f8ed1ab4752c6afb20174f03598c664724e0e32628e161c21000ff76"
 dependencies = [
  "derive_more 0.99.18",
- "parity-scale-codec 3.6.12",
- "primitive-types 0.12.2",
+ "parity-scale-codec",
+ "primitive-types",
  "scale-bits",
  "scale-decode-derive",
  "scale-info",
@@ -8205,8 +8070,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5"
 dependencies = [
  "derive_more 0.99.18",
- "parity-scale-codec 3.6.12",
- "primitive-types 0.12.2",
+ "parity-scale-codec",
+ "primitive-types",
  "scale-bits",
  "scale-encode-derive",
  "scale-info",
@@ -8232,10 +8097,10 @@ version = "2.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b"
 dependencies = [
- "bitvec 1.0.1",
+ "bitvec",
  "cfg-if",
  "derive_more 1.0.0",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-info-derive",
  "serde",
 ]
@@ -8276,7 +8141,7 @@ dependencies = [
  "derive_more 0.99.18",
  "either",
  "frame-metadata 15.1.0",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-bits",
  "scale-decode",
  "scale-encode",
@@ -8436,7 +8301,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 4.5.20",
- "ethabi 18.0.0",
+ "ethabi",
  "glob",
  "hex",
  "serde",
@@ -9574,11 +9439,11 @@ dependencies = [
  "frame-metadata 16.0.0",
  "futures 0.3.31",
  "hex",
- "impl-serde 0.4.0",
+ "impl-serde",
  "instant",
  "jsonrpsee 0.21.0",
- "parity-scale-codec 3.6.12",
- "primitive-types 0.12.2",
+ "parity-scale-codec",
+ "primitive-types",
  "scale-bits",
  "scale-decode",
  "scale-encode",
@@ -9606,7 +9471,7 @@ dependencies = [
  "heck 0.4.1",
  "hex",
  "jsonrpsee 0.21.0",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
  "scale-info",
@@ -9641,7 +9506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "365251668613323064803427af8c7c7bc366cd8b28e33639640757669dafebd5"
 dependencies = [
  "darling 0.20.10",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "proc-macro-error",
  "quote 1.0.37",
  "scale-typegen",
@@ -9656,7 +9521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c02aca8d39a1f6c55fff3a8fd81557d30a610fedc1cef03f889a81bc0f8f0b52"
 dependencies = [
  "frame-metadata 16.0.0",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "scale-info",
  "sp-core-hashing",
  "thiserror",
@@ -9671,7 +9536,7 @@ dependencies = [
  "bip39",
  "hex",
  "hmac 0.12.1",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "pbkdf2",
  "regex",
  "schnorrkel",
@@ -11324,12 +11189,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -11607,7 +11466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e0154bd4ae8202c96c52b29dd44f944bfd08c1c233fef843744463964de957"
 dependencies = [
  "bitflags 1.3.2",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "lazy_static",
  "sha2 0.10.8",
 ]
@@ -11620,7 +11479,7 @@ checksum = "e0769f7b27d8fb06e715da3290c575cac5d04d10a557faef180e847afce50ac4"
 dependencies = [
  "bitflags 2.6.0",
  "blake2 0.10.6",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "k256 0.11.6",
  "lazy_static",
  "sha2_ce",
@@ -11635,7 +11494,7 @@ checksum = "6be7bd5f0e0b61211f544147289640b4712715589d7f2fe5229d92a7a3ac64c0"
 dependencies = [
  "bitflags 2.6.0",
  "blake2 0.10.6",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "k256 0.13.4",
  "lazy_static",
  "sha2 0.10.8",
@@ -11650,7 +11509,7 @@ checksum = "b83f3b279248af4ca86dec20a54127f02110b45570f3f6c1d13df49ba75c28a5"
 dependencies = [
  "bitflags 2.6.0",
  "blake2 0.10.6",
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "k256 0.13.4",
  "lazy_static",
  "p256",
@@ -11689,7 +11548,7 @@ dependencies = [
  "anyhow",
  "bincode",
  "chrono",
- "ethabi 18.0.0",
+ "ethabi",
  "hex",
  "num_enum 0.7.3",
  "secrecy",
@@ -12057,7 +11916,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "chrono",
- "ethabi 18.0.0",
+ "ethabi",
  "hex",
  "regex",
  "semver 1.0.23",
@@ -12083,7 +11942,7 @@ name = "zksync_contracts"
 version = "0.1.0"
 dependencies = [
  "envy",
- "ethabi 18.0.0",
+ "ethabi",
  "hex",
  "once_cell",
  "serde",
@@ -12159,14 +12018,14 @@ dependencies = [
  "blake2b_simd",
  "bytes",
  "celestia-types",
- "ethabi 16.0.0",
+ "ethabi",
  "flate2",
  "futures 0.3.31",
  "hex",
  "http 1.1.0",
  "jsonrpsee 0.23.2",
  "num-bigint 0.4.6",
- "parity-scale-codec 3.6.12",
+ "parity-scale-codec",
  "pbjson-types",
  "prost 0.12.6",
  "rand 0.8.5",
@@ -12659,7 +12518,7 @@ dependencies = [
  "circuit_sequencer_api 0.141.2",
  "circuit_sequencer_api 0.142.2",
  "circuit_sequencer_api 0.150.7",
- "ethabi 18.0.0",
+ "ethabi",
  "hex",
  "itertools 0.10.5",
  "once_cell",
@@ -13223,7 +13082,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b310ab8a21681270e73f177ddf7974cabb7a96f0624ab8b008fd6ee1f9b4f687"
 dependencies = [
- "ethereum-types 0.14.1",
+ "ethereum-types",
  "franklin-crypto",
  "handlebars",
  "hex",
@@ -13369,7 +13228,7 @@ dependencies = [
 name = "zksync_test_account"
 version = "0.1.0"
 dependencies = [
- "ethabi 18.0.0",
+ "ethabi",
  "hex",
  "rand 0.8.5",
  "zksync_contracts",
@@ -13470,7 +13329,7 @@ version = "0.2.1"
 source = "git+https://github.com/matter-labs/vm2.git?rev=457d8a7eea9093af9440662e33e598c13ba41633#457d8a7eea9093af9440662e33e598c13ba41633"
 dependencies = [
  "enum_dispatch",
- "primitive-types 0.12.2",
+ "primitive-types",
  "zk_evm_abstractions 0.150.7",
  "zkevm_opcode_defs 0.150.7",
  "zksync_vm2_interface",
@@ -13481,7 +13340,7 @@ name = "zksync_vm2_interface"
 version = "0.2.1"
 source = "git+https://github.com/matter-labs/vm2.git?rev=457d8a7eea9093af9440662e33e598c13ba41633#457d8a7eea9093af9440662e33e598c13ba41633"
 dependencies = [
- "primitive-types 0.12.2",
+ "primitive-types",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e491c64605bc..6d651176ab6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -219,6 +219,11 @@ pbjson-types = "0.6.0"
 
 # Eigen
 tokio-stream = "0.1.16"
+alloy = { version = "0.3", features = ["full"] }
+rust-kzg-bn254 = {git = "https://github.com/lambdaclass/rust-kzg-bn254", branch = "bump-ark"}
+ark-bn254 = "0.5.0-alpha.0"
+num-bigint = "0.4.6"
+serial_test = "3.1.1"
 
 # 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
index a4abf758af20..7e9158d52f92 100644
--- a/core/node/da_clients/Cargo.toml
+++ b/core/node/da_clients/Cargo.toml
@@ -59,9 +59,9 @@ rlp.workspace = true
 rand.workspace = true
 sha3.workspace = true
 tiny-keccak.workspace = true
-alloy = { version = "0.3", features = ["full"] }
-ethabi = "16.0.0"
-rust-kzg-bn254 = {git = "https://github.com/lambdaclass/rust-kzg-bn254", branch = "bump-ark"}
-ark-bn254 = "0.5.0-alpha.0"
-num-bigint = "0.4.6"
-serial_test = "3.1.1"
+alloy.workspace = true
+ethabi.workspace = true
+rust-kzg-bn254.workspace = true
+ark-bn254.workspace = true
+num-bigint.workspace = true
+serial_test.workspace = true