Skip to content

Merge branch main into zsa1#59

Merged
ConstanceBeguier merged 44 commits intozsa1from
zsa1-merge
May 16, 2023
Merged

Merge branch main into zsa1#59
ConstanceBeguier merged 44 commits intozsa1from
zsa1-merge

Conversation

@ConstanceBeguier
Copy link
Collaborator

@ConstanceBeguier ConstanceBeguier commented May 16, 2023

For zcash_note_encryption, we have to use version 0.2 with QEDIT patch.

AloeareV and others added 30 commits December 1, 2022 16:51
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
Co-authored-by: str4d <thestr4d@gmail.com>
…pend_and_output_construction

Add concrete error types for add_spend and add_output
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Kris Nuttycombe <kris@nutty.land>
…tters_to_builder

Add spends/outputs getter fns to builders for use in change calculation
Fix clippy beta lints that are applicable given an MSRV of 1.60
Co-authored-by: Greg Pfeil <greg@technomadic.org>
Update to make use of the floor-planner-v1-legacy-pdqsort feature.
…ency

Upgrade patch version of halo2 dependencies.
Remove the `halo2-batch` feature flag and rename `halo2-multicore` to just `multicore`
@ConstanceBeguier ConstanceBeguier changed the title Merge main into zsa1 (2023_05) Merge main into zsa1 May 16, 2023
@ConstanceBeguier ConstanceBeguier requested a review from PaulLaux May 16, 2023 09:00
@ConstanceBeguier ConstanceBeguier changed the title Merge main into zsa1 Merge branch main into zsa1 May 16, 2023
Copy link
Collaborator

@PaulLaux PaulLaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice.

@ConstanceBeguier ConstanceBeguier merged commit c77d96c into zsa1 May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants