Verification key hashes in account updates

graphql_schema.json

@@ -3091,12 +3091,20 @@
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "SnappProof",
+                "name": "ZkappProof",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "verificationKeyHash",
+              "description": null,
+              "args": [],
+              "type": { "kind": "SCALAR", "name": "Field", "ofType": null },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "signature",
               "description": null,
@@ -3116,11 +3124,17 @@
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "SnappProof",
+                "name": "ZkappProof",
                 "ofType": null
               },
               "defaultValue": null
             },
+            {
+              "name": "verificationKeyHash",
+              "description": null,
+              "type": { "kind": "SCALAR", "name": "Field", "ofType": null },
+              "defaultValue": null
+            },
             {
               "name": "signature",
               "description": null,
@@ -6509,7 +6523,7 @@
         },
         {
           "kind": "SCALAR",
-          "name": "SnappProof",
+          "name": "ZkappProof",
           "description": null,
           "fields": null,
           "inputFields": null,
@@ -6528,12 +6542,20 @@
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "SnappProof",
+                "name": "ZkappProof",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "verificationKeyHash",
+              "description": null,
+              "args": [],
+              "type": { "kind": "SCALAR", "name": "Field", "ofType": null },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "signature",
               "description": null,

src/app/replayer/replayer.ml

@@ -643,7 +643,10 @@ let zkapp_command_of_zkapp_command ~pool (cmd : Sql.Zkapp_command.t) :
         let (authorization : Control.t) =
           match body.authorization_kind with
           | Proof ->
-              Proof Proof.transaction_dummy
+              Proof
+                { proof = Proof.transaction_dummy
+                ; verification_key_hash = Zkapp_account.dummy_vk_hash ()
+                }
           | Signature ->
               Signature Signature.dummy
           | None_given ->

src/app/test_executive/zkapps.ml

@@ -341,7 +341,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
                 | Proof _ ->
                     { other_p with
                       authorization =
-                        Control.Proof Mina_base.Proof.blockchain_dummy
+                        Control.Proof
+                          { proof = Mina_base.Proof.blockchain_dummy
+                          ; verification_key_hash =
+                              Mina_base.Zkapp_account.dummy_vk_hash ()
+                          }
                     }
                 | _ ->
                     other_p )

src/lib/fields_derivers_zkapps/fields_derivers_zkapps.ml

@@ -530,7 +530,7 @@ let proof obj : _ Unified_input.t =
     | Error _err ->
         raise_invalid_scalar `Proof s
   in
-  iso_string obj ~name:"SnappProof" ~js_type:String
+  iso_string obj ~name:"ZkappProof" ~js_type:String
     ~to_string:Pickles.Side_loaded.Proof.to_base64 ~of_string
 
 let verification_key_with_hash obj =

src/lib/mina_base/control.ml

@@ -5,11 +5,41 @@ open Core_kernel
 (* TODO: temporary hack *)
 [%%ifdef consensus_mechanism]
 
+(* we could use With_hash, but the hash is not of the data, the proof *)
+module Proof_with_vk_hash = struct
+  [%%versioned
+  module Stable = struct
+    module V1 = struct
+      type ('proof, 'hash) t =
+            ( 'proof
+            , 'hash )
+            Mina_wire_types.Mina_base.Control.Proof_with_vk_hash.V1.t =
+        { proof : 'proof; verification_key_hash : 'hash }
+      [@@deriving sexp, yojson, hash, equal, compare]
+    end
+  end]
+end
+
+(* TODO: yojson for Field.t in snarky *)
 [%%versioned
 module Stable = struct
   module V2 = struct
     type t = Mina_wire_types.Mina_base.Control.V2.t =
-      | Proof of Pickles.Side_loaded.Proof.Stable.V2.t
+      | Proof of
+          ( Pickles.Side_loaded.Proof.Stable.V2.t
+          , (Snark_params.Tick.Field.t
+            [@version_asserted]
+            [@to_yojson fun t -> `String (Snark_params.Tick.Field.to_string t)]
+            [@of_yojson
+              function
+              | `String s ->
+                  let field = Snark_params.Tick.Field.of_string s in
+                  let s' = Snark_params.Tick.Field.to_string field in
+                  if String.equal s s' then Ok field
+                  else Error "Invalid JSON for field"
+              | _ ->
+                  Error "expected JSON string"] ) )
+          Proof_with_vk_hash.Stable.V1.t
       | Signature of Signature.Stable.V1.t
       | None_given
     [@@deriving sexp, equal, yojson, hash, compare]
@@ -26,7 +56,8 @@ let gen_with_dummies : t Quickcheck.Generator.t =
          (let dummy_proof =
             let n2 = Pickles_types.Nat.N2.n in
             let proof = Pickles.Proof.dummy n2 n2 n2 ~domain_log2:15 in
-            Proof proof
+            Proof
+              { proof; verification_key_hash = Zkapp_account.dummy_vk_hash () }
           in
           let dummy_signature = Signature Signature.dummy in
           [ dummy_proof; dummy_signature; None_given ] ) )
@@ -92,7 +123,7 @@ let dummy_of_tag : Tag.t -> t = function
   | Proof ->
       let n2 = Pickles_types.Nat.N2.n in
       let proof = Pickles.Proof.dummy n2 n2 n2 ~domain_log2:15 in
-      Proof proof
+      Proof { proof; verification_key_hash = Zkapp_account.dummy_vk_hash () }
   | Signature ->
       Signature Signature.dummy
   | None_given ->
@@ -105,8 +136,12 @@ let signature_deriver obj =
       (Fields_derivers_zkapps.except ~f:Signature.of_base58_check_exn `Signature)
 
 module As_record = struct
+  (* rather than group the proof and vk hash in a record, as in the type `t`, we
+     make them separate elements to simplify the deriver
+  *)
   type t =
     { proof : Pickles.Side_loaded.Proof.t option
+    ; verification_key_hash : Snark_params.Tick.Field.t option
     ; signature : Signature.t option
     }
   [@@deriving annot, fields]
@@ -116,21 +151,25 @@ module As_record = struct
     let ( !. ) = ( !. ) ~t_fields_annots in
     Fields.make_creator obj
       ~proof:!.(option ~js_type:Or_undefined @@ proof @@ o ())
+      ~verification_key_hash:!.(option ~js_type:Or_undefined @@ field @@ o ())
       ~signature:!.(option ~js_type:Or_undefined @@ signature_deriver @@ o ())
     |> finish "Control" ~t_toplevel_annots
 end
 
 let to_record = function
-  | Proof p ->
-      { As_record.proof = Some p; signature = None }
+  | Proof { proof; verification_key_hash } ->
+      { As_record.proof = Some proof
+      ; verification_key_hash = Some verification_key_hash
+      ; signature = None
+      }
   | Signature s ->
-      { proof = None; signature = Some s }
+      { proof = None; verification_key_hash = None; signature = Some s }
   | None_given ->
-      { proof = None; signature = None }
+      { proof = None; verification_key_hash = None; signature = None }
 
 let of_record = function
-  | { As_record.proof = Some p; _ } ->
-      Proof p
+  | { As_record.proof = Some p; verification_key_hash = Some vk_hash; _ } ->
+      Proof { proof = p; verification_key_hash = vk_hash }
   | { signature = Some s; _ } ->
       Signature s
   | _ ->

src/lib/mina_wire_types/mina_base/mina_base_control.ml

@@ -1,6 +1,15 @@
+module Proof_with_vk_hash = struct
+  module V1 = struct
+    type ('proof, 'hash) t = { proof : 'proof; verification_key_hash : 'hash }
+  end
+end
+
 module V2 = struct
   type t =
-    | Proof of Pickles.Side_loaded.Proof.V2.t
+    | Proof of
+        ( Pickles.Side_loaded.Proof.V2.t
+        , Snark_params.Tick.Field.t )
+        Proof_with_vk_hash.V1.t
     | Signature of Mina_base_signature.V1.t
     | None_given
 end

src/lib/random_oracle/random_oracle.ml

@@ -37,16 +37,14 @@ module Operations = struct
 end
 
 module Digest = struct
-  open Field
-
-  type nonrec t = t
+  type t = Field.t
 
   let to_bits ?length x =
     match length with
     | None ->
-        unpack x
+        Field.unpack x
     | Some length ->
-        List.take (unpack x) length
+        List.take (Field.unpack x) length
 end
 
 include Sponge.Make_hash (Random_oracle_permutation)

src/lib/transaction/dune

@@ -23,6 +23,7 @@
    mina_numbers
    one_or_two
    pickles
+   random_oracle
    signature_lib
    sgn
    snark_params

src/lib/transaction/transaction_hash.ml

@@ -56,7 +56,10 @@ let hash_signed_command, hash_zkapp_command =
               let dummy_auth =
                 match acct_update.authorization with
                 | Control.Proof _ ->
-                    Control.Proof Proof.transaction_dummy
+                    Control.Proof
+                      { proof = Proof.transaction_dummy
+                      ; verification_key_hash = Zkapp_account.dummy_vk_hash ()
+                      }
                 | Control.Signature _ ->
                     Control.Signature Signature.dummy
                 | Control.None_given ->

src/lib/transaction_snark/test/multisig_account/multisig_account.ml

@@ -368,7 +368,12 @@ let%test_module "multisig_account" =
                     ; caller = Call
                     ; authorization_kind = Proof
                     }
-                ; authorization = Proof Mina_base.Proof.transaction_dummy
+                ; authorization =
+                    Proof
+                      { proof = Mina_base.Proof.transaction_dummy
+                      ; verification_key_hash =
+                          Mina_base.Zkapp_account.dummy_vk_hash ()
+                      }
                 }
               in
               let memo = Signed_command_memo.empty in
@@ -453,7 +458,11 @@ let%test_module "multisig_account" =
                   ; account_updates =
                       [ sender
                       ; { body = snapp_account_update_data.body
-                        ; authorization = Proof pi
+                        ; authorization =
+                            Proof
+                              { proof = pi
+                              ; verification_key_hash = With_hash.hash vk
+                              }
                         }
                       ]
                   ; memo

src/lib/transaction_snark/test/ring_sig.ml

@@ -99,7 +99,7 @@ let%test_unit "1-of-2" =
       |> run_and_check |> Or_error.ok_exn )
 
 (* test a snapp tx with a 3-account_update ring *)
-let%test_unit "ring-signature snapp tx with 3 zkapp_command" =
+let%test_unit "ring-signature zkapp tx with 3 zkapp_command" =
   let open Mina_transaction_logic.For_tests in
   let gen =
     let open Quickcheck.Generator.Let_syntax in
@@ -229,7 +229,12 @@ let%test_unit "ring-signature snapp tx with 3 zkapp_command" =
                 ; caller = Call
                 ; authorization_kind = Proof
                 }
-            ; authorization = Proof Mina_base.Proof.transaction_dummy
+            ; authorization =
+                Proof
+                  { proof = Mina_base.Proof.transaction_dummy
+                  ; verification_key_hash =
+                      Mina_base.Zkapp_account.dummy_vk_hash ()
+                  }
             }
           in
           let protocol_state = Zkapp_precondition.Protocol_state.accept in
@@ -298,7 +303,11 @@ let%test_unit "ring-signature snapp tx with 3 zkapp_command" =
               ; account_updates =
                   [ sender
                   ; { body = snapp_account_update_data.body
-                    ; authorization = Proof pi
+                    ; authorization =
+                        Proof
+                          { proof = pi
+                          ; verification_key_hash = With_hash.hash vk
+                          }
                     }
                   ]
               ; memo

src/lib/transaction_snark/transaction_snark.ml

@@ -4142,7 +4142,7 @@ module Make_str (A : Wire_types.Concrete) = struct
 
     let account_update_proof (p : Account_update.t) =
       match p.authorization with
-      | Proof p ->
+      | Proof { proof = p; _ } ->
           Some p
       | Signature _ | None_given ->
           None
@@ -4848,8 +4848,16 @@ module Make_str (A : Wire_types.Concrete) = struct
                     =
                   prover ~handler tx_statement
                 in
+                (* TODO: does this make sense? where did the hash come from? *)
+                let verification_key_hash =
+                  match simple_snapp_account_update.authorization with
+                  | Control.Proof { verification_key_hash; _ } ->
+                      verification_key_hash
+                  | _ ->
+                      assert false
+                in
                 ( { body = simple_snapp_account_update.body
-                  ; authorization = Proof pi
+                  ; authorization = Proof { proof = pi; verification_key_hash }
                   }
                   : Account_update.Simple.t )
             | Signature ->
@@ -5075,7 +5083,11 @@ module Make_str (A : Wire_types.Concrete) = struct
             ; caller = Call
             ; authorization_kind = Proof
             }
-        ; authorization = Proof Mina_base.Proof.blockchain_dummy
+        ; authorization =
+            Proof
+              { proof = Mina_base.Proof.transaction_dummy
+              ; verification_key_hash = Mina_base.Zkapp_account.dummy_vk_hash ()
+              }
         }
       in
       let memo = Signed_command_memo.empty in
@@ -5131,8 +5143,11 @@ module Make_str (A : Wire_types.Concrete) = struct
         }
       in
       let account_updates =
+        let verification_key_hash = With_hash.hash vk in
         [ sender
-        ; { body = snapp_account_update_data.body; authorization = Proof pi }
+        ; { body = snapp_account_update_data.body
+          ; authorization = Proof { proof = pi; verification_key_hash }
+          }
         ]
       in
       let zkapp_command : Zkapp_command.t =

src/lib/verifier/common.ml

@@ -91,7 +91,7 @@ let check :
                     None
                 | None_given ->
                     None
-                | Proof pi -> (
+                | Proof { proof = pi; verification_key_hash = _ } -> (
                     match vk_opt with
                     | None ->
                         return