Merge pull request #17891 from MinaProtocol/georgeee/sigkind-in-mina_lib

Introduce sigkind in mina_lib

Author: glyh

src/lib/mina_graphql/mina_graphql.ml

@@ -397,7 +397,7 @@ module Mutations = struct
       , string )
       result
       Io.t =
-    let signature_kind = Mina_signature_kind.t_DEPRECATED in
+    let signature_kind = Mina_lib.signature_kind mina in
     (* instead of adding the zkapp_command to the transaction pool, as we would for an actual zkapp,
        apply the zkapp using an ephemeral ledger
     *)
@@ -1172,7 +1172,7 @@ module Mutations = struct
                 ~memo:(Signed_command_memo.create_from_string_exn memo)
                 ~body
             in
-            let signature_kind = Mina_signature_kind.t_DEPRECATED in
+            let signature_kind = Mina_lib.signature_kind mina in
             let signature =
               Ok (Signed_command.sign_payload ~signature_kind sender payload)
             in
@@ -1656,9 +1656,8 @@ module Queries = struct
   open Schema
 
   (* helper for pooledUserCommands, pooledZkappCommands *)
-  let get_commands ~proof_cache_db ~resource_pool ~pk_opt ~hashes_opt ~txns_opt
-      =
-    let signature_kind = Mina_signature_kind.t_DEPRECATED in
+  let get_commands ~signature_kind ~proof_cache_db ~resource_pool ~pk_opt
+      ~hashes_opt ~txns_opt =
     match (pk_opt, hashes_opt, txns_opt) with
     | None, None, None ->
         Network_pool.Transaction_pool.Resource_pool.get_all resource_pool
@@ -1766,6 +1765,7 @@ module Queries = struct
         in
         let cmds =
           get_commands
+            ~signature_kind:(Mina_lib.signature_kind mina)
             ~proof_cache_db:(Mina_lib.proof_cache_db mina)
             ~resource_pool ~pk_opt ~hashes_opt ~txns_opt
         in
@@ -1806,6 +1806,7 @@ module Queries = struct
         in
         let cmds =
           get_commands
+            ~signature_kind:(Mina_lib.signature_kind mina)
             ~proof_cache_db:(Mina_lib.proof_cache_db mina)
             ~resource_pool ~pk_opt ~hashes_opt ~txns_opt
         in
@@ -2538,7 +2539,7 @@ module Queries = struct
                     (from, to_, amount, fee, valid_until, memo, nonce_opt)
                     signature ->
         let open Deferred.Result.Let_syntax in
-        let signature_kind = Mina_signature_kind.t_DEPRECATED in
+        let signature_kind = Mina_lib.signature_kind mina in
         let genesis_constants =
           (Mina_lib.config mina).precomputed_values.genesis_constants
         in
@@ -2741,8 +2742,8 @@ module Queries = struct
       ~doc:"The signature kind that this daemon instance is using"
       ~typ:(non_null string)
       ~args:Arg.[]
-      ~resolve:(fun _ () ->
-        match Mina_signature_kind.t_DEPRECATED with
+      ~resolve:(fun { ctx = mina; _ } () ->
+        match Mina_lib.signature_kind mina with
         | Mainnet ->
             "mainnet"
         | Testnet ->

src/lib/mina_lib/mina_lib.ml

@@ -122,6 +122,7 @@ type t =
   ; vrf_evaluation_state : Block_producer.Vrf_evaluation_state.t
   ; commit_id : string
   ; proof_cache_db : Proof_cache_tag.cache_db
+  ; signature_kind : Mina_signature_kind.t
   }
 [@@deriving fields]
 
@@ -1840,7 +1841,7 @@ let create ~commit_id ?wallets (config : Config.t) =
                         ~proof_level:config.precomputed_values.proof_level
                         ~pids:config.pids ~conf_dir:(Some config.conf_dir)
                         ~blockchain_verification_key
-                        ~transaction_verification_key ()
+                        ~transaction_verification_key ~signature_kind ()
                     in
                     let%map () = set_itn_data (module Verifier) verifier in
                     verifier ) )
@@ -2579,6 +2580,7 @@ let create ~commit_id ?wallets (config : Config.t) =
           ; vrf_evaluation_state = Block_producer.Vrf_evaluation_state.create ()
           ; commit_id
           ; proof_cache_db
+          ; signature_kind
           } ) )
 
 let net { components = { net; _ }; _ } = net

src/lib/mina_lib/mina_lib.mli

@@ -332,3 +332,5 @@ end
 val zkapp_cmd_limit : t -> int option ref
 
 val proof_cache_db : t -> Proof_cache_tag.cache_db
+
+val signature_kind : t -> Mina_signature_kind.t

src/lib/verifier/common.ml

@@ -34,8 +34,7 @@ let invalid_to_error (invalid : invalid) : Error.t =
   | `Invalid_proof err ->
       Error.tag ~tag:"Invalid_proof" err
 
-let check_signed_command c =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
+let check_signed_command ~signature_kind c =
   if not (Signed_command.check_valid_keys c) then
     Result.Error (`Invalid_keys (Signed_command.public_keys c))
   else
@@ -79,9 +78,8 @@ let collect_vk_assumptions zkapp_command =
      .to_zkapp_command_with_hashes_list
   |> List.fold_result ~f:collect_vk_assumption' ~init:[]
 
-let check_signatures_of_zkapp_command (zkapp_command : _ Zkapp_command.Poly.t) :
-    (unit, invalid) Result.t =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
+let check_signatures_of_zkapp_command ~signature_kind
+    (zkapp_command : _ Zkapp_command.Poly.t) : (unit, invalid) Result.t =
   let account_updates_hash =
     Zkapp_command.Call_forest.hash
       zkapp_command.Zkapp_command.Poly.account_updates
@@ -131,17 +129,22 @@ let check_signatures_of_zkapp_command (zkapp_command : _ Zkapp_command.Poly.t) :
                (`Mismatched_authorization_kind
                  [ Account_id.public_key @@ Account_update.account_id p ] ) )
 
-let check : _ With_status.t -> ([ `Assuming of _ list ], invalid) Result.t =
-  function
+let check ~signature_kind (cmd : _ With_status.t) :
+    ([ `Assuming of _ list ], invalid) Result.t =
+  match cmd with
   | { With_status.data = User_command.Signed_command c; status = _ } ->
-      check_signed_command c
+      check_signed_command ~signature_kind c
   | { With_status.data = Zkapp_command verifiable; status = Failed _ } ->
       let command = Zkapp_command.of_verifiable verifiable in
-      let%map.Result () = check_signatures_of_zkapp_command command in
+      let%map.Result () =
+        check_signatures_of_zkapp_command ~signature_kind command
+      in
       `Assuming []
   | { With_status.data = Zkapp_command verifiable; status = Applied } ->
       let command = Zkapp_command.of_verifiable verifiable in
-      let%bind.Result () = check_signatures_of_zkapp_command command in
+      let%bind.Result () =
+        check_signatures_of_zkapp_command ~signature_kind command
+      in
       let%map.Result assuming = collect_vk_assumptions verifiable in
       `Assuming assuming
 

src/lib/verifier/dummy.ml

@@ -12,6 +12,7 @@ type t =
   ; verify_transaction_snarks :
          (Ledger_proof.t * Mina_base.Sok_message.t) list
       -> unit Or_error.t Or_error.t Deferred.t
+  ; signature_kind : Mina_signature_kind.t
   }
 
 type invalid = Common.invalid [@@deriving bin_io_unversioned, to_yojson]
@@ -22,7 +23,7 @@ type ledger_proof = Ledger_proof.t
 
 let create ~logger:_ ?enable_internal_tracing:_ ?internal_trace_filename:_
     ~proof_level ~pids:_ ~conf_dir:_ ~commit_id:_ ~blockchain_verification_key
-    ~transaction_verification_key () =
+    ~transaction_verification_key ~signature_kind () =
   let verify_blockchain_snarks chains =
     match proof_level with
     | Genesis_constants.Proof_level.Full ->
@@ -72,6 +73,7 @@ let create ~logger:_ ?enable_internal_tracing:_ ?internal_trace_filename:_
     ; blockchain_verification_key
     ; transaction_verification_key
     ; verify_transaction_snarks
+    ; signature_kind
     }
 
 let verify_blockchain_snarks { verify_blockchain_snarks; _ } chains =
@@ -80,7 +82,7 @@ let verify_blockchain_snarks { verify_blockchain_snarks; _ } chains =
 (* N.B.: Valid_assuming is never returned, in fact; we assert a return type
    containing Valid_assuming to match the expected type
 *)
-let verify_commands { proof_level; _ }
+let verify_commands { proof_level; signature_kind; _ }
     (cs : User_command.Verifiable.t With_status.t list) :
     [ `Valid of Mina_base.User_command.Valid.t
     | `Valid_assuming of
@@ -108,15 +110,19 @@ let verify_commands { proof_level; _ }
         | Ok (`Assuming _) ->
             valid cmd
       in
-      let f cmd = convert_check_res cmd (Common.check cmd) in
+      let f cmd = convert_check_res cmd (Common.check ~signature_kind cmd) in
       List.map cs ~f |> Deferred.Or_error.return
   | Full ->
       let read_proof (vk, stmt, proof) =
         (vk, stmt, Proof_cache_tag.read_proof_from_disk proof)
       in
       let read_proofs (`Assuming ls) = `Assuming (List.map ~f:read_proof ls) in
       let results =
-        List.map cs ~f:(Fn.compose (Result.map ~f:read_proofs) Common.check)
+        List.map cs
+          ~f:
+            (Fn.compose
+               (Result.map ~f:read_proofs)
+               (Common.check ~signature_kind) )
       in
       let to_verify =
         List.concat_map

src/lib/verifier/prod.ml

@@ -13,9 +13,9 @@ let invalid_to_error = Common.invalid_to_error
 type ledger_proof = Ledger_proof.t
 
 module Processor = struct
-  let verify_commands
+  let verify_commands ~signature_kind
       (cs : User_command.Verifiable.Serializable.t With_status.t list) =
-    let results = List.map cs ~f:Common.check in
+    let results = List.map cs ~f:(Common.check ~signature_kind) in
     let to_verify =
       List.concat_map
         ~f:(function Ok (`Assuming xs) -> xs | Error _ -> [])
@@ -72,6 +72,7 @@ module Worker_state = struct
     ; commit_id : string
     ; blockchain_verification_key : Pickles.Verification_key.Stable.Latest.t
     ; transaction_verification_key : Pickles.Verification_key.Stable.Latest.t
+    ; signature_kind : Mina_signature_kind.t
     }
   [@@deriving bin_io_unversioned]
 
@@ -83,6 +84,7 @@ module Worker_state = struct
       ; commit_id
       ; blockchain_verification_key
       ; transaction_verification_key
+      ; signature_kind
       ; _
       } : t Deferred.t =
     match proof_level with
@@ -96,7 +98,7 @@ module Worker_state = struct
                Internal_tracing.Context_call.with_call_id
                @@ fun () ->
                [%log internal] "Verifier_verify_commands" ;
-               let%map result = Processor.verify_commands cs in
+               let%map result = Processor.verify_commands ~signature_kind cs in
                [%log internal] "Verifier_verify_commands_done" ;
                result
 
@@ -157,7 +159,8 @@ module Worker_state = struct
         Deferred.return
         @@ ( module struct
              let verify_commands tagged_commands =
-               List.map tagged_commands ~f:(Fn.compose f Common.check)
+               List.map tagged_commands
+                 ~f:(Fn.compose f (Common.check ~signature_kind))
                |> Deferred.return
 
              let verify_blockchain_snarks _ = Deferred.return (Ok ())
@@ -292,6 +295,7 @@ module Worker = struct
             ; commit_id
             ; blockchain_verification_key
             ; transaction_verification_key
+            ; signature_kind
             } =
         if Option.is_some conf_dir then (
           let max_size = 256 * 1024 * 512 in
@@ -327,6 +331,7 @@ module Worker = struct
           ; commit_id
           ; blockchain_verification_key
           ; transaction_verification_key
+          ; signature_kind
           }
 
       let init_connection_state ~connection:_ ~worker_state:_ () = Deferred.unit
@@ -347,7 +352,7 @@ type t = { worker : worker Ivar.t ref; logger : Logger.t }
 (* TODO: investigate why conf_dir wasn't being used *)
 let create ~logger ?(enable_internal_tracing = false) ?internal_trace_filename
     ~proof_level ~pids ~conf_dir ~commit_id ~blockchain_verification_key
-    ~transaction_verification_key () : t Deferred.t =
+    ~transaction_verification_key ~signature_kind () : t Deferred.t =
   let on_failure err =
     [%log error] "Verifier process failed with error $err"
       ~metadata:[ ("err", Error_json.error_to_yojson err) ] ;
@@ -387,6 +392,7 @@ let create ~logger ?(enable_internal_tracing = false) ?internal_trace_filename
             ; commit_id
             ; blockchain_verification_key
             ; transaction_verification_key
+            ; signature_kind
             } )
       |> Deferred.Result.map_error ~f:Error.of_exn
     in

src/lib/verifier/verifier.ml

@@ -45,11 +45,12 @@ module For_tests = struct
       ?(pids = Child_processes.Termination.create_pid_table ())
       ?(conf_dir = None) ?(commit_id = "not specified for unit tests") () =
     let open Async.Deferred.Let_syntax in
+    let signature_kind = Mina_signature_kind.Testnet in
     let%bind ( `Blockchain blockchain_verification_key
              , `Transaction transaction_verification_key ) =
       get_verification_keys_eagerly ~constraint_constants ~proof_level
     in
     create ~logger ?enable_internal_tracing ?internal_trace_filename
       ~proof_level ~pids ~conf_dir ~commit_id ~blockchain_verification_key
-      ~transaction_verification_key ()
+      ~transaction_verification_key ~signature_kind ()
 end

src/lib/verifier/verifier_intf.ml

@@ -67,6 +67,7 @@ module type S = sig
     -> commit_id:string
     -> blockchain_verification_key:Pickles.Verification_key.t
     -> transaction_verification_key:Pickles.Verification_key.t
+    -> signature_kind:Mina_signature_kind.t
     -> unit
     -> t Deferred.t
 end