Zsa1 diff, for reference only

.github/workflows/ci.yml

@@ -15,7 +15,10 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Run tests
-        run: cargo test --verbose
+        env:
+          # Disable LTO in CI to avoid very slow/hanging release test builds on macOS (rustc/LLVM).
+          CARGO_PROFILE_RELEASE_LTO: "off"
+        run: cargo test --verbose --release
       # verifier-fingerprint capture tests build the k=11 proving key and run real proofs, too
       # heavy for every PR (regenerate the fixtures manually per the docs in
       # src/circuit/fingerprint/mod.rs). Compile them so the cfg(test) module can't rot unnoticed:
@@ -90,6 +93,12 @@ jobs:
       - name: Add target
         working-directory: ./ci-build
         run: rustup target add ${{ matrix.target }}
+      - name: Pin deps to versions compatible with rustc 1.70
+        working-directory: ./ci-build
+        run: |
+          cargo update -p unicode-ident --precise 1.0.12
+          cargo update -p syn --precise 2.0.114
+          cargo update -p quote --precise 1.0.44
       - name: Build no_std for target
         working-directory: ./ci-build
         run: cargo build --verbose --target ${{ matrix.target }}
@@ -116,22 +125,22 @@ jobs:
       - name: Test Orchard book
         run: mdbook test book/
 
-  codecov:
-    name: Code coverage
-    runs-on: ubuntu-latest
-    container:
-      image: xd009642/tarpaulin:develop-nightly
-      options: --security-opt seccomp=unconfined
-    steps:
-      - uses: actions/checkout@v7
-      - name: Generate coverage report
-        # Enable every feature except `verifier-fingerprint`: it is opt-in capture tooling whose
-        # tests build the k=11 proving key and generate real proofs, which are far too heavy to run
-        # under coverage instrumentation on every PR. Run those manually per the docs in
-        # `src/circuit/fingerprint/mod.rs`.
-        run: cargo tarpaulin --engine llvm --features "dev-graph unstable-frost unstable-voting-circuits test-dependencies" --release --timeout 600 --out xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v7.0.0
+#  codecov:
+#    name: Code coverage
+#    runs-on: ubuntu-latest
+#    container:
+#      image: xd009642/tarpaulin:develop-nightly
+#      options: --security-opt seccomp=unconfined
+#    steps:
+#      - uses: actions/checkout@v7
+#      - name: Generate coverage report
+#        # Enable every feature except `verifier-fingerprint`: it is opt-in capture tooling whose
+#        # tests build the k=11 proving key and generate real proofs, which are far too heavy to run
+#        # under coverage instrumentation on every PR. Run those manually per the docs in
+#        # `src/circuit/fingerprint/mod.rs`.
+#        run: cargo tarpaulin --engine llvm --features "dev-graph unstable-frost unstable-voting-circuits test-dependencies" --release --timeout 600 --out xml
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v7.0.0
 
   doc-links:
     name: Intra-doc links

.github/workflows/lints-stable.yml

@@ -58,6 +58,12 @@ jobs:
       - name: Add target
         working-directory: ./ci-build
         run: rustup target add ${{ matrix.target }}
+      - name: Pin deps to versions compatible with rustc 1.70
+        working-directory: ./ci-build
+        run: |
+          cargo update -p unicode-ident --precise 1.0.12
+          cargo update -p syn --precise 2.0.114
+          cargo update -p quote --precise 1.0.44
       - name: Clippy no_std for target
         working-directory: ./ci-build
         run: cargo clippy --verbose --target ${{ matrix.target }}

.gitignore

@@ -1,4 +1,5 @@
 /target
 **/*.rs.bk
 .vscode
+.idea
 action-circuit-layout.png

Cargo.toml

@@ -25,11 +25,12 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"]
 [dependencies]
 aes = "0.8"
 bitvec = { version = "1", default-features = false }
-blake2b_simd = { version = "1", default-features = false }
+blake2b_simd = { version = "=1.0.1", default-features = false }
 ff = { version = "0.13", default-features = false }
 fpe = { version = "0.6", default-features = false, features = ["alloc"] }
 group = "0.13"
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
+secp256k1 = { version = "0.29", default-features = false, features = ["alloc", "rand"], optional = true }
 lazy_static = "1"
 memuse = { version = "0.2.2", default-features = false }
 pasta_curves = { version = "0.5.2", features = ["glv"] }
@@ -92,6 +93,8 @@ multicore = ["halo2_proofs?/multicore"]
 dev-graph = ["halo2_proofs?/dev-graph", "image", "plotters"]
 verifier-fingerprint = ["circuit", "halo2_proofs/unstable-verifier-fingerprint"]
 test-dependencies = ["proptest", "rand/std"]
+zsa-issuance = ["dep:secp256k1"]
+temporary-zebra = []
 
 [[bench]]
 name = "note_decryption"
@@ -112,3 +115,10 @@ debug = true
 
 [profile.bench]
 debug = true
+
+[patch.crates-io]
+sinsemilla = { git = "https://github.com/zcash/sinsemilla", rev = "aabb707e862bc3d7b803c77d14e5a771bcee3e8c" }
+zcash_note_encryption = { git = "https://github.com/zcash/zcash_note_encryption", rev = "40b73b157374b62b648a26b94a1f236e5d9c389f" }
+halo2_gadgets = { git = "https://github.com/zcash/halo2", rev = "828fab66a72116a4a8ea0dc7d8895667d90dacf4" }
+halo2_proofs = { git = "https://github.com/zcash/halo2", rev = "828fab66a72116a4a8ea0dc7d8895667d90dacf4" }
+zcash_spec = { git = "https://github.com/QED-it/zcash_spec", rev = "d5e84264d2ad0646b587a837f4e2424ca64d3a05" }

benches/circuit.rs

@@ -8,34 +8,46 @@ use pprof::criterion::{Output, PProfProfiler};
 
 use orchard::{
     builder::{Builder, BundleType},
-    bundle::BundleVersion,
-    circuit::{OrchardCircuitVersion, ProvingKey, VerifyingKey},
+    circuit::{ProvingKey, VerifyingKey},
     keys::{FullViewingKey, Scope, SpendingKey},
+    note::AssetBase,
     value::NoteValue,
     Anchor, Bundle,
 };
 use rand::rngs::OsRng;
 
-fn criterion_benchmark(c: &mut Criterion) {
+mod utils;
+
+use utils::{IronwoodV3, OrchardFlavorBench, OrchardV2, Zsa};
+
+fn criterion_benchmark<FL: OrchardFlavorBench>(c: &mut Criterion) {
     let rng = OsRng;
 
     let sk = SpendingKey::from_bytes([7; 32]).unwrap();
     let recipient = FullViewingKey::from(&sk).address_at(0u32, Scope::External);
 
-    let vk = VerifyingKey::build(OrchardCircuitVersion::FixedPostNu6_2);
-    let pk = ProvingKey::build(OrchardCircuitVersion::FixedPostNu6_2);
+    let bundle_version = FL::DEFAULT_BUNDLE_VERSION;
+
+    let vk = VerifyingKey::build(bundle_version.circuit_version());
+    let pk = ProvingKey::build(bundle_version.circuit_version());
 
     let create_bundle = |num_recipients| {
         let mut builder = Builder::new(
             BundleType::DEFAULT,
-            BundleVersion::orchard_v2(),
-            BundleVersion::orchard_v2().default_flags(),
+            bundle_version,
+            bundle_version.default_flags(),
             Anchor::from_bytes([0; 32]).unwrap(),
         )
         .unwrap();
         for _ in 0..num_recipients {
             builder
-                .add_output(None, recipient, NoteValue::from_raw(10), [0; 512])
+                .add_output(
+                    None,
+                    recipient,
+                    NoteValue::from_raw(10),
+                    AssetBase::zatoshi(),
+                    [0; 512],
+                )
                 .unwrap();
         }
         let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
@@ -52,7 +64,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     let recipients_range = 1..=4;
 
     {
-        let mut group = c.benchmark_group("proving");
+        let mut group = FL::benchmark_group(c, "proving");
         group.sample_size(10);
         for num_recipients in recipients_range.clone() {
             let (bundle, instances) = create_bundle(num_recipients);
@@ -68,7 +80,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     }
 
     {
-        let mut group = c.benchmark_group("verifying");
+        let mut group = FL::benchmark_group(c, "verifying");
         for num_recipients in recipients_range {
             let (bundle, instances) = create_bundle(num_recipients);
             let bundle = bundle
@@ -85,15 +97,31 @@ fn criterion_benchmark(c: &mut Criterion) {
 }
 
 #[cfg(unix)]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(PProfProfiler::new(100, Output::Flamegraph(None)));
-    targets = criterion_benchmark
+fn create_config() -> Criterion {
+    Criterion::default().with_profiler(PProfProfiler::new(100, Output::Flamegraph(None)))
 }
+
 #[cfg(windows)]
+fn create_config() -> Criterion {
+    Criterion::default()
+}
+
 criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = criterion_benchmark
+    name = benches_orchard_v2;
+    config = create_config();
+    targets = criterion_benchmark::<OrchardV2>
 }
-criterion_main!(benches);
+
+criterion_group! {
+    name = benches_ironwood_v3;
+    config = create_config();
+    targets = criterion_benchmark::<IronwoodV3>
+}
+
+criterion_group! {
+    name = benches_zsa;
+    config = create_config();
+    targets = criterion_benchmark::<Zsa>
+}
+
+criterion_main!(benches_orchard_v2, benches_ironwood_v3, benches_zsa);