diff --git a/Cargo.lock b/Cargo.lock index 210dfb828..3c8c27b79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1430,7 +1430,7 @@ checksum = "bb97d56060ee67d285efb8001fec9d2a4c710c32efd2e14b5cbb5ba71930fc2d" [[package]] name = "beacon_node_fallback" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "clap", "eth2", @@ -1534,7 +1534,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "arbitrary", @@ -1805,7 +1805,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "clap", @@ -1876,7 +1876,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "itertools 0.10.5", ] @@ -1884,7 +1884,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "quote", "syn 1.0.109", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "clap", "clap_utils", @@ -2787,7 +2787,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "derivative", "either", @@ -2817,7 +2817,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "paste", "types", @@ -2826,7 +2826,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "bls", "ethereum_hashing", @@ -2839,7 +2839,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "bls", "num-bigint-dig", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "aes 0.7.5", "bls", @@ -2873,7 +2873,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "bytes", "discv5", @@ -3060,7 +3060,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "winapi", "windows-acl", @@ -3081,7 +3081,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "safe_arith", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "graffiti_file" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "bls", "serde", @@ -3508,7 +3508,7 @@ dependencies = [ [[package]] name = "health_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "eth2", "metrics", @@ -4176,7 +4176,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "bytes", ] @@ -4359,7 +4359,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "arbitrary", "c-kzg", @@ -4524,6 +4524,36 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-gossipsub" +version = "0.49.0" +source = "git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c#7a36e4cde83041f1bd5f2078c4d3934ccb16777e" +dependencies = [ + "async-channel 2.3.1", + "asynchronous-codec", + "base64 0.22.1", + "byteorder", + "bytes", + "either", + "fnv", + "futures", + "futures-timer", + "getrandom 0.2.15", + "hashlink 0.9.1", + "hex_fmt", + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", + "prometheus-client", + "quick-protobuf", + "quick-protobuf-codec", + "rand 0.8.5", + "regex", + "sha2 0.10.8", + "tracing", + "web-time", +] + [[package]] name = "libp2p-identify" version = "0.46.0" @@ -4919,7 +4949,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4937,7 +4967,7 @@ dependencies = [ "hex", "itertools 0.10.5", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.49.0", "libp2p-mplex", "lighthouse_version", "local-ip-address", @@ -4971,7 +5001,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "git-version", "target_info", @@ -5035,7 +5065,7 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "chrono", "logroller", @@ -5098,7 +5128,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "fnv", ] @@ -5168,7 +5198,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -5182,7 +5212,7 @@ version = "0.1.0" dependencies = [ "database", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.48.1", "message_validator", "processor", "qbft_manager", @@ -5217,7 +5247,7 @@ dependencies = [ "database", "ethereum_ssz", "hex", - "libp2p-gossipsub", + "libp2p-gossipsub 0.48.1", "once_cell", "processor", "sha2 0.10.8", @@ -5255,7 +5285,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "prometheus", ] @@ -5526,7 +5556,7 @@ dependencies = [ "futures", "hex", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.48.1", "libp2p-peer-store", "libp2p-swarm-test", "lighthouse_network", @@ -6146,7 +6176,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "reqwest 0.11.27", "sensitive_url", @@ -6313,7 +6343,7 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -7109,7 +7139,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" [[package]] name = "salsa20" @@ -7264,7 +7294,7 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "serde", "url", @@ -7505,7 +7535,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7523,7 +7553,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "metrics", "parking_lot", @@ -7771,7 +7801,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7901,7 +7931,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "async-channel 1.9.0", "futures", @@ -7937,7 +7967,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "quote", "syn 1.0.109", @@ -8393,7 +8423,7 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8549,7 +8579,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "lru_cache", "parking_lot", @@ -8612,7 +8642,7 @@ dependencies = [ [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "metrics", ] @@ -8620,7 +8650,7 @@ dependencies = [ [[package]] name = "validator_services" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "beacon_node_fallback", "bls", @@ -8644,7 +8674,7 @@ dependencies = [ [[package]] name = "validator_store" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=397eb3e#397eb3eada19f0f30b278aa99edc2a4358c24f66" +source = "git+https://github.com/sigp/lighthouse?rev=22faccb#22faccb4575792ffe815ed02a92ea86f05f9366b" dependencies = [ "slashing_protection", "types", diff --git a/Cargo.toml b/Cargo.toml index 84713eb9a..2d162a452 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,24 +55,24 @@ ssv_types = { path = "anchor/common/ssv_types" } subnet_tracker = { path = "anchor/subnet_tracker" } version = { path = "anchor/common/version" } -beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -bls = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -eth2 = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -eth2_config = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -metrics = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -task_executor = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -types = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -unused_port = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -validator_services = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } -validator_store = { git = "https://github.com/sigp/lighthouse", rev = "397eb3e" } +beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +bls = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +eth2 = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +eth2_config = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +metrics = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +task_executor = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +types = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +unused_port = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +validator_services = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } +validator_store = { git = "https://github.com/sigp/lighthouse", rev = "22faccb" } alloy = { version = "0.12.0", features = [ "sol-types",