From a03b20d20ced31137b8dfdea00ec977c53ac4bb8 Mon Sep 17 00:00:00 2001
From: Daniel Knopik <107140945+dknopik@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:09:57 +0100
Subject: [PATCH] Point to anchor branch again (#89)

---
 Cargo.lock | 506 +++++++----------------------------------------------
 Cargo.toml |  16 +-
 2 files changed, 70 insertions(+), 452 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 056e80c8..d481a601 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,7 +161,7 @@ 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",
  "tokio",
@@ -720,50 +720,10 @@ dependencies = [
  "ethereum_hashing",
  "ethereum_serde_utils",
  "ethereum_ssz",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "fixed_bytes",
  "hex",
  "rand",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "serde",
- "tree_hash",
- "zeroize",
-]
-
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "alloy-primitives",
- "arbitrary",
- "blst",
- "ethereum_hashing",
- "ethereum_serde_utils",
- "ethereum_ssz",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "hex",
- "rand",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "safe_arith",
  "serde",
  "tree_hash",
  "zeroize",
@@ -990,7 +950,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 [[package]]
 name = "clap_utils"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -1001,7 +961,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "types",
 ]
 
 [[package]]
@@ -1018,7 +978,7 @@ dependencies = [
  "network",
  "parking_lot",
  "processor",
- "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "sensitive_url",
  "serde",
  "strum",
  "task_executor",
@@ -1042,22 +1002,6 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "itertools 0.10.5",
-]
-
 [[package]]
 name = "compare_fields_derive"
 version = "0.2.0"
@@ -1067,24 +1011,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1501,7 +1427,7 @@ dependencies = [
  "rusqlite",
  "ssv_types",
  "tempfile",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "types",
 ]
 
 [[package]]
@@ -1628,7 +1554,7 @@ dependencies = [
 [[package]]
 name = "directory"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "clap",
  "clap_utils",
@@ -1893,26 +1819,26 @@ dependencies = [
  "libp2p-identity",
  "mediatype",
  "multiaddr",
- "pretty_reqwest_error 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "pretty_reqwest_error",
  "proto_array",
  "reqwest",
  "reqwest-eventsource",
- "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "sensitive_url",
  "serde",
  "serde_json",
  "slashing_protection",
  "ssz_types",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "types",
  "zeroize",
 ]
 
 [[package]]
 name = "eth2_config"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "paste",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "types",
 ]
 
 [[package]]
@@ -1920,33 +1846,7 @@ name = "eth2_interop_keypairs"
 version = "0.2.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
- "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "ethereum_hashing",
- "hex",
- "num-bigint",
- "serde",
- "serde_yaml",
-]
-
-[[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",
-]
-
-[[package]]
-name = "eth2_interop_keypairs"
-version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "bls",
  "ethereum_hashing",
  "hex",
  "num-bigint",
@@ -1959,7 +1859,7 @@ name = "eth2_key_derivation"
 version = "0.1.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
- "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "bls",
  "num-bigint-dig",
  "ring 0.16.20",
  "sha2 0.9.9",
@@ -1972,7 +1872,7 @@ version = "0.1.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "aes 0.7.5",
- "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "bls",
  "eth2_key_derivation",
  "hex",
  "hmac 0.11.0",
@@ -1991,20 +1891,20 @@ dependencies = [
 [[package]]
 name = "eth2_network_config"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "bytes",
  "discv5",
  "eth2_config",
- "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "kzg",
  "logging",
- "pretty_reqwest_error 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "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",
 ]
@@ -2198,25 +2098,7 @@ version = "0.1.0"
 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=anchor)",
-]
-
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "alloy-primitives",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "safe_arith",
 ]
 
 [[package]]
@@ -2478,7 +2360,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 [[package]]
 name = "gossipsub"
 version = "0.5.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "async-channel",
  "asynchronous-codec",
@@ -2582,7 +2464,7 @@ version = "0.1.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "eth2",
- "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "metrics",
  "procfs",
  "psutil",
 ]
@@ -2806,7 +2688,7 @@ version = "0.1.0"
 dependencies = [
  "axum",
  "health_metrics",
- "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "metrics",
  "parking_lot",
  "serde",
  "tokio",
@@ -3191,22 +3073,6 @@ dependencies = [
  "bytes",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "bytes",
-]
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -3348,44 +3214,6 @@ dependencies = [
  "tree_hash",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-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 = "lazy_static"
 version = "1.5.0"
@@ -3926,7 +3754,7 @@ dependencies = [
 [[package]]
 name = "lighthouse_network"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -3936,6 +3764,7 @@ dependencies = [
  "dirs 3.0.2",
  "discv5",
  "either",
+ "eth2",
  "ethereum_ssz",
  "ethereum_ssz_derive",
  "fnv",
@@ -3948,7 +3777,7 @@ dependencies = [
  "lighthouse_version",
  "lru",
  "lru_cache",
- "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "metrics",
  "parking_lot",
  "prometheus-client",
  "rand",
@@ -3966,7 +3795,7 @@ dependencies = [
  "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",
  "void",
@@ -3975,7 +3804,7 @@ dependencies = [
 [[package]]
 name = "lighthouse_version"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "git-version",
  "target_info",
@@ -4024,10 +3853,10 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 [[package]]
 name = "logging"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "chrono",
- "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "metrics",
  "parking_lot",
  "serde",
  "serde_json",
@@ -4064,7 +3893,7 @@ dependencies = [
 [[package]]
 name = "lru_cache"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "fnv",
 ]
@@ -4133,30 +3962,8 @@ source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb2
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
-]
-
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-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]]
@@ -4190,22 +3997,6 @@ dependencies = [
  "prometheus",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "prometheus",
-]
-
 [[package]]
 name = "milhouse"
 version = "0.3.0"
@@ -4901,16 +4692,7 @@ version = "0.1.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "reqwest",
- "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
-]
-
-[[package]]
-name = "pretty_reqwest_error"
-version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "reqwest",
- "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "sensitive_url",
 ]
 
 [[package]]
@@ -4957,7 +4739,7 @@ version = "0.1.0"
 dependencies = [
  "async-channel",
  "futures",
- "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "metrics",
  "num_cpus",
  "serde",
  "task_executor",
@@ -5056,11 +4838,11 @@ source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb2
 dependencies = [
  "ethereum_ssz",
  "ethereum_ssz_derive",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "safe_arith",
  "serde",
  "serde_yaml",
  "superstruct",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "types",
 ]
 
 [[package]]
@@ -5745,16 +5527,6 @@ name = "safe_arith"
 version = "0.1.0"
 source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-
 [[package]]
 name = "salsa20"
 version = "0.8.1"
@@ -5880,24 +5652,6 @@ dependencies = [
  "url",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "serde",
- "url",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.217"
@@ -6074,7 +5828,7 @@ dependencies = [
  "ssv_types",
  "tokio",
  "tracing",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "types",
 ]
 
 [[package]]
@@ -6100,7 +5854,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=anchor)",
+ "types",
 ]
 
 [[package]]
@@ -6208,11 +5962,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)",
+ "metrics",
  "parking_lot",
- "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "types",
 ]
 
 [[package]]
@@ -6287,7 +6041,7 @@ dependencies = [
  "derive_more 1.0.0",
  "openssl",
  "rusqlite",
- "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "types",
 ]
 
 [[package]]
@@ -6381,27 +6135,7 @@ source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb2
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
-]
-
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "alloy-primitives",
- "ethereum_hashing",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "fixed_bytes",
 ]
 
 [[package]]
@@ -6512,12 +6246,12 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
 [[package]]
 name = "task_executor"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "async-channel",
  "futures",
  "logging",
- "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "metrics",
  "slog",
  "sloggers",
  "tokio",
@@ -6568,24 +6302,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -6988,72 +6704,23 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arbitrary",
- "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "compare_fields 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "compare_fields_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "derivative",
- "eth2_interop_keypairs 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "ethereum_hashing",
- "ethereum_serde_utils",
- "ethereum_ssz",
- "ethereum_ssz_derive",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "hex",
- "int_to_bytes 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "itertools 0.10.5",
- "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "log",
- "maplit",
- "merkle_proof 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "metastruct",
- "milhouse",
- "parking_lot",
- "rand",
- "rand_xorshift",
- "rayon",
- "regex",
- "rpds",
- "rusqlite",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "serde",
- "serde_json",
- "serde_yaml",
- "slog",
- "smallvec",
- "ssz_types",
- "superstruct",
- "swap_or_not_shuffle 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "tempfile",
- "test_random_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)",
- "tree_hash",
- "tree_hash_derive",
-]
-
-[[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)",
+ "bls",
+ "compare_fields",
+ "compare_fields_derive",
  "derivative",
- "eth2_interop_keypairs 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "eth2_interop_keypairs",
  "ethereum_hashing",
  "ethereum_serde_utils",
  "ethereum_ssz",
  "ethereum_ssz_derive",
- "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "fixed_bytes",
  "hex",
- "int_to_bytes 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "int_to_bytes",
  "itertools 0.10.5",
- "kzg 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "kzg",
  "log",
  "maplit",
- "merkle_proof 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "merkle_proof",
  "metastruct",
  "milhouse",
  "parking_lot",
@@ -7063,7 +6730,7 @@ dependencies = [
  "regex",
  "rpds",
  "rusqlite",
- "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "safe_arith",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -7071,58 +6738,9 @@ dependencies = [
  "smallvec",
  "ssz_types",
  "superstruct",
- "swap_or_not_shuffle 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)",
+ "swap_or_not_shuffle",
  "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#a244aa3a6971572c65dd1c68c726547a1d38c033"
-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)",
- "derivative",
- "eth2_interop_keypairs 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "ethereum_hashing",
- "ethereum_serde_utils",
- "ethereum_ssz",
- "ethereum_ssz_derive",
- "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "hex",
- "int_to_bytes 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "itertools 0.10.5",
- "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "log",
- "maplit",
- "merkle_proof 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "metastruct",
- "milhouse",
- "parking_lot",
- "rand",
- "rand_xorshift",
- "rayon",
- "regex",
- "rpds",
- "rusqlite",
- "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "serde",
- "serde_json",
- "serde_yaml",
- "slog",
- "smallvec",
- "ssz_types",
- "superstruct",
- "swap_or_not_shuffle 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
- "tempfile",
- "test_random_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)",
+ "test_random_derive",
  "tree_hash",
  "tree_hash_derive",
 ]
@@ -7244,7 +6862,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 [[package]]
 name = "unused_port"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?branch=unstable#a244aa3a6971572c65dd1c68c726547a1d38c033"
+source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c"
 dependencies = [
  "lru_cache",
  "parking_lot",
@@ -7292,9 +6910,9 @@ dependencies = [
 [[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]]
diff --git a/Cargo.toml b/Cargo.toml
index 8c94b234..bf5b0842 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,8 +36,8 @@ 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 = "unstable" }
-metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
+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"
@@ -45,12 +45,12 @@ parking_lot = "0.12"
 processor = { path = "anchor/processor" }
 qbft = { path = "anchor/common/qbft" }
 rusqlite = "0.28.0"
-sensitive_url = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
+sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 serde = { version = "1.0.208", features = ["derive"] }
-slot_clock = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
+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 = "unstable", default-features = false, features = [ "tracing", ] }
+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",
@@ -61,9 +61,9 @@ tokio = { version = "1.39.2", features = [
 tower-http = { version = "0.6", features = ["cors"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
-types = { git = "https://github.com/sigp/lighthouse", branch = "unstable" }
-unused_port = { git = "https://github.com/sigp/lighthouse", branch = "unstable" }
-validator_metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
+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]