From b6b155b0dcf1a7e15a05cd7cc20a4c487ab87be9 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Fri, 17 May 2024 15:54:54 +0300 Subject: [PATCH] rebase to latest reth --- Cargo.lock | 152 +++++++++++++++++++++++++---------------------------- Cargo.toml | 20 +++---- 2 files changed, 81 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26018205..34371c41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -702,12 +702,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - [[package]] name = "async-channel" version = "1.9.0" @@ -5901,7 +5895,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "ahash", "alloy-rlp", @@ -5975,7 +5969,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5998,7 +5992,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "futures-core", @@ -6021,7 +6015,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "metrics", @@ -6050,7 +6044,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "linked_hash_set", @@ -6075,7 +6069,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-tasks", "tokio", @@ -6085,7 +6079,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6100,7 +6094,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6111,7 +6105,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "confy", "humantime-serde", @@ -6126,7 +6120,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "auto_impl", "reth-primitives", @@ -6136,7 +6130,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-consensus", "reth-primitives", @@ -6145,7 +6139,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "arbitrary", "bytes", @@ -6176,7 +6170,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "discv5", @@ -6198,7 +6192,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "derive_more", @@ -6222,7 +6216,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6245,7 +6239,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "futures", @@ -6272,7 +6266,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6305,7 +6299,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6316,7 +6310,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "bytes", @@ -6343,7 +6337,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "bytes", @@ -6357,7 +6351,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6367,7 +6361,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6382,7 +6376,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6398,7 +6392,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6416,7 +6410,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "rayon", "reth-db", @@ -6426,7 +6420,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "futures-util", @@ -6439,7 +6433,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6459,7 +6453,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "eyre", "metrics", @@ -6480,7 +6474,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "auto_impl", "clap", @@ -6498,7 +6492,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "async-trait", "bytes", @@ -6519,7 +6513,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6537,7 +6531,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "bindgen", "cc", @@ -6547,7 +6541,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "metrics", @@ -6559,7 +6553,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "once_cell", "proc-macro2", @@ -6571,7 +6565,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "pin-project", "reth-network-types", @@ -6581,7 +6575,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "igd-next", "pin-project-lite", @@ -6595,7 +6589,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "aquamarine", @@ -6645,7 +6639,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6661,7 +6655,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6675,7 +6669,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "anyhow", "bincode", @@ -6695,7 +6689,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6710,7 +6704,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "confy", @@ -6751,7 +6745,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "clap", "const-str", @@ -6813,7 +6807,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6831,7 +6825,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "humantime", @@ -6853,7 +6847,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "metrics", @@ -6874,7 +6868,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6884,7 +6878,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6924,7 +6918,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6953,7 +6947,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "itertools 0.12.1", "metrics", @@ -6974,7 +6968,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6990,7 +6984,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7042,7 +7036,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7056,7 +7050,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "hyper", "jsonrpsee", @@ -7084,7 +7078,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7109,21 +7103,17 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ - "assert_matches", "http", "http-body", "hyper", - "jsonrpsee", "jsonwebtoken 8.3.0", "pin-project", "rand 0.8.5", "reth-primitives", "serde", - "tempfile", "thiserror", - "tokio", "tower", "tracing", ] @@ -7131,7 +7121,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7149,7 +7139,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7160,7 +7150,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7187,7 +7177,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "auto_impl", @@ -7211,7 +7201,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7228,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "dyn-clone", "futures-util", @@ -7245,7 +7235,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "tokio", "tokio-stream", @@ -7254,7 +7244,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "clap", "eyre", @@ -7269,7 +7259,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "aquamarine", @@ -7301,7 +7291,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "auto_impl", @@ -7319,7 +7309,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "derive_more", @@ -7341,7 +7331,7 @@ dependencies = [ [[package]] name = "revm" version = "9.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "auto_impl", "cfg-if", @@ -7373,7 +7363,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "5.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "revm-primitives", "serde", @@ -7382,7 +7372,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "7.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -7398,7 +7388,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "4.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "alloy-primitives", "auto_impl", diff --git a/Cargo.toml b/Cargo.toml index bf70c85a..4973f50c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,12 +27,12 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } @@ -80,7 +80,7 @@ clap = "4.1.4" [patch.crates-io] libffi-sys = { git = "https://github.com/tov/libffi-rs", rev = "d0704d634b6f3ffef5b6fc7e07fe965a1cff5c7b" } -revm = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-precompile = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } +revm = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-precompile = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" }