Commit Graph

1248 Commits

Author SHA1 Message Date
Kris Nuttycombe e127230af0
Merge pull request #411 from nuttycom/public_merkle_depth
Make the `MERKLE_DEPTH_ORCHARD` constant public.
2024-01-06 10:02:15 -07:00
Kris Nuttycombe 110ad5c642 Make the `MERKLE_DEPTH_ORCHARD` constant public. 2024-01-05 13:41:19 -07:00
Kris Nuttycombe ba70c32c28
Merge pull request #409 from zcash/required_bundles
Modify `BundleType` to exclude the anchor & allow no bundle to be produced.
2023-12-21 08:16:32 -07:00
Kris Nuttycombe 189257391a Expose `Anchor::empty_tree`. 2023-12-20 20:25:06 -07:00
Kris Nuttycombe 3845686a6e Modify `BundleType` to exclude the anchor & allow no bundle to be produced.
This adds a flag to `BundleType` that, when set, requires a dummy-only
bundle to be produced even if no spends or outputs are added to the
builder, and when unset results in standard padding.
2023-12-20 19:29:14 -07:00
str4d a0f1acadb3
Merge pull request #408 from daira/fix-changelog-entries
Move some changelog entries from 0.3.0 to 0.4.0
2023-12-20 00:57:34 +00:00
str4d a5948cd778
Fix path to `orchard::note::Nullifier` in CHANGELOG.md 2023-12-20 00:56:26 +00:00
Daira Emma Hopwood 71d9ddd637 Move some changelog entries from 0.3.0 to 0.4.0.
The changelog changes in #362 had a non-merge conflict with #363,
because #362 was implemented as if it would be part of the 0.3.0
release but was in fact merged just afterwards.

fixes #391

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-12-20 00:21:57 +00:00
str4d c375696787
Merge pull request #405 from daira/change-license
Change license from BOSL to "MIT OR Apache-2.0"
2023-12-20 00:03:42 +00:00
Daira Emma Hopwood ac4b52187f Switch to MIT or Apache 2.0 licensing.
Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-12-19 21:35:25 +00:00
Daira Emma Hopwood 153b793b26 Change my name in Cargo.toml and remove an old email address for
Ying Tong Lai.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-12-19 21:34:28 +00:00
str4d 78f598616a
Merge pull request #404 from nuttycom/builder_functions
Add a public bundle-builder function as an alternative to the mutable builder.
2023-12-19 20:03:08 +00:00
Kris Nuttycombe 938b203de5 Apply suggestions from code review
Co-authored-by: str4d <thestr4d@gmail.com>
2023-12-19 12:45:43 -07:00
Kris Nuttycombe 2e2c161d52 Add a public bundle construction function & use it in the builder. 2023-12-18 21:56:42 -07:00
Kris Nuttycombe 0a257d6f68 Add explicit control of padding to the Builder API. 2023-12-15 15:08:22 -07:00
Kris Nuttycombe 06cb76168e Rename `Builder::add_recipient` to `add_output`.
The term `recipient` is commonly used to refer to the address to which a
note is sent; however, a bundle may include multiple outputs to the same
recipient. This change is intended to clarify this usage.

Co-authored-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-12-14 15:56:42 -07:00
str4d 003619bad4
Merge pull request #402 from zcash/ci-updates
CI: Modernise workflows
2023-11-30 08:04:40 +00:00
str4d 4bb65b9330
Merge pull request #323 from defuse/nu5-consensus-labeled
Label Consensus Rules
2023-11-29 04:36:23 +00:00
Jack Grigg a12661cf19 CI: Modernise workflows 2023-11-29 03:42:17 +00:00
Jack Grigg 866d5ca3f6 Add `Cargo.lock` to repository
This is currently "whatever lockfile happened to last work for str4d",
but going forward will be the lockfile we use for testing our MSRV. See
https://blog.rust-lang.org/2023/08/29/committing-lockfiles for rationale
on this change.
2023-11-28 23:53:24 +00:00
str4d c48247dd34
Merge pull request #398 from zcash/update_incrementalmerkletree
Migrate to `incrementalmerkletree 0.5`
2023-09-08 19:21:50 +01:00
Jack Grigg bb6e3afc08 orchard 0.6.0 2023-09-08 17:52:14 +00:00
Jack Grigg 7fa0edbd98 Bump MSRV to 1.65
`reddsa 0.5.1` has MSRV 1.65.
2023-09-08 17:52:14 +00:00
Jack Grigg 1ff53e963c CI: Use `rust-toolchain.toml` for MSRV checks 2023-09-08 17:34:38 +00:00
Jack Grigg 213b11a7ad Migrate to published `incrementalmerkletree 0.5` 2023-09-08 17:16:42 +00:00
Jack Grigg 6ef89d5f15 Update incrementalmerkletree deps again with bugfixes 2023-07-06 21:58:09 +00:00
Kris Nuttycombe 5da41a6bbb Upgrade incrementalmerkletree deps for pre-dag-sync 2023-06-29 15:33:16 -06:00
Kris Nuttycombe 2103db8290
Merge pull request #397 from zcash/release-0.5.0
orchard release version 0.5.0
2023-06-06 12:23:12 -06:00
Kris Nuttycombe ca55cadbad orchard release version 0.5.0 2023-06-06 11:10:49 -06:00
Kris Nuttycombe e9f556ead4
Merge pull request #396 from zcash/simplify_parse_note_plaintext_ovk_args
Update `zcash_note_encryption` to remove unused arguments from `parse_note_plaintext_without_memo_ovk`
2023-05-31 12:54:40 -06:00
Kris Nuttycombe 2a4f27c937 Update `zcash_note_encryption` to remove unused arguments from parse_note_plaintext_without_memo_ovk. 2023-05-26 09:28:01 -06:00
Kris Nuttycombe 729def6c60
Merge pull request #394 from zcash/note-encryption-avoid-redundant-checks
Remove redundant checks during note encryption
2023-05-26 09:13:20 -06:00
Kris Nuttycombe 11b6858ac8
Merge pull request #395 from nuttycom/update_bridgetree
Update the `incrementalmerkletree` and `bridgetree` patch versions.
2023-05-25 11:38:40 -06:00
str4d f4a785adae
Merge pull request #393 from daira/book-notecommit-missing-paren
[book] Add a missing right parenthesis
2023-05-24 23:24:47 +01:00
Kris Nuttycombe 6cf6f15bf1 Update the `incrementalmerkletree` and `bridgetree` patch versions.
This also removes the `bridgetree` transitive dependency when building
using the `test-dependencies` feature flag, as the only use of it can be
satisfied just with `incrementalmerkletree`.
2023-05-24 15:36:25 -06:00
Jack Grigg 90e64cbac0 Remove redundant checks during note encryption
The consistency check between `esk` and `ephemeral_key` is checked
inside `zcash_note_encryption::try_output_recovery_with_ock`, and the
requirement to check it inside the `Domain` implementation is being
lifted in zcash/librustzcash#848.

Removing the check here improves performance, both because we avoid an
extra scalar multiplication from `esk.derive_public()`, and because we
avoid an unnecessary `spec::diversify_hash()` call which is expensive
for Orchard.
2023-05-19 16:43:17 +00:00
Daira Emma Hopwood a38bc537c9 [book] Add a missing right parenthesis. fixes #392
Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
2023-05-02 14:53:09 +01:00
Kris Nuttycombe 3619b86d1c
Merge pull request #373 from nuttycom/update_incrementalmerkletree
Update to development versions of incrementalmerkletree/bridgetree
2023-04-12 14:16:38 -06:00
Kris Nuttycombe 8bc53ecbde Update to development versions of incrementalmerkletree/bridgetree
This modifies the tests where required to use bridgetree checkpoint
identifiers.
2023-04-11 10:33:25 -06:00
str4d 7d4aa67eaa
Merge pull request #390 from zcash/release-0.4.0
Release 0.4.0
2023-04-11 14:02:47 +01:00
Jack Grigg 63ab47ecc9 orchard 0.4.0 2023-04-11 09:00:17 +00:00
Kris Nuttycombe b40a12f1ff
Merge pull request #389 from zcash/368-fix-variable-name
Fix variable name in `spec::diversify_hash`
2023-04-10 19:06:06 -06:00
Jack Grigg a65018f93c Fix variable name in `spec::diversify_hash`
Closes zcash/orchard#368.
2023-04-11 00:23:33 +00:00
Kris Nuttycombe d612d0454c
Merge pull request #388 from zcash/369-fpe-0.6
Migrate to `fpe 0.6`
2023-04-10 17:33:58 -06:00
Jack Grigg 955681b1f7 Migrate to `fpe 0.6`
Closes zcash/orchard#369.
2023-04-10 22:49:40 +00:00
Kris Nuttycombe 047201dafd
Merge pull request #387 from nuttycom/upgrade/incrementalmerkletree_0.3.1
Upgrade `incrementalmerkletree` dependency to version 0.3.1
2023-04-05 10:00:51 -06:00
Kris Nuttycombe 8f452540d4 Upgrade `incrementalmerkletree` dependency to version 0.3.1
Fixes #375
2023-04-05 09:38:11 -06:00
Kris Nuttycombe bdcf15ba21
Merge pull request #385 from nuttycom/upgrade/halo2_0.3.0
Update to halo2_proofs and halo2_gadgets v0.3.0
2023-03-22 13:28:36 -06:00
Kris Nuttycombe feedd693dd Update to halo2_proofs and halo2_gadgets v0.3.0
Fixes #376
2023-03-22 13:11:28 -06:00
Kris Nuttycombe 97d12603d9
Merge pull request #384 from nuttycom/use_zcash_not_encryption-0.3.0-final
Use released version of zcash_note_encryption 0.3.0
2023-03-22 11:28:27 -06:00