Commit 08c24595 authored by Alex Wied's avatar Alex Wied
Browse files

lighthouse: 4.5.0 -> 4.6.0

parent 3ab52f06

pkgs/applications/blockchains/lighthouse/Cargo.lock

+1475 −1307

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/blockchains/lighthouse/default.nix

+16 −11
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
, postgresql

, protobuf

, rustPlatform

, rust-jemalloc-sys

, Security

, sqlite

, rust-jemalloc-sys

, stdenv

, SystemConfiguration

, testers
@@ -23,7 +23,7 @@ 


rustPlatform.buildRustPackage rec {

  pname = "lighthouse";

  version = "4.5.0";

  version = "4.6.0";



  # lighthouse/common/deposit_contract/build.rs

  depositContractSpecVersion = "0.12.1";
@@ -33,11 +33,12 @@ rustPlatform.buildRustPackage rec { 
    owner = "sigp";

    repo = "lighthouse";

    rev = "v${version}";

    hash = "sha256-UUOvTxOQXT1zfhDYEL/J6moHAyejZn7GyGS/XBmXxRQ=";

    hash = "sha256-uMrVnVvYXcY2Axn3ycsf+Pwur3HYGoOYjjUkGS5c3l4=";

  };



  patches = [

    ./use-system-sqlite.patch

    ./use-c-kzg-from-crates-io.patch

  ];



  postPatch = ''
@@ -48,14 +49,11 @@ rustPlatform.buildRustPackage rec { 
    lockFile = ./Cargo.lock;

    outputHashes = {

      "amcl-0.3.0" = "sha256-kc8k/ls4W0TwFBsRcyyotyz8ZBEjsZXHeJnJtsnW/LM=";

      "anvil-rpc-0.1.0" = "sha256-L38OioxnWEn94g3GJT4j3U1cJZ8jQDHp8d1QOHaVEuU=";

      "beacon-api-client-0.1.0" = "sha256-Z0CoPxZzl2bjb8vgmHWxq2orMawhMMs7beKGopilKjE=";

      "ethereum-consensus-0.1.1" = "sha256-biTrw3yMJUo9+56QK5RGWXLCoPPZEWp18SCs+Y9QWg4=";

      "discv5-0.4.0" = "sha256-GKAk9Du6fy0ldeBEwPueDbVPhyNxdKNROKpMJvR/OTc=";

      "futures-bounded-0.2.3" = "sha256-/LbD+je9P1lPnXMJVDqRQHJziQPXPvSDmQadTfsQ5I8=";

      "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q=";

      "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk=";

      "mev-rs-0.3.0" = "sha256-LCO0GTvWTLcbPt7qaSlLwlKmAjt3CIHVYTT/JRXpMEo=";

      "testcontainers-0.14.0" = "sha256-mSsp21G7MLEtFROWy88Et5s07PO0tjezovCGIMh+/oQ=";

      "warp-0.3.5" = "sha256-d5e6ASdL7+Dl3KsTNOb9B5RHpStrupOKsbGWsdu9Jfk=";

      "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE=";

    };

  };
@@ -70,8 +68,8 @@ rustPlatform.buildRustPackage rec { 
  ];



  buildInputs = [

    sqlite

    rust-jemalloc-sys

    sqlite

  ] ++ lib.optionals stdenv.isDarwin [

    CoreFoundation

    Security
@@ -102,11 +100,12 @@ rustPlatform.buildRustPackage rec { 
  # All of these tests require network access and/or docker

  cargoTestFlags = [

    "--workspace"

    "--exclude beacon_node"

    "--exclude beacon_chain"

    "--exclude beacon_node"

    "--exclude http_api"

    "--exclude lighthouse"

    "--exclude lighthouse_network"

    "--exclude network"

    "--exclude slashing_protection"

    "--exclude watch"

    "--exclude web3signer_tests"
@@ -147,11 +146,17 @@ rustPlatform.buildRustPackage rec { 
    updateScript = nix-update-script { };

  };



  enableParallelBuilding = true;



  # This is needed by the unit tests.

  FORK_NAME = "capella";



  meta = with lib; {

    description = "Ethereum consensus client in Rust";

    homepage = "https://lighthouse.sigmaprime.io/";

    license = licenses.asl20;

    maintainers = with maintainers; [ centromere pmw ];

    mainProgram = "lighthouse";

    broken = stdenv.hostPlatform.isDarwin;

  };

}

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

0 → 100644
+11 −0
Original line number Diff line number Diff line 
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

+3 −3
Original line number Diff line number Diff line 
diff --git a/Cargo.toml b/Cargo.toml

index 62c0e7bd2..a089e3c5b 100644

index ca55d00d4..76514b545 100644

--- a/Cargo.toml

+++ b/Cargo.toml

@@ -138,7 +138,7 @@ rayon = "1.7"

@@ -139,7 +139,7 @@ rayon = "1.7"

 regex = "1"

 reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls"] }

 reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }

 ring = "0.16"

-rusqlite = { version = "0.28", features = ["bundled"] }

+rusqlite = { version = "0.28" }