From cbf865ca0412133ba9b8c400764befb85e52bf40 Mon Sep 17 00:00:00 2001
From: Mikal Sande <msande@chorus.one>
Date: Mon, 12 May 2025 13:30:28 +0200
Subject: [PATCH 1/4] Allow ssh://github.com/ChorusOne/lighthouse as crate
 source

---
 deny.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deny.toml b/deny.toml
index 130e94d..67c7008 100644
--- a/deny.toml
+++ b/deny.toml
@@ -6,6 +6,12 @@ ignore = [
     "RUSTSEC-2024-0436",
 ]
 
+[sources]
+unknown-git = "deny"
+allow-git = [
+    "ssh://github.com/ChorusOne/lighthouse",
+]
+
 [licenses]
 # List of explicitly allowed licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].

From f23499793df4b829136ad1f1d34c6eef31909589 Mon Sep 17 00:00:00 2001
From: Mikal Sande <msande@chorus.one>
Date: Mon, 12 May 2025 13:50:46 +0200
Subject: [PATCH 2/4] Update and fix crate versions.

* Move all Lighthouse git crates to the same place
* Set shared dependencies with Lighthouse to the same version
  that Lighthouse uses.
* Update crates that are not directly Lighthouse or Ethereum
  related.
---
 Cargo.lock | 453 ++++++++++++++++++++++++++++++++++++++---------------
 Cargo.toml |  27 ++--
 2 files changed, 346 insertions(+), 134 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d7de7bc..1d6a8d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -778,9 +778,9 @@ dependencies = [
  "alloy-primitives",
  "arbitrary",
  "blst",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "ethereum_serde_utils",
- "ethereum_ssz 0.7.1",
+ "ethereum_ssz",
  "fixed_bytes",
  "hex",
  "rand 0.8.5",
@@ -1715,10 +1715,10 @@ dependencies = [
  "eth2_keystore",
  "eth2_network_config",
  "eth2_wallet",
- "ethereum_hashing 0.6.0",
- "ethereum_ssz 0.5.4",
- "ethereum_ssz_derive 0.5.4",
- "getrandom 0.2.16",
+ "ethereum_hashing",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
+ "getrandom 0.3.3",
  "hex",
  "httpmock",
  "lazy_static",
@@ -1726,13 +1726,13 @@ dependencies = [
  "predicates",
  "pretty_assertions",
  "regex",
- "reqwest",
+ "reqwest 0.12.15",
  "serde",
  "serde_derive",
  "serde_json",
  "serial_test",
  "test-log",
- "tiny-bip39",
+ "tiny-bip39 2.0.0",
  "tree_hash",
  "tree_hash_derive",
  "types",
@@ -1755,7 +1755,7 @@ version = "0.2.0"
 source = "git+https://github.com/ChorusOne/lighthouse?rev=664a8fae9650ecba457fccbb561c5c0d6c270e3b#664a8fae9650ecba457fccbb561c5c0d6c270e3b"
 dependencies = [
  "bls",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "hex",
  "num-bigint",
  "serde",
@@ -1807,7 +1807,7 @@ dependencies = [
  "kzg",
  "logging",
  "pretty_reqwest_error",
- "reqwest",
+ "reqwest 0.11.27",
  "sensitive_url",
  "serde_yaml",
  "sha2 0.9.9",
@@ -1828,49 +1828,10 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_repr",
- "tiny-bip39",
+ "tiny-bip39 1.0.0",
  "uuid 0.8.2",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint 0.9.5",
-]
-
-[[package]]
-name = "ethereum_hashing"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea7b408432c13f71af01197b1d3d0069c48a27bfcfbe72a81fc346e47f6defb"
-dependencies = [
- "cpufeatures",
- "lazy_static",
- "ring",
- "sha2 0.10.9",
-]
-
 [[package]]
 name = "ethereum_hashing"
 version = "0.7.0"
@@ -1895,17 +1856,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "ethereum_ssz"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3627f83d8b87b432a5fad9934b4565260722a141a2c40f371f8080adec9425"
-dependencies = [
- "ethereum-types",
- "itertools 0.10.5",
- "smallvec",
-]
-
 [[package]]
 name = "ethereum_ssz"
 version = "0.7.1"
@@ -1917,18 +1867,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "ethereum_ssz_derive"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eccd5378ec34a07edd3d9b48088cbc63309d0367d14ba10b0cdb1d1791080ea"
-dependencies = [
- "darling 0.13.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ethereum_ssz_derive"
 version = "0.7.1"
@@ -2317,7 +2255,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.12",
  "indexmap",
  "slab",
  "tokio",
@@ -2437,6 +2375,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.6"
@@ -2444,7 +2393,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.3.1",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -2475,7 +2447,7 @@ dependencies = [
  "crossbeam-utils",
  "form_urlencoded",
  "futures-util",
- "hyper",
+ "hyper 0.14.32",
  "lazy_static",
  "levenshtein",
  "log",
@@ -2499,8 +2471,8 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
- "http-body",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
@@ -2512,6 +2484,25 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.24.2"
@@ -2519,8 +2510,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 0.2.12",
+ "hyper 0.14.32",
  "rustls",
  "tokio",
  "tokio-rustls",
@@ -2533,12 +2524,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.32",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "hyper 1.6.0",
+ "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.63"
@@ -2685,24 +2712,6 @@ dependencies = [
  "parity-scale-codec",
 ]
 
-[[package]]
-name = "impl-rlp"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
-dependencies = [
- "rlp",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "impl-trait-for-tuples"
 version = "0.2.3"
@@ -2893,10 +2902,10 @@ dependencies = [
  "arbitrary",
  "c-kzg",
  "derivative",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "ethereum_serde_utils",
- "ethereum_ssz 0.7.1",
- "ethereum_ssz_derive 0.7.1",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
  "hex",
  "rust_eth_kzg",
  "serde",
@@ -3130,7 +3139,7 @@ version = "0.2.0"
 source = "git+https://github.com/ChorusOne/lighthouse?rev=664a8fae9650ecba457fccbb561c5c0d6c270e3b#664a8fae9650ecba457fccbb561c5c0d6c270e3b"
 dependencies = [
  "alloy-primitives",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "fixed_bytes",
  "safe_arith",
 ]
@@ -3175,9 +3184,9 @@ dependencies = [
  "alloy-primitives",
  "arbitrary",
  "derivative",
- "ethereum_hashing 0.7.0",
- "ethereum_ssz 0.7.1",
- "ethereum_ssz_derive 0.7.1",
+ "ethereum_hashing",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
  "itertools 0.13.0",
  "parking_lot",
  "rayon",
@@ -3559,6 +3568,16 @@ dependencies = [
  "sha2 0.10.9",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest 0.10.7",
+ "hmac 0.12.1",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -3757,7 +3776,7 @@ name = "pretty_reqwest_error"
 version = "0.1.0"
 source = "git+https://github.com/ChorusOne/lighthouse?rev=664a8fae9650ecba457fccbb561c5c0d6c270e3b#664a8fae9650ecba457fccbb561c5c0d6c270e3b"
 dependencies = [
- "reqwest",
+ "reqwest 0.11.27",
  "sensitive_url",
 ]
 
@@ -3769,8 +3788,6 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec",
- "impl-rlp",
- "impl-serde",
  "uint 0.9.5",
 ]
 
@@ -4038,11 +4055,11 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
  "hyper-rustls",
- "hyper-tls",
+ "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
  "log",
@@ -4052,11 +4069,11 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rustls",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -4072,6 +4089,47 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.12.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -4272,6 +4330,24 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -4810,7 +4886,7 @@ dependencies = [
  "arbitrary",
  "derivative",
  "ethereum_serde_utils",
- "ethereum_ssz 0.7.1",
+ "ethereum_ssz",
  "itertools 0.13.0",
  "serde",
  "serde_derive",
@@ -4881,7 +4957,7 @@ version = "0.2.0"
 source = "git+https://github.com/ChorusOne/lighthouse?rev=664a8fae9650ecba457fccbb561c5c0d6c270e3b#664a8fae9650ecba457fccbb561c5c0d6c270e3b"
 dependencies = [
  "alloy-primitives",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "fixed_bytes",
 ]
 
@@ -4913,6 +4989,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.13.2"
@@ -5127,6 +5212,23 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "tiny-bip39"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a30fd743a02bf35236f6faf99adb03089bb77e91c998dac2c2ad76bb424f668c"
+dependencies = [
+ "once_cell",
+ "pbkdf2 0.12.2",
+ "rand 0.8.5",
+ "rustc-hash 1.1.0",
+ "sha2 0.10.9",
+ "thiserror 1.0.69",
+ "unicode-normalization",
+ "wasm-bindgen",
+ "zeroize",
+]
+
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -5240,6 +5342,27 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -5346,7 +5469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373495c23db675a5192de8b610395e1bec324d596f9e6111192ce903dc11403a"
 dependencies = [
  "alloy-primitives",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "smallvec",
 ]
 
@@ -5397,10 +5520,10 @@ dependencies = [
  "compare_fields_derive",
  "derivative",
  "eth2_interop_keypairs",
- "ethereum_hashing 0.7.0",
+ "ethereum_hashing",
  "ethereum_serde_utils",
- "ethereum_ssz 0.7.1",
- "ethereum_ssz_derive 0.7.1",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
  "fixed_bytes",
  "hex",
  "int_to_bytes",
@@ -5792,7 +5915,7 @@ dependencies = [
  "windows-interface",
  "windows-link",
  "windows-result",
- "windows-strings",
+ "windows-strings 0.4.0",
 ]
 
 [[package]]
@@ -5823,6 +5946,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.2"
@@ -5832,6 +5966,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.4.0"
@@ -5892,13 +6035,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5911,6 +6070,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5923,6 +6088,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5935,12 +6106,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5953,6 +6136,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5965,6 +6154,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5977,6 +6172,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -5989,6 +6190,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.7.10"
diff --git a/Cargo.toml b/Cargo.toml
index d403f17..b1caea6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ edition = "2021"
 description = "Deposit CLI replacement library"
 authors = ["tech@chorus.one"]
 publish = false
+resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,30 +14,34 @@ name = "eth_staking_smith"
 path = "src/lib.rs"
 
 [dependencies]
-clap = { version = "^4.5", features = ["derive", "env"] }
-ethereum_hashing = "0.6.0"
+# Lighthouse git dependencies.
 eth2_key_derivation = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b"}
 eth2_keystore = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b"}
 eth2_network_config = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b" }
-ethereum_ssz = "0.5.4"
-ethereum_ssz_derive = "0.5.4"
 eth2_wallet = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b"}
+types = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b"}
+
+# These must be pinned to a version that lighthouse version used above uses.
+ethereum_hashing = "0.7.0"
+ethereum_ssz = "0.7"
+ethereum_ssz_derive = "0.7"
+tree_hash = "0.8"
+tree_hash_derive = "0.8"
+
+clap = { version = "^4.5", features = ["derive", "env"] }
 env_logger = "^0.11"
 hex = "0.4"
 lazy_static = "1.5"
 log = "^0.4"
+
 # eth2_network_config uses native-tls, so do we
-reqwest = { version = "0.11", default-features = false, features = ["native-tls"] }
-getrandom = "0.2"
+reqwest = { version = "0.12", default-features = false, features = ["blocking", "native-tls"] }
+getrandom = "0.3"
 regex = "1.10.6"
 serde = "1.0.204"
 serde_derive = "1.0"
 serde_json = "1.0"
-tiny-bip39 = "1.0.0"
-# This must be pinned to a version that lighthouse uses
-tree_hash = "0.8"
-tree_hash_derive = "0.8"
-types = { git = "https://github.com/ChorusOne/lighthouse", rev = "664a8fae9650ecba457fccbb561c5c0d6c270e3b"}
+tiny-bip39 = "2.0.0"
 url = "2.5"
 uuid = { version = "1.10", features = ["v4"] }
 

From 76df0339413492d5e6236830ef03ee234db0bb63 Mon Sep 17 00:00:00 2001
From: Mikal Sande <msande@chorus.one>
Date: Mon, 12 May 2025 13:52:13 +0200
Subject: [PATCH 3/4] Code updates after crate updates

---
 src/seed.rs  | 2 +-
 src/utils.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/seed.rs b/src/seed.rs
index e89afc6..69ccb9b 100644
--- a/src/seed.rs
+++ b/src/seed.rs
@@ -11,7 +11,7 @@ use bip39::{Language, Mnemonic, MnemonicType, Seed as Bip39Seed};
 fn create_new_seed() -> Mnemonic {
     let mut bytes = vec![0u8; MnemonicType::Words24.entropy_bits() / 8];
 
-    getrandom::getrandom(&mut bytes).expect("Failed to generate seed using getrandom(2)");
+    getrandom::fill(&mut bytes).expect("Failed to generate seed using getrandom(2)");
 
     Mnemonic::from_entropy(bytes.as_slice(), Language::English)
         .expect("Failed to generate mnemonic")
diff --git a/src/utils.rs b/src/utils.rs
index d64dfe4..17747c5 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -5,7 +5,7 @@ use types::PublicKeyBytes;
 
 pub(crate) fn pbkdf2() -> Kdf {
     let mut salt = vec![0u8; SALT_SIZE];
-    getrandom::getrandom(&mut salt).expect("Failed to generate pbkdf salt using getrandom(2)");
+    getrandom::fill(&mut salt).expect("Failed to generate pbkdf salt using getrandom(2)");
     Kdf::Pbkdf2(Pbkdf2 {
         dklen: DKLEN,
         c: 262_144,
@@ -16,7 +16,7 @@ pub(crate) fn pbkdf2() -> Kdf {
 
 pub(crate) fn scrypt() -> Kdf {
     let mut salt = vec![0u8; SALT_SIZE];
-    getrandom::getrandom(&mut salt).expect("Failed to generate scrypt salt using getrandom(2)");
+    getrandom::fill(&mut salt).expect("Failed to generate scrypt salt using getrandom(2)");
     Kdf::Scrypt(Scrypt {
         dklen: DKLEN,
         n: 262144,

From b3be4e595cda70a37f5b317082033b8bc4505498 Mon Sep 17 00:00:00 2001
From: Mikal Sande <msande@chorus.one>
Date: Mon, 12 May 2025 15:00:57 +0200
Subject: [PATCH 4/4] Update test because tiny-bip39 had changed its error
 output

---
 tests/e2e/existing_mnemonic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/existing_mnemonic.rs b/tests/e2e/existing_mnemonic.rs
index 0fa5f7c..c5dc414 100644
--- a/tests/e2e/existing_mnemonic.rs
+++ b/tests/e2e/existing_mnemonic.rs
@@ -825,7 +825,7 @@ fn test_error_phrase_too_short() -> Result<(), Box<dyn std::error::Error>> {
     cmd.arg(num_validators);
 
     cmd.assert().failure().stderr(predicate::str::contains(
-        "Invalid phrase passed: invalid number of words in phrase: 3",
+        "Invalid phrase passed: InvalidWordLength(3)",
     ));
 
     Ok(())