Unverified Commit f9d4f5f2 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #263052 from centromere/lighthouse-4.5.0 

lighthouse: 4.1.0 -> 4.5.0
parents e8ff5952 56992665

pkgs/applications/blockchains/lighthouse/Cargo.lock

+1982 −2545

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/blockchains/lighthouse/default.nix

+22 −11
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


rustPlatform.buildRustPackage rec {

  pname = "lighthouse";

  version = "4.1.0";

  version = "4.5.0";



  # lighthouse/common/deposit_contract/build.rs

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

    repo = "lighthouse";

    rev = "v${version}";

    hash = "sha256-QVAFzV9sao8+eegI7bLfm+pPHyvDFhnADS80+nqqgtE=";

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

  };



  patches = [
@@ -47,15 +47,15 @@ rustPlatform.buildRustPackage rec { 
  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "amcl-0.3.0" = "sha256-Mj4dXTlGVSleFfuTKgVDQ7S3jANMsdtVE5L90WGxA4U=";

      "arbitrary-1.3.0" = "sha256-BMxcBfxBRf+Kb0Tz55jtFbwokSeD2GPtB+KV8Wbne0g=";

      "beacon-api-client-0.1.0" = "sha256-fI8qST6HZrchg7yr/nVtRNrsW3f5ONSX+mGRYW+iiqA=";

      "ethereum-consensus-0.1.1" = "sha256-aBrZ786Me0BWpnncxQc5MT3r+O0yLQhqGKFBiNTdqSA=";

      "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=";

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

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

      "mev-rs-0.2.1" = "sha256-n3ns1oynw5fKQtp/CQHER41+C1EmLCVEBqggkHc3or4=";

      "ssz-rs-0.8.0" = "sha256-k1JLu+jZrSqUyHou76gbJeA5CDWwdL0fPkek3Vzl4Gs=";

      "warp-0.3.2" = "sha256-m9lkEgeSs0yEc+6N6DG7IfQY/evkUMoNyst2hMUR//c=";

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

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

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

    };

  };
@@ -103,8 +103,8 @@ rustPlatform.buildRustPackage rec { 
  cargoTestFlags = [

    "--workspace"

    "--exclude beacon_node"

    "--exclude http_api"

    "--exclude beacon_chain"

    "--exclude http_api"

    "--exclude lighthouse"

    "--exclude lighthouse_network"

    "--exclude slashing_protection"
@@ -114,10 +114,21 @@ rustPlatform.buildRustPackage rec { 


  # All of these tests require network access

  checkFlags = [

    "--skip basic"

    "--skip deposit_tree::cache_consistency"

    "--skip deposit_tree::double_update"

    "--skip deposit_tree::updating"

    "--skip eth1_cache::big_skip"

    "--skip eth1_cache::double_update"

    "--skip eth1_cache::pruning"

    "--skip eth1_cache::simple_scenario"

    "--skip fast::deposit_cache_query"

    "--skip http::incrementing_deposits"

    "--skip persist::test_persist_caches"

    "--skip service::tests::tests::test_dht_persistence"

    "--skip time::test::test_reinsertion_updates_timeout"



  ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [

    "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart"

    "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch"

    "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"

  ];

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

+13 −26
Original line number Diff line number Diff line 
diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml

index 46b88af66..c8c909234 100644

--- a/consensus/types/Cargo.toml

+++ b/consensus/types/Cargo.toml

@@ -37,7 +37,7 @@ cached_tree_hash = { path = "../cached_tree_hash" }

 serde_yaml = "0.8.13"

 tempfile = "3.1.0"

 derivative = "2.1.1"

-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }

+rusqlite = { version = "0.28.0", optional = true }

 # The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by

 # `AbstractExecPayload`

 arbitrary = { version = "1.0", features = ["derive"] }

diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml

index 631e54dc4..dec95156b 100644

--- a/validator_client/slashing_protection/Cargo.toml

+++ b/validator_client/slashing_protection/Cargo.toml

@@ -12,7 +12,7 @@ path = "tests/main.rs"

 [dependencies]

 tempfile = "3.1.0"

 types = { path = "../../consensus/types" }

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

+rusqlite = { version = "0.28.0" }

 r2d2 = "0.8.9"

 r2d2_sqlite = "0.21.0"

 serde = "1.0.116"
 
diff --git a/Cargo.toml b/Cargo.toml

index 62c0e7bd2..a089e3c5b 100644

--- a/Cargo.toml

+++ b/Cargo.toml

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

 regex = "1"

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

 ring = "0.16"

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

+rusqlite = { version = "0.28" }

 serde = { version = "1", features = ["derive"] }

 serde_json = "1"

 serde_repr = "0.1"