Verification refcounted key hash table in transaction pool

src/app/cli/src/init/transaction_snark_profiler.ml

@@ -609,8 +609,11 @@ let profile_zkapps ~verifier ledger zkapp_commands =
         let v_start_time = Time.now () in
         let%bind res =
           Verifier.verify_commands verifier
-            [ User_command.to_verifiable ~ledger ~get:Mina_ledger.Ledger.get
-                ~location_of_account:Mina_ledger.Ledger.location_of_account
+            [ User_command.to_verifiable
+                ~find_vk:
+                  (Zkapp_command.Verifiable.find_vk_via_ledger ~ledger
+                     ~get:Mina_ledger.Ledger.get
+                     ~location_of_account:Mina_ledger.Ledger.location_of_account )
                 (Zkapp_command zkapp_command)
               |> Or_error.ok_exn
             ]

src/lib/mina_base/mina_base.ml

@@ -60,5 +60,6 @@ module Transaction_status = Transaction_status
 module Transaction_union_payload = Transaction_union_payload
 module Transaction_union_tag = Transaction_union_tag
 module User_command = User_command
+module Verification_key_wire = Verification_key_wire
 module With_stack_hash = With_stack_hash
 module With_status = With_status

src/lib/mina_base/transaction_status.ml

@@ -46,6 +46,7 @@ module Failure = struct
         | Account_proved_state_precondition_unsatisfied
         | Account_is_new_precondition_unsatisfied
         | Protocol_state_precondition_unsatisfied
+        | Unexpected_verification_key_hash
         | Incorrect_nonce
         | Invalid_fee_excess
         | Cancelled
@@ -127,7 +128,8 @@ module Failure = struct
         List.init 8 ~f:var.constructor @ acc )
       ~account_proved_state_precondition_unsatisfied:add
       ~account_is_new_precondition_unsatisfied:add
-      ~protocol_state_precondition_unsatisfied:add ~incorrect_nonce:add
+      ~protocol_state_precondition_unsatisfied:add
+      ~unexpected_verification_key_hash:add ~incorrect_nonce:add
       ~invalid_fee_excess:add ~cancelled:add
 
   let gen = Quickcheck.Generator.of_list all
@@ -211,6 +213,8 @@ module Failure = struct
         "Account_is_new_precondition_unsatisfied"
     | Protocol_state_precondition_unsatisfied ->
         "Protocol_state_precondition_unsatisfied"
+    | Unexpected_verification_key_hash ->
+        "Unexpected_verification_key_hash"
     | Incorrect_nonce ->
         "Incorrect_nonce"
     | Invalid_fee_excess ->
@@ -295,6 +299,8 @@ module Failure = struct
         Ok Account_is_new_precondition_unsatisfied
     | "Protocol_state_precondition_unsatisfied" ->
         Ok Protocol_state_precondition_unsatisfied
+    | "Unexpected_verification_key_hash" ->
+        Ok Unexpected_verification_key_hash
     | "Incorrect_nonce" ->
         Ok Incorrect_nonce
     | "Invalid_fee_excess" ->
@@ -436,6 +442,9 @@ module Failure = struct
         "The account update's account is-new state precondition was unsatisfied"
     | Protocol_state_precondition_unsatisfied ->
         "The account update's protocol state precondition unsatisfied"
+    | Unexpected_verification_key_hash ->
+        "The account update's verification key hash does not match the \
+         verification key in the ledger account"
     | Incorrect_nonce ->
         "Incorrect nonce"
     | Invalid_fee_excess ->

src/lib/mina_base/user_command.ml

@@ -159,15 +159,61 @@ module Verifiable = struct
         Account_update.Fee_payer.account_id p.fee_payer
 end
 
-let to_verifiable (t : t) ~ledger ~get ~location_of_account :
-    Verifiable.t Or_error.t =
+let to_verifiable (t : t) ~find_vk : Verifiable.t Or_error.t =
   match t with
   | Signed_command c ->
       Ok (Signed_command c)
   | Zkapp_command cmd ->
-      Zkapp_command.Verifiable.create ~ledger ~get ~location_of_account cmd
+      Zkapp_command.Verifiable.create ~find_vk cmd
       |> Or_error.map ~f:(fun cmd -> Zkapp_command cmd)
 
+module Make_to_all_verifiable (Strategy : sig
+  val create_all :
+       Zkapp_command.t list
+    -> find_vk:
+         (   Zkapp_basic.F.t
+          -> Account_id.t
+          -> (Verification_key_wire.t, Error.t) Result.t )
+    -> Zkapp_command.Verifiable.t list Or_error.t
+end) =
+struct
+  let to_all_verifiable (ts : t list) ~find_vk : Verifiable.t list Or_error.t =
+    let open Or_error.Let_syntax in
+    (* First we tag everything with its index *)
+    let its = List.mapi ts ~f:(fun i x -> (i, x)) in
+    (* then we partition out the zkapp commands *)
+    let izk_cmds, is_cmds =
+      List.partition_map its ~f:(fun (i, cmd) ->
+          match cmd with
+          | Zkapp_command c ->
+              First (i, c)
+          | Signed_command c ->
+              Second (i, c) )
+    in
+    (* then unzip the indices *)
+    let ixs, zk_cmds = List.unzip izk_cmds in
+    (* then we verify the zkapp commands *)
+    let%map vzk_cmds = Strategy.create_all ~find_vk zk_cmds in
+    (* rezip indices *)
+    let ivzk_cmds = List.zip_exn ixs vzk_cmds in
+    (* Put them back in with a sort by index (un-partition) *)
+    let ivs =
+      List.map is_cmds ~f:(fun (i, cmd) -> (i, Signed_command cmd))
+      @ List.map ivzk_cmds ~f:(fun (i, cmd) -> (i, Zkapp_command cmd))
+      |> List.sort ~compare:(fun (i, _) (j, _) -> i - j)
+    in
+    (* Drop the indices *)
+    List.unzip ivs |> snd
+end
+
+module Any = struct
+  include Make_to_all_verifiable (Zkapp_command.Verifiable.Any)
+end
+
+module Last = struct
+  include Make_to_all_verifiable (Zkapp_command.Verifiable.Last)
+end
+
 let of_verifiable (t : Verifiable.t) : t =
   match t with
   | Signed_command x ->
@@ -212,6 +258,12 @@ let applicable_at_nonce (t : t) =
 
 let expected_target_nonce t = Account.Nonce.succ (applicable_at_nonce t)
 
+let extract_vks : t -> Verification_key_wire.t List.t = function
+  | Signed_command _ ->
+      []
+  | Zkapp_command cmd ->
+      Zkapp_command.extract_vks cmd
+
 (** The target nonce is what the nonce of the fee payer will be after a user command is successfully applied. *)
 let target_nonce_on_success (t : t) =
   match t with
@@ -239,6 +291,8 @@ let valid_until (t : t) =
           Mina_numbers.Global_slot.max_value )
 
 module Valid = struct
+  type t_ = t
+
   [%%versioned
   module Stable = struct
     module V2 = struct
@@ -255,7 +309,7 @@ module Valid = struct
   module Gen = Gen_make (Signed_command.With_valid_signature)
 end
 
-let check ~ledger ~get ~location_of_account (t : t) : Valid.t Or_error.t =
+let check_verifiable (t : Verifiable.t) : Valid.t Or_error.t =
   match t with
   | Signed_command x -> (
       match Signed_command.check x with
@@ -264,9 +318,10 @@ let check ~ledger ~get ~location_of_account (t : t) : Valid.t Or_error.t =
       | None ->
           Or_error.error_string "Invalid signature" )
   | Zkapp_command p ->
-      Or_error.map
-        (Zkapp_command.Valid.to_valid ~ledger ~get ~location_of_account p)
-        ~f:(fun p -> Zkapp_command p)
+      Ok (Zkapp_command (Zkapp_command.Valid.of_verifiable p))
+
+let check ~find_vk (t : t) : Valid.t Or_error.t =
+  to_verifiable ~find_vk t |> Or_error.bind ~f:check_verifiable
 
 let forget_check (t : Valid.t) : t =
   match t with

src/lib/mina_base/zkapp_basic.ml

@@ -393,6 +393,11 @@ module F = Snark_params.Tick.Field
 
 [%%endif]
 
+module F_map = struct
+  include Hashable.Make (F)
+  include Comparable.Make (F)
+end
+
 let invalid_public_key : Public_key.Compressed.t =
   { x = F.zero; is_odd = false }