Merge pull request #152 from zcash/expose_prover_progress

Expose prover progress

CHANGELOG.md

@@ -15,7 +15,7 @@ and this library adheres to Rust's notion of
   avoid the need to depend upon the `bellman` crate.
 
 ### Changed
-- MSRV is now 1.66
+- MSRV is now 1.70
 
 ## [0.4.0] - 2024-12-16
 

Cargo.toml

@@ -7,7 +7,7 @@ authors = [
     "Kris Nuttycombe <[email protected]>",
 ]
 edition = "2021"
-rust-version = "1.66"
+rust-version = "1.70"
 description = "Cryptographic library for Zcash Sapling"
 homepage = "https://github.com/zcash/sapling-crypto"
 repository = "https://github.com/zcash/sapling-crypto"
@@ -91,7 +91,7 @@ std = [
   "core2/std",
   "dep:document-features",
   "group/wnaf-memuse",
-  "redjubjub/std",
+  "redjubjub/std"
 ]
 
 ## Enables creation of Sapling proofs
@@ -126,4 +126,4 @@ name = "pedersen_hash"
 harness = false
 
 [patch.crates-io]
-redjubjub = { git = "https://github.com/nuttycom/redjubjub", rev = "e413019904400f4caa3550df7c4040befadfbb14" }
+redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub", rev = "eae848c5c14d9c795d000dd9f4c4762d1aee7ee1" }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.66.0"
+channel = "1.70.0"
 components = ["clippy", "rustfmt"]

src/builder.rs

@@ -697,7 +697,7 @@ impl Builder {
             Zip212Enforcement::Off | Zip212Enforcement::GracePeriod => {
                 Err(Error::PcztRequiresZip212)
             }
-            Zip212Enforcement::On => build_bundle::<_, (), (), _>(
+            Zip212Enforcement::On => build_bundle(
                 rng,
                 self.bundle_type,
                 Zip212Enforcement::On,
@@ -743,7 +743,7 @@ pub fn bundle<SP: SpendProver, OP: OutputProver, R: RngCore, V: TryFrom<i64>>(
     outputs: Vec<OutputInfo>,
     extsks: &[ExtendedSpendingKey],
 ) -> Result<Option<(UnauthorizedBundle<V>, SaplingMetadata)>, Error> {
-    build_bundle::<_, SP, OP, _>(
+    build_bundle(
         rng,
         bundle_type,
         zip212_enforcement,
@@ -813,7 +813,7 @@ pub fn bundle<SP: SpendProver, OP: OutputProver, R: RngCore, V: TryFrom<i64>>(
     )
 }
 
-fn build_bundle<B, SP, OP, R: RngCore>(
+fn build_bundle<B, R: RngCore>(
     mut rng: R,
     bundle_type: BundleType,
     zip212_enforcement: Zip212Enforcement,
@@ -980,27 +980,24 @@ impl InProgressProofs for Proven {
 }
 
 /// Reports on the progress made towards creating proofs for a bundle.
-#[cfg(feature = "circuit")]
 pub trait ProverProgress {
     /// Updates the progress instance with the number of steps completed and the total
     /// number of steps.
     fn update(&mut self, cur: u32, end: u32);
 }
 
-#[cfg(feature = "circuit")]
 impl ProverProgress for () {
     fn update(&mut self, _: u32, _: u32) {}
 }
 
-#[cfg(all(feature = "circuit", feature = "std"))]
+#[cfg(feature = "std")]
 impl<U: From<(u32, u32)>> ProverProgress for std::sync::mpsc::Sender<U> {
     fn update(&mut self, cur: u32, end: u32) {
         // If the send fails, we should ignore the error, not crash.
         self.send(U::from((cur, end))).unwrap_or(());
     }
 }
 
-#[cfg(feature = "circuit")]
 impl<U: ProverProgress> ProverProgress for &mut U {
     fn update(&mut self, cur: u32, end: u32) {
         (*self).update(cur, end);