From 926c370e4e7f481f9e88b10c160b9ee5716f0e8c Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Wed, 6 Nov 2024 09:43:15 +0100 Subject: [PATCH 1/3] bump reth to 1.1.1 --- Cargo.lock | 1244 ++++++----------- Cargo.toml | 36 +- .../src/evm_sequencer/account/mod.rs | 2 +- crates/ef-testing/src/evm_sequencer/utils.rs | 1 + 4 files changed, 467 insertions(+), 816 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4f45aae..f646fd10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,16 +88,18 @@ checksum = "c54e2fbc026948a0f638bf6a94fc0ce6e44652280fed40bb0dd970e3357bc5f2" dependencies = [ "alloy-primitives", "alloy-rlp", + "arbitrary", "num_enum", + "proptest", "serde", "strum 0.26.3", ] [[package]] name = "alloy-consensus" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ "alloy-eips", "alloy-primitives", @@ -111,24 +113,6 @@ dependencies = [ "serde_with", ] -[[package]] -name = "alloy-dyn-abi" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95d76a38cae906fd394a5afb0736aaceee5432efe76addfd71048e623e208af" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", - "const-hex", - "derive_more 1.0.0", - "itoa", - "serde", - "serde_json", - "winnow", -] - [[package]] name = "alloy-eip2930" version = "0.1.0" @@ -144,13 +128,14 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", + "derive_more 1.0.0", "k256", "rand", "serde", @@ -159,9 +144,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -171,6 +156,8 @@ dependencies = [ "arbitrary", "c-kzg", "derive_more 1.0.0", + "ethereum_ssz", + "ethereum_ssz_derive", "once_cell", "serde", "sha2 0.10.8", @@ -178,9 +165,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", "alloy-serde", @@ -201,9 +188,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -215,9 +202,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ "alloy-consensus", "alloy-eips", @@ -236,9 +223,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ "alloy-consensus", "alloy-eips", @@ -249,9 +236,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb848c43f6b06ae3de2e4a67496cbbabd78ae87db0f1248934f15d76192c6a" +checksum = "fd58d377699e6cfeab52c4a9d28bdc4ef37e2bd235ff2db525071fe37a2e9af5" dependencies = [ "alloy-rlp", "arbitrary", @@ -303,9 +290,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -316,9 +303,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb520ed46cc5b7d8c014a73fdd77b6a310383a2a5c0a5ae3c9b8055881f062b7" +checksum = "ea02c25541fb19eaac4278aa5c41d2d7e0245898887e54a74bfc0f3103e99415" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -326,46 +313,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-rpc-types-anvil" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" -dependencies = [ - "alloy-primitives", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-rpc-types-beacon" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8dc5980fe30203d698627cddb5f0cedc57f900c8b5e1229c8b9448e37acb4a" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "serde", - "serde_with", - "thiserror", -] - -[[package]] -name = "alloy-rpc-types-debug" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d8f8c5bfb160081a772f1f68eb9a37e8929c4ef74e5d01f5b78c2b645a5c5e" -dependencies = [ - "alloy-primitives", - "serde", -] - [[package]] name = "alloy-rpc-types-engine" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ "alloy-consensus", "alloy-eips", @@ -373,6 +325,8 @@ dependencies = [ "alloy-rlp", "alloy-serde", "derive_more 1.0.0", + "ethereum_ssz", + "ethereum_ssz_derive", "jsonwebtoken", "rand", "serde", @@ -381,9 +335,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ "alloy-consensus", "alloy-eips", @@ -392,30 +346,18 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", + "arbitrary", "derive_more 1.0.0", "itertools 0.13.0", "serde", "serde_json", ] -[[package]] -name = "alloy-rpc-types-mev" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cec23ce56c869eec5f6b6fd6a8a92b5aa0cfaf8d7be3a96502e537554dc7430" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-serde", - "serde", - "serde_json", -] - [[package]] name = "alloy-rpc-types-trace" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017cad3e5793c5613588c1f9732bcbad77e820ba7d0feaba3527749f856fdbc5" +checksum = "4e5fb6c5c401321f802f69dcdb95b932f30f8158f6798793f914baac5995628e" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -425,23 +367,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "alloy-rpc-types-txpool" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b230e321c416be7f50530159392b4c41a45596d40d97e185575bcd0b545e521" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", -] - [[package]] name = "alloy-serde" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" dependencies = [ "alloy-primitives", "arbitrary", @@ -451,9 +381,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ "alloy-primitives", "async-trait", @@ -465,9 +395,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ "alloy-consensus", "alloy-network", @@ -551,13 +481,14 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9703ce68b97f8faae6f7739d1e003fc97621b856953cbcdbb2b515743f23288" +checksum = "cdd7f8b3a7c65ca09b3c7bdd7c7d72d7423d026f5247eda96af53d24e58315c1" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", + "arrayvec", "derive_arbitrary", "derive_more 1.0.0", "nybbles", @@ -640,13 +571,13 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aquamarine" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" dependencies = [ "include_dir", "itertools 0.10.5", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.79", @@ -860,6 +791,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "ascii-canvas" @@ -1865,12 +1799,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cexpr" version = "0.6.0" @@ -1978,16 +1906,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "concat-kdf" version = "0.1.0" @@ -2128,6 +2046,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -2328,7 +2252,8 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", + "serde", ] [[package]] @@ -2365,11 +2290,12 @@ checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "delay_map" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" +checksum = "df941644b671f05f59433e481ba0d31ac10e3667de725236a4c0d587c496fba1" dependencies = [ "futures", + "tokio", "tokio-util", ] @@ -2530,9 +2456,9 @@ dependencies = [ [[package]] name = "discv5" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569b8c367554666c8652305621e8bae3634a2ff5c6378081d5bd8c399c99f23" +checksum = "23e6b70634e26c909d1edbb3142b3eaf3b89da0e52f284f00ca7c80d9901ad9e" dependencies = [ "aes", "aes-gcm", @@ -2551,13 +2477,13 @@ dependencies = [ "lru", "more-asserts", "multiaddr", - "parking_lot 0.11.2", + "parking_lot", "rand", "smallvec", - "socket2 0.4.10", + "socket2", "tokio", "tracing", - "uint", + "uint 0.10.0", "zeroize", ] @@ -2680,8 +2606,8 @@ dependencies = [ [[package]] name = "ef-tests" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -2692,7 +2618,9 @@ dependencies = [ "reth-evm-ethereum", "reth-primitives", "reth-provider", + "reth-revm", "reth-stages", + "revm", "serde", "serde_json", "thiserror", @@ -2847,7 +2775,48 @@ dependencies = [ "impl-rlp", "impl-serde", "primitive-types", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "ethereum_serde_utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" +dependencies = [ + "alloy-primitives", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfbba28f4f3f32d92c06a64f5bf6c4537b5d4e21f28c689bd2bbaecfea4e0d3e" +dependencies = [ + "alloy-primitives", + "derivative", + "ethereum_serde_utils", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d37845ba7c16bf4be8be4b5786f03a2ba5f2fda0d7f9e7cb2282f69cff420d7" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.79", ] [[package]] @@ -3060,10 +3029,6 @@ name = "futures-timer" version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers", - "send_wrapper", -] [[package]] name = "futures-util" @@ -3117,6 +3082,7 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ + "serde", "typenum", "version_check", "zeroize", @@ -3170,52 +3136,6 @@ dependencies = [ "regex-syntax 0.8.5", ] -[[package]] -name = "gloo-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 1.1.0", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "good_lp" version = "1.8.1" @@ -3321,9 +3241,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -3512,7 +3432,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3532,7 +3452,6 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "httparse", - "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -3564,7 +3483,6 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "log", "rustls 0.23.14", "rustls-pki-types", "tokio", @@ -3601,7 +3519,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3848,7 +3766,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.7", + "socket2", "widestring", "windows-sys 0.48.0", "winreg", @@ -3908,26 +3826,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "jobserver" version = "0.1.32" @@ -3947,181 +3845,36 @@ dependencies = [ ] [[package]] -name = "jsonrpsee" +name = "jsonrpsee-core" version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f01f48e04e0d7da72280ab787c9943695699c9b32b99158ece105e8ad0afea" +checksum = "3c2709a32915d816a6e8f625bf72cf74523ebe5d8829f895d6b041b1d3137818" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros", - "jsonrpsee-server", + "async-trait", "jsonrpsee-types", - "jsonrpsee-wasm-client", - "jsonrpsee-ws-client", - "tokio", + "serde", + "serde_json", + "thiserror", "tracing", ] [[package]] -name = "jsonrpsee-client-transport" +name = "jsonrpsee-types" version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80eccbd47a7b9f1e67663fd846928e941cb49c65236e297dd11c9ea3c5e3387" +checksum = "1ca331cd7b3fe95b33432825c2d4c9f5a43963e207fdc01ae67f9fd80ab0930f" dependencies = [ - "base64 0.22.1", - "futures-channel", - "futures-util", - "gloo-net", "http 1.1.0", - "jsonrpsee-core", - "pin-project", - "rustls 0.23.14", - "rustls-pki-types", - "rustls-platform-verifier", - "soketto", + "serde", + "serde_json", "thiserror", - "tokio", - "tokio-rustls 0.26.0", - "tokio-util", - "tracing", - "url", ] [[package]] -name = "jsonrpsee-core" -version = "0.24.6" +name = "jsonwebtoken" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2709a32915d816a6e8f625bf72cf74523ebe5d8829f895d6b041b1d3137818" -dependencies = [ - "async-trait", - "bytes", - "futures-timer", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "jsonrpsee-types", - "parking_lot 0.12.3", - "pin-project", - "rand", - "rustc-hash 2.0.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "wasm-bindgen-futures", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc54db939002b030e794fbfc9d5a925aa2854889c5a2f0352b0bffa54681707e" -dependencies = [ - "async-trait", - "base64 0.22.1", - "http-body 1.0.1", - "hyper 1.4.1", - "hyper-rustls 0.27.3", - "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", - "rustls 0.23.14", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "tracing", - "url", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9a4b2eaba8cc928f49c4ccf4fcfa65b690a73997682da99ed08f3393b51f07" -dependencies = [ - "heck 0.5.0", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "jsonrpsee-server" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30110d0f2d7866c8cc6c86483bdab2eb9f4d2f0e20db55518b2bca84651ba8e" -dependencies = [ - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", - "pin-project", - "route-recognizer", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tracing", -] - -[[package]] -name = "jsonrpsee-types" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca331cd7b3fe95b33432825c2d4c9f5a43963e207fdc01ae67f9fd80ab0930f" -dependencies = [ - "http 1.1.0", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jsonrpsee-wasm-client" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c603d97578071dc44d79d3cfaf0775437638fd5adc33c6b622dfe4fa2ec812d" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755ca3da1c67671f1fae01cd1a47f41dfb2233a8f19a643e587ab0a663942044" -dependencies = [ - "http 1.1.0", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", - "url", -] - -[[package]] -name = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", "js-sys", @@ -4311,7 +4064,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", + "redox_syscall", ] [[package]] @@ -4375,6 +4128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" dependencies = [ "linked-hash-map", + "serde", ] [[package]] @@ -4391,6 +4145,7 @@ checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -4486,9 +4241,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" dependencies = [ "ahash", "portable-atomic", @@ -4688,6 +4443,7 @@ dependencies = [ "libc", "log", "mio 0.8.11", + "serde", "walkdir", "windows-sys 0.48.0", ] @@ -4907,6 +4663,10 @@ name = "once_cell" version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "oorandom" @@ -4916,9 +4676,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea7162170c6f3cad8f67f4dd7108e3f78349fd553da5b8bebff1e7ef8f38896" +checksum = "f26c3b35b7b3e36d15e0563eebffe13c1d9ca16b7aaffcb6a64354633547e16b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4934,9 +4694,9 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3d31dfbbd8dd898c7512f8ce7d30103980485416f668566100b0ed0994b958" +checksum = "ccacc2efed3d60d98ea581bddb885df1c6c62a592e55de049cfefd94116112cd" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4948,26 +4708,29 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310873e4fbfc41986716c4fb6000a8b49d025d932d2c261af58271c434b05288" +checksum = "f5f8e6ec6b91c6aaeb20860b455a52fd8e300acfe5d534e96e9073a24f853e74" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", + "async-trait", "derive_more 1.0.0", "op-alloy-consensus", "op-alloy-genesis", "serde", + "tracing", + "unsigned-varint 0.8.0", ] [[package]] name = "op-alloy-rpc-types" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323c65880e2561aa87f74f8af260fd15b9cc930c448c88a60ae95af86c88c634" +checksum = "94bae9bf91b620e1e2c2291562e5998bc1247bd8ada011773e1997b31a95de99" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4975,6 +4738,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", + "arbitrary", "op-alloy-consensus", "serde", "serde_json", @@ -4982,16 +4746,18 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349e7b420f45d1a00216ec4c65fcf3f0057a841bc39732c405c85ae782b94121" +checksum = "4b52ee59c86537cff83e8c7f2a6aa287a94f3608bb40c06d442aafd0c2e807a4" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", "alloy-serde", "derive_more 1.0.0", + "ethereum_ssz", "op-alloy-protocol", "serde", + "snap", ] [[package]] @@ -5086,6 +4852,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ + "arbitrary", "arrayvec", "bitvec", "byte-slice-cast", @@ -5107,17 +4874,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -5125,21 +4881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -5150,7 +4892,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -5410,7 +5152,7 @@ dependencies = [ "impl-codec", "impl-rlp", "impl-serde", - "uint", + "uint 0.9.5", ] [[package]] @@ -5614,15 +5356,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -5730,7 +5463,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", + "webpki-roots", "winreg", ] @@ -5789,11 +5522,47 @@ dependencies = [ "quick-error", ] +[[package]] +name = "reth-beacon-consensus" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "futures", + "itertools 0.13.0", + "metrics", + "reth-blockchain-tree-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", + "reth-primitives", + "reth-provider", + "reth-prune", + "reth-stages-api", + "reth-static-file", + "reth-tasks", + "reth-tokio-util", + "schnellru", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "reth-blockchain-tree-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", "alloy-primitives", "reth-consensus", "reth-execution-errors", @@ -5804,8 +5573,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5815,7 +5584,7 @@ dependencies = [ "auto_impl", "derive_more 1.0.0", "metrics", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "reth-chainspec", @@ -5833,14 +5602,14 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", - "alloy-trie", "auto_impl", "derive_more 1.0.0", "once_cell", @@ -5853,8 +5622,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5864,28 +5633,33 @@ dependencies = [ "rand", "reth-fs-util", "secp256k1", + "serde", "thiserror", ] [[package]] name = "reth-codecs" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", "alloy-trie", + "arbitrary", "bytes", "modular-bitfield", + "op-alloy-consensus", "reth-codecs-derive", + "serde", + "visibility", ] [[package]] name = "reth-codecs-derive" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -5895,8 +5669,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "eyre", "humantime-serde", @@ -5909,9 +5683,10 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", "alloy-primitives", "auto_impl", "derive_more 1.0.0", @@ -5920,9 +5695,11 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -5932,8 +5709,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", @@ -5941,7 +5718,7 @@ dependencies = [ "eyre", "metrics", "page_size", - "parking_lot 0.12.3", + "parking_lot", "paste", "reth-db-api", "reth-fs-util", @@ -5965,8 +5742,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -5990,8 +5767,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "arbitrary", @@ -5999,21 +5776,23 @@ dependencies = [ "modular-bitfield", "proptest", "reth-codecs", - "reth-primitives", + "reth-primitives-traits", "serde", ] [[package]] name = "reth-discv4" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", "discv5", "enr", "generic-array", - "parking_lot 0.12.3", + "itertools 0.13.0", + "parking_lot", + "rand", "reth-ethereum-forks", "reth-net-banlist", "reth-net-nat", @@ -6029,8 +5808,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6053,19 +5832,21 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "data-encoding", "enr", "linked_hash_set", - "parking_lot 0.12.3", + "parking_lot", "reth-ethereum-forks", "reth-network-peers", "reth-tokio-util", "schnellru", "secp256k1", + "serde", + "serde_with", "thiserror", "tokio", "tokio-stream", @@ -6075,8 +5856,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "aes", "alloy-primitives", @@ -6106,8 +5887,8 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "reth-execution-types", @@ -6119,8 +5900,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -6132,8 +5913,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6148,6 +5929,7 @@ dependencies = [ "reth-metrics", "reth-network-peers", "reth-primitives", + "serde", "snap", "thiserror", "tokio", @@ -6158,8 +5940,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", "alloy-eips", @@ -6170,14 +5952,17 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-primitives", + "serde", "thiserror", ] [[package]] name = "reth-ethereum-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -6188,8 +5973,8 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6207,8 +5992,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6227,8 +6012,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "rayon", "reth-db-api", @@ -6237,21 +6022,25 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", "auto_impl", "futures-util", "metrics", + "parking_lot", "reth-chainspec", + "reth-consensus", + "reth-consensus-common", "reth-execution-errors", "reth-execution-types", "reth-metrics", "reth-primitives", "reth-primitives-traits", "reth-prune-types", + "reth-revm", "reth-storage-errors", "revm", "revm-primitives", @@ -6259,27 +6048,27 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-sol-types", "reth-chainspec", + "reth-consensus", "reth-ethereum-consensus", "reth-ethereum-forks", "reth-evm", - "reth-execution-types", "reth-primitives", - "reth-prune-types", "reth-revm", "revm-primitives", ] [[package]] name = "reth-execution-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6294,8 +6083,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6309,8 +6098,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6318,7 +6107,7 @@ dependencies = [ "futures", "itertools 0.13.0", "metrics", - "parking_lot 0.12.3", + "parking_lot", "reth-chain-state", "reth-chainspec", "reth-config", @@ -6345,8 +6134,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6358,8 +6147,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "serde", "serde_json", @@ -6368,15 +6157,15 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bitflags 2.6.0", "byteorder", "dashmap", "derive_more 1.0.0", "indexmap 2.6.0", - "parking_lot 0.12.3", + "parking_lot", "reth-mdbx-sys", "smallvec", "thiserror", @@ -6385,8 +6174,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bindgen", "cc", @@ -6394,8 +6183,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "futures", "metrics", @@ -6406,16 +6195,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "futures-util", "if-addrs", @@ -6428,8 +6217,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6442,7 +6231,7 @@ dependencies = [ "futures", "itertools 0.13.0", "metrics", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "reth-chainspec", @@ -6460,6 +6249,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-provider", "reth-storage-api", "reth-tasks", "reth-tokio-util", @@ -6478,8 +6268,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -6501,14 +6291,15 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", "auto_impl", "derive_more 1.0.0", "futures", + "parking_lot", "reth-consensus", "reth-eth-wire-types", "reth-network-peers", @@ -6521,8 +6312,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6536,8 +6327,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -6550,8 +6341,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "anyhow", "bincode 1.3.3", @@ -6567,27 +6358,33 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-rpc-types-engine", + "eyre", + "reth-beacon-consensus", + "reth-consensus", "reth-engine-primitives", "reth-evm", "reth-network-api", + "reth-node-core", "reth-node-types", "reth-payload-builder", "reth-payload-primitives", "reth-primitives", "reth-provider", - "reth-rpc-eth-api", "reth-tasks", "reth-transaction-pool", ] [[package]] name = "reth-node-core" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "clap", @@ -6611,8 +6408,6 @@ dependencies = [ "reth-network-peers", "reth-primitives", "reth-prune-types", - "reth-rpc-api", - "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", "reth-rpc-types-compat", @@ -6633,20 +6428,22 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "reth-chainspec", "reth-db-api", "reth-engine-primitives", + "reth-primitives", + "reth-primitives-traits", + "reth-trie-db", ] [[package]] name = "reth-payload-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-primitives", "alloy-rpc-types", "async-trait", "futures-util", @@ -6654,7 +6451,6 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-metrics", "reth-payload-primitives", - "reth-primitives", "reth-provider", "tokio", "tokio-stream", @@ -6663,9 +6459,10 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types", "async-trait", @@ -6683,10 +6480,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-payload-validator" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-rpc-types", + "reth-chainspec", + "reth-primitives", + "reth-rpc-types-compat", +] + [[package]] name = "reth-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6703,7 +6511,6 @@ dependencies = [ "once_cell", "op-alloy-consensus", "op-alloy-rpc-types", - "proptest", "rand", "rayon", "reth-codecs", @@ -6720,8 +6527,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6744,8 +6551,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6756,8 +6563,7 @@ dependencies = [ "itertools 0.13.0", "metrics", "notify", - "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rayon", "reth-blockchain-tree-api", "reth-chain-state", @@ -6789,8 +6595,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "itertools 0.13.0", @@ -6815,10 +6621,11 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", + "arbitrary", "bytes", "derive_more 1.0.0", "modular-bitfield", @@ -6829,101 +6636,34 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", "alloy-primitives", - "reth-chainspec", - "reth-consensus-common", "reth-execution-errors", "reth-primitives", "reth-prune-types", "reth-storage-api", "reth-storage-errors", - "revm", -] - -[[package]] -name = "reth-rpc-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" -dependencies = [ - "alloy-eips", - "alloy-json-rpc", - "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-eth", - "alloy-rpc-types-mev", - "alloy-rpc-types-trace", - "alloy-rpc-types-txpool", - "alloy-serde", - "jsonrpsee", - "reth-engine-primitives", - "reth-network-peers", - "reth-primitives", - "reth-rpc-eth-api", -] - -[[package]] -name = "reth-rpc-eth-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" -dependencies = [ - "alloy-dyn-abi", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-eth", - "alloy-rpc-types-mev", - "async-trait", - "auto_impl", - "dyn-clone", - "futures", - "jsonrpsee", - "jsonrpsee-types", - "parking_lot 0.12.3", - "reth-chainspec", - "reth-errors", - "reth-evm", - "reth-execution-types", - "reth-network-api", - "reth-primitives", - "reth-provider", - "reth-revm", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-rpc-types-compat", - "reth-tasks", - "reth-transaction-pool", "reth-trie", "revm", - "revm-inspectors", - "revm-primitives", - "tokio", - "tracing", ] [[package]] name = "reth-rpc-eth-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-eth", - "alloy-serde", "alloy-sol-types", "derive_more 1.0.0", "futures", + "itertools 0.13.0", "jsonrpsee-core", "jsonrpsee-types", "metrics", @@ -6955,40 +6695,41 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "jsonrpsee-core", "jsonrpsee-types", "reth-errors", "reth-network-api", - "reth-primitives", "serde", "strum 0.26.3", ] [[package]] name = "reth-rpc-types-compat" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", "reth-primitives", "reth-trie-common", + "serde", ] [[package]] name = "reth-stages" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bincode 1.3.3", @@ -7023,8 +6764,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "aquamarine", @@ -7049,10 +6790,11 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", + "arbitrary", "bytes", "modular-bitfield", "reth-codecs", @@ -7062,17 +6804,14 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", - "parking_lot 0.12.3", + "parking_lot", "rayon", - "reth-chainspec", "reth-db", "reth-db-api", - "reth-nippy-jar", - "reth-node-types", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -7084,8 +6823,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -7095,9 +6834,10 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "auto_impl", @@ -7114,8 +6854,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7127,15 +6867,13 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "auto_impl", "dyn-clone", "futures-util", "metrics", - "pin-project", - "rayon", "reth-metrics", "thiserror", "tokio", @@ -7145,8 +6883,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "tokio", "tokio-stream", @@ -7155,8 +6893,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "clap", "eyre", @@ -7170,9 +6908,10 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", @@ -7181,7 +6920,8 @@ dependencies = [ "bitflags 2.6.0", "futures-util", "metrics", - "parking_lot 0.12.3", + "parking_lot", + "rand", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -7204,13 +6944,13 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more 1.0.0", "itertools 0.13.0", "metrics", "rayon", @@ -7229,8 +6969,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7252,34 +6992,32 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", - "auto_impl", "derive_more 1.0.0", - "itertools 0.13.0", "metrics", - "rayon", "reth-db", "reth-db-api", "reth-execution-errors", "reth-metrics", "reth-primitives", - "reth-stages-types", "reth-storage-errors", "reth-trie", "reth-trie-common", "revm", + "serde", "tracing", + "triehash", ] [[package]] name = "revm" -version = "14.0.3" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641702b12847f9ed418d552f4fcabe536d867a2c980e96b6e7e25d7b992f929f" +checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" dependencies = [ "auto_impl", "cfg-if", @@ -7292,9 +7030,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c44af0bf801f48d25f7baf25cf72aff4c02d610f83b428175228162fef0246" +checksum = "1e29c662f7887f3b659d4b0fd234673419a8fcbeaa1ecc29bf7034c0a75cc8ea" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -7309,9 +7047,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "10.0.3" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5e14002afae20b5bf1566f22316122f42f57517000e559c55b25bf7a49cba2" +checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" dependencies = [ "revm-primitives", "serde", @@ -7319,9 +7057,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "11.0.3" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3198c06247e8d4ad0d1312591edf049b0de4ddffa9fecb625c318fd67db8639b" +checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" dependencies = [ "aurora-engine-modexp", "blst", @@ -7338,9 +7076,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "10.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1525851a03aff9a9d6a1d018b414d76252d6802ab54695b27093ecd7e7a101" +checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -7441,12 +7179,6 @@ dependencies = [ "chrono", ] -[[package]] -name = "route-recognizer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" - [[package]] name = "rstest" version = "0.17.0" @@ -7513,7 +7245,7 @@ dependencies = [ "indexmap 2.6.0", "lock_api", "oorandom", - "parking_lot 0.12.3", + "parking_lot", "rust-analyzer-salsa-macros", "rustc-hash 1.1.0", "smallvec", @@ -7619,28 +7351,13 @@ version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ - "log", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki 0.102.8", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -7665,33 +7382,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" -[[package]] -name = "rustls-platform-verifier" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.14", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.8", - "security-framework", - "security-framework-sys", - "webpki-roots 0.26.6", - "winapi", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -7872,7 +7562,6 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "num-bigint", "security-framework-sys", ] @@ -7913,12 +7602,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - [[package]] name = "sequencer" version = "0.1.0" @@ -8222,16 +7905,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -8242,22 +7915,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "soketto" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", -] - [[package]] name = "spin" version = "0.9.8" @@ -8538,7 +8195,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "phf_shared 0.10.0", "precomputed-hash", ] @@ -8875,10 +8532,10 @@ dependencies = [ "bytes", "libc", "mio 1.0.2", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] @@ -8945,7 +8602,6 @@ checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "pin-project-lite", "slab", @@ -8986,27 +8642,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -9189,9 +8824,10 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand", "resolv-conf", + "serde", "smallvec", "thiserror", "tokio", @@ -9229,6 +8865,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -9409,6 +9057,17 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "wait-timeout" version = "0.2.0" @@ -9526,15 +9185,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[package]] -name = "webpki-roots" -version = "0.26.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "widestring" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index 12907326..5652b128 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,13 +6,13 @@ resolver = "2" version = "0.1.0" edition = "2021" authors = [ - "Elias Tazartes <@eikix>", - "Clement Walter <@clementwalter>", - "Gregory Edison <@greged93>", - "Johann Bestowrous <@jobez>", - "Harsh Bajpai <@bajpai244>", - "Danilo Kim <@danilowhk>", - "Fred Tupas <@ftupas>", + "Elias Tazartes <@eikix>", + "Clement Walter <@clementwalter>", + "Gregory Edison <@greged93>", + "Johann Bestowrous <@jobez>", + "Harsh Bajpai <@bajpai244>", + "Danilo Kim <@danilowhk>", + "Fred Tupas <@ftupas>", ] description = "EF standard testing for Kakarot" homepage = "https://github.com/kkrt-labs" @@ -26,18 +26,18 @@ incremental = true [workspace.dependencies] # Eth deps alloy-rlp = { version = "0.3.8", default-features = false } -ef-tests = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, features = [ - "ef-tests", +ef-tests = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ + "ef-tests", ] } -alloy-signer-local = { version = "0.4.2", default-features = false } -alloy-primitives = { version = "0.8.4", default-features = false } -alloy-eips = { version = "0.4.2", default-features = false } -alloy-consensus = { version = "0.4.2", default-features = false } -reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = true, features = [ - "std", +alloy-signer-local = { version = "0.5.4", default-features = false } +alloy-primitives = { version = "0.8.9", default-features = false } +alloy-eips = { version = "0.5.4", default-features = false } +alloy-consensus = { version = "0.5.4", default-features = false } +reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = true, features = [ + "std", ] } -revm-interpreter = { version = "10.0", default-features = false } -revm-primitives = { version = "10.0", default-features = false } +revm-interpreter = { version = "13.0", default-features = false } +revm-primitives = { version = "13.0", default-features = false } # Starknet deps cairo-lang-casm = "2.8.0" @@ -46,7 +46,7 @@ cairo-lang-utils = "2.8.0" cairo-lang-starknet-classes = "2.8.0" cairo-vm = "1.0.1" blockifier = { package = "blockifier", git = "https://github.com/kkrt-labs/sequencer.git", rev = "d1f32e2", default-features = false, features = [ - "testing", + "testing", ] } starknet = "0.12" starknet-crypto = "0.7" diff --git a/crates/ef-testing/src/evm_sequencer/account/mod.rs b/crates/ef-testing/src/evm_sequencer/account/mod.rs index a255e26b..d7e81728 100644 --- a/crates/ef-testing/src/evm_sequencer/account/mod.rs +++ b/crates/ef-testing/src/evm_sequencer/account/mod.rs @@ -4,11 +4,11 @@ use crate::evm_sequencer::constants::storage_variables::{ }; use crate::evm_sequencer::utils::split_u256; use crate::starknet_storage; +use alloy_consensus::constants::KECCAK_EMPTY; use alloy_primitives::keccak256; use alloy_primitives::{Address, U256}; use blockifier::abi::{abi_utils::get_storage_var_address, sierra_types::next_storage_key}; use ef_tests::models::Account; -use reth_primitives::KECCAK_EMPTY; use revm_interpreter::analysis::to_analysed; use revm_primitives::Bytecode; use starknet::core::utils::cairo_short_string_to_felt; diff --git a/crates/ef-testing/src/evm_sequencer/utils.rs b/crates/ef-testing/src/evm_sequencer/utils.rs index 7dce6349..9ef547ff 100644 --- a/crates/ef-testing/src/evm_sequencer/utils.rs +++ b/crates/ef-testing/src/evm_sequencer/utils.rs @@ -1,5 +1,6 @@ use super::constants::KAKAROT_ADDRESS; use crate::evm_sequencer::constants::RELAYER_ADDRESS; +use alloy_consensus::transaction::Transaction; use alloy_primitives::{Address, Bytes, U256}; use bytes::BytesMut; use reth_primitives::{TransactionSigned, TxType}; From 389b82473de45d0cc56a7f5307882e56c50bf243 Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Wed, 6 Nov 2024 09:50:57 +0100 Subject: [PATCH 2/3] fmt --- Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5652b128..df8821e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,13 +6,13 @@ resolver = "2" version = "0.1.0" edition = "2021" authors = [ - "Elias Tazartes <@eikix>", - "Clement Walter <@clementwalter>", - "Gregory Edison <@greged93>", - "Johann Bestowrous <@jobez>", - "Harsh Bajpai <@bajpai244>", - "Danilo Kim <@danilowhk>", - "Fred Tupas <@ftupas>", + "Elias Tazartes <@eikix>", + "Clement Walter <@clementwalter>", + "Gregory Edison <@greged93>", + "Johann Bestowrous <@jobez>", + "Harsh Bajpai <@bajpai244>", + "Danilo Kim <@danilowhk>", + "Fred Tupas <@ftupas>", ] description = "EF standard testing for Kakarot" homepage = "https://github.com/kkrt-labs" @@ -27,14 +27,14 @@ incremental = true # Eth deps alloy-rlp = { version = "0.3.8", default-features = false } ef-tests = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ - "ef-tests", + "ef-tests", ] } alloy-signer-local = { version = "0.5.4", default-features = false } alloy-primitives = { version = "0.8.9", default-features = false } alloy-eips = { version = "0.5.4", default-features = false } alloy-consensus = { version = "0.5.4", default-features = false } reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = true, features = [ - "std", + "std", ] } revm-interpreter = { version = "13.0", default-features = false } revm-primitives = { version = "13.0", default-features = false } @@ -46,7 +46,7 @@ cairo-lang-utils = "2.8.0" cairo-lang-starknet-classes = "2.8.0" cairo-vm = "1.0.1" blockifier = { package = "blockifier", git = "https://github.com/kkrt-labs/sequencer.git", rev = "d1f32e2", default-features = false, features = [ - "testing", + "testing", ] } starknet = "0.12" starknet-crypto = "0.7" From d9c5abbb1e8c48284b6c956cb90572057728f86b Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Wed, 6 Nov 2024 10:01:02 +0100 Subject: [PATCH 3/3] clippy --- crates/ef-testing/src/evm_sequencer/evm_state/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/ef-testing/src/evm_sequencer/evm_state/mod.rs b/crates/ef-testing/src/evm_sequencer/evm_state/mod.rs index c48cac8b..6fec4ce1 100644 --- a/crates/ef-testing/src/evm_sequencer/evm_state/mod.rs +++ b/crates/ef-testing/src/evm_sequencer/evm_state/mod.rs @@ -356,9 +356,10 @@ mod tests { }; use alloy_consensus::TxEip1559; use alloy_eips::eip2930::AccessList; + use alloy_primitives::Signature; use alloy_primitives::B256; use ef_tests::models::Account; - use reth_primitives::{sign_message, Signature, TransactionSigned}; + use reth_primitives::{sign_message, TransactionSigned}; #[test] fn test_execute_simple_contract() {