Skip to content

Commit

Permalink
Bump v0.1.16 (#147)
Browse files Browse the repository at this point in the history
* remove zcashd depend

* Squashed 'depend/zcash/' content from commit 1408e23f0

git-subtree-dir: depend/zcash
git-subtree-split: 1408e23f00fa49ca5f86d2c7ebeb5d120603aa4c

* delete cargo, update and apply patch

* update dependencies

* fix compiling issue by updating lib.rs

* update `cc`

* update `cxx-gen`

* add changeloig entry

---------

Co-authored-by: Conrado Gouvea <conradoplg@gmail.com>
  • Loading branch information
oxarbitrage and conradoplg committed Apr 26, 2024
1 parent faed932 commit 06de015
Show file tree
Hide file tree
Showing 95 changed files with 2,787 additions and 2,031 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased] - ReleaseDate

## [0.1.16] - 2024-04-24

### Changed
- Update `depend/zcash` to version 5.9.0 which includes updated dependencies

## [0.1.15] - 2024-04-19

### Changed
Expand Down
113 changes: 95 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,18 @@ jubjub = "0.10"
libc = "0.2"
memuse = "0.2"
metrics = "0.21"
orchard = "0.6"
orchard = "0.7"
rand_core = "0.6"
rayon = "1.5"
redjubjub = "0.7"
sapling = { package = "sapling-crypto", version = "0.1", features = ["temporary-zcashd"] }
subtle = "2.2"
tracing = "0.1"
zcash_address = "0.3"
zcash_encoding = "0.2"
zcash_note_encryption = "0.4"
zcash_primitives = { version = "=0.13.0", features = ["temporary-zcashd", "transparent-inputs"] }
zcash_proofs = { version = "=0.13.0", features = ["directories"] }
zcash_primitives = { version = "=0.14.0", features = ["temporary-zcashd", "transparent-inputs"] }
zcash_proofs = { version = "=0.14.0", features = ["directories"] }
bridgetree = "0.4"
rand = "0.8"

Expand All @@ -87,7 +89,7 @@ bindgen = ">= 0.64.0"
# These dependencies are shared with a lot of other Zebra dependencies,
# so they are configured to automatically upgrade to match Zebra.
# But we try to use the latest versions here, to catch any bugs in `zcash_script`'s CI.
cc = { version = "1.0.83", features = ["parallel"] }
cc = { version = "1.0.94", features = ["parallel"] }
# Treat minor versions with a zero major version as compatible (cargo doesn't by default).
cxx-gen = ">= 0.7.107"
syn = { version = "1.0.109", features = ["full", "printing"] }
Expand All @@ -100,7 +102,7 @@ syn = { version = "1.0.109", features = ["full", "printing"] }
hex = ">= 0.4.3"
lazy_static = "1.4.0"
incrementalmerkletree = { version = "0.5", features = ["test-dependencies"] }
zcash_primitives = { version = "=0.13.0", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
zcash_primitives = { version = "=0.14.0", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }

[[package.metadata.release.pre-release-replacements]]
file = "CHANGELOG.md"
Expand Down
61 changes: 61 additions & 0 deletions depend/zcash/.github/actions/gcs-download-cloud-storage/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: 'gcs-download-cloud-storage'
description: 'Download files from a GCS bucket'
inputs:
path-prefix:
description: 'The bucket path inside which the source path is located'
required: true
source:
description: 'The path to the files to download'
required: true
destination:
description: 'The directory into which the files will be downloaded'
required: true
remove-first-if-exists:
description: 'Deletes the given path first (if it exists) before downloading files'

runs:
using: 'composite'
steps:
- name: Set up Cloud SDK
if: runner.os != 'Linux'
uses: 'google-github-actions/setup-gcloud@v2'
with:
version: '>= 390.0.0' # To use gsutil with google-github-actions/auth

# Use $RUNNER_TEMP instead of ${{ runner.temp }} to prevent the Bash used by Windows
# runners from treating backslashes in Windows paths as escape characters.
# https://github.com/orgs/community/discussions/25910
- name: Create temporary directory
shell: bash
run: |
rm -rf $RUNNER_TEMP/gcs-download
mkdir $RUNNER_TEMP/gcs-download
- name: Download source
shell: bash
run: >
gcloud storage
cp -r
gs://gh-zcash/${{ inputs.path-prefix }}/${{ inputs.source }}
$RUNNER_TEMP/gcs-download
- name: Remove the specified path if it exists
if: inputs.remove-first-if-exists != ''
shell: bash
run: rm -rf ${{ inputs.remove-first-if-exists }}

- name: Ensure the target directory exists
shell: bash
run: mkdir -p ${{ inputs.destination }}

- name: Move source to target [Unix]
if: runner.os != 'Windows'
shell: bash
run: mv $RUNNER_TEMP/gcs-download/* ${{ inputs.destination }}

# PowerShell's mv aliases to its Move-Item cmdlet which has glob support (unlike mv in
# Git Bash for whatever reason).
- name: Move source to target [Windows]
if: runner.os == 'Windows'
shell: pwsh
run: mv ${{ runner.temp }}/gcs-download/* ${{ inputs.destination }}
2 changes: 1 addition & 1 deletion depend/zcash/.github/workflows/audits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
id: toolchain
- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: cargo install cargo-vet --version ~0.8
- run: cargo install cargo-vet --version ~0.9
- run: cargo vet --locked

cargo-deny:
Expand Down
Loading

0 comments on commit 06de015

Please sign in to comment.