diff --git a/Cargo.lock b/Cargo.lock index a248fb02..8de1901e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -81,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -143,7 +133,7 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-eips", "alloy-primitives", @@ -151,14 +141,13 @@ dependencies = [ "alloy-serde", "c-kzg", "serde", - "sha2 0.10.8", ] [[package]] name = "alloy-dyn-abi" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ab339ca7b4ea9115f0578c941abc80a171edf8e5eadd01e6c4237b68db8083" +checksum = "545885d9b0b2c30fd344ae291439b4bfe59e48dd62fbc862f8503d98088967dc" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -169,13 +158,13 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.6.7", + "winnow 0.6.8", ] [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -186,12 +175,13 @@ dependencies = [ "proptest", "proptest-derive", "serde", + "sha2 0.10.8", ] [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "alloy-serde", @@ -201,9 +191,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44294729c145cf7ae65feab544b5b81fb2bb7e2fd060214842eb3989a1e9d882" +checksum = "786689872ec4e7d354810ab0dffd48bb40b838c047522eb031cbd47d15634849" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -214,7 +204,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "serde", @@ -226,7 +216,7 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -242,9 +232,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c715249705afa1e32be79dabfd35e2ef0f1cc02ad2cf48c9d1e20026ee637b" +checksum = "525448f6afc1b70dd0f9d0a8145631bf2f5e434678ab23ab18409ca264cae6b3" dependencies = [ "alloy-rlp", "arbitrary", @@ -254,7 +244,7 @@ dependencies = [ "derive_arbitrary", "derive_more", "ethereum_ssz", - "getrandom 0.2.14", + "getrandom 0.2.15", "hex-literal", "itoa", "k256 0.13.3", @@ -292,7 +282,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -314,17 +304,29 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "alloy-serde", "serde", ] +[[package]] +name = "alloy-rpc-types-beacon" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "serde", + "serde_with", +] + [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -342,7 +344,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -354,7 +356,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "serde", @@ -364,7 +366,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-primitives", "async-trait", @@ -377,7 +379,7 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db" +source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" dependencies = [ "alloy-consensus", "alloy-network", @@ -393,9 +395,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef9a94a27345fb31e3fcb5f5e9f592bb4847493b07fa1e47dd9fde2222f2e28" +checksum = "89c80a2cb97e7aa48611cbb63950336f9824a174cdf670527cc6465078a26ea1" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -411,9 +413,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31fe73cd259527e24dc2dbfe64bc95e5ddfcd2b2731f670a11ff72b2be2c25b" +checksum = "c58894b58ac50979eeac6249661991ac40b9d541830d9a725f7714cc9ef08c23" dependencies = [ "const-hex", "dunce", @@ -426,18 +428,18 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8d6e74e4feeaa2bcfdecfd3da247ab53c67bd654ba1907270c32e02b142331" +checksum = "7da8e71ea68e780cc203919e03f69f59e7afe92d2696fb1dcb6662f61e4031b6" dependencies = [ - "winnow 0.6.7", + "winnow 0.6.8", ] [[package]] name = "alloy-sol-types" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afaffed78bfb17526375754931e045f96018aa810844b29c7aef823266dd4b4b" +checksum = "399287f68d1081ed8b1f4903c49687658b95b142207d7cb4ae2f4813915343ef" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -482,47 +484,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -530,9 +533,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "aquamarine" @@ -693,15 +696,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - [[package]] name = "asn1_der" version = "0.7.6" @@ -744,8 +738,8 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "zstd 0.13.1", - "zstd-safe 7.1.0", + "zstd", + "zstd-safe", ] [[package]] @@ -790,17 +784,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.0", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -841,9 +824,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -901,7 +884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.14", + "getrandom 0.2.15", "instant", "pin-project-lite", "rand 0.8.5", @@ -967,9 +950,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -1380,27 +1363,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "c-kzg" version = "1.0.0" @@ -1463,9 +1425,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", @@ -1598,7 +1560,7 @@ dependencies = [ "coins-bip32", "hmac 0.12.1", "once_cell", - "pbkdf2 0.12.2", + "pbkdf2", "rand 0.8.5", "sha2 0.10.8", "thiserror", @@ -1626,9 +1588,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "comfy-table" @@ -1722,12 +1684,6 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "convert_case" version = "0.4.0" @@ -2446,15 +2402,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - [[package]] name = "encode_unicode" version = "0.3.6" @@ -2495,24 +2442,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enr" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" -dependencies = [ - "base64 0.21.7", - "bytes", - "hex", - "k256 0.13.3", - "log", - "rand 0.8.5", - "rlp", - "serde", - "sha3", - "zeroize", -] - [[package]] name = "enr" version = "0.12.0" @@ -2597,28 +2526,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "eth-keystore" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab" -dependencies = [ - "aes 0.8.4", - "ctr 0.9.2", - "digest 0.10.7", - "hex", - "hmac 0.12.1", - "pbkdf2 0.11.0", - "rand 0.8.5", - "scrypt", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "thiserror", - "uuid 0.8.2", -] - [[package]] name = "ethabi" version = "18.0.0" @@ -2702,93 +2609,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "ethers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" -dependencies = [ - "ethers-addressbook", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-middleware", - "ethers-providers", - "ethers-signers", - "ethers-solc", -] - -[[package]] -name = "ethers-addressbook" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" -dependencies = [ - "ethers-core", - "once_cell", - "serde", - "serde_json", -] - -[[package]] -name = "ethers-contract" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" -dependencies = [ - "const-hex", - "ethers-contract-abigen", - "ethers-contract-derive", - "ethers-core", - "ethers-providers", - "futures-util", - "once_cell", - "pin-project", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "ethers-contract-abigen" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" -dependencies = [ - "Inflector", - "const-hex", - "dunce", - "ethers-core", - "ethers-etherscan", - "eyre", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "reqwest", - "serde", - "serde_json", - "syn 2.0.60", - "toml 0.8.12", - "walkdir", -] - -[[package]] -name = "ethers-contract-derive" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" -dependencies = [ - "Inflector", - "const-hex", - "ethers-contract-abigen", - "ethers-core", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.60", -] - [[package]] name = "ethers-core" version = "2.0.14" @@ -2797,7 +2617,6 @@ checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec", "bytes", - "cargo_metadata", "chrono", "const-hex", "elliptic-curve 0.13.8", @@ -2805,151 +2624,18 @@ dependencies = [ "generic-array", "k256 0.13.3", "num_enum", - "once_cell", "open-fastrlp", "rand 0.8.5", "rlp", "serde", "serde_json", "strum", - "syn 2.0.60", "tempfile", "thiserror", "tiny-keccak", "unicode-xid", ] -[[package]] -name = "ethers-etherscan" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649" -dependencies = [ - "chrono", - "ethers-core", - "reqwest", - "semver 1.0.22", - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "ethers-middleware" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-providers", - "ethers-signers", - "futures-channel", - "futures-locks", - "futures-util", - "instant", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "url", -] - -[[package]] -name = "ethers-providers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" -dependencies = [ - "async-trait", - "auto_impl", - "base64 0.21.7", - "bytes", - "const-hex", - "enr 0.10.0", - "ethers-core", - "futures-core", - "futures-timer", - "futures-util", - "hashers", - "http", - "instant", - "jsonwebtoken 8.3.0", - "once_cell", - "pin-project", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-tungstenite", - "tracing", - "tracing-futures", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "ws_stream_wasm", -] - -[[package]] -name = "ethers-signers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" -dependencies = [ - "async-trait", - "coins-bip32", - "coins-bip39", - "const-hex", - "elliptic-curve 0.13.8", - "eth-keystore", - "ethers-core", - "rand 0.8.5", - "sha2 0.10.8", - "thiserror", - "tracing", -] - -[[package]] -name = "ethers-solc" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66244a771d9163282646dbeffe0e6eca4dda4146b6498644e678ac6089b11edd" -dependencies = [ - "cfg-if", - "const-hex", - "dirs", - "dunce", - "ethers-core", - "glob", - "home", - "md-5", - "num_cpus", - "once_cell", - "path-slash", - "rayon", - "regex", - "semver 1.0.22", - "serde", - "serde_json", - "solang-parser", - "svm-rs", - "thiserror", - "tiny-keccak", - "tokio", - "tracing", - "walkdir", - "yansi", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -3089,12 +2775,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.30" @@ -3135,16 +2815,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "funty" version = "2.0.0" @@ -3225,16 +2895,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "futures-locks" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06" -dependencies = [ - "futures-channel", - "futures-task", -] - [[package]] name = "futures-macro" version = "0.3.30" @@ -3282,7 +2942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers", - "send_wrapper 0.4.0", + "send_wrapper", ] [[package]] @@ -3309,15 +2969,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -3342,9 +2993,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3488,15 +3139,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashers" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2bca93b15ea5a746f220e56587f71e73c6165eab783df9e26590069953e3c30" -dependencies = [ - "fxhash", -] - [[package]] name = "hashlink" version = "0.8.4" @@ -3588,15 +3230,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -4144,19 +3777,16 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.11.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -4233,7 +3863,7 @@ dependencies = [ "tokio-util", "tracing", "url", - "webpki-roots 0.26.1", + "webpki-roots", ] [[package]] @@ -4430,36 +4060,6 @@ dependencies = [ "sha3-asm", ] -[[package]] -name = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.8.3", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata 0.4.6", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -4525,7 +4125,7 @@ dependencies = [ "either", "futures", "futures-timer", - "getrandom 0.2.14", + "getrandom 0.2.15", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -4612,9 +4212,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.44.1" +version = "0.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92532fc3c4fb292ae30c371815c9b10103718777726ea5497abc268a4761866" +checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" dependencies = [ "either", "fnv", @@ -4623,6 +4223,7 @@ dependencies = [ "instant", "libp2p-core", "libp2p-identity", + "lru", "multistream-select", "once_cell", "rand 0.8.5", @@ -4803,16 +4404,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest 0.10.7", -] - [[package]] name = "memchr" version = "2.7.2" @@ -4962,7 +4553,6 @@ dependencies = [ "beacon-api-client", "clap", "ethereum-consensus", - "ethers", "eyre", "futures-util", "mev-rs", @@ -5239,12 +4829,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nibble_vec" version = "0.1.0" @@ -5326,9 +4910,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -5349,9 +4933,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -5614,41 +5198,12 @@ dependencies = [ ] [[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-slash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", - "password-hash", - "sha2 0.10.8", -] - -[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "pbkdf2" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5673,7 +5228,7 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "serde", ] @@ -5685,25 +5240,15 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", "ucd-trie", ] -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - [[package]] name = "ph" version = "0.8.3" @@ -5717,16 +5262,6 @@ dependencies = [ "wyhash", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version 0.4.0", -] - [[package]] name = "phf" version = "0.11.2" @@ -5734,7 +5269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -5743,7 +5278,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.2", + "phf_shared", "rand 0.8.5", ] @@ -5754,21 +5289,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", "proc-macro2", "quote", "syn 2.0.60", ] -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - [[package]] name = "phf_shared" version = "0.11.2" @@ -5889,22 +5415,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "prettyplease" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" -dependencies = [ - "proc-macro2", - "syn 2.0.60", -] - [[package]] name = "primitive-types" version = "0.12.2" @@ -6173,7 +5683,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -6267,7 +5777,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "libredox", "thiserror", ] @@ -6341,7 +5851,6 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -6351,7 +5860,6 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -6360,7 +5868,6 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -6368,7 +5875,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", "winreg", ] @@ -6385,7 +5891,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "ahash", "alloy-rlp", @@ -6419,6 +5925,7 @@ dependencies = [ "reth-discv4", "reth-downloaders", "reth-ethereum-payload-builder", + "reth-evm", "reth-exex", "reth-interfaces", "reth-network", @@ -6459,7 +5966,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -6482,7 +5989,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "futures-core", @@ -6505,7 +6012,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures", "metrics", @@ -6534,7 +6041,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus-core" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6544,7 +6051,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "aquamarine", "linked_hash_set", @@ -6553,10 +6060,12 @@ dependencies = [ "parking_lot 0.12.2", "reth-consensus", "reth-db", + "reth-evm", "reth-interfaces", "reth-metrics", "reth-primitives", "reth-provider", + "reth-revm", "reth-stages-api", "reth-trie", "reth-trie-parallel", @@ -6567,9 +6076,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ - "futures", "reth-tasks", "tokio", "tracing", @@ -6578,9 +6086,10 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-eips", + "alloy-genesis", "alloy-primitives", "bytes", "modular-bitfield", @@ -6591,7 +6100,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6602,8 +6111,9 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ + "confy", "humantime-serde", "reth-discv4", "reth-net-nat", @@ -6616,7 +6126,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "auto_impl", "reth-primitives", @@ -6626,7 +6136,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6637,7 +6147,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "arbitrary", "bytes", @@ -6668,7 +6178,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "discv5", @@ -6690,7 +6200,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "derive_more", @@ -6714,7 +6224,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6737,7 +6247,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "futures", @@ -6764,7 +6274,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6797,7 +6307,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6808,7 +6318,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "bytes", @@ -6835,7 +6345,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "bytes", @@ -6849,7 +6359,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6864,7 +6374,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6880,7 +6390,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-basic-payload-builder", "reth-payload-builder", @@ -6895,7 +6405,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "rayon", "reth-db", @@ -6905,8 +6415,9 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ + "futures-util", "reth-interfaces", "reth-primitives", "revm", @@ -6916,12 +6427,11 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-evm", "reth-interfaces", "reth-primitives", - "reth-provider", "reth-revm", "revm-primitives", "tracing", @@ -6930,14 +6440,16 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "eyre", "metrics", "reth-config", "reth-metrics", + "reth-network", "reth-node-api", "reth-node-core", + "reth-payload-builder", "reth-primitives", "reth-provider", "reth-tasks", @@ -6949,7 +6461,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "auto_impl", "clap", @@ -6967,7 +6479,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "async-trait", "bytes", @@ -6988,7 +6500,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -7006,7 +6518,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "bindgen", "cc", @@ -7016,7 +6528,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures", "metrics", @@ -7028,7 +6540,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "once_cell", "proc-macro2", @@ -7040,7 +6552,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "pin-project", "reth-network-types", @@ -7050,7 +6562,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "igd-next", "pin-project-lite", @@ -7064,7 +6576,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "aquamarine", @@ -7114,7 +6626,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -7130,19 +6642,21 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ + "alloy-primitives", + "alloy-rlp", "enr 0.12.0", - "reth-primitives", - "reth-rpc-types", "secp256k1", "serde_with", + "thiserror", + "url", ] [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "anyhow", "bincode", @@ -7156,13 +6670,13 @@ dependencies = [ "sucds", "thiserror", "tracing", - "zstd 0.13.1", + "zstd", ] [[package]] name = "reth-node-api" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-db", "reth-engine-primitives", @@ -7177,7 +6691,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "aquamarine", "confy", @@ -7192,6 +6706,7 @@ dependencies = [ "reth-consensus", "reth-db", "reth-downloaders", + "reth-evm", "reth-exex", "reth-interfaces", "reth-network", @@ -7202,7 +6717,6 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-prune", - "reth-revm", "reth-rpc", "reth-rpc-engine-api", "reth-stages", @@ -7211,12 +6725,13 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "tokio", + "tokio-stream", ] [[package]] name = "reth-node-core" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "clap", "const-str", @@ -7232,14 +6747,18 @@ dependencies = [ "metrics-process", "metrics-util", "once_cell", + "pin-project", "procfs", "rand 0.8.5", "reth-beacon-consensus", + "reth-codecs", "reth-config", "reth-consensus-common", "reth-db", "reth-discv4", + "reth-discv5", "reth-engine-primitives", + "reth-etl", "reth-evm", "reth-interfaces", "reth-metrics", @@ -7265,6 +6784,7 @@ dependencies = [ "thiserror", "tikv-jemalloc-ctl", "tokio", + "tokio-util", "tracing", "vergen", ] @@ -7272,7 +6792,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -7290,7 +6810,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures", "humantime", @@ -7312,7 +6832,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures-util", "metrics", @@ -7333,7 +6853,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -7343,7 +6863,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-chains", "alloy-eips", @@ -7366,6 +6886,7 @@ dependencies = [ "rayon", "reth-codecs", "reth-ethereum-forks", + "reth-network-types", "reth-rpc-types", "revm", "revm-primitives", @@ -7377,13 +6898,13 @@ dependencies = [ "strum", "tempfile", "thiserror", - "zstd 0.13.1", + "zstd", ] [[package]] name = "reth-provider" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "auto_impl", @@ -7412,7 +6933,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "itertools 0.12.1", "metrics", @@ -7433,10 +6954,9 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "reth-consensus-common", - "reth-evm", "reth-interfaces", "reth-primitives", "reth-provider", @@ -7448,7 +6968,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7500,7 +7020,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7514,7 +7034,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "hyper", "jsonrpsee", @@ -7541,7 +7061,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7566,32 +7086,25 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ - "alloy-genesis", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types", "alloy-rpc-types-anvil", + "alloy-rpc-types-beacon", "alloy-rpc-types-engine", "alloy-rpc-types-trace", - "arbitrary", - "enr 0.12.0", "jsonrpsee-types", - "proptest", - "proptest-derive", - "secp256k1", "serde", "serde_json", "serde_with", "thiserror", - "url", ] [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7602,7 +7115,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7613,10 +7126,12 @@ dependencies = [ "reth-consensus", "reth-db", "reth-etl", + "reth-evm", "reth-exex", "reth-interfaces", "reth-primitives", "reth-provider", + "reth-revm", "reth-stages-api", "reth-trie", "thiserror", @@ -7627,7 +7142,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "aquamarine", "auto_impl", @@ -7650,7 +7165,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7667,7 +7182,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "dyn-clone", "futures-util", @@ -7684,7 +7199,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "tokio", "tokio-stream", @@ -7693,7 +7208,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "clap", "eyre", @@ -7708,7 +7223,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "aquamarine", @@ -7740,7 +7255,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "auto_impl", @@ -7758,7 +7273,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60" +source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" dependencies = [ "alloy-rlp", "derive_more", @@ -7795,7 +7310,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=3d2077e#3d2077ee665046c256448a8bd90d8e93ea85de56" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=7168ac5#7168ac55682fb420da7a82ed94bfb0c30a034113" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7902,7 +7417,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -8120,7 +7635,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] @@ -8192,24 +7707,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher 0.4.4", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "scale-info" version = "2.11.2" @@ -8260,18 +7757,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scrypt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" -dependencies = [ - "hmac 0.12.1", - "pbkdf2 0.11.0", - "salsa20", - "sha2 0.10.8", -] - [[package]] name = "sct" version = "0.7.1" @@ -8332,11 +7817,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -8345,9 +7830,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -8386,17 +7871,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -8412,9 +7891,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -8481,7 +7960,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -8530,17 +8009,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.9.9" @@ -8764,20 +8232,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "solang-parser" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" -dependencies = [ - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "phf", - "thiserror", - "unicode-xid", -] - [[package]] name = "spin" version = "0.5.2" @@ -8869,19 +8323,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.2", - "phf_shared 0.10.0", - "precomputed-hash", -] - [[package]] name = "strsim" version = "0.9.3" @@ -8951,26 +8392,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "svm-rs" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11297baafe5fa0c99d5722458eac6a5e25c01eb1b8e5cd137f54079093daa7a4" -dependencies = [ - "dirs", - "fs2", - "hex", - "once_cell", - "reqwest", - "semver 1.0.22", - "serde", - "serde_json", - "sha2 0.10.8", - "thiserror", - "url", - "zip", -] - [[package]] name = "syn" version = "1.0.109" @@ -8995,9 +8416,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70aba06097b6eda3c15f6eebab8a6339e121475bcf08bbe6758807e716c372a1" +checksum = "5aa0cefd02f532035d83cfec82647c6eb53140b0485220760e669f4bad489e36" dependencies = [ "paste", "proc-macro2", @@ -9073,17 +8494,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - [[package]] name = "thin-vec" version = "0.2.13" @@ -9307,26 +8717,11 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", - "tungstenite", - "webpki-roots 0.25.4", -] - [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -9335,7 +8730,6 @@ dependencies = [ "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] @@ -9400,7 +8794,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow 0.6.8", ] [[package]] @@ -9451,7 +8845,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.8.0", + "uuid", ] [[package]] @@ -9685,26 +9079,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.21.12", - "sha1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "typenum" version = "1.17.0" @@ -9830,12 +9204,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -9854,23 +9222,13 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.14", - "serde", -] - [[package]] name = "uuid" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -9926,16 +9284,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -10046,12 +9394,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.1" @@ -10083,15 +9425,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -10267,9 +9600,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -10296,25 +9629,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.0", - "send_wrapper 0.6.0", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyhash" version = "0.5.0" @@ -10357,12 +9671,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "yoke" version = "0.7.3" @@ -10389,18 +9697,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" dependencies = [ "proc-macro2", "quote", @@ -10470,52 +9778,13 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes 0.8.4", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac 0.12.1", - "pbkdf2 0.11.0", - "sha1", - "time", - "zstd 0.11.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - [[package]] name = "zstd" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.1.0", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 99e37d5f..dc776160 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,16 +17,41 @@ version = "0.3.0" ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "2ce2ca4d59ef2985088168b0f69a4a8c4f953241" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "2ce2ca4d59ef2985088168b0f69a4a8c4f953241" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "77c1240" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "77c1240" } + +futures = "0.3.21" +tokio = "1.0" +tokio-stream = "0.1.15" +axum = "0.6.4" +hyper = "0.14" +tracing = "0.1" +tracing-subscriber = "0.3" +http = "0.2.7" +url = { version = "2.2.2", default-features = false } + +serde_json = "1.0.92" +async-trait = "0.1.53" +serde = "1.0" +thiserror = "1.0.30" +parking_lot = "0.12.1" +toml = "0.8.2" + +rayon = "1.8.0" + +pin-project = "1.0.12" +backoff = "0.4.0" eyre = "0.6.8" futures-util = "0.3.30" sha2 = "0.10.8" +rand = "0.8.5" + +clap = "4.1.4" [patch.crates-io] c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", tag = "v1.0.1" } diff --git a/bin/mev/Cargo.toml b/bin/mev/Cargo.toml index 67c74f04..6fd39cff 100644 --- a/bin/mev/Cargo.toml +++ b/bin/mev/Cargo.toml @@ -20,18 +20,18 @@ minimal-preset = [ ] [dependencies] -tokio = { version = "1.0", features = ["full"] } -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true } +tracing-subscriber = { workspace = true, features = ["env-filter"] } mev-boost-rs = { path = "../../mev-boost-rs", optional = true } mev-relay-rs = { path = "../../mev-relay-rs", optional = true } mev-build-rs = { path = "../../mev-build-rs", optional = true } mev-rs = { path = "../../mev-rs" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } -clap = { version = "4.1.4", features = ["derive", "env"] } +clap = { workspace = true, features = ["derive", "env"] } eyre = { workspace = true } ethereum-consensus = { workspace = true } diff --git a/bin/utils/Cargo.toml b/bin/utils/Cargo.toml index 478f2948..68cb3848 100644 --- a/bin/utils/Cargo.toml +++ b/bin/utils/Cargo.toml @@ -7,13 +7,13 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.0", features = ["full"] } -url = { version = "2.2.2", default-features = false } +tokio = { workspace = true, features = ["full"] } +url = { workspace = true } mev-rs = { path = "../../mev-rs" } -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0.92" } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } ethereum-consensus = { workspace = true } beacon-api-client = { workspace = true } diff --git a/mev-boost-rs/Cargo.toml b/mev-boost-rs/Cargo.toml index d5d1b502..cd575111 100644 --- a/mev-boost-rs/Cargo.toml +++ b/mev-boost-rs/Cargo.toml @@ -16,16 +16,16 @@ minimal-preset = [ ] [dependencies] -tokio = { version = "1.0", features = ["full"] } -tracing = "0.1" -async-trait = "0.1.53" -pin-project = "1.0.12" -rand = "0.8.5" +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true } +async-trait = { workspace = true } +pin-project = { workspace = true } futures-util = { workspace = true } +rand = { workspace = true } -serde = { version = "1.0", features = ["derive"] } -thiserror = "1.0.30" -parking_lot = "0.12.1" +serde = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } +parking_lot = { workspace = true } ethereum-consensus = { workspace = true } beacon-api-client = { workspace = true } @@ -33,7 +33,6 @@ beacon-api-client = { workspace = true } mev-rs = { path = "../mev-rs" } [dev-dependencies] -rand = "0.8.5" tracing-subscriber = { version = "0.3", features = ["env-filter"] } url = { version = "2.2.2", default-features = false } serde_json = "1.0.81" diff --git a/mev-build-rs/Cargo.toml b/mev-build-rs/Cargo.toml index e9cdfac6..30b21bd0 100644 --- a/mev-build-rs/Cargo.toml +++ b/mev-build-rs/Cargo.toml @@ -12,15 +12,15 @@ default = [] minimal-preset = ["mev-rs/minimal-preset"] [dependencies] -tokio = { version = "1.0", features = ["full"] } -tokio-stream = "0.1.15" -tracing = "0.1" -async-trait = "0.1.53" -pin-project = "1.0.12" +tokio = { workspace = true, features = ["full"] } +tokio-stream = { workspace = true } +tracing = { workspace = true } +async-trait = { workspace = true } +pin-project = { workspace = true } futures-util = { workspace = true } -thiserror = "1.0.30" -serde = { version = "1.0", features = ["derive"] } +thiserror = { workspace = true } +serde = { workspace = true, features = ["derive"] } ethereum-consensus = { workspace = true } beacon-api-client = { workspace = true } @@ -35,6 +35,5 @@ alloy-signer = { workspace = true } alloy-signer-wallet = { workspace = true, features = ["mnemonic"] } sha2 = { workspace = true } -ethers = "2.0" eyre = { workspace = true } -clap = { version = "4.1.4", features = ["derive", "env"] } +clap = { workspace = true, features = ["derive", "env"] } diff --git a/mev-build-rs/src/auctioneer/service.rs b/mev-build-rs/src/auctioneer/service.rs index c28305c5..22eed0da 100644 --- a/mev-build-rs/src/auctioneer/service.rs +++ b/mev-build-rs/src/auctioneer/service.rs @@ -216,7 +216,7 @@ impl< proposer: Proposer, relays: HashSet, mut attributes: BuilderPayloadBuilderAttributes, - ) { + ) -> Option { let (bidder, revenue_updates) = mpsc::channel(DEFAULT_BUILDER_BIDDER_CHANNEL_SIZE); let proposal = ProposalAttributes { proposer_gas_limit: proposer.gas_limit, @@ -235,10 +235,19 @@ impl< if let Err(err) = self.builder.new_payload(auction.attributes.clone()).await { warn!(%err, "could not start build with payload builder"); - return + return None } + let payload_id = auction.attributes.payload_id(); self.bidder.start_bid(auction, revenue_updates); + Some(payload_id) + } + + // Record `payload_id` as processed so that we can identify duplicate notifications. + // Return value indicates if the `payload_id` has been observed before or not. + fn observe_payload_id(&mut self, slot: Slot, payload_id: PayloadId) -> bool { + let processed_set = self.processed_payload_attributes.entry(slot).or_default(); + processed_set.insert(payload_id) } async fn on_payload_attributes(&mut self, attributes: BuilderPayloadBuilderAttributes) { @@ -249,8 +258,7 @@ impl< ) .expect("is past genesis"); - let processed_set = self.processed_payload_attributes.entry(slot).or_default(); - let is_new = processed_set.insert(attributes.payload_id()); + let is_new = self.observe_payload_id(slot, attributes.payload_id()); if !is_new { trace!(payload_id = %attributes.payload_id(), "ignoring duplicate payload attributes"); @@ -259,7 +267,11 @@ impl< if let Some(proposals) = self.get_proposals(slot) { for (proposer, relays) in proposals { - self.open_auction(slot, proposer, relays, attributes.clone()).await; + if let Some(payload_id) = + self.open_auction(slot, proposer, relays, attributes.clone()).await + { + self.observe_payload_id(slot, payload_id); + } } } } diff --git a/mev-build-rs/src/payload/attributes.rs b/mev-build-rs/src/payload/attributes.rs index ae528d5d..e8ba8597 100644 --- a/mev-build-rs/src/payload/attributes.rs +++ b/mev-build-rs/src/payload/attributes.rs @@ -5,7 +5,7 @@ use reth::{ primitives::{ alloy_primitives::private::alloy_rlp::Encodable, revm_primitives::{BlockEnv, CfgEnvWithHandlerCfg}, - Address, ChainSpec, Header, Withdrawals, B256, + Address, ChainSpec, Header, Withdrawals, B256, B64, }, rpc::types::engine::PayloadAttributes, }; @@ -13,11 +13,7 @@ use sha2::Digest; use std::convert::Infallible; use tokio::sync::mpsc::Sender; -pub fn payload_id_with_bytes( - parent: &B256, - attributes: &PayloadAttributes, - proposal: Option<&ProposalAttributes>, -) -> (PayloadId, [u8; 8]) { +pub fn payload_id(parent: &B256, attributes: &PayloadAttributes) -> PayloadId { let mut hasher = sha2::Sha256::new(); hasher.update(parent.as_slice()); hasher.update(&attributes.timestamp.to_be_bytes()[..]); @@ -33,20 +29,11 @@ pub fn payload_id_with_bytes( hasher.update(parent_beacon_block); } - if let Some(proposal) = proposal { - hasher.update(proposal.proposer_gas_limit.to_be_bytes()); - hasher.update(proposal.proposer_fee_recipient.as_slice()); - } - let out = hasher.finalize(); - let inner: [u8; 8] = out.as_slice()[..8].try_into().expect("sufficient length"); - (PayloadId::new(inner), inner) + PayloadId::new(out.as_slice()[..8].try_into().expect("sufficient length")) } -pub fn mix_proposal_into_payload_id( - payload_id: [u8; 8], - proposal: &ProposalAttributes, -) -> PayloadId { +pub fn mix_proposal_into_payload_id(payload_id: B64, proposal: &ProposalAttributes) -> PayloadId { let mut hasher = sha2::Sha256::new(); hasher.update(payload_id); @@ -67,15 +54,12 @@ pub struct ProposalAttributes { #[derive(Debug, Clone)] pub struct BuilderPayloadBuilderAttributes { pub inner: EthPayloadBuilderAttributes, - // TODO: can skip this if we expose the inner value upstream - // NOTE: save this here to avoid recomputing later - payload_id: Option<[u8; 8]>, pub proposal: Option, } impl BuilderPayloadBuilderAttributes { pub fn new(parent: B256, attributes: PayloadAttributes) -> Self { - let (id, id_bytes) = payload_id_with_bytes(&parent, &attributes, None); + let id = payload_id(&parent, &attributes); let inner = EthPayloadBuilderAttributes { id, @@ -86,16 +70,13 @@ impl BuilderPayloadBuilderAttributes { withdrawals: attributes.withdrawals.unwrap_or_default().into(), parent_beacon_block_root: attributes.parent_beacon_block_root, }; - Self { inner, payload_id: Some(id_bytes), proposal: None } + Self { inner, proposal: None } } pub fn attach_proposal(&mut self, proposal: ProposalAttributes) { - // NOTE: error to call this more than once; see note on this field, hopefully this goes away - if let Some(payload_id) = self.payload_id.take() { - let id = mix_proposal_into_payload_id(payload_id, &proposal); - self.inner.id = id; - self.proposal = Some(proposal); - } + let id = mix_proposal_into_payload_id(self.inner.id.0, &proposal); + self.inner.id = id; + self.proposal = Some(proposal); } } diff --git a/mev-relay-rs/Cargo.toml b/mev-relay-rs/Cargo.toml index 989f1f65..7833da9a 100644 --- a/mev-relay-rs/Cargo.toml +++ b/mev-relay-rs/Cargo.toml @@ -12,18 +12,18 @@ default = [] minimal-preset = ["mev-rs/minimal-preset"] [dependencies] -tokio = { version = "1.0", features = ["full"] } -tracing = "0.1" -futures = "0.3.21" -async-trait = "0.1.53" -parking_lot = "0.12.1" -pin-project = "1.0.12" -backoff = { version = "0.4.0", features = ["tokio"] } +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true } +futures = { workspace = true } +async-trait = { workspace = true } +parking_lot = { workspace = true } +pin-project = { workspace = true } +backoff = { workspace = true, features = ["tokio"] } -thiserror = "1.0.30" -http = "0.2.7" -url = { version = "2.2.2", default-features = false } -serde = { version = "1.0", features = ["derive"] } +thiserror = { workspace = true } +url = { workspace = true, default-features = false } +serde = { workspace = true, features = ["derive"] } +http = { workspace = true } ethereum-consensus = { workspace = true } beacon-api-client = { workspace = true } diff --git a/mev-rs/Cargo.toml b/mev-rs/Cargo.toml index cf5ef935..ff907f6a 100644 --- a/mev-rs/Cargo.toml +++ b/mev-rs/Cargo.toml @@ -15,21 +15,21 @@ api = ["tokio", "axum", "hyper", "beacon-api-client", "tracing", "serde_json"] minimal-preset = [] [dependencies] -tokio = { version = "1.0", optional = true } -axum = { version = "0.6.4", optional = true } -hyper = { version = "0.14", optional = true } -tracing = { version = "0.1", optional = true } +tokio = { workspace = true, optional = true } +axum = { workspace = true, optional = true } +hyper = { workspace = true, optional = true } +tracing = { workspace = true, optional = true } -async-trait = "0.1.53" -serde = { version = "1.0", features = ["derive"], optional = true } -thiserror = "1.0.30" -parking_lot = "0.12.1" -url = { version = "2.2.2", default-features = false } +async-trait = { workspace = true } +serde = { workspace = true, features = ["derive"], optional = true } +thiserror = { workspace = true } +parking_lot = { workspace = true } +url = { workspace = true } -serde_json = { version = "1.0.92", optional = true } -toml = "0.8.2" +serde_json = { workspace = true, optional = true } +toml = { workspace = true } -rayon = "1.8.0" +rayon = { workspace = true } ethereum-consensus = { workspace = true } beacon-api-client = { workspace = true, optional = true }