Implement ZkappApplication for non-snark context

Author: sebastiencs

ledger/src/account/account.rs

@@ -884,6 +884,10 @@ impl ZkAppAccount {
     pub fn empty_action_state() -> Fp {
         cache_one!(Fp, { hash_noinputs("MinaZkappActionStateEmptyElt") })
     }
+
+    pub fn is_default(&self) -> bool {
+        self == &Self::default()
+    }
 }
 
 /// An `AccountId` implementing `Ord` & `PartialOrd`, reproducing OCaml ordering.

ledger/src/scan_state/transaction_logic.rs

@@ -1805,7 +1805,7 @@ pub mod zkapp_command {
     }
 
     impl EpochLedger {
-        pub fn epoch_ledger(&self, t: protocol_state::EpochLedger<Fp>) -> Result<(), String> {
+        pub fn epoch_ledger(&self, t: &protocol_state::EpochLedger<Fp>) -> Result<(), String> {
             self.hash.zcheck("epoch_ledger_hash".to_string(), t.hash)?;
             self.total_currency
                 .zcheck("epoch_ledger_total_currency".to_string(), t.total_currency)
@@ -1908,9 +1908,9 @@ pub mod zkapp_command {
         pub fn epoch_data(
             &self,
             label: &str,
-            t: protocol_state::EpochData<Fp>,
+            t: &protocol_state::EpochData<Fp>,
         ) -> Result<(), String> {
-            self.ledger.epoch_ledger(t.ledger)?;
+            self.ledger.epoch_ledger(&t.ledger)?;
             // ignore seed
             self.start_checkpoint.zcheck(
                 format!("{}_{}", label, "start_checkpoint"),
@@ -1954,7 +1954,7 @@ pub mod zkapp_command {
 
     impl ZkAppPreconditions {
         /// zkapp check
-        pub fn zcheck(&self, s: ProtocolStateView) -> Result<(), String> {
+        pub fn zcheck(&self, s: &ProtocolStateView) -> Result<(), String> {
             self.snarked_ledger_hash
                 .zcheck("snarker_ledger_hash".to_string(), s.snarked_ledger_hash)?;
             self.blockchain_length
@@ -1968,9 +1968,9 @@ pub mod zkapp_command {
                 s.global_slot_since_genesis,
             )?;
             self.staking_epoch_data
-                .epoch_data("staking_epoch_data", s.staking_epoch_data)?;
+                .epoch_data("staking_epoch_data", &s.staking_epoch_data)?;
             self.next_epoch_data
-                .epoch_data("next_epoch_data", s.next_epoch_data)
+                .epoch_data("next_epoch_data", &s.next_epoch_data)
         }
 
         pub fn checked_zcheck(&self, s: &ProtocolStateView, w: &mut Witness<Fp>) -> Boolean {
@@ -2167,7 +2167,7 @@ pub mod zkapp_command {
 
     impl Account {
         /// zkapp check
-        pub fn zcheck<F>(&self, new_account: bool, mut check: F, a: account::Account)
+        pub fn zcheck<F>(&self, new_account: bool, mut check: F, a: &account::Account)
         where
             F: FnMut(TransactionFailure, bool),
         {
@@ -2179,9 +2179,12 @@ pub mod zkapp_command {
         fn zchecks(
             &self,
             new_account: bool,
-            a: account::Account,
+            a: &account::Account,
         ) -> Vec<(TransactionFailure, Result<(), String>)> {
-            let zkapp = a.zkapp.unwrap_or_default();
+            let zkapp = match a.zkapp.as_ref() {
+                Some(zkapp) => MyCow::Borrow(&**zkapp),
+                None => MyCow::Own(ZkAppAccount::default()),
+            };
             let mut ret = vec![
                 (
                     TransactionFailure::AccountBalancePreconditionUnsatisfied,
@@ -2200,7 +2203,7 @@ pub mod zkapp_command {
                     TransactionFailure::AccountDelegatePreconditionUnsatisfied,
                     self.delegate.zcheck(
                         "delegate".to_string(),
-                        a.delegate.unwrap_or_else(invalid_public_key),
+                        a.delegate.clone().unwrap_or_else(invalid_public_key),
                     ),
                 ),
                 (
@@ -5227,7 +5230,7 @@ pub mod protocol_state {
         }
 
         #[must_use]
-        fn set_fee_excess(&self, fee_excess: Signed<Amount>) -> Self {
+        pub fn set_fee_excess(&self, fee_excess: Signed<Amount>) -> Self {
             let mut this = self.clone();
             this.fee_excess = fee_excess;
             this
@@ -5244,7 +5247,7 @@ pub mod protocol_state {
             this
         }
 
-        fn block_global_slot(&self) -> Slot {
+        pub fn block_global_slot(&self) -> Slot {
             self.block_global_slot
         }
     }
@@ -5856,7 +5859,7 @@ where
                     .is_ok(),
             ),
             Eff::CheckProtocolStatePrecondition(pred, global_state) => {
-                PerformResult::Bool(pred.zcheck(global_state.protocol_state).is_ok())
+                PerformResult::Bool(pred.zcheck(&global_state.protocol_state).is_ok())
             }
             Eff::CheckAccountPrecondition(account_update, account, new_account, local_state) => {
                 let local_state = {
@@ -5865,7 +5868,7 @@ where
                     let check = |failure, b| {
                         _local_state = _local_state.add_check(failure, b);
                     };
-                    precondition_account.zcheck(new_account, check, account);
+                    precondition_account.zcheck(new_account, check, &account);
                     _local_state
                 };
                 PerformResult::LocalState(Box::new(local_state))
@@ -7895,7 +7898,7 @@ pub fn validate_timing(
 pub fn account_check_timing(
     txn_global_slot: &Slot,
     account: &Account,
-) -> (TimingValidation, Timing) {
+) -> (TimingValidation<bool>, Timing) {
     let (invalid_timing, timing, _) =
         validate_timing_with_min_balance_impl(account, Amount::from_u64(0), txn_global_slot);
     // TODO: In OCaml the returned Timing is actually converted to None/Some(fields of Timing structure)
@@ -7958,9 +7961,9 @@ pub fn timing_error_to_user_command_status(
     }
 }
 
-pub enum TimingValidation {
-    InsufficientBalance(bool),
-    InvalidTiming(bool),
+pub enum TimingValidation<B> {
+    InsufficientBalance(B),
+    InvalidTiming(B),
 }
 
 #[derive(Debug)]
@@ -7970,7 +7973,7 @@ fn validate_timing_with_min_balance_impl(
     account: &Account,
     txn_amount: Amount,
     txn_global_slot: &Slot,
-) -> (TimingValidation, Timing, MinBalance) {
+) -> (TimingValidation<bool>, Timing, MinBalance) {
     use crate::Timing::*;
     use TimingValidation::*;
 

ledger/src/zkapps/intefaces.rs

@@ -13,7 +13,7 @@ use crate::zkapps::zkapp_logic;
 use crate::scan_state::transaction_logic::zkapp_command::{
     self, CheckAuthorizationResult, SetOrKeep,
 };
-use crate::scan_state::transaction_logic::TransactionFailure;
+use crate::scan_state::transaction_logic::{TimingValidation, TransactionFailure};
 use crate::sparse_ledger::LedgerIntf;
 use crate::{AccountId, AuthRequired, MyCow, ReceiptChainHash, TokenId, ZkAppAccount};
 
@@ -90,6 +90,21 @@ pub struct Opt<T> {
     pub data: T,
 }
 
+impl<T: Default> Opt<T> {
+    pub fn from_option(opt: Option<T>) -> Self {
+        match opt {
+            Some(data) => Self {
+                is_some: Boolean::True,
+                data,
+            },
+            None => Self {
+                is_some: Boolean::False,
+                data: T::default(),
+            },
+        }
+    }
+}
+
 impl<A, B> Opt<(A, B)> {
     pub fn unzip(self) -> (Opt<A>, Opt<B>) {
         let Self {
@@ -320,11 +335,11 @@ where
     type CallForest: CallForestInterface;
     type Bool: BoolInterface;
     type SignedAmount: SignedAmountInterface;
+    type VerificationKeyHash: VerificationKeyHashInterface;
 
     // Only difference in our Rust code is the `WithHash`
     fn body(&self) -> &crate::scan_state::transaction_logic::zkapp_command::Body;
-    fn set(&mut self, new: Self);
-    fn verification_key_hash(&self) -> Fp;
+    fn verification_key_hash(&self) -> Self::VerificationKeyHash;
     fn is_proved(&self) -> Self::Bool;
     fn is_signed(&self) -> Self::Bool;
     fn check_authorization(
@@ -372,7 +387,7 @@ pub trait ControllerInterface {
         auth: &AuthRequired,
         single_data: &Self::SingleData,
         w: &mut Self::W,
-    ) -> Self::Bool;
+    ) -> Result<Self::Bool, String>;
 
     fn verification_key_perm_fallback_to_signature_with_older_version(
         auth: &AuthRequired,
@@ -434,6 +449,7 @@ where
     type Bool: BoolInterface;
     type Balance: BalanceInterface;
     type GlobalSlot: GlobalSlotSinceGenesisInterface;
+    type VerificationKeyHash: VerificationKeyHashInterface;
     type D;
 
     fn register_verification_key(&self, data: &Self::D, w: &mut Self::W);
@@ -442,7 +458,7 @@ where
     fn set_delegate(&mut self, new: CompressedPubKey);
     fn zkapp(&self) -> MyCow<ZkAppAccount>;
     fn zkapp_mut(&mut self) -> &mut ZkAppAccount;
-    fn verification_key_hash(&self) -> Fp;
+    fn verification_key_hash(&self) -> Self::VerificationKeyHash;
     fn set_token_id(&mut self, token_id: TokenId);
     fn is_timed(&self) -> Self::Bool;
     fn balance(&self) -> Self::Balance;
@@ -451,7 +467,7 @@ where
         &self,
         txn_global_slot: &Self::GlobalSlot,
         w: &mut Self::W,
-    ) -> (Self::Bool, crate::Timing);
+    ) -> (TimingValidation<Self::Bool>, crate::Timing);
     fn make_zkapp(&mut self);
     fn unmake_zkapp(&mut self);
     fn proved_state(&self) -> Self::Bool;
@@ -490,7 +506,7 @@ pub trait VerificationKeyHashInterface {
     type W: WitnessGenerator<Fp>;
     type Bool: BoolInterface;
 
-    fn equal(a: Fp, b: Fp, w: &mut Self::W) -> Self::Bool;
+    fn equal(a: &Self, b: &Self, w: &mut Self::W) -> Self::Bool;
 }
 
 pub trait SetOrKeepInterface {
@@ -599,6 +615,7 @@ where
         SingleData = Self::SingleData,
         Bool = Self::Bool,
         SignedAmount = Self::SignedAmount,
+        VerificationKeyHash = Self::VerificationKeyHash,
     >;
     type AccountId: AccountIdInterface<W = Self::WitnessGenerator>;
     type TokenId: TokenIdInterface<W = Self::WitnessGenerator, Bool = Self::Bool>;
@@ -620,6 +637,7 @@ where
         Bool = Self::Bool,
         Balance = Self::Balance,
         GlobalSlot = Self::GlobalSlotSinceGenesis,
+        VerificationKeyHash = Self::VerificationKeyHash,
     >;
     type VerificationKeyHash: VerificationKeyHashInterface<
         W = Self::WitnessGenerator,