From 6e1e5cb5fe9f4f4f9e601964d400a5922c09d941 Mon Sep 17 00:00:00 2001 From: christn Date: Sun, 14 Jan 2024 12:21:40 +0800 Subject: [PATCH 01/14] Update reth dependency --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92b61ff..9d5bee4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,9 +23,9 @@ derivative = "2.2.0" eyre = "0.6.8" hex = "0.4.3" jsonrpsee = "0.20.1" -reth = { git = "https://github.com/paradigmxyz/reth", rev = "c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" } -reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9"} -reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9"} +reth = { git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9" } +reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9"} +reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9"} secp256k1 = { version = "0.28.0", features = ["rand-std"] } serde = "1.0.188" serde_json = "1.0.107" From d22d22582e4b2280be1b0735183064732decdc47 Mon Sep 17 00:00:00 2001 From: christn Date: Sun, 14 Jan 2024 12:30:25 +0800 Subject: [PATCH 02/14] Change reth dependency to fork --- Cargo.lock | 1487 ++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 6 +- 2 files changed, 914 insertions(+), 579 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac18747..bace5bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,12 +66,12 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -116,11 +116,25 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +[[package]] +name = "alloy-chains" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a5f61137c31916542bb63cd70d0e0dd7a76f76b7f962f4337bc438612d45b2" +dependencies = [ + "alloy-rlp", + "arbitrary", + "num_enum 0.7.2", + "proptest", + "serde", + "strum", +] + [[package]] name = "alloy-dyn-abi" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafc3b20c6d069d9db47037f34acfb0e079c050fa5c1ff9e79855609b359b92b" +checksum = "fcf1d316f6375d7cff11b526e91938b199e021da118861f9d238438938e0ac7d" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -136,9 +150,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d32061da2f184e5defab8e65a3057f88b7017cfe1ea9e2d6b413edb5ca76a54" +checksum = "b7b07fb0de8c985deebc60b97fc8c45fd45c101822c3241c1f389e9f9a557dd7" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -148,9 +162,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ca2c09d5911548a5cb620382ea0e1af99d3c898ce0efecbbd274a4676cf53e" +checksum = "3729132072f369bc4e8e6e070f9cf4deb3490fc9b9eea6f71f75ec19406df811" dependencies = [ "alloy-rlp", "arbitrary", @@ -160,9 +174,11 @@ dependencies = [ "derive_arbitrary", "derive_more", "ethereum_ssz", - "getrandom 0.2.11", + "getrandom 0.2.12", "hex-literal", "itoa", + "k256", + "keccak-asm", "proptest", "proptest-derive", "rand 0.8.5", @@ -173,32 +189,59 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef" +checksum = "8d58d9f5da7b40e9bfff0b7e7816700be4019db97d4b6359fe7f94a9e22e42ac" dependencies = [ "alloy-rlp-derive", "arrayvec", "bytes", - "smol_str", ] [[package]] name = "alloy-rlp-derive" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" +checksum = "1a047897373be4bbb0224c1afdabca92648dc57a9c9ef6e7b0be3aff7a859c83" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", +] + +[[package]] +name = "alloy-rpc-trace-types" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy#5ed60f827f3bd0211855919c08504cc4701e8353" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-rpc-types" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy#5ed60f827f3bd0211855919c08504cc4701e8353" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arbitrary", + "itertools 0.12.0", + "jsonrpsee-types", + "proptest", + "proptest-derive", + "serde", + "serde_json", + "thiserror", ] [[package]] name = "alloy-sol-macro" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40cea54ac58080a1b88ea6556866eac1902b321186c77d53ad2b5ebbbf0e038" +checksum = "5531f0a16e36c547e68c73a1638bea1f26237ee8ae785527190c4e4f9fecd2c5" dependencies = [ "const-hex", "dunce", @@ -207,25 +250,25 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-type-parser" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23cb462613b2046da46dbf69ebaee458b7bfd3e9d7fe05adcce38a8d4b8a14f" +checksum = "6958f72e4aa4acc979ea70bca59204336c0686e92b26d02d48244cf25b0dabb0" dependencies = [ "winnow", ] [[package]] name = "alloy-sol-types" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81aa34725607be118c395d62c1d8d97c8a343dd1ada5370ed508ed5232eab6a" +checksum = "783eb720b73d38f9d4c1fb9890e4db6bc8c708f7aa77d3071a19e06091ecd1c9" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -233,6 +276,25 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-trie" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677fd3c62d77b0550288d63723d331dbd88adcf3578e1f58daa123f0b599e383" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arbitrary", + "derive_arbitrary", + "derive_more", + "nybbles", + "proptest", + "proptest-derive", + "serde", + "smallvec", + "tracing", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -250,9 +312,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -270,50 +332,50 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "aquamarine" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -457,9 +519,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "flate2", @@ -482,22 +544,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", + "syn 2.0.48", ] [[package]] @@ -590,9 +643,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -637,7 +690,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.48", "which", ] @@ -658,7 +711,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -700,9 +753,9 @@ dependencies = [ [[package]] name = "bitm" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7becd9fb525c1c507eb025ec37129a0d9320aee17c841085a48101f4f18c0d27" +checksum = "1c963a97cda30f51eb4f343d0f7924d491bdf30273d806ca1775239e37ab6bad" dependencies = [ "dyn_size_of", ] @@ -846,7 +899,7 @@ checksum = "f3e5afa991908cfbe79bd3109b824e473a1dc5f74f31fab91bb44c9e245daa77" dependencies = [ "boa_gc", "boa_macros", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "indexmap 2.1.0", "once_cell", "phf", @@ -862,7 +915,7 @@ checksum = "005fa0c5bd20805466dda55eb34cd709bb31a2592bb26927b47714eeed6914d8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "synstructure", ] @@ -899,9 +952,9 @@ checksum = "3190f92dfe48224adc92881c620f08ccf37ff62b91a094bb357fe53bd5e84647" [[package]] name = "boyer-moore-magiclen" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116d76fee857b03ecdd95d5f9555e46aa0cd34e5bb348a520e9445d151182a7e" +checksum = "95e6233f2d926b5b123caf9d58e3885885255567fbe7776a7fdcae2a4d7241c4" dependencies = [ "debug-helper", ] @@ -1012,7 +1065,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1036,9 +1089,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -1047,9 +1100,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445" dependencies = [ "clap_builder", "clap_derive", @@ -1057,9 +1110,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb" dependencies = [ "anstream", "anstyle", @@ -1076,7 +1129,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1093,15 +1146,15 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "codecs-derive" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", "proc-macro2", "quote", "serde", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1149,9 +1202,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-str" @@ -1176,9 +1229,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1186,15 +1239,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1231,46 +1284,37 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1321,9 +1365,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -1407,7 +1451,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1455,7 +1499,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1477,7 +1521,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1487,7 +1531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -1495,9 +1539,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "debug-helper" @@ -1527,9 +1571,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1554,7 +1598,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1670,7 +1714,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1700,7 +1744,7 @@ dependencies = [ "hex", "hkdf", "lazy_static", - "lru 0.12.0", + "lru 0.12.1", "more-asserts", "parking_lot 0.11.2", "rand 0.8.5", @@ -1722,7 +1766,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1757,9 +1801,9 @@ checksum = "6c8adcce29eef18ae1369bbd268fd56bf98144e80281315e9d4a82e34df001c7" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -1781,15 +1825,16 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", "rand_core 0.6.4", "serde", "sha2", + "subtle", "zeroize", ] @@ -1813,9 +1858,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -1848,7 +1893,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "ed25519-dalek", "hex", @@ -1883,7 +1928,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1896,18 +1941,18 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "enumn" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1918,12 +1963,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1972,9 +2017,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -2014,11 +2059,12 @@ dependencies = [ [[package]] name = "fdlimit" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", + "thiserror", ] [[package]] @@ -2033,9 +2079,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "fixed-hash" @@ -2068,9 +2114,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2083,9 +2129,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2098,9 +2144,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2108,15 +2154,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2125,32 +2171,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -2164,9 +2210,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2204,9 +2250,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -2225,9 +2271,22 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "git2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +dependencies = [ + "bitflags 2.4.1", + "libc", + "libgit2-sys", + "log", + "url", +] [[package]] name = "glob" @@ -2294,9 +2353,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" dependencies = [ "bytes", "fnv", @@ -2304,7 +2363,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -2337,9 +2396,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2352,14 +2411,14 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] name = "hdrhistogram" -version = "7.5.2" +version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ "byteorder", "num-traits", @@ -2367,11 +2426,11 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ - "atomic-polyfill 0.1.11", + "atomic-polyfill", "hash32", "rustc_version 0.4.0", "serde", @@ -2408,9 +2467,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -2426,11 +2485,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2446,9 +2505,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2457,9 +2516,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2508,9 +2567,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2523,7 +2582,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -2562,9 +2621,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2726,6 +2785,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "igd" version = "0.12.0" @@ -2824,7 +2893,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -2855,7 +2924,7 @@ checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ "socket2 0.5.5", "widestring", - "windows-sys", + "windows-sys 0.48.0", "winreg", ] @@ -2893,11 +2962,20 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jemalloc-ctl" @@ -2941,9 +3019,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -3115,7 +3193,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "pem", "ring 0.16.20", "serde", @@ -3125,9 +3203,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -3139,13 +3217,23 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb8515fff80ed850aea4a1595f2e519c003e2a00a82fe168ebf5269196caf444" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -3163,18 +3251,49 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libffi" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" +dependencies = [ + "libc", + "libffi-sys", +] + +[[package]] +name = "libffi-sys" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c" +dependencies = [ + "cc", +] + +[[package]] +name = "libgit2-sys" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3205,6 +3324,18 @@ dependencies = [ "redox_syscall 0.4.1", ] +[[package]] +name = "libz-sys" +version = "1.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3222,15 +3353,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "litemap" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" [[package]] name = "lock_api" @@ -3254,16 +3385,16 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] name = "lru" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3277,15 +3408,15 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -3313,9 +3444,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -3326,15 +3457,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "metrics" version = "0.21.1" @@ -3348,11 +3470,11 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" +checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "hyper", "indexmap 1.9.3", "ipnet", @@ -3366,20 +3488,20 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "metrics-process" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674a02f6ad51326c2106d9aa5a07d1f759695b655c06df0bba5d5fb338ac0a4" +checksum = "6aa2a67e2580fbeba4d5a96e659945981e700a383b4cea1432e0cfc18f58c5da" dependencies = [ "libproc", "mach2", @@ -3442,14 +3564,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3607,11 +3729,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -3623,19 +3745,19 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -3647,23 +3769,37 @@ dependencies = [ "libc", ] +[[package]] +name = "nybbles" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836816c354fb2c09622b54545a6f98416147346b13cc7eba5f92fab6b3042c93" +dependencies = [ + "alloy-rlp", + "arbitrary", + "const-hex", + "proptest", + "serde", + "smallvec", +] + [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" dependencies = [ - "atomic-polyfill 1.0.3", "critical-section", + "portable-atomic", ] [[package]] @@ -3711,9 +3847,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", "bitvec", @@ -3726,11 +3862,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3795,7 +3931,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3821,15 +3957,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" dependencies = [ "memchr", "thiserror", @@ -3838,9 +3974,9 @@ dependencies = [ [[package]] name = "ph" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c6e62e083483e2812a9d2a6eff6b97871302ef4166b5182c6da30624b7e991" +checksum = "c8267f3f34640e69a448dcf1ae8c76ae49a573cd9665b7f5d50b26ae169f361c" dependencies = [ "binout", "bitm", @@ -3879,7 +4015,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -3908,7 +4044,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -3935,15 +4071,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "pollster" @@ -3965,9 +4101,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "postcard" @@ -4005,12 +4141,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -4045,6 +4181,15 @@ dependencies = [ "toml_edit 0.20.7", ] +[[package]] +name = "proc-macro-crate" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2685dd208a3771337d8d386a89840f0f43cd68be8dae90a5f8c2384effc9cd" +dependencies = [ + "toml_edit 0.21.0", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4071,9 +4216,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -4085,6 +4230,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ "bitflags 2.4.1", + "chrono", + "flate2", "hex", "lazy_static", "procfs-core", @@ -4098,14 +4245,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ "bitflags 2.4.1", + "chrono", "hex", ] [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", @@ -4115,7 +4263,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -4177,9 +4325,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4259,7 +4407,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -4333,7 +4481,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] @@ -4376,12 +4524,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4410,9 +4552,10 @@ dependencies = [ [[package]] name = "reth" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "alloy-rlp", "aquamarine", "backon", @@ -4426,18 +4569,21 @@ dependencies = [ "eyre", "fdlimit", "futures", + "futures-util", "human_bytes", "humantime", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "jemalloc-ctl", "jemallocator", "metrics", "metrics-exporter-prometheus", "metrics-process", "metrics-util", + "once_cell", "pin-project", "pretty_assertions", + "procfs", "proptest", "rand 0.8.5", "rayon", @@ -4450,18 +4596,21 @@ dependencies = [ "reth-db", "reth-discv4", "reth-downloaders", + "reth-ethereum-payload-builder", "reth-interfaces", "reth-metrics", "reth-net-nat", "reth-network", "reth-network-api", "reth-nippy-jar", + "reth-node-api", + "reth-node-builder", "reth-payload-builder", + "reth-payload-validator 0.1.0-alpha.14", "reth-primitives", "reth-provider", "reth-prune", "reth-revm", - "reth-revm-inspectors", "reth-rpc", "reth-rpc-api", "reth-rpc-builder", @@ -4474,6 +4623,7 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "reth-trie", + "revm-inspectors", "secp256k1 0.27.0", "serde", "serde_json", @@ -4489,12 +4639,13 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "futures-util", "reth-beacon-consensus", "reth-interfaces", + "reth-node-api", "reth-primitives", "reth-provider", "reth-revm", @@ -4507,8 +4658,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", "futures-core", @@ -4516,6 +4667,7 @@ dependencies = [ "metrics", "reth-interfaces", "reth-metrics", + "reth-node-api", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -4529,22 +4681,23 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "cfg-if", "futures", "metrics", - "reth-consensus-common", + "reth-beacon-consensus-core", "reth-db", "reth-interfaces", "reth-metrics", + "reth-node-api", "reth-payload-builder", + "reth-payload-validator 0.1.0-alpha.14", "reth-primitives", "reth-provider", "reth-prune", "reth-rpc-types", - "reth-rpc-types-compat", "reth-snapshot", "reth-stages", "reth-tasks", @@ -4556,10 +4709,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-beacon-consensus-core" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +dependencies = [ + "reth-consensus-common", + "reth-interfaces", + "reth-primitives", +] + [[package]] name = "reth-blockchain-tree" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "aquamarine", "linked_hash_set", @@ -4572,14 +4735,15 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-stages", + "reth-trie", "tokio", "tracing", ] [[package]] name = "reth-codecs" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-primitives", "bytes", @@ -4588,11 +4752,10 @@ dependencies = [ [[package]] name = "reth-config" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "reth-discv4", - "reth-downloaders", "reth-net-nat", "reth-network", "reth-primitives", @@ -4604,9 +4767,10 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "cfg-if", "reth-interfaces", "reth-primitives", @@ -4615,8 +4779,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "arbitrary", "bytes", @@ -4624,9 +4788,10 @@ dependencies = [ "eyre", "futures", "heapless", - "itertools 0.11.0", + "itertools 0.12.0", "metrics", "modular-bitfield", + "once_cell", "page_size", "parity-scale-codec", "parking_lot 0.12.1", @@ -4652,8 +4817,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", "discv5", @@ -4674,9 +4839,10 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "alloy-rlp", "async-trait", "data-encoding", @@ -4698,23 +4864,22 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", "futures", "futures-util", - "itertools 0.11.0", + "itertools 0.12.0", "metrics", "pin-project", "rayon", - "reth-db", + "reth-config", "reth-interfaces", "reth-metrics", "reth-primitives", "reth-provider", "reth-tasks", - "tempfile", "thiserror", "tokio", "tokio-stream", @@ -4724,8 +4889,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "aes 0.8.3", "alloy-rlp", @@ -4755,9 +4920,10 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "alloy-rlp", "async-trait", "bytes", @@ -4781,9 +4947,10 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -4795,36 +4962,43 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reth-ethereum-payload-builder" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +dependencies = [ + "reth-basic-payload-builder", + "reth-payload-builder", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-transaction-pool", + "revm", + "tracing", +] + [[package]] name = "reth-interfaces" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ - "async-trait", "auto_impl", "clap", "futures", - "modular-bitfield", - "parking_lot 0.12.1", - "rand 0.8.5", - "reth-codecs", "reth-eth-wire", "reth-network-api", "reth-nippy-jar", "reth-primitives", "reth-rpc-types", - "revm-primitives", - "secp256k1 0.27.0", "thiserror", "tokio", - "tokio-stream", "tracing", ] [[package]] name = "reth-ipc" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "async-trait", "bytes", @@ -4843,14 +5017,15 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "bitflags 2.4.1", "byteorder", "derive_more", "indexmap 2.1.0", "libc", + "libffi", "parking_lot 0.12.1", "reth-mdbx-sys", "thiserror", @@ -4858,8 +5033,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "bindgen 0.68.1", "cc", @@ -4868,8 +5043,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "futures", "metrics", @@ -4880,20 +5055,20 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "reth-net-common" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "pin-project", "reth-primitives", @@ -4902,8 +5077,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "igd", "pin-project-lite", @@ -4916,8 +5091,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", "aquamarine", @@ -4959,9 +5134,10 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "alloy-chains", "async-trait", "reth-discv4", "reth-eth-wire", @@ -4974,8 +5150,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "anyhow", "bincode", @@ -4991,21 +5167,49 @@ dependencies = [ "zstd 0.12.4", ] +[[package]] +name = "reth-node-api" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +dependencies = [ + "reth-primitives", + "reth-rpc-types", + "serde", + "thiserror", +] + +[[package]] +name = "reth-node-builder" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +dependencies = [ + "reth-node-api", + "reth-payload-builder", + "reth-primitives", + "reth-rpc-types", + "serde", +] + [[package]] name = "reth-payload-builder" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", + "async-trait", "futures-util", "metrics", "reth-interfaces", "reth-metrics", + "reth-node-api", "reth-primitives", + "reth-provider", "reth-rpc-types", "reth-rpc-types-compat", + "reth-tasks", "reth-transaction-pool", "revm-primitives", + "serde", "sha2", "thiserror", "tokio", @@ -5013,6 +5217,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-payload-validator" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +dependencies = [ + "reth-primitives", + "reth-rpc-types", + "reth-rpc-types-compat", +] + [[package]] name = "reth-payload-validator" version = "0.1.0" @@ -5026,7 +5240,7 @@ dependencies = [ "reth", "reth-db", "reth-tracing", - "secp256k1 0.28.0", + "secp256k1 0.28.1", "serde", "serde_json", "serde_with", @@ -5036,11 +5250,14 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "ahash", + "alloy-chains", "alloy-primitives", "alloy-rlp", + "alloy-trie", "arbitrary", "byteorder", "bytes", @@ -5049,7 +5266,8 @@ dependencies = [ "derive_more", "itertools 0.11.0", "modular-bitfield", - "num_enum 0.7.1", + "num_enum 0.7.2", + "nybbles", "once_cell", "proptest", "proptest-derive", @@ -5074,13 +5292,14 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "ahash", "alloy-rlp", "auto_impl", "dashmap", - "itertools 0.11.0", + "itertools 0.12.0", "metrics", "parking_lot 0.12.1", "pin-project", @@ -5092,6 +5311,7 @@ dependencies = [ "reth-primitives", "reth-trie", "revm", + "strum", "tokio", "tokio-stream", "tracing", @@ -5099,12 +5319,13 @@ dependencies = [ [[package]] name = "reth-prune" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.0", "metrics", "rayon", + "reth-config", "reth-db", "reth-interfaces", "reth-metrics", @@ -5120,39 +5341,22 @@ dependencies = [ [[package]] name = "reth-revm" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "reth-consensus-common", "reth-interfaces", "reth-primitives", "reth-provider", - "reth-revm-inspectors", "revm", + "revm-inspectors", "tracing", ] -[[package]] -name = "reth-revm-inspectors" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "boa_engine", - "boa_gc", - "reth-rpc-types", - "revm", - "serde", - "serde_json", - "thiserror", - "tokio", -] - [[package]] name = "reth-rpc" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -5202,10 +5406,12 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "jsonrpsee", + "reth-node-api", + "reth-payload-builder", "reth-primitives", "reth-rpc-types", "serde_json", @@ -5213,8 +5419,8 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "hyper", "jsonrpsee", @@ -5223,6 +5429,7 @@ dependencies = [ "reth-ipc", "reth-metrics", "reth-network-api", + "reth-node-api", "reth-primitives", "reth-provider", "reth-rpc", @@ -5242,8 +5449,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "async-trait", "jsonrpsee-core", @@ -5252,6 +5459,7 @@ dependencies = [ "reth-beacon-consensus", "reth-interfaces", "reth-metrics", + "reth-node-api", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -5267,14 +5475,16 @@ dependencies = [ [[package]] name = "reth-rpc-types" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-primitives", "alloy-rlp", + "alloy-rpc-trace-types", + "alloy-rpc-types", "arbitrary", "bytes", - "itertools 0.11.0", + "itertools 0.12.0", "jsonrpsee-types", "proptest", "proptest-derive", @@ -5288,18 +5498,20 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", + "alloy-rpc-types", "reth-primitives", "reth-rpc-types", + "serde_json", ] [[package]] name = "reth-snapshot" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "clap", "reth-db", @@ -5314,14 +5526,14 @@ dependencies = [ [[package]] name = "reth-stages" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "aquamarine", "async-trait", "auto_impl", "futures-util", - "itertools 0.11.0", + "itertools 0.12.0", "metrics", "num-traits", "pin-project", @@ -5344,8 +5556,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "dyn-clone", "futures-util", @@ -5359,8 +5571,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "tokio", "tokio-stream", @@ -5368,20 +5580,23 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "clap", + "eyre", "rolling-file", "tracing", "tracing-appender", "tracing-journald", + "tracing-logfmt", "tracing-subscriber", ] [[package]] name = "reth-transaction-pool" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ "alloy-rlp", "aquamarine", @@ -5410,9 +5625,11 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.1.0-alpha.13" -source = "git+https://github.com/paradigmxyz/reth?rev=c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9#c1d7d2bde398bcf410c7e2df13fd7151fc2a58b9" +version = "0.1.0-alpha.14" +source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" dependencies = [ + "ahash", + "alloy-chains", "alloy-rlp", "auto_impl", "derive_more", @@ -5427,17 +5644,35 @@ dependencies = [ [[package]] name = "revm" version = "3.5.0" -source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#b00ebab8b3477f87e3d876a11b8f18d00a8f4103" +source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#5ea9d7948bd5cd34bc5fe00e33ae9fcba5340448" dependencies = [ "auto_impl", "revm-interpreter", "revm-precompile", ] +[[package]] +name = "revm-inspectors" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/evm-inspectors#29bb854055855daf84c5aac796681e3aae208895" +dependencies = [ + "alloy-primitives", + "alloy-rpc-trace-types", + "alloy-rpc-types", + "alloy-sol-types", + "boa_engine", + "boa_gc", + "revm", + "serde", + "serde_json", + "thiserror", + "tokio", +] + [[package]] name = "revm-interpreter" version = "1.3.0" -source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#b00ebab8b3477f87e3d876a11b8f18d00a8f4103" +source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#5ea9d7948bd5cd34bc5fe00e33ae9fcba5340448" dependencies = [ "revm-primitives", ] @@ -5445,7 +5680,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "2.2.0" -source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#b00ebab8b3477f87e3d876a11b8f18d00a8f4103" +source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#5ea9d7948bd5cd34bc5fe00e33ae9fcba5340448" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -5453,7 +5688,7 @@ dependencies = [ "once_cell", "revm-primitives", "ripemd", - "secp256k1 0.28.0", + "secp256k1 0.28.1", "sha2", "substrate-bn", ] @@ -5461,7 +5696,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "1.3.0" -source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#b00ebab8b3477f87e3d876a11b8f18d00a8f4103" +source = "git+https://github.com/bluealloy/revm?branch=reth_freeze#5ea9d7948bd5cd34bc5fe00e33ae9fcba5340448" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5471,7 +5706,7 @@ dependencies = [ "c-kzg", "derive_more", "enumn", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", "once_cell", "serde", @@ -5504,16 +5739,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5623,30 +5858,30 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.21", ] [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -5665,11 +5900,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -5678,7 +5913,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -5702,9 +5937,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "ryu-js" @@ -5714,11 +5949,11 @@ checksum = "6518fc26bced4d53678a22d6e423e9d8716377def84545fe328236e3af070e7f" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -5744,7 +5979,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -5775,12 +6010,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" +checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27" dependencies = [ "rand 0.8.5", - "secp256k1-sys 0.9.0", + "secp256k1-sys 0.9.2", ] [[package]] @@ -5794,9 +6029,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -5835,9 +6070,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "semver-parser" @@ -5856,38 +6091,38 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -5896,9 +6131,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -5909,7 +6144,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", @@ -5929,7 +6164,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -5966,6 +6201,16 @@ dependencies = [ "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac61da6b35ad76b195eb4771210f947734321a8d81d7738e1580d953bc7a15e" +dependencies = [ + "cc", + "cfg-if", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -6022,9 +6267,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -6065,28 +6310,19 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" dependencies = [ "arbitrary", "serde", ] -[[package]] -name = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" @@ -6105,7 +6341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6141,9 +6377,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -6198,7 +6434,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6252,9 +6488,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -6263,14 +6499,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c7ad08db24862d5b787a94714ff6b047935c3e3f60af944ac969404debd7ff" +checksum = "3cfbd642e1748fd9e47951973abfa78f825b11fbf68af9e6b9db4c983a770166" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6281,7 +6517,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "unicode-xid", ] @@ -6293,41 +6529,41 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "thin-vec" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6351,9 +6587,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -6373,9 +6609,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -6431,7 +6667,7 @@ dependencies = [ "signal-hook-registry", "socket2 0.5.5", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6442,7 +6678,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6576,7 +6812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", - "base64 0.21.5", + "base64 0.21.7", "bitflags 2.4.1", "bytes", "futures-core", @@ -6625,11 +6861,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -6642,7 +6879,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6680,31 +6917,56 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", "tracing-core", ] +[[package]] +name = "tracing-logfmt" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84bab42e40ace4e4ff19c92023ee1dbc1510db60976828fbbdc6994852c7d065" +dependencies = [ + "time", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] @@ -6800,9 +7062,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tui" @@ -6859,9 +7121,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -6920,26 +7182,26 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] [[package]] name = "utf16_iter" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52df8b7fb78e7910d776fccf2e42ceaf3604d55e8e7eb2dbd183cb1441d8a692" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" [[package]] name = "utf8_iter" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" @@ -6953,7 +7215,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -6962,13 +7224,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "vergen" -version = "8.2.6" +version = "8.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1290fd64cc4e7d3c9b07d7f333ce0ce0007253e32870e632624835cc80b83939" +checksum = "6cf9c2670809c4840d4648fc7daa396551d7d88966f9ba93821b81a5c0c2d3f5" dependencies = [ "anyhow", + "git2", "rustversion", "time", ] @@ -7011,9 +7280,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7021,24 +7290,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -7048,9 +7317,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7058,28 +7327,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -7087,9 +7356,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" @@ -7139,21 +7408,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets", + "windows-targets 0.52.0", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.0", ] [[package]] @@ -7162,7 +7431,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -7171,13 +7449,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -7186,47 +7479,89 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -7238,7 +7573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -7249,9 +7584,9 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" [[package]] name = "wyhash" @@ -7294,9 +7629,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -7306,34 +7641,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7353,15 +7688,15 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "synstructure", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -7374,7 +7709,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7397,7 +7732,7 @@ checksum = "7a4a1638a1934450809c2266a70362bfc96cd90550c073f5b8a55014d1010157" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9d5bee4..4ee04fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,9 +23,9 @@ derivative = "2.2.0" eyre = "0.6.8" hex = "0.4.3" jsonrpsee = "0.20.1" -reth = { git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9" } -reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9"} -reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "573c73fd822c758bef02de4e354a6516ef7585e9"} +reth = { git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa" } +reth-db = { features = ["test-utils"], git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa"} +reth-tracing = { git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa"} secp256k1 = { version = "0.28.0", features = ["rand-std"] } serde = "1.0.188" serde_json = "1.0.107" From 7a98ebef50efe439007f1a2035e351d20815d3e5 Mon Sep 17 00:00:00 2001 From: christn Date: Sun, 14 Jan 2024 12:54:37 +0800 Subject: [PATCH 03/14] Adjust to new execute_transactions interface --- src/rpc/validation.rs | 11 +++++++++-- tests/integration/http.rs | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/rpc/validation.rs b/src/rpc/validation.rs index e131665..b1f5034 100644 --- a/src/rpc/validation.rs +++ b/src/rpc/validation.rs @@ -154,12 +154,19 @@ where let mut executor = EVMProcessor::new_with_db(chain_spec, StateProviderDatabase::new(&state_provider)); - let unsealed_block = block.clone().unseal(); + let unsealed_block = + block + .clone() + .unseal() + .with_recovered_senders() + .ok_or(internal_rpc_err( + "Error recovering senders from block, cannot execute block", + ))?; // Note: Setting total difficulty to U256::MAX makes this incompatible with pre merge POW // blocks // TODO: Check what exactly the "senders" argument is and if we can set it to None here executor - .execute_and_verify_receipt(&unsealed_block, U256::MAX, None) + .execute_and_verify_receipt(&unsealed_block, U256::MAX) .map_err(|e| internal_rpc_err(format!("Error executing transactions: {:}", e)))?; Ok(executor.take_output_state()) diff --git a/tests/integration/http.rs b/tests/integration/http.rs index 3d5404b..ed0ccad 100644 --- a/tests/integration/http.rs +++ b/tests/integration/http.rs @@ -672,8 +672,12 @@ fn calculate_receipts_root( let state_provider_db = StateProviderDatabase::new(provider_factory.latest().unwrap()); let mut executor = EVMProcessor::new_with_db(chain_spec.clone(), state_provider_db); + let block_with_senders = block + .clone() + .with_recovered_senders() + .expect("failed to recover senders"); let (receipts, cumulative_gas_used) = executor - .execute_transactions(block, U256::MAX, None) + .execute_transactions(&block_with_senders, U256::MAX) .unwrap(); let receipts_with_bloom = receipts .iter() @@ -688,12 +692,14 @@ fn calculate_receipts_root( ..block.header.clone() }, ..block.clone() - }; + } + .with_recovered_senders() + .expect("failed to recover senders"); let state_provider_db = StateProviderDatabase::new(provider_factory.latest().unwrap()); let mut block_executor = EVMProcessor::new_with_db(chain_spec.clone(), state_provider_db); block_executor - .execute_and_verify_receipt(&new_block, U256::MAX, None) + .execute_and_verify_receipt(&new_block, U256::MAX) .unwrap(); let state = block_executor.take_output_state(); From 656dbb147a16b9c2f3d53368f9766de4f4f5a148 Mon Sep 17 00:00:00 2001 From: christn Date: Sun, 14 Jan 2024 13:50:17 +0800 Subject: [PATCH 04/14] Switch back to paradigmxyz/reth --- Cargo.lock | 100 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 6 ++-- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bace5bd..684e39d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1147,7 +1147,7 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "codecs-derive" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -4553,7 +4553,7 @@ dependencies = [ [[package]] name = "reth" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4640,7 +4640,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -4659,7 +4659,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "futures-core", @@ -4682,7 +4682,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "cfg-if", "futures", @@ -4712,7 +4712,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus-core" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "aquamarine", "linked_hash_set", @@ -4743,7 +4743,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-primitives", "bytes", @@ -4753,7 +4753,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-discv4", "reth-net-nat", @@ -4768,7 +4768,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "cfg-if", @@ -4780,7 +4780,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "arbitrary", "bytes", @@ -4818,7 +4818,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "discv5", @@ -4840,7 +4840,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4865,7 +4865,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "futures", @@ -4890,7 +4890,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "aes 0.8.3", "alloy-rlp", @@ -4921,7 +4921,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4948,7 +4948,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "alloy-primitives", @@ -4965,7 +4965,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-basic-payload-builder", "reth-payload-builder", @@ -4980,7 +4980,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "auto_impl", "clap", @@ -4998,7 +4998,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "async-trait", "bytes", @@ -5018,7 +5018,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "bitflags 2.4.1", "byteorder", @@ -5034,7 +5034,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "bindgen 0.68.1", "cc", @@ -5044,7 +5044,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "futures", "metrics", @@ -5056,7 +5056,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "once_cell", "proc-macro2", @@ -5068,7 +5068,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "pin-project", "reth-primitives", @@ -5078,7 +5078,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "igd", "pin-project-lite", @@ -5092,7 +5092,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "aquamarine", @@ -5135,7 +5135,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-chains", "async-trait", @@ -5151,7 +5151,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "anyhow", "bincode", @@ -5170,7 +5170,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -5181,7 +5181,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-node-api", "reth-payload-builder", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "async-trait", @@ -5220,7 +5220,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -5251,7 +5251,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "ahash", "alloy-chains", @@ -5293,7 +5293,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "ahash", "alloy-rlp", @@ -5320,7 +5320,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "itertools 0.12.0", "metrics", @@ -5342,7 +5342,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -5356,7 +5356,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -5407,7 +5407,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "jsonrpsee", "reth-node-api", @@ -5420,7 +5420,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "hyper", "jsonrpsee", @@ -5450,7 +5450,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "async-trait", "jsonrpsee-core", @@ -5476,7 +5476,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5499,7 +5499,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -5511,7 +5511,7 @@ dependencies = [ [[package]] name = "reth-snapshot" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "clap", "reth-db", @@ -5527,7 +5527,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "aquamarine", "async-trait", @@ -5557,7 +5557,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "dyn-clone", "futures-util", @@ -5572,7 +5572,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "tokio", "tokio-stream", @@ -5581,7 +5581,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "clap", "eyre", @@ -5596,7 +5596,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "alloy-rlp", "aquamarine", @@ -5626,7 +5626,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.1.0-alpha.14" -source = "git+https://github.com/ckoopmann/reth?rev=22b0e7280c1d7ef96de74faa3843ca2389344bfa#22b0e7280c1d7ef96de74faa3843ca2389344bfa" +source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" dependencies = [ "ahash", "alloy-chains", diff --git a/Cargo.toml b/Cargo.toml index 4ee04fb..762e904 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,9 +23,9 @@ derivative = "2.2.0" eyre = "0.6.8" hex = "0.4.3" jsonrpsee = "0.20.1" -reth = { git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa" } -reth-db = { features = ["test-utils"], git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa"} -reth-tracing = { git = "https://github.com/ckoopmann/reth", rev = "22b0e7280c1d7ef96de74faa3843ca2389344bfa"} +reth = { git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e" } +reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e"} +reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e"} secp256k1 = { version = "0.28.0", features = ["rand-std"] } serde = "1.0.188" serde_json = "1.0.107" From 9a8a35abf74d158115d42f0b99cc53856b27a71d Mon Sep 17 00:00:00 2001 From: christn Date: Wed, 17 Jan 2024 16:08:10 +0800 Subject: [PATCH 05/14] Add parent_beacon_block_root to validation request --- src/rpc/types.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpc/types.rs b/src/rpc/types.rs index 6e1de2b..51212a9 100644 --- a/src/rpc/types.rs +++ b/src/rpc/types.rs @@ -13,6 +13,7 @@ pub struct ValidationRequestBody { pub signature: Bytes, #[serde_as(as = "DisplayFromStr")] pub registered_gas_limit: u64, + pub parent_beacon_block_root: Option, } #[serde_as] From 4f7ce333fe07c789bf51b81b26228cdb6ad13a7c Mon Sep 17 00:00:00 2001 From: christn Date: Thu, 18 Jan 2024 09:31:29 +0800 Subject: [PATCH 06/14] Add blob_gas_used and excess_blob_gas to the execution payload --- src/rpc/types.rs | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/rpc/types.rs b/src/rpc/types.rs index 51212a9..4d6ac3a 100644 --- a/src/rpc/types.rs +++ b/src/rpc/types.rs @@ -1,6 +1,8 @@ use derivative::Derivative; use reth::primitives::{Address, Bloom, Bytes, B256, U256}; -use reth::rpc::types::{ExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV2, Withdrawal}; +use reth::rpc::types::{ + ExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, Withdrawal, +}; use serde::{Deserialize, Serialize}; use serde_with::{serde_as, DisplayFromStr}; @@ -63,6 +65,10 @@ pub struct ExecutionPayloadValidation { #[derivative(Debug = "ignore")] pub transactions: Vec, pub withdrawals: Vec, + #[serde_as(as = "DisplayFromStr")] + pub blob_gas_used: u64, + #[serde_as(as = "DisplayFromStr")] + pub excess_blob_gas: u64, } /// Withdrawal object with numbers deserialized as decimals @@ -84,24 +90,28 @@ pub struct WithdrawalValidation { impl From for ExecutionPayload { fn from(val: ExecutionPayloadValidation) -> Self { - ExecutionPayload::V2(ExecutionPayloadV2 { - payload_inner: ExecutionPayloadV1 { - parent_hash: val.parent_hash, - fee_recipient: val.fee_recipient, - state_root: val.state_root, - receipts_root: val.receipts_root, - logs_bloom: val.logs_bloom, - prev_randao: val.prev_randao, - block_number: val.block_number, - gas_limit: val.gas_limit, - gas_used: val.gas_used, - timestamp: val.timestamp, - extra_data: val.extra_data, - base_fee_per_gas: val.base_fee_per_gas, - block_hash: val.block_hash, - transactions: val.transactions, + ExecutionPayload::V3(ExecutionPayloadV3 { + payload_inner: ExecutionPayloadV2 { + payload_inner: ExecutionPayloadV1 { + parent_hash: val.parent_hash, + fee_recipient: val.fee_recipient, + state_root: val.state_root, + receipts_root: val.receipts_root, + logs_bloom: val.logs_bloom, + prev_randao: val.prev_randao, + block_number: val.block_number, + gas_limit: val.gas_limit, + gas_used: val.gas_used, + timestamp: val.timestamp, + extra_data: val.extra_data, + base_fee_per_gas: val.base_fee_per_gas, + block_hash: val.block_hash, + transactions: val.transactions, + }, + withdrawals: val.withdrawals.into_iter().map(|w| w.into()).collect(), }, - withdrawals: val.withdrawals.into_iter().map(|w| w.into()).collect(), + blob_gas_used: val.blob_gas_used, + excess_blob_gas: val.excess_blob_gas, }) } } From 6a087d4b6a89371c942fd3bacbd3dfc24cc2fcb0 Mon Sep 17 00:00:00 2001 From: christn Date: Thu, 18 Jan 2024 09:33:30 +0800 Subject: [PATCH 07/14] Make use of parent_beacon_block_root field --- src/rpc/validation.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rpc/validation.rs b/src/rpc/validation.rs index b1f5034..c163378 100644 --- a/src/rpc/validation.rs +++ b/src/rpc/validation.rs @@ -139,7 +139,7 @@ where } fn parse_block(&self) -> RpcResult { - try_into_sealed_block(self.request_body.execution_payload.clone().into(), None) + try_into_sealed_block(self.request_body.execution_payload.clone().into(), self.request_body.parent_beacon_block_root) .to_rpc_result() } @@ -164,7 +164,6 @@ where ))?; // Note: Setting total difficulty to U256::MAX makes this incompatible with pre merge POW // blocks - // TODO: Check what exactly the "senders" argument is and if we can set it to None here executor .execute_and_verify_receipt(&unsealed_block, U256::MAX) .map_err(|e| internal_rpc_err(format!("Error executing transactions: {:}", e)))?; From 7c3bdb0bc6c7d3203aa7a246d01061719b2e5a9d Mon Sep 17 00:00:00 2001 From: christn Date: Thu, 18 Jan 2024 09:38:56 +0800 Subject: [PATCH 08/14] Reth bump --- Cargo.lock | 209 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 6 +- 2 files changed, 108 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 684e39d..3703890 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1146,8 +1146,8 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "codecs-derive" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -4552,8 +4552,8 @@ dependencies = [ [[package]] name = "reth" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4606,7 +4606,7 @@ dependencies = [ "reth-node-api", "reth-node-builder", "reth-payload-builder", - "reth-payload-validator 0.1.0-alpha.14", + "reth-payload-validator 0.1.0-alpha.15", "reth-primitives", "reth-provider", "reth-prune", @@ -4639,8 +4639,8 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -4658,8 +4658,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "futures-core", @@ -4681,8 +4681,8 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "cfg-if", "futures", @@ -4693,7 +4693,7 @@ dependencies = [ "reth-metrics", "reth-node-api", "reth-payload-builder", - "reth-payload-validator 0.1.0-alpha.14", + "reth-payload-validator 0.1.0-alpha.15", "reth-primitives", "reth-provider", "reth-prune", @@ -4711,8 +4711,8 @@ dependencies = [ [[package]] name = "reth-beacon-consensus-core" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -4721,8 +4721,8 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "aquamarine", "linked_hash_set", @@ -4742,8 +4742,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-primitives", "bytes", @@ -4752,8 +4752,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-discv4", "reth-net-nat", @@ -4767,8 +4767,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "cfg-if", @@ -4779,8 +4779,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "arbitrary", "bytes", @@ -4817,8 +4817,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "discv5", @@ -4839,8 +4839,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4864,8 +4864,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "futures", @@ -4889,8 +4889,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "aes 0.8.3", "alloy-rlp", @@ -4920,8 +4920,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "alloy-rlp", @@ -4947,8 +4947,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "alloy-primitives", @@ -4957,15 +4957,14 @@ dependencies = [ "crc", "proptest", "proptest-derive", - "reth-codecs", "serde", "thiserror", ] [[package]] name = "reth-ethereum-payload-builder" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-basic-payload-builder", "reth-payload-builder", @@ -4979,8 +4978,8 @@ dependencies = [ [[package]] name = "reth-interfaces" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "auto_impl", "clap", @@ -4997,8 +4996,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "async-trait", "bytes", @@ -5017,8 +5016,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "bitflags 2.4.1", "byteorder", @@ -5033,8 +5032,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "bindgen 0.68.1", "cc", @@ -5043,8 +5042,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "futures", "metrics", @@ -5055,8 +5054,8 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "once_cell", "proc-macro2", @@ -5067,8 +5066,8 @@ dependencies = [ [[package]] name = "reth-net-common" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "pin-project", "reth-primitives", @@ -5077,8 +5076,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "igd", "pin-project-lite", @@ -5091,13 +5090,14 @@ dependencies = [ [[package]] name = "reth-network" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "aquamarine", "async-trait", "auto_impl", + "derive_more", "enr", "fnv", "futures", @@ -5122,6 +5122,7 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "reth-transaction-pool", + "schnellru", "secp256k1 0.27.0", "serde", "serde_json", @@ -5134,8 +5135,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-chains", "async-trait", @@ -5150,8 +5151,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "anyhow", "bincode", @@ -5169,8 +5170,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -5180,8 +5181,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-node-api", "reth-payload-builder", @@ -5192,8 +5193,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "async-trait", @@ -5219,8 +5220,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -5250,8 +5251,8 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "ahash", "alloy-chains", @@ -5292,8 +5293,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "ahash", "alloy-rlp", @@ -5319,8 +5320,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "itertools 0.12.0", "metrics", @@ -5341,8 +5342,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -5355,8 +5356,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -5406,8 +5407,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "jsonrpsee", "reth-node-api", @@ -5419,8 +5420,8 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "hyper", "jsonrpsee", @@ -5449,8 +5450,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "async-trait", "jsonrpsee-core", @@ -5475,8 +5476,8 @@ dependencies = [ [[package]] name = "reth-rpc-types" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5498,8 +5499,8 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -5510,8 +5511,8 @@ dependencies = [ [[package]] name = "reth-snapshot" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "clap", "reth-db", @@ -5526,8 +5527,8 @@ dependencies = [ [[package]] name = "reth-stages" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "aquamarine", "async-trait", @@ -5556,8 +5557,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "dyn-clone", "futures-util", @@ -5571,8 +5572,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "tokio", "tokio-stream", @@ -5580,8 +5581,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "clap", "eyre", @@ -5595,8 +5596,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "alloy-rlp", "aquamarine", @@ -5625,8 +5626,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.1.0-alpha.14" -source = "git+https://github.com/paradigmxyz/reth?rev=5127d40f48b0afb608d4fce550cf5daf9237d80e#5127d40f48b0afb608d4fce550cf5daf9237d80e" +version = "0.1.0-alpha.15" +source = "git+https://github.com/paradigmxyz/reth?rev=5a623a9c1285d986fc46f1091d58d7a388323457#5a623a9c1285d986fc46f1091d58d7a388323457" dependencies = [ "ahash", "alloy-chains", @@ -5636,8 +5637,8 @@ dependencies = [ "reth-db", "reth-interfaces", "reth-primitives", + "revm", "thiserror", - "tokio", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 762e904..08f0108 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,9 +23,9 @@ derivative = "2.2.0" eyre = "0.6.8" hex = "0.4.3" jsonrpsee = "0.20.1" -reth = { git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e" } -reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e"} -reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "5127d40f48b0afb608d4fce550cf5daf9237d80e"} +reth = { git = "https://github.com/paradigmxyz/reth", rev = "5a623a9c1285d986fc46f1091d58d7a388323457" } +reth-db = { features = ["test-utils"], git = "https://github.com/paradigmxyz/reth", rev = "5a623a9c1285d986fc46f1091d58d7a388323457"} +reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "5a623a9c1285d986fc46f1091d58d7a388323457"} secp256k1 = { version = "0.28.0", features = ["rand-std"] } serde = "1.0.188" serde_json = "1.0.107" From 010361a25b2dba9b91244a266f32bf86b7eb3dd1 Mon Sep 17 00:00:00 2001 From: christn Date: Thu, 18 Jan 2024 10:15:38 +0800 Subject: [PATCH 09/14] Adjust name of rpc method --- src/rpc/api.rs | 4 ++-- src/rpc/mod.rs | 2 +- src/rpc/types.rs | 1 + tests/integration/http.rs | 26 +++++++++++++------------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/rpc/api.rs b/src/rpc/api.rs index 6a760be..18fa971 100644 --- a/src/rpc/api.rs +++ b/src/rpc/api.rs @@ -8,8 +8,8 @@ use jsonrpsee::proc_macros::rpc; #[rpc(client, server, namespace = "flashbots")] pub trait ValidationApi { /// Validates a block submitted to the relay - #[method(name = "validateBuilderSubmissionV2")] - async fn validate_builder_submission_v2( + #[method(name = "validateBuilderSubmissionV3")] + async fn validate_builder_submission_v3( &self, request_body: ValidationRequestBody, ) -> RpcResult<()>; diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs index 213b7ed..128e8d8 100644 --- a/src/rpc/mod.rs +++ b/src/rpc/mod.rs @@ -57,7 +57,7 @@ where + 'static, { /// Validates a block submitted to the relay - async fn validate_builder_submission_v2( + async fn validate_builder_submission_v3( &self, request_body: ValidationRequestBody, ) -> RpcResult<()> { diff --git a/src/rpc/types.rs b/src/rpc/types.rs index 4d6ac3a..556d53c 100644 --- a/src/rpc/types.rs +++ b/src/rpc/types.rs @@ -15,6 +15,7 @@ pub struct ValidationRequestBody { pub signature: Bytes, #[serde_as(as = "DisplayFromStr")] pub registered_gas_limit: u64, + #[serde(default)] pub parent_beacon_block_root: Option, } diff --git a/tests/integration/http.rs b/tests/integration/http.rs index ed0ccad..f94e097 100644 --- a/tests/integration/http.rs +++ b/tests/integration/http.rs @@ -35,7 +35,7 @@ async fn test_valid_block() { generate_valid_request(&provider_factory, None); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -52,7 +52,7 @@ async fn test_registered_gas_limit_too_low_block() { validation_request_body.registered_gas_limit = 10_000; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -71,7 +71,7 @@ async fn test_invalid_state_root() { validation_request_body.execution_payload.state_root = B256::default(); validation_request_body = seal_request_body(validation_request_body); - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -88,7 +88,7 @@ async fn test_block_number_too_high() { validation_request_body = seal_request_body(validation_request_body); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -120,7 +120,7 @@ async fn test_block_number_already_known() { // .is_some()); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -146,7 +146,7 @@ async fn test_block_hash_already_known() { ); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -172,7 +172,7 @@ async fn test_incorrect_parent() { validation_request_body = seal_request_body(validation_request_body); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -234,7 +234,7 @@ async fn test_tx_nonce_too_low() { ); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -285,7 +285,7 @@ async fn test_proposer_payment_validation_via_balance_change() { &provider_factory, )); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -361,7 +361,7 @@ async fn test_proposer_spent_in_same_block() { )); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -446,7 +446,7 @@ async fn test_proposer_spent_in_same_block_but_payment_tx_last() { validation_request_body = seal_request_body(validation_request_body); let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -466,7 +466,7 @@ async fn test_insufficient_proposer_payment() { let client = get_client(provider_factory).await; - let result = ValidationApiClient::validate_builder_submission_v2( + let result = ValidationApiClient::validate_builder_submission_v3( &client, validation_request_body.clone(), ) @@ -489,7 +489,7 @@ async fn test_wrong_hash() { let client = get_client(provider_factory).await; let result = - ValidationApiClient::validate_builder_submission_v2(&client, validation_request_body).await; + ValidationApiClient::validate_builder_submission_v3(&client, validation_request_body).await; let error_message = get_call_error_message(result.unwrap_err()).unwrap(); assert!(error_message.contains("block hash mismatch")); } From 4d3146d4b7bdee9ae3be96585bbc4d020e15d68b Mon Sep 17 00:00:00 2001 From: christn Date: Sat, 16 Mar 2024 12:51:23 +0100 Subject: [PATCH 10/14] Switch back to stable toolchain --- .github/workflows/check-lint-test.yaml | 10 +++++----- Dockerfile | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-lint-test.yaml b/.github/workflows/check-lint-test.yaml index e4c0603..5a29a47 100644 --- a/.github/workflows/check-lint-test.yaml +++ b/.github/workflows/check-lint-test.yaml @@ -21,7 +21,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - name: Install toolchain - uses: dtolnay/rust-toolchain@nightly + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 @@ -29,16 +29,16 @@ jobs: cache-on-failure: true - name: cargo check - run: cargo +nightly check --all --all-features --benches --tests + run: cargo check --all --all-features --benches --tests - name: cargo fmt - run: cargo +nightly fmt --all --check + run: cargo fmt --all --check - name: cargo clippy - run: cargo +nightly clippy --all --all-features --benches --tests + run: cargo clippy --all --all-features --benches --tests - name: cargo test - run: cargo +nightly test + run: cargo test - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/Dockerfile b/Dockerfile index f0dd819..b50b98d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,16 +8,15 @@ WORKDIR /app RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config COPY Cargo.toml Cargo.lock ./ -RUN rustup install nightly RUN mkdir src/ RUN echo "fn main() {}" > dummy.rs RUN sed -i 's#src/main.rs#dummy.rs#' Cargo.toml -RUN cargo +nightly build --release +RUN cargo build --release # Build executable. RUN sed -i 's#dummy.rs#src/main.rs#' Cargo.toml COPY src ./src -RUN cargo +nightly build --release +RUN cargo build --release # Build runtime image. FROM gcr.io/distroless/cc-debian12 AS runtime From cf173547d5d5b044c1bb0f59ba8ad66a888fe62e Mon Sep 17 00:00:00 2001 From: christn Date: Sat, 16 Mar 2024 12:55:59 +0100 Subject: [PATCH 11/14] cargo fmt --- src/rpc/validation.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rpc/validation.rs b/src/rpc/validation.rs index c163378..41cb64a 100644 --- a/src/rpc/validation.rs +++ b/src/rpc/validation.rs @@ -139,8 +139,11 @@ where } fn parse_block(&self) -> RpcResult { - try_into_sealed_block(self.request_body.execution_payload.clone().into(), self.request_body.parent_beacon_block_root) - .to_rpc_result() + try_into_sealed_block( + self.request_body.execution_payload.clone().into(), + self.request_body.parent_beacon_block_root, + ) + .to_rpc_result() } fn validate_header(&self, block: &SealedBlock) -> RpcResult<()> { From edd56c6a59773f150ac141b6a5ac9b5ceda47ecf Mon Sep 17 00:00:00 2001 From: christn Date: Sat, 16 Mar 2024 15:03:13 +0100 Subject: [PATCH 12/14] Fix tests by running against goerli spec --- tests/integration/http.rs | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/integration/http.rs b/tests/integration/http.rs index f94e097..bb44cde 100644 --- a/tests/integration/http.rs +++ b/tests/integration/http.rs @@ -8,7 +8,7 @@ use reth::primitives::{ keccak256, sign_message, stage::{StageCheckpoint, StageId}, AccessList, Account, Address, Block, Bytes, Header, ReceiptWithBloom, Transaction, - TransactionKind, TransactionSigned, TxEip1559, B256, MAINNET, U256, + TransactionKind, TransactionSigned, TxEip1559, B256, GOERLI, U256, }; use reth::providers::{ providers::BlockchainProvider, BlockExecutor, ProviderFactory, StateRootProvider, @@ -109,7 +109,7 @@ async fn test_block_number_already_known() { generate_valid_request(&provider_factory, None); let block = try_into_block( validation_request_body.execution_payload.clone().into(), - None, + Some(B256::with_last_byte(0x69)), ) .expect("failed to create block"); add_block_with_hash(&provider_factory, B256::random(), block); @@ -136,7 +136,7 @@ async fn test_block_hash_already_known() { generate_valid_request(&provider_factory, None); let block = try_into_block( validation_request_body.execution_payload.clone().into(), - None, + Some(B256::with_last_byte(0x69)), ) .expect("failed to create block"); add_block_with_hash( @@ -203,7 +203,7 @@ async fn test_tx_nonce_too_low() { let other_transaction = sign_transaction( &sender_secret_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, // Invalid Tx because nonce is too low gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -265,7 +265,7 @@ async fn test_proposer_payment_validation_via_balance_change() { let other_transaction = sign_transaction( &sender_secret_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -327,7 +327,7 @@ async fn test_proposer_spent_in_same_block() { let spend_proposer_payment_tx = sign_transaction( &recipient_private_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -342,7 +342,7 @@ async fn test_proposer_spent_in_same_block() { let other_transaction = sign_transaction( &sender_secret_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -405,7 +405,7 @@ async fn test_proposer_spent_in_same_block_but_payment_tx_last() { let spend_proposer_payment_tx = sign_transaction( &recipient_private_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -420,7 +420,7 @@ async fn test_proposer_spent_in_same_block_but_payment_tx_last() { let other_transaction = sign_transaction( &sender_secret_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(receiver_address), @@ -563,7 +563,7 @@ fn generate_valid_request( let proposer_payment_transaction = sign_transaction( &sender_secret_key, Transaction::Eip1559(TxEip1559 { - chain_id: 1, + chain_id: 5, nonce: 0, gas_limit: 21000, to: TransactionKind::Call(fee_recipient), @@ -590,10 +590,10 @@ fn generate_block(gas_limit: u64, base_fee_per_gas: u64) -> Block { let payload = reth_payload_validator::rpc::ExecutionPayloadValidation { gas_limit, base_fee_per_gas: U256::from(base_fee_per_gas), - block_number: 18469910, + block_number: 19447300, ..Default::default() }; - try_into_block(payload.clone().into(), None).expect("failed to create block") + try_into_block(payload.clone().into(), Some(B256::with_last_byte(0x69))).expect("failed to create block") } fn generate_validation_request_body( @@ -617,6 +617,8 @@ fn generate_validation_request_body( validation_request_body.message.value = U256::from(proposer_fee); validation_request_body.message.proposer_fee_recipient = fee_recipient; validation_request_body.registered_gas_limit = 1_000_000; + validation_request_body.parent_beacon_block_root = Some(B256::with_last_byte(0x69)); + seal_request_body(add_transactions( validation_request_body, @@ -641,7 +643,7 @@ fn add_transactions( .append(&mut encoded_transactions); let block = try_into_block( validation_request_body.execution_payload.clone().into(), - None, + Some(B256::with_last_byte(0x69)), ) .expect("failed to create block"); let (receipts_root, cumulative_gas_used, state_root) = @@ -656,7 +658,7 @@ fn add_transactions( fn seal_request_body(mut validation_request_body: ValidationRequestBody) -> ValidationRequestBody { let block = try_into_block( validation_request_body.execution_payload.clone().into(), - None, + Some(B256::with_last_byte(0x69)), ) .expect("failed to create block"); let sealed_block = block.seal_slow(); @@ -668,7 +670,7 @@ fn calculate_receipts_root( block: &Block, provider_factory: &TestProviderFactory, ) -> (B256, u64, B256) { - let chain_spec = MAINNET.clone(); + let chain_spec = GOERLI.clone(); let state_provider_db = StateProviderDatabase::new(provider_factory.latest().unwrap()); let mut executor = EVMProcessor::new_with_db(chain_spec.clone(), state_provider_db); @@ -728,7 +730,7 @@ fn sign_transaction(secret_key: &SecretKey, transaction: Transaction) -> Transac fn get_provider_factory() -> TestProviderFactory { let db = create_test_rw_db(); - ProviderFactory::new(db, MAINNET.clone()) + ProviderFactory::new(db, GOERLI.clone()) } fn add_account(provider_factory: &TestProviderFactory, address: Address, account: Account) { From f178bf3bc90bf4b2455ea0566249c90ea2be8af5 Mon Sep 17 00:00:00 2001 From: christn Date: Sat, 16 Mar 2024 15:05:47 +0100 Subject: [PATCH 13/14] Add missing fields to example payload --- tests/data/single_payload.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/data/single_payload.json b/tests/data/single_payload.json index 87b8228..abcae67 100644 --- a/tests/data/single_payload.json +++ b/tests/data/single_payload.json @@ -20,6 +20,8 @@ "block_number": "17585076", "gas_limit": "30000000", "gas_used": "10241365", + "blob_gas_used": "10241365", + "excess_blob_gas": "10241365", "timestamp": "1688043143", "extra_data": "0x497427732046726565205265616c20457374617465", "base_fee_per_gas": "26097588307", From 1f8b2b240f7f891e0c39a5da1f7eba3f14c124fe Mon Sep 17 00:00:00 2001 From: christn Date: Sat, 16 Mar 2024 15:06:44 +0100 Subject: [PATCH 14/14] Cargo fmt --- tests/integration/http.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/http.rs b/tests/integration/http.rs index bb44cde..deace8b 100644 --- a/tests/integration/http.rs +++ b/tests/integration/http.rs @@ -593,7 +593,8 @@ fn generate_block(gas_limit: u64, base_fee_per_gas: u64) -> Block { block_number: 19447300, ..Default::default() }; - try_into_block(payload.clone().into(), Some(B256::with_last_byte(0x69))).expect("failed to create block") + try_into_block(payload.clone().into(), Some(B256::with_last_byte(0x69))) + .expect("failed to create block") } fn generate_validation_request_body( @@ -619,7 +620,6 @@ fn generate_validation_request_body( validation_request_body.registered_gas_limit = 1_000_000; validation_request_body.parent_beacon_block_root = Some(B256::with_last_byte(0x69)); - seal_request_body(add_transactions( validation_request_body, transactions,