zkapp account update: auto bump txn version to current on setting verification key

Author: glyh

src/lib/transaction_logic/mina_transaction_logic.ml

@@ -1136,9 +1136,6 @@ module Make (L : Ledger_intf.S) :
         let set_verification_key_auth : t -> Controller.t =
          fun a -> fst a.permissions.set_verification_key
 
-        let set_verification_key_txn_version : t -> Txn_version.t =
-         fun a -> snd a.permissions.set_verification_key
-
         let set_zkapp_uri : t -> Controller.t =
          fun a -> a.permissions.set_zkapp_uri
 
@@ -1288,9 +1285,30 @@ module Make (L : Ledger_intf.S) :
 
       let set_voting_for voting_for (a : t) = { a with voting_for }
 
+      type txn_version = Txn_version.t
+
+      let txn_version (a : t) : txn_version =
+        snd a.permissions.set_verification_key
+
       let permissions (a : t) = a.permissions
 
-      let set_permissions permissions (a : t) = { a with permissions }
+      let set_permissions_ignore_vk_txn_version (permissions : Permissions.t)
+          (a : t) =
+        let vk_txn_version = txn_version a in
+        let set_verification_key =
+          (fst permissions.set_verification_key, vk_txn_version)
+        in
+        { a with permissions = { a.permissions with set_verification_key } }
+
+      let set_txn_version_to_current (a : t) =
+        { a with
+          permissions =
+            { a.permissions with
+              set_verification_key =
+                ( fst a.permissions.set_verification_key
+                , Mina_numbers.Txn_version.current )
+            }
+        }
     end
 
     module Amount = struct

src/lib/transaction_logic/zkapp_command_logic.ml

@@ -574,8 +574,6 @@ module type Account_intf = sig
   module Permissions : sig
     type controller
 
-    type txn_version
-
     val access : t -> controller
 
     val edit_state : t -> controller
@@ -590,8 +588,6 @@ module type Account_intf = sig
 
     val set_verification_key_auth : t -> controller
 
-    val set_verification_key_txn_version : t -> txn_version
-
     val set_zkapp_uri : t -> controller
 
     val edit_action_state : t -> controller
@@ -710,7 +706,13 @@ module type Account_intf = sig
 
   val permissions : t -> Permissions.t
 
-  val set_permissions : Permissions.t -> t -> t
+  val set_permissions_ignore_vk_txn_version : Permissions.t -> t -> t
+
+  type txn_version
+
+  val txn_version : t -> txn_version
+
+  val set_txn_version_to_current : t -> t
 end
 
 module Eff = struct
@@ -825,7 +827,6 @@ module type Inputs_intf = sig
   and Account :
     (Account_intf
       with type Permissions.controller := Controller.t
-       and type Permissions.txn_version := Txn_version.t
        and type timing := Timing.t
        and type balance := Balance.t
        and type receipt_chain_hash := Receipt_chain_hash.t
@@ -840,7 +841,8 @@ module type Inputs_intf = sig
        and type nonce := Nonce.t
        and type state_hash := State_hash.t
        and type token_id := Token_id.t
-       and type account_id := Account_id.t)
+       and type account_id := Account_id.t
+       and type txn_version = Txn_version.t)
 
   and Actions :
     (Actions_intf with type bool := Bool.t and type field := Field.t)
@@ -1549,8 +1551,7 @@ module Make (Inputs : Inputs_intf) = struct
     *)
     let a = Account.make_zkapp a in
     let auth_with_fallback ~fallback_logic auth =
-      Account.Permissions.set_verification_key_txn_version a
-      |> Txn_version.older_than_current
+      Account.txn_version a |> Txn_version.older_than_current
       |> Controller.if_ ~then_:(fallback_logic auth) ~else_:auth
     in
     (* Check that the account can be accessed with the given authorization. *)
@@ -1641,6 +1642,7 @@ module Make (Inputs : Inputs_intf) = struct
           (Account.verification_key a)
       in
       let a = Account.set_verification_key verification_key a in
+      let a = Account.set_txn_version_to_current a in
       (a, local_state)
     in
     (* Update action state. *)
@@ -1808,7 +1810,7 @@ module Make (Inputs : Inputs_intf) = struct
         Set_or_keep.set_or_keep ~if_:Account.Permissions.if_ permissions
           (Account.permissions a)
       in
-      let a = Account.set_permissions permissions a in
+      let a = Account.set_permissions_ignore_vk_txn_version permissions a in
       (a, local_state)
     in
     (* Initialize account's pk, in case it is new. *)

src/lib/transaction_snark/transaction_snark.ml

@@ -891,8 +891,6 @@ module Make_str (A : Wire_types.Concrete) = struct
           module Permissions = struct
             type controller = Permissions.Auth_required.Checked.t
 
-            type txn_version = Mina_numbers.Txn_version.Checked.t
-
             let edit_state : t -> controller =
              fun a -> a.data.permissions.edit_state
 
@@ -911,9 +909,6 @@ module Make_str (A : Wire_types.Concrete) = struct
             let set_verification_key_auth : t -> controller =
              fun a -> fst a.data.permissions.set_verification_key
 
-            let set_verification_key_txn_version : t -> txn_version =
-             fun a -> snd a.data.permissions.set_verification_key
-
             let set_zkapp_uri : t -> controller =
              fun a -> a.data.permissions.set_zkapp_uri
 
@@ -1064,10 +1059,38 @@ module Make_str (A : Wire_types.Concrete) = struct
           let set_voting_for voting_for ({ data = a; hash } : t) : t =
             { data = { a with voting_for }; hash }
 
+          type txn_version = Mina_numbers.Txn_version.Checked.t
+
+          let txn_version ({ data = a; _ } : t) =
+            snd a.permissions.set_verification_key
+
           let permissions (a : t) = a.data.permissions
 
-          let set_permissions permissions ({ data = a; hash } : t) : t =
-            { data = { a with permissions }; hash }
+          let set_permissions_ignore_vk_txn_version
+              (permissions : Permissions.t) ({ data = a; hash } as t : t) : t =
+            let vk_txn_version = txn_version t in
+            let set_verification_key =
+              (fst permissions.set_verification_key, vk_txn_version)
+            in
+            { data =
+                { a with
+                  permissions = { a.permissions with set_verification_key }
+                }
+            ; hash
+            }
+
+          let set_txn_version_to_current ({ data = a; hash } : t) : t =
+            { With_hash.data =
+                { a with
+                  permissions =
+                    { a.permissions with
+                      set_verification_key =
+                        ( fst a.permissions.set_verification_key
+                        , Mina_numbers.Txn_version.current_checked )
+                    }
+                }
+            ; hash
+            }
         end
 
         module Opt = struct