From f8ace2017cd0c9fb7627c8e01d9d7099b6a24b12 Mon Sep 17 00:00:00 2001 From: Oliver Nordbjerg Date: Tue, 10 Sep 2024 15:22:14 +0200 Subject: [PATCH] chore: bump reth --- Cargo.lock | 1534 +++++++++++++++------------- Cargo.toml | 34 +- bin/alphanet/Cargo.toml | 6 +- bin/alphanet/src/main.rs | 36 +- crates/node/Cargo.toml | 11 +- crates/node/src/evm.rs | 106 +- crates/node/src/lib.rs | 4 +- crates/node/src/node.rs | 32 +- crates/precompile/Cargo.toml | 9 +- crates/precompile/src/secp256r1.rs | 27 +- crates/testing/Cargo.toml | 7 - 11 files changed, 954 insertions(+), 852 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3845701..064c9a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" @@ -59,7 +59,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -97,15 +97,16 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eadd758805fe353ea8a520da4531efb9739382312c354d3e90b7a16353b0315" +checksum = "c37d89f69cb43901949ba29307ada8b9e3b170f94057ad4c04d6fd169d24d65f" dependencies = [ "alloy-consensus", "alloy-contract", "alloy-core", "alloy-eips", "alloy-genesis", + "alloy-network", "alloy-provider", "alloy-rpc-client", "alloy-serde", @@ -116,9 +117,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.27" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b515e82c8468ddb6ff8db21c78a5997442f113fd8471fd5b2261b2602dd0c67" +checksum = "2b4f201b0ac8f81315fbdc55269965a8ddadbc04ab47fa65a1a468f9a40f7a5f" dependencies = [ "alloy-rlp", "arbitrary", @@ -130,9 +131,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7198a527b4c4762cb88d54bcaeb0428f4298b72552c9c8ec4af614b4a4990c59" +checksum = "1468e3128e07c7afe4ff13c17e8170c330d12c322f8924b8bf6986a27e0aad3d" dependencies = [ "alloy-eips", "alloy-primitives", @@ -145,9 +146,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0450f718460a93ac8a3df08dca5fdea7cf3f08c5cb61b9548c02aa54f84841ad" +checksum = "335d62de1a887f1b780441f8a3037f39c9fb26839cc9acd891c9b80396145cd5" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -165,9 +166,9 @@ dependencies = [ [[package]] name = "alloy-core" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6dbb79f4e3285cc87f50c0d4be9a3a812643623b2e3558d425b41cbd795ceb" +checksum = "88b095eb0533144b4497e84a9cc3e44a5c2e3754a3983c0376a55a2f9183a53e" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -177,20 +178,20 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5b68572f5dfa99ede0a491d658c9842626c956b840d0b97d0bbc9637742504" +checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471" dependencies = [ "alloy-json-abi", "alloy-primitives", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", - "derive_more 0.99.18", + "derive_more", "itoa", "serde", "serde_json", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -202,7 +203,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", - "rand 0.8.5", + "rand", "serde", ] @@ -216,15 +217,15 @@ dependencies = [ "alloy-rlp", "arbitrary", "k256", - "rand 0.8.5", + "rand", "serde", ] [[package]] name = "alloy-eips" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159eab0e4e15b88571f55673af37314f4b8f17630dc1b393c3d70f2128a1d494" +checksum = "0c35df7b972b06f1b2f4e8b7a53328522fa788054a9d3e556faf2411c5a51d5a" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -233,7 +234,7 @@ dependencies = [ "alloy-serde", "arbitrary", "c-kzg", - "derive_more 1.0.0", + "derive_more", "once_cell", "serde", "sha2 0.10.8", @@ -241,9 +242,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210f4b358d724f85df8adaec753c583defb58169ad3cad3d48c80d1a25a6ff0e" +checksum = "0b7210f9206c0fa2a83c824cf8cb6c962126bc9fdc4f41ade1932f14150ef5f6" dependencies = [ "alloy-primitives", "alloy-serde", @@ -252,9 +253,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299d2a937b6c60968df3dad2a988b0f0e03277b344639a4f7a31bd68e6285e59" +checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -264,9 +265,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7733446dd531f8eb877331fea02f6c40bdbb47444a17dc3464bf75319cc073a" +checksum = "8866562186d237f1dfeaf989ef941a24764f764bf5c33311e37ead3519c6a429" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -278,9 +279,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80851d1697fc4fa2827998e3ee010a3d1fc59c7d25e87070840169fcf465832" +checksum = "abe714e233f9eaf410de95a9af6bcd05d3a7f8c8de7a0817221e95a6b642a080" dependencies = [ "alloy-consensus", "alloy-eips", @@ -299,10 +300,11 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76a2336889f3d0624b18213239d27f4f34eb476eb35bef22f6a8cc24e0c0078" +checksum = "8c5a38117974c5776a45e140226745a0b664f79736aa900995d8e4121558e064" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-serde", "serde", @@ -310,9 +312,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a767e59c86900dd7c3ce3ecef04f3ace5ac9631ee150beb8b7d22f7fa3bbb2d7" +checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd" dependencies = [ "alloy-rlp", "arbitrary", @@ -320,15 +322,15 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more 0.99.18", - "getrandom 0.2.15", + "derive_more", + "getrandom", "hex-literal", "itoa", "k256", "keccak-asm", "proptest", "proptest-derive", - "rand 0.8.5", + "rand", "ruint", "serde", "tiny-keccak", @@ -336,9 +338,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d2a195caa6707f5ce13905794865765afc6d9ea92c3a56e3a973c168d703bc" +checksum = "c65633d6ef83c3626913c004eaf166a6dd50406f724772ea8567135efd6dc5d3" dependencies = [ "alloy-chains", "alloy-consensus", @@ -372,9 +374,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c59e13200322138fe4279b4676b0d78c4f55502de127f5a448495d3ddfaa43" +checksum = "949db89abae6193b44cc90ebf2eeb74eb8d2a474383c5e62b45bdcd362e84f8f" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -385,7 +387,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", ] @@ -408,14 +410,14 @@ checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "alloy-rpc-client" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed31cdba2b23d71c555505b06674f8e7459496abfd7f4875d268434ef5a99ee6" +checksum = "d5fc328bb5d440599ba1b5aa44c0b9ab0625fbc3a403bb5ee94ed4a01ba23e07" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -430,29 +432,28 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-rpc-types" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d758f65aa648491c6358335c578de45cd7de6fdf2877c3cef61f2c9bebea21" +checksum = "8f8ff679f94c497a8383f2cd09e2a099266e5f3d5e574bc82b4b379865707dbb" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-rpc-types-trace", "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e41c33bbddaec71ca1bd7a4df38f95f408ef4fa3b3c29a7e9cc8d0e43be5fbe" +checksum = "cfeb75bc4dad84037f6ebd9385b8fe85833aac70c384e99855bc2f38cc35ab91" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -462,9 +463,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5ee4ffe3e687a6372dd02e998f4f65e512ffdfe0d2c248db822649814c36cd" +checksum = "1d430bf98148565e67b2c08f033dd5fb27ce901c3481018941ce1524b9ad4fba" dependencies = [ "alloy-primitives", "alloy-serde", @@ -473,9 +474,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173bf0239a59d3616f4f4ab1682de25dd30b13fb8f52bf7ee7503729354f3c4" +checksum = "b016035bb76144d04c071004383370d39def54d1a857171277f618112086b70e" dependencies = [ "alloy-eips", "alloy-primitives", @@ -485,11 +486,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-rpc-types-debug" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c037ac74c2aff58a6f8f82179b7f05c6b02b762b661abff9d8fe32056bc4a41" +dependencies = [ + "alloy-primitives", + "serde", +] + [[package]] name = "alloy-rpc-types-engine" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e800d959606fa19b36b31d7c24d68ef75b970c654b7aa581dce23de82db0a5" +checksum = "b66bb45f4c5efe227bcb51d89c97221225169976e18097671a0bd4393d8248a4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -499,16 +510,16 @@ dependencies = [ "alloy-serde", "jsonrpsee-types", "jsonwebtoken", - "rand 0.8.5", + "rand", "serde", "thiserror", ] [[package]] name = "alloy-rpc-types-eth" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ba05d6ee4db0d89113294a614137940f79abfc2c40a9a3bee2995660358776" +checksum = "9a59b1d7c86e0a653e7f3d29954f6de5a2878d8cfd1f010ff93be5c2c48cd3b1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -526,9 +537,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a0b28949d1077826684b5912fe9ab1c752a863af0419b1ba9abff19006d61b1" +checksum = "456a942b962e140d574d09b52241bc9f4277203fb80bddb1f49de57ca3ce4e00" dependencies = [ "alloy-eips", "alloy-primitives", @@ -539,9 +550,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2af822ed58f2b6dd7cfccf88bf69f42c9a8cbf4663316227646a8a3e5a591f" +checksum = "c54375e5a34ec5a2cf607f9ce98c0ece30dc76ad623afeb25d3953a8d7d30f20" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -553,9 +564,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8fbdf39e93a9b213df39541be51671e93e6e8b142c3602ddb4ff6219a1bc85" +checksum = "65ae88491edfc8bbd55ba2b22b2ff24d4c522bacd8808461c4a232715fee3d22" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -565,9 +576,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd260ede54f0b53761fdd04133acc10ae70427f66a69aa9590529bbd066cd58" +checksum = "51db8a6428a2159e01b7a43ec7aac801edd0c4db1d4de06f310c288940f16fd3" dependencies = [ "alloy-primitives", "arbitrary", @@ -577,9 +588,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5193ee6b370b89db154d7dc40c6a8e6ce11213865baaf2b418a9f2006be762" +checksum = "bebc1760c13592b7ba3fcd964abba546b8d6a9f10d15e8d92a8263731be33f36" dependencies = [ "alloy-primitives", "async-trait", @@ -591,9 +602,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6b19bbb231c7f941af07f363d4c74d356dfcdfcd7dfa85a41a504ae856a6d5" +checksum = "3bfb3508485aa798efb5725322e414313239274d3780079b7f8c6746b8ee6e1b" dependencies = [ "alloy-consensus", "alloy-network", @@ -603,75 +614,75 @@ dependencies = [ "coins-bip32", "coins-bip39", "k256", - "rand 0.8.5", + "rand", "thiserror", ] [[package]] name = "alloy-sol-macro" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183bcfc0f3291d9c41a3774172ee582fb2ce6eb6569085471d8f225de7bb86fc" +checksum = "0458ccb02a564228fcd76efb8eb5a520521a8347becde37b402afec9a1b83859" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" +checksum = "2bc65475025fc1e84bf86fc840f04f63fcccdcf3cf12053c99918e4054dfbc69" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", - "heck 0.5.0", - "indexmap 2.4.0", - "proc-macro-error", + "heck", + "indexmap 2.5.0", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" +checksum = "6ed10f0715a0b69fde3236ff3b9ae5f6f7c97db5a387747100070d3016b9266b" dependencies = [ "alloy-json-abi", "const-hex", "dunce", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.77", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4691da83dce9c9b4c775dd701c87759f173bd3021cbf2e60cde00c5fe6d7241" +checksum = "3edae8ea1de519ccba896b6834dec874230f72fe695ff3c9c118e90ec7cff783" dependencies = [ "serde", - "winnow 0.6.18", + "winnow", ] [[package]] name = "alloy-sol-types" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577e262966e92112edbd15b1b2c0947cc434d6e8311df96d3329793fe8047da9" +checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -682,9 +693,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454220c714857cf68af87d788d1f0638ad8766268b94f6a49fed96cbc2ab382c" +checksum = "fd5dc4e902f1860d54952446d246ac05386311ad61030a2b906ae865416d36e0" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -694,31 +705,31 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-transport-http" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f2353d7fea03a2dba6b9ffbb7d610402c040dd5700d1fae8b9ec2673eed9b" +checksum = "1742b94bb814f1ca6b322a6f9dd38a0252ff45a3119e40e888fb7029afa500ce" dependencies = [ "alloy-json-rpc", "alloy-transport", "reqwest", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-transport-ws" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d43ba8e9a3a7fef626d5fd93cc87ff2d6d2c81acfb866f068b3dce31dda060" +checksum = "e8ed861e7030001364c8ffa2db63541f7bae275a6e636de7616c20f2fd3dc0c3" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -734,13 +745,13 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd491aade72a82d51db430379f48a44a1d388ff03711a2023f1faa302c5b675d" +checksum = "398a977d774db13446b8cead8cfa9517aebf9e03fc8a1512892dc1e03e70bb04" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "hashbrown 0.14.5", "nybbles", "serde", @@ -754,9 +765,9 @@ version = "0.0.0" dependencies = [ "alphanet-node", "clap", - "reth", "reth-cli-util", "reth-node-optimism", + "reth-optimism-cli", "reth-optimism-rpc", "tikv-jemallocator", "tracing", @@ -768,10 +779,12 @@ version = "0.0.0" dependencies = [ "alphanet-precompile", "eyre", - "reth", "reth-chainspec", "reth-node-api", + "reth-node-builder", "reth-node-optimism", + "reth-primitives", + "reth-revm", ] [[package]] @@ -780,9 +793,10 @@ version = "0.0.0" dependencies = [ "eyre", "p256", - "reth", "reth-chainspec", "reth-node-api", + "reth-primitives", + "reth-revm", "rstest", ] @@ -871,9 +885,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "aquamarine" @@ -886,7 +900,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -932,7 +946,7 @@ dependencies = [ "num-bigint", "num-traits", "paste", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -1009,7 +1023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -1019,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -1075,18 +1089,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1097,7 +1111,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1124,7 +1138,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1147,17 +1161,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1234,15 +1248,9 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.75", + "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" @@ -1274,15 +1282,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" @@ -1400,9 +1399,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -1436,9 +1435,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3054fea8a20d8ff3968d5b22cc27501d2b08dc4decdb31b184323f00c5ef23bb" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -1483,9 +1482,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.13" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1551,9 +1550,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -1561,9 +1560,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1577,10 +1576,10 @@ version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1616,7 +1615,7 @@ dependencies = [ "hmac 0.12.1", "once_cell", "pbkdf2", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", ] @@ -1723,9 +1722,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", "konst", @@ -1733,21 +1732,15 @@ dependencies = [ [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", "unicode-xid", ] -[[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" @@ -1784,9 +1777,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1887,7 +1880,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", ] @@ -1899,7 +1892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -1922,20 +1915,6 @@ dependencies = [ "cipher", ] -[[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 = "curve25519-dalek" version = "4.1.3" @@ -1947,7 +1926,7 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -1960,7 +1939,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1984,7 +1963,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1995,14 +1974,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -2094,20 +2073,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", -] - -[[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.0", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2125,13 +2091,19 @@ 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.75", + "syn 2.0.77", "unicode-xid", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.9.0" @@ -2219,7 +2191,7 @@ dependencies = [ "more-asserts", "multiaddr", "parking_lot 0.11.2", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "tokio", @@ -2246,12 +2218,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" @@ -2284,7 +2250,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", + "rand_core", "serde", "sha2 0.10.8", "subtle", @@ -2311,7 +2277,7 @@ dependencies = [ "group", "pem-rfc7468", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -2342,7 +2308,7 @@ dependencies = [ "hex", "k256", "log", - "rand 0.8.5", + "rand", "secp256k1", "serde", "sha3", @@ -2351,14 +2317,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2369,7 +2335,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2400,9 +2366,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -2431,7 +2397,7 @@ 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", ] @@ -2441,6 +2407,18 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[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" @@ -2448,16 +2426,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -2493,6 +2471,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" @@ -2555,7 +2542,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2615,17 +2602,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" @@ -2635,7 +2611,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2651,9 +2627,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -2714,15 +2690,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -2730,7 +2706,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2779,12 +2755,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2959,9 +2929,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", @@ -2969,7 +2939,7 @@ dependencies = [ "hyper-util", "log", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls", @@ -2995,9 +2965,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -3008,7 +2978,7 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -3062,6 +3032,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "if-addrs" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -3120,15 +3100,35 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", "serde", ] +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "inout" version = "0.1.3" @@ -3172,14 +3172,14 @@ dependencies = [ "socket2 0.5.7", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "iri-string" @@ -3327,7 +3327,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "rustc-hash 2.0.0", "serde", "serde_json", @@ -3358,7 +3358,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tracing", "url", ] @@ -3369,11 +3369,11 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b07a2daf52077ab1b197aea69a5c990c060143835bf04c77070e98903791715" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3399,7 +3399,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.4.13", "tracing", ] @@ -3502,6 +3502,26 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" +[[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" @@ -3519,9 +3539,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.156" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -3577,6 +3597,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -3592,7 +3613,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -3744,7 +3765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" dependencies = [ "base64 0.22.1", - "indexmap 2.4.0", + "indexmap 2.5.0", "metrics", "metrics-util", "quanta", @@ -3776,7 +3797,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "metrics", "num_cpus", "ordered-float", @@ -3809,11 +3830,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -3824,7 +3845,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3836,7 +3857,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.52.0", ] @@ -3943,6 +3964,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 0.8.11", + "walkdir", + "windows-sys 0.48.0", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -4069,7 +4108,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4096,9 +4135,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4111,24 +4150,26 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "op-alloy-consensus" -version = "0.2.2" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db6e3a9bbbcef7cef19d77aa2cc76d61377376e3bb86f89167e7e3f30ea023" +checksum = "ad134a77fdfebac469526756b207c7889593657eeaca374200332ec89175e27a" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", - "derive_more 1.0.0", + "arbitrary", + "derive_more", "serde", + "spin", ] [[package]] name = "op-alloy-network" -version = "0.2.2" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66184e6c92269ba4ef1f80e8566ce11d41b584884ce7476d4b1b5e0e38503ecb" +checksum = "f4234322a67d2c0be701ea61381ac7c78984bda2fae0be3d8e0d1e055c583b2f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4141,10 +4182,11 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.2.2" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c604cd3b9680d0edd0b7127f3550bcff634c2d2efe27b2b4853e72320186a8" +checksum = "f9fbd440cd8a5ccfa7c4c085b29fd0f0a1574fb53e1572f8e070cc105039e42b" dependencies = [ + "alloy-eips", "alloy-network", "alloy-primitives", "alloy-rpc-types-eth", @@ -4156,9 +4198,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.2.2" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620e645c36cc66220909bf97e6632e7a154a2309356221cbf33ae78bf5294478" +checksum = "b8b14dba2261a5d54e4502d41dcee03079b5d2d13d47a07b8ec2c67722af10c7" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -4195,7 +4237,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4377,28 +4419,15 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", "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 = "pharos" version = "0.5.3" @@ -4406,7 +4435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -4426,7 +4455,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4490,6 +4519,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -4512,11 +4551,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -4543,6 +4582,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -4589,8 +4650,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", @@ -4616,7 +4677,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4629,7 +4690,7 @@ dependencies = [ "libc", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -4651,9 +4712,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", @@ -4669,12 +4730,12 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring", "rustc-hash 2.0.0", "rustls", @@ -4686,22 +4747,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4722,19 +4783,6 @@ dependencies = [ "nibble_vec", ] -[[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" @@ -4742,37 +4790,18 @@ 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", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "rand_chacha", + "rand_core", ] [[package]] -name = "rand_core" -version = "0.5.1" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "getrandom 0.1.16", + "ppv-lite86", + "rand_core", ] [[package]] @@ -4781,16 +4810,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]] @@ -4799,7 +4819,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]] @@ -4878,11 +4898,11 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.15", + "getrandom", "libredox", "thiserror", ] @@ -4939,9 +4959,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -4964,13 +4984,13 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-native-tls", "tokio-rustls", @@ -4980,7 +5000,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -4996,23 +5016,19 @@ dependencies = [ [[package]] name = "reth" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "aquamarine", "backon", "clap", - "discv5", "eyre", - "fdlimit", "futures", - "itertools 0.13.0", - "libc", - "metrics-process", "reth-basic-payload-builder", "reth-beacon-consensus", "reth-blockchain-tree", "reth-chainspec", + "reth-cli", "reth-cli-commands", "reth-cli-runner", "reth-cli-util", @@ -5021,7 +5037,6 @@ dependencies = [ "reth-consensus-common", "reth-db", "reth-db-api", - "reth-db-common", "reth-downloaders", "reth-engine-util", "reth-errors", @@ -5039,10 +5054,6 @@ dependencies = [ "reth-node-ethereum", "reth-node-events", "reth-node-metrics", - "reth-node-optimism", - "reth-optimism-cli", - "reth-optimism-primitives", - "reth-optimism-rpc", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", @@ -5058,29 +5069,25 @@ dependencies = [ "reth-rpc-types", "reth-rpc-types-compat", "reth-stages", - "reth-stages-api", "reth-static-file", - "reth-static-file-types", "reth-tasks", "reth-tracing", "reth-transaction-pool", "reth-trie", "reth-trie-db", - "serde", "serde_json", "similar-asserts", - "tempfile", "tikv-jemallocator", "tokio", - "toml", "tracing", ] [[package]] name = "reth-auto-seal-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "futures-util", "reth-beacon-consensus", "reth-chainspec", @@ -5107,7 +5114,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "futures-core", @@ -5130,19 +5137,19 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "futures", "itertools 0.13.0", "metrics", "reth-blockchain-tree-api", - "reth-chainspec", - "reth-db-api", "reth-engine-primitives", "reth-errors", "reth-ethereum-consensus", "reth-metrics", "reth-network-p2p", + "reth-node-types", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", @@ -5164,8 +5171,9 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "aquamarine", "linked_hash_set", "metrics", @@ -5179,9 +5187,9 @@ dependencies = [ "reth-execution-types", "reth-metrics", "reth-network", + "reth-node-types", "reth-primitives", "reth-provider", - "reth-prune-types", "reth-revm", "reth-stages-api", "reth-storage-errors", @@ -5195,7 +5203,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -5207,10 +5215,10 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "auto_impl", - "derive_more 1.0.0", + "derive_more", "metrics", "parking_lot 0.12.3", "pin-project", @@ -5229,7 +5237,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-chains", "alloy-eips", @@ -5237,7 +5245,7 @@ dependencies = [ "alloy-primitives", "alloy-trie", "auto_impl", - "derive_more 1.0.0", + "derive_more", "once_cell", "op-alloy-rpc-types", "reth-ethereum-forks", @@ -5251,7 +5259,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "clap", "eyre", @@ -5261,9 +5269,10 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "ahash", + "alloy-primitives", "backon", "clap", "comfy-table", @@ -5276,6 +5285,7 @@ dependencies = [ "ratatui", "reth-beacon-consensus", "reth-chainspec", + "reth-cli", "reth-cli-runner", "reth-cli-util", "reth-config", @@ -5315,7 +5325,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-tasks", "tokio", @@ -5325,13 +5335,13 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-eips", "alloy-primitives", "eyre", "libc", - "rand 0.8.5", + "rand", "reth-fs-util", "secp256k1", "thiserror", @@ -5340,7 +5350,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5349,6 +5359,7 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", + "op-alloy-consensus", "reth-codecs-derive", "serde", ] @@ -5356,18 +5367,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ - "convert_case 0.6.0", + "convert_case", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "reth-config" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "eyre", "humantime-serde", @@ -5381,18 +5392,20 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "auto_impl", - "derive_more 1.0.0", + "derive_more", "reth-primitives", ] [[package]] name = "reth-consensus-common" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "reth-chainspec", "reth-consensus", "reth-primitives", @@ -5401,7 +5414,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5424,10 +5437,10 @@ dependencies = [ [[package]] name = "reth-db" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "bytes", - "derive_more 1.0.0", + "derive_more", "eyre", "metrics", "page_size", @@ -5455,11 +5468,11 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "arbitrary", "bytes", - "derive_more 1.0.0", + "derive_more", "metrics", "modular-bitfield", "parity-scale-codec", @@ -5478,9 +5491,10 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-genesis", + "alloy-primitives", "boyer-moore-magiclen", "eyre", "reth-chainspec", @@ -5490,6 +5504,7 @@ dependencies = [ "reth-db-api", "reth-etl", "reth-fs-util", + "reth-node-types", "reth-primitives", "reth-provider", "reth-stages-types", @@ -5504,7 +5519,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "arbitrary", "bytes", @@ -5518,7 +5533,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5542,17 +5557,17 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "discv5", "enr", "futures", "itertools 0.13.0", "metrics", - "rand 0.8.5", + "rand", "reth-chainspec", "reth-ethereum-forks", "reth-metrics", @@ -5566,7 +5581,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "data-encoding", @@ -5588,7 +5603,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "futures", @@ -5615,7 +5630,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "aes", "alloy-primitives", @@ -5630,7 +5645,7 @@ dependencies = [ "generic-array", "hmac 0.12.1", "pin-project", - "rand 0.8.5", + "rand", "reth-network-peers", "secp256k1", "sha2 0.10.8", @@ -5646,28 +5661,29 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chainspec", + "reth-execution-types", "reth-payload-primitives", + "reth-primitives", + "reth-trie", "serde", ] [[package]] name = "reth-engine-service" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures", "pin-project", "reth-beacon-consensus", - "reth-chainspec", "reth-consensus", - "reth-db-api", - "reth-engine-primitives", "reth-engine-tree", "reth-evm", "reth-network-p2p", + "reth-node-types", "reth-payload-builder", "reth-payload-validator", "reth-provider", @@ -5680,7 +5696,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures", "metrics", @@ -5689,13 +5705,12 @@ dependencies = [ "reth-blockchain-tree-api", "reth-chain-state", "reth-consensus", - "reth-db", - "reth-db-api", "reth-engine-primitives", "reth-errors", "reth-evm", "reth-metrics", "reth-network-p2p", + "reth-node-types", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", @@ -5715,7 +5730,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "eyre", "futures", @@ -5745,7 +5760,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -5758,11 +5773,11 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "bytes", - "derive_more 1.0.0", + "derive_more", "futures", "pin-project", "reth-chainspec", @@ -5783,13 +5798,13 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-chains", "alloy-genesis", "alloy-rlp", "bytes", - "derive_more 1.0.0", + "derive_more", "reth-chainspec", "reth-codecs-derive", "reth-primitives", @@ -5799,7 +5814,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chainspec", "reth-consensus", @@ -5811,9 +5826,10 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", + "reth-chain-state", "reth-chainspec", "reth-engine-primitives", "reth-evm-ethereum", @@ -5829,7 +5845,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-chains", "alloy-primitives", @@ -5849,9 +5865,10 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-basic-payload-builder", + "reth-chain-state", "reth-errors", "reth-evm", "reth-evm-ethereum", @@ -5869,7 +5886,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "rayon", "reth-db-api", @@ -5879,14 +5896,16 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-eips", "auto_impl", "futures-util", + "metrics", "reth-chainspec", "reth-execution-errors", "reth-execution-types", + "reth-metrics", "reth-primitives", "reth-prune-types", "reth-storage-errors", @@ -5897,7 +5916,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-eips", "alloy-sol-types", @@ -5915,13 +5934,15 @@ dependencies = [ [[package]] name = "reth-evm-optimism" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "reth-chainspec", "reth-ethereum-forks", "reth-evm", "reth-execution-errors", "reth-execution-types", + "reth-optimism-chainspec", "reth-optimism-consensus", "reth-primitives", "reth-prune-types", @@ -5935,12 +5956,12 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "nybbles", "reth-consensus", "reth-prune-types", @@ -5951,7 +5972,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chainspec", "reth-execution-errors", @@ -5963,7 +5984,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "eyre", "futures", @@ -5990,26 +6011,47 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", + "reth-primitives", "reth-provider", ] [[package]] name = "reth-fs-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "serde", "serde_json", "thiserror", ] +[[package]] +name = "reth-invalid-block-hooks" +version = "1.0.6" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" +dependencies = [ + "alloy-rlp", + "alloy-rpc-types-debug", + "eyre", + "pretty_assertions", + "reth-chainspec", + "reth-engine-primitives", + "reth-evm", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-tracing", + "reth-trie", + "serde_json", +] + [[package]] name = "reth-ipc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "async-trait", "bytes", @@ -6023,20 +6065,20 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.4.13", "tracing", ] [[package]] name = "reth-libmdbx" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "bitflags 2.6.0", "byteorder", "dashmap", - "derive_more 1.0.0", - "indexmap 2.4.0", + "derive_more", + "indexmap 2.5.0", "parking_lot 0.12.3", "reth-mdbx-sys", "thiserror", @@ -6046,7 +6088,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "bindgen", "cc", @@ -6055,7 +6097,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures", "metrics", @@ -6067,18 +6109,18 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "reth-net-banlist" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", ] @@ -6086,9 +6128,10 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures-util", + "if-addrs", "reqwest", "serde_with", "thiserror", @@ -6098,12 +6141,12 @@ dependencies = [ [[package]] name = "reth-network" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "aquamarine", "auto_impl", - "derive_more 1.0.0", + "derive_more", "discv5", "enr", "futures", @@ -6111,7 +6154,7 @@ dependencies = [ "metrics", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "reth-chainspec", "reth-consensus", "reth-discv4", @@ -6146,12 +6189,12 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", "auto_impl", - "derive_more 1.0.0", + "derive_more", "enr", "futures", "reth-eth-wire-types", @@ -6169,10 +6212,10 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "auto_impl", - "derive_more 1.0.0", + "derive_more", "futures", "reth-consensus", "reth-eth-wire-types", @@ -6187,7 +6230,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6202,7 +6245,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -6216,18 +6259,15 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "anyhow", "bincode", - "cuckoofilter", - "derive_more 1.0.0", + "derive_more", "lz4_flex", "memmap2", - "ph", "reth-fs-util", "serde", - "sucds", "thiserror", "tracing", "zstd", @@ -6236,13 +6276,12 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ - "reth-chainspec", - "reth-db-api", "reth-engine-primitives", "reth-evm", "reth-network-api", + "reth-node-types", "reth-payload-builder", "reth-payload-primitives", "reth-provider", @@ -6254,9 +6293,10 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-network", + "alloy-primitives", "aquamarine", "eyre", "fdlimit", @@ -6279,6 +6319,8 @@ dependencies = [ "reth-engine-util", "reth-evm", "reth-exex", + "reth-fs-util", + "reth-invalid-block-hooks", "reth-network", "reth-network-api", "reth-network-p2p", @@ -6312,24 +6354,25 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-genesis", + "alloy-primitives", "alloy-rpc-types-engine", "clap", "const_format", - "derive_more 1.0.0", + "derive_more", "dirs-next", "eyre", "futures", "humantime", - "rand 0.8.5", + "rand", "reth-chainspec", + "reth-cli", "reth-cli-util", "reth-config", "reth-consensus-common", "reth-db", - "reth-db-api", "reth-discv4", "reth-discv5", "reth-fs-util", @@ -6339,7 +6382,6 @@ dependencies = [ "reth-network-peers", "reth-optimism-chainspec", "reth-primitives", - "reth-provider", "reth-prune-types", "reth-rpc-api", "reth-rpc-eth-api", @@ -6348,6 +6390,7 @@ dependencies = [ "reth-rpc-types", "reth-rpc-types-compat", "reth-stages-types", + "reth-storage-api", "reth-storage-errors", "reth-tracing", "reth-transaction-pool", @@ -6355,6 +6398,8 @@ dependencies = [ "serde", "serde_json", "shellexpand", + "strum", + "thiserror", "toml", "tracing", "vergen", @@ -6363,7 +6408,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -6387,8 +6432,9 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rpc-types-engine", "futures", "humantime", @@ -6409,7 +6455,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "eyre", "http", @@ -6425,7 +6471,7 @@ dependencies = [ "reth-tasks", "tikv-jemalloc-ctl", "tokio", - "tower", + "tower 0.4.13", "tracing", "vergen", ] @@ -6433,8 +6479,9 @@ dependencies = [ [[package]] name = "reth-node-optimism" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "async-trait", "clap", "eyre", @@ -6474,14 +6521,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-node-types" +version = "1.0.6" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" +dependencies = [ + "reth-chainspec", + "reth-db-api", + "reth-engine-primitives", +] + [[package]] name = "reth-optimism-chainspec" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-chains", "alloy-primitives", - "derive_more 1.0.0", + "derive_more", "once_cell", "reth-chainspec", "reth-ethereum-forks", @@ -6492,7 +6549,7 @@ dependencies = [ [[package]] name = "reth-optimism-cli" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6502,6 +6559,7 @@ dependencies = [ "reth-chainspec", "reth-cli", "reth-cli-commands", + "reth-cli-runner", "reth-config", "reth-consensus", "reth-db", @@ -6511,8 +6569,10 @@ dependencies = [ "reth-evm-optimism", "reth-execution-types", "reth-network-p2p", + "reth-node-builder", "reth-node-core", "reth-node-events", + "reth-node-optimism", "reth-optimism-chainspec", "reth-optimism-primitives", "reth-primitives", @@ -6522,6 +6582,7 @@ dependencies = [ "reth-stages-types", "reth-static-file", "reth-static-file-types", + "reth-tracing", "tokio", "tokio-util", "tracing", @@ -6530,20 +6591,23 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "reth-chainspec", "reth-consensus", "reth-consensus-common", "reth-primitives", + "reth-trie-common", "tracing", ] [[package]] name = "reth-optimism-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rlp", "reth-basic-payload-builder", "reth-chain-state", @@ -6569,16 +6633,18 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" [[package]] name = "reth-optimism-rpc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "jsonrpsee-types", + "op-alloy-consensus", "op-alloy-network", + "op-alloy-rpc-types", "parking_lot 0.12.3", "reqwest", "reth-chainspec", @@ -6606,7 +6672,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures-util", "metrics", @@ -6628,7 +6694,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chain-state", "reth-chainspec", @@ -6644,7 +6710,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chainspec", "reth-primitives", @@ -6655,7 +6721,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6667,10 +6733,11 @@ dependencies = [ "arbitrary", "bytes", "c-kzg", - "derive_more 1.0.0", + "derive_more", "k256", "modular-bitfield", "once_cell", + "op-alloy-consensus", "op-alloy-rpc-types", "proptest", "rayon", @@ -6684,15 +6751,13 @@ dependencies = [ "revm-primitives", "secp256k1", "serde", - "tempfile", - "thiserror", "zstd", ] [[package]] name = "reth-primitives-traits" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6703,7 +6768,7 @@ dependencies = [ "arbitrary", "byteorder", "bytes", - "derive_more 1.0.0", + "derive_more", "modular-bitfield", "proptest", "proptest-arbitrary-interop", @@ -6716,13 +6781,14 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rpc-types-engine", "auto_impl", "dashmap", "itertools 0.13.0", "metrics", + "notify", "parking_lot 0.12.3", "rayon", "reth-blockchain-tree-api", @@ -6738,6 +6804,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-nippy-jar", + "reth-node-types", "reth-primitives", "reth-prune-types", "reth-stages-types", @@ -6754,7 +6821,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "itertools 0.13.0", @@ -6767,6 +6834,7 @@ dependencies = [ "reth-errors", "reth-exex-types", "reth-metrics", + "reth-node-types", "reth-provider", "reth-prune-types", "reth-static-file-types", @@ -6780,11 +6848,11 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "bytes", - "derive_more 1.0.0", + "derive_more", "modular-bitfield", "reth-codecs", "serde", @@ -6794,7 +6862,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "reth-chainspec", "reth-consensus-common", @@ -6809,15 +6877,16 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-dyn-abi", + "alloy-eips", "alloy-genesis", "alloy-network", "alloy-primitives", "alloy-rlp", "async-trait", - "derive_more 1.0.0", + "derive_more", "futures", "http", "http-body", @@ -6826,7 +6895,7 @@ dependencies = [ "jsonwebtoken", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "reth-chainspec", "reth-consensus-common", "reth-errors", @@ -6857,7 +6926,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tracing", "tracing-futures", ] @@ -6865,9 +6934,11 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-eips", "alloy-json-rpc", + "alloy-primitives", "jsonrpsee", "reth-engine-primitives", "reth-network-peers", @@ -6879,8 +6950,9 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-network", "http", "jsonrpsee", "metrics", @@ -6904,7 +6976,7 @@ dependencies = [ "reth-transaction-pool", "serde", "thiserror", - "tower", + "tower 0.4.13", "tower-http", "tracing", ] @@ -6912,8 +6984,9 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "async-trait", "jsonrpsee-core", "jsonrpsee-types", @@ -6931,6 +7004,7 @@ dependencies = [ "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", + "reth-transaction-pool", "serde", "thiserror", "tokio", @@ -6940,11 +7014,12 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-dyn-abi", "alloy-json-rpc", "alloy-network", + "alloy-primitives", "async-trait", "auto_impl", "dyn-clone", @@ -6977,15 +7052,16 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-sol-types", - "derive_more 1.0.0", + "derive_more", "futures", "jsonrpsee-core", "jsonrpsee-types", "metrics", - "rand 0.8.5", + "rand", "reth-chain-state", "reth-chainspec", "reth-errors", @@ -7015,20 +7091,20 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rpc-types-engine", "http", "jsonrpsee-http-client", "pin-project", - "tower", + "tower 0.4.13", "tracing", ] [[package]] name = "reth-rpc-server-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "jsonrpsee-core", @@ -7044,13 +7120,15 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-admin", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", + "alloy-rpc-types-debug", "alloy-rpc-types-engine", "alloy-rpc-types-mev", "alloy-rpc-types-trace", @@ -7059,13 +7137,15 @@ dependencies = [ "jsonrpsee-types", "op-alloy-rpc-types", "op-alloy-rpc-types-engine", + "serde", ] [[package]] name = "reth-rpc-types-compat" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rlp", "alloy-rpc-types", "reth-primitives", @@ -7076,7 +7156,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "futures-util", "itertools 0.13.0", @@ -7110,7 +7190,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "aquamarine", @@ -7122,6 +7202,7 @@ dependencies = [ "reth-errors", "reth-metrics", "reth-network-p2p", + "reth-node-types", "reth-primitives-traits", "reth-provider", "reth-prune", @@ -7137,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "bytes", @@ -7150,14 +7231,16 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "parking_lot 0.12.3", "rayon", + "reth-chainspec", "reth-db", "reth-db-api", "reth-nippy-jar", + "reth-node-types", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -7170,11 +7253,11 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-primitives", "clap", - "derive_more 1.0.0", + "derive_more", "serde", "strum", ] @@ -7182,10 +7265,12 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "auto_impl", "reth-chainspec", + "reth-db-api", "reth-db-models", "reth-execution-types", "reth-primitives", @@ -7198,10 +7283,11 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "reth-fs-util", "reth-primitives", ] @@ -7209,7 +7295,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "auto_impl", "dyn-clone", @@ -7227,7 +7313,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "tokio", "tokio-stream", @@ -7237,7 +7323,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "clap", "eyre", @@ -7252,8 +7338,9 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rlp", "aquamarine", "auto_impl", @@ -7268,6 +7355,7 @@ dependencies = [ "reth-fs-util", "reth-metrics", "reth-primitives", + "reth-rpc-types", "reth-storage-api", "reth-tasks", "revm", @@ -7284,11 +7372,12 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ + "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "metrics", "rayon", @@ -7299,13 +7388,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.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7313,7 +7403,7 @@ dependencies = [ "alloy-rlp", "alloy-trie", "bytes", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "nybbles", "reth-codecs", @@ -7325,11 +7415,11 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", "auto_impl", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "metrics", "rayon", @@ -7349,10 +7439,10 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth.git?rev=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +source = "git+https://github.com/paradigmxyz/reth.git?rev=c1b5fbb#c1b5fbbc7fe3f70ee025c4600e68235ed44252c4" dependencies = [ "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "metrics", "rayon", @@ -7372,9 +7462,9 @@ dependencies = [ [[package]] name = "revm" -version = "14.0.0" +version = "14.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69eae90188e48c81588fe1987b4bd35cd90d69b3602cb0c3a9ab12b882f18d91" +checksum = "1f719e28cc6fdd086f8bc481429e587740d20ad89729cec3f5f5dd7b655474df" dependencies = [ "auto_impl", "cfg-if", @@ -7387,12 +7477,13 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48184032103bb23788e42e42c7c85207f5b0b8a248b09ea8f5233077f35ab56e" +checksum = "5d37cf496100c6ff1fb7de04a0e05318b7f36b36aec54054bdeeb3346fb2abeb" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", "colorchoice", @@ -7403,9 +7494,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "10.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bad33a4f862ed8e2dc8bb5e7935852990da74f6db986732ef4f47f9021b2e4" +checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916" dependencies = [ "revm-primitives", "serde", @@ -7413,9 +7504,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24db0f8fb5bc636e18b4d36bdc4c402ea941be79cfbdb096469887b616959a46" +checksum = "6e25f604cb9db593ca3013be8c00f310d6790ccb1b7d8fbbdd4660ec8888043a" dependencies = [ "aurora-engine-modexp", "blst", @@ -7433,9 +7524,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "9.0.0" +version = "9.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13132ed599b17fa9057fcfc1d37d2954921958f3b96173fc4f4cf52803b32c3" +checksum = "0ccb981ede47ccf87c68cebf1ba30cdbb7ec935233ea305f3dfff4c1e10ae541" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7469,7 +7560,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom", "libc", "spin", "untrusted", @@ -7493,9 +7584,9 @@ dependencies = [ [[package]] name = "rlimit" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" dependencies = [ "libc", ] @@ -7544,7 +7635,7 @@ dependencies = [ "futures", "futures-timer", "rstest_macros", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -7559,8 +7650,8 @@ dependencies = [ "quote", "regex", "relative-path", - "rustc_version 0.4.0", - "syn 2.0.75", + "rustc_version 0.4.1", + "syn 2.0.77", "unicode-ident", ] @@ -7581,7 +7672,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand", "rlp", "ruint-macro", "serde", @@ -7630,18 +7721,18 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", @@ -7652,9 +7743,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", "once_cell", @@ -7667,9 +7758,22 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -7696,9 +7800,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-platform-verifier" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bda3f493b9abe5b93b3e7e3ecde0df292f2bd28c0296b90586ee0055ff5123" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ "core-foundation", "core-foundation-sys", @@ -7706,7 +7810,7 @@ dependencies = [ "log", "once_cell", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki", "security-framework", @@ -7723,9 +7827,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -7767,11 +7871,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7807,11 +7911,11 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "rand 0.8.5", + "rand", "secp256k1-sys", "serde", ] @@ -7890,40 +7994,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" 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.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "memchr", "ryu", @@ -7961,7 +8056,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -7978,7 +8073,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8097,7 +8192,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]] @@ -8112,9 +8207,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", "similar", @@ -8194,7 +8289,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", ] @@ -8203,6 +8298,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -8221,7 +8319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" dependencies = [ "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8251,11 +8349,11 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8267,7 +8365,7 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.5", + "rand", "rustc-hex", ] @@ -8277,16 +8375,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" @@ -8300,9 +8388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -8311,21 +8399,30 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284c41c2919303438fcf8dede4036fd1e82d4fc0fbb2b279bd2a1442c909ca92" +checksum = "4b95156f8b577cb59dc0b1df15c6f29a10afc5f8a7ac9786b0b5c68c19149278" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sysinfo" @@ -8377,7 +8474,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8509,9 +8606,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -8533,7 +8630,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8559,9 +8656,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -8587,9 +8684,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -8609,7 +8706,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -8621,28 +8718,17 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -8657,7 +8743,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -8666,6 +8752,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-http" version = "0.5.2" @@ -8690,7 +8790,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -8741,7 +8841,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8845,7 +8945,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -8866,7 +8966,7 @@ dependencies = [ "lru-cache", "once_cell", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -8893,7 +8993,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "rustls", "rustls-pki-types", "sha1", @@ -8986,9 +9086,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "universal-hash" @@ -9041,7 +9141,7 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] @@ -9104,12 +9204,6 @@ dependencies = [ "try-lock", ] -[[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" @@ -9138,7 +9232,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -9172,7 +9266,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9195,9 +9289,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -9276,7 +9370,7 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement", "windows-interface", - "windows-result", + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -9288,7 +9382,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -9299,7 +9393,18 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] @@ -9311,6 +9416,25 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -9459,15 +9583,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.18" @@ -9487,16 +9602,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -9508,7 +9613,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -9516,15 +9621,6 @@ dependencies = [ "web-sys", ] -[[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" @@ -9534,6 +9630,12 @@ dependencies = [ "tap", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "zerocopy" version = "0.7.35" @@ -9552,7 +9654,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -9572,7 +9674,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index eefe6c9..96b2dce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,18 +70,32 @@ alloy-signer-local = { version = "0.3", features = ["mnemonic"] } tokio = { version = "1.21", default-features = false } # reth -reth = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6", features = [ +reth = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ "optimism", ] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-node-optimism = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", rev = "v1.0.6" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-node-optimism = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-revm = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb", features = [ + "optimism", +] } +reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", rev = "c1b5fbb" } # misc clap = "4" diff --git a/bin/alphanet/Cargo.toml b/bin/alphanet/Cargo.toml index 95c4445..99e73da 100644 --- a/bin/alphanet/Cargo.toml +++ b/bin/alphanet/Cargo.toml @@ -14,9 +14,9 @@ workspace = true [dependencies] alphanet-node.workspace = true tracing.workspace = true -reth.workspace = true reth-cli-util.workspace = true reth-node-optimism.workspace = true +reth-optimism-cli.workspace = true reth-optimism-rpc.workspace = true clap = { workspace = true, features = ["derive"] } @@ -24,9 +24,9 @@ clap = { workspace = true, features = ["derive"] } tikv-jemallocator = { version = "0.5", optional = true } [features] -default = ["jemalloc", "reth/optimism", "reth-node-optimism/optimism"] +default = ["jemalloc"] -asm-keccak = ["reth/asm-keccak"] +asm-keccak = ["reth-optimism-cli/asm-keccak"] jemalloc = ["dep:tikv-jemallocator"] jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"] diff --git a/bin/alphanet/src/main.rs b/bin/alphanet/src/main.rs index 9577e14..8fed050 100644 --- a/bin/alphanet/src/main.rs +++ b/bin/alphanet/src/main.rs @@ -25,8 +25,8 @@ use alphanet_node::node::AlphaNetNode; use clap::Parser; -use reth::cli::Cli; use reth_node_optimism::args::RollupArgs; +use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli}; use reth_optimism_rpc::eth::rpc::SequencerClient; // We use jemalloc for performance reasons. @@ -44,24 +44,26 @@ fn main() { std::env::set_var("RUST_BACKTRACE", "1"); } - if let Err(err) = Cli::::parse().run(|builder, rollup_args| async move { - let node = builder - .node(AlphaNetNode::new(rollup_args.clone())) - .extend_rpc_modules(move |ctx| { - // register sequencer tx forwarder - if let Some(sequencer_http) = rollup_args.sequencer_http.clone() { - ctx.registry - .eth_api() - .set_sequencer_client(SequencerClient::new(sequencer_http)); - } + if let Err(err) = + Cli::::parse().run(|builder, rollup_args| async move { + let node = builder + .node(AlphaNetNode::new(rollup_args.clone())) + .extend_rpc_modules(move |ctx| { + // register sequencer tx forwarder + if let Some(sequencer_http) = rollup_args.sequencer_http.clone() { + ctx.registry + .eth_api() + .set_sequencer_client(SequencerClient::new(sequencer_http)); + } - Ok(()) - }) - .launch() - .await?; + Ok(()) + }) + .launch() + .await?; - node.wait_for_node_exit().await - }) { + node.wait_for_node_exit().await + }) + { eprintln!("Error: {err:?}"); std::process::exit(1); } diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml index 75f20ab..a1ddee1 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -11,19 +11,14 @@ categories.workspace = true [dependencies] alphanet-precompile.workspace = true -reth.workspace = true reth-node-api.workspace = true +reth-node-builder.workspace = true reth-node-optimism.workspace = true reth-chainspec.workspace = true +reth-primitives.workspace = true +reth-revm.workspace = true eyre.workspace = true -[features] -default = [ - "alphanet-precompile/optimism", - "reth/optimism", - "reth-node-optimism/optimism", -] - [lints] workspace = true diff --git a/crates/node/src/evm.rs b/crates/node/src/evm.rs index b9faa3a..b36d407 100644 --- a/crates/node/src/evm.rs +++ b/crates/node/src/evm.rs @@ -11,30 +11,34 @@ //! precompiles defined by [`alphanet_precompile`]. use alphanet_precompile::secp256r1; -use reth::{ - primitives::{ - revm_primitives::{CfgEnvWithHandlerCfg, TxEnv}, - transaction::FillTxEnv, - Address, Bytes, Header, TransactionSigned, TxKind, U256, - }, - revm::{ - handler::register::EvmHandler, - inspector_handle_register, - precompile::PrecompileSpecId, - primitives::{AnalysisKind, Env, OptimismFields}, - ContextPrecompiles, Database, Evm, EvmBuilder, GetInspector, - }, -}; use reth_chainspec::{ChainSpec, EthereumHardfork, Head, OptimismHardfork}; use reth_node_api::{ConfigureEvm, ConfigureEvmEnv}; +use reth_primitives::{ + revm_primitives::{CfgEnvWithHandlerCfg, TxEnv}, + transaction::FillTxEnv, + Address, Bytes, Header, TransactionSigned, TxKind, U256, +}; +use reth_revm::{ + handler::register::EvmHandler, + inspector_handle_register, + precompile::PrecompileSpecId, + primitives::{AnalysisKind, Env, OptimismFields}, + ContextPrecompiles, Database, Evm, EvmBuilder, GetInspector, +}; use std::sync::Arc; /// Custom EVM configuration -#[derive(Debug, Clone, Copy, Default)] -#[non_exhaustive] -pub struct AlphaNetEvmConfig; +#[derive(Debug, Clone, Default)] +pub struct AlphaNetEvmConfig { + chain_spec: Arc, +} impl AlphaNetEvmConfig { + /// Creates a new AlphaNet EVM configuration with the given chain spec. + pub const fn new(chain_spec: Arc) -> Self { + Self { chain_spec } + } + /// Sets the precompiles to the EVM handler /// /// This will be invoked when the EVM is created via [ConfigureEvm::evm] or @@ -113,12 +117,11 @@ impl ConfigureEvmEnv for AlphaNetEvmConfig { fn fill_cfg_env( &self, cfg_env: &mut CfgEnvWithHandlerCfg, - chain_spec: &ChainSpec, header: &Header, total_difficulty: U256, ) { let spec_id = revm_spec( - chain_spec, + &self.chain_spec, &Head { number: header.number, timestamp: header.timestamp, @@ -128,11 +131,11 @@ impl ConfigureEvmEnv for AlphaNetEvmConfig { }, ); - cfg_env.chain_id = chain_spec.chain().id(); + cfg_env.chain_id = self.chain_spec.chain().id(); cfg_env.perf_analyse_created_bytecodes = AnalysisKind::Analyse; cfg_env.handler_cfg.spec_id = spec_id; - cfg_env.handler_cfg.is_optimism = chain_spec.is_optimism(); + cfg_env.handler_cfg.is_optimism = self.chain_spec.is_optimism(); } } @@ -167,47 +170,47 @@ impl ConfigureEvm for AlphaNetEvmConfig { } /// Determine the revm spec ID from the current block and reth chainspec. -fn revm_spec(chain_spec: &ChainSpec, block: &Head) -> reth::revm::primitives::SpecId { +fn revm_spec(chain_spec: &ChainSpec, block: &Head) -> reth_revm::primitives::SpecId { if chain_spec.fork(EthereumHardfork::Prague).active_at_head(block) { - reth::revm::primitives::PRAGUE_EOF + reth_revm::primitives::PRAGUE_EOF } else if chain_spec.fork(OptimismHardfork::Granite).active_at_head(block) { - reth::revm::primitives::GRANITE + reth_revm::primitives::GRANITE } else if chain_spec.fork(OptimismHardfork::Fjord).active_at_head(block) { - reth::revm::primitives::FJORD + reth_revm::primitives::FJORD } else if chain_spec.fork(OptimismHardfork::Ecotone).active_at_head(block) { - reth::revm::primitives::ECOTONE + reth_revm::primitives::ECOTONE } else if chain_spec.fork(OptimismHardfork::Canyon).active_at_head(block) { - reth::revm::primitives::CANYON + reth_revm::primitives::CANYON } else if chain_spec.fork(OptimismHardfork::Regolith).active_at_head(block) { - reth::revm::primitives::REGOLITH + reth_revm::primitives::REGOLITH } else if chain_spec.fork(OptimismHardfork::Bedrock).active_at_head(block) { - reth::revm::primitives::BEDROCK + reth_revm::primitives::BEDROCK } else if chain_spec.fork(EthereumHardfork::Prague).active_at_head(block) { - reth::revm::primitives::PRAGUE + reth_revm::primitives::PRAGUE } else if chain_spec.fork(EthereumHardfork::Cancun).active_at_head(block) { - reth::revm::primitives::CANCUN + reth_revm::primitives::CANCUN } else if chain_spec.fork(EthereumHardfork::Shanghai).active_at_head(block) { - reth::revm::primitives::SHANGHAI + reth_revm::primitives::SHANGHAI } else if chain_spec.fork(EthereumHardfork::Paris).active_at_head(block) { - reth::revm::primitives::MERGE + reth_revm::primitives::MERGE } else if chain_spec.fork(EthereumHardfork::London).active_at_head(block) { - reth::revm::primitives::LONDON + reth_revm::primitives::LONDON } else if chain_spec.fork(EthereumHardfork::Berlin).active_at_head(block) { - reth::revm::primitives::BERLIN + reth_revm::primitives::BERLIN } else if chain_spec.fork(EthereumHardfork::Istanbul).active_at_head(block) { - reth::revm::primitives::ISTANBUL + reth_revm::primitives::ISTANBUL } else if chain_spec.fork(EthereumHardfork::Petersburg).active_at_head(block) { - reth::revm::primitives::PETERSBURG + reth_revm::primitives::PETERSBURG } else if chain_spec.fork(EthereumHardfork::Byzantium).active_at_head(block) { - reth::revm::primitives::BYZANTIUM + reth_revm::primitives::BYZANTIUM } else if chain_spec.fork(EthereumHardfork::SpuriousDragon).active_at_head(block) { - reth::revm::primitives::SPURIOUS_DRAGON + reth_revm::primitives::SPURIOUS_DRAGON } else if chain_spec.fork(EthereumHardfork::Tangerine).active_at_head(block) { - reth::revm::primitives::TANGERINE + reth_revm::primitives::TANGERINE } else if chain_spec.fork(EthereumHardfork::Homestead).active_at_head(block) { - reth::revm::primitives::HOMESTEAD + reth_revm::primitives::HOMESTEAD } else if chain_spec.fork(EthereumHardfork::Frontier).active_at_head(block) { - reth::revm::primitives::FRONTIER + reth_revm::primitives::FRONTIER } else { panic!( "invalid hardfork chainspec: expected at least one hardfork, got {:?}", @@ -219,28 +222,29 @@ fn revm_spec(chain_spec: &ChainSpec, block: &Head) -> reth::revm::primitives::Sp #[cfg(test)] mod tests { use super::*; - use reth::primitives::{ + use reth_chainspec::{Chain, ChainSpecBuilder, EthereumHardfork}; + use reth_primitives::{ revm_primitives::{BlockEnv, CfgEnv, SpecId}, ForkCondition, Genesis, }; - use reth_chainspec::{Chain, ChainSpecBuilder, EthereumHardfork}; #[test] fn test_fill_cfg_and_block_env() { let mut cfg_env = CfgEnvWithHandlerCfg::new_with_spec_id(CfgEnv::default(), SpecId::LATEST); let mut block_env = BlockEnv::default(); let header = Header::default(); - let chain_spec = ChainSpecBuilder::default() - .chain(Chain::optimism_mainnet()) - .genesis(Genesis::default()) - .with_fork(EthereumHardfork::Frontier, ForkCondition::Block(0)) - .build(); + let chain_spec = Arc::new( + ChainSpecBuilder::default() + .chain(Chain::optimism_mainnet()) + .genesis(Genesis::default()) + .with_fork(EthereumHardfork::Frontier, ForkCondition::Block(0)) + .build(), + ); let total_difficulty = U256::ZERO; - AlphaNetEvmConfig::default().fill_cfg_and_block_env( + AlphaNetEvmConfig::new(chain_spec.clone()).fill_cfg_and_block_env( &mut cfg_env, &mut block_env, - &chain_spec, &header, total_difficulty, ); diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index b897a18..de554e4 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -4,8 +4,8 @@ //! [AlphaNetEvmConfig](evm::AlphaNetEvmConfig). //! //! The [AlphaNetNode](node::AlphaNetNode) type implements the -//! [NodeTypes](reth::builder::NodeTypes) trait, and configures the engine types required for the -//! optimism engine API. +//! [NodeTypes](reth_node_builder::NodeTypes) trait, and configures the engine types required for +//! the optimism engine API. //! //! The [AlphaNetEvmConfig](evm::AlphaNetEvmConfig) type implements the //! [ConfigureEvm](reth_node_api::ConfigureEvm) and diff --git a/crates/node/src/node.rs b/crates/node/src/node.rs index 0fc41f5..5d83a9f 100644 --- a/crates/node/src/node.rs +++ b/crates/node/src/node.rs @@ -4,12 +4,12 @@ //! required for the optimism engine API. use crate::evm::AlphaNetEvmConfig; -use reth::builder::{ +use reth_chainspec::ChainSpec; +use reth_node_api::{FullNodeTypes, NodeTypesWithEngine}; +use reth_node_builder::{ components::{ComponentsBuilder, ExecutorBuilder}, BuilderContext, Node, NodeTypes, }; -use reth_chainspec::ChainSpec; -use reth_node_api::FullNodeTypes; use reth_node_optimism::{ args::RollupArgs, node::{ @@ -38,22 +38,21 @@ impl AlphaNetNode { ) -> ComponentsBuilder< Node, OptimismPoolBuilder, - OptimismPayloadBuilder, + OptimismPayloadBuilder, OptimismNetworkBuilder, AlphaNetExecutorBuilder, OptimismConsensusBuilder, > where - Node: FullNodeTypes, + Node: FullNodeTypes< + Types: NodeTypesWithEngine, + >, { let RollupArgs { disable_txpool_gossip, compute_pending_block, discovery_v4, .. } = args; ComponentsBuilder::default() .node_types::() .pool(OptimismPoolBuilder::default()) - .payload(OptimismPayloadBuilder::new( - compute_pending_block, - AlphaNetEvmConfig::default(), - )) + .payload(OptimismPayloadBuilder::new(compute_pending_block)) .network(OptimismNetworkBuilder { disable_txpool_gossip, disable_discovery_v4: !discovery_v4, @@ -66,18 +65,23 @@ impl AlphaNetNode { /// Configure the node types impl NodeTypes for AlphaNetNode { type Primitives = (); - type Engine = OptimismEngineTypes; type ChainSpec = ChainSpec; } +impl NodeTypesWithEngine for AlphaNetNode { + type Engine = OptimismEngineTypes; +} + impl Node for AlphaNetNode where - N: FullNodeTypes, + N: FullNodeTypes< + Types: NodeTypesWithEngine, + >, { type ComponentsBuilder = ComponentsBuilder< N, OptimismPoolBuilder, - OptimismPayloadBuilder, + OptimismPayloadBuilder, OptimismNetworkBuilder, AlphaNetExecutorBuilder, OptimismConsensusBuilder, @@ -98,7 +102,7 @@ pub struct AlphaNetExecutorBuilder; impl ExecutorBuilder for AlphaNetExecutorBuilder where - Node: FullNodeTypes, + Node: FullNodeTypes>, { type EVM = AlphaNetEvmConfig; type Executor = OpExecutorProvider; @@ -109,7 +113,7 @@ where ) -> eyre::Result<(Self::EVM, Self::Executor)> { let chain_spec = ctx.chain_spec(); let evm_config = AlphaNetEvmConfig::default(); - let executor = OpExecutorProvider::new(chain_spec, evm_config); + let executor = OpExecutorProvider::new(chain_spec, evm_config.clone()); Ok((evm_config, executor)) } diff --git a/crates/precompile/Cargo.toml b/crates/precompile/Cargo.toml index 2f5b978..16c1dc8 100644 --- a/crates/precompile/Cargo.toml +++ b/crates/precompile/Cargo.toml @@ -10,20 +10,15 @@ keywords.workspace = true categories.workspace = true [dependencies] -reth.workspace = true - +reth-revm.workspace = true p256 = { version = "0.13.2", features = ["ecdsa"] } [dev-dependencies] reth-node-api.workspace = true reth-chainspec.workspace = true +reth-primitives.workspace = true eyre.workspace = true rstest.workspace = true -[features] -optimism = [ - "reth/optimism", -] - [lints] workspace = true diff --git a/crates/precompile/src/secp256r1.rs b/crates/precompile/src/secp256r1.rs index 46bae03..2f7a007 100644 --- a/crates/precompile/src/secp256r1.rs +++ b/crates/precompile/src/secp256r1.rs @@ -10,16 +10,14 @@ //! The precompile can be inserted in a custom EVM like this: //! ``` //! use alphanet_precompile::secp256r1; -//! use reth::{ -//! primitives::{TransactionSigned, U256}, -//! revm::{ -//! precompile::{PrecompileSpecId, Precompiles}, -//! primitives::{Address, Bytes, CfgEnvWithHandlerCfg, Env, TxEnv}, -//! ContextPrecompiles, Database, Evm, EvmBuilder, -//! }, -//! }; //! use reth_chainspec::ChainSpec; //! use reth_node_api::{ConfigureEvm, ConfigureEvmEnv}; +//! use reth_primitives::{TransactionSigned, U256}; +//! use reth_revm::{ +//! precompile::{PrecompileSpecId, Precompiles}, +//! primitives::{Address, Bytes, CfgEnvWithHandlerCfg, Env, TxEnv}, +//! ContextPrecompiles, Database, Evm, EvmBuilder, +//! }; //! use std::sync::Arc; //! //! #[derive(Debug, Clone, Copy, Default)] @@ -57,15 +55,10 @@ //! ) { //! todo!() //! } -//! fn fill_cfg_env( -//! &self, -//! _: &mut CfgEnvWithHandlerCfg, -//! _: &ChainSpec, -//! _: &reth::primitives::Header, -//! _: U256, -//! ) { +//! fn fill_cfg_env(&self, _: &mut CfgEnvWithHandlerCfg, _: &reth_primitives::Header, _: U256) { //! todo!() //! } +//! //! fn fill_tx_env_system_contract_call(&self, _: &mut Env, _: Address, _: Address, _: Bytes) { //! todo!() //! } @@ -73,7 +66,7 @@ //! ``` use crate::addresses::P256VERIFY_ADDRESS; use p256::ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey}; -use reth::revm::{ +use reth_revm::{ precompile::{u64_to_address, Precompile, PrecompileWithAddress}, primitives::{ Bytes, PrecompileError, PrecompileErrors, PrecompileOutput, PrecompileResult, B256, @@ -141,7 +134,7 @@ fn verify_impl(input: &[u8]) -> Option<()> { #[cfg(test)] mod test { use super::*; - use reth::revm::primitives::hex::FromHex; + use reth_revm::primitives::hex::FromHex; use rstest::rstest; #[rstest] diff --git a/crates/testing/Cargo.toml b/crates/testing/Cargo.toml index 0e29bb3..7bd406e 100644 --- a/crates/testing/Cargo.toml +++ b/crates/testing/Cargo.toml @@ -27,12 +27,5 @@ once_cell = "1.19.0" tokio.workspace = true url = "2.5.0" -[features] -default = [ - "reth/optimism", - "reth-node-core/optimism", - "reth-primitives/optimism", -] - [lints] workspace = true