Migrate Crypto Upgrades from #153

.github/workflows/audit.yml

@@ -1,9 +1,6 @@
 name: Audit
 on:
-  pull_request:
-  push:
-  schedule:
-    - cron: '0 */12 * * *'
+  workflow_dispatch:
 jobs:
   audit:
     runs-on: ubuntu-latest

.github/workflows/bench.yml

@@ -1,5 +1,8 @@
 name: Benchmark
 on:
+  push:
+    branches:
+      - 'main'
   workflow_dispatch:
 env:
   CARGO_TERM_COLOR: always

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
       - 'main'
   schedule:
     - cron: '0 0 * * */2'
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
 ### Added
 - [\#172](https://github.com/Manta-Network/manta-rs/pull/172) Add abstract Phase 2 for Groth16 trusted setup 
+- [\#197](https://github.com/Manta-Network/manta-rs/pull/197) Add ECLAIR utilities for next circuit upgrade
 
 ### Changed
 - [\#180](https://github.com/Manta-Network/manta-rs/pull/180) Start moving to new `arkworks` backend for `manta-crypto`

manta-accounting/src/transfer/mod.rs

@@ -34,7 +34,7 @@ use alloc::vec::Vec;
 use core::{fmt::Debug, hash::Hash, marker::PhantomData, ops::Deref};
 use manta_crypto::{
     accumulator::{self, AssertValidVerification, MembershipProof, Model},
-    constraint::{ProofSystem, ProofSystemInput},
+    constraint::{HasInput, ProofSystem},
     eclair::{
         self,
         alloc::{
@@ -236,12 +236,12 @@ pub trait Configuration {
 
     /// Proof System Type
     type ProofSystem: ProofSystem<Compiler = Self::Compiler>
-        + ProofSystemInput<AssetId>
-        + ProofSystemInput<AssetValue>
-        + ProofSystemInput<UtxoAccumulatorOutput<Self>>
-        + ProofSystemInput<Utxo<Self>>
-        + ProofSystemInput<VoidNumber<Self>>
-        + ProofSystemInput<PublicKey<Self>>;
+        + HasInput<AssetId>
+        + HasInput<AssetValue>
+        + HasInput<UtxoAccumulatorOutput<Self>>
+        + HasInput<Utxo<Self>>
+        + HasInput<VoidNumber<Self>>
+        + HasInput<PublicKey<Self>>;
 
     /// Note Base Encryption Scheme Type
     type NoteEncryptionScheme: encryption::Encrypt<
@@ -297,8 +297,7 @@ pub type UtxoAccumulatorOutput<C> =
 pub type UtxoMembershipProof<C> = MembershipProof<<C as Configuration>::UtxoAccumulatorModel>;
 
 /// UTXO Membership Proof Variable Type
-pub type UtxoMembershipProofVar<C> =
-    MembershipProof<<C as Configuration>::UtxoAccumulatorModelVar, Compiler<C>>;
+pub type UtxoMembershipProofVar<C> = MembershipProof<<C as Configuration>::UtxoAccumulatorModelVar>;
 
 /// Encrypted Note Type
 pub type EncryptedNote<C> = EncryptedMessage<

manta-accounting/src/transfer/receiver.rs

@@ -25,8 +25,7 @@ use crate::{
 };
 use core::{fmt::Debug, hash::Hash, iter};
 use manta_crypto::{
-    accumulator::Accumulator,
-    constraint::ProofSystemInput,
+    constraint::HasInput,
     eclair::{
         alloc::{
             mode::{Derived, Public},
@@ -97,16 +96,6 @@ where
         self.encrypted_note.ephemeral_public_key()
     }
 
-    /// Returns `true` whenever `self.utxo` and `rhs.utxo` can be inserted in any order into the
-    /// `utxo_accumulator`.
-    #[inline]
-    pub fn is_independent_from<A>(&self, rhs: &Self, utxo_accumulator: &A) -> bool
-    where
-        A: Accumulator<Item = Utxo<C>, Model = C::UtxoAccumulatorModel>,
-    {
-        utxo_accumulator.are_independent(&self.utxo, &rhs.utxo)
-    }
-
     /// Extracts the ledger posting data from `self`.
     #[inline]
     pub fn into_post(self) -> ReceiverPost<C> {

manta-accounting/src/transfer/sender.rs

@@ -27,7 +27,7 @@ use crate::{
 use core::{fmt::Debug, hash::Hash, iter};
 use manta_crypto::{
     accumulator::Accumulator,
-    constraint::ProofSystemInput,
+    constraint::HasInput,
     eclair::{
         alloc::{mode::Derived, Allocate, Allocator, Variable},
         bool::AssertEq,
@@ -142,16 +142,6 @@ where
             None
         }
     }
-
-    /// Returns `true` whenever `self.utxo` and `rhs.utxo` can be inserted in any order into the
-    /// `utxo_accumulator`.
-    #[inline]
-    pub fn is_independent_from<A>(&self, rhs: &Self, utxo_accumulator: &A) -> bool
-    where
-        A: Accumulator<Item = Utxo<C>, Model = C::UtxoAccumulatorModel>,
-    {
-        utxo_accumulator.are_independent(&self.utxo, &rhs.utxo)
-    }
 }
 
 /// Sender Proof
@@ -211,16 +201,6 @@ where
         self.asset.value
     }
 
-    /// Returns `true` whenever `self.utxo` and `rhs.utxo` can be inserted in any order into the
-    /// `utxo_accumulator`.
-    #[inline]
-    pub fn is_independent_from<A>(&self, rhs: &Self, utxo_accumulator: &A) -> bool
-    where
-        A: Accumulator<Item = Utxo<C>, Model = C::UtxoAccumulatorModel>,
-    {
-        utxo_accumulator.are_independent(&self.utxo, &rhs.utxo)
-    }
-
     /// Reverts `self` back into a [`PreSender`].
     ///
     /// This method should be called if the [`Utxo`] membership proof attached to `self` was deemed

manta-crypto/Cargo.toml

@@ -59,4 +59,5 @@ rand_core = { version = "0.6.3", default-features = false }
 workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 
 [dev-dependencies]
-rand = "0.8.4"
+ark-bn254 = { version = "0.3.0", default-features = false, features = ["scalar_field"] }
+manta-crypto = { path = ".", default-features = false, features = ["getrandom"] }