Merge pull request #322106 from codyps/lighthouse-5.2.0

lighthouse: 4.6.0 → 5.2.0

nixos/modules/services/blockchain/ethereum/lighthouse.nix

@@ -192,7 +192,7 @@ in {
       };
 
       network = mkOption {
-        type = types.enum [ "mainnet" "prater" "goerli" "gnosis" "kiln" "ropsten" "sepolia" ];
+        type = types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ];
         default = "mainnet";
         description = ''
           The network to connect to. Mainnet is the default ethereum network.

pkgs/applications/blockchains/lighthouse/default.nix

@@ -23,7 +23,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lighthouse";
-  version = "4.6.0";
+  version = "5.2.0";
 
   # lighthouse/common/deposit_contract/build.rs
   depositContractSpecVersion = "0.12.1";
@@ -33,12 +33,12 @@ rustPlatform.buildRustPackage rec {
     owner = "sigp";
     repo = "lighthouse";
     rev = "v${version}";
-    hash = "sha256-uMrVnVvYXcY2Axn3ycsf+Pwur3HYGoOYjjUkGS5c3l4=";
+    hash = "sha256-kruHYFPQ9H9HtEjzscQOyghPSpx++wNbHDYOVo0qtjY=";
   };
 
   patches = [
     ./use-system-sqlite.patch
-    ./use-c-kzg-from-crates-io.patch
+    ./fix-dep-lazy_static.patch
   ];
 
   postPatch = ''
@@ -48,12 +48,9 @@ rustPlatform.buildRustPackage rec {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "amcl-0.3.0" = "sha256-kc8k/ls4W0TwFBsRcyyotyz8ZBEjsZXHeJnJtsnW/LM=";
-      "discv5-0.4.0" = "sha256-GKAk9Du6fy0ldeBEwPueDbVPhyNxdKNROKpMJvR/OTc=";
-      "futures-bounded-0.2.3" = "sha256-/LbD+je9P1lPnXMJVDqRQHJziQPXPvSDmQadTfsQ5I8=";
+      "alloy-consensus-0.1.0" = "sha256-y5AIZN4d7Vm2dVa3jd0e6zXwC8hzPyOv0h5+W/Az3rs=";
       "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q=";
       "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk=";
-      "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE=";
     };
   };
 

pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch

@@ -0,0 +1,11 @@
+diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml
+index fe966f4a9..f4153fec2 100644
+--- a/common/lighthouse_metrics/Cargo.toml
++++ b/common/lighthouse_metrics/Cargo.toml
+@@ -8,3 +8,6 @@ edition = { workspace = true }
+ 
+ [dependencies]
+ prometheus = "0.13.0"
++
++[dev-dependencies]
++lazy_static.workspace = true

pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch

@@ -1,11 +0,0 @@
-diff --git a/crypto/kzg/Cargo.toml b/crypto/kzg/Cargo.toml
-index 7b70166f9..857fa4ee1 100644
---- a/crypto/kzg/Cargo.toml
-+++ b/crypto/kzg/Cargo.toml
-@@ -16,4 +16,4 @@ serde = { workspace = true }
- ethereum_serde_utils = { workspace = true }
- hex = { workspace = true }
- ethereum_hashing = { workspace = true }
--c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "748283cced543c486145d5f3f38684becdfe3e1b"}
-\ No newline at end of file
-+c-kzg = "0.4.0"

pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch

@@ -1,11 +1,11 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index ca55d00d4..76514b545 100644
+index b942d1719..da6f245c5 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -139,7 +139,7 @@ rayon = "1.7"
- regex = "1"
+@@ -148,7 +148,7 @@ regex = "1"
  reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }
  ring = "0.16"
+ rpds = "0.11"
 -rusqlite = { version = "0.28", features = ["bundled"] }
 +rusqlite = { version = "0.28" }
  serde = { version = "1", features = ["derive"] }