Merge pull request #17892 from MinaProtocol/georgeee/signkind-out-of-transcation

Propagate sigkind from `Mina_transaction.t`

Author: georgeee

src/app/archive/lib/processor.ml

@@ -3245,9 +3245,10 @@ module Block = struct
 
   let add_from_precomputed conn ~proof_cache_db ~constraint_constants
       (t : Precomputed.t) =
+    let signature_kind = Mina_signature_kind.t_DEPRECATED in
     let staged_ledger_diff =
-      Staged_ledger_diff.write_all_proofs_to_disk ~proof_cache_db
-        t.staged_ledger_diff
+      Staged_ledger_diff.write_all_proofs_to_disk ~signature_kind
+        ~proof_cache_db t.staged_ledger_diff
     in
     add_parts_if_doesn't_exist conn ~constraint_constants
       ~protocol_state:t.protocol_state ~staged_ledger_diff
@@ -4649,9 +4650,12 @@ let run pool reader ~proof_cache_db ~genesis_constants ~constraint_constants
           Block.add_if_doesn't_exist ~logger ~constraint_constants
         in
         let hash = State_hash.With_state_hashes.state_hash in
+        let signature_kind = Mina_signature_kind.t_DEPRECATED in
         let block =
           With_hash.map
-            ~f:(Mina_block.write_all_proofs_to_disk ~proof_cache_db)
+            ~f:
+              (Mina_block.write_all_proofs_to_disk ~signature_kind
+                 ~proof_cache_db )
             block
         in
         match%bind

src/lib/block_producer/block_producer.ml

@@ -22,6 +22,8 @@ module type CONTEXT = sig
   val vrf_poll_interval : Time.Span.t
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 type Structured_log_events.t += Block_produced
@@ -172,7 +174,7 @@ let generate_next_state ~commit_id ~zkapp_cmd_limit ~constraint_constants
     ~previous_protocol_state ~time_controller ~staged_ledger ~transactions
     ~get_completed_work ~logger ~(block_data : Consensus.Data.Block_data.t)
     ~winner_pk ~scheduled_time ~log_block_creation ~block_reward_threshold
-    ~zkapp_cmd_limit_hardcap ~slot_tx_end ~slot_chain_end =
+    ~zkapp_cmd_limit_hardcap ~slot_tx_end ~slot_chain_end ~signature_kind =
   let open Interruptible.Let_syntax in
   let global_slot_since_hard_fork =
     Consensus.Data.Block_data.global_slot block_data
@@ -284,7 +286,7 @@ let generate_next_state ~commit_id ~zkapp_cmd_limit ~constraint_constants
               ~state_and_body_hash:
                 (previous_protocol_state_hash, previous_protocol_state_body_hash)
               ~coinbase_receiver ~supercharge_coinbase ~zkapp_cmd_limit_hardcap
-              ~signature_kind:Mina_signature_kind.t_DEPRECATED
+              ~signature_kind
           with
           | Ok
               ( `Hash_after_applying next_staged_ledger_hash
@@ -782,7 +784,7 @@ let produce ~genesis_breadcrumb ~context:(module Context : CONTEXT) ~prover
           ~transactions ~get_completed_work ~logger ~log_block_creation
           ~winner_pk:winner_pubkey ~block_reward_threshold
           ~zkapp_cmd_limit:!zkapp_cmd_limit ~zkapp_cmd_limit_hardcap
-          ~slot_tx_end ~slot_chain_end
+          ~slot_tx_end ~slot_chain_end ~signature_kind
       in
       [%log internal] "Generate_next_state_done" ;
       match next_state_opt with
@@ -1449,8 +1451,8 @@ let run_precomputed ~context:(module Context : CONTEXT) ~verifier ~trust_system
           in
           let body =
             Body.create
-              (Staged_ledger_diff.write_all_proofs_to_disk ~proof_cache_db
-                 staged_ledger_diff )
+              (Staged_ledger_diff.write_all_proofs_to_disk ~signature_kind
+                 ~proof_cache_db staged_ledger_diff )
           in
           let%bind transition =
             let open Result.Let_syntax in

src/lib/bootstrap_controller/bootstrap_controller.ml

@@ -22,6 +22,8 @@ module type CONTEXT = sig
   val ledger_sync_config : Syncable_ledger.daemon_config
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 type Structured_log_events.t += Bootstrap_complete
@@ -165,11 +167,15 @@ let on_transition ({ context = (module Context); _ } as t) ~sender
         let pcd =
           peer_root_with_proof.data
           |> Proof_carrying_data.map
-               ~f:(Mina_block.write_all_proofs_to_disk ~proof_cache_db)
+               ~f:
+                 (Mina_block.write_all_proofs_to_disk ~signature_kind
+                    ~proof_cache_db )
           |> Proof_carrying_data.map_proof
                ~f:
                  (Tuple2.map_snd
-                    ~f:(Mina_block.write_all_proofs_to_disk ~proof_cache_db) )
+                    ~f:
+                      (Mina_block.write_all_proofs_to_disk ~signature_kind
+                         ~proof_cache_db ) )
         in
         match%bind
           Mina_block.verify_on_header
@@ -276,7 +282,7 @@ let download_snarked_ledger ~trust_system ~preferred_peers ~transition_graph
 let run_cycle ~context:(module Context : CONTEXT) ~trust_system ~verifier
     ~network ~consensus_local_state ~network_transition_pipe ~preferred_peers
     ~persistent_root ~persistent_frontier ~initial_root_transition ~catchup_mode
-    ~signature_kind previous_cycles =
+    previous_cycles =
   let open Context in
   (* The short-lived pipe allocated here will be closed
      when a follow-up pipe is allocated: in the next cycle of bootstrap
@@ -378,7 +384,7 @@ let run_cycle ~context:(module Context : CONTEXT) ~trust_system ~verifier
               in
               let scan_state =
                 Staged_ledger.Scan_state.write_all_proofs_to_disk
-                  ~proof_cache_db scan_state_uncached
+                  ~signature_kind ~proof_cache_db scan_state_uncached
               in
               let%bind protocol_states =
                 Staged_ledger.Scan_state.check_required_protocol_states
@@ -666,15 +672,14 @@ let run_cycle ~context:(module Context : CONTEXT) ~trust_system ~verifier
 let run ~context:(module Context : CONTEXT) ~trust_system ~verifier ~network
     ~consensus_local_state ~network_transition_pipe ~preferred_peers
     ~persistent_root ~persistent_frontier ~initial_root_transition ~catchup_mode
-    ~signature_kind =
+    =
   let open Context in
   let run_cycle =
     run_cycle
       ~context:(module Context : CONTEXT)
       ~trust_system ~verifier ~network ~consensus_local_state
       ~network_transition_pipe ~preferred_peers ~persistent_root
       ~persistent_frontier ~initial_root_transition ~catchup_mode
-      ~signature_kind
   in
   O1trace.thread "bootstrap"
   @@ fun () ->
@@ -747,6 +752,8 @@ let%test_module "Bootstrap_controller tests" =
           ~max_subtree_depth:None ~default_subtree_depth:None ()
 
       let proof_cache_db = Proof_cache_tag.For_tests.create_db ()
+
+      let signature_kind = Mina_signature_kind.Testnet
     end
 
     let verifier =
@@ -893,7 +900,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:Testnet )
+           ~catchup_mode:`Super ~initial_root_transition )
 
     let assert_transitions_increasingly_sorted ~root
         (incoming_transitions : Transition_cache.element list) =

src/lib/bootstrap_controller/bootstrap_controller.mli

@@ -15,6 +15,8 @@ module type CONTEXT = sig
   val ledger_sync_config : Syncable_ledger.daemon_config
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 type Structured_log_events.t += Bootstrap_complete [@@deriving register_event]
@@ -52,5 +54,4 @@ val run :
   -> persistent_frontier:Transition_frontier.Persistent_frontier.t
   -> initial_root_transition:Mina_block.Validated.t
   -> catchup_mode:[ `Super ]
-  -> signature_kind:Mina_signature_kind.t
   -> (Transition_frontier.t * Transition_cache.element list) Deferred.t

src/lib/fake_network/fake_network.ml

@@ -81,6 +81,8 @@ let setup (type n) ~context:(module Context : CONTEXT)
       let consensus_local_state = consensus_local_state
 
       let proof_cache_db = Proof_cache_tag.For_tests.create_db ()
+
+      let signature_kind = Mina_signature_kind.Testnet
     end )
   in
   let config rpc_mocks peer =

src/lib/ledger_catchup/ledger_catchup.ml

@@ -11,6 +11,8 @@ module type CONTEXT = sig
   val consensus_constants : Consensus.Constants.t
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 let run ~context:(module Context : CONTEXT) ~trust_system ~verifier ~network

src/lib/ledger_catchup/ledger_catchup.mli

@@ -15,6 +15,8 @@ module type CONTEXT = sig
   val consensus_constants : Consensus.Constants.t
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 module Catchup_jobs : sig

src/lib/ledger_catchup/super_catchup.ml

@@ -17,6 +17,8 @@ module type CONTEXT = sig
   val consensus_constants : Consensus.Constants.t
 
   val proof_cache_db : Proof_cache_tag.cache_db
+
+  val signature_kind : Mina_signature_kind.t
 end
 
 (** [Ledger_catchup] is a procedure that connects a foreign external transition
@@ -1166,7 +1168,9 @@ let run_catchup ~context:(module Context : CONTEXT) ~trust_system ~verifier
         |> Deferred.Or_error.map
              ~f:
                (List.map
-                  ~f:(Mina_block.write_all_proofs_to_disk ~proof_cache_db) ) )
+                  ~f:
+                    (Mina_block.write_all_proofs_to_disk ~signature_kind
+                       ~proof_cache_db ) ) )
       ~peers:(fun () -> Mina_networking.peers network)
       ~knowledge_context:
         (Broadcast_pipe.map best_tip_r
@@ -1482,6 +1486,8 @@ let%test_module "Ledger_catchup tests" =
       let consensus_constants = precomputed_values.consensus_constants
 
       let proof_cache_db = Proof_cache_tag.For_tests.create_db ()
+
+      let signature_kind = Mina_signature_kind.Testnet
     end
 
     (* let mock_verifier =

src/lib/mina_block/block.ml

@@ -114,9 +114,12 @@ let account_ids_accessed ~constraint_constants t =
   |> List.dedup_and_sort
        ~compare:[%compare: Account_id.t * [ `Accessed | `Not_accessed ]]
 
-let write_all_proofs_to_disk ~proof_cache_db { Stable.Latest.header; body } =
+let write_all_proofs_to_disk ~signature_kind ~proof_cache_db
+    { Stable.Latest.header; body } =
   { header
-  ; body = Staged_ledger_diff.Body.write_all_proofs_to_disk ~proof_cache_db body
+  ; body =
+      Staged_ledger_diff.Body.write_all_proofs_to_disk ~signature_kind
+        ~proof_cache_db body
   }
 
 let read_all_proofs_from_disk { header; body } =

src/lib/mina_block/block.mli

@@ -52,6 +52,9 @@ val account_ids_accessed :
   -> (Account_id.t * [ `Accessed | `Not_accessed ]) list
 
 val write_all_proofs_to_disk :
-  proof_cache_db:Proof_cache_tag.cache_db -> Stable.Latest.t -> t
+     signature_kind:Mina_signature_kind.t
+  -> proof_cache_db:Proof_cache_tag.cache_db
+  -> Stable.Latest.t
+  -> t
 
 val read_all_proofs_from_disk : t -> Stable.Latest.t