refactor(l1, l2, levm): fix shared dependencies in workspace Cargo.toml

Cargo.toml

@@ -45,12 +45,11 @@ ethrex-prover = { path = "./crates/l2/prover" }
 
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
-
 ethereum-types = { version = "0.15.1", features = ["serialize"] }
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.135"
 libmdbx = { version = "0.5.0", features = ["orm"] }
-bytes = { version = "1.6.0", features = ["serde"] }
+bytes = "1.9.0"
 tokio = { version = "1.41.1", features = ["full"] }
 thiserror = "2.0.9"
 hex = "0.4.3"
@@ -73,3 +72,14 @@ secp256k1 = { version = "0.29", default-features = false, features = [
 ] }
 keccak-hash = "0.11.0"
 axum = "0.8.1"
+anyhow = "1.0.86"
+directories = "5.0.1"
+tinyvec = "1.6.0"
+revm = { version = "14.0.3", default-features = false }
+spinoff = "0.8.0"
+colored = "2.1.0"
+envy = "0.4.2"
+sha2 = "0.10.8"
+datatest-stable = "0.2.9"
+itertools = "0.13.0"
+clap_complete = "4.5.17"

cmd/ef_tests/ethrex/Cargo.toml

@@ -15,7 +15,7 @@ hex.workspace = true
 lazy_static.workspace = true
 
 [dev-dependencies]
-datatest-stable = "0.2.9"
+datatest-stable.workspace = true
 
 [lib]
 path = "./ef_tests.rs"

cmd/ef_tests/levm/Cargo.toml

@@ -15,22 +15,22 @@ serde_json.workspace = true
 bytes.workspace = true
 hex.workspace = true
 keccak-hash.workspace = true
-colored = "2.1.0"
-spinoff = "0.8.0"
+colored.workspace = true
+spinoff.workspace = true
 thiserror.workspace = true
 clap = { version = "4.3", features = ["derive"] }
-clap_complete = "4.5.17"
-itertools = "0.13.0"
-revm = { version = "14.0.3", features = [
+clap_complete.workspace = true
+itertools.workspace = true
+revm = { workspace = true, features = [
     "serde",
     "std",
     "serde-json",
     "optional_no_base_fee",
     "optional_block_gas_limit",
-], default-features = false }
+] }
 
 [dev-dependencies]
-hex = "0.4.3"
+hex.workspace = true
 
 [lib]
 path = "./ef_tests.rs"

cmd/ethrex/Cargo.toml

@@ -20,19 +20,19 @@ hex.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 k256.workspace = true
-clap = { version = "4.5.4", features = ["cargo"] }
-directories = "5.0.1"
+directories.workspace = true
 serde_json.workspace = true
-tokio = { version = "1.38.0", features = ["full"] }
-anyhow = "1.0.86"
-rand = "0.8.5"
-local-ip-address = "0.6"
+tokio = { workspace = true, features = ["full"] }
+anyhow.workspace = true
+rand.workspace = true
 tokio-util.workspace = true
 libmdbx = { workspace = true, optional = true }
 redb = { workspace = true, optional = true }
 lazy_static.workspace = true
+cfg-if.workspace = true
 
-cfg-if = "1.0.0"
+local-ip-address = "0.6"
+clap = { version = "4.5.4", features = ["cargo"] }
 
 ethrex-dev = { path = "../../crates/blockchain/dev", optional = true }
 ethrex-metrics = { path = "../../crates/blockchain/metrics" }

cmd/ethrex_l2/Cargo.toml

@@ -4,6 +4,14 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
+ethrex-l2.workspace = true
+ethrex-sdk.workspace = true
+ethrex-core.workspace = true
+ethrex-blockchain.workspace = true
+ethrex-prover.workspace = true
+ethrex-rlp.workspace = true
+ethrex-rpc.workspace = true
+
 serde_json.workspace = true
 serde.workspace = true
 bytes.workspace = true
@@ -12,27 +20,20 @@ tokio.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tracing.workspace = true
 hex.workspace = true
+clap_complete.workspace = true
+colored.workspace = true
+spinoff.workspace = true
+itertools.workspace = true
+secp256k1.workspace = true
+keccak-hash.workspace = true
+
 log = "0.4"
 clap = { version = "4.3", features = ["derive"] }
-clap_complete = "4.5.17"
 eyre = "0.6"
 dirs = "5.0.1"
 toml = "0.8.19"
 dialoguer = "0.11"
-colored = "2.1.0"
-spinoff = "0.8.0"
-itertools = "0.13.0"
 strum = "0.26.3"
-secp256k1.workspace = true
-keccak-hash.workspace = true
-
-ethrex-l2.workspace = true
-ethrex-sdk.workspace = true
-ethrex-core.workspace = true
-ethrex-blockchain.workspace = true
-ethrex-prover.workspace = true
-ethrex-rlp.workspace = true
-ethrex-rpc.workspace = true
 
 [[bin]]
 name = "ethrex_l2"

cmd/loc/Cargo.toml

@@ -4,11 +4,12 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
+serde.workspace = true
+serde_json.workspace = true
+
 tokei = "12.1.2"
-serde = "1.0.215"
-serde_json = "1.0.133"
 clap = { version = "4.3", features = ["derive"] }
-clap_complete = "4.5.17"
-colored = "2.1.0"
-spinoff = "0.8.0"
+clap_complete.workspace = true
+colored.workspace = true
+spinoff.workspace = true
 prettytable = "0.10.0"

crates/blockchain/Cargo.toml

@@ -6,24 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-thiserror.workspace = true
-sha3.workspace = true
-tracing.workspace = true
-bytes.workspace = true
-cfg-if = "1.0.0"
-
 ethrex-rlp.workspace = true
 ethrex-core = { path = "../common", default-features = false }
 ethrex-storage = { path = "../storage/store", default-features = false }
 ethrex-vm = { path = "../vm", default-features = false }
-
-k256 = { version = "0.13.3", features = ["ecdh"] }
-
 ethrex-metrics = { path = "./metrics", default-features = false }
 
+thiserror.workspace = true
+sha3.workspace = true
+tracing.workspace = true
+bytes.workspace = true
+cfg-if.workspace = true
+k256 = { workspace = true, features = ["ecdh"] }
+
 [dev-dependencies]
 serde_json.workspace = true
-hex = "0.4.3"
+hex.workspace = true
 
 [lib]
 path = "./blockchain.rs"

crates/blockchain/dev/Cargo.toml

@@ -17,10 +17,11 @@ serde.workspace = true
 bytes.workspace = true
 ethereum-types.workspace = true
 hex.workspace = true
-reqwest = { version = "0.12.7", features = ["json"] }
-envy = "0.4.2"
+envy.workspace = true
 keccak-hash.workspace = true
-sha2 = "0.10.8"
+sha2.workspace = true
+
+reqwest = { version = "0.12.7", features = ["json"] }
 
 [lib]
 path = "./dev.rs"

crates/blockchain/metrics/Cargo.toml

@@ -6,18 +6,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+ethrex-core = { path = "../../common", default-features = false }
+
 tokio = { workspace = true, optional = true }
 tracing = { workspace = true, optional = true }
 thiserror.workspace = true
 serde_json.workspace = true
 serde.workspace = true
-
-ethrex-core = { path = "../../common", default-features = false }
-
-
-prometheus = { version = "0.13.4", optional = true }
 axum = { workspace = true, optional = true }
 
+prometheus = { version = "0.13.4", optional = true }
 
 [lib]
 path = "./mod.rs"

crates/common/Cargo.toml

@@ -9,23 +9,24 @@ edition = "2021"
 ethrex-rlp.workspace = true
 ethrex-trie = { path = "../storage/trie", default-features = false }
 
-tinyvec = "1.6.0"
+tinyvec.workspace = true
 ethereum-types.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 k256.workspace = true
 # TODO(#1102): Move to Lambdaworks in the future
-c-kzg = { version = "^1.0.3", optional = true }
 keccak-hash.workspace = true
 sha3.workspace = true
 secp256k1.workspace = true
-once_cell = "1.20.2"
 crc32fast.workspace = true
 bytes.workspace = true
 hex.workspace = true
 lazy_static.workspace = true
 
+c-kzg = { version = "^1.0.3", optional = true }
+once_cell = "1.20.2"
+
 [dev-dependencies]
 hex-literal.workspace = true
 

crates/common/rlp/Cargo.toml

@@ -4,7 +4,7 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-tinyvec = "1.6.0"
+tinyvec.workspace = true
 thiserror.workspace = true
 bytes.workspace = true
 hex.workspace = true

crates/l2/Cargo.toml

@@ -6,41 +6,40 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest.workspace = true
-tokio.workspace = true
-tokio-util.workspace = true
-tracing.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-ethereum-types.workspace = true
 ethrex-core.workspace = true
 ethrex-rlp.workspace = true
 ethrex-rpc.workspace = true
 ethrex-blockchain.workspace = true
 ethrex-storage.workspace = true
 ethrex-vm.workspace = true
 ethrex-dev = { path = "../../crates/blockchain/dev" }
+ethrex-metrics = { path = "../blockchain/metrics", default-features = false }
+
+reqwest.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
+tracing.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+ethereum-types.workspace = true
 hex.workspace = true
 bytes.workspace = true
 jsonwebtoken.workspace = true
 secp256k1.workspace = true
 keccak-hash.workspace = true
-envy = "0.4.2"
+envy.workspace = true
 thiserror.workspace = true
-directories = "5.0.1"
+directories.workspace = true
 
 zkvm_interface = { path = "./prover/zkvm/interface/", default-features = false }
-
 # risc0
 risc0-zkvm = { version = "1.2.0" }
 # sp1
 sp1-sdk = { version = "3.4.0" }
 ethrex-sdk = { path = "./sdk" }
 
-ethrex-metrics = { path = "../blockchain/metrics", default-features = false }
-
 [dev-dependencies]
-rand = "0.8.5"
+rand.workspace = true
 
 
 [lib]

crates/l2/contracts/Cargo.toml

@@ -6,22 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokio = { version = "1.38.0", features = ["full"] }
+ethrex-l2 = { path = "../../l2" }
+ethrex-sdk = { path = "../../l2/sdk" }
+ethrex-core = { path = "../../common" }
+
+tokio = { workspace = true, features = ["full"] }
 ethereum-types = { workspace = true, features = ["serialize"] }
-bytes = { version = "1.6.0", features = ["serde"] }
+bytes = { workspace = true, features = ["serde"] }
 secp256k1.workspace = true
 keccak-hash.workspace = true
-hex = "0.4.3"
-spinoff = "0.8.0"
-colored = "2.1.0"
-lazy_static = "1.5.0"
+hex.workspace = true
+spinoff.workspace = true
+colored.workspace = true
+lazy_static.workspace = true
 tracing.workspace = true
 thiserror.workspace = true
 
-ethrex-l2 = { path = "../../l2" }
-ethrex-sdk = { path = "../../l2/sdk" }
-ethrex-core = { path = "../../common" }
-
 [[bin]]
 name = "ethrex_l2_l1_deployer"
 path = "./deployer.rs"

crates/l2/prover/Cargo.toml

@@ -4,6 +4,11 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
+ethrex-core.workspace = true
+ethrex-vm.workspace = true
+ethrex-rlp.workspace = true
+ethrex-l2.workspace = true
+
 serde_json.workspace = true
 serde.workspace = true
 bytes.workspace = true
@@ -15,24 +20,13 @@ tracing.workspace = true
 hex.workspace = true
 thiserror.workspace = true
 
-# ethrex
-ethrex-core.workspace = true
-ethrex-vm.workspace = true
-ethrex-rlp.workspace = true
-
-# l2
-ethrex-l2.workspace = true
-
 zkvm_interface = { path = "./zkvm/interface", default-features = false }
-
 # risc0
 risc0-zkvm = { version = "1.2.0" }
-
 # sp1
 sp1-sdk = "3.4.0"
 
 [dev-dependencies]
-ethrex-vm.workspace = true
 ethrex-storage.workspace = true
 ethrex-blockchain.workspace = true