From 4916dacea3882e1cbf7c195e3cbf19888f39475d Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Fri, 4 Oct 2024 14:29:07 +0200 Subject: [PATCH 1/3] feat: updgrade commit-boost to v0.3.0 --- bolt-boost/Cargo.lock | 1076 +++++++++++------------------------- bolt-boost/Cargo.toml | 27 +- bolt-boost/src/main.rs | 3 +- bolt-boost/src/metrics.rs | 2 +- bolt-boost/src/server.rs | 9 +- bolt-boost/src/testutil.rs | 2 +- bolt-boost/src/types.rs | 1 - 7 files changed, 350 insertions(+), 770 deletions(-) diff --git a/bolt-boost/Cargo.lock b/bolt-boost/Cargo.lock index 6f4b4c3a9..003b3e99f 100644 --- a/bolt-boost/Cargo.lock +++ b/bolt-boost/Cargo.lock @@ -59,18 +59,16 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100" +checksum = "8367891bf380210abb0d6aa30c5f85a9080cb4a066c4d5c5acadad630823751b" dependencies = [ "alloy-consensus", - "alloy-contract", "alloy-core", "alloy-eips", "alloy-genesis", "alloy-network", "alloy-provider", - "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types", "alloy-serde", @@ -78,8 +76,6 @@ dependencies = [ "alloy-signer-local", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", ] [[package]] @@ -94,59 +90,39 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96" +checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rlp", "alloy-serde", "c-kzg", "serde", ] -[[package]] -name = "alloy-contract" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", - "alloy-primitives", - "alloy-provider", - "alloy-pubsub", - "alloy-rpc-types-eth", - "alloy-sol-types", - "alloy-transport", - "futures", - "futures-util", - "thiserror", -] - [[package]] name = "alloy-core" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" +checksum = "5ce854562e7cafd5049189d0268d6e5cba05fe6c9cb7c6f8126a79b94800629c" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.8.5", + "alloy-rlp", "alloy-sol-types", ] [[package]] name = "alloy-dyn-abi" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" +checksum = "0b499852e1d0e9b8c6db0f24c48998e647c0d5762a01090f955106a7700e4611" dependencies = [ "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", @@ -156,20 +132,43 @@ dependencies = [ "winnow", ] +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives 0.8.5", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +dependencies = [ + "alloy-primitives 0.8.5", + "alloy-rlp", + "serde", +] + [[package]] name = "alloy-eips" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68" +checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ - "alloy-primitives", + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives 0.8.5", "alloy-rlp", "alloy-serde", "c-kzg", - "derive_more 0.99.18", - "ethereum_ssz", - "ethereum_ssz_derive", - "k256", + "derive_more 1.0.0", + "ethereum_ssz 0.7.1", + "ethereum_ssz_derive 0.7.1", "once_cell", "serde", "sha2 0.10.8", @@ -177,22 +176,22 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d" +checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-serde", "serde", ] [[package]] name = "alloy-json-abi" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" +checksum = "a438d4486b5d525df3b3004188f9d5cd1d65cd30ecc41e5a3ccef6f6342e8af9" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-sol-type-parser", "serde", "serde_json", @@ -200,11 +199,11 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2" +checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-sol-types", "serde", "serde_json", @@ -214,15 +213,15 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede" +checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", @@ -235,11 +234,12 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9" +checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" dependencies = [ - "alloy-primitives", + "alloy-eips", + "alloy-primitives 0.8.5", "alloy-serde", "serde", ] @@ -255,7 +255,6 @@ dependencies = [ "cfg-if", "const-hex", "derive_more 0.99.18", - "ethereum_ssz", "hex-literal", "itoa", "k256", @@ -267,11 +266,39 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260d3ff3bff0bb84599f032a2f2c6828180b0ea0cd41fdaf44f39cef3ba41861" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "getrandom", + "hashbrown 0.14.5", + "hex-literal", + "indexmap 2.5.0", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand", + "ruint", + "rustc-hash", + "serde", + "sha3", + "tiny-keccak", +] + [[package]] name = "alloy-provider" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8" +checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" dependencies = [ "alloy-chains", "alloy-consensus", @@ -279,20 +306,17 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-network-primitives", - "alloy-primitives", - "alloy-pubsub", + "alloy-primitives 0.8.5", "alloy-rpc-client", "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-rpc-types-trace", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 6.1.0", "futures", "futures-utils-wasm", "lru", @@ -300,30 +324,12 @@ dependencies = [ "reqwest", "serde", "serde_json", + "thiserror", "tokio", "tracing", "url", ] -[[package]] -name = "alloy-pubsub" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281" -dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-transport", - "bimap", - "futures", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower", - "tracing", -] - [[package]] name = "alloy-rlp" version = "0.3.8" @@ -348,17 +354,13 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3" +checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" dependencies = [ "alloy-json-rpc", - "alloy-primitives", - "alloy-pubsub", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "futures", "pin-project", "reqwest", @@ -366,16 +368,16 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-rpc-types" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521" +checksum = "64333d639f2a0cf73491813c629a405744e16343a4bc5640931be707c345ecc5" dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-engine", @@ -387,15 +389,15 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a24bcff4f9691d7a4971b43e5da46aa7b4ce22ed7789796612dc1eed220983" +checksum = "2e7081d2206dca51ce23a06338d78d9b536931cc3f15134fc1c6535eb2b77f18" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rpc-types-engine", - "ethereum_ssz", - "ethereum_ssz_derive", + "ethereum_ssz 0.7.1", + "ethereum_ssz_derive 0.7.1", "serde", "serde_with", "thiserror", @@ -403,50 +405,49 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7" +checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rlp", - "alloy-rpc-types-eth", "alloy-serde", - "ethereum_ssz", - "ethereum_ssz_derive", - "jsonwebtoken", - "rand", + "derive_more 1.0.0", + "ethereum_ssz 0.7.1", + "ethereum_ssz_derive 0.7.1", "serde", - "thiserror", ] [[package]] name = "alloy-rpc-types-eth" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef" +checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rlp", "alloy-serde", "alloy-sol-types", + "cfg-if", + "derive_more 1.0.0", + "hashbrown 0.14.5", "itertools 0.13.0", "serde", "serde_json", - "thiserror", ] [[package]] name = "alloy-rpc-types-trace" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86eeb49ea0cc79f249faa1d35c20541bb1c317a59b5962cb07b1890355b0064" +checksum = "98db35cd42c90b484377e6bc44d95377a7a38a5ebee996e67754ac0446d542ab" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-rpc-types-eth", "alloy-serde", "serde", @@ -456,22 +457,22 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef" +checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "serde", "serde_json", ] [[package]] name = "alloy-signer" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47" +checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "async-trait", "auto_impl", "elliptic-curve", @@ -481,13 +482,13 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee" +checksum = "9fabe917ab1778e760b4701628d1cae8e028ee9d52ac6307de4e1e9286ab6b5f" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-signer", "async-trait", "k256", @@ -497,13 +498,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" +checksum = "68e7f6e8fe5b443f82b3f1e15abfa191128f71569148428e49449d01f6f49e8b" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -511,16 +512,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" +checksum = "6b96ce28d2fde09abb6135f410c41fad670a3a770b6776869bd852f1df102e6f" dependencies = [ - "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", "indexmap 2.5.0", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -530,26 +530,24 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" +checksum = "906746396a8296537745711630d9185746c0b50c033d5e9d18b0a6eba3d53f90" dependencies = [ - "alloy-json-abi", "const-hex", "dunce", "heck 0.5.0", "proc-macro2", "quote", - "serde_json", "syn 2.0.77", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" +checksum = "bc85178909a49c8827ffccfc9103a7ce1767ae66a801b69bdc326913870bf8e6" dependencies = [ "serde", "winnow", @@ -557,12 +555,12 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" +checksum = "d86a533ce22525969661b25dfe296c112d35eb6861f188fd284f8bd4bb3842ae" dependencies = [ "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.8.5", "alloy-sol-macro", "const-hex", "serde", @@ -570,75 +568,38 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae" +checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" dependencies = [ "alloy-json-rpc", - "base64 0.22.1", + "base64", "futures-util", "futures-utils-wasm", "serde", "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-transport-http" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698" +checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" dependencies = [ "alloy-json-rpc", "alloy-transport", "reqwest", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] -[[package]] -name = "alloy-transport-ipc" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c" -dependencies = [ - "alloy-json-rpc", - "alloy-pubsub", - "alloy-transport", - "bytes", - "futures", - "interprocess", - "pin-project", - "serde_json", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "alloy-transport-ws" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300" -dependencies = [ - "alloy-pubsub", - "alloy-transport", - "futures", - "http", - "rustls", - "serde_json", - "tokio", - "tokio-tungstenite", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -654,55 +615,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - [[package]] name = "arbitrary" version = "1.3.2" @@ -884,17 +796,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.1", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -947,7 +848,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -984,14 +885,13 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "headers", "http", "http-body", "http-body-util", "mime", "pin-project-lite", "serde", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -1030,12 +930,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1117,14 +1011,14 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "arbitrary", "blst", "ethereum-types", "ethereum_hashing 0.6.0", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.5.2", + "ethereum_ssz 0.5.4", "hex", "rand", "serde", @@ -1141,8 +1035,8 @@ dependencies = [ "blst", "ethereum-types", "ethereum_hashing 0.6.0", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.5.2", + "ethereum_ssz 0.5.4", "hex", "rand", "serde", @@ -1171,9 +1065,10 @@ dependencies = [ "axum", "axum-extra", "cb-common", - "commit-boost", - "ethereum_ssz", - "ethereum_ssz_derive", + "cb-pbs", + "ethereum_ssz 0.5.4", + "ethereum_ssz 0.7.1", + "ethereum_ssz_derive 0.7.1", "eyre", "futures", "lazy_static", @@ -1188,6 +1083,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", + "tree_hash 0.8.0", "types", ] @@ -1233,26 +1129,10 @@ dependencies = [ "serde", ] -[[package]] -name = "cb-cli" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" -dependencies = [ - "cb-common", - "clap", - "docker-compose-types", - "dotenvy", - "eyre", - "indexmap 2.5.0", - "serde", - "serde_json", - "serde_yaml", -] - [[package]] name = "cb-common" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" +version = "0.3.0" +source = "git+https://github.com/commit-boost/commit-boost-client?rev=v0.3.0#d511c267243b3371f4d47604aebe6a20dbbd0e79" dependencies = [ "alloy", "axum", @@ -1260,32 +1140,30 @@ dependencies = [ "blst", "derive_more 1.0.0", "eth2_keystore", - "ethereum-types", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", + "ethereum_serde_utils 0.7.0", "eyre", "k256", "rand", "reqwest", "serde", "serde_json", - "ssz_types 0.5.4", + "serde_yaml", + "ssz_types 0.8.0", "thiserror", "tokio", "toml", "tracing", "tracing-appender", "tracing-subscriber", - "tree_hash 0.5.2", - "tree_hash_derive 0.5.2", + "tree_hash 0.8.0", + "tree_hash_derive 0.8.0", "url", ] [[package]] name = "cb-metrics" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" +version = "0.3.0" +source = "git+https://github.com/commit-boost/commit-boost-client?rev=v0.3.0#d511c267243b3371f4d47604aebe6a20dbbd0e79" dependencies = [ "axum", "cb-common", @@ -1298,8 +1176,8 @@ dependencies = [ [[package]] name = "cb-pbs" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" +version = "0.3.0" +source = "git+https://github.com/commit-boost/commit-boost-client?rev=v0.3.0#d511c267243b3371f4d47604aebe6a20dbbd0e79" dependencies = [ "alloy", "async-trait", @@ -1307,7 +1185,7 @@ dependencies = [ "blst", "cb-common", "cb-metrics", - "dashmap", + "dashmap 5.5.3", "eyre", "futures", "lazy_static", @@ -1321,30 +1199,6 @@ dependencies = [ "uuid 1.10.0", ] -[[package]] -name = "cb-signer" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" -dependencies = [ - "alloy", - "axum", - "axum-extra", - "bimap", - "blst", - "cb-common", - "derive_more 1.0.0", - "eyre", - "headers", - "k256", - "lazy_static", - "thiserror", - "tokio", - "tracing", - "tree_hash 0.5.2", - "tree_hash_derive 0.5.2", - "uuid 1.10.0", -] - [[package]] name = "cc" version = "1.1.15" @@ -1382,101 +1236,10 @@ dependencies = [ "generic-array", ] -[[package]] -name = "clap" -version = "4.5.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_derive" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" - -[[package]] -name = "commit-boost" -version = "0.1.0" -source = "git+https://github.com/commit-boost/commit-boost-client?rev=45ce8f1b#45ce8f1b8febd778c7a8a1fd7651b6e39afa8478" -dependencies = [ - "cb-cli", - "cb-common", - "cb-metrics", - "cb-pbs", - "cb-signer", - "clap", - "color-eyre", - "eyre", - "tokio", - "tree_hash 0.5.2", - "tree_hash_derive 0.5.2", -] - [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "itertools 0.10.5", ] @@ -1484,7 +1247,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "quote", "syn 1.0.109", @@ -1705,10 +1468,18 @@ dependencies = [ ] [[package]] -name = "data-encoding" -version = "2.6.0" +name = "dashmap" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] [[package]] name = "der" @@ -1752,37 +1523,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "derive_builder" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" -dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" -dependencies = [ - "derive_builder_core", - "syn 2.0.77", -] - [[package]] name = "derive_more" version = "0.99.18" @@ -1836,31 +1576,7 @@ dependencies = [ "const-oid", "crypto-common", "subtle", -] - -[[package]] -name = "docker-compose-types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213a368b9c0767c81ef9ced0f712cfd99d27d7de2a22a60e7ac9b1342c8a395" -dependencies = [ - "derive_builder", - "indexmap 2.5.0", - "serde", - "serde_yaml", -] - -[[package]] -name = "doctest-file" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +] [[package]] name = "dunce" @@ -1944,9 +1660,9 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ - "bls 0.2.0 (git+https://github.com/sigp/lighthouse?rev=2e0eb6d1)", + "bls 0.2.0 (git+https://github.com/sigp/lighthouse?tag=v5.3.0)", "ethereum_hashing 0.6.0", "hex", "lazy_static", @@ -2030,13 +1746,12 @@ dependencies = [ [[package]] name = "ethereum_hashing" -version = "1.0.0-beta.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233dc6f434ce680dbabf4451ee3380cec46cb3c45d66660445a435619710dd35" +checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab" dependencies = [ "cpufeatures", - "lazy_static", - "ring 0.16.20", + "ring 0.17.8", "sha2 0.10.8", ] @@ -2053,6 +1768,19 @@ dependencies = [ "serde_json", ] +[[package]] +name = "ethereum_serde_utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" +dependencies = [ + "alloy-primitives 0.8.5", + "hex", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "ethereum_ssz" version = "0.5.4" @@ -2064,6 +1792,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "ethereum_ssz" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e999563461faea0ab9bc0024e5e66adcee35881f3d5062f52f31a4070fe1522" +dependencies = [ + "alloy-primitives 0.8.5", + "itertools 0.13.0", + "smallvec", +] + [[package]] name = "ethereum_ssz_derive" version = "0.5.4" @@ -2076,6 +1815,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ethereum_ssz_derive" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3deae99c8e74829a00ba7a92d49055732b3c1f093f2ccfa3cbc621679b6fa91" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "eyre" version = "0.6.12" @@ -2287,10 +2038,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -2349,6 +2098,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", + "serde", ] [[package]] @@ -2360,30 +2110,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "headers" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http", -] - [[package]] name = "heck" version = "0.4.1" @@ -2551,7 +2277,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2664,38 +2390,17 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "bytes", ] -[[package]] -name = "interprocess" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" -dependencies = [ - "doctest-file", - "futures-core", - "libc", - "recvmsg", - "tokio", - "widestring", - "windows-sys 0.52.0", -] - [[package]] name = "ipnet" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "itertools" version = "0.10.5" @@ -2729,21 +2434,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "k256" version = "0.13.3" @@ -2758,6 +2448,15 @@ dependencies = [ "signature", ] +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + [[package]] name = "keccak-asm" version = "0.1.3" @@ -2771,15 +2470,15 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "arbitrary", "c-kzg", "derivative", "ethereum_hashing 0.6.0", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", + "ethereum_serde_utils 0.5.2", + "ethereum_ssz 0.5.4", + "ethereum_ssz_derive 0.5.4", "hex", "serde", "tree_hash 0.6.0", @@ -2878,7 +2577,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "ethereum-types", "ethereum_hashing 0.6.0", @@ -2919,8 +2618,8 @@ dependencies = [ "derivative", "ethereum-types", "ethereum_hashing 0.6.0", - "ethereum_ssz", - "ethereum_ssz_derive", + "ethereum_ssz 0.5.4", + "ethereum_ssz_derive 0.5.4", "itertools 0.10.5", "parking_lot", "rayon", @@ -3151,12 +2850,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -3221,16 +2914,6 @@ dependencies = [ "crypto-mac", ] -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -3248,16 +2931,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version 0.4.1", -] - [[package]] name = "pin-project" version = "1.1.5" @@ -3344,27 +3017,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.77", ] [[package]] @@ -3447,6 +3118,7 @@ dependencies = [ "libc", "rand_chacha", "rand_core", + "serde", ] [[package]] @@ -3497,12 +3169,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "recvmsg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" - [[package]] name = "redox_syscall" version = "0.5.3" @@ -3562,7 +3228,7 @@ version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "encoding_rs", "futures-core", @@ -3668,7 +3334,6 @@ dependencies = [ "ark-ff 0.3.0", "ark-ff 0.4.2", "bytes", - "ethereum_ssz", "fastrlp", "num-bigint", "num-traits", @@ -3709,6 +3374,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -3753,7 +3424,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", - "ring 0.17.8", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3766,7 +3436,7 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.1", + "base64", "rustls-pki-types", ] @@ -3814,7 +3484,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" [[package]] name = "salsa20" @@ -3913,12 +3583,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.209" @@ -3999,7 +3663,7 @@ version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ - "base64 0.22.1", + "base64", "chrono", "hex", "indexmap 1.9.3", @@ -4036,17 +3700,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.9.9" @@ -4081,6 +3734,16 @@ dependencies = [ "cc", ] +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", +] + [[package]] name = "sha3-asm" version = "0.1.3" @@ -4125,18 +3788,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - [[package]] name = "slab" version = "0.4.9" @@ -4199,9 +3850,9 @@ dependencies = [ [[package]] name = "ssz_rs" version = "0.9.0" -source = "git+https://github.com/ralexstokes/ssz-rs?rev=1df4cd9b#1df4cd9b849a48c44a6105abc3a38d21cd4fd8d3" +source = "git+https://github.com/mempirate/ssz-rs?branch=feat/bump-deps#5bce60fa871e4ecd31024ea2a7be58a6c74f7dfa" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.5", "bitvec", "serde", "sha2 0.9.9", @@ -4211,7 +3862,7 @@ dependencies = [ [[package]] name = "ssz_rs_derive" version = "0.9.0" -source = "git+https://github.com/ralexstokes/ssz-rs?rev=1df4cd9b#1df4cd9b849a48c44a6105abc3a38d21cd4fd8d3" +source = "git+https://github.com/mempirate/ssz-rs?branch=feat/bump-deps#5bce60fa871e4ecd31024ea2a7be58a6c74f7dfa" dependencies = [ "proc-macro2", "quote", @@ -4220,36 +3871,36 @@ dependencies = [ [[package]] name = "ssz_types" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382939886cb24ee8ac885d09116a60f6262d827c7a9e36012b4f6d3d0116d0b3" +checksum = "625b20de2d4b3891e6972f4ce5061cb11bd52b3479270c4b177c134b571194a9" dependencies = [ + "arbitrary", "derivative", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.5.2", + "ethereum_ssz 0.5.4", "itertools 0.10.5", "serde", "serde_derive", "smallvec", - "tree_hash 0.5.2", + "tree_hash 0.6.0", "typenum", ] [[package]] name = "ssz_types" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625b20de2d4b3891e6972f4ce5061cb11bd52b3479270c4b177c134b571194a9" +checksum = "35e0719d2b86ac738a55ae71a8429f52aa2741da988f1fd0975b4cc610fd1e08" dependencies = [ - "arbitrary", "derivative", - "ethereum_serde_utils", - "ethereum_ssz", - "itertools 0.10.5", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", + "itertools 0.13.0", "serde", "serde_derive", "smallvec", - "tree_hash 0.6.0", + "tree_hash 0.8.0", "typenum", ] @@ -4322,7 +3973,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "ethereum-types", "ethereum_hashing 0.6.0", @@ -4352,9 +4003,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.7" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea" +checksum = "0ab661c8148c2261222a4d641ad5477fd4bea79406a99056096a0b41b35617a5" dependencies = [ "paste", "proc-macro2", @@ -4420,7 +4071,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ "quote", "syn 1.0.109", @@ -4582,22 +4233,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - [[package]] name = "tokio-util" version = "0.7.11" @@ -4661,6 +4296,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4718,16 +4367,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -4772,31 +4411,31 @@ dependencies = [ [[package]] name = "tree_hash" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c998ac5fe2b07c025444bdd522e6258110b63861c6698eedc610c071980238d" +checksum = "134d6b24a5b829f30b5ee7de05ba7384557f5f6b00e29409cdf2392f93201bfa" dependencies = [ "ethereum-types", - "ethereum_hashing 1.0.0-beta.2", + "ethereum_hashing 0.6.0", "smallvec", ] [[package]] name = "tree_hash" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d6b24a5b829f30b5ee7de05ba7384557f5f6b00e29409cdf2392f93201bfa" +checksum = "373495c23db675a5192de8b610395e1bec324d596f9e6111192ce903dc11403a" dependencies = [ - "ethereum-types", - "ethereum_hashing 0.6.0", + "alloy-primitives 0.8.5", + "ethereum_hashing 0.7.0", "smallvec", ] [[package]] name = "tree_hash_derive" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84303a9c7cda5f085a3ed9cd241d1e95e04d88aab1d679b02f212e653537ba86" +checksum = "9ce7bccc538359a213436af7bc95804bdbf1c2a21d80e22953cbe9e096837ff1" dependencies = [ "darling 0.13.4", "quote", @@ -4805,13 +4444,14 @@ dependencies = [ [[package]] name = "tree_hash_derive" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce7bccc538359a213436af7bc95804bdbf1c2a21d80e22953cbe9e096837ff1" +checksum = "b0857056ca4eb5de8c417309be42bcff6017b47e86fbaddde609b4633f66061e" dependencies = [ - "darling 0.13.4", + "darling 0.20.10", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -4830,26 +4470,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror", - "utf-8", -] - [[package]] name = "typenum" version = "1.17.0" @@ -4859,21 +4479,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?rev=2e0eb6d1#2e0eb6d1b8705bbda2ba56eb195d9cc7c6575e95" +source = "git+https://github.com/sigp/lighthouse?tag=v5.3.0#d6ba8c397557f5c977b70f0d822a9228e98ca214" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "arbitrary", - "bls 0.2.0 (git+https://github.com/sigp/lighthouse?rev=2e0eb6d1)", + "bls 0.2.0 (git+https://github.com/sigp/lighthouse?tag=v5.3.0)", "compare_fields", "compare_fields_derive", "derivative", "eth2_interop_keypairs", "ethereum-types", "ethereum_hashing 0.6.0", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", + "ethereum_serde_utils 0.5.2", + "ethereum_ssz 0.5.4", + "ethereum_ssz_derive 0.5.4", "hex", "int_to_bytes", "itertools 0.10.5", @@ -4988,18 +4608,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "uuid" version = "0.8.2" @@ -5146,21 +4754,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.26.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - [[package]] name = "winapi" version = "0.3.9" @@ -5313,25 +4906,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.1", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/bolt-boost/Cargo.toml b/bolt-boost/Cargo.toml index bee082b64..a79551d0f 100644 --- a/bolt-boost/Cargo.toml +++ b/bolt-boost/Cargo.toml @@ -14,9 +14,11 @@ eyre = "0.6.12" thiserror = "1.0.63" reqwest = "0.12.7" -ssz_rs = { git = "https://github.com/ralexstokes/ssz-rs", rev = "1df4cd9b", features = [ +# crypto +ssz_rs = { git = "https://github.com/mempirate/ssz-rs", branch = "feat/bump-deps", features = [ "sha2-asm", -] } # crypto +] } +tree_hash = "0.8" # tracing & metrics tracing = "0.1.40" @@ -26,23 +28,26 @@ prometheus = "0.13.4" # serialization serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.115" -ethereum_ssz = "0.5" -ethereum_ssz_derive = "0.5" +ethereum_ssz = "0.7.0" +ethereum_ssz_derive = "0.7.0" -# alloy -alloy = { version = "0.2.0", features = [ - "full", +alloy = { version = "0.3.6", features = [ + "signer-local", "provider-trace-api", "rpc-types-beacon", "rpc-types-engine", -] } +] } # alloy # commit-boost -commit-boost = { git = "https://github.com/commit-boost/commit-boost-client", rev = "45ce8f1b" } -cb-common = { git = "https://github.com/commit-boost/commit-boost-client", rev = "45ce8f1b" } +cb-common = { git = "https://github.com/commit-boost/commit-boost-client", rev = "v0.3.0" } +cb-pbs = { git = "https://github.com/commit-boost/commit-boost-client", rev = "v0.3.0" } # other -types = { git = "https://github.com/sigp/lighthouse", rev = "2e0eb6d1" } rand = "0.8.5" parking_lot = "0.12.3" lazy_static = "1.5.0" + +[dev-dependencies] +# NOTE: we need this in order to play nice with Lighthouse types at version 5.3.0 +ssz_compat = { version = "0.5", package = "ethereum_ssz" } +types = { git = "https://github.com/sigp/lighthouse", tag = "v5.3.0" } diff --git a/bolt-boost/src/main.rs b/bolt-boost/src/main.rs index 5bfa26a8e..c08d7fb6b 100644 --- a/bolt-boost/src/main.rs +++ b/bolt-boost/src/main.rs @@ -1,4 +1,5 @@ -use commit_boost::prelude::*; +use cb_common::{config::load_pbs_custom_config, utils::initialize_pbs_tracing_log}; +use cb_pbs::{PbsService, PbsState}; use eyre::Result; mod constraints; diff --git a/bolt-boost/src/metrics.rs b/bolt-boost/src/metrics.rs index 3d86f8939..7892b70d4 100644 --- a/bolt-boost/src/metrics.rs +++ b/bolt-boost/src/metrics.rs @@ -1,4 +1,4 @@ -use commit_boost::prelude::PbsService; +use cb_pbs::PbsService; use lazy_static::lazy_static; use prometheus::{ register_histogram_vec_with_registry, register_int_counter_vec_with_registry, diff --git a/bolt-boost/src/server.rs b/bolt-boost/src/server.rs index 7b702f55e..b3bb87aea 100644 --- a/bolt-boost/src/server.rs +++ b/bolt-boost/src/server.rs @@ -21,9 +21,10 @@ use cb_common::{ }, signature::verify_signed_message, types::Chain, - utils::{get_user_agent_with_version, ms_into_slot}, + utils::{get_user_agent_with_version, ms_into_slot, utcnow_ms}, }; -use commit_boost::prelude::*; +use cb_pbs::{register_validator, BuilderApi, BuilderApiState, PbsState}; +// use commit_boost::prelude::*; use eyre::Result; use futures::{future::join_all, stream::FuturesUnordered, StreamExt}; use serde::Serialize; @@ -444,7 +445,7 @@ async fn send_one_get_header( debug!( latency = ?request_latency, block_hash = %get_header_response.data.message.header.block_hash, - value_eth = format_ether(get_header_response.data.message.value()), + value_eth = format_ether(get_header_response.data.message.value), "received new header" ); @@ -471,7 +472,7 @@ fn validate_header( let block_hash = signed_header.message.header.block_hash; let received_relay_pubkey = signed_header.message.pubkey; let tx_root = signed_header.message.header.transactions_root; - let value = signed_header.message.value(); + let value = signed_header.message.value; if block_hash == B256::ZERO { return Err(ValidationError::EmptyBlockhash); diff --git a/bolt-boost/src/testutil.rs b/bolt-boost/src/testutil.rs index 3852e505a..8834a4f59 100644 --- a/bolt-boost/src/testutil.rs +++ b/bolt-boost/src/testutil.rs @@ -1,5 +1,5 @@ use alloy::primitives::{Bytes, B256}; -use ssz::Decode; +use ssz_compat::Decode; use types::{ExecPayload, MainnetEthSpec, SignedBeaconBlockDeneb}; const TEST_BLOCK: &[u8] = include_bytes!(concat!( diff --git a/bolt-boost/src/types.rs b/bolt-boost/src/types.rs index bb5168844..0ee4419be 100644 --- a/bolt-boost/src/types.rs +++ b/bolt-boost/src/types.rs @@ -6,7 +6,6 @@ use alloy::{ signers::k256::sha2::{Digest, Sha256}, }; use axum::http::HeaderMap; -use commit_boost::prelude::tree_hash; use reqwest::Url; use serde::{Deserialize, Serialize}; use ssz_derive::{Decode, Encode}; From d9c2b3c1afa3cf4772e91a48f703792173f949db Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Fri, 4 Oct 2024 14:33:27 +0200 Subject: [PATCH 2/3] misc --- bolt-boost/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt-boost/Cargo.toml b/bolt-boost/Cargo.toml index a79551d0f..497145e7e 100644 --- a/bolt-boost/Cargo.toml +++ b/bolt-boost/Cargo.toml @@ -31,12 +31,13 @@ serde_json = "1.0.115" ethereum_ssz = "0.7.0" ethereum_ssz_derive = "0.7.0" +# alloy alloy = { version = "0.3.6", features = [ "signer-local", "provider-trace-api", "rpc-types-beacon", "rpc-types-engine", -] } # alloy +] } # commit-boost cb-common = { git = "https://github.com/commit-boost/commit-boost-client", rev = "v0.3.0" } From 6219293f08c31f0b6cc7b342897ea9b577dae057 Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Fri, 4 Oct 2024 14:34:31 +0200 Subject: [PATCH 3/3] misc --- bolt-boost/src/main.rs | 3 ++- bolt-boost/src/metrics.rs | 3 ++- bolt-boost/src/server.rs | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/bolt-boost/src/main.rs b/bolt-boost/src/main.rs index c08d7fb6b..7434e426d 100644 --- a/bolt-boost/src/main.rs +++ b/bolt-boost/src/main.rs @@ -1,6 +1,7 @@ +use eyre::Result; + use cb_common::{config::load_pbs_custom_config, utils::initialize_pbs_tracing_log}; use cb_pbs::{PbsService, PbsState}; -use eyre::Result; mod constraints; mod error; diff --git a/bolt-boost/src/metrics.rs b/bolt-boost/src/metrics.rs index 7892b70d4..77c97ce54 100644 --- a/bolt-boost/src/metrics.rs +++ b/bolt-boost/src/metrics.rs @@ -1,10 +1,11 @@ -use cb_pbs::PbsService; use lazy_static::lazy_static; use prometheus::{ register_histogram_vec_with_registry, register_int_counter_vec_with_registry, register_int_gauge_with_registry, HistogramVec, IntCounterVec, IntGauge, Registry, }; +use cb_pbs::PbsService; + pub(crate) const TIMEOUT_ERROR_CODE_STR: &str = "555"; pub(crate) const GET_HEADER_WP_TAG: &str = "get_header_with_proofs"; diff --git a/bolt-boost/src/server.rs b/bolt-boost/src/server.rs index b3bb87aea..f40c5cabf 100644 --- a/bolt-boost/src/server.rs +++ b/bolt-boost/src/server.rs @@ -11,6 +11,16 @@ use axum::{ routing::{get, post}, Json, Router, }; +use eyre::Result; +use futures::{future::join_all, stream::FuturesUnordered, StreamExt}; +use serde::Serialize; +use std::{ + collections::HashMap, + time::{Duration, Instant}, +}; +use tokio::time::sleep; +use tracing::{debug, error, info, warn, Instrument}; + use cb_common::{ config::PbsConfig, constants::APPLICATION_BUILDER_DOMAIN, @@ -24,16 +34,6 @@ use cb_common::{ utils::{get_user_agent_with_version, ms_into_slot, utcnow_ms}, }; use cb_pbs::{register_validator, BuilderApi, BuilderApiState, PbsState}; -// use commit_boost::prelude::*; -use eyre::Result; -use futures::{future::join_all, stream::FuturesUnordered, StreamExt}; -use serde::Serialize; -use std::{ - collections::HashMap, - time::{Duration, Instant}, -}; -use tokio::time::sleep; -use tracing::{debug, error, info, warn, Instrument}; use crate::metrics::{ GET_HEADER_WP_TAG, RELAY_INVALID_BIDS, RELAY_LATENCY, RELAY_STATUS_CODE, TIMEOUT_ERROR_CODE_STR,