From c466874e9a584d595a882678bbcc255c85489ecd Mon Sep 17 00:00:00 2001 From: Roshan Date: Wed, 5 Jun 2024 15:33:55 +0800 Subject: [PATCH] resolve merge conflicts --- .github/workflows/lint-actions.yml | 19 - Cargo.lock | 1199 ++++++++--------- Cargo.toml | 10 +- Makefile | 2 +- crates/ethereum-forks/src/hardfork.rs | 12 +- crates/node-core/src/args/utils.rs | 1 - crates/optimism/evm/src/execute.rs | 7 +- .../src/providers/database/provider.rs | 2 +- 8 files changed, 588 insertions(+), 664 deletions(-) delete mode 100644 .github/workflows/lint-actions.yml diff --git a/.github/workflows/lint-actions.yml b/.github/workflows/lint-actions.yml deleted file mode 100644 index d60885ad54..0000000000 --- a/.github/workflows/lint-actions.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Lint GitHub Actions workflows -on: - pull_request: - merge_group: - push: - branches: [main] - -jobs: - actionlint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Download actionlint - id: get_actionlint - run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) - shell: bash - - name: Check workflow files - run: SHELLCHECK_OPTS="-S error" ${{ steps.get_actionlint.outputs.executable }} -color - shell: bash diff --git a/Cargo.lock b/Cargo.lock index 22dd5abf93..d57f263121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,15 +77,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -132,13 +123,16 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "arbitrary", "c-kzg", + "proptest", + "proptest-derive", "serde", ] @@ -176,16 +170,14 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "arbitrary", "c-kzg", "derive_more", - "ethereum_ssz", - "ethereum_ssz_derive", "once_cell", "proptest", "proptest-derive", @@ -210,10 +202,10 @@ dependencies = [ [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "serde", "serde_json", ] @@ -244,7 +236,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", "serde", @@ -256,16 +248,17 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-signer", "alloy-sol-types", "async-trait", + "auto_impl", "futures-utils-wasm", "thiserror", ] @@ -273,9 +266,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "k256", "serde_json", @@ -315,14 +308,16 @@ dependencies = [ [[package]] name = "alloy-provider" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-chains", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-json-rpc", "alloy-network", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-rpc-types-trace", "alloy-transport", "alloy-transport-http", @@ -333,7 +328,9 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", + "pin-project", "reqwest 0.12.4", + "serde", "serde_json", "tokio", "tracing", @@ -365,7 +362,7 @@ dependencies = [ [[package]] name = "alloy-rpc-client" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -385,14 +382,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-sol-types", "arbitrary", "itertools 0.12.1", @@ -425,38 +422,37 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "serde", ] [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "alloy-rpc-types-engine", "serde", "serde_with", + "thiserror", ] [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "ethereum_ssz", - "ethereum_ssz_derive", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "jsonrpsee-types", "jsonwebtoken 9.3.0", "rand 0.8.5", @@ -467,11 +463,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "serde", "serde_json", ] @@ -479,7 +475,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", "serde", @@ -499,7 +495,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-primitives", "async-trait", @@ -512,9 +508,9 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-network", "alloy-primitives", "alloy-signer", @@ -601,7 +597,7 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -619,7 +615,7 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=61140ec#61140ec42988abed6db3d2d38044b2918e08d2a9" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -632,9 +628,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb28aa4ecd32fdfa1b1bdd111ff7357dd562c6b2372694cf9e613434fcba659" +checksum = "03704f265cbbb943b117ecb5055fd46e8f41e7dc8a58b1aed20bcd40ace38c15" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1060,17 +1056,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "attohttpc" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" -dependencies = [ - "http 0.2.12", - "log", - "url", -] - [[package]] name = "aurora-engine-modexp" version = "1.1.0" @@ -1161,6 +1146,22 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "beacon-api-sidecar-fetcher" +version = "0.1.0" +dependencies = [ + "alloy-rpc-types-beacon", + "clap", + "eyre", + "futures-util", + "reqwest 0.12.4", + "reth", + "reth-node-ethereum", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "beacon-api-sse" version = "0.0.0" @@ -1515,6 +1516,21 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "bsc-p2p" +version = "0.0.0" +dependencies = [ + "reth-discv4", + "reth-network", + "reth-network-api", + "reth-primitives", + "reth-tracing", + "secp256k1 0.28.2", + "serde_json", + "tokio", + "tokio-stream", +] + [[package]] name = "bstr" version = "0.2.17" @@ -1757,7 +1773,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -2449,62 +2465,14 @@ dependencies = [ "tracing", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - [[package]] name = "darling" version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -2517,39 +2485,17 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.65", ] -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.9", + "darling_core", "quote", "syn 2.0.65", ] @@ -2671,31 +2617,6 @@ dependencies = [ "syn 2.0.65", ] -[[package]] -name = "derive_builder" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling 0.10.2", - "derive_builder_core", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" -dependencies = [ - "darling 0.10.2", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -2823,18 +2744,6 @@ dependencies = [ "syn 2.0.65", ] -[[package]] -name = "dns-lookup" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" -dependencies = [ - "cfg-if", - "libc", - "socket2 0.4.10", - "winapi", -] - [[package]] name = "downcast" version = "0.11.0" @@ -2925,21 +2834,18 @@ dependencies = [ [[package]] name = "ef-tests" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "rayon", "reth-db", "reth-evm-ethereum", - "reth-interfaces", "reth-primitives", "reth-provider", - "reth-revm", "reth-stages", "serde", "serde_json", "thiserror", - "tokio", "walkdir", ] @@ -3003,24 +2909,12 @@ dependencies = [ "k256", "log", "rand 0.8.5", - "secp256k1", + "secp256k1 0.28.2", "serde", "sha3", "zeroize", ] -[[package]] -name = "enum-as-inner" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum-as-inner" version = "0.6.0" @@ -3111,18 +3005,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "ethereum_ssz_derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6085d7fd3cf84bd2b8fec150d54c8467fb491d8db9c460607c5534f653a0ee38" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -3192,11 +3074,8 @@ dependencies = [ "reth", "reth-exex", "reth-node-api", - "reth-node-core", "reth-node-ethereum", - "reth-primitives", "reth-tracing", - "tokio", ] [[package]] @@ -3206,44 +3085,38 @@ dependencies = [ "alloy-sol-types", "eyre", "futures", - "itertools 0.12.1", "reth", "reth-exex", "reth-node-api", - "reth-node-core", "reth-node-ethereum", "reth-primitives", "reth-provider", "reth-tracing", "rusqlite", - "tokio", ] [[package]] name = "exex-rollup" version = "0.0.0" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-rlp", "alloy-sol-types", "eyre", "foundry-blob-explorers", - "futures", "once_cell", "reth", - "reth-cli-runner", + "reth-execution-errors", "reth-exex", - "reth-interfaces", "reth-node-api", - "reth-node-core", "reth-node-ethereum", "reth-primitives", "reth-provider", "reth-revm", + "reth-testing-utils", "reth-tracing", - "reth-trie", "rusqlite", - "secp256k1", + "secp256k1 0.28.2", "serde_json", "tokio", ] @@ -3511,23 +3384,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-test" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce388237b32ac42eca0df1ba55ed3bbda4eaf005d7d4b5dbc0b20ab962928ac9" -dependencies = [ - "futures-core", - "futures-executor", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "futures-util", - "pin-project", - "pin-utils", -] - [[package]] name = "futures-timer" version = "3.0.3" @@ -4055,20 +3911,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-system-resolver" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eea26c5d0b6ab9d72219f65000af310f042a740926f7b2fa3553e774036e2e7" -dependencies = [ - "derive_builder", - "dns-lookup", - "hyper 0.14.28", - "tokio", - "tower-service", - "tracing", -] - [[package]] name = "hyper-util" version = "0.1.3" @@ -4135,7 +3977,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -4271,17 +4113,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -4302,25 +4133,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "igd-next" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" -dependencies = [ - "async-trait", - "attohttpc", - "bytes", - "futures", - "http 0.2.12", - "hyper 0.14.28", - "log", - "rand 0.8.5", - "tokio", - "url", - "xmltree", -] - [[package]] name = "impl-codec" version = "0.6.0" @@ -5138,7 +4950,7 @@ dependencies = [ "reth-network", "reth-network-types", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "tokio", ] @@ -5157,12 +4969,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" version = "2.7.2" @@ -5198,49 +5004,33 @@ dependencies = [ [[package]] name = "metrics" -version = "0.21.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" dependencies = [ "ahash", - "metrics-macros", "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.12.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" +checksum = "5d58e362dc7206e9456ddbcdbd53c71ba441020e62104703075a69151e38d85f" dependencies = [ - "base64 0.21.7", - "hyper 0.14.28", - "indexmap 1.9.3", - "ipnet", + "base64 0.22.1", + "indexmap 2.2.6", "metrics", "metrics-util", "quanta", "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "metrics-macros" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.65", ] [[package]] name = "metrics-process" -version = "1.0.14" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2a67e2580fbeba4d5a96e659945981e700a383b4cea1432e0cfc18f58c5da" +checksum = "e7d8f5027620bf43b86e2c8144beea1e4323aec39241f5eae59dee54f79c6a29" dependencies = [ "libproc", "mach2", @@ -5248,20 +5038,20 @@ dependencies = [ "once_cell", "procfs", "rlimit", - "windows", + "windows 0.56.0", ] [[package]] name = "metrics-util" -version = "0.15.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.13.2", - "indexmap 1.9.3", + "hashbrown 0.14.5", + "indexmap 2.2.6", "metrics", "num_cpus", "ordered-float", @@ -5488,7 +5278,6 @@ name = "node-custom-rpc" version = "0.0.0" dependencies = [ "clap", - "eyre", "jsonrpsee", "reth", "reth-node-ethereum", @@ -5514,6 +5303,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -5721,9 +5519,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -6088,7 +5886,7 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-tracing", - "secp256k1", + "secp256k1 0.28.2", "serde_json", "tokio", "tokio-stream", @@ -6336,35 +6134,13 @@ dependencies = [ ] [[package]] -name = "public-ip" -version = "0.2.2" +name = "quanta" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4c40db5262d93298c363a299f8bc1b3a956a78eecddba3bc0e58b76e2f419a" -dependencies = [ - "dns-lookup", - "futures-core", - "futures-util", - "http 0.2.12", - "hyper 0.14.28", - "hyper-system-resolver", - "pin-project-lite", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "trust-dns-client", - "trust-dns-proto 0.20.4", -] - -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", - "mach2", "once_cell", "raw-cpuid", "wasi 0.11.0+wasi-snapshot-preview1", @@ -6523,11 +6299,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.7.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -6585,7 +6361,7 @@ version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-automata 0.4.6", "regex-syntax 0.8.3", @@ -6606,7 +6382,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-syntax 0.8.3", ] @@ -6730,7 +6506,7 @@ dependencies = [ [[package]] name = "reth" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "ahash", "alloy-rlp", @@ -6763,14 +6539,18 @@ dependencies = [ "reth-consensus", "reth-consensus-common", "reth-db", + "reth-db-common", "reth-discv4", + "reth-discv5", "reth-downloaders", + "reth-errors", "reth-ethereum-payload-builder", "reth-evm", "reth-exex", - "reth-interfaces", + "reth-fs-util", "reth-network", "reth-network-api", + "reth-network-p2p", "reth-nippy-jar", "reth-node-api", "reth-node-builder", @@ -6778,6 +6558,7 @@ dependencies = [ "reth-node-ethereum", "reth-node-events", "reth-node-optimism", + "reth-optimism-primitives", "reth-payload-builder", "reth-payload-validator", "reth-primitives", @@ -6806,20 +6587,22 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "futures-util", "reth-beacon-consensus", "reth-consensus", "reth-engine-primitives", "reth-evm", - "reth-interfaces", + "reth-execution-errors", + "reth-network-p2p", "reth-network-types", "reth-primitives", "reth-provider", "reth-revm", "reth-rpc-types", "reth-stages-api", + "reth-tokio-util", "reth-transaction-pool", "tokio", "tokio-stream", @@ -6828,14 +6611,13 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "futures-core", "futures-util", "metrics", "reth-engine-primitives", - "reth-interfaces", "reth-metrics", "reth-payload-builder", "reth-primitives", @@ -6850,23 +6632,26 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "assert_matches", "futures", + "itertools 0.12.1", "metrics", "reth-blockchain-tree", + "reth-blockchain-tree-api", "reth-config", "reth-consensus", "reth-db", "reth-downloaders", "reth-engine-primitives", + "reth-errors", "reth-ethereum-consensus", "reth-ethereum-engine-primitives", "reth-evm", "reth-evm-ethereum", - "reth-interfaces", "reth-metrics", + "reth-network-p2p", "reth-payload-builder", "reth-payload-validator", "reth-primitives", @@ -6892,33 +6677,47 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "aquamarine", "assert_matches", "linked_hash_set", - "lru", "metrics", "parking_lot 0.12.2", + "reth-blockchain-tree-api", "reth-consensus", "reth-db", "reth-evm", "reth-evm-ethereum", - "reth-interfaces", + "reth-execution-errors", "reth-metrics", + "reth-network", "reth-primitives", "reth-provider", "reth-revm", "reth-stages-api", + "reth-storage-errors", + "reth-testing-utils", "reth-trie", "reth-trie-parallel", "tokio", "tracing", ] +[[package]] +name = "reth-blockchain-tree-api" +version = "0.2.0-beta.8" +dependencies = [ + "reth-consensus", + "reth-execution-errors", + "reth-primitives", + "reth-storage-errors", + "thiserror", +] + [[package]] name = "reth-cli-runner" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-tasks", "tokio", @@ -6927,10 +6726,11 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "arbitrary", "bytes", @@ -6945,7 +6745,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6956,15 +6756,12 @@ dependencies = [ [[package]] name = "reth-config" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "confy", "humantime-serde", - "reth-discv4", - "reth-net-nat", "reth-network", "reth-primitives", - "secp256k1", "serde", "tempfile", "toml", @@ -6972,7 +6769,7 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "auto_impl", "reth-primitives", @@ -6981,18 +6778,18 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "mockall", + "rand 0.8.5", "reth-consensus", - "reth-interfaces", "reth-primitives", - "reth-provider", + "reth-storage-api", ] [[package]] name = "reth-db" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "arbitrary", "assert_matches", @@ -7012,24 +6809,44 @@ dependencies = [ "proptest-derive", "rand 0.8.5", "reth-codecs", - "reth-interfaces", + "reth-fs-util", "reth-libmdbx", "reth-metrics", "reth-nippy-jar", "reth-primitives", + "reth-storage-errors", "reth-tracing", "rustc-hash", "serde", "serde_json", "strum", + "sysinfo", "tempfile", "test-fuzz", "thiserror", ] +[[package]] +name = "reth-db-common" +version = "0.2.0-beta.8" +dependencies = [ + "eyre", + "reth-codecs", + "reth-config", + "reth-db", + "reth-etl", + "reth-primitives", + "reth-provider", + "reth-trie", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "reth-discv4" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "assert_matches", @@ -7043,7 +6860,8 @@ dependencies = [ "reth-network-types", "reth-primitives", "reth-tracing", - "secp256k1", + "schnellru", + "secp256k1 0.28.2", "serde", "thiserror", "tokio", @@ -7053,7 +6871,7 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "derive_more", @@ -7069,7 +6887,7 @@ dependencies = [ "reth-network-types", "reth-primitives", "reth-tracing", - "secp256k1", + "secp256k1 0.28.2", "thiserror", "tokio", "tracing", @@ -7077,7 +6895,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "data-encoding", @@ -7090,7 +6908,7 @@ dependencies = [ "reth-primitives", "reth-tracing", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_with", "thiserror", @@ -7102,7 +6920,7 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "assert_matches", @@ -7116,12 +6934,13 @@ dependencies = [ "reth-config", "reth-consensus", "reth-db", - "reth-interfaces", "reth-metrics", + "reth-network-p2p", "reth-network-types", "reth-primitives", "reth-provider", "reth-tasks", + "reth-testing-utils", "reth-tracing", "tempfile", "thiserror", @@ -7133,28 +6952,26 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-network", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-signer", "alloy-signer-wallet", "eyre", "futures-util", "jsonrpsee", - "rand 0.8.5", "reth", "reth-db", "reth-node-builder", - "reth-node-core", - "reth-node-ethereum", "reth-payload-builder", "reth-primitives", "reth-provider", "reth-rpc", + "reth-rpc-layer", + "reth-tokio-util", "reth-tracing", - "secp256k1", "serde_json", "tokio", "tokio-stream", @@ -7163,7 +6980,7 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -7182,7 +6999,7 @@ dependencies = [ "reth-net-common", "reth-network-types", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", "thiserror", @@ -7195,7 +7012,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -7203,9 +7020,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reth-errors" +version = "0.2.0-beta.8" +dependencies = [ + "reth-blockchain-tree-api", + "reth-consensus", + "reth-execution-errors", + "reth-fs-util", + "reth-storage-errors", + "thiserror", +] + [[package]] name = "reth-eth-wire" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "arbitrary", @@ -7213,7 +7042,6 @@ dependencies = [ "bytes", "derive_more", "futures", - "metrics", "pin-project", "proptest", "proptest-derive", @@ -7227,7 +7055,7 @@ dependencies = [ "reth-network-types", "reth-primitives", "reth-tracing", - "secp256k1", + "secp256k1 0.28.2", "serde", "snap", "test-fuzz", @@ -7240,7 +7068,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "arbitrary", @@ -7250,11 +7078,10 @@ dependencies = [ "proptest", "proptest-derive", "rand 0.8.5", - "reth-codecs", + "reth-codecs-derive", "reth-net-common", "reth-primitives", "reth-tracing", - "secp256k1", "serde", "test-fuzz", "thiserror", @@ -7263,7 +7090,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -7272,7 +7099,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -7287,7 +7114,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7302,9 +7129,12 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-basic-payload-builder", + "reth-errors", + "reth-evm", + "reth-evm-ethereum", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -7316,7 +7146,7 @@ dependencies = [ [[package]] name = "reth-etl" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "rayon", "reth-db", @@ -7326,34 +7156,42 @@ dependencies = [ [[package]] name = "reth-evm" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "auto_impl", "futures-util", "parking_lot 0.12.2", - "reth-interfaces", + "reth-execution-errors", "reth-primitives", + "reth-storage-errors", "revm", "revm-primitives", ] [[package]] name = "reth-evm-ethereum" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-sol-types", + "reth-ethereum-consensus", "reth-evm", - "reth-interfaces", "reth-primitives", "reth-revm", + "reth-testing-utils", "revm-primitives", - "tracing", + "secp256k1 0.28.2", + "serde_json", ] [[package]] name = "reth-evm-optimism" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "reth-consensus-common", "reth-evm", - "reth-interfaces", + "reth-execution-errors", + "reth-optimism-consensus", "reth-primitives", "reth-provider", "reth-revm", @@ -7363,9 +7201,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-execution-errors" +version = "0.2.0-beta.8" +dependencies = [ + "reth-consensus", + "reth-primitives", + "reth-storage-errors", + "thiserror", +] + +[[package]] +name = "reth-execution-types" +version = "0.2.0-beta.8" +dependencies = [ + "reth-evm", + "reth-execution-errors", + "reth-primitives", + "reth-trie", + "revm", +] + [[package]] name = "reth-exex" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "eyre", "metrics", @@ -7384,28 +7243,16 @@ dependencies = [ ] [[package]] -name = "reth-interfaces" -version = "0.2.0-beta.7" +name = "reth-fs-util" +version = "0.2.0-beta.8" dependencies = [ - "auto_impl", - "clap", - "futures", - "parking_lot 0.12.2", - "rand 0.8.5", - "reth-consensus", - "reth-eth-wire-types", - "reth-network-api", - "reth-network-types", - "reth-primitives", - "secp256k1", + "serde_json", "thiserror", - "tokio", - "tracing", ] [[package]] name = "reth-ipc" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "async-trait", "bytes", @@ -7427,7 +7274,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -7449,7 +7296,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "bindgen", "cc", @@ -7458,7 +7305,7 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "futures", "metrics", @@ -7469,7 +7316,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "metrics", "once_cell", @@ -7483,30 +7330,28 @@ dependencies = [ [[package]] name = "reth-net-common" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "alloy-primitives", "pin-project", - "reth-network-types", "tokio", ] [[package]] name = "reth-net-nat" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ - "igd-next", - "pin-project-lite", - "public-ip", + "futures-util", + "reqwest 0.12.4", "reth-tracing", "serde_with", "thiserror", "tokio", - "tracing", ] [[package]] name = "reth-network" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-node-bindings", "alloy-provider", @@ -7519,10 +7364,8 @@ dependencies = [ "enr", "fnv", "futures", - "futures-test", "humantime-serde", "itertools 0.12.1", - "linked_hash_set", "metrics", "parking_lot 0.12.2", "pin-project", @@ -7534,11 +7377,11 @@ dependencies = [ "reth-dns-discovery", "reth-ecies", "reth-eth-wire", - "reth-interfaces", "reth-metrics", "reth-net-common", "reth-network", "reth-network-api", + "reth-network-p2p", "reth-network-types", "reth-primitives", "reth-provider", @@ -7548,7 +7391,7 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "serial_test", @@ -7563,28 +7406,45 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "alloy-primitives", "enr", - "reth-discv4", "reth-eth-wire", "reth-network-types", - "reth-primitives", "reth-rpc-types", "serde", "thiserror", "tokio", ] +[[package]] +name = "reth-network-p2p" +version = "0.2.0-beta.8" +dependencies = [ + "auto_impl", + "futures", + "parking_lot 0.12.2", + "reth-consensus", + "reth-eth-wire-types", + "reth-network-api", + "reth-network-types", + "reth-primitives", + "reth-storage-errors", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "reth-network-types" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-primitives", "alloy-rlp", "enr", "rand 0.8.5", - "secp256k1", + "secp256k1 0.28.2", "serde_json", "serde_with", "thiserror", @@ -7593,7 +7453,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "anyhow", "bincode", @@ -7603,7 +7463,7 @@ dependencies = [ "memmap2 0.7.1", "ph", "rand 0.8.5", - "reth-primitives", + "reth-fs-util", "serde", "sucds", "tempfile", @@ -7614,7 +7474,7 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-db", "reth-engine-primitives", @@ -7628,7 +7488,7 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "aquamarine", "confy", @@ -7642,11 +7502,12 @@ dependencies = [ "reth-config", "reth-consensus", "reth-db", + "reth-db-common", "reth-downloaders", "reth-evm", "reth-exex", - "reth-interfaces", "reth-network", + "reth-network-p2p", "reth-node-api", "reth-node-core", "reth-node-events", @@ -7656,6 +7517,8 @@ dependencies = [ "reth-prune", "reth-rpc", "reth-rpc-engine-api", + "reth-rpc-layer", + "reth-rpc-types", "reth-stages", "reth-static-file", "reth-tasks", @@ -7668,9 +7531,9 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ - "assert_matches", + "alloy-rpc-types-engine", "clap", "const-str", "derive_more", @@ -7680,7 +7543,6 @@ dependencies = [ "futures", "humantime", "hyper 0.14.28", - "jsonrpsee", "metrics", "metrics-exporter-prometheus", "metrics-process", @@ -7691,37 +7553,32 @@ dependencies = [ "proptest", "rand 0.8.5", "reth-beacon-consensus", - "reth-codecs", "reth-config", "reth-consensus-common", "reth-db", "reth-discv4", "reth-discv5", "reth-engine-primitives", - "reth-etl", - "reth-evm", - "reth-interfaces", + "reth-fs-util", "reth-metrics", "reth-net-nat", "reth-network", - "reth-network-api", + "reth-network-p2p", "reth-primitives", "reth-provider", "reth-rpc", "reth-rpc-api", "reth-rpc-builder", - "reth-rpc-engine-api", "reth-rpc-types", "reth-rpc-types-compat", + "reth-storage-errors", "reth-tasks", "reth-tracing", "reth-transaction-pool", - "reth-trie", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "shellexpand", - "tempfile", "thiserror", "tikv-jemalloc-ctl", "tokio", @@ -7732,7 +7589,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "eyre", "futures", @@ -7760,7 +7617,7 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "futures", "humantime", @@ -7781,7 +7638,7 @@ dependencies = [ [[package]] name = "reth-node-optimism" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-primitives", "async-trait", @@ -7798,7 +7655,6 @@ dependencies = [ "reth-e2e-test-utils", "reth-evm", "reth-evm-optimism", - "reth-interfaces", "reth-network", "reth-node-api", "reth-node-builder", @@ -7812,7 +7668,6 @@ dependencies = [ "reth-rpc-types-compat", "reth-tracing", "reth-transaction-pool", - "revm", "revm-primitives", "serde", "serde_json", @@ -7823,7 +7678,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -7832,7 +7687,7 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "reth-basic-payload-builder", @@ -7852,15 +7707,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-optimism-primitives" +version = "0.2.0-beta.8" + [[package]] name = "reth-payload-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "futures-util", "metrics", "reth-engine-primitives", + "reth-errors", "reth-ethereum-engine-primitives", - "reth-interfaces", "reth-metrics", "reth-primitives", "reth-provider", @@ -7876,7 +7735,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -7885,21 +7744,21 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-chains", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-trie", "arbitrary", "assert_matches", "byteorder", "bytes", "c-kzg", - "clap", "criterion", "derive_more", "hash-db", @@ -7916,13 +7775,13 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-network-types", + "reth-static-file-types", "revm", "revm-primitives", "roaring", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", - "strum", "sucds", "tempfile", "test-fuzz", @@ -7934,9 +7793,10 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", + "alloy-rpc-types-engine", "assert_matches", "auto_impl", "dashmap", @@ -7946,14 +7806,20 @@ dependencies = [ "pin-project", "rand 0.8.5", "rayon", + "reth-blockchain-tree-api", "reth-codecs", "reth-db", + "reth-errors", "reth-evm", - "reth-interfaces", + "reth-execution-types", + "reth-fs-util", "reth-metrics", + "reth-network-p2p", "reth-nippy-jar", "reth-primitives", - "reth-rpc-types", + "reth-storage-api", + "reth-storage-errors", + "reth-testing-utils", "reth-trie", "revm", "strum", @@ -7965,36 +7831,38 @@ dependencies = [ [[package]] name = "reth-prune" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "assert_matches", - "derive_more", "itertools 0.12.1", "metrics", "rayon", "reth-config", "reth-db", - "reth-interfaces", + "reth-errors", "reth-metrics", "reth-primitives", "reth-provider", "reth-stages", + "reth-testing-utils", "reth-tokio-util", "reth-tracing", "thiserror", "tokio", - "tokio-stream", "tracing", ] [[package]] name = "reth-revm" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "alloy-rlp", "reth-consensus-common", - "reth-interfaces", + "reth-execution-errors", "reth-primitives", - "reth-provider", + "reth-storage-api", + "reth-storage-errors", "reth-trie", "revm", "tracing", @@ -8002,7 +7870,7 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -8023,10 +7891,10 @@ dependencies = [ "pin-project", "rand 0.8.5", "reth-consensus-common", + "reth-errors", "reth-evm", "reth-evm-ethereum", "reth-evm-optimism", - "reth-interfaces", "reth-metrics", "reth-network-api", "reth-network-types", @@ -8038,12 +7906,13 @@ dependencies = [ "reth-rpc-types", "reth-rpc-types-compat", "reth-tasks", + "reth-testing-utils", "reth-transaction-pool", "revm", "revm-inspectors", "revm-primitives", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "tempfile", @@ -8057,7 +7926,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -8070,7 +7939,7 @@ dependencies = [ [[package]] name = "reth-rpc-api-testing-util" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "futures", "jsonrpsee", @@ -8084,7 +7953,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "hyper 0.14.28", "jsonrpsee", @@ -8095,7 +7964,6 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-evm", "reth-evm-ethereum", - "reth-interfaces", "reth-ipc", "reth-metrics", "reth-network-api", @@ -8105,9 +7973,11 @@ dependencies = [ "reth-rpc", "reth-rpc-api", "reth-rpc-engine-api", + "reth-rpc-layer", "reth-rpc-types", "reth-rpc-types-compat", "reth-tasks", + "reth-tokio-util", "reth-tracing", "reth-transaction-pool", "serde", @@ -8122,7 +7992,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "assert_matches", @@ -8133,7 +8003,7 @@ dependencies = [ "reth-beacon-consensus", "reth-engine-primitives", "reth-ethereum-engine-primitives", - "reth-interfaces", + "reth-evm", "reth-metrics", "reth-payload-builder", "reth-primitives", @@ -8141,44 +8011,60 @@ dependencies = [ "reth-rpc-api", "reth-rpc-types", "reth-rpc-types-compat", + "reth-storage-api", "reth-tasks", + "reth-testing-utils", + "reth-tokio-util", "serde", "thiserror", "tokio", "tracing", ] +[[package]] +name = "reth-rpc-layer" +version = "0.2.0-beta.8" +dependencies = [ + "alloy-rpc-types-engine", + "assert_matches", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "jsonrpsee", + "pin-project", + "tempfile", + "tokio", + "tower", + "tracing", +] + [[package]] name = "reth-rpc-types" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", "alloy-rpc-types-trace", "arbitrary", "bytes", - "ethereum_ssz", - "ethereum_ssz_derive", "jsonrpsee-types", "proptest", "proptest-derive", "rand 0.8.5", "serde", "serde_json", - "serde_with", "similar-asserts", - "thiserror", ] [[package]] name = "reth-rpc-types-compat" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "reth-primitives", "reth-rpc-types", "serde_json", @@ -8186,7 +8072,7 @@ dependencies = [ [[package]] name = "reth-stages" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "assert_matches", @@ -8206,14 +8092,17 @@ dependencies = [ "reth-etl", "reth-evm", "reth-evm-ethereum", + "reth-execution-errors", "reth-exex", - "reth-interfaces", + "reth-network-p2p", "reth-network-types", "reth-primitives", "reth-provider", "reth-revm", "reth-stages-api", "reth-static-file", + "reth-storage-errors", + "reth-testing-utils", "reth-trie", "serde_json", "tempfile", @@ -8224,7 +8113,7 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "aquamarine", "assert_matches", @@ -8233,12 +8122,14 @@ dependencies = [ "metrics", "reth-consensus", "reth-db", - "reth-interfaces", + "reth-errors", "reth-metrics", + "reth-network-p2p", "reth-primitives", "reth-provider", "reth-prune", "reth-static-file", + "reth-testing-utils", "reth-tokio-util", "thiserror", "tokio", @@ -8248,26 +8139,60 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "assert_matches", "parking_lot 0.12.2", "rayon", "reth-db", - "reth-interfaces", "reth-nippy-jar", "reth-primitives", "reth-provider", "reth-stages", + "reth-storage-errors", + "reth-testing-utils", "reth-tokio-util", "tempfile", - "tokio-stream", "tracing", ] +[[package]] +name = "reth-static-file-types" +version = "0.2.0-beta.8" +dependencies = [ + "alloy-primitives", + "clap", + "derive_more", + "serde", + "strum", +] + +[[package]] +name = "reth-storage-api" +version = "0.2.0-beta.8" +dependencies = [ + "auto_impl", + "reth-db", + "reth-execution-types", + "reth-primitives", + "reth-storage-errors", + "reth-trie", + "revm", +] + +[[package]] +name = "reth-storage-errors" +version = "0.2.0-beta.8" +dependencies = [ + "clap", + "reth-fs-util", + "reth-primitives", + "thiserror", +] + [[package]] name = "reth-tasks" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "dyn-clone", "futures-util", @@ -8283,24 +8208,26 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", + "rand 0.8.5", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", ] [[package]] name = "reth-tokio-util" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "tokio", "tokio-stream", + "tracing", ] [[package]] name = "reth-tracing" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "clap", "eyre", @@ -8314,7 +8241,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "aquamarine", @@ -8330,15 +8257,13 @@ dependencies = [ "pprof", "proptest", "rand 0.8.5", - "reth-eth-wire", + "reth-eth-wire-types", + "reth-fs-util", "reth-metrics", - "reth-network-types", "reth-primitives", "reth-provider", - "reth-revm", "reth-tasks", "reth-tracing", - "revm", "rustc-hash", "schnellru", "serde", @@ -8353,7 +8278,7 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "auto_impl", @@ -8362,15 +8287,16 @@ dependencies = [ "metrics", "once_cell", "proptest", + "rayon", "reth-db", - "reth-interfaces", + "reth-execution-errors", "reth-metrics", "reth-primitives", "reth-provider", + "reth-storage-errors", "revm", "serde_json", "similar-asserts", - "thiserror", "tokio", "tokio-stream", "tracing", @@ -8379,7 +8305,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "0.2.0-beta.7" +version = "0.2.0-beta.8" dependencies = [ "alloy-rlp", "criterion", @@ -8390,7 +8316,7 @@ dependencies = [ "rand 0.8.5", "rayon", "reth-db", - "reth-interfaces", + "reth-execution-errors", "reth-metrics", "reth-primitives", "reth-provider", @@ -8403,8 +8329,8 @@ dependencies = [ [[package]] name = "revm" -version = "8.0.0" -source = "git+https://github.com/bnb-chain/revm.git?rev=2f38e6c#2f38e6c6f82c8c664e4302cadde0df68f6b4cfbf" +version = "9.0.0" +source = "git+https://github.com/bnb-chain/revm?rev=b4c100bec637244f2c5b018f592c96c6e33eecbd#b4c100bec637244f2c5b018f592c96c6e33eecbd" dependencies = [ "auto_impl", "cfg-if", @@ -8418,10 +8344,10 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=7168ac5#7168ac55682fb420da7a82ed94bfb0c30a034113" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=2b6fff1#2b6fff148a1c07e18156561114c04878618ece6b" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=77c1240)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=61140ec)", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", @@ -8435,8 +8361,8 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "4.0.0" -source = "git+https://github.com/bnb-chain/revm.git?rev=2f38e6c#2f38e6c6f82c8c664e4302cadde0df68f6b4cfbf" +version = "5.0.0" +source = "git+https://github.com/bnb-chain/revm?rev=b4c100bec637244f2c5b018f592c96c6e33eecbd#b4c100bec637244f2c5b018f592c96c6e33eecbd" dependencies = [ "revm-primitives", "serde", @@ -8444,11 +8370,12 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "6.0.0" -source = "git+https://github.com/bnb-chain/revm.git?rev=2f38e6c#2f38e6c6f82c8c664e4302cadde0df68f6b4cfbf" +version = "7.0.0" +source = "git+https://github.com/bnb-chain/revm?rev=b4c100bec637244f2c5b018f592c96c6e33eecbd#b4c100bec637244f2c5b018f592c96c6e33eecbd" dependencies = [ "aurora-engine-modexp", "bls_on_arkworks", + "blst", "c-kzg", "cometbft", "cometbft-light-client", @@ -8460,15 +8387,15 @@ dependencies = [ "prost", "revm-primitives", "ripemd", - "secp256k1", + "secp256k1 0.29.0", "sha2 0.10.8", "substrate-bn", ] [[package]] name = "revm-primitives" -version = "3.1.1" -source = "git+https://github.com/bnb-chain/revm.git?rev=2f38e6c#2f38e6c6f82c8c664e4302cadde0df68f6b4cfbf" +version = "4.0.0" +source = "git+https://github.com/bnb-chain/revm?rev=b4c100bec637244f2c5b018f592c96c6e33eecbd#b4c100bec637244f2c5b018f592c96c6e33eecbd" dependencies = [ "alloy-primitives", "auto_impl", @@ -8611,7 +8538,6 @@ dependencies = [ "ark-ff 0.3.0", "ark-ff 0.4.2", "bytes", - "ethereum_ssz", "fastrlp", "num-bigint", "num-traits", @@ -8914,10 +8840,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.9.2", "serde", ] +[[package]] +name = "secp256k1" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +dependencies = [ + "rand 0.8.5", + "secp256k1-sys 0.10.0", +] + [[package]] name = "secp256k1-sys" version = "0.9.2" @@ -8927,6 +8863,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.0" @@ -9101,7 +9046,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.9", + "darling", "proc-macro2", "quote", "syn 2.0.65", @@ -9434,18 +9379,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -9592,6 +9525,21 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "sysinfo" +version = "0.30.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows 0.52.0", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -9675,7 +9623,7 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abe1689311f7edc6bab4033a259a3c37510b41063e4b01e57970105c0c764428" dependencies = [ - "darling 0.20.9", + "darling", "itertools 0.12.1", "once_cell", "prettyplease", @@ -10094,8 +10042,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures", - "futures-task", "pin-project", "tracing", ] @@ -10175,51 +10121,6 @@ dependencies = [ "rlp", ] -[[package]] -name = "trust-dns-client" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4ef9b9bde0559b78a4abb00339143750085f05e5a453efb7b8bef1061f09dc" -dependencies = [ - "cfg-if", - "data-encoding", - "futures-channel", - "futures-util", - "lazy_static", - "log", - "radix_trie", - "rand 0.8.5", - "thiserror", - "time", - "tokio", - "trust-dns-proto 0.20.4", -] - -[[package]] -name = "trust-dns-proto" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.3.4", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", -] - [[package]] name = "trust-dns-proto" version = "0.23.2" @@ -10229,7 +10130,7 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner 0.6.0", + "enum-as-inner", "futures-channel", "futures-io", "futures-util", @@ -10263,7 +10164,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto 0.23.2", + "trust-dns-proto", ] [[package]] @@ -10689,7 +10590,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", "windows-targets 0.52.5", ] @@ -10702,6 +10613,49 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -10909,21 +10863,6 @@ dependencies = [ "tap", ] -[[package]] -name = "xml-rs" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" - -[[package]] -name = "xmltree" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" -dependencies = [ - "xml-rs", -] - [[package]] name = "yoke" version = "0.7.3" diff --git a/Cargo.toml b/Cargo.toml index aaa71f8806..0d2229aae0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -433,7 +433,11 @@ similar-asserts = "1.5.0" test-fuzz = "5" [patch.crates-io] -revm = { git = "https://github.com/bnb-chain/revm.git", rev = "2f38e6c" } -revm-primitives = { git = "https://github.com/bnb-chain/revm.git", rev = "2f38e6c" } -revm-precompile = { git = "https://github.com/bnb-chain/revm.git", rev = "2f38e6c" } +revm = { git = "https://github.com/bnb-chain/revm", rev = "b4c100bec637244f2c5b018f592c96c6e33eecbd" } +revm-interpreter = { git = "https://github.com/bnb-chain/revm", rev = "b4c100bec637244f2c5b018f592c96c6e33eecbd" } +revm-precompile = { git = "https://github.com/bnb-chain/revm", rev = "b4c100bec637244f2c5b018f592c96c6e33eecbd" } +revm-primitives = { git = "https://github.com/bnb-chain/revm", rev = "b4c100bec637244f2c5b018f592c96c6e33eecbd" } alloy-chains = { git = "https://github.com/alloy-rs/chains.git", rev = "906d6fb" } + +[patch."https://github.com/bluealloy/revm"] +revm = { git = "https://github.com/bnb-chain/revm", rev = "b4c100bec637244f2c5b018f592c96c6e33eecbd" } \ No newline at end of file diff --git a/Makefile b/Makefile index 8b597a5bb0..fd0ff37a3e 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ build: ## Build the reth binary into `target` directory. .PHONY: build-op build-op: ## Build the op-reth binary into `target` directory. - cargo build --bin op-reth --features "optimism,$(FEATURES)" --profile "$(PROFILE)" + cargo build --bin op-reth --features "optimism opbnb $(FEATURES)" --profile "$(PROFILE)" # Builds the reth binary natively. build-native-%: diff --git a/crates/ethereum-forks/src/hardfork.rs b/crates/ethereum-forks/src/hardfork.rs index e9a500d975..ae35cc4688 100644 --- a/crates/ethereum-forks/src/hardfork.rs +++ b/crates/ethereum-forks/src/hardfork.rs @@ -68,7 +68,7 @@ pub enum Hardfork { /// Ecotone: . #[cfg(feature = "optimism")] Ecotone, - /// PreContractForkBlock + /// `PreContractForkBlock` #[cfg(all(feature = "optimism", feature = "opbnb"))] PreContractForkBlock, /// Fermat @@ -564,18 +564,18 @@ impl FromStr for Hardfork { #[cfg(feature = "optimism")] "regolith" => Self::Regolith, #[cfg(all(feature = "optimism", feature = "opbnb"))] - "precontractforkblock" => Hardfork::PreContractForkBlock, + "precontractforkblock" => Self::PreContractForkBlock, #[cfg(all(feature = "optimism", feature = "opbnb"))] - "fermat" => Hardfork::Fermat, + "fermat" => Self::Fermat, #[cfg(all(feature = "optimism", feature = "opbnb"))] - "haber" => Hardfork::Haber, + "haber" => Self::Haber, #[cfg(feature = "optimism")] "canyon" => Self::Canyon, #[cfg(feature = "optimism")] "ecotone" => Self::Ecotone, "prague" => Self::Prague, - // "arbos11" => Hardfork::ArbOS11, - // "arbos20atlas" => Hardfork::ArbOS20Atlas, + // "arbos11" => Self::ArbOS11, + // "arbos20atlas" => Self::ArbOS20Atlas, _ => return Err(format!("Unknown hardfork: {s}")), }) } diff --git a/crates/node-core/src/args/utils.rs b/crates/node-core/src/args/utils.rs index 7e4532b39d..0c53a2cbf0 100644 --- a/crates/node-core/src/args/utils.rs +++ b/crates/node-core/src/args/utils.rs @@ -23,7 +23,6 @@ use reth_primitives::{GOERLI, HOLESKY, MAINNET, SEPOLIA}; #[cfg(feature = "optimism")] /// Chains supported by op-reth. First value should be used as the default. -pub const SUPPORTED_CHAINS: &[&str] = &["optimism", "optimism-sepolia", "base", "base-sepolia"]; pub const SUPPORTED_CHAINS: &[&str] = &["optimism", "optimism-sepolia", "base", "base-sepolia", "opbnb-mainnet", "opbnb-testnet"]; #[cfg(not(feature = "optimism"))] diff --git a/crates/optimism/evm/src/execute.rs b/crates/optimism/evm/src/execute.rs index 5d07236f7e..5592f4411d 100644 --- a/crates/optimism/evm/src/execute.rs +++ b/crates/optimism/evm/src/execute.rs @@ -10,8 +10,8 @@ use reth_evm::{ }; use reth_optimism_consensus::validate_block_post_execution; use reth_primitives::{ - Address, BlockNumber, BlockWithSenders, ChainSpec, Hardfork, Header, PruneModes, - Receipt, Receipts, TxType, Withdrawals, U256, + Address, BlockNumber, BlockWithSenders, ChainSpec, Hardfork, Header, PruneModes, Receipt, + Receipts, TxType, Withdrawals, U256, }; use reth_revm::{ batch::{BlockBatchRecord, BlockExecutorStats}, @@ -19,9 +19,10 @@ use reth_revm::{ state_change::{apply_beacon_root_contract_call, post_block_balance_increments}, Evm, State, }; +use revm::db::states::StorageSlot; use revm_primitives::{ db::{Database, DatabaseCommit}, - BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ResultAndState, StorageSlot, + BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ResultAndState, }; use std::{collections::HashMap, str::FromStr, sync::Arc}; use tracing::trace; diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index 962a6b8921..d6506742cc 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -377,7 +377,7 @@ impl DatabaseProvider { /// 1. Iterate over the [`BlockBodyIndices`][tables::BlockBodyIndices] table to get all the /// transaction ids. /// 2. Iterate over the [`StorageChangeSets`][tables::StorageChangeSets] table and the - /// [`AccountChangeSets`][tables::AccountChangeSets] tables in reverse order to reconstruct + /// [`AccountChangeSets`][tables::AccountChangeSets] tables in reverse order to reconstruct /// the changesets. /// - In order to have both the old and new values in the changesets, we also access the /// plain state tables.