diff --git a/Cargo.lock b/Cargo.lock index 8145fb1d..606fd80f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,26 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "account_utils" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "eth2_keystore", - "eth2_wallet", - "filesystem", - "rand", - "regex", - "rpassword", - "serde", - "serde_yaml", - "slog", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "validator_dir", - "zeroize", -] - [[package]] name = "addr2line" version = "0.24.2" @@ -118,55 +98,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "alloy-consensus" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "c-kzg", -] - -[[package]] -name = "alloy-eip2930" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" -dependencies = [ - "alloy-primitives", - "alloy-rlp", -] - -[[package]] -name = "alloy-eip7702" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" -dependencies = [ - "alloy-primitives", - "alloy-rlp", -] - -[[package]] -name = "alloy-eips" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" -dependencies = [ - "alloy-eip2930", - "alloy-eip7702", - "alloy-primitives", - "alloy-rlp", - "c-kzg", - "derive_more 1.0.0", - "once_cell", - "serde", - "sha2 0.10.8", -] - [[package]] name = "alloy-primitives" version = "0.8.18" @@ -185,16 +116,16 @@ dependencies = [ "hashbrown 0.15.2", "indexmap", "itoa", - "k256 0.13.4", + "k256", "keccak-asm", "paste", "proptest", "proptest-derive", "rand", "ruint", - "rustc-hash 2.1.0", + "rustc-hash", "serde", - "sha3 0.10.8", + "sha3", "tiny-keccak", ] @@ -230,9 +161,9 @@ dependencies = [ "dirs 5.0.1", "futures", "regex", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "sensitive_url", "serde", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tokio", "tracing", "tracing-subscriber", @@ -537,7 +468,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.42", + "rustix 0.38.43", "slab", "tracing", "windows-sys 0.59.0", @@ -549,7 +480,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] @@ -682,12 +613,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -718,75 +643,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "beacon_chain" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "bitvec 1.0.1", - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "derivative", - "eth1", - "eth2", - "eth2_network_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", - "execution_layer", - "fork_choice", - "futures", - "genesis", - "hex", - "int_to_bytes 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "itertools 0.10.5", - "kzg 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "lighthouse_version 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "lru", - "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "oneshot_broadcast", - "operation_pool", - "parking_lot 0.12.3", - "proto_array", - "rand", - "rayon", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "serde_json", - "slasher", - "slog", - "slog-async", - "slog-term", - "sloggers", - "slot_clock", - "smallvec", - "ssz_types", - "state_processing", - "store", - "strum", - "superstruct", - "task_executor 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tempfile", - "tokio", - "tokio-stream", - "tree_hash", - "tree_hash_derive", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -814,28 +670,16 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.1", + "wyz", ] [[package]] @@ -853,7 +697,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -866,36 +709,10 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "bls" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "arbitrary", - "blst", - "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", - "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "hex", - "rand", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "tree_hash", - "zeroize", -] - [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "arbitrary", @@ -903,10 +720,10 @@ dependencies = [ "ethereum_hashing", "ethereum_serde_utils", "ethereum_ssz", - "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "fixed_bytes", "hex", "rand", - "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "safe_arith", "serde", "tree_hash", "zeroize", @@ -932,8 +749,8 @@ checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" dependencies = [ "blst", "byte-slice-cast", - "ff 0.13.0", - "group 0.13.0", + "ff", + "group", "pairing", "rand_core", "serde", @@ -949,18 +766,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "builder_client" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "eth2", - "lighthouse_version 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -1020,8 +825,6 @@ dependencies = [ "glob", "hex", "libc", - "once_cell", - "serde", ] [[package]] @@ -1105,9 +908,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" dependencies = [ "clap_builder", "clap_derive", @@ -1115,9 +918,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" dependencies = [ "anstream", "anstyle", @@ -1128,9 +931,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1147,35 +950,18 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "clap", - "dirs 3.0.2", - "eth2_network_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_ssz", - "hex", - "serde", - "serde_json", - "serde_yaml", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "clap_utils" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "clap", "dirs 3.0.2", - "eth2_network_config 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "eth2_network_config", "ethereum_ssz", "hex", "serde", "serde_json", "serde_yaml", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "types", ] [[package]] @@ -1190,27 +976,18 @@ dependencies = [ "http_metrics", "hyper 1.5.2", "network", - "parking_lot 0.12.3", + "parking_lot", "processor", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "sensitive_url", "serde", "strum", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tokio", "tracing", - "unused_port 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "unused_port", "version", ] -[[package]] -name = "cmake" -version = "0.1.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" -dependencies = [ - "cc", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -1220,15 +997,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "itertools 0.10.5", -] - -[[package]] -name = "compare_fields" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "itertools 0.10.5", ] @@ -1236,16 +1005,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "compare_fields_derive" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "quote", "syn 1.0.109", @@ -1336,8 +1096,8 @@ checksum = "319cb241b1ad37f8c376b2ebcd7233f53e033a50de6f0a9cf38e6cc545554de4" dependencies = [ "blst", "blstrs", - "ff 0.13.0", - "group 0.13.0", + "ff", + "group", "pairing", "subtle", ] @@ -1429,18 +1189,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -1502,16 +1250,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "ctrlc" -version = "3.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" -dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1646,7 +1384,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -1682,30 +1420,14 @@ dependencies = [ "base64 0.22.1", "dashmap", "openssl", - "parking_lot 0.12.3", + "parking_lot", "r2d2", "r2d2_sqlite", "rand", "rusqlite", "ssv_types", "tempfile", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", -] - -[[package]] -name = "db-key" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72465f46d518f6015d9cf07f7f3013a95dd6b9c2747c3d65ae0cce43929d14f" - -[[package]] -name = "delay_map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" -dependencies = [ - "futures", - "tokio-util", + "types", ] [[package]] @@ -1719,31 +1441,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "deposit_contract" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "ethabi 16.0.0", - "ethereum_ssz", - "hex", - "reqwest", - "serde_json", - "sha2 0.9.9", - "tree_hash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "der" version = "0.7.9" @@ -1857,21 +1554,11 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "clap", - "clap_utils 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "eth2_network_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "directory" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "clap", - "clap_utils 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "eth2_network_config 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "clap_utils", + "eth2_network_config", ] [[package]] @@ -1936,39 +1623,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discv5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569b8c367554666c8652305621e8bae3634a2ff5c6378081d5bd8c399c99f23" -dependencies = [ - "aes 0.8.4", - "aes-gcm", - "alloy-rlp", - "arrayvec", - "ctr 0.9.2", - "delay_map 0.3.0", - "enr 0.12.1", - "fnv", - "futures", - "hashlink 0.8.4", - "hex", - "hkdf", - "lazy_static", - "libp2p-identity", - "lru", - "more-asserts", - "multiaddr", - "parking_lot 0.11.2", - "rand", - "smallvec", - "socket2 0.4.10", - "tokio", - "tracing", - "uint 0.9.5", - "zeroize", -] - [[package]] name = "discv5" version = "0.9.0" @@ -1980,8 +1634,8 @@ dependencies = [ "alloy-rlp", "arrayvec", "ctr 0.9.2", - "delay_map 0.4.0", - "enr 0.13.0", + "delay_map", + "enr", "fnv", "futures", "hashlink 0.9.1", @@ -1992,10 +1646,10 @@ dependencies = [ "lru", "more-asserts", "multiaddr", - "parking_lot 0.12.3", + "parking_lot", "rand", "smallvec", - "socket2 0.5.8", + "socket2", "tokio", "tracing", "uint 0.10.0", @@ -2021,28 +1675,16 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der 0.7.9", - "digest 0.10.7", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", - "signature 2.2.0", - "spki 0.7.3", + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -2051,8 +1693,8 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", + "pkcs8", + "signature", ] [[package]] @@ -2076,41 +1718,22 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array", - "group 0.12.1", - "rand_core", - "sec1 0.3.0", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff", "generic-array", - "group 0.13.0", + "group", "pem-rfc7468", - "pkcs8 0.10.2", + "pkcs8", "rand_core", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] @@ -2124,25 +1747,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enr" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972070166c68827e64bd1ebc8159dd8e32d9bc2da7ebe8f20b61308f7974ad30" -dependencies = [ - "alloy-rlp", - "base64 0.21.7", - "bytes", - "ed25519-dalek", - "hex", - "k256 0.13.4", - "log", - "rand", - "serde", - "sha3 0.10.8", - "zeroize", -] - [[package]] name = "enr" version = "0.13.0" @@ -2154,11 +1758,11 @@ dependencies = [ "bytes", "ed25519-dalek", "hex", - "k256 0.13.4", + "k256", "log", "rand", "serde", - "sha3 0.10.8", + "sha3", "zeroize", ] @@ -2174,28 +1778,6 @@ dependencies = [ "syn 2.0.95", ] -[[package]] -name = "environment" -version = "0.1.2" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "async-channel", - "ctrlc", - "eth2_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "eth2_network_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "futures", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "slog", - "slog-async", - "slog-json", - "slog-term", - "sloggers", - "task_executor 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tokio", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -2221,110 +1803,50 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "eth1" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "eth2", - "ethereum_ssz", - "ethereum_ssz_derive", - "execution_layer", - "futures", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "slog", - "state_processing", - "superstruct", - "task_executor 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tokio", - "tree_hash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "account_utils", - "bytes", "derivative", + "enr", "eth2_keystore", "ethereum_serde_utils", "ethereum_ssz", "ethereum_ssz_derive", "futures", "futures-util", - "libsecp256k1", - "lighthouse_network 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "libp2p-identity", "mediatype", - "pretty_reqwest_error 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "procfs", + "multiaddr", + "pretty_reqwest_error", "proto_array", - "psutil", "reqwest", - "ring 0.16.20", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "reqwest-eventsource", + "sensitive_url", "serde", "serde_json", "slashing_protection", "ssz_types", - "store", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "eth2_config" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "paste", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "types", + "zeroize", ] [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "paste", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", -] - -[[package]] -name = "eth2_interop_keypairs" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_hashing", - "hex", - "num-bigint", - "serde", - "serde_yaml", + "types", ] [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "bls", "ethereum_hashing", "hex", "num-bigint", @@ -2335,9 +1857,9 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "bls", "num-bigint-dig", "ring 0.16.20", "sha2 0.9.9", @@ -2347,10 +1869,10 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "aes 0.7.5", - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "bls", "eth2_key_derivation", "hex", "hmac 0.11.0", @@ -2369,150 +1891,24 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bytes", - "discv5 0.7.0", - "eth2_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "kzg 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "pretty_reqwest_error 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde_yaml", - "sha2 0.9.9", - "slog", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "url", - "zip", -] - -[[package]] -name = "eth2_network_config" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "bytes", - "discv5 0.9.0", - "eth2_config 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "logging 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "pretty_reqwest_error 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "discv5", + "eth2_config", + "kzg", + "logging", + "pretty_reqwest_error", "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "sensitive_url", "serde_yaml", "sha2 0.9.9", "slog", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "types", "url", "zip", ] -[[package]] -name = "eth2_wallet" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "eth2_key_derivation", - "eth2_keystore", - "rand", - "serde", - "serde_json", - "serde_repr", - "tiny-bip39", - "uuid", -] - -[[package]] -name = "ethabi" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5" -dependencies = [ - "ethereum-types 0.12.1", - "hex", - "serde", - "serde_json", - "sha3 0.9.1", - "thiserror 1.0.69", - "uint 0.9.5", -] - -[[package]] -name = "ethabi" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898" -dependencies = [ - "ethereum-types 0.14.1", - "hex", - "once_cell", - "regex", - "serde", - "serde_json", - "sha3 0.10.8", - "thiserror 1.0.69", - "uint 0.9.5", -] - -[[package]] -name = "ethbloom" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" -dependencies = [ - "crunchy", - "fixed-hash 0.7.0", - "impl-rlp", - "impl-serde 0.3.2", - "tiny-keccak", -] - -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash 0.8.0", - "impl-codec 0.6.0", - "impl-rlp", - "impl-serde 0.4.0", - "scale-info", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" -dependencies = [ - "ethbloom 0.11.1", - "fixed-hash 0.7.0", - "impl-rlp", - "impl-serde 0.3.2", - "primitive-types 0.10.1", - "uint 0.9.5", -] - -[[package]] -name = "ethereum-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom 0.13.0", - "fixed-hash 0.8.0", - "impl-codec 0.6.0", - "impl-rlp", - "impl-serde 0.4.0", - "primitive-types 0.12.2", - "scale-info", - "uint 0.9.5", -] - [[package]] name = "ethereum_hashing" version = "0.7.0" @@ -2560,32 +1956,6 @@ dependencies = [ "syn 2.0.95", ] -[[package]] -name = "ethers-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade3e9c97727343984e1ceada4fdab11142d2ee3472d2c67027d56b1251d4f15" -dependencies = [ - "arrayvec", - "bytes", - "chrono", - "elliptic-curve 0.12.3", - "ethabi 18.0.0", - "generic-array", - "hex", - "k256 0.11.6", - "open-fastrlp", - "rand", - "rlp", - "rlp-derive", - "serde", - "serde_json", - "strum", - "thiserror 1.0.69", - "tiny-keccak", - "unicode-xid", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -2594,9 +1964,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -2609,62 +1979,19 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] [[package]] -name = "execution_layer" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rlp", - "arc-swap", - "builder_client", - "bytes", - "eth2", - "eth2_network_config 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_serde_utils", - "ethereum_ssz", - "ethers-core", - "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "fork_choice", - "hash-db", - "hash256-std-hasher", - "hex", - "jsonwebtoken", - "keccak-hash", - "kzg 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "lighthouse_version 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "lru", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "pretty_reqwest_error 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "rand", - "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "serde_json", - "sha2 0.9.9", - "slog", - "slot_clock", - "ssz_types", - "state_processing", - "strum", - "superstruct", - "task_executor 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tempfile", - "tokio", - "tokio-stream", - "tree_hash", - "tree_hash_derive", - "triehash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "warp", - "zeroize", + "futures-core", + "nom", + "pin-project-lite", ] [[package]] @@ -2717,33 +2044,17 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core", - "subtle", -] - [[package]] name = "ff" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec 1.0.1", + "bitvec", "rand_core", "subtle", ] -[[package]] -name = "ffi-opaque" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec54ac60a7f2ee9a97cad9946f9bf629a3bc6a7ae59e68983dc9318f5a54b81a" - [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2763,24 +2074,12 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "winapi", "windows-acl", ] -[[package]] -name = "fixed-hash" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -dependencies = [ - "byteorder", - "rand", - "rustc-hex", - "static_assertions", -] - [[package]] name = "fixed-hash" version = "0.8.0" @@ -2796,19 +2095,10 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "fixed_bytes" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", - "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "safe_arith", ] [[package]] @@ -2818,7 +2108,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "libz-sys", "miniz_oxide", ] @@ -2849,20 +2138,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "fork_choice" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "ethereum_ssz", - "ethereum_ssz_derive", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "proto_array", - "slog", - "state_processing", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2872,22 +2147,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -3043,26 +2302,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "genesis" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "environment", - "eth1", - "ethereum_hashing", - "ethereum_ssz", - "futures", - "int_to_bytes 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "rayon", - "slog", - "state_processing", - "tokio", - "tree_hash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -3121,37 +2360,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "gossipsub" version = "0.5.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "async-channel", - "asynchronous-codec", - "base64 0.21.7", - "byteorder", - "bytes", - "either", - "fnv", - "futures", - "futures-ticker", - "futures-timer", - "getrandom", - "hashlink 0.9.1", - "hex_fmt", - "libp2p", - "prometheus-client", - "quick-protobuf", - "quick-protobuf-codec", - "rand", - "regex", - "sha2 0.10.8", - "tracing", - "void", - "web-time", -] - -[[package]] -name = "gossipsub" -version = "0.5.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "async-channel", "asynchronous-codec", @@ -3177,24 +2386,13 @@ dependencies = [ "web-time", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand", "rand_core", "rand_xorshift", @@ -3220,21 +2418,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - -[[package]] -name = "hash256-std-hasher" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" -dependencies = [ - "crunchy", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -3276,27 +2459,14 @@ dependencies = [ ] [[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 0.2.12", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +name = "health_metrics" +version = "0.1.0" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "http 0.2.12", + "eth2", + "metrics", + "procfs", + "psutil", ] [[package]] @@ -3355,7 +2525,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.8", + "socket2", "thiserror 1.0.69", "tinyvec", "tokio", @@ -3375,7 +2545,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand", "resolv-conf", "smallvec", @@ -3507,7 +2677,7 @@ dependencies = [ "axum", "serde", "slot_clock", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tokio", "tracing", ] @@ -3517,14 +2687,14 @@ name = "http_metrics" version = "0.1.0" dependencies = [ "axum", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", + "health_metrics", + "metrics", + "parking_lot", "serde", "tokio", "tower-http", "tracing", "validator_metrics", - "warp_utils", ] [[package]] @@ -3556,7 +2726,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.8", + "socket2", "tokio", "tower-service", "tracing", @@ -3593,7 +2763,7 @@ dependencies = [ "hyper 0.14.32", "rustls 0.21.12", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -3845,49 +3015,13 @@ dependencies = [ "xmltree", ] -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec 2.3.1", -] - [[package]] name = "impl-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.12", -] - -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-serde" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", + "parity-scale-codec", ] [[package]] @@ -3934,28 +3068,11 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bytes", -] - -[[package]] -name = "int_to_bytes" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "bytes", ] -[[package]] -name = "integer-sqrt" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" -dependencies = [ - "num-traits", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -3973,7 +3090,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.8", + "socket2", "widestring 1.1.0", "windows-sys 0.48.0", "winreg", @@ -4045,34 +3162,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.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" -dependencies = [ - "cfg-if", - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.8", - "sha3 0.10.8", -] - [[package]] name = "k256" version = "0.13.4" @@ -4080,11 +3169,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.2.0", + "signature", ] [[package]] @@ -4106,39 +3195,10 @@ dependencies = [ "sha3-asm", ] -[[package]] -name = "keccak-hash" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c" -dependencies = [ - "primitive-types 0.12.2", - "tiny-keccak", -] - -[[package]] -name = "kzg" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "arbitrary", - "c-kzg", - "derivative", - "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", - "hex", - "rust_eth_kzg", - "serde", - "serde_json", - "tree_hash", -] - [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "arbitrary", "c-kzg", @@ -4163,29 +3223,6 @@ dependencies = [ "spin 0.9.8", ] -[[package]] -name = "leveldb" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32651baaaa5596b3a6e0bee625e73fd0334c167db0ea5ac68750ef9a629a2d6a" -dependencies = [ - "db-key", - "leveldb-sys", - "libc", -] - -[[package]] -name = "leveldb-sys" -version = "2.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd94a4d0242a437e5e41a27c782b69a624469ca1c4d1e5cb3c337f74a8031d4" -dependencies = [ - "cmake", - "ffi-opaque", - "libc", - "num_cpus", -] - [[package]] name = "libc" version = "0.2.169" @@ -4295,7 +3332,7 @@ dependencies = [ "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "quick-protobuf", "rand", @@ -4319,7 +3356,7 @@ dependencies = [ "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.3", + "parking_lot", "smallvec", "tracing", ] @@ -4393,7 +3430,7 @@ dependencies = [ "p256", "quick-protobuf", "rand", - "sec1 0.7.3", + "sec1", "sha2 0.10.8", "thiserror 1.0.69", "tracing", @@ -4415,7 +3452,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.8", + "socket2", "tokio", "tracing", "void", @@ -4451,7 +3488,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "nohash-hasher", - "parking_lot 0.12.3", + "parking_lot", "rand", "smallvec", "tracing", @@ -4531,12 +3568,12 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.3", + "parking_lot", "quinn", "rand", "ring 0.17.8", "rustls 0.23.20", - "socket2 0.5.8", + "socket2", "thiserror 1.0.69", "tokio", "tracing", @@ -4590,7 +3627,7 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.8", + "socket2", "tokio", "tracing", ] @@ -4714,94 +3751,34 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libz-sys" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "lighthouse_network" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "bytes", - "delay_map 0.3.0", - "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "dirs 3.0.2", - "discv5 0.7.0", - "either", - "error-chain", - "ethereum_ssz", - "ethereum_ssz_derive", - "fnv", - "futures", - "gossipsub 0.5.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "hex", - "itertools 0.10.5", - "libp2p", - "libp2p-mplex", - "lighthouse_version 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "lru", - "lru_cache 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "prometheus-client", - "rand", - "regex", - "serde", - "sha2 0.9.9", - "slog", - "smallvec", - "snap", - "ssz_types", - "strum", - "superstruct", - "task_executor 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tiny-keccak", - "tokio", - "tokio-io-timeout", - "tokio-util", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "unsigned-varint 0.8.0", - "unused_port 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "void", -] - [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "alloy-rlp", "bytes", - "delay_map 0.4.0", - "directory 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "delay_map", + "directory", "dirs 3.0.2", - "discv5 0.9.0", + "discv5", "either", + "eth2", "ethereum_ssz", "ethereum_ssz_derive", "fnv", "futures", - "gossipsub 0.5.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "gossipsub", "hex", "itertools 0.10.5", "libp2p", "libp2p-mplex", - "lighthouse_version 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "lighthouse_version", "lru", - "lru_cache 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "parking_lot 0.12.3", + "lru_cache", + "metrics", + "parking_lot", "prometheus-client", "rand", "regex", @@ -4813,30 +3790,21 @@ dependencies = [ "ssz_types", "strum", "superstruct", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tiny-keccak", "tokio", "tokio-io-timeout", "tokio-util", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "types", "unsigned-varint 0.8.0", - "unused_port 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "unused_port", "void", ] [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "git-version", - "target_info", -] - -[[package]] -name = "lighthouse_version" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "git-version", "target_info", @@ -4856,9 +3824,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -4876,14 +3844,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "lockfile" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "fs2", -] - [[package]] name = "log" version = "0.4.22" @@ -4893,33 +3853,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "chrono", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "serde", - "serde_json", - "slog", - "slog-term", - "sloggers", - "take_mut", - "tokio", - "tracing", - "tracing-appender", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "logging" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "chrono", - "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "parking_lot 0.12.3", + "metrics", + "parking_lot", "serde", "serde_json", "slog", @@ -4955,15 +3893,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "fnv", -] - -[[package]] -name = "lru_cache" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "fnv", ] @@ -5028,23 +3958,12 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "ethereum_hashing", - "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "merkle_proof" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "ethereum_hashing", - "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "fixed_bytes", + "safe_arith", ] [[package]] @@ -5073,15 +3992,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "prometheus", -] - -[[package]] -name = "metrics" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "prometheus", ] @@ -5099,7 +4010,7 @@ dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", "itertools 0.13.0", - "parking_lot 0.12.3", + "parking_lot", "rayon", "serde", "smallvec", @@ -5115,16 +4026,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -5299,12 +4200,12 @@ version = "0.1.0" dependencies = [ "async-channel", "dirs 5.0.1", - "discv5 0.9.0", + "discv5", "futures", "libp2p", - "lighthouse_network 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "lighthouse_network", "serde", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tokio", "tracing", "version", @@ -5325,22 +4226,10 @@ dependencies = [ name = "nix" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "cfg-if", - "cfg_aliases", "libc", ] @@ -5468,45 +4357,12 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "oneshot_broadcast" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "parking_lot 0.12.3", -] - [[package]] name = "opaque-debug" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "open-fastrlp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", - "ethereum-types 0.14.1", - "open-fastrlp-derive", -] - -[[package]] -name = "open-fastrlp-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" -dependencies = [ - "bytes", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "openssl" version = "0.10.68" @@ -5561,26 +4417,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "operation_pool" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bitvec 1.0.1", - "derivative", - "ethereum_ssz", - "ethereum_ssz_derive", - "itertools 0.10.5", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "rand", - "rayon", - "serde", - "state_processing", - "store", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -5599,8 +4435,8 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "primeorder", "sha2 0.10.8", ] @@ -5611,21 +4447,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ - "group 0.13.0", -] - -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", + "group", ] [[package]] @@ -5635,32 +4457,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", - "bitvec 1.0.1", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.12", + "parity-scale-codec-derive", "serde", ] -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "parity-scale-codec-derive" version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -5672,17 +4482,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[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" @@ -5690,21 +4489,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]] @@ -5715,7 +4500,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.8", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -5790,7 +4575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.10", "ucd-trie", ] @@ -5826,24 +4611,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - [[package]] name = "pkcs8" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.9", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -5868,7 +4643,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.42", + "rustix 0.38.43", "tracing", "windows-sys 0.59.0", ] @@ -5914,19 +4689,10 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "pretty_reqwest_error" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" -dependencies = [ - "reqwest", - "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "sensitive_url", ] [[package]] @@ -5935,20 +4701,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", -] - -[[package]] -name = "primitive-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" -dependencies = [ - "fixed-hash 0.7.0", - "impl-codec 0.5.1", - "impl-rlp", - "impl-serde 0.3.2", - "uint 0.9.5", + "elliptic-curve", ] [[package]] @@ -5957,31 +4710,18 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ - "fixed-hash 0.8.0", - "impl-codec 0.6.0", - "impl-rlp", - "impl-serde 0.4.0", - "scale-info", + "fixed-hash", + "impl-codec", "uint 0.9.5", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit", ] [[package]] @@ -5999,11 +4739,11 @@ version = "0.1.0" dependencies = [ "async-channel", "futures", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "metrics", "num_cpus", "qbft", "serde", - "task_executor 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "task_executor", "tokio", "tracing", ] @@ -6033,7 +4773,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.3", + "parking_lot", "protobuf", "thiserror 1.0.69", ] @@ -6046,7 +4786,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.3", + "parking_lot", "prometheus-client-derive-encode", ] @@ -6095,15 +4835,15 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "safe_arith", "serde", "serde_yaml", "superstruct", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "types", ] [[package]] @@ -6181,10 +4921,10 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.0", + "rustc-hash", "rustls 0.23.20", - "socket2 0.5.8", - "thiserror 2.0.9", + "socket2", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -6199,11 +4939,11 @@ dependencies = [ "getrandom", "rand", "ring 0.17.8", - "rustc-hash 2.1.0", + "rustc-hash", "rustls 0.23.20", "rustls-pki-types", "slab", - "thiserror 2.0.9", + "thiserror 2.0.10", "tinyvec", "tracing", "web-time", @@ -6218,7 +4958,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.8", + "socket2", "tracing", "windows-sys 0.59.0", ] @@ -6239,7 +4979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.3", + "parking_lot", "scheduled-thread-pool", ] @@ -6253,12 +4993,6 @@ dependencies = [ "rusqlite", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -6337,15 +5071,6 @@ dependencies = [ "yasna", ] -[[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.8" @@ -6436,7 +5161,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -6444,7 +5169,7 @@ dependencies = [ "system-configuration 0.5.1", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -6457,24 +5182,29 @@ dependencies = [ ] [[package]] -name = "resolv-conf" -version = "0.7.0" +name = "reqwest-eventsource" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" dependencies = [ - "hostname", - "quick-error", + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest", + "thiserror 1.0.69", ] [[package]] -name = "rfc6979" -version = "0.3.1" +name = "resolv-conf" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "crypto-bigint 0.4.9", - "hmac 0.12.1", - "zeroize", + "hostname", + "quick-error", ] [[package]] @@ -6533,27 +5263,6 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "rlp-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "rpds" version = "0.11.0" @@ -6597,8 +5306,8 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "parity-scale-codec 3.6.12", - "primitive-types 0.12.2", + "parity-scale-codec", + "primitive-types", "proptest", "rand", "rlp", @@ -6648,12 +5357,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.0" @@ -6709,14 +5412,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys 0.4.15", "windows-sys 0.59.0", ] @@ -6732,20 +5435,6 @@ dependencies = [ "sct", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.20" @@ -6769,15 +5458,6 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.10.1" @@ -6846,12 +5526,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" - -[[package]] -name = "safe_arith" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" [[package]] name = "salsa20" @@ -6862,30 +5537,6 @@ dependencies = [ "cipher 0.3.0", ] -[[package]] -name = "scale-info" -version = "2.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" -dependencies = [ - "cfg-if", - "derive_more 1.0.0", - "parity-scale-codec 3.6.12", - "scale-info-derive", -] - -[[package]] -name = "scale-info-derive" -version = "2.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.95", -] - [[package]] name = "schannel" version = "0.1.27" @@ -6901,15 +5552,9 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.3", + "parking_lot", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -6938,30 +5583,16 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.9", + "base16ct", + "der", "generic-array", - "pkcs8 0.10.2", + "pkcs8", "subtle", "zeroize", ] @@ -6981,9 +5612,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -7016,16 +5647,7 @@ dependencies = [ [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "serde", - "url", -] - -[[package]] -name = "sensitive_url" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "serde", "url", @@ -7040,16 +5662,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_array_query" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89c6e82b1005b33d5b2bbc47096800e5ad6b67ef5636f9c13ad29a6935734a7" -dependencies = [ - "serde", - "serde_urlencoded", -] - [[package]] name = "serde_derive" version = "1.0.217" @@ -7063,9 +5675,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -7154,18 +5766,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -7203,21 +5803,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ - "digest 0.10.7", - "rand_core", + "libc", ] [[package]] @@ -7230,18 +5820,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 1.0.69", - "time", -] - [[package]] name = "slab" version = "0.4.9" @@ -7251,36 +5829,10 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slasher" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bincode", - "byteorder", - "derivative", - "ethereum_ssz", - "ethereum_ssz_derive", - "filesystem", - "flate2", - "lru", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "rand", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "slog", - "ssz_types", - "strum", - "tree_hash", - "tree_hash_derive", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7291,7 +5843,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "types", ] [[package]] @@ -7399,11 +5951,11 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "metrics", + "parking_lot", + "types", ] [[package]] @@ -7438,16 +5990,6 @@ dependencies = [ "subtle", ] -[[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.8" @@ -7470,16 +6012,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - [[package]] name = "spki" version = "0.7.3" @@ -7487,7 +6019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.9", + "der", ] [[package]] @@ -7498,7 +6030,7 @@ dependencies = [ "derive_more 1.0.0", "openssl", "rusqlite", - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "types", ] [[package]] @@ -7525,61 +6057,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state_processing" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "arbitrary", - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "derivative", - "ethereum_hashing", - "ethereum_ssz", - "ethereum_ssz_derive", - "int_to_bytes 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "integer-sqrt", - "itertools 0.10.5", - "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "rand", - "rayon", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "smallvec", - "ssz_types", - "test_random_derive 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tree_hash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "store" -version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "db-key", - "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_ssz", - "ethereum_ssz_derive", - "itertools 0.10.5", - "leveldb", - "lru", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "slog", - "sloggers", - "state_processing", - "strum", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "strsim" version = "0.10.0" @@ -7637,21 +6120,11 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "ethereum_hashing", - "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - -[[package]] -name = "swap_or_not_shuffle" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "ethereum_hashing", - "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "fixed_bytes", ] [[package]] @@ -7762,26 +6235,12 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "async-channel", - "futures", - "logging 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "slog", - "sloggers", - "tokio", -] - -[[package]] -name = "task_executor" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "async-channel", "futures", - "logging 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "logging", + "metrics", "slog", "sloggers", "tokio", @@ -7798,7 +6257,7 @@ dependencies = [ "fastrand", "getrandom", "once_cell", - "rustix 0.38.42", + "rustix 0.38.43", "windows-sys 0.59.0", ] @@ -7819,23 +6278,14 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ - "rustix 0.38.42", + "rustix 0.38.43", "windows-sys 0.59.0", ] [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "test_random_derive" -version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "quote", "syn 1.0.109", @@ -7852,11 +6302,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -7872,9 +6322,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", @@ -7931,25 +6381,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand", - "rustc-hash 1.1.0", - "sha2 0.10.8", - "thiserror 1.0.69", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -7986,9 +6417,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -7996,7 +6427,7 @@ dependencies = [ "mio", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.8", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] @@ -8013,9 +6444,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -8042,29 +6473,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - [[package]] name = "tokio-util" version = "0.7.13" @@ -8086,17 +6494,6 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.22" @@ -8105,7 +6502,7 @@ checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.6.22", + "winnow", ] [[package]] @@ -8266,16 +6663,6 @@ dependencies = [ "syn 2.0.95", ] -[[package]] -name = "triehash" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c" -dependencies = [ - "hash-db", - "rlp", -] - [[package]] name = "triomphe" version = "0.1.14" @@ -8301,87 +6688,38 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "arbitrary", - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "compare_fields 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "compare_fields_derive 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "derivative", - "eth2_interop_keypairs 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", - "ethereum_ssz_derive", - "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "hex", - "int_to_bytes 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "itertools 0.10.5", - "kzg 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "log", - "maplit", - "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "metastruct", - "milhouse", - "parking_lot 0.12.3", - "rand", - "rand_xorshift", - "rayon", - "regex", - "rpds", - "rusqlite", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "serde_json", - "serde_yaml", - "slog", - "smallvec", - "ssz_types", - "superstruct", - "swap_or_not_shuffle 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tempfile", - "test_random_derive 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tree_hash", - "tree_hash_derive", -] - -[[package]] -name = "types" -version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", - "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "compare_fields 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "compare_fields_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "bls", + "compare_fields", + "compare_fields_derive", "derivative", - "eth2_interop_keypairs 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "eth2_interop_keypairs", "ethereum_hashing", "ethereum_serde_utils", "ethereum_ssz", "ethereum_ssz_derive", - "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "fixed_bytes", "hex", - "int_to_bytes 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "int_to_bytes", "itertools 0.10.5", - "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "kzg", "log", "maplit", - "merkle_proof 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "merkle_proof", "metastruct", "milhouse", - "parking_lot 0.12.3", + "parking_lot", "rand", "rand_xorshift", "rayon", "regex", "rpds", "rusqlite", - "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "safe_arith", "serde", "serde_json", "serde_yaml", @@ -8389,9 +6727,9 @@ dependencies = [ "smallvec", "ssz_types", "superstruct", - "swap_or_not_shuffle 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "swap_or_not_shuffle", "tempfile", - "test_random_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", + "test_random_derive", "tree_hash", "tree_hash_derive", ] @@ -8438,12 +6776,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - [[package]] name = "unicode-ident" version = "1.0.14" @@ -8519,19 +6851,10 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "lru_cache 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "parking_lot 0.12.3", -] - -[[package]] -name = "unused_port" -version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#f51a292f77575a1786af34271fb44954f141c377" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "lru_cache 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "parking_lot 0.12.3", + "lru_cache", + "parking_lot", ] [[package]] @@ -8573,30 +6896,12 @@ dependencies = [ "serde", ] -[[package]] -name = "validator_dir" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "deposit_contract", - "derivative", - "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "eth2_keystore", - "filesystem", - "hex", - "lockfile", - "rand", - "tree_hash", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", -] - [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" +source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", + "metrics", ] [[package]] @@ -8656,55 +6961,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "warp" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http 0.2.12", - "hyper 0.14.32", - "log", - "mime", - "mime_guess", - "percent-encoding", - "pin-project", - "rustls-pemfile 2.2.0", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls 0.25.0", - "tokio-util", - "tower-service", - "tracing", -] - -[[package]] -name = "warp_utils" -version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" -dependencies = [ - "beacon_chain", - "bytes", - "eth2", - "headers", - "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "serde", - "serde_array_query", - "serde_json", - "state_processing", - "tokio", - "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "warp", -] - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -9115,15 +7371,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.22" @@ -9155,12 +7402,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.1" @@ -9201,9 +7442,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" +checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4" [[package]] name = "xmltree" @@ -9223,7 +7464,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "static_assertions", @@ -9238,7 +7479,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "static_assertions", diff --git a/Cargo.toml b/Cargo.toml index a099c6c7..564a25df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = [ "anchor/common/qbft", "anchor/common/ssv_types", "anchor/common/version", - "anchor/common/version", "anchor/database", "anchor/http_api", "anchor/http_metrics", @@ -19,37 +18,37 @@ resolver = "2" edition = "2021" [workspace.dependencies] -client = { path = "anchor/client" } -qbft = { path = "anchor/common/qbft" } -http_api = { path = "anchor/http_api" } -http_metrics = { path = "anchor/http_metrics" } -database = { path = "anchor/database" } -network = { path = "anchor/network" } -version = { path = "anchor/common/version" } -processor = { path = "anchor/processor" } -ssv_types = { path = "anchor/common/ssv_types" } -lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "unstable" } -task_executor = { git = "https://github.com/sigp/lighthouse", branch = "unstable", default-features = false, features = [ "tracing", ] } -metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } -validator_metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } -sensitive_url = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } -slot_clock = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } -unused_port = { git = "https://github.com/sigp/lighthouse", branch = "unstable" } -types = { git = "https://github.com/sigp/lighthouse", branch = "unstable" } -derive_more = { version = "1.0.0", features = ["full"] } async-channel = "1.9" axum = "0.7.7" +base64 = "0.22.1" clap = { version = "4.5.15", features = ["derive", "wrap_help"] } -discv5 = "0.9.0" +client = { path = "anchor/client" } +dashmap = "6.1.0" +database = { path = "anchor/database" } +derive_more = { version = "1.0.0", features = ["full"] } dirs = "5.0.1" +discv5 = "0.9.0" either = "1.13.0" futures = "0.3.30" -tower-http = { version = "0.6", features = ["cors"] } +health_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +http_api = { path = "anchor/http_api" } +http_metrics = { path = "anchor/http_metrics" } hyper = "1.4" +lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +network = { path = "anchor/network" } num_cpus = "1" +openssl = "0.10.68" parking_lot = "0.12" +processor = { path = "anchor/processor" } +qbft = { path = "anchor/common/qbft" } +rusqlite = "0.28.0" +sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } serde = { version = "1.0.208", features = ["derive"] } +slot_clock = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +ssv_types = { path = "anchor/common/ssv_types" } strum = { version = "0.24", features = ["derive"] } +task_executor = { git = "https://github.com/sigp/lighthouse", branch = "anchor", default-features = false, features = [ "tracing", ] } tokio = { version = "1.39.2", features = [ "rt", "rt-multi-thread", @@ -57,12 +56,13 @@ tokio = { version = "1.39.2", features = [ "signal", "macros", ] } +tower-http = { version = "0.6", features = ["cors"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } -base64 = "0.22.1" -rusqlite = "0.28.0" -openssl = "0.10.68" -dashmap = "6.1.0" +types = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +unused_port = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +validator_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" } +version = { path = "anchor/common/version" } [profile.maxperf] inherits = "release" diff --git a/anchor/http_metrics/Cargo.toml b/anchor/http_metrics/Cargo.toml index fbf931ce..d1c84af5 100644 --- a/anchor/http_metrics/Cargo.toml +++ b/anchor/http_metrics/Cargo.toml @@ -5,6 +5,7 @@ edition = "2021" [dependencies] axum = { workspace = true } +health_metrics = { workspace = true } metrics = { workspace = true } parking_lot = { workspace = true } serde = { workspace = true } @@ -12,5 +13,3 @@ tokio = { workspace = true } tower-http = { workspace = true } tracing = { workspace = true } validator_metrics = { workspace = true } -# Group dependencies -warp_utils = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } diff --git a/anchor/http_metrics/src/lib.rs b/anchor/http_metrics/src/lib.rs index 2a2cde84..d8a4d40e 100644 --- a/anchor/http_metrics/src/lib.rs +++ b/anchor/http_metrics/src/lib.rs @@ -106,7 +106,7 @@ async fn metrics_handler(State(state): State>>) -> Response