wip

Author: sebastiencs

ledger/src/proofs/block.rs

@@ -35,6 +35,7 @@ use crate::{
         transaction_logic::protocol_state::{EpochLedger, ProtocolStateView},
     },
     staged_ledger::hash::StagedLedgerHash,
+    zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface},
     Inputs, ToInputs,
 };
 
@@ -1637,10 +1638,14 @@ fn block_main<'a>(
         txn_statement_ledger_hashes_equal(s1, &s2, w)
     };
 
-    let supply_increase = w.exists_no_check(match txn_stmt_ledger_hashes_didn_t_change {
-        Boolean::True => CheckedSigned::zero(),
-        Boolean::False => txn_snark.supply_increase.to_checked(),
-    });
+    let supply_increase = CheckedSigned::on_if(
+        txn_stmt_ledger_hashes_didn_t_change.var(),
+        SignedAmountBranchParam {
+            on_true: &CheckedSigned::zero(),
+            on_false: &txn_snark.supply_increase.to_checked(),
+        },
+        w,
+    );
 
     let (updated_consensus_state, consensus_state) = consensus::next_state_checked(
         previous_state,

ledger/src/proofs/numbers/currency.rs

@@ -93,6 +93,16 @@ where
         }
     }
 
+    // https://github.com/MinaProtocol/mina/blob/ca9c8c86aa21d3c346d28ea0be7ad4cb0c22bf7f/src/lib/transaction_snark/transaction_snark.ml#L1891-L1892
+    // https://github.com/MinaProtocol/mina/blob/ca9c8c86aa21d3c346d28ea0be7ad4cb0c22bf7f/src/lib/currency/currency.ml#L579
+    pub fn constant_zero() -> Self {
+        Self {
+            magnitude: T::zero(),
+            sgn: CircuitVar::Constant(Sgn::Pos),
+            value: Cell::new(Some(T::zero().to_field())),
+        }
+    }
+
     pub fn negate(self) -> Self {
         Self {
             magnitude: self.magnitude,

ledger/src/proofs/to_field_elements.rs

@@ -32,7 +32,6 @@ use crate::{
 
 use super::{
     field::{Boolean, CircuitVar, FieldWitness, GroupAffine},
-    numbers::currency::{CheckedCurrency, CheckedSigned},
     step::PerProofWitness,
     transaction::{
         field_to_bits, InnerCurve, PlonkVerificationKeyEvals, StepMainProofState, StepMainStatement,
@@ -799,13 +798,6 @@ impl<F: FieldWitness, T: ToFieldElements<F>> ToFieldElements<F> for &T {
     }
 }
 
-impl<F: FieldWitness, T: CheckedCurrency<F>> ToFieldElements<F> for CheckedSigned<F, T> {
-    fn to_field_elements(&self, fields: &mut Vec<F>) {
-        self.sgn.to_field_elements(fields);
-        self.magnitude.to_field_elements(fields);
-    }
-}
-
 impl<F: FieldWitness> ToFieldElements<F> for InnerCurve<F> {
     fn to_field_elements(&self, fields: &mut Vec<F>) {
         let GroupAffine::<F> { x, y, .. } = self.to_affine();

ledger/src/proofs/zkapp.rs

@@ -1075,8 +1075,8 @@ fn zkapp_main(
                 ledger: witness.global_second_pass_ledger.clone(),
                 hash: statement.source.second_pass_ledger,
             },
-            fee_excess: CheckedSigned::zero(),
-            supply_increase: CheckedSigned::zero(),
+            fee_excess: CheckedSigned::constant_zero(),
+            supply_increase: CheckedSigned::constant_zero(),
             protocol_state: state_body.view(),
             block_global_slot,
         };

ledger/src/zkapps/intefaces.rs

@@ -142,7 +142,7 @@ where
     fn negate(&self) -> Self;
     fn add_flagged(&self, other: &Self, w: &mut Self::W) -> (Self, Self::Bool);
     fn of_unsigned(unsigned: Self::Amount) -> Self;
-    fn on_if<'a>(b: Self::Bool, param: SignedAmountBranchParam<&'a Self>, w: &mut Self::W) -> Self;
+    fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self;
 }
 
 pub trait BalanceInterface
@@ -580,8 +580,7 @@ where
     >;
     type SignedAmount: SignedAmountInterface<W = Self::WitnessGenerator, Bool = Self::Bool, Amount = Self::Amount>
         + std::fmt::Debug
-        + Clone
-        + ToFieldElements<Fp>;
+        + Clone;
     type Amount: AmountInterface<W = Self::WitnessGenerator, Bool = Self::Bool> + Clone;
     type Balance: BalanceInterface<
         W = Self::WitnessGenerator,

ledger/src/zkapps/non_snark.rs

@@ -401,11 +401,11 @@ impl SignedAmountInterface for Signed<Amount> {
     fn of_unsigned(unsigned: Self::Amount) -> Self {
         Self::of_unsigned(unsigned)
     }
-    fn on_if<'a>(b: Self::Bool, param: SignedAmountBranchParam<&'a Self>, w: &mut Self::W) -> Self {
+    fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self {
         let SignedAmountBranchParam { on_true, on_false } = param;
         match b {
-            true => on_true.clone(),
-            false => on_false.clone(),
+            true => *on_true,
+            false => *on_false,
         }
     }
 }

ledger/src/zkapps/snark.rs

@@ -210,7 +210,7 @@ impl SignedAmountInterface for CheckedSigned<Fp, CheckedAmount<Fp>> {
     fn of_unsigned(unsigned: Self::Amount) -> Self {
         Self::of_unsigned(unsigned)
     }
-    fn on_if<'a>(b: Self::Bool, param: SignedAmountBranchParam<&'a Self>, w: &mut Self::W) -> Self {
+    fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self {
         let SignedAmountBranchParam { on_true, on_false } = param;
 
         let amount = match b.as_boolean() {