From eec3b67f1be3d09f1d244993d4acb272dc394464 Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 6 May 2025 11:27:37 +0200 Subject: [PATCH 1/8] Update Lighthouse - CK's dvt changes - Remove `sign_validator_exit` from trait --- Cargo.lock | 82 +++++++++++++++---------------- Cargo.toml | 36 +++++++------- anchor/client/src/lib.rs | 16 +++++- anchor/validator_store/src/lib.rs | 11 ----- 4 files changed, 74 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6018b3efe..6f7fdd7fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1427,7 +1427,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "beacon_node_fallback" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "clap", "eth2", @@ -1531,7 +1531,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "arbitrary", @@ -1834,7 +1834,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "clap", @@ -1905,7 +1905,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "itertools 0.10.5", ] @@ -1913,7 +1913,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "quote", "syn 1.0.109", @@ -2513,7 +2513,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "clap", "clap_utils", @@ -2819,7 +2819,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "derivative", "either", @@ -2835,6 +2835,7 @@ dependencies = [ "multiaddr", "pretty_reqwest_error", "proto_array", + "rand 0.8.5", "reqwest 0.11.27", "reqwest-eventsource", "sensitive_url", @@ -2842,6 +2843,7 @@ dependencies = [ "serde_json", "slashing_protection", "ssz_types", + "test_random_derive", "types", "zeroize", ] @@ -2849,7 +2851,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "paste", "types", @@ -2858,7 +2860,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "bls", "ethereum_hashing", @@ -2871,7 +2873,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "bls", "num-bigint-dig", @@ -2883,7 +2885,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "aes 0.7.5", "bls", @@ -2905,7 +2907,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "bytes", "discv5", @@ -3092,7 +3094,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "winapi", "windows-acl", @@ -3113,7 +3115,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "safe_arith", @@ -3425,7 +3427,7 @@ dependencies = [ [[package]] name = "graffiti_file" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "bls", "serde", @@ -3542,7 +3544,7 @@ dependencies = [ [[package]] name = "health_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "eth2", "metrics", @@ -4219,7 +4221,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "bytes", ] @@ -4402,7 +4404,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "arbitrary", "c-kzg", @@ -4962,7 +4964,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5014,7 +5016,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "git-version", "target_info", @@ -5096,13 +5098,11 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "chrono", "logroller", "metrics", - "once_cell", - "parking_lot", "serde", "serde_json", "tokio", @@ -5160,7 +5160,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "fnv", ] @@ -5230,7 +5230,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -5323,7 +5323,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "prometheus", ] @@ -6214,7 +6214,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "reqwest 0.11.27", "sensitive_url", @@ -6381,7 +6381,7 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -7185,7 +7185,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" [[package]] name = "salsa20" @@ -7343,7 +7343,7 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "serde", "url", @@ -7584,7 +7584,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7602,7 +7602,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "metrics", "parking_lot", @@ -7850,7 +7850,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7980,7 +7980,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "async-channel 1.9.0", "futures", @@ -8015,7 +8015,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "quote", "syn 1.0.109", @@ -8483,7 +8483,7 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8639,7 +8639,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "lru_cache", "parking_lot", @@ -8702,7 +8702,7 @@ dependencies = [ [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "metrics", ] @@ -8710,7 +8710,7 @@ dependencies = [ [[package]] name = "validator_services" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "beacon_node_fallback", "bls", @@ -8734,7 +8734,7 @@ dependencies = [ [[package]] name = "validator_store" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "slashing_protection", "types", @@ -9491,7 +9491,7 @@ dependencies = [ [[package]] name = "workspace_members" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8" +source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" dependencies = [ "cargo_metadata", "quote", diff --git a/Cargo.toml b/Cargo.toml index 5dd488ea3..a777d64cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,24 +57,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 = "f1056d9c" } -bls = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -eth2 = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -task_executor = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -types = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -unused_port = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -validator_services = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -validator_store = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } -workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" } +beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +bls = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +eth2 = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +task_executor = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +types = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +unused_port = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +validator_services = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +validator_store = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } alloy = { version = "0.12.0", features = [ "sol-types", diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs index fcd766bae..acafc2e69 100644 --- a/anchor/client/src/lib.rs +++ b/anchor/client/src/lib.rs @@ -54,6 +54,7 @@ use validator_services::{ duties_service, duties_service::DutiesServiceBuilder, preparation_service::PreparationServiceBuilder, sync_committee_service::SyncCommitteeService, }; +use validator_services::duties_service::SelectionProofConfig; use zeroize::Zeroizing; /// The filename within the `validators` directory that contains the slashing protection DB. @@ -231,12 +232,14 @@ impl Client { attester_duties: slot_duration / HTTP_ATTESTER_DUTIES_TIMEOUT_QUOTIENT, attestation_subscriptions: slot_duration / HTTP_ATTESTATION_SUBSCRIPTIONS_TIMEOUT_QUOTIENT, + attestation_aggregators: slot_duration / HTTP_ATTESTATION_TIMEOUT_QUOTIENT, liveness: slot_duration / HTTP_LIVENESS_TIMEOUT_QUOTIENT, proposal: slot_duration / HTTP_PROPOSAL_TIMEOUT_QUOTIENT, proposer_duties: slot_duration / HTTP_PROPOSER_DUTIES_TIMEOUT_QUOTIENT, sync_committee_contribution: slot_duration / HTTP_SYNC_COMMITTEE_CONTRIBUTION_TIMEOUT_QUOTIENT, sync_duties: slot_duration / HTTP_SYNC_DUTIES_TIMEOUT_QUOTIENT, + sync_aggregators: slot_duration / HTTP_SYNC_DUTIES_TIMEOUT_QUOTIENT, get_beacon_blocks_ssz: slot_duration / HTTP_GET_BEACON_BLOCK_SSZ_TIMEOUT_QUOTIENT, get_debug_beacon_states: slot_duration / HTTP_GET_DEBUG_BEACON_STATE_QUOTIENT, @@ -486,7 +489,18 @@ impl Client { .spec(spec.clone()) .executor(executor.clone()) //.enable_high_validator_count_metrics(config.enable_high_validator_count_metrics) - .distributed(true) + .attestation_selection_proof_config(SelectionProofConfig { + lookahead_slot: 0, + computation_offset: Duration::ZERO, + selections_endpoint: false, + parallel_sign: true, + }) + .sync_selection_proof_config(SelectionProofConfig { + lookahead_slot: 0, + computation_offset: Duration::ZERO, + selections_endpoint: false, + parallel_sign: true, + }) .build()?, ); diff --git a/anchor/validator_store/src/lib.rs b/anchor/validator_store/src/lib.rs index c921f578d..2a962d19d 100644 --- a/anchor/validator_store/src/lib.rs +++ b/anchor/validator_store/src/lib.rs @@ -55,7 +55,6 @@ use types::{ signed_aggregate_and_proof::SignedAggregateAndProof, signed_beacon_block::SignedBeaconBlock, signed_contribution_and_proof::SignedContributionAndProof, - signed_voluntary_exit::SignedVoluntaryExit, slot_data::SlotData, slot_epoch::{Epoch, Slot}, sync_committee_contribution::SyncCommitteeContribution, @@ -64,7 +63,6 @@ use types::{ sync_subnet_id::SyncSubnetId, typenum::U13, validator_registration_data::{SignedValidatorRegistrationData, ValidatorRegistrationData}, - voluntary_exit::VoluntaryExit, AbstractExecPayload, Address, AggregateAndProof, ChainSpec, ContributionAndProof, Domain, EthSpec, Hash256, PublicKeyBytes, SecretKey, Signature, SignedRoot, SyncAggregatorSelectionData, VariableList, @@ -890,15 +888,6 @@ impl ValidatorStore for AnchorValidatorStore { Ok(()) } - async fn sign_voluntary_exit( - &self, - _validator_pubkey: PublicKeyBytes, - _voluntary_exit: VoluntaryExit, - ) -> Result { - // there should be no situation ever where we want to sign an exit - Err(Error::SpecificError(SpecificError::Unsupported)) - } - async fn sign_validator_registration_data( &self, mut validator_registration_data: ValidatorRegistrationData, From 79e9639e286a155290691a780441c9983c6778c3 Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 6 May 2025 11:39:15 +0200 Subject: [PATCH 2/8] fmt --- anchor/client/src/lib.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs index acafc2e69..52ec1125d 100644 --- a/anchor/client/src/lib.rs +++ b/anchor/client/src/lib.rs @@ -50,11 +50,13 @@ use tracing::{debug, error, info, warn}; use types::{ChainSpec, EthSpec, Hash256}; use validator_metrics::set_gauge; use validator_services::{ - attestation_service::AttestationServiceBuilder, block_service::BlockServiceBuilder, - duties_service, duties_service::DutiesServiceBuilder, - preparation_service::PreparationServiceBuilder, sync_committee_service::SyncCommitteeService, + attestation_service::AttestationServiceBuilder, + block_service::BlockServiceBuilder, + duties_service, + duties_service::{DutiesServiceBuilder, SelectionProofConfig}, + preparation_service::PreparationServiceBuilder, + sync_committee_service::SyncCommitteeService, }; -use validator_services::duties_service::SelectionProofConfig; use zeroize::Zeroizing; /// The filename within the `validators` directory that contains the slashing protection DB. From eecf0342d2ab47ce6eeef0dbfa1ebf8fe9aefbcf Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 11:13:34 +0200 Subject: [PATCH 3/8] Update LH again --- Cargo.lock | 118 ++++++++++++++++++++++++--------------- Cargo.toml | 36 ++++++------ anchor/client/src/lib.rs | 2 + 3 files changed, 94 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af33e0c11..f0aebd71e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -1427,7 +1427,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "beacon_node_fallback" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "clap", "eth2", @@ -1531,7 +1531,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "arbitrary", @@ -1834,7 +1834,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "clap", @@ -1905,7 +1905,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "itertools 0.10.5", ] @@ -1913,7 +1913,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "quote", "syn 1.0.109", @@ -2513,7 +2513,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "clap", "clap_utils", @@ -2819,7 +2819,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "derivative", "either", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "paste", "types", @@ -2860,7 +2860,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "bls", "ethereum_hashing", @@ -2873,7 +2873,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "bls", "num-bigint-dig", @@ -2885,7 +2885,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "aes 0.7.5", "bls", @@ -2907,7 +2907,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "bytes", "discv5", @@ -3094,7 +3094,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "winapi", "windows-acl", @@ -3115,7 +3115,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "safe_arith", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "graffiti_file" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "bls", "serde", @@ -3544,7 +3544,7 @@ dependencies = [ [[package]] name = "health_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "eth2", "metrics", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "bytes", ] @@ -4404,7 +4404,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "arbitrary", "c-kzg", @@ -4539,6 +4539,36 @@ dependencies = [ "tracing", ] +[[package]] +name = "libp2p-gossipsub" +version = "0.49.0" +source = "git+https://github.com/sigp/rust-libp2p.git?rev=61b2820#61b2820de7a3fab5ae5e1362c4dfa93bd7c41e98" +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-gossipsub" version = "0.49.0" @@ -4964,7 +4994,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4982,7 +5012,7 @@ dependencies = [ "hex", "itertools 0.10.5", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820)", "libp2p-mplex", "lighthouse_version", "local-ip-address", @@ -5016,7 +5046,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "git-version", "target_info", @@ -5098,7 +5128,7 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "chrono", "logroller", @@ -5160,7 +5190,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "fnv", ] @@ -5230,7 +5260,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -5244,7 +5274,7 @@ version = "0.1.0" dependencies = [ "database", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", "message_validator", "processor", "qbft_manager", @@ -5282,7 +5312,7 @@ dependencies = [ "eth2", "ethereum_ssz", "hex", - "libp2p-gossipsub", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", "openssl", "parking_lot", "processor", @@ -5323,7 +5353,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "prometheus", ] @@ -5593,7 +5623,7 @@ dependencies = [ "futures", "hex", "libp2p", - "libp2p-gossipsub", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", "libp2p-peer-store", "libp2p-swarm-test", "lighthouse_network", @@ -6214,7 +6244,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "reqwest 0.11.27", "sensitive_url", @@ -6381,7 +6411,7 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -7184,7 +7214,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" [[package]] name = "salsa20" @@ -7342,7 +7372,7 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "serde", "url", @@ -7583,7 +7613,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7601,7 +7631,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "metrics", "parking_lot", @@ -7849,7 +7879,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7979,7 +8009,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "async-channel 1.9.0", "futures", @@ -8014,7 +8044,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "quote", "syn 1.0.109", @@ -8482,7 +8512,7 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8638,7 +8668,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "lru_cache", "parking_lot", @@ -8701,7 +8731,7 @@ dependencies = [ [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "metrics", ] @@ -8709,7 +8739,7 @@ dependencies = [ [[package]] name = "validator_services" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "beacon_node_fallback", "bls", @@ -8733,7 +8763,7 @@ dependencies = [ [[package]] name = "validator_store" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "slashing_protection", "types", @@ -9490,7 +9520,7 @@ dependencies = [ [[package]] name = "workspace_members" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=f4188707#f418870747c954ec2904a26b6d06629643d8fdbf" +source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" dependencies = [ "cargo_metadata", "quote", diff --git a/Cargo.toml b/Cargo.toml index 930394a15..635c2b6b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,24 +57,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 = "f4188707" } -bls = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -eth2 = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -task_executor = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -types = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -unused_port = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -validator_services = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -validator_store = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } -workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "f4188707" } +beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +bls = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +eth2 = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +task_executor = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +types = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +unused_port = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +validator_services = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +validator_store = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } alloy = { version = "0.12.0", features = [ "sol-types", diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs index a03376bb3..8fd15edd1 100644 --- a/anchor/client/src/lib.rs +++ b/anchor/client/src/lib.rs @@ -79,6 +79,7 @@ const HTTP_GET_BEACON_BLOCK_SSZ_TIMEOUT_QUOTIENT: u32 = 4; const HTTP_GET_DEBUG_BEACON_STATE_QUOTIENT: u32 = 4; const HTTP_GET_DEPOSIT_SNAPSHOT_QUOTIENT: u32 = 4; const HTTP_GET_VALIDATOR_BLOCK_TIMEOUT_QUOTIENT: u32 = 4; +const HTTP_DEFAULT_TIMEOUT_QUOTIENT: u32 = 4; pub struct Client {} @@ -247,6 +248,7 @@ impl Client { get_debug_beacon_states: slot_duration / HTTP_GET_DEBUG_BEACON_STATE_QUOTIENT, get_deposit_snapshot: slot_duration / HTTP_GET_DEPOSIT_SNAPSHOT_QUOTIENT, get_validator_block: slot_duration / HTTP_GET_VALIDATOR_BLOCK_TIMEOUT_QUOTIENT, + default: slot_duration / HTTP_DEFAULT_TIMEOUT_QUOTIENT, } } else { Timeouts::set_all(slot_duration) From 22865fdedf45134b969b4632841a46a4d999224c Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 11:34:31 +0200 Subject: [PATCH 4/8] update gossipsub --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0aebd71e..3ea5e1f52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4572,7 +4572,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.49.0" -source = "git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c#7a36e4cde83041f1bd5f2078c4d3934ccb16777e" +source = "git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d#61b2820de7a3fab5ae5e1362c4dfa93bd7c41e98" dependencies = [ "async-channel 2.3.1", "asynchronous-codec", @@ -5274,7 +5274,7 @@ version = "0.1.0" dependencies = [ "database", "libp2p", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", "message_validator", "processor", "qbft_manager", @@ -5312,7 +5312,7 @@ dependencies = [ "eth2", "ethereum_ssz", "hex", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", "openssl", "parking_lot", "processor", @@ -5623,7 +5623,7 @@ dependencies = [ "futures", "hex", "libp2p", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c)", + "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", "libp2p-peer-store", "libp2p-swarm-test", "lighthouse_network", diff --git a/Cargo.toml b/Cargo.toml index 635c2b6b7..9150848a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ enr = "0.13.0" ethereum_ssz = "0.8" ethereum_ssz_derive = "0.8" futures = "0.3.30" -gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "7a36e4c" } +gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "61b2820d" } hex = "0.4.3" hyper = "1.4" indexmap = "2.7.0" From 3408589bfab8de7dad9482663ece30a5b44e5773 Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 15:54:21 +0200 Subject: [PATCH 5/8] update to recent `anchor` branch version --- Cargo.lock | 78 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 36 ++++++++++++------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ea5e1f52..a55200f86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1427,7 +1427,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "beacon_node_fallback" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "clap", "eth2", @@ -1531,7 +1531,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "arbitrary", @@ -1834,7 +1834,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "clap", @@ -1905,7 +1905,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "itertools 0.10.5", ] @@ -1913,7 +1913,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "quote", "syn 1.0.109", @@ -2513,7 +2513,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "clap", "clap_utils", @@ -2819,7 +2819,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "derivative", "either", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "paste", "types", @@ -2860,7 +2860,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "bls", "ethereum_hashing", @@ -2873,7 +2873,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "bls", "num-bigint-dig", @@ -2885,7 +2885,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "aes 0.7.5", "bls", @@ -2907,7 +2907,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "bytes", "discv5", @@ -3094,7 +3094,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "winapi", "windows-acl", @@ -3115,7 +3115,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "safe_arith", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "graffiti_file" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "bls", "serde", @@ -3544,7 +3544,7 @@ dependencies = [ [[package]] name = "health_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "eth2", "metrics", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "bytes", ] @@ -4404,7 +4404,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "arbitrary", "c-kzg", @@ -4994,7 +4994,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5046,7 +5046,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "git-version", "target_info", @@ -5128,7 +5128,7 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "chrono", "logroller", @@ -5190,7 +5190,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "fnv", ] @@ -5260,7 +5260,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -5353,7 +5353,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "prometheus", ] @@ -6244,7 +6244,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "reqwest 0.11.27", "sensitive_url", @@ -6411,7 +6411,7 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -7214,7 +7214,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" [[package]] name = "salsa20" @@ -7372,7 +7372,7 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "serde", "url", @@ -7613,7 +7613,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7631,7 +7631,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "metrics", "parking_lot", @@ -7879,7 +7879,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -8009,7 +8009,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "async-channel 1.9.0", "futures", @@ -8044,7 +8044,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "quote", "syn 1.0.109", @@ -8512,7 +8512,7 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8668,7 +8668,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "lru_cache", "parking_lot", @@ -8731,7 +8731,7 @@ dependencies = [ [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "metrics", ] @@ -8739,7 +8739,7 @@ dependencies = [ [[package]] name = "validator_services" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "beacon_node_fallback", "bls", @@ -8763,7 +8763,7 @@ dependencies = [ [[package]] name = "validator_store" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "slashing_protection", "types", @@ -9520,7 +9520,7 @@ dependencies = [ [[package]] name = "workspace_members" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?rev=86a106b94#86a106b943390dd03d5b8386e26809ea919223fa" +source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7" dependencies = [ "cargo_metadata", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9150848a9..72bf8087d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,24 +57,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 = "86a106b94" } -bls = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -eth2 = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -task_executor = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -types = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -unused_port = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -validator_services = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -validator_store = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } -workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "86a106b94" } +beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +bls = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +eth2 = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +task_executor = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +types = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +unused_port = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +validator_services = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +validator_store = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } +workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" } alloy = { version = "0.12.0", features = [ "sol-types", From 4d357d0b40e77f451c3b5e8a949e135c1fa9f50d Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 15:59:44 +0200 Subject: [PATCH 6/8] fix gossipsub version --- Cargo.lock | 38 ++++---------------------------------- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a55200f86..0160ae008 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4569,36 +4569,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "libp2p-gossipsub" -version = "0.49.0" -source = "git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d#61b2820de7a3fab5ae5e1362c4dfa93bd7c41e98" -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" @@ -5012,7 +4982,7 @@ dependencies = [ "hex", "itertools 0.10.5", "libp2p", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820)", + "libp2p-gossipsub", "libp2p-mplex", "lighthouse_version", "local-ip-address", @@ -5274,7 +5244,7 @@ version = "0.1.0" dependencies = [ "database", "libp2p", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", + "libp2p-gossipsub", "message_validator", "processor", "qbft_manager", @@ -5312,7 +5282,7 @@ dependencies = [ "eth2", "ethereum_ssz", "hex", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", + "libp2p-gossipsub", "openssl", "parking_lot", "processor", @@ -5623,7 +5593,7 @@ dependencies = [ "futures", "hex", "libp2p", - "libp2p-gossipsub 0.49.0 (git+https://github.com/sigp/rust-libp2p.git?rev=61b2820d)", + "libp2p-gossipsub", "libp2p-peer-store", "libp2p-swarm-test", "lighthouse_network", diff --git a/Cargo.toml b/Cargo.toml index 72bf8087d..e152e918b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ enr = "0.13.0" ethereum_ssz = "0.8" ethereum_ssz_derive = "0.8" futures = "0.3.30" -gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "61b2820d" } +gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "61b2820" } hex = "0.4.3" hyper = "1.4" indexmap = "2.7.0" From a81b4ad83d63eaa833749d51ec960ed63cb13b66 Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 16:13:53 +0200 Subject: [PATCH 7/8] remove duplication of Selection Proof Config --- anchor/client/src/lib.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs index 258e4f839..ba635ddf1 100644 --- a/anchor/client/src/lib.rs +++ b/anchor/client/src/lib.rs @@ -484,6 +484,13 @@ impl Client { config.builder_boost_factor, config.prefer_builder_proposals, ); + + let selection_proof_config = SelectionProofConfig { + lookahead_slot: 0, + computation_offset: Duration::ZERO, + selections_endpoint: false, + parallel_sign: true, + }; let duties_service = Arc::new( DutiesServiceBuilder::new() @@ -493,18 +500,8 @@ impl Client { .spec(spec.clone()) .executor(executor.clone()) .enable_high_validator_count_metrics(config.enable_high_validator_count_metrics) - .attestation_selection_proof_config(SelectionProofConfig { - lookahead_slot: 0, - computation_offset: Duration::ZERO, - selections_endpoint: false, - parallel_sign: true, - }) - .sync_selection_proof_config(SelectionProofConfig { - lookahead_slot: 0, - computation_offset: Duration::ZERO, - selections_endpoint: false, - parallel_sign: true, - }) + .attestation_selection_proof_config(selection_proof_config) + .sync_selection_proof_config(selection_proof_config) .build()?, ); From 0256c7b5d926efb8199c6b3b7aea3cfca1f2d425 Mon Sep 17 00:00:00 2001 From: Daniel Knopik Date: Tue, 13 May 2025 16:16:20 +0200 Subject: [PATCH 8/8] fmt :D --- anchor/client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs index ba635ddf1..df07ce455 100644 --- a/anchor/client/src/lib.rs +++ b/anchor/client/src/lib.rs @@ -484,7 +484,7 @@ impl Client { config.builder_boost_factor, config.prefer_builder_proposals, ); - + let selection_proof_config = SelectionProofConfig { lookahead_slot: 0, computation_offset: Duration::ZERO,