From c8a3aed078fa075fa6339a4955b223430d7f96e0 Mon Sep 17 00:00:00 2001 From: jacobkaufmann Date: Thu, 10 Aug 2023 16:53:31 -0600 Subject: [PATCH] chore: bump reth crates to 0.1.0-alpha.6 --- Cargo.lock | 314 ++++++++++++++++++++++++++++--------------------- Cargo.toml | 12 +- src/builder.rs | 10 +- 3 files changed, 192 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3bfb0c..5dc06a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,6 +69,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -113,7 +119,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -226,6 +232,27 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.64.0" +source = "git+https://github.com/rust-lang/rust-bindgen?rev=0de11f0a521611ac8738b7b01d19dddaf3899e66#0de11f0a521611ac8738b7b01d19dddaf3899e66" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.28", + "which", +] + [[package]] name = "bindgen" version = "0.65.1" @@ -244,7 +271,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -327,7 +354,7 @@ dependencies = [ [[package]] name = "boa_ast" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "bitflags 2.3.3", "boa_interner", @@ -340,7 +367,7 @@ dependencies = [ [[package]] name = "boa_engine" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "bitflags 2.3.3", "boa_ast", @@ -378,17 +405,18 @@ dependencies = [ [[package]] name = "boa_gc" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "boa_macros", "boa_profiler", + "hashbrown 0.14.0", "thin-vec", ] [[package]] name = "boa_icu_provider" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "icu_collections", "icu_normalizer", @@ -401,7 +429,7 @@ dependencies = [ [[package]] name = "boa_interner" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "boa_gc", "boa_macros", @@ -416,18 +444,18 @@ dependencies = [ [[package]] name = "boa_macros" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", "synstructure 0.13.0", ] [[package]] name = "boa_parser" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" dependencies = [ "bitflags 2.3.3", "boa_ast", @@ -447,7 +475,7 @@ dependencies = [ [[package]] name = "boa_profiler" version = "0.17.0" -source = "git+https://github.com/boa-dev/boa#8fe405d275c52fef09f2bd94a0c6830e31da59e2" +source = "git+https://github.com/boa-dev/boa#22b014d5d5ab9fba5dc467734227558e75c66d20" [[package]] name = "bs58" @@ -506,6 +534,19 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c-kzg" +version = "0.1.0" +source = "git+https://github.com/ethereum/c-kzg-4844#9d85ed8b194eee2a70380e58b6c45909f75933ea" +dependencies = [ + "bindgen 0.64.0", + "cc", + "glob", + "hex", + "libc", + "serde", +] + [[package]] name = "camino" version = "1.1.6" @@ -604,15 +645,15 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "codecs-derive" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", "proc-macro2", "quote", "serde", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -844,7 +885,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -855,17 +896,17 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -956,7 +997,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1062,7 +1103,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1073,7 +1114,7 @@ checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1240,7 +1281,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn 2.0.23", + "syn 2.0.28", "toml", "walkdir", ] @@ -1258,7 +1299,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1283,8 +1324,8 @@ dependencies = [ "rlp", "serde", "serde_json", - "strum 0.25.0", - "syn 2.0.23", + "strum", + "syn 2.0.28", "tempfile", "thiserror", "tiny-keccak", @@ -1597,7 +1638,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -1763,6 +1804,10 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] [[package]] name = "hashers" @@ -2187,9 +2232,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5bf6c75ce2a4217421154adfc65a24d2b46e77286e59bba5d9fa6544ccc8f4" +checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2" dependencies = [ "anyhow", "beef", @@ -2500,9 +2545,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -2535,7 +2580,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2668,6 +2713,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "path-slash" version = "0.2.1" @@ -2758,7 +2809,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2796,7 +2847,7 @@ checksum = "d1fef411b303e3e12d534fb6e7852de82da56edd937d895125821fb7c09436c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2887,7 +2938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" dependencies = [ "proc-macro2", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -2940,18 +2991,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3117,8 +3168,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "bytes", "codecs-derive", @@ -3127,8 +3178,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "reth-interfaces", "reth-primitives", @@ -3137,8 +3188,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "bytes", "derive_more", @@ -3164,8 +3215,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "aes", "block-padding", @@ -3195,8 +3246,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "async-trait", "bytes", @@ -3220,8 +3271,8 @@ dependencies = [ [[package]] name = "reth-interfaces" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "async-trait", "auto_impl", @@ -3244,8 +3295,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "bitflags 2.3.3", "byteorder", @@ -3259,18 +3310,18 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ - "bindgen", + "bindgen 0.65.1", "cc", "libc", ] [[package]] name = "reth-metrics" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "metrics", "reth-metrics-derive", @@ -3278,20 +3329,20 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] name = "reth-net-common" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "pin-project", "reth-primitives", @@ -3300,8 +3351,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "async-trait", "reth-eth-wire", @@ -3314,8 +3365,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "futures-util", "reth-interfaces", @@ -3334,10 +3385,11 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "bytes", + "c-kzg", "crc", "crunchy", "derive_more", @@ -3349,6 +3401,7 @@ dependencies = [ "impl-serde", "modular-bitfield", "once_cell", + "paste", "plain_hasher", "reth-codecs", "reth-rlp", @@ -3359,8 +3412,10 @@ dependencies = [ "serde", "serde_json", "serde_with", - "strum 0.24.1", + "sha2 0.10.7", + "strum", "sucds", + "tempfile", "thiserror", "tiny-keccak", "tokio", @@ -3373,12 +3428,12 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "auto_impl", "derive_more", - "itertools 0.10.5", + "itertools 0.11.0", "parking_lot", "pin-project", "reth-db", @@ -3393,8 +3448,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "reth-consensus-common", "reth-interfaces", @@ -3408,8 +3463,8 @@ dependencies = [ [[package]] name = "reth-revm-inspectors" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "boa_engine", "boa_gc", @@ -3425,8 +3480,8 @@ dependencies = [ [[package]] name = "reth-revm-primitives" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "reth-primitives", "revm", @@ -3434,12 +3489,13 @@ dependencies = [ [[package]] name = "reth-rlp" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "arrayvec", "auto_impl", "bytes", + "c-kzg", "ethereum-types", "reth-rlp-derive", "revm-primitives", @@ -3448,19 +3504,20 @@ dependencies = [ [[package]] name = "reth-rlp-derive" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] name = "reth-rpc-types" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ + "itertools 0.11.0", "jsonrpsee-types", "reth-primitives", "reth-rlp", @@ -3471,8 +3528,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.1.0-alpha.2" -source = "git+https://github.com/paradigmxyz/reth.git#f3d7988f684d087a895d288a0041e95a6596b8a6" +version = "0.1.0-alpha.6" +source = "git+https://github.com/paradigmxyz/reth.git#500b0fac135fe07635d871d64467326599e2b27e" dependencies = [ "derive_more", "hex", @@ -3857,29 +3914,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.167" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -3932,7 +3989,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4028,9 +4085,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smol_str" -version = "0.1.24" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ "serde", ] @@ -4127,35 +4184,13 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - [[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "strum_macros", ] [[package]] @@ -4168,7 +4203,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4232,9 +4267,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -4261,7 +4296,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", "unicode-xid", ] @@ -4304,22 +4339,22 @@ checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4413,7 +4448,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4528,7 +4563,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", ] [[package]] @@ -4746,7 +4781,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -4780,7 +4815,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4829,6 +4864,17 @@ dependencies = [ "rustls-webpki 0.100.1", ] +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index a5464c2..eb781b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" [dependencies] futures-util = "0.3.28" -reth-interfaces = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-interfaces" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-payload-builder" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-primitives" } -reth-provider = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-provider" } -reth-revm = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-revm" } -reth-revm-primitives = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-revm-primitives" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-interfaces", version = "0.1.0-alpha.6" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-payload-builder", version = "0.1.0-alpha.6" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-primitives", version = "0.1.0-alpha.6" } +reth-provider = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-provider", version = "0.1.0-alpha.6" } +reth-revm = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-revm", version = "0.1.0-alpha.6" } +reth-revm-primitives = { git = "https://github.com/paradigmxyz/reth.git", package = "reth-revm-primitives", version = "0.1.0-alpha.6" } tokio = "1.29.1" tokio-stream = { version = "0.1.14", features = ["sync"] } tokio-util = { version = "0.7.8", features = ["time"] } diff --git a/src/builder.rs b/src/builder.rs index 815c76b..7c315b0 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -671,14 +671,16 @@ fn package_block( receipts_root, withdrawals_root: Some(withdrawals_root), logs_bloom, + difficulty: U256::ZERO, + number: block_num, + gas_limit: block_gas_limit, + gas_used: cumulative_gas_used, timestamp: attributes.timestamp, mix_hash: attributes.prev_randao, nonce: BEACON_NONCE, base_fee_per_gas: Some(base_fee), - number: block_num, - gas_limit: block_gas_limit, - difficulty: U256::ZERO, - gas_used: cumulative_gas_used, + blob_gas_used: None, + excess_blob_gas: None, extra_data: extra_data.to_le_bytes().into(), };