From df9dfa6b6fe1334bb7cf493ba79ea79cf99af6cc Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 6 Jun 2023 13:47:55 +0200 Subject: [PATCH] chore(deps): use revm and revm-primitives as workspace deps (#3017) --- Cargo.toml | 5 +++++ crates/interfaces/Cargo.toml | 2 +- crates/payload/basic/Cargo.toml | 2 +- crates/payload/builder/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 4 ++-- crates/revm/Cargo.toml | 2 +- crates/revm/revm-inspectors/Cargo.toml | 2 +- crates/revm/revm-primitives/Cargo.toml | 2 +- crates/rlp/Cargo.toml | 2 +- crates/rpc/rpc/Cargo.toml | 4 ++-- crates/storage/codecs/Cargo.toml | 4 ++-- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bacd6527e..06996bb17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,4 +74,9 @@ incremental = false ruint = { git = "https://github.com/paradigmxyz/uint" } [workspace.dependencies] +## eth +revm = { version = "3" } +revm-primitives = "1.1" + +## misc tracing = "^0.1.0" diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index 8bec5a372..c4680cedd 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -16,7 +16,7 @@ reth-network-api = { path = "../net/network-api" } reth-eth-wire = { path = "../net/eth-wire" } # eth -revm-primitives = "1.1" +revm-primitives = { workspace = true } parity-scale-codec = { version = "3.2.1", features = ["bytes"] } # async diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml index f2d62ab02..a939c6378 100644 --- a/crates/payload/basic/Cargo.toml +++ b/crates/payload/basic/Cargo.toml @@ -20,7 +20,7 @@ reth-tasks = { path = "../../tasks" } reth-metrics = { path = "../../metrics" } ## ethereum -revm = { version = "3" } +revm = { workspace = true } ## async tokio = { version = "1", features = ["sync", "time"] } diff --git a/crates/payload/builder/Cargo.toml b/crates/payload/builder/Cargo.toml index 6af8d6ef5..650d8a512 100644 --- a/crates/payload/builder/Cargo.toml +++ b/crates/payload/builder/Cargo.toml @@ -18,7 +18,7 @@ reth-revm-primitives = { path = "../../revm/revm-primitives" } reth-metrics = { path = "../../metrics" } ## ethereum -revm-primitives = "1.1" +revm-primitives = { workspace = true } ## async tokio = { version = "1", features = ["sync"] } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 15a5f3bfa..c7ab1044e 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -14,7 +14,7 @@ reth-rlp = { path = "../rlp", features = ["std", "derive", "ethereum-types"] } reth-rlp-derive = { path = "../rlp/rlp-derive" } reth-codecs = { version = "0.1.0", path = "../storage/codecs" } -revm-primitives = { version = "1.1", features = ["serde"] } +revm-primitives = { workspace = true, features = ["serde"] } # ethereum ethers-core = { version = "2.0.7", default-features = false } @@ -75,7 +75,7 @@ serde_json = "1.0" hex-literal = "0.3" test-fuzz = "3.0.4" rand = "0.8" -revm-primitives = { version = "1.1", features = ["arbitrary"] } +revm-primitives = { workspace = true, features = ["arbitrary"] } arbitrary = { version = "1.1.7", features = ["derive"] } proptest = { version = "1.0" } proptest-derive = "0.3" diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index 867c774c7..cb9e0a060 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -18,7 +18,7 @@ reth-revm-inspectors = { path = "./revm-inspectors" } reth-consensus-common = { path = "../consensus/common" } # revm -revm = { version = "3" } +revm = { workspace = true } # common tracing = { workspace = true } diff --git a/crates/revm/revm-inspectors/Cargo.toml b/crates/revm/revm-inspectors/Cargo.toml index 68bd2cb85..5d8730750 100644 --- a/crates/revm/revm-inspectors/Cargo.toml +++ b/crates/revm/revm-inspectors/Cargo.toml @@ -13,7 +13,7 @@ description = "revm inspector implementations used by reth" reth-primitives = { path = "../../primitives" } reth-rpc-types = { path = "../../rpc/rpc-types" } -revm = { version = "3" } +revm = { workspace = true } # remove from reth and reexport from revm hashbrown = "0.13" diff --git a/crates/revm/revm-primitives/Cargo.toml b/crates/revm/revm-primitives/Cargo.toml index 7652c920a..8fd10a6b5 100644 --- a/crates/revm/revm-primitives/Cargo.toml +++ b/crates/revm/revm-primitives/Cargo.toml @@ -12,4 +12,4 @@ description = "core reth specific revm utilities" # reth reth-primitives = { path = "../../primitives" } -revm = { version = "3" } +revm = { workspace = true } diff --git a/crates/rlp/Cargo.toml b/crates/rlp/Cargo.toml index 703a6acab..3e31af614 100644 --- a/crates/rlp/Cargo.toml +++ b/crates/rlp/Cargo.toml @@ -15,7 +15,7 @@ bytes = { version = "1", default-features = false } ethnum = { version = "1", default-features = false, optional = true } smol_str = { version = "0.1", default-features = false, optional = true } ethereum-types = { version = "0.14", features = ["codec"], optional = true } -revm-primitives = { version = "1.1", features = ["serde"] } +revm-primitives = { workspace = true, features = ["serde"] } reth-rlp-derive = { version = "0.1", path = "./rlp-derive", optional = true } [dev-dependencies] diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index f985a4da7..0ef535250 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -24,13 +24,13 @@ reth-revm = { path = "../../revm" } reth-tasks = { path = "../../tasks" } # eth -revm = { version = "3", features = [ +revm = { workspace = true, features = [ "optional_block_gas_limit", "optional_eip3607", "optional_no_base_fee", ] } ethers-core = { version = "2.0.7", features = ["eip712"] } -revm-primitives = { version = "1.1", features = ["serde"] } +revm-primitives = { workspace = true, features = ["serde"] } # rpc jsonrpsee = { version = "0.18" } diff --git a/crates/storage/codecs/Cargo.toml b/crates/storage/codecs/Cargo.toml index 14c86b900..b5ca60a5d 100644 --- a/crates/storage/codecs/Cargo.toml +++ b/crates/storage/codecs/Cargo.toml @@ -18,7 +18,7 @@ arbitrary = ["revm-primitives/arbitrary", "dep:arbitrary", "dep:proptest", "dep: [dependencies] bytes = "1.4" codecs-derive = { version = "0.1.0", path = "./derive", default-features = false } -revm-primitives = { version = "1.1", features = ["serde"] } +revm-primitives = { workspace = true, features = ["serde"] } # arbitrary utils arbitrary = { version = "1.1.7", features = ["derive"], optional = true } @@ -26,7 +26,7 @@ proptest = { version = "1.0", optional = true } proptest-derive = { version = "0.3", optional = true } [dev-dependencies] -revm-primitives = { version = "1.1", features = ["serde", "arbitrary"] } +revm-primitives = { workspace = true, features = ["serde", "arbitrary"] } serde = "1.0" modular-bitfield = "0.11.2"