Merge pull request #17885 from MinaProtocol/georgeee/remove-trivial-sigkind-usages

Remove trivial sigkind usages

Author: glyh

src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml

@@ -1704,11 +1704,11 @@ let snark_hashes =
       fun () -> if json then Core.printf "[]\n%!"]
 
 let internal_commands logger ~itn_features =
+  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   [ ( Snark_worker.Intf.command_name
     , Snark_worker.command ~proof_level:Genesis_constants.Compiled.proof_level
         ~constraint_constants:Genesis_constants.Compiled.constraint_constants
-        ~commit_id:Mina_version.commit_id
-        ~signature_kind:Mina_signature_kind.t_DEPRECATED )
+        ~commit_id:Mina_version.commit_id ~signature_kind )
   ; ("snark-hashes", snark_hashes)
   ; ( "run-prover"
     , Command.async
@@ -1727,8 +1727,7 @@ let internal_commands logger ~itn_features =
                  let%bind prover =
                    Prover.create ~commit_id:Mina_version.commit_id ~logger
                      ~proof_level ~constraint_constants
-                     ~pids:(Pid.Table.create ()) ~conf_dir
-                     ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
+                     ~pids:(Pid.Table.create ()) ~conf_dir ~signature_kind ()
                  in
                  Prover.prove_from_input_sexp prover sexp >>| ignore
              | `Eof ->
@@ -1755,7 +1754,6 @@ let internal_commands logger ~itn_features =
                 Reader.read_sexp reader )
           with
           | `Ok sexp -> (
-              let signature_kind = Mina_signature_kind.t_DEPRECATED in
               let%bind worker_state =
                 Snark_worker.Inputs.Worker_state.create ~proof_level
                   ~constraint_constants ~signature_kind ()
@@ -1988,7 +1986,7 @@ let internal_commands logger ~itn_features =
             Prover.create ~commit_id:Mina_version.commit_id ~logger ~pids
               ~conf_dir ~proof_level
               ~constraint_constants:precomputed_values.constraint_constants
-              ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
+              ~signature_kind ()
           in
           match%bind
             Prover.create_genesis_block prover

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

@@ -184,7 +184,7 @@ let command =
      in
      let proof_level = Genesis_constants.Proof_level.Full in
      let proof_cache_db = Proof_cache_tag.create_identity_db () in
-     let signature_kind = Mina_signature_kind.t_DEPRECATED in
+     let signature_kind = Mina_signature_kind.Testnet in
      if witness_only then
        witness ~proof_cache_db ~genesis_constants ~constraint_constants
          ~proof_level ~max_num_updates ~logger ~signature_kind ?min_num_updates

src/app/disk_caching_stats/disk_caching_stats.ml

@@ -329,7 +329,6 @@ module Values (S : Sample) = struct
       ~authorization:(Mina_base.Control.Poly.Proof side_loaded_proof)
 
   let zkapp_command' () : Mina_base.Zkapp_command.t =
-    let signature_kind = Mina_signature_kind.t_DEPRECATED in
     { fee_payer =
         Mina_base.Account_update.Fee_payer.make
           ~body:
@@ -342,7 +341,7 @@ module Values (S : Sample) = struct
     ; account_updates =
         List.init Params.max_zkapp_txn_account_updates ~f:(Fn.const ())
         |> List.fold_left ~init:[] ~f:(fun acc () ->
-               Mina_base.Zkapp_command.Call_forest.cons ~signature_kind
+               Mina_base.Zkapp_command.Call_forest.cons ~signature_kind:Testnet
                  (zkapp_account_update ()) acc )
     ; memo = signed_command_memo ()
     }
@@ -720,7 +719,7 @@ let () =
       ~proof_cache_db:(Proof_cache_tag.For_tests.create_db ())
       ~genesis_constants ~constraint_constants ~min_num_updates:num_updates
       ~num_proof_updates:num_updates ~max_num_updates:num_updates
-      ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
+      ~signature_kind:Testnet ()
   in
   let%map.Async_kernel.Deferred vk =
     let `VK vk, `Prover _ =

src/app/heap_usage/values.ml

@@ -35,7 +35,7 @@ let zkapp_command ~proof_cache_db ~genesis_constants ~constraint_constants =
     Snark_profiler_lib.create_ledger_and_zkapps ~proof_cache_db
       ~genesis_constants ~constraint_constants ~min_num_updates:num_updates
       ~num_proof_updates:num_updates ~max_num_updates:num_updates
-      ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
+      ~signature_kind:Testnet ()
   in
   List.hd_exn zkapp_commands
 

src/app/zkapp_test_transaction/lib/commands.ml

@@ -32,9 +32,8 @@ let get_second_pass_ledger_mask ~ledger ~constraint_constants ~global_slot
     in
     Mina_ledger.Ledger.register_mask ledger new_mask
   in
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let _partial_stmt =
-    Mina_ledger.Ledger.apply_transaction_first_pass ~signature_kind
+    Mina_ledger.Ledger.apply_transaction_first_pass ~signature_kind:Testnet
       ~constraint_constants ~global_slot
       ~txn_state_view:(Mina_state.Protocol_state.Body.view state_body)
       second_pass_ledger

src/app/zkapps_examples/calls/zkapps_calls.ml

@@ -132,12 +132,12 @@ type _ Snarky_backendless.Request.t +=
     for the [Execute_call] request.
 *)
 let execute_call ~may_use_token account_update old_state =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let call_inputs = { Call_data.Input.Circuit.old_state } in
   let call_outputs, called_account_update, sub_calls =
     exists
       (Typ.tuple3 Call_data.Output.typ
-         (Zkapp_call_forest.Checked.account_update_typ ~signature_kind ())
+         (Zkapp_call_forest.Checked.account_update_typ ~signature_kind:Testnet
+            () )
          Zkapp_call_forest.typ )
       ~request:(fun () ->
         let may_use_token =

src/app/zkapps_examples/tokens/zkapps_tokens.ml

@@ -86,7 +86,6 @@ module Rules = struct
           respond Unhandled
 
     let main input =
-      let signature_kind = Mina_signature_kind.t_DEPRECATED in
       let public_key =
         exists Public_key.Compressed.typ ~request:(fun () -> Public_key)
       in
@@ -127,8 +126,8 @@ module Rules = struct
                  .to_account_update_and_calls
             in
             let digest =
-              Zkapp_command.Digest.Account_update.Checked.create ~signature_kind
-                final_update
+              Zkapp_command.Digest.Account_update.Checked.create
+                ~signature_kind:Testnet final_update
             in
             ( { Zkapp_call_forest.Checked.account_update =
                   { data = final_update; hash = digest }
@@ -160,13 +159,12 @@ module Rules = struct
   (** Rule to transfer tokens. *)
   module Transfer = struct
     let dummy_account_update_body =
-      let signature_kind = Mina_signature_kind.t_DEPRECATED in
       lazy
         (let dummy_body = Account_update.Body.dummy in
          { With_hash.data = dummy_body
          ; hash =
-             Zkapp_command.Digest.Account_update.create_body ~signature_kind
-               dummy_body
+             Zkapp_command.Digest.Account_update.create_body
+               ~signature_kind:Testnet dummy_body
          } )
 
     let dummy_tree_hash =
@@ -330,7 +328,6 @@ module Rules = struct
         State.Circuit.t
         * Zkapp_call_forest.Checked.account_update
         * Account_update.May_use_token.Checked.t =
-      let signature_kind = Mina_signature_kind.t_DEPRECATED in
       let dummy_account_update_body = Lazy.force dummy_account_update_body in
       let dummy : _ Zkapp_command.Call_forest.Tree.t =
         { account_update =
@@ -344,8 +341,8 @@ module Rules = struct
         Zkapp_command.Digest.Tree.constant (Lazy.force dummy_tree_hash)
       in
       let (account_update, forest), rest_of_forest =
-        Zkapp_call_forest.Checked.pop ~signature_kind ~dummy ~dummy_tree_hash
-          forest
+        Zkapp_call_forest.Checked.pop ~signature_kind:Testnet ~dummy
+          ~dummy_tree_hash forest
       in
       let rest_of_forest_is_empty =
         Zkapp_call_forest.Checked.is_empty rest_of_forest

src/app/zkapps_examples/zkapps_examples.ml

@@ -209,7 +209,6 @@ module Account_update_under_construction = struct
 
     let to_account_update_and_calls (t : t) :
         Account_update.Body.Checked.t * Zkapp_call_forest.Checked.t =
-      let signature_kind = Mina_signature_kind.t_DEPRECATED in
       (* TODO: Don't do this. *)
       let var_of_t (type var value) (typ : (var, value) Typ.t) (x : value) : var
           =
@@ -285,8 +284,8 @@ module Account_update_under_construction = struct
         | Rev_calls rev_calls ->
             List.fold_left ~init:(Zkapp_call_forest.Checked.empty ()) rev_calls
               ~f:(fun acc (account_update, calls) ->
-                Zkapp_call_forest.Checked.push ~signature_kind ~account_update
-                  ~calls acc )
+                Zkapp_call_forest.Checked.push ~signature_kind:Testnet
+                  ~account_update ~calls acc )
         | Calls calls ->
             calls
       in
@@ -471,15 +470,14 @@ type return_type =
 
 let to_account_update (account_update : account_update) :
     Zkapp_statement.Checked.t * return_type Prover_value.t =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   dummy_constraints () ;
   let account_update, calls =
     Account_update_under_construction.In_circuit.to_account_update_and_calls
       account_update#account_update_under_construction
   in
   let account_update_digest =
     Zkapp_command.Call_forest.Digest.Account_update.Checked.create
-      ~signature_kind account_update
+      ~signature_kind:Testnet account_update
   in
   let public_output : Zkapp_statement.Checked.t =
     { account_update = (account_update_digest :> Field.t)
@@ -777,7 +775,6 @@ end
 
 let insert_signatures pk_compressed sk
     ({ fee_payer; account_updates; memo } : Zkapp_command.t) : Zkapp_command.t =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let transaction_commitment : Zkapp_command.Transaction_commitment.t =
     (* TODO: This is a pain. *)
     let account_updates_hash = Zkapp_command.Call_forest.hash account_updates in
@@ -788,7 +785,8 @@ let insert_signatures pk_compressed sk
     Zkapp_command.Transaction_commitment.create_complete transaction_commitment
       ~memo_hash
       ~fee_payer_hash:
-        (Zkapp_command.Call_forest.Digest.Account_update.create ~signature_kind
+        (Zkapp_command.Call_forest.Digest.Account_update.create
+           ~signature_kind:Testnet
            (Account_update.of_fee_payer fee_payer) )
   in
   let fee_payer =
@@ -797,7 +795,7 @@ let insert_signatures pk_compressed sk
       when Public_key.Compressed.equal public_key pk_compressed ->
         { fee_payer with
           authorization =
-            Schnorr.Chunked.sign ~signature_kind sk
+            Schnorr.Chunked.sign ~signature_kind:Testnet sk
               (Random_oracle.Input.Chunked.field full_commitment)
         }
     | fee_payer ->
@@ -818,7 +816,7 @@ let insert_signatures pk_compressed sk
           { account_update with
             authorization =
               Control.Poly.Signature
-                (Schnorr.Chunked.sign ~signature_kind sk
+                (Schnorr.Chunked.sign ~signature_kind:Testnet sk
                    (Random_oracle.Input.Chunked.field commitment) )
           }
       | account_update ->

src/lib/bootstrap_controller/bootstrap_controller.ml

@@ -893,8 +893,7 @@ let%test_module "Bootstrap_controller tests" =
            ~trust_system ~verifier ~network:my_net.network ~preferred_peers:[]
            ~consensus_local_state:my_net.state.consensus_local_state
            ~network_transition_pipe ~persistent_root ~persistent_frontier
-           ~catchup_mode:`Super ~initial_root_transition
-           ~signature_kind:Mina_signature_kind.t_DEPRECATED )
+           ~catchup_mode:`Super ~initial_root_transition ~signature_kind:Testnet )
 
     let assert_transitions_increasingly_sorted ~root
         (incoming_transitions : Transition_cache.element list) =
@@ -1012,8 +1011,7 @@ let%test_module "Bootstrap_controller tests" =
                 Staged_ledger.of_scan_state_pending_coinbases_and_snarked_ledger
                   ~scan_state ~logger ~verifier ~constraint_constants
                   ~snarked_ledger ~snarked_local_state ~expected_merkle_root
-                  ~pending_coinbases ~get_state
-                  ~signature_kind:Mina_signature_kind.t_DEPRECATED
+                  ~pending_coinbases ~get_state ~signature_kind:Testnet
                 |> Deferred.Or_error.ok_exn
               in
               let height =

src/lib/mina_generators/zkapp_command_generators.ml

@@ -1139,7 +1139,6 @@ let gen_zkapp_command_from ?global_slot ?memo ?(no_account_precondition = false)
     ~genesis_constants
     ~(constraint_constants : Genesis_constants.Constraint_constants.t) () :
     Zkapp_command.t Quickcheck.Generator.t =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let open Quickcheck.Let_syntax in
   let fee_payer_pk =
     Signature_lib.Public_key.compress fee_payer_keypair.public_key
@@ -1543,14 +1542,16 @@ let gen_zkapp_command_from ?global_slot ?memo ?(no_account_precondition = false)
         Signed_command_memo.gen
   in
   let zkapp_command =
-    Zkapp_command.write_all_proofs_to_disk ~signature_kind ~proof_cache_db
+    Zkapp_command.write_all_proofs_to_disk ~signature_kind:Testnet
+      ~proof_cache_db
       { Zkapp_command.Poly.fee_payer; account_updates; memo }
   in
   (* update receipt chain hashes in accounts table *)
   let receipt_elt =
     let _txn_commitment, full_txn_commitment =
       (* also computed in replace_authorizations, but easier just to re-compute here *)
-      Zkapp_command.get_transaction_commitments ~signature_kind zkapp_command
+      Zkapp_command.get_transaction_commitments ~signature_kind:Testnet
+        zkapp_command
     in
     Receipt.Zkapp_command_elt.Zkapp_command_commitment full_txn_commitment
   in
@@ -1679,7 +1680,6 @@ let gen_max_cost_zkapp_command_from ?memo ?fee_range
     ~(fee_payer_keypair : Signature_lib.Keypair.t)
     ~(account_state_tbl : (Account.t * role) Account_id.Table.t) ~vk
     ~(genesis_constants : Genesis_constants.t) () =
-  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let open Quickcheck.Generator.Let_syntax in
   let%bind memo =
     match memo with
@@ -1739,7 +1739,7 @@ let gen_max_cost_zkapp_command_from ?memo ?fee_range
         None
     | Some (a, role) ->
         Some ({ a with nonce = Account.Nonce.succ a.nonce }, role) ) ;
-  Zkapp_command.of_simple ~signature_kind ~proof_cache_db
+  Zkapp_command.of_simple ~signature_kind:Testnet ~proof_cache_db
     { fee_payer; account_updates; memo }
 
 let%test_module _ =