From ccf40d4a30802a24a4751db898de3b6075209296 Mon Sep 17 00:00:00 2001 From: sveitser Date: Thu, 19 Dec 2024 10:04:05 +0100 Subject: [PATCH 1/3] Fix nix dev-env - Remove unused license header pre-commit check --- flake.lock | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 51 ++------------ 2 files changed, 195 insertions(+), 46 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..49dd48d --- /dev/null +++ b/flake.lock @@ -0,0 +1,190 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1734575524, + "narHash": "sha256-BxQ/4JuHEi0zRjF0P8B5xnbXOLulgsK2gfwVRXGZ4a4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "573c674a3ad06e8a525263185ebef336a411d1d5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 868ba35..8e4491e 100644 --- a/flake.nix +++ b/flake.nix @@ -26,17 +26,11 @@ inputs.pre-commit-hooks.inputs.flake-utils.follows = "flake-utils"; inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; - inputs.poetry2nixFlake = { - url = "github:nix-community/poetry2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { self, nixpkgs, flake-utils, rust-overlay, pre-commit-hooks, poetry2nixFlake, ... }: + outputs = { self, nixpkgs, flake-utils, rust-overlay, pre-commit-hooks, ... }: flake-utils.lib.eachDefaultSystem (system: let overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; - poetry2nix = poetry2nixFlake.lib.mkPoetry2Nix { inherit pkgs; }; rustToolchain = pkgs.rust-bin.stable.latest.minimal.override { extensions = [ "rustfmt" "clippy" "llvm-tools-preview" "rust-src" ]; }; @@ -68,11 +62,6 @@ ] ++ lib.optionals (!stdenv.isDarwin) [ cargo-watch # broken: https://github.com/NixOS/nixpkgs/issues/146349 ]; - # nixWithFlakes allows pre v2.4 nix installations to use - # flake commands (like `nix flake update`) - nixWithFlakes = pkgs.writeShellScriptBin "nix" '' - exec ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" - ''; cargo-llvm-cov = pkgs.rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; version = "0.5.0"; @@ -96,8 +85,6 @@ license = with licenses; [ mit asl20 ]; }; }; - pythonEnv = poetry2nix.mkPoetryEnv { projectDir = ./.; }; - myPython = with pkgs; [ poetry pythonEnv ]; shellHook = '' # Prevent cargo aliases from using programs in `~/.cargo` to avoid conflicts with rustup # installations. @@ -131,33 +118,6 @@ entry = "cargo clippy --workspace --all-features --all-targets -- -D clippy::dbg-macro"; pass_filenames = false; }; - license-header-c-style = { - enable = true; - description = - "Ensure files with c-style comments have license header"; - entry = '' - insert_license --license-filepath .license-header.txt --comment-style "//"''; - types_or = [ "rust" ]; - pass_filenames = true; - }; - license-header-hash = { - enable = true; - description = - "Ensure files with hash style comments have license header"; - entry = '' - insert_license --license-filepath .license-header.txt --comment-style "#"''; - types_or = [ "bash" "python" "toml" "nix" ]; - excludes = [ "poetry.lock" ]; - pass_filenames = true; - }; - license-header-html = { - enable = true; - description = "Ensure markdown files have license header"; - entry = '' - insert_license --license-filepath .license-header.txt --comment-style ""''; - types_or = [ "markdown" ]; - pass_filenames = true; - }; }; }; }; @@ -168,23 +128,22 @@ buildInputs = with pkgs; [ rust-bin.nightly.latest.rust-analyzer - nixWithFlakes nixpkgs-fmt git mdbook # make-doc, documentation generation protobuf rustToolchain - ] ++ myPython ++ rustDeps; + ] ++ rustDeps; - inherit RUST_SRC_PATH RUST_BACKTRACE RUST_LOG RUSTFLAGS; + inherit RUST_SRC_PATH RUST_BACKTRACE RUST_LOG; }; devShells = { perfShell = pkgs.mkShell { shellHook = shellHook; buildInputs = with pkgs; - [ nixWithFlakes cargo-llvm-cov rustToolchain protobuf ] ++ rustDeps; + [ cargo-llvm-cov rustToolchain protobuf ] ++ rustDeps; - inherit RUST_SRC_PATH RUST_BACKTRACE RUST_LOG RUSTFLAGS; + inherit RUST_SRC_PATH RUST_BACKTRACE RUST_LOG; }; }; }); From 89b06b6007e88fd20bfc855d3f400b8fa045f379 Mon Sep 17 00:00:00 2001 From: sveitser Date: Thu, 19 Dec 2024 10:04:47 +0100 Subject: [PATCH 2/3] update hotshot: 0.5.83 --- Cargo.lock | 173 +++++++++++++++++++++++------------------------------ Cargo.toml | 6 +- 2 files changed, 77 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4de6ab0..d80a524 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -848,19 +848,6 @@ dependencies = [ "tungstenite", ] -[[package]] -name = "asynchronous-codec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" -dependencies = [ - "bytes", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.14", -] - [[package]] name = "asynchronous-codec" version = "0.7.0" @@ -2770,8 +2757,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "anyhow", "async-broadcast", @@ -2814,7 +2801,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "async-trait", "clap", @@ -2832,7 +2819,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" -version = "0.1.50" +version = "0.1.57" dependencies = [ "async-broadcast", "async-lock 2.8.0", @@ -2861,8 +2848,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "anyhow", "async-lock 3.4.0", @@ -2886,8 +2873,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "async-broadcast", "async-trait", @@ -2899,8 +2886,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "anyhow", "async-broadcast", @@ -2934,7 +2921,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "anyhow", "ark-bn254", @@ -3727,16 +3714,15 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libp2p" -version = "0.53.2" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681fb3f183edfbedd7a57d32ebe5dcdc0b9f94061185acf3c30249349cc6fc99" +checksum = "bbbe80f9c7e00526cd6b838075b9c171919404a4732cb2fa8ece0a093223bfc4" dependencies = [ "bytes", "either", "futures", "futures-timer", "getrandom 0.2.15", - "instant", "libp2p-allow-block-list", "libp2p-autonat", "libp2p-connection-limits", @@ -3761,9 +3747,9 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" +checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041" dependencies = [ "libp2p-core", "libp2p-identity", @@ -3773,30 +3759,36 @@ dependencies = [ [[package]] name = "libp2p-autonat" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95151726170e41b591735bf95c42b888fe4aa14f65216a9fbf0edcc04510586" +checksum = "a083675f189803d0682a2726131628e808144911dad076858bfbe30b13065499" dependencies = [ "async-trait", - "asynchronous-codec 0.6.2", + "asynchronous-codec", + "bytes", + "either", "futures", + "futures-bounded", "futures-timer", - "instant", "libp2p-core", "libp2p-identity", "libp2p-request-response", "libp2p-swarm", "quick-protobuf", - "quick-protobuf-codec 0.2.0", + "quick-protobuf-codec", "rand 0.8.5", + "rand_core 0.6.4", + "thiserror 1.0.63", "tracing", + "void", + "web-time", ] [[package]] name = "libp2p-connection-limits" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" +checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8" dependencies = [ "libp2p-core", "libp2p-identity", @@ -3806,9 +3798,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.3" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" +checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298" dependencies = [ "either", "fnv", @@ -3835,9 +3827,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.41.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17cbcf7160ff35c3e8e560de4a068fe9d6cb777ea72840e48eb76ff9576c4b6" +checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd" dependencies = [ "async-trait", "futures", @@ -3851,12 +3843,12 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.46.1" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d665144a616dadebdc5fff186b1233488cdcd8bfb1223218ff084b6d052c94f7" +checksum = "b4e830fdf24ac8c444c12415903174d506e1e077fbe3875c404a78c5935a8543" dependencies = [ - "asynchronous-codec 0.7.0", - "base64 0.21.7", + "asynchronous-codec", + "base64 0.22.1", "byteorder", "bytes", "either", @@ -3865,13 +3857,12 @@ dependencies = [ "futures-ticker", "getrandom 0.2.15", "hex_fmt", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm", "prometheus-client", "quick-protobuf", - "quick-protobuf-codec 0.3.1", + "quick-protobuf-codec", "rand 0.8.5", "regex", "serde", @@ -3879,15 +3870,16 @@ dependencies = [ "smallvec", "tracing", "void", + "web-time", ] [[package]] name = "libp2p-identify" -version = "0.44.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d635ebea5ca0c3c3e77d414ae9b67eccf2a822be06091b9c1a0d13029a1e2f" +checksum = "1711b004a273be4f30202778856368683bd9a83c4c7dcc8f848847606831a4e3" dependencies = [ - "asynchronous-codec 0.7.0", + "asynchronous-codec", "either", "futures", "futures-bounded", @@ -3897,7 +3889,7 @@ dependencies = [ "libp2p-swarm", "lru 0.12.4", "quick-protobuf", - "quick-protobuf-codec 0.3.1", + "quick-protobuf-codec", "smallvec", "thiserror 1.0.63", "tracing", @@ -3927,24 +3919,23 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.45.3" +version = "0.46.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc5767727d062c4eac74dd812c998f0e488008e82cce9c33b463d38423f9ad2" +checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3" dependencies = [ "arrayvec", - "asynchronous-codec 0.7.0", + "asynchronous-codec", "bytes", "either", "fnv", "futures", "futures-bounded", "futures-timer", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm", "quick-protobuf", - "quick-protobuf-codec 0.3.1", + "quick-protobuf-codec", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -3953,13 +3944,14 @@ dependencies = [ "tracing", "uint", "void", + "web-time", ] [[package]] name = "libp2p-mdns" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49007d9a339b3e1d7eeebc4d67c05dbf23d300b7d091193ec2d3f26802d7faf2" +checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417" dependencies = [ "data-encoding", "futures", @@ -3978,12 +3970,11 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" +checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566" dependencies = [ "futures", - "instant", "libp2p-core", "libp2p-gossipsub", "libp2p-identify", @@ -3992,12 +3983,13 @@ dependencies = [ "libp2p-swarm", "pin-project", "prometheus-client", + "web-time", ] [[package]] name = "libp2p-networking" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "anyhow", "async-trait", @@ -4023,9 +4015,9 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" +checksum = "46352ac5cd040c70e88e7ff8257a2ae2f891a4076abad2c439584a31c15fd24e" dependencies = [ "bytes", "futures", @@ -4047,16 +4039,15 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.26.3" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c314fe28368da5e3a262553fb0ad575c1c8934c461e10de10265551478163836" +checksum = "1356c9e376a94a75ae830c42cdaea3d4fe1290ba409a22c809033d1b7dcab0a6" dependencies = [ "async-trait", "cbor4ii", "futures", "futures-bounded", "futures-timer", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm", @@ -4065,19 +4056,19 @@ dependencies = [ "smallvec", "tracing", "void", + "web-time", ] [[package]] name = "libp2p-swarm" -version = "0.44.2" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" +checksum = "d7dd6741793d2c1fb2088f67f82cf07261f25272ebe3c0b0c311e0c6b50e851a" dependencies = [ "either", "fnv", "futures", "futures-timer", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", @@ -4089,13 +4080,14 @@ dependencies = [ "tokio", "tracing", "void", + "web-time", ] [[package]] name = "libp2p-swarm-derive" -version = "0.34.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5daceb9dd908417b6dfcfe8e94098bc4aac54500c282e78120b885dadc09b999" +checksum = "206e0aa0ebe004d778d79fb0966aa0de996c19894e2c0605ba2f8524dd4443d8" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -4105,9 +4097,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2460fc2748919adff99ecbc1aab296e4579e41f374fb164149bd2c9e529d4c" +checksum = "ad964f312c59dcfcac840acd8c555de8403e295d39edf96f5240048b5fcaa314" dependencies = [ "futures", "futures-timer", @@ -4122,9 +4114,9 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" +checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847" dependencies = [ "futures", "futures-rustls", @@ -4141,9 +4133,9 @@ dependencies = [ [[package]] name = "libp2p-upnp" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccf04b0e3ff3de52d07d5fd6c3b061d0e7f908ffc683c32d9638caedce86fc8" +checksum = "01bf2d1b772bd3abca049214a3304615e6a36fa6ffc742bdd1ba774486200b8f" dependencies = [ "futures", "futures-timer", @@ -5303,26 +5295,13 @@ dependencies = [ "byteorder", ] -[[package]] -name = "quick-protobuf-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" -dependencies = [ - "asynchronous-codec 0.6.2", - "bytes", - "quick-protobuf", - "thiserror 1.0.63", - "unsigned-varint 0.7.2", -] - [[package]] name = "quick-protobuf-codec" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474" dependencies = [ - "asynchronous-codec 0.7.0", + "asynchronous-codec", "bytes", "quick-protobuf", "thiserror 1.0.63", @@ -7635,10 +7614,6 @@ name = "unsigned-varint" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" -dependencies = [ - "asynchronous-codec 0.6.2", - "bytes", -] [[package]] name = "unsigned-varint" @@ -7700,8 +7675,8 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" -version = "0.5.79" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +version = "0.5.83" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" dependencies = [ "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index d5aaa6f..8467691 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hotshot-events-service" -version = "0.1.56" +version = "0.1.57" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,7 +13,7 @@ derivative = "2.2" derive_more = "0.99" either = { version = "1.12", features = ["serde"] } futures = "0.3" -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.82" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.83" } libp2p-identity = { version = "0.2", features = ["serde"] } rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } @@ -27,6 +27,6 @@ tracing-test = "0.2" vbs = "0.1.4" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.82" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.83" } portpicker = "0.1.1" surf-disco = "0.9" From 6c60698c3df4ca2788c3352740535c6965d24fe1 Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 20 Dec 2024 14:56:16 +0100 Subject: [PATCH 3/3] Update hotshot --- Cargo.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d80a524..9f60892 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2758,7 +2758,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "anyhow", "async-broadcast", @@ -2801,7 +2801,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "async-trait", "clap", @@ -2849,7 +2849,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "anyhow", "async-lock 3.4.0", @@ -2874,7 +2874,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "async-broadcast", "async-trait", @@ -2887,7 +2887,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "anyhow", "async-broadcast", @@ -2921,7 +2921,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "anyhow", "ark-bn254", @@ -3989,9 +3989,10 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "anyhow", + "async-lock 3.4.0", "async-trait", "bincode", "blake3", @@ -7676,7 +7677,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" version = "0.5.83" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#f9bf48ebf53a5fa934614a13f4cbb3069c1e0fda" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump%2F0.5.83#bd6781ccf26c67935e14f3d16273aa452982f0ba" dependencies = [ "tracing", ]