diff --git a/Cargo.lock b/Cargo.lock index a7853c936..6ffd0d88e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2491,6 +2491,12 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +[[package]] +name = "hex-literal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcb5b3e439c92a7191df2f9bbe733de8de55c3f86368cdb1c63f8be7e9e328e" + [[package]] name = "hkdf" version = "0.12.3" @@ -3076,7 +3082,6 @@ dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", "sha2 0.10.6", - "sha3", ] [[package]] @@ -4667,7 +4672,7 @@ dependencies = [ "educe", "futures", "generic-array", - "hex-literal", + "hex-literal 0.3.4", "hmac", "pin-project", "rand 0.8.5", @@ -4695,7 +4700,7 @@ dependencies = [ "ethers-core", "futures", "hex", - "hex-literal", + "hex-literal 0.3.4", "metrics", "pin-project", "proptest", @@ -4748,7 +4753,7 @@ dependencies = [ "async-trait", "auto_impl", "futures", - "hex-literal", + "hex-literal 0.3.4", "modular-bitfield", "parity-scale-codec", "rand 0.8.5", @@ -4936,7 +4941,7 @@ dependencies = [ "fixed-hash", "hash-db", "hex", - "hex-literal", + "hex-literal 0.3.4", "impl-serde", "modular-bitfield", "once_cell", @@ -5031,7 +5036,7 @@ dependencies = [ "criterion", "ethereum-types", "ethnum", - "hex-literal", + "hex-literal 0.3.4", "pprof", "reth-rlp", "reth-rlp-derive", @@ -5279,8 +5284,9 @@ dependencies = [ [[package]] name = "revm" -version = "3.0.0" -source = "git+https://github.com/bluealloy/revm#c2ee8ff5b4f0262565fa65a6a95c2a430116fa68" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f8e1d10d4d381e657b40c7fc704373ea5985a6a77a48a048ae0b969d5072b3" dependencies = [ "auto_impl", "revm-interpreter", @@ -5289,8 +5295,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "1.0.0" -source = "git+https://github.com/bluealloy/revm#c2ee8ff5b4f0262565fa65a6a95c2a430116fa68" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd02c0cf375af9e4bc3d5ed645de9b28fe911793adce0c2b94f52ecff6818c23" dependencies = [ "derive_more", "enumn", @@ -5300,10 +5307,11 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "2.0.0" -source = "git+https://github.com/bluealloy/revm#c2ee8ff5b4f0262565fa65a6a95c2a430116fa68" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95e1299235ef4580feb34b68c2ff13b59bc09dbbf6ed5f1d50ec5731f17c422" dependencies = [ - "k256 0.11.6", + "k256 0.13.0", "num", "once_cell", "revm-primitives", @@ -5316,8 +5324,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "1.0.0" -source = "git+https://github.com/bluealloy/revm#c2ee8ff5b4f0262565fa65a6a95c2a430116fa68" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f75dc073614bcab964c77a58f66755d5be6f99cd2ca438dc4a561b04f34894a" dependencies = [ "arbitrary", "auto_impl", @@ -5328,7 +5337,7 @@ dependencies = [ "fixed-hash", "hashbrown 0.13.2", "hex", - "hex-literal", + "hex-literal 0.4.0", "primitive-types", "proptest", "proptest-derive", diff --git a/Cargo.toml b/Cargo.toml index e2bd810c1..937b85a69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,5 @@ inherits = "release" debug = true [patch.crates-io] -revm = { git = "https://github.com/bluealloy/revm" } -revm-primitives = { git = "https://github.com/bluealloy/revm" } # patched for quantity U256 responses ruint = { git = "https://github.com/paradigmxyz/uint" } diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index d8a81d115..6a571efba 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -11,7 +11,7 @@ reth-codecs = { path = "../storage/codecs" } reth-primitives = { path = "../primitives" } reth-rpc-types = { path = "../rpc/rpc-types" } reth-network-api = { path = "../net/network-api" } -revm-primitives = "1.0" +revm-primitives = "1.1" async-trait = "0.1.57" thiserror = "1.0.37" auto_impl = "1.0" diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 99f63d4ce..7beb0d52e 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -13,7 +13,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.0", features = ["serde"] } +revm-primitives = { version = "1.1", features = ["serde"] } # ethereum ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false } @@ -67,7 +67,7 @@ serde_json = "1.0" hex-literal = "0.3" test-fuzz = "3.0.4" rand = "0.8" -revm-primitives = { version = "1.0", features = ["arbitrary"] } +revm-primitives = { version = "1.1", 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 6b4848371..d03eaeba2 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -17,7 +17,7 @@ reth-executor = { path = "../executor" } reth-consensus-common = { path = "../consensus/common" } # revm -revm = { version = "3.0.0" } +revm = { version = "3.1.0" } # common tracing = "0.1.37" diff --git a/crates/revm/revm-inspectors/Cargo.toml b/crates/revm/revm-inspectors/Cargo.toml index 19e5c34f7..cd19d8ab4 100644 --- a/crates/revm/revm-inspectors/Cargo.toml +++ b/crates/revm/revm-inspectors/Cargo.toml @@ -11,7 +11,7 @@ description = "revm inspector implementations used by reth" reth-primitives = { path = "../../primitives" } reth-rpc-types = { path = "../../rpc/rpc-types" } -revm = { version = "3.0.0" } +revm = { version = "3.1.0" } # 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 eab09ed76..78bcaedb5 100644 --- a/crates/revm/revm-primitives/Cargo.toml +++ b/crates/revm/revm-primitives/Cargo.toml @@ -10,4 +10,4 @@ description = "core reth specific revm utilities" # reth reth-primitives = { path = "../../primitives" } -revm = { version = "3.0.0" } +revm = { version = "3.1.0" } diff --git a/crates/rlp/Cargo.toml b/crates/rlp/Cargo.toml index 606d74b03..02d27d934 100644 --- a/crates/rlp/Cargo.toml +++ b/crates/rlp/Cargo.toml @@ -13,7 +13,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.0.0", features = ["serde"] } +revm-primitives = { version = "1.1.0", 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 fad39cfd2..20a95332f 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -25,9 +25,9 @@ reth-revm = { path = "../../revm" } reth-tasks = { path = "../../tasks" } # eth -revm = { version = "3.0.0", features = ["optional_block_gas_limit", "optional_eip3607", "optional_no_base_fee"] } +revm = { version = "3.1.0", features = ["optional_block_gas_limit", "optional_eip3607", "optional_no_base_fee"] } ethers-core = { git = "https://github.com/gakonst/ethers-rs", features = ["eip712"] } -revm-primitives = { version = "1.0", features = ["serde"] } +revm-primitives = { version = "1.1", features = ["serde"] } # rpc diff --git a/crates/storage/codecs/Cargo.toml b/crates/storage/codecs/Cargo.toml index f39c6143c..54c81a80e 100644 --- a/crates/storage/codecs/Cargo.toml +++ b/crates/storage/codecs/Cargo.toml @@ -23,7 +23,7 @@ arbitrary = [ [dependencies] bytes = "1.4" codecs-derive = { version = "0.1.0", path = "./derive", default-features = false } -revm-primitives = { version = "1.0.0", features = ["serde"] } +revm-primitives = { version = "1.1.0", features = ["serde"] } # arbitrary utils arbitrary = { version = "1.1.7", features = ["derive"], optional = true } @@ -31,7 +31,7 @@ proptest = { version = "1.0", optional = true } proptest-derive = { version = "0.3", optional = true } [dev-dependencies] -revm-primitives = {version = "1.0.0", features = [ +revm-primitives = {version = "1.1.0", features = [ "serde", "arbitrary" ] } diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml index ee016459b..d8969f199 100644 --- a/crates/storage/provider/Cargo.toml +++ b/crates/storage/provider/Cargo.toml @@ -17,7 +17,7 @@ reth-codecs = { path = "../codecs" } reth-tracing = {path = "../../tracing"} reth-rlp = {path = "../../rlp"} -revm-primitives = "1.0.0" +revm-primitives = "1.1.0" # trie cita_trie = "4.0.0"