Merge branch main into zsa1

.github/workflows/ci.yml

@@ -22,6 +22,22 @@ jobs:
           command: test
           args: --verbose
 
+  build:
+    name: Build target ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - wasm32-wasi
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add target
+        run: rustup target add ${{ matrix.target }}
+      - run: cargo fetch
+      - name: Build for ${{ matrix.target }} target
+        run: cargo build --verbose --no-default-features --target ${{ matrix.target }}
+
   bitrot:
     name: Bitrot check
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to Rust's notion of
 
 ## [Unreleased]
 
+## [0.4.0] - 2023-04-11
+### Added
+- `orchard::builder`:
+  - `{SpendInfo::new, InputView, OutputView}`
+  - `Builder::{spends, outputs}`
+  - `SpendError` 
+  - `OutputError` 
+
+### Changed
+- MSRV is now 1.60.0.
+- Migrated to `ff 0.13`, `group 0.13`, `pasta_curves 0.5`, `halo2_proofs 0.3`,
+  `halo2_gadgets 0.3`, `reddsa 0.5`, `zcash_note_encryption 0.3`.
+- `orchard::builder`:
+  - `Builder::{add_spend, add_output}` now use concrete error types instead of
+    `&'static str`s.
+  - `Error` has been renamed to `BuildError` to differentiate from new error
+    types.
+  - `BuildError` now implements `std::error::Error` and `std::fmt::Display`.
+
+### Fixed
+- Several bugs have been fixed that were preventing Orchard bundles from being
+  created or verified on 32-bit platforms, or with recent versions of Rust.
+
 ## [0.3.0] - 2022-10-19
 ### Added
 - `orchard::Proof::add_to_batch`
@@ -21,7 +44,6 @@ and this project adheres to Rust's notion of
   - `impl memuse::DynamicUsage for Nullifier`
 - `orchard::note_encryption`:
   - `impl memuse::DynamicUsage for OrchardDomain`
-- `orchard::builder::SpendInfo::new`
 - `orchard::circuit::Circuit::from_action_context`
 - impls of `Eq` for:
   - `orchard::zip32::ChildIndex`

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "orchard"
-version = "0.3.0"
+version = "0.4.0"
 authors = [
     "Sean Bowe <sean@electriccoin.co>",
     "Jack Grigg <jack@electriccoin.co>",
@@ -23,39 +23,43 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"]
 
 [dependencies]
-aes = "0.7"
+aes = "0.8"
 bitvec = "1"
 blake2b_simd = "1"
-ff = "0.12"
-fpe = "0.5"
-group = { version = "0.12.1", features = ["wnaf-memuse"] }
+bridgetree = { version = "0.2", optional = true }
+ff = "0.13"
+fpe = "0.6"
+group = { version = "0.13", features = ["wnaf-memuse"] }
 halo2_gadgets = { git = "https://github.com/QED-it/halo2", branch = "zsa1" }
-halo2_proofs = { git = "https://github.com/QED-it/halo2", branch = "zsa1"}
+halo2_proofs = { git = "https://github.com/QED-it/halo2", branch = "zsa1", default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] }
 hex = "0.4"
 lazy_static = "1"
 memuse = { version = "0.2.1", features = ["nonempty"] }
-pasta_curves = "0.4"
+pasta_curves = "0.5"
 proptest = { version = "1.0.0", optional = true }
 rand = "0.8"
-reddsa = "0.3"
+reddsa = "0.5"
 nonempty = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 subtle = "2.3"
 zcash_note_encryption = "0.2"
-incrementalmerkletree = "0.3"
+incrementalmerkletree = "0.3.1"
 
 # Logging
 tracing = "0.1"
 
 # Developer tooling dependencies
+image = { version = ">= 0.24, < 0.24.5", optional = true } # 0.24.5 has MSRV 1.61
 plotters = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
+bridgetree = "0.2"
 criterion = "0.3"
 halo2_gadgets = { git = "https://github.com/QED-it/halo2", branch = "zsa1", features = ["test-dependencies"] }
 hex = "0.4"
 proptest = "1.0.0"
 zcash_note_encryption = { version = "0.2", features = ["pre-zip-212"] }
+incrementalmerkletree = { version = "0.3", features = ["test-dependencies"] }
 
 [target.'cfg(unix)'.dev-dependencies]
 inferno = ">= 0.11, < 0.11.15"
@@ -65,8 +69,10 @@ pprof = { version = "0.9", features = ["criterion", "flamegraph"] } # MSRV 1.56
 bench = false
 
 [features]
-dev-graph = ["halo2_proofs/dev-graph", "plotters"]
-test-dependencies = ["proptest"]
+default = ["multicore"]
+multicore = ["halo2_proofs/multicore"]
+dev-graph = ["halo2_proofs/dev-graph", "image", "plotters"]
+test-dependencies = ["bridgetree", "proptest"]
 
 [[bench]]
 name = "note_decryption"
@@ -88,3 +94,5 @@ debug = true
 
 [patch.crates-io]
 zcash_note_encryption = { git = "https://github.com/QED-it/librustzcash.git", rev = "07c377ddedf71ab7c7a266d284b054a2dafc2ed4" }
+bridgetree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "ea1686e8f8f6c1e41aa97251a7eb4fadfd33df47" }
+incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "ea1686e8f8f6c1e41aa97251a7eb4fadfd33df47" }

rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.61.0"
+components = [ "clippy", "rustfmt" ]