diff --git a/Cargo.lock b/Cargo.lock index 3b3e949..c2ff6bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,6 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -38,18 +39,13 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - [[package]] name = "alloy-chains" -version = "0.1.29" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07629a5d0645d29f68d2fb6f4d0cf15c89ec0965be915f303967180929743f" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" dependencies = [ + "alloy-primitives", "alloy-rlp", "num_enum", "serde", @@ -58,15 +54,17 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4177d135789e282e925092be8939d421b701c6d92c0a16679faa659d9166289d" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", + "auto_impl", "c-kzg", + "derive_more", "serde", ] @@ -83,21 +81,22 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.1.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", + "derive_more", "k256", "serde", ] [[package]] name = "alloy-eips" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499ee14d296a133d142efd215eb36bf96124829fe91cf8f5d4e5ccdd381eae00" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -105,7 +104,9 @@ dependencies = [ "alloy-rlp", "alloy-serde", "c-kzg", - "derive_more 1.0.0", + "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", "once_cell", "serde", "sha2", @@ -113,9 +114,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", "alloy-serde", @@ -124,10 +125,12 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-serde", "serde", @@ -135,24 +138,30 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a767e59c86900dd7c3ce3ecef04f3ace5ac9631ee150beb8b7d22f7fa3bbb2d7" +checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 0.99.18", - "getrandom 0.2.15", + "derive_more", + "foldhash", + "getrandom", + "hashbrown 0.15.1", "hex-literal", + "indexmap 2.5.0", "itoa", "k256", "keccak-asm", + "paste", "proptest", - "rand 0.8.5", + "rand", "ruint", + "rustc-hash 2.0.0", "serde", + "sha3", "tiny-keccak", ] @@ -178,27 +187,42 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "alloy-rpc-types" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-rpc-types-engine" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79cadb52e32d40afa04847647eb50a332559d7870e66e46a0c32c33bf1c801d" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth", "alloy-serde", + "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", "serde", - "thiserror", + "strum", ] [[package]] name = "alloy-rpc-types-eth" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bb3506ab1cf415d4752778c93e102050399fb8de97b7da405a5bf3e31f5f3b" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ "alloy-consensus", "alloy-eips", @@ -207,17 +231,17 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", + "derive_more", "itertools 0.13.0", "serde", "serde_json", - "thiserror", ] [[package]] name = "alloy-serde" -version = "0.3.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" dependencies = [ "alloy-primitives", "serde", @@ -226,13 +250,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183bcfc0f3291d9c41a3774172ee582fb2ce6eb6569085471d8f225de7bb86fc" +checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -240,15 +264,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" +checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", "indexmap 2.5.0", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -258,9 +282,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" +checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a" dependencies = [ "const-hex", "dunce", @@ -273,9 +297,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577e262966e92112edbd15b1b2c0947cc434d6e8311df96d3329793fe8047da9" +checksum = "6520d427d4a8eb7aa803d852d7a52ceb0c519e784c292f64bb339e636918cf27" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -284,14 +308,14 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.5.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398a977d774db13446b8cead8cfa9517aebf9e03fc8a1512892dc1e03e70bb04" +checksum = "b6b2e366c0debf0af77766c23694a3f863b02633050e71e096e257ffbd395e50" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", - "hashbrown 0.14.5", + "arrayvec", + "derive_more", "nybbles", "serde", "smallvec", @@ -374,6 +398,20 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[package]] +name = "aquamarine" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "ark-ff" version = "0.3.0" @@ -485,7 +523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -495,7 +533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -503,6 +541,20 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] [[package]] name = "atty" @@ -592,16 +644,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -610,12 +660,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "binout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60b1af88a588fca5fe424ae7d735bc52814f80ff57614f57043cc4e2024f2ea" - [[package]] name = "bit-set" version = "0.5.3" @@ -646,15 +690,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06e8e5bec3490b9f6f3adbb78aa4f53e8396fd9994e8a62a346b44ea7c15f35" -dependencies = [ - "dyn_size_of", -] - [[package]] name = "bitvec" version = "1.0.1" @@ -781,7 +816,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -908,12 +943,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "convert_case" version = "0.6.0" @@ -989,6 +1018,12 @@ dependencies = [ "itertools 0.10.5", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -1036,7 +1071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -1051,20 +1086,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cuckoofilter" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" -dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", - "serde", - "serde_bytes", - "serde_derive", -] - [[package]] name = "darling" version = "0.20.10" @@ -1145,19 +1166,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version 0.4.1", - "syn 2.0.77", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -1173,7 +1181,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case 0.6.0", + "convert_case", "proc-macro2", "quote", "syn 2.0.77", @@ -1213,12 +1221,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" -[[package]] -name = "dyn_size_of" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d4f78a40b1ec35bf8cafdaaf607ba2f773c366b0b3bda48937cacd7a8d5134" - [[package]] name = "ecdsa" version = "0.16.9" @@ -1252,7 +1254,7 @@ dependencies = [ "generic-array", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1269,7 +1271,7 @@ dependencies = [ "bytes", "hex", "log", - "rand 0.8.5", + "rand", "sha3", "zeroize", ] @@ -1312,7 +1314,7 @@ dependencies = [ "eyre", "hash-db", "proptest", - "rand 0.8.5", + "rand", "rayon", "reth-db-api", "reth-errors", @@ -1331,6 +1333,47 @@ dependencies = [ "triehash", ] +[[package]] +name = "ethereum_serde_utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" +dependencies = [ + "alloy-primitives", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfbba28f4f3f32d92c06a64f5bf6c4537b5d4e21f28c689bd2bbaecfea4e0d3e" +dependencies = [ + "alloy-primitives", + "derivative", + "ethereum_serde_utils", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d37845ba7c16bf4be8be4b5786f03a2ba5f2fda0d7f9e7cb2282f69cff420d7" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "eyre" version = "0.6.12" @@ -1364,10 +1407,22 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -1375,7 +1430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -1386,6 +1441,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1395,6 +1456,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "funty" version = "2.0.0" @@ -1501,17 +1571,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -1520,7 +1579,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1542,7 +1601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1568,14 +1627,25 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" dependencies = [ - "ahash", - "allocator-api2", + "foldhash", "serde", ] @@ -1635,7 +1705,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1683,6 +1753,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.3" @@ -1712,25 +1801,36 @@ dependencies = [ ] [[package]] -name = "is_terminal_polyfill" -version = "1.70.1" +name = "inotify" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] [[package]] -name = "itertools" -version = "0.10.5" +name = "inotify-sys" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" dependencies = [ - "either", + "libc", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" -version = "0.12.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1800,6 +1900,26 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -1809,12 +1929,6 @@ dependencies = [ "spin", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.158" @@ -1828,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -1837,6 +1951,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1851,6 +1976,7 @@ checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -1891,14 +2017,26 @@ dependencies = [ [[package]] name = "metrics" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" dependencies = [ "ahash", "portable-atomic", ] +[[package]] +name = "metrics-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3dbdd96ed57d565ec744cba02862d707acf373c5772d152abae6ec5c4e24f6c" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.77", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1915,7 +2053,19 @@ dependencies = [ ] [[package]] -name = "modular-bitfield" +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "modular-bitfield" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" @@ -1945,6 +2095,24 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -2101,6 +2269,10 @@ name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "oorandom" @@ -2108,6 +2280,72 @@ version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +[[package]] +name = "op-alloy-consensus" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26c3b35b7b3e36d15e0563eebffe13c1d9ca16b7aaffcb6a64354633547e16b" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "derive_more", + "serde", + "spin", +] + +[[package]] +name = "op-alloy-genesis" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccacc2efed3d60d98ea581bddb885df1c6c62a592e55de049cfefd94116112cd" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_repr", +] + +[[package]] +name = "op-alloy-protocol" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f8e6ec6b91c6aaeb20860b455a52fd8e300acfe5d534e96e9073a24f853e74" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "async-trait", + "derive_more", + "op-alloy-consensus", + "op-alloy-genesis", + "serde", + "tracing", + "unsigned-varint", +] + +[[package]] +name = "op-alloy-rpc-types-engine" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b52ee59c86537cff83e8c7f2a6aa287a94f3608bb40c06d442aafd0c2e807a4" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-serde", + "derive_more", + "ethereum_ssz", + "op-alloy-protocol", + "serde", + "snap", +] + [[package]] name = "os_str_bytes" version = "6.6.1" @@ -2177,7 +2415,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2203,19 +2441,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "ph" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b7b74d575d7c11fb653fae69688be5206cafc1ead33c01ce61ac7f36eae45b" -dependencies = [ - "binout", - "bitm", - "dyn_size_of", - "rayon", - "wyhash", -] - [[package]] name = "pin-project" version = "1.1.5" @@ -2334,27 +2559,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.77", ] [[package]] @@ -2377,8 +2600,8 @@ dependencies = [ "bitflags 2.6.0", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.4", "rusty-fork", @@ -2407,19 +2630,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2427,18 +2637,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "serde", ] [[package]] @@ -2448,16 +2649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2466,16 +2658,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -2484,7 +2667,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2562,9 +2745,11 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reth-blockchain-tree-api" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "reth-consensus", "reth-execution-errors", "reth-primitives", @@ -2574,11 +2759,13 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "auto_impl", - "derive_more 1.0.0", + "derive_more", "metrics", "parking_lot", "pin-project", @@ -2596,16 +2783,16 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", - "alloy-trie", "auto_impl", - "derive_more 1.0.0", + "derive_more", "once_cell", "reth-ethereum-forks", "reth-network-peers", @@ -2616,8 +2803,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2632,10 +2819,10 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "convert_case 0.6.0", + "convert_case", "proc-macro2", "quote", "syn 2.0.77", @@ -2643,21 +2830,38 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "auto_impl", - "derive_more 1.0.0", + "derive_more", + "reth-primitives", +] + +[[package]] +name = "reth-consensus-common" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "reth-chainspec", + "reth-consensus", "reth-primitives", + "revm-primitives", ] [[package]] name = "reth-db" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-primitives", "bytes", - "derive_more 1.0.0", + "derive_more", "eyre", "metrics", "page_size", @@ -2683,11 +2887,13 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-genesis", + "alloy-primitives", "bytes", - "derive_more 1.0.0", + "derive_more", "metrics", "modular-bitfield", "parity-scale-codec", @@ -2704,20 +2910,34 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-primitives", "bytes", "modular-bitfield", "reth-codecs", + "reth-primitives-traits", + "serde", +] + +[[package]] +name = "reth-engine-primitives" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-primitives", + "reth-execution-types", + "reth-payload-primitives", "reth-primitives", + "reth-trie", "serde", ] [[package]] name = "reth-errors" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -2729,24 +2949,26 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", - "alloy-genesis", + "alloy-eips", + "alloy-primitives", "alloy-rlp", "bytes", - "derive_more 1.0.0", + "derive_more", "reth-chainspec", "reth-codecs-derive", "reth-primitives", + "serde", "thiserror", ] [[package]] name = "reth-ethereum-forks" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", "alloy-primitives", @@ -2762,17 +2984,24 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", + "alloy-primitives", "auto_impl", "futures-util", + "metrics", "reth-chainspec", + "reth-consensus", + "reth-consensus-common", "reth-execution-errors", "reth-execution-types", + "reth-metrics", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", + "reth-revm", "reth-storage-errors", "revm", "revm-primitives", @@ -2780,13 +3009,13 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "nybbles", "reth-consensus", "reth-prune-types", @@ -2796,19 +3025,22 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "reth-execution-errors", "reth-primitives", "reth-trie", "revm", + "serde", ] [[package]] name = "reth-fs-util" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "serde", "serde_json", @@ -2817,24 +3049,25 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bitflags 2.6.0", "byteorder", "dashmap", - "derive_more 1.0.0", + "derive_more", "indexmap 2.5.0", "parking_lot", "reth-mdbx-sys", + "smallvec", "thiserror", "tracing", ] [[package]] name = "reth-mdbx-sys" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bindgen", "cc", @@ -2842,39 +3075,30 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "metrics", - "reth-metrics-derive", -] - -[[package]] -name = "reth-metrics-derive" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.77", + "metrics-derive", ] [[package]] name = "reth-net-banlist" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-network-p2p" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "auto_impl", - "derive_more 1.0.0", + "derive_more", "futures", "reth-consensus", "reth-eth-wire-types", @@ -2888,8 +3112,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -2901,8 +3125,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "reth-ethereum-forks", "reth-net-banlist", @@ -2913,36 +3137,70 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "anyhow", "bincode", - "cuckoofilter", - "derive_more 1.0.0", + "derive_more", "lz4_flex", "memmap2", - "ph", "reth-fs-util", "serde", - "sucds", "thiserror", "tracing", "zstd", ] +[[package]] +name = "reth-node-types" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "reth-chainspec", + "reth-db-api", + "reth-engine-primitives", + "reth-primitives", + "reth-primitives-traits", + "reth-trie-db", +] + +[[package]] +name = "reth-payload-primitives" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types", + "async-trait", + "op-alloy-rpc-types-engine", + "pin-project", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-primitives", + "reth-transaction-pool", + "serde", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "reth-primitives" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-genesis", "alloy-primitives", "alloy-rlp", + "alloy-serde", "bytes", - "derive_more 1.0.0", + "c-kzg", + "derive_more", "k256", "modular-bitfield", "once_cell", @@ -2955,14 +3213,13 @@ dependencies = [ "revm-primitives", "secp256k1", "serde", - "thiserror", "zstd", ] [[package]] name = "reth-primitives-traits" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2971,7 +3228,7 @@ dependencies = [ "alloy-rlp", "byteorder", "bytes", - "derive_more 1.0.0", + "derive_more", "modular-bitfield", "reth-codecs", "revm-primitives", @@ -2981,14 +3238,17 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", "dashmap", "itertools 0.13.0", "metrics", + "notify", "parking_lot", "rayon", "reth-blockchain-tree-api", @@ -3004,6 +3264,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-nippy-jar", + "reth-node-types", "reth-primitives", "reth-prune-types", "reth-stages-types", @@ -3019,22 +3280,37 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", - "derive_more 1.0.0", + "derive_more", "modular-bitfield", "reth-codecs", "serde", "thiserror", ] +[[package]] +name = "reth-revm" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "reth-execution-errors", + "reth-primitives", + "reth-prune-types", + "reth-storage-api", + "reth-storage-errors", + "revm", +] + [[package]] name = "reth-stages-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", @@ -3046,22 +3322,26 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", - "derive_more 1.0.0", + "derive_more", "serde", "strum", ] [[package]] name = "reth-storage-api" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", "auto_impl", "reth-chainspec", + "reth-db-api", "reth-db-models", "reth-execution-types", "reth-primitives", @@ -3073,19 +3353,37 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", + "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "reth-fs-util", "reth-primitives", ] +[[package]] +name = "reth-tasks" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "auto_impl", + "dyn-clone", + "futures-util", + "metrics", + "reth-metrics", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "reth-tracing" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "clap 4.5.16", "eyre", @@ -3097,14 +3395,51 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "reth-transaction-pool" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "aquamarine", + "auto_impl", + "bitflags 2.6.0", + "futures-util", + "metrics", + "parking_lot", + "rand", + "reth-chain-state", + "reth-chainspec", + "reth-eth-wire-types", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-primitives", + "reth-storage-api", + "reth-tasks", + "revm", + "rustc-hash 2.0.0", + "schnellru", + "serde", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "reth-trie" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", + "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more 1.0.0", "itertools 0.13.0", "metrics", "rayon", @@ -3115,13 +3450,14 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm", + "serde", "tracing", ] [[package]] name = "reth-trie-common" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -3129,7 +3465,7 @@ dependencies = [ "alloy-rlp", "alloy-trie", "bytes", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "nybbles", "reth-codecs", @@ -3140,21 +3476,18 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-primitives", "alloy-rlp", - "auto_impl", - "derive_more 1.0.0", - "itertools 0.13.0", + "derive_more", "metrics", - "rayon", "reth-db", "reth-db-api", "reth-execution-errors", "reth-metrics", "reth-primitives", - "reth-stages-types", "reth-storage-errors", "reth-trie", "reth-trie-common", @@ -3164,9 +3497,9 @@ dependencies = [ [[package]] name = "revm" -version = "14.0.1" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f719e28cc6fdd086f8bc481429e587740d20ad89729cec3f5f5dd7b655474df" +checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" dependencies = [ "auto_impl", "cfg-if", @@ -3179,9 +3512,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "10.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916" +checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" dependencies = [ "revm-primitives", "serde", @@ -3189,9 +3522,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "11.0.1" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e25f604cb9db593ca3013be8c00f310d6790ccb1b7d8fbbdd4660ec8888043a" +checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" dependencies = [ "aurora-engine-modexp", "blst", @@ -3208,11 +3541,12 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "9.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccb981ede47ccf87c68cebf1ba30cdbb7ec935233ea305f3dfff4c1e10ae541" +checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" dependencies = [ - "alloy-eips", + "alloy-eip2930", + "alloy-eip7702", "alloy-primitives", "auto_impl", "bitflags 2.6.0", @@ -3221,7 +3555,6 @@ dependencies = [ "cfg-if", "dyn-clone", "enumn", - "hashbrown 0.14.5", "hex", "serde", ] @@ -3290,7 +3623,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand", "rlp", "ruint-macro", "serde", @@ -3321,6 +3654,9 @@ name = "rustc-hash" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +dependencies = [ + "rand", +] [[package]] name = "rustc-hex" @@ -3392,6 +3728,17 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schnellru" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3418,7 +3765,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ - "rand 0.8.5", + "rand", "secp256k1-sys", ] @@ -3464,15 +3811,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.209" @@ -3497,6 +3835,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "serde_with" version = "3.9.0" @@ -3580,7 +3929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3601,11 +3950,20 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -3660,7 +4018,7 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.5", + "rand", "rustc-hex", ] @@ -3670,16 +4028,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "sucds" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53d46182afe6ed822a94c54a532dc0d59691a8f49226bdc4596529ca864cdd6" -dependencies = [ - "anyhow", - "num-traits", -] - [[package]] name = "syn" version = "1.0.109" @@ -3704,9 +4052,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.0" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284c41c2919303438fcf8dede4036fd1e82d4fc0fbb2b279bd2a1442c909ca92" +checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b" dependencies = [ "paste", "proc-macro2", @@ -3716,15 +4064,14 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "windows", ] @@ -3985,6 +4332,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "tracing-journald" version = "0.3.0" @@ -4123,6 +4480,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "url" version = "2.5.2" @@ -4171,12 +4534,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4281,12 +4638,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", - "windows-targets", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -4295,7 +4652,59 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", ] [[package]] @@ -4304,7 +4713,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -4313,7 +4722,22 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] @@ -4322,28 +4746,46 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[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.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[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.6" @@ -4356,24 +4798,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[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.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[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.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[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.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[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.6" @@ -4389,15 +4855,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "wyhash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index b421ff4..d7d8d75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,27 +13,27 @@ rayon = "1.10.0" smallvec = "1.13.2" # reth -reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } # revm -revm = { version = "14.0.0", features = [ +revm = { version = "17.0.0", features = [ "std", "secp256k1", "blst", ], default-features = false } -revm-primitives = { version = "9.0.0", features = [ +revm-primitives = { version = "13.0.0", features = [ "std", ], default-features = false } # alloy -alloy-primitives = { version = "0.8.0", default-features = false, features = ["asm-keccak"] } +alloy-primitives = { version = "0.8.9", default-features = false, features = ["asm-keccak"] } alloy-rlp = "0.3.4" -alloy-trie = { version = "0.5", default-features = false } +alloy-trie = { version = "0.7", default-features = false } # test only dependencies but included here to be accessible from benches/ hash-db = "0.15.2" diff --git a/src/reth_sparse_trie/mod.rs b/src/reth_sparse_trie/mod.rs index ead38c7..e2d7c4b 100644 --- a/src/reth_sparse_trie/mod.rs +++ b/src/reth_sparse_trie/mod.rs @@ -2,8 +2,8 @@ use alloy_primitives::{Address, B256}; use change_set::prepare_change_set; use change_set::prepare_change_set_for_prefetch; use hash::RootHashError; -use reth_db_api::database::Database; use reth_provider::providers::ConsistentDbView; +use reth_provider::BlockReader; use reth_provider::DatabaseProviderFactory; use reth_provider::ExecutionOutcome; use std::time::Duration; @@ -65,14 +65,13 @@ impl ChangedAccountData { } /// Prefetches data -pub fn prefetch_tries_for_accounts<'a, DB, Provider>( - consistent_db_view: ConsistentDbView, +pub fn prefetch_tries_for_accounts<'a, Provider>( + consistent_db_view: ConsistentDbView, shared_cache: SparseTrieSharedCache, changed_data: impl Iterator, ) -> Result<(), SparseTrieError> where - DB: Database, - Provider: DatabaseProviderFactory + Send + Sync, + Provider: DatabaseProviderFactory + Send + Sync, { let change_set = prepare_change_set_for_prefetch(changed_data); @@ -95,14 +94,13 @@ where /// Calculate root hash for the given outcome on top of the block defined by consistent_db_view. /// * shared_cache should be created once for each parent block and it stores fethed parts of the trie /// It uses rayon for parallelism and the thread pool should be configured from outside. -pub fn calculate_root_hash_with_sparse_trie( - consistent_db_view: ConsistentDbView, +pub fn calculate_root_hash_with_sparse_trie( + consistent_db_view: ConsistentDbView, outcome: &ExecutionOutcome, shared_cache: SparseTrieSharedCache, ) -> (Result, SparseTrieMetrics) where - DB: Database, - Provider: DatabaseProviderFactory + Send + Sync, + Provider: DatabaseProviderFactory + Send + Sync, { let mut metrics = SparseTrieMetrics::default(); diff --git a/src/reth_sparse_trie/trie_fetcher/mod.rs b/src/reth_sparse_trie/trie_fetcher/mod.rs index 532ac83..d855d36 100644 --- a/src/reth_sparse_trie/trie_fetcher/mod.rs +++ b/src/reth_sparse_trie/trie_fetcher/mod.rs @@ -1,18 +1,19 @@ use crate::utils::{hash_map_with_capacity, HashMap, HashSet}; +use alloy_primitives::map::HashMap as AlloyHashMap; +use alloy_primitives::map::HashSet as AlloyHashSet; + use alloy_primitives::{Bytes, B256}; use alloy_trie::Nibbles; use rayon::prelude::*; -use reth_db_api::database::Database; use reth_errors::ProviderError; use reth_execution_errors::trie::StateProofError; use reth_provider::providers::ConsistentDbView; -use reth_provider::DatabaseProviderFactory; +use reth_provider::{BlockReader, DBProvider, DatabaseProviderFactory}; use reth_trie::proof::Proof; use reth_trie::{MultiProof as RethMultiProof, EMPTY_ROOT_HASH}; use reth_trie_db::{DatabaseHashedCursorFactory, DatabaseTrieCursorFactory}; use serde::{Deserialize, Serialize}; use serde_with::{serde_as, Seq}; -use std::collections::HashMap as StdHashMap; use super::shared_cache::MissingNodes; @@ -51,16 +52,15 @@ pub struct StorageMultiProof { } #[derive(Debug)] -pub struct TrieFetcher { - consistent_db_view: ConsistentDbView, +pub struct TrieFetcher { + consistent_db_view: ConsistentDbView, } -impl TrieFetcher +impl TrieFetcher where - DB: Database, - Provider: DatabaseProviderFactory + Send + Sync, + Provider: DatabaseProviderFactory + Send + Sync, { - pub fn new(consistent_db_view: ConsistentDbView) -> Self { + pub fn new(consistent_db_view: ConsistentDbView) -> Self { Self { consistent_db_view } } @@ -74,13 +74,12 @@ where .into_par_iter() .map(|targets| -> Result { let provider = self.consistent_db_view.provider_ro()?; - let proof = Proof::new( DatabaseTrieCursorFactory::new(provider.tx_ref()), DatabaseHashedCursorFactory::new(provider.tx_ref()), ); - let reth_multiproof = proof.with_targets(targets).multiproof()?; + let reth_multiproof = proof.multiproof(targets)?; let result = convert_reth_multiproof(reth_multiproof, &all_requested_accounts); Ok(result) }) @@ -103,7 +102,7 @@ fn pad_path(mut path: Nibbles) -> B256 { fn get_proof_targets( missing_nodes: MissingNodes, -) -> (Vec>>, HashSet) { +) -> (Vec>>, HashSet) { // we will split all missing nodes accounts into buckets of (missing accounts / account_per_fetch) let account_per_fetch = 5; @@ -115,7 +114,7 @@ fn get_proof_targets( if is_address { all_requested_accounts.insert(hashed_address); } - targets.insert(hashed_address, Vec::new()); + targets.insert(hashed_address, AlloyHashSet::default()); } for (account, missing_storage_nodes) in missing_nodes.storage_trie_nodes { let hashed_address = B256::from_slice(&account); @@ -123,14 +122,14 @@ fn get_proof_targets( let storage_targets = targets.entry(hashed_address).or_default(); for node in missing_storage_nodes { let node = pad_path(node); - storage_targets.push(node); + storage_targets.insert(node); } } - let mut result = Vec::new(); + let mut result = Vec::>>::new(); let mut iter = targets.into_iter(); loop { - let mut split_target = StdHashMap::new(); + let mut split_target = AlloyHashMap::>::default(); let mut count = 0; while let Some((target_key, target_value)) = iter.next() { split_target.insert(target_key, target_value); @@ -182,7 +181,7 @@ fn convert_reth_multiproof( all_requested_accounts: &HashSet, ) -> MultiProof { let mut account_subtree = Vec::with_capacity(reth_proof.account_subtree.len()); - for (k, v) in reth_proof.account_subtree { + for (k, v) in reth_proof.account_subtree.into_inner() { account_subtree.push((k, v)); } account_subtree.sort_by_key(|a| a.0.clone()); @@ -196,7 +195,7 @@ fn convert_reth_multiproof( } let mut subtree = Vec::with_capacity(reth_storage_proof.subtree.len()); - for (k, v) in reth_storage_proof.subtree { + for (k, v) in reth_storage_proof.subtree.into_inner() { subtree.push((k, v)); } subtree.sort_by_key(|a| a.0.clone()); diff --git a/src/sparse_mpt/diff_trie/mod.rs b/src/sparse_mpt/diff_trie/mod.rs index 03e4f5d..1f72b75 100644 --- a/src/sparse_mpt/diff_trie/mod.rs +++ b/src/sparse_mpt/diff_trie/mod.rs @@ -116,7 +116,7 @@ impl DiffTrie { loop { let node = try_get_node_mut(&mut self.nodes, c.current_node, &c.current_path)?; match &mut node.kind { - DiffTrieNodeKind::Null => { + DiffTrieNodeKind::EmptyRoot => { let new_node = DiffTrieNode::new_leaf(c.path_left, value); *node = new_node; break; @@ -269,7 +269,7 @@ impl DiffTrie { .map_err(|e| DeletionError::NodeNotFound(e))?; match &mut node.kind { - DiffTrieNodeKind::Null => { + DiffTrieNodeKind::EmptyRoot => { return Err(DeletionError::KeyNotFound); } DiffTrieNodeKind::Leaf(leaf) => { @@ -359,7 +359,7 @@ impl DiffTrie { let node = try_get_node_mut(&mut self.nodes, current_node, &Nibbles::new()) .expect("nodes must exist when walking back"); let should_remove = match &mut node.kind { - DiffTrieNodeKind::Null => unreachable!(), + DiffTrieNodeKind::EmptyRoot => unreachable!(), DiffTrieNodeKind::Leaf(_) => { deletion_result = NodeDeletionResult::NodeDeleted; true @@ -578,7 +578,7 @@ impl DiffTrie { }); child_below.rlp_pointer = None; } - DiffTrieNodeKind::Null => unreachable!(), + DiffTrieNodeKind::EmptyRoot => unreachable!(), }; let ptr = get_new_ptr(&mut self.ptrs); self.head = ptr; @@ -610,7 +610,7 @@ impl DiffTrie { let node = try_get_node_mut(&mut self.nodes, current_node, &empty_path)?; match &mut node.kind { - DiffTrieNodeKind::Null | DiffTrieNodeKind::Leaf(_) => { + DiffTrieNodeKind::EmptyRoot | DiffTrieNodeKind::Leaf(_) => { result_stack.push(node.rlp_pointer_slow()); } DiffTrieNodeKind::Extension(extension) => { @@ -682,7 +682,7 @@ impl DiffTrie { let node = self.nodes.get(&node_ptr).expect("node not found"); let mut child_rlp = Vec::new(); let rlp_encode = match &node.kind { - DiffTrieNodeKind::Null | DiffTrieNodeKind::Leaf(_) => node.rlp_encode(&[]), + DiffTrieNodeKind::EmptyRoot | DiffTrieNodeKind::Leaf(_) => node.rlp_encode(&[]), DiffTrieNodeKind::Extension(extension) => { if node.rlp_pointer.is_none() && extension.child.rlp_pointer.is_none() { let child_node = extension.child.ptr(); diff --git a/src/sparse_mpt/diff_trie/nodes.rs b/src/sparse_mpt/diff_trie/nodes.rs index 97e6c78..3441308 100644 --- a/src/sparse_mpt/diff_trie/nodes.rs +++ b/src/sparse_mpt/diff_trie/nodes.rs @@ -20,7 +20,7 @@ pub struct DiffTrieNode { impl DiffTrieNode { pub fn new_null() -> Self { Self { - kind: DiffTrieNodeKind::Null, + kind: DiffTrieNodeKind::EmptyRoot, rlp_pointer: None, } } @@ -133,7 +133,7 @@ impl DiffTrieNode { encode_branch_node(&child_rlp_pointers, &mut out); out } - DiffTrieNodeKind::Null => { + DiffTrieNodeKind::EmptyRoot => { let mut out = Vec::with_capacity(1); encode_null_node(&mut out); out @@ -148,7 +148,7 @@ pub enum DiffTrieNodeKind { Leaf(DiffLeafNode), Extension(DiffExtensionNode), Branch(DiffBranchNode), - Null, + EmptyRoot, } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/src/sparse_mpt/fixed_trie.rs b/src/sparse_mpt/fixed_trie.rs index 58df208..e270a9a 100644 --- a/src/sparse_mpt/fixed_trie.rs +++ b/src/sparse_mpt/fixed_trie.rs @@ -34,7 +34,7 @@ pub enum FixedTrieNode { node: Arc, child_ptrs: Vec<(u8, u64)>, }, - Null, + EmptyRoot, } #[derive(Debug, thiserror::Error)] @@ -70,7 +70,7 @@ impl FixedTrieNode { changed_children: SmallVec::new(), aux_bits: node.child_mask, }), - FixedTrieNode::Null => DiffTrieNodeKind::Null, + FixedTrieNode::EmptyRoot => DiffTrieNodeKind::EmptyRoot, }; DiffTrieNode { kind, @@ -111,7 +111,8 @@ impl From for FixedBranchNode { let rlp_data = stack_iter .next() .expect("stack must be the same size as mask"); - children[index as usize] = Some(rlp_data.into()); + // @Pending: Eval replacing Bytes for ArrayVec to avoid the copy or dig deeper into low-level. + children[index as usize] = Some(Bytes::copy_from_slice(rlp_data.as_ref())); child_mask |= 1 << index } } @@ -132,7 +133,7 @@ impl From for FixedExtensionNode { fn from(alloy_extension_node: AlloyExtensionNode) -> Self { Self { key: alloy_extension_node.key, - child: alloy_extension_node.child.into(), + child: Bytes::copy_from_slice(alloy_extension_node.child.as_ref()), } } } @@ -199,7 +200,7 @@ impl FixedTrie { child_ptrs, } } - DiffTrieNodeKind::Null => FixedTrieNode::Null, + DiffTrieNodeKind::EmptyRoot => FixedTrieNode::EmptyRoot, }; result.nodes.insert(*ptr, fixed_node); } @@ -212,7 +213,7 @@ impl FixedTrie { pub fn add_nodes(&mut self, nodes: &[(Nibbles, Bytes)]) -> Result<(), AddNodeError> { // when adding empty proof we init try to be empty if nodes.is_empty() && self.nodes.is_empty() { - self.nodes.insert(0, FixedTrieNode::Null); + self.nodes.insert(0, FixedTrieNode::EmptyRoot); self.head = 0; self.ptrs = 0; self.nodes_inserted.insert(Nibbles::new()); @@ -234,6 +235,7 @@ impl FixedTrie { child_ptr: None, }, AlloyTrieNode::Leaf(node) => FixedTrieNode::Leaf(Arc::new(node.into())), + AlloyTrieNode::EmptyRoot => FixedTrieNode::EmptyRoot, }; // here we find parent to link with this new node @@ -292,7 +294,7 @@ impl FixedTrie { current_node = get_child_ptr(child_ptrs, nibble).ok_or(AddNodeError::InvalidInput)?; } - FixedTrieNode::Null | FixedTrieNode::Leaf(_) => { + FixedTrieNode::EmptyRoot | FixedTrieNode::Leaf(_) => { return Err(AddNodeError::InvalidInput) } } @@ -314,7 +316,7 @@ impl FixedTrie { assert!(get_child_ptr(child_ptrs, child_nibble).is_none()); child_ptrs.push((child_nibble, ptr)); } - FixedTrieNode::Null | FixedTrieNode::Leaf(_) => unreachable!(), + FixedTrieNode::EmptyRoot | FixedTrieNode::Leaf(_) => unreachable!(), } } else { assert_eq!(self.nodes.len(), 1); @@ -365,7 +367,7 @@ impl FixedTrie { .entry(c.current_node) .or_insert_with(|| node.create_diff_node()); match (node, &mut diff_node.kind) { - (FixedTrieNode::Null, DiffTrieNodeKind::Null) => { + (FixedTrieNode::EmptyRoot, DiffTrieNodeKind::EmptyRoot) => { // this is empty trie, we have everything to return return Ok(result); } diff --git a/src/utils.rs b/src/utils.rs index 8b6ff24..fae1682 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -2,7 +2,7 @@ use alloy_primitives::{keccak256, Bytes, B256}; use alloy_rlp::{length_of_length, BufMut, Encodable, Header, EMPTY_STRING_CODE}; use alloy_trie::nodes::{ExtensionNodeRef, LeafNodeRef}; use alloy_trie::Nibbles; -use reth_trie::word_rlp; +use reth_trie::RlpNode; use rustc_hash::{FxBuildHasher, FxHasher}; use serde::{Deserialize, Serialize}; @@ -21,7 +21,7 @@ pub fn rlp_pointer(rlp_encode: Bytes) -> Bytes { if rlp_encode.len() < 32 { rlp_encode } else { - word_rlp(&keccak256(&rlp_encode)).into() + Bytes::copy_from_slice(RlpNode::word_rlp(&keccak256(&rlp_encode)).as_ref()) } }