push sig kind out of txn router and bootstrap controller

Author: glyh

src/lib/bootstrap_controller/bootstrap_controller.ml

@@ -288,7 +288,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
-    previous_cycles =
+    ~signature_kind 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
@@ -446,8 +446,7 @@ let run_cycle ~context:(module Context : CONTEXT) ~trust_system ~verifier
                           |> Blockchain_state.snarked_local_state)
                       ~verifier ~constraint_constants ~scan_state
                       ~snarked_ledger:temp_mask ~expected_merkle_root
-                      ~pending_coinbases ~get_state
-                      ~signature_kind:Mina_signature_kind.t_DEPRECATED
+                      ~pending_coinbases ~get_state ~signature_kind
                   in
                   ignore
                     ( Ledger.Maskable.unregister_mask_exn ~loc:__LOC__ temp_mask
@@ -679,14 +678,15 @@ 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 () ->
@@ -905,7 +905,8 @@ 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 )
+           ~catchup_mode:`Super ~initial_root_transition
+           ~signature_kind:Mina_signature_kind.t_DEPRECATED )
 
     let assert_transitions_increasingly_sorted ~root
         (incoming_transitions : Transition_cache.element list) =

src/lib/bootstrap_controller/bootstrap_controller.mli

@@ -52,4 +52,5 @@ 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/mina_intf/transition_frontier_components_intf.ml

@@ -341,6 +341,7 @@ module type Transition_router_intf = sig
     -> catchup_mode:[ `Super ]
     -> notify_online:(unit -> unit Deferred.t)
     -> ledger_backing:Mina_ledger.Ledger.Root.Config.backing_type
+    -> signature_kind:Mina_signature_kind.t
     -> unit
     -> ( [ `Transition of Mina_block.Validated.t ]
        * [ `Source of [ `Gossip | `Catchup | `Internal ] ]

src/lib/mina_lib/mina_lib.ml

@@ -2177,7 +2177,8 @@ let create ~commit_id ?wallets (config : Config.t) =
               ~most_recent_valid_block_writer
               ~get_completed_work:
                 (Network_pool.Snark_pool.get_completed_work snark_pool)
-              ~notify_online ~transaction_pool_proxy ~ledger_backing ()
+              ~notify_online ~transaction_pool_proxy ~ledger_backing
+              ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
           in
           let ( valid_transitions_for_network
               , valid_transitions_for_api

src/lib/mina_lib/tests/tests.ml

@@ -363,7 +363,7 @@ let%test_module "Epoch ledger sync tests" =
           ~network_transition_reader:block_reader ~producer_transition_reader
           ~get_most_recent_valid_block ~most_recent_valid_block_writer
           ~notify_online ?transaction_pool_proxy:None ~ledger_backing:Stable_db
-          ()
+          ~signature_kind:Mina_signature_kind.t_DEPRECATED ()
       in
       let%bind () = Ivar.read initialization_finish_signal in
       let tr_tm1 = Unix.gettimeofday () in

src/lib/transition_router/transition_router.ml

@@ -142,7 +142,7 @@ let start_bootstrap_controller ~context:(module Context : CONTEXT) ~trust_system
     ~producer_transition_writer_ref ~verified_transition_writer ~clear_reader
     ~network_transition_pipe ~consensus_local_state ~frontier_w
     ~initial_root_transition ~persistent_root ~persistent_frontier
-    ~cache_exceptions ~best_seen_transition ~catchup_mode =
+    ~cache_exceptions ~best_seen_transition ~catchup_mode ~signature_kind =
   let open Context in
   [%str_log info] Starting_bootstrap_controller ;
   producer_transition_writer_ref := None ;
@@ -165,7 +165,7 @@ let start_bootstrap_controller ~context:(module Context : CONTEXT) ~trust_system
        ~context:(module Context)
        ~trust_system ~verifier ~network ~consensus_local_state
        ~network_transition_pipe ~persistent_frontier ~persistent_root
-       ~initial_root_transition ~preferred_peers ~catchup_mode )
+       ~initial_root_transition ~preferred_peers ~catchup_mode ~signature_kind )
     (fun (new_frontier, collected_transitions) ->
       start_transition_frontier_controller
         ~context:(module Context)
@@ -372,7 +372,7 @@ let initialize ~transaction_pool_proxy ~context:(module Context : CONTEXT)
     ~producer_transition_writer_ref ~clear_reader ~verified_transition_writer
     ~cache_exceptions ~most_recent_valid_block_writer ~persistent_root
     ~persistent_frontier ~consensus_local_state ~catchup_mode ~notify_online
-    ~network_transition_pipe =
+    ~network_transition_pipe ~signature_kind =
   let open Context in
   [%log info] "Initializing transition router" ;
   let%bind () =
@@ -410,6 +410,7 @@ let initialize ~transaction_pool_proxy ~context:(module Context : CONTEXT)
         ~initial_root_transition ~catchup_mode
         ~best_seen_transition:
           (Option.map ~f:(fun x -> `Block x) best_seen_transition)
+        ~signature_kind
   | Some best_tip, Some frontier
     when is_transition_for_bootstrap
            ~context:(module Context)
@@ -438,6 +439,7 @@ let initialize ~transaction_pool_proxy ~context:(module Context : CONTEXT)
         ~frontier_w ~initial_root_transition ~persistent_root
         ~persistent_frontier ~cache_exceptions ~catchup_mode
         ~best_seen_transition:(Some (`Block best_tip))
+        ~signature_kind
   | best_tip_opt, Some frontier ->
       let collected_transitions =
         match best_tip_opt with
@@ -547,7 +549,7 @@ let run ?(sync_local_state = true) ?(cache_exceptions = false)
     ~frontier_broadcast_writer:frontier_w ~network_transition_reader
     ~producer_transition_reader ~get_most_recent_valid_block
     ~most_recent_valid_block_writer ~get_completed_work ~catchup_mode
-    ~notify_online ~ledger_backing () =
+    ~notify_online ~ledger_backing ~signature_kind () =
   let open Context in
   [%log info] "Starting transition router" ;
   let initialization_finish_signal = Ivar.create () in
@@ -641,7 +643,9 @@ let run ?(sync_local_state = true) ?(cache_exceptions = false)
           ~producer_transition_writer_ref ~clear_reader
           ~verified_transition_writer ~most_recent_valid_block_writer
           ~consensus_local_state ~notify_online ~network_transition_pipe
+          ~signature_kind
       in
+
       Ivar.fill_if_empty initialization_finish_signal () ;
 
       let valid_transition_reader1, valid_transition_reader2 =
@@ -700,7 +704,8 @@ let run ?(sync_local_state = true) ?(cache_exceptions = false)
                              ~clear_reader ~network_transition_pipe
                              ~consensus_local_state ~frontier_w ~persistent_root
                              ~persistent_frontier ~initial_root_transition
-                             ~best_seen_transition:(Some b_or_h) ~catchup_mode )
+                             ~best_seen_transition:(Some b_or_h) ~catchup_mode
+                             ~signature_kind )
                       else Deferred.unit
                   | None ->
                       Deferred.unit