Merge pull request #17790 from MinaProtocol/lyh/various-sig-kind-push-sep15

glyh · web-flow · commit e977188a95dc · 2025-09-18T08:10:28.000+08:00
Various sig kind pushing
diff --git a/src/lib/bootstrap_controller/bootstrap_controller.ml b/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) =
diff --git a/src/lib/bootstrap_controller/bootstrap_controller.mli b/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
diff --git a/src/lib/mina_intf/transition_frontier_components_intf.ml b/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 ] ]
diff --git a/src/lib/mina_lib/mina_lib.ml b/src/lib/mina_lib/mina_lib.ml
@@ -726,7 +726,7 @@ let get_snarked_ledger_full t state_hash_opt =
               in
               Staged_ledger.Scan_state.get_snarked_ledger_async ~ledger
                 ~get_protocol_state ~apply_first_pass ~apply_second_pass
-                ~apply_first_pass_sparse_ledger
+                ~apply_first_pass_sparse_ledger ~signature_kind
                 (Staged_ledger.scan_state
                    (Transition_frontier.Breadcrumb.staged_ledger b) )
               |> Deferred.Result.map_error ~f:(fun e ->
@@ -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
diff --git a/src/lib/mina_lib/tests/tests.ml b/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
diff --git a/src/lib/staged_ledger/staged_ledger.ml b/src/lib/staged_ledger/staged_ledger.ml
@@ -362,7 +362,8 @@ module T = struct
       Scan_state.get_staged_ledger_async
         ~async_batch_size:transaction_application_scheduler_batch_size
         ~ledger:snarked_ledger ~get_protocol_state:get_state ~apply_first_pass
-        ~apply_second_pass ~apply_first_pass_sparse_ledger scan_state
+        ~apply_second_pass ~apply_first_pass_sparse_ledger ~signature_kind
+        scan_state
     in
     let staged_ledger_hash = Ledger.merkle_root snarked_ledger in
     let%bind () =
@@ -2834,7 +2835,8 @@ let%test_module "staged ledger tests" =
                       Sl.Scan_state.get_snarked_ledger_async
                         ~ledger:snarked_ledger ~get_protocol_state:get_state
                         ~apply_first_pass ~apply_second_pass
-                        ~apply_first_pass_sparse_ledger !sl.scan_state
+                        ~apply_first_pass_sparse_ledger ~signature_kind
+                        !sl.scan_state
                     in
                     let target_snarked_ledger =
                       let stmt = Ledger_proof.Cached.statement proof in
diff --git a/src/lib/staged_ledger/staged_ledger.mli b/src/lib/staged_ledger/staged_ledger.mli
@@ -110,6 +110,7 @@ module Scan_state : sig
           -> Mina_transaction.Transaction.t
           -> Mina_ledger.Sparse_ledger.T.Transaction_partially_applied.t
              Or_error.t )
+    -> signature_kind:Mina_signature_kind.t
     -> t
     -> unit Or_error.t
 
@@ -141,6 +142,7 @@ module Scan_state : sig
           -> Mina_transaction.Transaction.t
           -> Mina_ledger.Sparse_ledger.T.Transaction_partially_applied.t
              Or_error.t )
+    -> signature_kind:Mina_signature_kind.t
     -> t
     -> unit Deferred.Or_error.t
 
diff --git a/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.ml b/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.ml
@@ -965,7 +965,8 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
             expected_status status
             (Ledger.Transaction_partially_applied.command partially_applied_txn)
   in
-  let apply_previous_incomplete_txns ~k (txns : Previous_incomplete_txns.t) =
+  let apply_previous_incomplete_txns ~signature_kind ~k
+      (txns : Previous_incomplete_txns.t) =
     (*Note: Previous incomplete transactions refer to the block's transactions from previous scan state tree that were split between the two trees.
       The set in the previous tree have gone through the first pass. For the second pass that is to happen after the rest of the set goes through the first pass, we need partially applied state - result of previous tree's transactions' first pass. To generate the partial state, we do a first pass application of previous tree's transaction on a sparse ledger created from witnesses stored in the scan state and then use it to apply to the ledger here*)
     let inject_ledger_info partially_applied_txn =
@@ -1016,7 +1017,7 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
             { command = t.command
             ; previous_hash = t.previous_hash
             ; original_first_pass_account_states
-            ; signature_kind = Mina_signature_kind.t_DEPRECATED
+            ; signature_kind
             ; constraint_constants = t.constraint_constants
             ; state_view = t.state_view
             ; global_state
@@ -1068,7 +1069,7 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
   in
   let rec apply_txns (previous_incomplete : Previous_incomplete_txns.t)
       (ordered_txns : _ Transactions_ordered.Poly.t list)
-      ~first_pass_ledger_hash =
+      ~first_pass_ledger_hash ~signature_kind =
     let previous_incomplete =
       (*filter out any non-zkapp transactions for second pass application*)
       match previous_incomplete with
@@ -1090,8 +1091,9 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
     in
     match ordered_txns with
     | [] ->
-        apply_previous_incomplete_txns previous_incomplete ~k:(fun () ->
-            Ok (`Complete first_pass_ledger_hash) )
+        apply_previous_incomplete_txns ~signature_kind
+          ~k:(fun () -> Ok (`Complete first_pass_ledger_hash))
+          previous_incomplete
     | [ txns_per_block ] when stop_at_first_pass ->
         (*Last block; don't apply second pass. This is for snarked ledgers which are first pass ledgers*)
         apply_txns_first_pass txns_per_block.first_pass
@@ -1100,13 +1102,14 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
               then there’d be at least two sets of txns_per_block and the
               previous_incomplete txns will be applied when processing the first
               set. The subsequent sets shouldn’t have any previous-incomplete.*)
-            apply_txns (Unapplied []) [] ~first_pass_ledger_hash )
+            apply_txns (Unapplied []) [] ~first_pass_ledger_hash ~signature_kind )
     | txns_per_block :: ordered_txns' ->
         (*Apply first pass of a blocks transactions either new or continued from previous tree*)
         apply_txns_first_pass txns_per_block.first_pass
           ~k:(fun first_pass_ledger_hash partially_applied_txns ->
             (*Apply second pass of previous tree's transactions, if any*)
-            apply_previous_incomplete_txns previous_incomplete ~k:(fun () ->
+            apply_previous_incomplete_txns previous_incomplete ~signature_kind
+              ~k:(fun () ->
                 let continue_previous_tree's_txns =
                   (* If this is a continuation from previous tree for the same block (incomplete txns in both sets) then do second pass now*)
                   let previous_not_empty =
@@ -1127,11 +1130,11 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
                 if do_second_pass then
                   apply_txns_second_pass partially_applied_txns ~k:(fun () ->
                       apply_txns (Unapplied []) ordered_txns'
-                        ~first_pass_ledger_hash )
+                        ~first_pass_ledger_hash ~signature_kind )
                 else
                   (*Transactions not completed in this tree, so second pass after first pass of remaining transactions for the same block in the next tree*)
                   apply_txns (Partially_applied partially_applied_txns)
-                    ordered_txns' ~first_pass_ledger_hash ) )
+                    ordered_txns' ~first_pass_ledger_hash ~signature_kind ) )
   in
   let previous_incomplete =
     Option.value_map (List.hd ordered_txns)
@@ -1148,7 +1151,7 @@ let apply_ordered_txns_stepwise ?(stop_at_first_pass = false) ordered_txns
 
 let apply_ordered_txns_sync ?stop_at_first_pass ordered_txns ~ledger
     ~get_protocol_state ~apply_first_pass ~apply_second_pass
-    ~apply_first_pass_sparse_ledger =
+    ~apply_first_pass_sparse_ledger ~signature_kind =
   let rec run = function
     | Ok (`Continue k) ->
         run (k ())
@@ -1160,11 +1163,11 @@ let apply_ordered_txns_sync ?stop_at_first_pass ordered_txns ~ledger
   run
   @@ apply_ordered_txns_stepwise ?stop_at_first_pass ordered_txns ~ledger
        ~get_protocol_state ~apply_first_pass ~apply_second_pass
-       ~apply_first_pass_sparse_ledger
+       ~apply_first_pass_sparse_ledger ~signature_kind
 
 let apply_ordered_txns_async ?stop_at_first_pass ordered_txns
     ?(async_batch_size = 10) ~ledger ~get_protocol_state ~apply_first_pass
-    ~apply_second_pass ~apply_first_pass_sparse_ledger =
+    ~apply_second_pass ~apply_first_pass_sparse_ledger ~signature_kind =
   let open Deferred.Result.Let_syntax in
   let yield =
     let f = Staged.unstage (Scheduler.yield_every ~n:async_batch_size) in
@@ -1183,36 +1186,38 @@ let apply_ordered_txns_async ?stop_at_first_pass ordered_txns
   run
   @@ apply_ordered_txns_stepwise ?stop_at_first_pass ordered_txns ~ledger
        ~get_protocol_state ~apply_first_pass ~apply_second_pass
-       ~apply_first_pass_sparse_ledger
+       ~apply_first_pass_sparse_ledger ~signature_kind
 
 let get_snarked_ledger_sync ~ledger ~get_protocol_state ~apply_first_pass
-    ~apply_second_pass ~apply_first_pass_sparse_ledger t =
+    ~apply_second_pass ~apply_first_pass_sparse_ledger ~signature_kind t =
   match latest_ledger_proof' t with
   | None ->
       Or_error.errorf "No transactions found"
   | Some (_, txns_per_block) ->
       apply_ordered_txns_sync ~stop_at_first_pass:true txns_per_block ~ledger
         ~get_protocol_state ~apply_first_pass ~apply_second_pass
-        ~apply_first_pass_sparse_ledger
+        ~apply_first_pass_sparse_ledger ~signature_kind
       |> Or_error.ignore_m
 
 let get_snarked_ledger_async ?async_batch_size ~ledger ~get_protocol_state
-    ~apply_first_pass ~apply_second_pass ~apply_first_pass_sparse_ledger t =
+    ~apply_first_pass ~apply_second_pass ~apply_first_pass_sparse_ledger
+    ~signature_kind t =
   match latest_ledger_proof' t with
   | None ->
       Deferred.Or_error.errorf "No transactions found"
   | Some (_, txns_per_block) ->
       apply_ordered_txns_async ~stop_at_first_pass:true txns_per_block
         ?async_batch_size ~ledger ~get_protocol_state ~apply_first_pass
-        ~apply_second_pass ~apply_first_pass_sparse_ledger
+        ~apply_second_pass ~apply_first_pass_sparse_ledger ~signature_kind
       |> Deferred.Or_error.ignore_m
 
 let get_staged_ledger_async ?async_batch_size ~ledger ~get_protocol_state
-    ~apply_first_pass ~apply_second_pass ~apply_first_pass_sparse_ledger t =
+    ~apply_first_pass ~apply_second_pass ~apply_first_pass_sparse_ledger
+    ~signature_kind t =
   let staged_transactions_with_state_hash = staged_transactions t in
   apply_ordered_txns_async staged_transactions_with_state_hash ?async_batch_size
     ~ledger ~get_protocol_state ~apply_first_pass ~apply_second_pass
-    ~apply_first_pass_sparse_ledger
+    ~apply_first_pass_sparse_ledger ~signature_kind
 
 let free_space t = Parallel_scan.free_space t.scan_state
 
diff --git a/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.mli b/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.mli
@@ -138,6 +138,7 @@ val get_snarked_ledger_sync :
         -> Mina_transaction.Transaction.t
         -> Mina_ledger.Sparse_ledger.T.Transaction_partially_applied.t
            Or_error.t )
+  -> signature_kind:Mina_signature_kind.t
   -> t
   -> unit Or_error.t
 
@@ -163,6 +164,7 @@ val get_snarked_ledger_async :
         -> Mina_transaction.Transaction.t
         -> Mina_ledger.Sparse_ledger.T.Transaction_partially_applied.t
            Or_error.t )
+  -> signature_kind:Mina_signature_kind.t
   -> t
   -> unit Deferred.Or_error.t
 
@@ -195,6 +197,7 @@ val get_staged_ledger_async :
         -> Mina_transaction.Transaction.t
         -> Mina_ledger.Sparse_ledger.T.Transaction_partially_applied.t
            Or_error.t )
+  -> signature_kind:Mina_signature_kind.t
   -> t
   -> [ `First_pass_ledger_hash of Ledger_hash.t ] Deferred.Or_error.t
 
diff --git a/src/lib/transition_frontier/full_frontier/full_frontier.ml b/src/lib/transition_frontier/full_frontier/full_frontier.ml
@@ -508,12 +508,11 @@ let move_root ({ context = (module Context); _ } as t) ~new_root_hash
               (State_hash.to_base58_check state_hash)
       in
       Or_error.ok_exn
-        ( Staged_ledger.Scan_state.get_snarked_ledger_sync ~ledger:mt
-            ~get_protocol_state ~apply_first_pass ~apply_second_pass
-            ~apply_first_pass_sparse_ledger
-            (Staged_ledger.scan_state
-               (Breadcrumb.staged_ledger new_root_node.breadcrumb) )
-          : unit Or_error.t ) ;
+        (Staged_ledger.Scan_state.get_snarked_ledger_sync ~ledger:mt
+           ~get_protocol_state ~apply_first_pass ~apply_second_pass
+           ~apply_first_pass_sparse_ledger ~signature_kind
+           (Staged_ledger.scan_state
+              (Breadcrumb.staged_ledger new_root_node.breadcrumb) ) ) ;
       (*Check that the new snarked ledger is as expected*)
       let new_snarked_ledger_hash = Ledger.merkle_root mt in
       let expected_snarked_ledger_hash =
diff --git a/src/lib/transition_frontier/persistent_frontier/persistent_frontier.ml b/src/lib/transition_frontier/persistent_frontier/persistent_frontier.ml
@@ -22,7 +22,8 @@ exception Invalid_genesis_state_hash of Mina_block.Validated.t
 
 let construct_staged_ledger_at_root ~proof_cache_db
     ~(precomputed_values : Precomputed_values.t) ~root_ledger ~root_transition
-    ~(root : Root_data.Minimal.Stable.Latest.t) ~protocol_states ~logger =
+    ~(root : Root_data.Minimal.Stable.Latest.t) ~protocol_states ~logger
+    ~signature_kind =
   let open Deferred.Or_error.Let_syntax in
   let blockchain_state =
     root_transition |> Mina_block.Validated.forget |> With_hash.data
@@ -68,7 +69,7 @@ let construct_staged_ledger_at_root ~proof_cache_db
       ~constraint_constants:precomputed_values.constraint_constants ~logger
       ~pending_coinbases
       ~expected_merkle_root:(Staged_ledger_hash.ledger_hash staged_ledger_hash)
-      ~get_state ~signature_kind:Mina_signature_kind.t_DEPRECATED
+      ~get_state ~signature_kind
   in
   let constructed_staged_ledger_hash = Staged_ledger.hash staged_ledger in
   if
@@ -96,6 +97,7 @@ and Factory_type : sig
     ; directory : string
     ; verifier : Verifier.t
     ; time_controller : Block_time.Controller.t
+    ; signature_kind : Mina_signature_kind.t
     ; mutable instance : Instance_type.t option
     }
 end =
@@ -244,7 +246,7 @@ module Instance = struct
       match%map
         construct_staged_ledger_at_root ~proof_cache_db ~precomputed_values
           ~root_ledger ~root_transition ~root ~protocol_states
-          ~logger:t.factory.logger
+          ~signature_kind:t.factory.signature_kind ~logger:t.factory.logger
       with
       | Error err ->
           Error (`Failure (Error.to_string_hum err))
@@ -356,8 +358,14 @@ end
 
 type t = Factory_type.t
 
-let create ~logger ~verifier ~time_controller ~directory =
-  { logger; verifier; time_controller; directory; instance = None }
+let create ~logger ~verifier ~time_controller ~directory ~signature_kind =
+  { logger
+  ; verifier
+  ; time_controller
+  ; directory
+  ; signature_kind
+  ; instance = None
+  }
 
 let destroy_database_exn t =
   assert (Option.is_none t.instance) ;
diff --git a/src/lib/transition_frontier/transition_frontier.ml b/src/lib/transition_frontier/transition_frontier.ml
@@ -659,6 +659,7 @@ module For_tests = struct
           Persistent_frontier.create ~logger ~verifier
             ~time_controller:(Block_time.Controller.basic ~logger)
             ~directory:frontier_dir
+            ~signature_kind:Mina_signature_kind.t_DEPRECATED
         in
         Gc.Expert.add_finalizer_exn persistent_root clean_temp_dirs ;
         Gc.Expert.add_finalizer_exn persistent_frontier (fun x ->
diff --git a/src/lib/transition_router/transition_router.ml b/src/lib/transition_router/transition_router.ml
