Populate change to Consensus > Genesis_epoch_ledger across the codebase

Author: glyh

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

@@ -1144,8 +1144,7 @@ let setup_daemon logger ~itn_features ~default_snark_worker_fee =
           let consensus_local_state =
             Consensus.Data.Local_state.create
               ~context:(module Context)
-              ~genesis_ledger:
-                (Precomputed_values.genesis_ledger precomputed_values)
+              ~genesis_ledger:precomputed_values.genesis_ledger
               ~genesis_epoch_data:precomputed_values.genesis_epoch_data
               ~epoch_ledger_location
               ( Option.map block_production_keypair ~f:(fun keypair ->

src/app/cli/src/init/mina_run.ml

@@ -306,7 +306,8 @@ let setup_local_server ?(client_trustlist = []) ?rest_server_port
           | Ok ledger -> (
               match ledger with
               | Genesis_epoch_ledger l ->
-                  let%map accts = Mina_ledger.Ledger.to_list l in
+                  let l_inner = Lazy.force @@ Genesis_ledger.Packed.t l in
+                  let%map accts = Mina_ledger.Ledger.to_list l_inner in
                   Ok accts
               | Ledger_root l ->
                   let casted = Mina_ledger.Ledger.Root.as_unmasked l in

src/app/cli/src/init/test_ledger_application.ml

@@ -85,10 +85,8 @@ let mk_tx ~transfer_parties_get_actions_events ~event_elements ~action_elements
 let generate_protocol_state_stub ~consensus_constants ~constraint_constants
     ledger =
   let open Staged_ledger_diff in
-  Protocol_state.negative_one
-    ~genesis_ledger:(lazy ledger)
-    ~genesis_epoch_data:None ~constraint_constants ~consensus_constants
-    ~genesis_body_reference
+  Protocol_state.negative_one ~genesis_ledger:ledger ~genesis_epoch_data:None
+    ~constraint_constants ~consensus_constants ~genesis_body_reference
 
 let apply_txs ~transfer_parties_get_actions_events ~action_elements
     ~event_elements ~constraint_constants ~first_partition_slots ~no_new_stack
@@ -186,9 +184,16 @@ let test ~privkey_path ~ledger_path ?prev_block_path ~first_partition_slots
   O1trace.thread "mina"
   @@ fun () ->
   let%bind keypair = read_privkey privkey_path in
+
+  let module Test_genesis_ledger = Genesis_ledger.Make (struct
+    include Test_genesis_ledger
+
+    let directory = `Path ledger_path
+
+    let depth = constraint_constants.ledger_depth
+  end) in
   let init_ledger =
-    Ledger.create ~directory_name:ledger_path
-      ~depth:constraint_constants.ledger_depth ()
+    Lazy.force @@ Genesis_ledger.Packed.t (module Test_genesis_ledger)
   in
   let prev_protocol_state =
     let%map.Option prev_block_path = prev_block_path in
@@ -207,7 +212,7 @@ let test ~privkey_path ~ledger_path ?prev_block_path ~first_partition_slots
     match prev_protocol_state with
     | None ->
         generate_protocol_state_stub ~consensus_constants ~constraint_constants
-          init_ledger
+          (module Test_genesis_ledger)
     | Some p ->
         p
   in

src/app/zkapp_test_transaction/lib/commands.ml

@@ -109,7 +109,7 @@ let gen_proof ?(zkapp_account = None) (zkapp_command : Zkapp_command.t)
       let open Staged_ledger_diff in
       (*not using Precomputed_values.for_unit_test because of dependency cycle*)
       Mina_state.Genesis_protocol_state.t
-        ~genesis_ledger:Genesis_ledger.(Packed.t for_unit_tests)
+        ~genesis_ledger:Genesis_ledger.for_unit_tests
         ~genesis_epoch_data:Consensus.Genesis_epoch_data.for_unit_tests
         ~constraint_constants ~consensus_constants ~genesis_body_reference
     in
@@ -171,7 +171,7 @@ let generate_zkapp_txn (keypair : Signature_lib.Keypair.t) (ledger : Ledger.t)
   let compile_time_genesis =
     (*not using Precomputed_values.for_unit_test because of dependency cycle*)
     Mina_state.Genesis_protocol_state.t
-      ~genesis_ledger:Genesis_ledger.(Packed.t for_unit_tests)
+      ~genesis_ledger:Genesis_ledger.for_unit_tests
       ~genesis_epoch_data:Consensus.Genesis_epoch_data.for_unit_tests
       ~constraint_constants ~consensus_constants ~genesis_body_reference
   in

src/lib/fake_network/fake_network.ml

@@ -230,11 +230,10 @@ module Generator = struct
       Filename.temp_dir_name ^/ "epoch_ledger"
       ^ (Uuid_unix.create () |> Uuid.to_string)
     in
-    let genesis_ledger = Precomputed_values.genesis_ledger precomputed_values in
     let consensus_local_state =
       Consensus.Data.Local_state.create Public_key.Compressed.Set.empty
         ~context:(module Context)
-        ~genesis_ledger
+        ~genesis_ledger:precomputed_values.genesis_ledger
         ~genesis_epoch_data:precomputed_values.genesis_epoch_data
         ~epoch_ledger_location
         ~genesis_state_hash:
@@ -273,11 +272,10 @@ module Generator = struct
       Filename.temp_dir_name ^/ "epoch_ledger"
       ^ (Uuid_unix.create () |> Uuid.to_string)
     in
-    let genesis_ledger = Precomputed_values.genesis_ledger precomputed_values in
     let consensus_local_state =
       Consensus.Data.Local_state.create Public_key.Compressed.Set.empty
         ~context:(module Context)
-        ~genesis_ledger
+        ~genesis_ledger:precomputed_values.genesis_ledger
         ~genesis_epoch_data:precomputed_values.genesis_epoch_data
         ~epoch_ledger_location
         ~genesis_state_hash:

src/lib/genesis_ledger_helper/genesis_ledger_helper.ml

@@ -604,8 +604,7 @@ module Epoch_data = struct
           in
           [%log trace] "Loaded staking epoch ledger from $ledger_file"
             ~metadata:[ ("ledger_file", `String ledger_file) ] ;
-          ( { Consensus.Genesis_epoch_data.Data.ledger =
-                Genesis_ledger.Packed.t staking_ledger
+          ( { Consensus.Genesis_epoch_data.Data.ledger = staking_ledger
             ; seed = Epoch_seed.of_base58_check_exn config.staking.seed
             }
           , { config.staking with ledger = config' } )
@@ -622,8 +621,7 @@ module Epoch_data = struct
               [%log trace] "Loaded next epoch ledger from $ledger_file"
                 ~metadata:[ ("ledger_file", `String ledger_file) ] ;
               ( Some
-                  { Consensus.Genesis_epoch_data.Data.ledger =
-                      Genesis_ledger.Packed.t next_ledger
+                  { Consensus.Genesis_epoch_data.Data.ledger = next_ledger
                   ; seed = Epoch_seed.of_base58_check_exn seed
                   }
               , Some { Runtime_config.Epoch_data.Data.ledger = config''; seed }
@@ -707,8 +705,7 @@ module Genesis_proof = struct
     in
     let open Staged_ledger_diff in
     let protocol_state_with_hashes =
-      Mina_state.Genesis_protocol_state.t
-        ~genesis_ledger:(Genesis_ledger.Packed.t ledger)
+      Mina_state.Genesis_protocol_state.t ~genesis_ledger:ledger
         ~genesis_epoch_data ~constraint_constants ~consensus_constants
         ~genesis_body_reference
     in

src/lib/mina_graphql/mina_graphql.ml

@@ -2096,10 +2096,8 @@ module Queries = struct
             ; hash = { State_hash.State_hashes.state_hash = hash; _ }
             } =
           let open Staged_ledger_diff in
-          Genesis_protocol_state.t
-            ~genesis_ledger:(Genesis_ledger.Packed.t genesis_ledger)
-            ~genesis_epoch_data ~constraint_constants ~consensus_constants
-            ~genesis_body_reference
+          Genesis_protocol_state.t ~genesis_ledger ~genesis_epoch_data
+            ~constraint_constants ~consensus_constants ~genesis_body_reference
         in
         let winner = fst Consensus_state_hooks.genesis_winner in
         { With_hash.data =
@@ -2601,7 +2599,8 @@ module Queries = struct
     let cast_ledger = function
       | Consensus.Data.Local_state.Snapshot.Ledger_snapshot.Genesis_epoch_ledger
           l ->
-          Ledger.Any_ledger.cast (module Ledger) l
+          let l_inner = Lazy.force @@ Genesis_ledger.Packed.t l in
+          Ledger.Any_ledger.cast (module Ledger) l_inner
       | Consensus.Data.Local_state.Snapshot.Ledger_snapshot.Ledger_root l ->
           Ledger.Root.as_unmasked l
     in

src/lib/mina_graphql/types.ml

@@ -1494,11 +1494,14 @@ module AccountObj = struct
                  let account_id = account_id account in
                  match%bind Mina_lib.staking_ledger mina with
                  | Genesis_epoch_ledger staking_ledger -> (
+                     let staking_ledger_inner =
+                       Lazy.force @@ Genesis_ledger.Packed.t staking_ledger
+                     in
                      match
                        let open Option.Let_syntax in
                        account_id
-                       |> Ledger.location_of_account staking_ledger
-                       >>= Ledger.get staking_ledger
+                       |> Ledger.location_of_account staking_ledger_inner
+                       >>= Ledger.get staking_ledger_inner
                      with
                      | Some account ->
                          let%bind delegate_key = account.delegate in

src/lib/mina_lib/tests/tests.ml

@@ -128,12 +128,7 @@ let%test_module "Epoch ledger sync tests" =
             ~compile_config:Mina_compile_config.For_unit_tests.t
             ~max_subtree_depth:None ~default_subtree_depth:None ()
       end in
-      let genesis_ledger =
-        lazy
-          (Mina_ledger.Ledger.create
-             ~directory_name:(make_dirname "genesis_ledger")
-             ~depth:precomputed_values.constraint_constants.ledger_depth () )
-      in
+      let genesis_ledger = Genesis_ledger.for_unit_tests in
       let genesis_epoch_data : Consensus.Genesis_epoch_data.t = None in
       let genesis_state_hash = Quickcheck.random_value Ledger_hash.gen in
       let consensus_local_state =
@@ -147,7 +142,7 @@ let%test_module "Epoch ledger sync tests" =
       let module Context = struct
         include Context
 
-        let genesis_ledger = genesis_ledger
+        let genesis_ledger = Genesis_ledger.Packed.t genesis_ledger
 
         let consensus_local_state = consensus_local_state
 
@@ -568,7 +563,7 @@ let%test_module "Epoch ledger sync tests" =
           | Error _ ->
               failwith "Could not add account" ) ;
       Consensus.Data.Local_state.Snapshot.Ledger_snapshot.Genesis_epoch_ledger
-        ledger
+        Genesis_ledger.for_unit_tests
 
     let make_db_ledger (module Context : CONTEXT) (accounts : Account.t list) =
       let root_ledger = make_empty_root_ledger (module Context) in

src/lib/mina_state/genesis_protocol_state.ml

@@ -2,8 +2,11 @@ open Core_kernel
 
 let t ~genesis_ledger ~genesis_epoch_data ~constraint_constants
     ~consensus_constants ~genesis_body_reference =
+  let genesis_ledger_forced =
+    Lazy.force @@ Genesis_ledger.Packed.t genesis_ledger
+  in
   let genesis_ledger_hash =
-    Mina_ledger.Ledger.merkle_root (Lazy.force genesis_ledger)
+    Mina_ledger.Ledger.merkle_root genesis_ledger_forced
   in
   let protocol_constants =
     Consensus.Constants.to_protocol_constants consensus_constants