Call our new non_snark::{start,step} to apply zkapps

Author: sebastiencs

ledger/src/proofs/zkapp.rs

@@ -745,8 +745,8 @@ pub fn zkapp_command_witnesses_exn(
                     data: call_stack,
                     hash: Fp::zero(), // TODO
                 },
-                transaction_commitment: TransactionCommitment(transaction_commitment.0),
-                full_transaction_commitment: TransactionCommitment(full_transaction_commitment.0),
+                transaction_commitment: TransactionCommitment(transaction_commitment),
+                full_transaction_commitment: TransactionCommitment(full_transaction_commitment),
                 excess,
                 supply_increase,
                 ledger,

ledger/src/scan_state/scan_state.rs

@@ -32,12 +32,15 @@ use crate::{
             transaction_partially_applied::{
                 TransactionPartiallyApplied, ZkappCommandPartiallyApplied,
             },
+            zkapp_command::AccountUpdate,
             TransactionStatus,
         },
     },
-    sparse_ledger::{LedgerIntf, SparseLedger},
+    sparse_ledger::SparseLedger,
     staged_ledger::hash::AuxHash,
     verifier::Verifier,
+    zkapps::intefaces::LedgerInterface,
+    Account,
 };
 
 use self::transaction_snark::{InitStack, LedgerProof, OneOrTwo, Registers};
@@ -1434,7 +1437,7 @@ impl ScanState {
         apply_first_pass_sparse_ledger: ApplyFirstSparse,
     ) -> Result<Pass, String>
     where
-        L: LedgerIntf + Clone,
+        L: LedgerInterface<W = (), Bool = bool, Account = Account, AccountUpdate = AccountUpdate>,
         F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
         ApplyFirst: Fn(
             Slot,
@@ -1455,7 +1458,9 @@ impl ScanState {
         let stop_at_first_pass = stop_at_first_pass.unwrap_or(false);
 
         #[derive(Clone)]
-        enum PreviousIncompleteTxns<L: LedgerIntf + Clone> {
+        enum PreviousIncompleteTxns<
+            L: LedgerInterface<W = (), Bool = bool, Account = Account, AccountUpdate = AccountUpdate>,
+        > {
             Unapplied(Vec<Arc<TransactionWithWitness>>),
             PartiallyApplied(Vec<(TransactionStatus, TransactionPartiallyApplied<L>)>),
         }
@@ -1469,7 +1474,12 @@ impl ScanState {
             get_protocol_state: F,
         ) -> Result<TransactionPartiallyApplied<L>, String>
         where
-            L: LedgerIntf + Clone,
+            L: LedgerInterface<
+                W = (),
+                Bool = bool,
+                Account = Account,
+                AccountUpdate = AccountUpdate,
+            >,
             F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
             Apply: Fn(
                 Slot,
@@ -1536,7 +1546,12 @@ impl ScanState {
             apply_second_pass: ApplySecond,
         ) -> Result<(), String>
         where
-            L: LedgerIntf + Clone,
+            L: LedgerInterface<
+                W = (),
+                Bool = bool,
+                Account = Account,
+                AccountUpdate = AccountUpdate,
+            >,
             ApplySecond:
                 Fn(&mut L, TransactionPartiallyApplied<L>) -> Result<TransactionApplied, String>,
         {
@@ -1568,7 +1583,12 @@ impl ScanState {
             apply_txns_second_pass: ApplySecondPass,
         ) -> Result<R, String>
         where
-            L: LedgerIntf + Clone,
+            L: LedgerInterface<
+                W = (),
+                Bool = bool,
+                Account = Account,
+                AccountUpdate = AccountUpdate,
+            >,
             F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
             ApplySecondPass: Fn(Acc<L>) -> Result<R, String>,
             ApplyFirstSparse: Fn(
@@ -1622,7 +1642,7 @@ impl ScanState {
                                 block_global_slot: zkapp.global_state.block_global_slot,
                             };
 
-                            let local_state = LocalStateEnv {
+                            let local_state = LocalStateEnv::<L> {
                                 stack_frame: zkapp.local_state.stack_frame,
                                 call_stack: zkapp.local_state.call_stack,
                                 transaction_commitment: zkapp.local_state.transaction_commitment,
@@ -1711,7 +1731,12 @@ impl ScanState {
             apply_txns_second_pass: &'a impl Fn(Acc<L>) -> Result<(), String>,
         ) -> Result<Pass, String>
         where
-            L: LedgerIntf + Clone + 'a,
+            L: LedgerInterface<
+                W = (),
+                Bool = bool,
+                Account = Account,
+                AccountUpdate = AccountUpdate,
+            >,
         {
             use PreviousIncompleteTxns::{PartiallyApplied, Unapplied};
 
@@ -1862,7 +1887,7 @@ impl ScanState {
         apply_first_pass_sparse_ledger: ApplyFirstSparse,
     ) -> Result<Pass, String>
     where
-        L: LedgerIntf + Clone,
+        L: LedgerInterface<W = (), Bool = bool, Account = Account, AccountUpdate = AccountUpdate>,
         F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
         ApplyFirst: Fn(
             Slot,
@@ -1899,7 +1924,7 @@ impl ScanState {
         apply_first_pass_sparse_ledger: ApplyFirstSparse,
     ) -> Result<Pass, String>
     where
-        L: LedgerIntf + Clone,
+        L: LedgerInterface<W = (), Bool = bool, Account = Account, AccountUpdate = AccountUpdate>,
         F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
         ApplyFirst: Fn(
             Slot,
@@ -1939,7 +1964,7 @@ impl ScanState {
         apply_first_pass_sparse_ledger: ApplyFirstSparse,
     ) -> Result<Pass, String>
     where
-        L: LedgerIntf + Clone,
+        L: LedgerInterface<W = (), Bool = bool, Account = Account, AccountUpdate = AccountUpdate>,
         F: Fn(Fp) -> Result<MinaStateProtocolStateValueStableV2, String>,
         ApplyFirst: Fn(
             Slot,