Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to upstream (zcash/main v0.8.0) #103

Merged
merged 72 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
7c83d6d
Label consensus rules in orchard
defuse May 5, 2022
2d15aea
Update to new annotation syntax.
daira Jul 21, 2022
5da41a6
Upgrade incrementalmerkletree deps for pre-dag-sync
nuttycom May 22, 2023
6ef89d5
Update incrementalmerkletree deps again with bugfixes
str4d Jul 6, 2023
213b11a
Migrate to published `incrementalmerkletree 0.5`
str4d Sep 8, 2023
1ff53e9
CI: Use `rust-toolchain.toml` for MSRV checks
str4d Sep 8, 2023
7fa0edb
Bump MSRV to 1.65
str4d Sep 8, 2023
bb6e3af
orchard 0.6.0
str4d Sep 8, 2023
c48247d
Merge pull request #398 from zcash/update_incrementalmerkletree
str4d Sep 8, 2023
866d5ca
Add `Cargo.lock` to repository
str4d Nov 28, 2023
a12661c
CI: Modernise workflows
str4d Nov 28, 2023
4bb65b9
Merge pull request #323 from defuse/nu5-consensus-labeled
str4d Nov 29, 2023
003619b
Merge pull request #402 from zcash/ci-updates
str4d Nov 30, 2023
06cb761
Rename `Builder::add_recipient` to `add_output`.
nuttycom Dec 12, 2023
0a257d6
Add explicit control of padding to the Builder API.
nuttycom Dec 8, 2023
2e2c161
Add a public bundle construction function & use it in the builder.
nuttycom Dec 15, 2023
938b203
Apply suggestions from code review
nuttycom Dec 19, 2023
78f5986
Merge pull request #404 from nuttycom/builder_functions
str4d Dec 19, 2023
153b793
Change my name in Cargo.toml and remove an old email address for
daira Dec 19, 2023
ac4b521
Switch to MIT or Apache 2.0 licensing.
daira Dec 19, 2023
c375696
Merge pull request #405 from daira/change-license
str4d Dec 20, 2023
71d9ddd
Move some changelog entries from 0.3.0 to 0.4.0.
daira Dec 20, 2023
a5948cd
Fix path to `orchard::note::Nullifier` in CHANGELOG.md
str4d Dec 20, 2023
a0f1aca
Merge pull request #408 from daira/fix-changelog-entries
str4d Dec 20, 2023
3845686
Modify `BundleType` to exclude the anchor & allow no bundle to be pro…
nuttycom Dec 21, 2023
1892573
Expose `Anchor::empty_tree`.
nuttycom Dec 21, 2023
ba70c32
Merge pull request #409 from zcash/required_bundles
nuttycom Dec 21, 2023
110ad5c
Make the `MERKLE_DEPTH_ORCHARD` constant public.
nuttycom Jan 5, 2024
e127230
Merge pull request #411 from nuttycom/public_merkle_depth
nuttycom Jan 6, 2024
b60ef5c
Return bundle metadata from bundle building.
nuttycom Jan 9, 2024
3f7acee
Apply suggestions from code review
nuttycom Jan 9, 2024
9a85034
Merge pull request #412 from nuttycom/bundle_metadata
nuttycom Jan 9, 2024
4b09ef6
Migrate to `zcash_spec 0.1`
str4d Jan 10, 2024
21cff6b
Clean up changelog
str4d Jan 10, 2024
68290a1
Migrate to `zip32 0.1`
str4d Jan 10, 2024
d5fa3e1
Merge pull request #413 from zcash/zcash_spec-0.1
str4d Jan 11, 2024
c5dea4e
Merge pull request #414 from zcash/zip32-0.1
nuttycom Jan 11, 2024
a55fbf1
Use the `zip32::Scope` type
str4d Jan 26, 2024
5db6454
Merge pull request #415 from zcash/zip32-scope
nuttycom Jan 26, 2024
23ce468
orchard 0.7.0
str4d Jan 26, 2024
8a2abbb
Merge pull request #416 from zcash/release-0.7.0
str4d Jan 26, 2024
ae1ba27
* Add a pointer to how the Z and U constants for fixed-base scalar
daira Feb 6, 2024
3d79ba4
Merge pull request #417 from daira/improve-doc-for-fixed-base-constants
daira Feb 6, 2024
f90e52d
Update the doc for `struct Action`. This was originally written when the
daira Feb 6, 2024
ff7287e
Add `impl subtle::ConstantTimeEq for note::Nullifier`
nuttycom Feb 24, 2024
8cc96b5
Add `impl Clone for note_encryption::CompactAction`
nuttycom Feb 26, 2024
9729cd8
Add note_encryption::CompactAction::cmx
nuttycom Feb 26, 2024
f8857e8
Merge pull request #418 from daira/action-doc-nit
str4d Feb 26, 2024
2a312c0
Merge pull request #419 from nuttycom/nullifier_ct_eq
str4d Feb 29, 2024
79d739f
orchard 0.7.1
str4d Feb 29, 2024
1db9741
Merge pull request #420 from zcash/release-0.7.1
str4d Feb 29, 2024
7ef1fea
Add a `MerkleHashOrchard::random` function under the `test-dependenci…
nuttycom Mar 12, 2024
a6b3407
Merge pull request #422 from nuttycom/test_only_random_merklehashorchard
nuttycom Mar 12, 2024
1a8ded0
Add a `Rho` type, to distinguish from revealed note nullifiers.
nuttycom Mar 10, 2024
e74879d
Merge pull request #421 from nuttycom/add_rho_type
str4d Mar 12, 2024
1b6c078
Add `impl Distribution<MerkleHashOrchard> for Standard` for testing.
nuttycom Mar 16, 2024
33474bd
Merge pull request #423 from nuttycom/merkle_hash_orchard_dist
nuttycom Mar 19, 2024
d8e2bc6
orchard release version 0.8.0
nuttycom Mar 25, 2024
c9a8f49
Merge branch 'zcash-0.8.0' into zsa1-with-zcash-0.8.0
dmidem Apr 15, 2024
f3d9459
Fix compilation errors after the merge (there're still several compli…
dmidem Apr 24, 2024
0f56f52
Fix compilation errors in tests
dmidem Apr 25, 2024
149827d
Fix cargo doc issues
dmidem Apr 25, 2024
c8c84aa
Fix Builder::bundle function to pass unit tests from tests folder cor…
dmidem Apr 29, 2024
ac371f0
Fix several comments, rename some flag constants
dmidem Apr 30, 2024
7969b9e
Fix flag names after renaming
dmidem Apr 30, 2024
47f7aae
Disable rustfmt for one line in keys.rs module to prevent removing do…
dmidem Apr 30, 2024
bb9e03b
Fix typo in constant name
dmidem Apr 30, 2024
dd956b8
Fix comments, rename DEFAULT_WITH(OUT)_ZSA to DEVAULT_VANILLA(ZSA)
dmidem May 1, 2024
123b609
1) Use Option instead of usize::MAX in builder::partition_by_asset fu…
dmidem May 2, 2024
ee89541
Refactor build function to remove `Copy + Into<i64>` constraints
dmidem May 7, 2024
73218b0
Remove extra comment
dmidem May 7, 2024
50c6310
Fix comments, indroduce and use MatadataIdx type in the builder
dmidem May 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ jobs:
name: Performance regression check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- uses: actions/checkout@v4
- name: Run benchmark
run: cargo bench -- --output-format bencher | tee output.txt
- name: Store benchmark result
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@ on:

jobs:
deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
- uses: actions/checkout@v4
with:
mdbook-version: '0.4.5'
fetch-depth: 0

- name: Install mdbook-katex
uses: actions-rs/cargo@v1
with:
command: install
args: mdbook-katex
- name: Install mdbook and mdbook-katex
run: |
mkdir mdbook
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.35/mdbook-v0.4.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
curl -sSL https://github.com/lzanini/mdbook-katex/releases/download/v0.5.8pub/mdbook-katex-v0.5.8-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
echo `pwd`/mdbook >> $GITHUB_PATH

- name: Build Orchard book
run: mdbook build book/
Expand Down
134 changes: 51 additions & 83 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,31 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- uses: actions/checkout@v4
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose
run: cargo test --verbose
- name: Verify working directory is clean
run: git diff --exit-code

build:
build-latest:
name: Latest build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
id: toolchain
- run: rustup override set ${{steps.toolchain.outputs.name}}
- name: Remove lockfile to build with latest dependencies
run: rm Cargo.lock
- name: Build crate
run: cargo build --all-features --verbose
- name: Verify working directory is clean (excluding lockfile)
run: git diff --exit-code ':!Cargo.lock'

build-nodefault:
name: Build target ${{ matrix.target }}
runs-on: ubuntu-latest
strategy:
Expand All @@ -31,7 +44,7 @@ jobs:
- wasm32-wasi

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Add target
run: rustup target add ${{ matrix.target }}
- run: cargo fetch
Expand All @@ -41,98 +54,53 @@ jobs:
bitrot:
name: Bitrot check
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- uses: actions/checkout@v4
# Build benchmarks to prevent bitrot
- name: Build benchmarks
uses: actions-rs/cargo@v1
with:
command: build
args: --benches
run: cargo build --benches

book:
name: Book tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
with:
mdbook-version: '0.4.5'
- uses: actions/checkout@v4
- name: Install mdbook
run: |
mkdir mdbook
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.35/mdbook-v0.4.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
echo `pwd`/mdbook >> $GITHUB_PATH
- name: Test Orchard book
run: mdbook test book/

# disabled due to performance issues:
# codecov:
# name: Code coverage
# runs-on: ubuntu-latest
#
# steps:
# - uses: actions/checkout@v2
# # Use stable for this to ensure that cargo-tarpaulin can be built.
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# override: true
# - name: Install cargo-tarpaulin
# uses: actions-rs/cargo@v1
# with:
# command: install
# args: cargo-tarpaulin
# - name: Generate coverage report
# uses: actions-rs/cargo@v1
# with:
# command: tarpaulin
# args: --all-features --timeout 1200 --out Xml
# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v1
# with:
# token: ${{secrets.CODECOV_TOKEN}}
codecov:
name: Code coverage
runs-on: ubuntu-latest
container:
image: xd009642/tarpaulin:develop-nightly
options: --security-opt seccomp=unconfined

steps:
- uses: actions/checkout@v4
- name: Generate coverage report
run: cargo tarpaulin --engine llvm --all-features --release --timeout 600 --out xml
- name: Upload coverage to Codecov
uses: codecov/[email protected]

doc-links:
name: Intra-doc links
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch

# Ensure intra-documentation links all resolve correctly
# Requires #![deny(intra_doc_link_resolution_failure)] in crates.
- uses: actions/checkout@v4
- run: cargo fetch
# Requires #![deny(rustdoc::broken_intra_doc_links)] in crates.
- name: Check intra-doc links
uses: actions-rs/cargo@v1
with:
command: doc
args: --document-private-items
run: cargo doc --all-features --document-private-items

fmt:
name: Rustfmt
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
override: true
- run: rustup component add rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: -- --check
- uses: actions/checkout@v4
- run: cargo fmt -- --check
17 changes: 8 additions & 9 deletions .github/workflows/lints-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@beta
id: toolchain
with:
toolchain: beta
components: clippy
override: true
- name: Run Clippy (beta)
uses: actions-rs/clippy-check@v1
- run: rustup override set ${{steps.toolchain.outputs.name}}
- name: Run Clippy
uses: auguwu/clippy-[email protected]
continue-on-error: true
with:
name: Clippy (beta)
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features --all-targets

working-directory: ${{ inputs.target }}
warn: clippy::all
15 changes: 5 additions & 10 deletions .github/workflows/lints-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,14 @@ on: pull_request

jobs:
clippy:
name: Clippy (1.65.0)
name: Clippy (MSRV)
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
components: clippy
override: true
- uses: actions/checkout@v4
- name: Run Clippy
uses: actions-rs/clippy-check@v1
uses: auguwu/clippy-[email protected]
with:
name: Clippy (1.65.0)
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features --all-targets -- -D warnings
working-directory: ${{ inputs.target }}
deny: warnings
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/target
**/*.rs.bk
Cargo.lock
.vscode
.idea
action-circuit-layout.png
Loading
Loading