From 8b727ffb505b6abc5c674e5ef618f84226f38dbc Mon Sep 17 00:00:00 2001 From: Jeb Bearer Date: Mon, 21 Nov 2022 13:32:03 -0800 Subject: [PATCH] Pin dependencies and update to Rust 1.64 --- .github/workflows/slow-tests.yml | 2 +- Cargo.lock | 6 +++--- Cargo.toml | 8 ++++---- flake.lock | 18 +++++++++--------- flake.nix | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/slow-tests.yml b/.github/workflows/slow-tests.yml index da01508e..0e3493bb 100644 --- a/.github/workflows/slow-tests.yml +++ b/.github/workflows/slow-tests.yml @@ -16,7 +16,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/espressosystems/devops-rust:1.63 + image: ghcr.io/espressosystems/devops-rust:1.64 steps: - uses: styfle/cancel-workflow-action@0.11.0 name: Cancel Outdated Builds diff --git a/Cargo.lock b/Cargo.lock index 4bdfdb4d..8b2a1f06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2300,7 +2300,7 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "key-set" version = "0.3.0" -source = "git+https://github.com/EspressoSystems/key-set.git#e340c4006f07f15044d6333b8a39e1e3cf4230d0" +source = "git+https://github.com/EspressoSystems/key-set.git?tag=0.3.0#e340c4006f07f15044d6333b8a39e1e3cf4230d0" dependencies = [ "ark-serialize", "bincode", @@ -3207,7 +3207,7 @@ dependencies = [ [[package]] name = "reef" version = "0.3.0" -source = "git+https://github.com/EspressoSystems/reef.git#c716c9a36128c1e3e3fab48fcf17579066e821dd" +source = "git+https://github.com/EspressoSystems/reef.git?tag=0.3.0#c49a3685827ce1e8b5f986eaff43b9243d465bd1" dependencies = [ "arbitrary", "arbitrary-wrappers", @@ -3432,7 +3432,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "seahorse" -version = "0.3.0" +version = "0.3.1" dependencies = [ "arbitrary", "arbitrary-wrappers", diff --git a/Cargo.toml b/Cargo.toml index ca5a9733..8d0aea5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "seahorse" description = "A generic cap-style cryptocurrency keystore." authors = ["Espresso Systems "] -version = "0.3.0" +version = "0.3.1" edition = "2018" license = "GPL-3.0-or-later" @@ -50,13 +50,13 @@ zeroize = "1.3" # local dependencies atomic_store = { git = "https://github.com/EspressoSystems/atomicstore.git", tag = "0.1.3" } commit = { git = "https://github.com/EspressoSystems/commit.git", tag = "0.2.0" } -key-set = { git = "https://github.com/EspressoSystems/key-set.git" } +key-set = { git = "https://github.com/EspressoSystems/key-set.git", tag = "0.3.0" } espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" } jf-cap = { features=["std"], git = "https://github.com/EspressoSystems/cap.git", branch = "testnet-v1" } jf-primitives = { features=["std"], git = "https://github.com/EspressoSystems/jellyfish.git", tag = "0.1.2" } jf-utils = { features=["std"], git = "https://github.com/EspressoSystems/jellyfish.git", tag = "0.1.2" } arbitrary-wrappers = { git = "https://github.com/EspressoSystems/arbitrary-wrappers.git"} -reef = { git = "https://github.com/EspressoSystems/reef.git" } +reef = { git = "https://github.com/EspressoSystems/reef.git", tag = "0.3.0" } tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64.git", tag = "0.2.1" } [dev-dependencies] @@ -65,7 +65,7 @@ proptest = "1.0.0" quickcheck = "1.0" quickcheck_macros = "1.0" rand = "0.8.5" -reef = { git = "https://github.com/EspressoSystems/reef.git", features = ["testing"] } +reef = { git = "https://github.com/EspressoSystems/reef.git", tag = "0.3.0", features = ["testing"] } [features] slow-tests = [] diff --git a/flake.lock b/flake.lock index 2634527d..83b4d0fd 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -64,11 +64,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1659102345, - "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=", + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1665111330, - "narHash": "sha256-bvL2xzSVOLBUlXQIklqHqn1M6z5aXrr3FKcqtSnGJ8I=", + "lastModified": 1668998422, + "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb8f4fa9c5514dbbc7d2a7c310d8ba874c519779", + "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f29aabc..dba9e6e6 100644 --- a/flake.nix +++ b/flake.nix @@ -15,11 +15,11 @@ let overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; - stableToolchain = pkgs.rust-bin.stable."1.63.0".minimal.override { + stableToolchain = pkgs.rust-bin.stable."1.64.0".minimal.override { extensions = [ "rustfmt" "clippy" "llvm-tools-preview" "rust-src" ]; }; stableMuslRustToolchain = - pkgs.rust-bin.stable."1.63.0".minimal.override { + pkgs.rust-bin.stable."1.65.0".minimal.override { extensions = [ "rustfmt" "clippy" "llvm-tools-preview" "rust-src" ]; targets = [ "x86_64-unknown-linux-musl" ]; };