Return source ledgers in prepare inputs

Author: cjjdespres

src/lib/mina_graphql/mina_graphql.ml

@@ -2612,17 +2612,24 @@ module Queries = struct
               Deferred.Or_error.error_string
                 "Cannot specify both state hash and height"
         in
-        let%bind { staged_ledger
+        let%bind { source_ledgers
                  ; global_slot_since_genesis
                  ; state_hash
-                 ; staking_ledger
                  ; staking_epoch_seed
-                 ; next_epoch_ledger
                  ; next_epoch_seed
                  ; blockchain_length
                  } =
           Mina_lib.Hardfork_config.prepare_inputs ~breadcrumb_spec mina
         in
+        let staged_ledger = source_ledgers.staged_ledger in
+        let staking_ledger =
+          Mina_lib.Hardfork_config.genesis_source_ledger_cast
+            source_ledgers.staking_ledger
+        in
+        let next_epoch_ledger =
+          Mina_lib.Hardfork_config.genesis_source_ledger_cast
+            source_ledgers.next_epoch_ledger
+        in
         let%bind new_config =
           Runtime_config.make_fork_config ~staged_ledger
             ~global_slot_since_genesis ~state_hash ~staking_ledger

src/lib/mina_lib/mina_lib.ml

@@ -2827,12 +2827,10 @@ module Hardfork_config = struct
     { root_snarked_ledger; staged_ledger; staking_ledger; next_epoch_ledger }
 
   type inputs =
-    { staged_ledger : Ledger.t
+    { source_ledgers : genesis_source_ledgers
     ; global_slot_since_genesis : Mina_numbers.Global_slot_since_genesis.t
     ; state_hash : State_hash.t
-    ; staking_ledger : Ledger.Any_ledger.witness
     ; staking_epoch_seed : Epoch_seed.t
-    ; next_epoch_ledger : Ledger.Any_ledger.witness
     ; next_epoch_seed : Epoch_seed.t
     ; blockchain_length : Mina_numbers.Length.t
     }
@@ -2859,19 +2857,11 @@ module Hardfork_config = struct
     in
     let staking_epoch_seed = staking_epoch.Epoch_data.Poly.seed in
     let next_epoch_seed = next_epoch.Epoch_data.Poly.seed in
-    let%map { root_snarked_ledger = _
-            ; staged_ledger
-            ; staking_ledger
-            ; next_epoch_ledger
-            } =
-      source_ledgers ~breadcrumb mina
-    in
-    { staged_ledger
+    let%map source_ledgers = source_ledgers ~breadcrumb mina in
+    { source_ledgers
     ; global_slot_since_genesis
     ; state_hash
-    ; staking_ledger = genesis_source_ledger_cast staking_ledger
     ; staking_epoch_seed
-    ; next_epoch_ledger = genesis_source_ledger_cast next_epoch_ledger
     ; next_epoch_seed
     ; blockchain_length
     }

src/lib/mina_lib/mina_lib.mli

@@ -309,6 +309,12 @@ module Hardfork_config : sig
         | `Uncommitted of Mina_ledger.Ledger.t ]
     }
 
+  val genesis_source_ledger_cast :
+       [< `Genesis of Genesis_ledger.Packed.t
+       | `Root of Mina_ledger.Ledger.Root.t
+       | `Uncommitted of Mina_ledger.Ledger.t ]
+    -> Mina_ledger.Ledger.Any_ledger.witness
+
   (** Retrieve the [genesis_source_ledgers] from the transition frontier,
       starting at the given [breadcrumb]. *)
   val source_ledgers :
@@ -317,12 +323,10 @@ module Hardfork_config : sig
     -> genesis_source_ledgers Deferred.Or_error.t
 
   type inputs =
-    { staged_ledger : Mina_ledger.Ledger.t
+    { source_ledgers : genesis_source_ledgers
     ; global_slot_since_genesis : Mina_numbers.Global_slot_since_genesis.t
     ; state_hash : State_hash.t
-    ; staking_ledger : Mina_ledger.Ledger.Any_ledger.witness
     ; staking_epoch_seed : Epoch_seed.t
-    ; next_epoch_ledger : Mina_ledger.Ledger.Any_ledger.witness
     ; next_epoch_seed : Epoch_seed.t
     ; blockchain_length : Mina_numbers.Length.t
     }