Merge pull request #17793 from MinaProtocol/cjjdespres/use-hard-fork-account

Use Hardfork account type in Root ledger

Author: cjjdespres

src/lib/mina_ledger/ledger.ml

@@ -283,21 +283,21 @@ module Ledger_inner = struct
        and type token_id_set := Token_id.Set.t
        and type account_id := Account_id.t
        and type account_id_set := Account_id.Set.t
-       and type converted_account := Account.Unstable.t
+       and type converted_account := Account.Hardfork.t
        and type primary_ledger = Db.t
-       and type converting_ledger = Unstable_db.t =
+       and type converting_ledger = Hardfork_db.t =
     Converting_merkle_tree.With_database
       (struct
-        type converted_account = Account.Unstable.t
+        type converted_account = Account.Hardfork.t
 
-        let convert = Account.Unstable.of_stable
+        let convert = Account.Hardfork.of_stable
 
-        let converted_equal = Account.Unstable.equal
+        let converted_equal = Account.Hardfork.equal
 
         include Inputs
       end)
       (Db)
-      (Unstable_db)
+      (Hardfork_db)
 
   let of_any_ledger ledger =
     let mask = Mask.create ~depth:(Any_ledger.M.depth ledger) () in
@@ -334,7 +334,7 @@ module Ledger_inner = struct
     , Converting_ledger.converting_ledger converting_ledger )
 
   module Root = struct
-    include Root.Make (Any_ledger) (Db) (Unstable_db) (Converting_ledger)
+    include Root.Make (Any_ledger) (Db) (Hardfork_db) (Converting_ledger)
 
     let as_masked t = as_unmasked t |> of_any_ledger
   end
@@ -909,7 +909,7 @@ let%test_unit "user_command application on converting ledger" =
       L.with_converting_ledger_exn ~logger ~depth ~f:(fun (l, cl) ->
           Init_ledger.init (module L) init_ledger l ;
           let init_merkle_root = L.merkle_root l in
-          let init_cl_merkle_root = Unstable_db.merkle_root cl in
+          let init_cl_merkle_root = Hardfork_db.merkle_root cl in
           let () =
             iter_err cmds
               ~f:
@@ -923,18 +923,15 @@ let%test_unit "user_command application on converting ledger" =
           assert (
             not
               (Ledger_hash.equal init_cl_merkle_root
-                 (Unstable_db.merkle_root cl) ) ) ;
-          (* Assert that the converted ledger has the same accounts as the first one, up to the new field*)
+                 (Hardfork_db.merkle_root cl) ) ) ;
+          (* Assert that the converted ledger has the same accounts as the first one, up to conversion *)
           L.iteri l ~f:(fun index account ->
-              let account_converted = Unstable_db.get_at_index_exn cl index in
+              let account_converted = Hardfork_db.get_at_index_exn cl index in
               assert (
-                Mina_base.Account.Key.(
-                  equal account.public_key account_converted.public_key) ) ;
-              assert (
-                Mina_base.Account.Nonce.(
-                  equal account_converted.nonce account_converted.unstable_field) ) ) ;
+                Mina_base.Account.Hardfork.(
+                  equal (of_stable account) account_converted) ) ) ;
           (* Assert that the converted ledger doesn't have anything "extra" compared to the primary ledger *)
-          Unstable_db.iteri cl ~f:(fun index account_converted ->
+          Hardfork_db.iteri cl ~f:(fun index account_converted ->
               let account = L.get_at_index_exn l index in
               assert (
                 Mina_base.Account.Key.(

src/lib/mina_ledger/ledger.mli

@@ -97,13 +97,13 @@ module Converting_ledger :
      and type token_id_set := Token_id.Set.t
      and type account_id := Account_id.t
      and type account_id_set := Account_id.Set.t
-     and type converted_account := Account.Unstable.t
+     and type converted_account := Account.Hardfork.t
      and type primary_ledger = Db.t
-     and type converting_ledger = Unstable_db.t
+     and type converting_ledger = Hardfork_db.t
 
 module Root : sig
   include module type of
-      Root.Make (Any_ledger) (Db) (Unstable_db) (Converting_ledger)
+      Root.Make (Any_ledger) (Db) (Hardfork_db) (Converting_ledger)
 
   val as_masked : t -> Mask.Attached.t
 end

src/lib/mina_ledger/root.ml

@@ -12,9 +12,9 @@ module type Stable_db_intf =
      and type hash := Ledger_hash.t
      and type root_hash := Ledger_hash.t
 
-module type Unstable_db_intf =
+module type Migrated_db_intf =
   Merkle_ledger.Intf.Ledger.DATABASE
-    with type account := Account.Unstable.t
+    with type account := Account.Hardfork.t
      and type key := Signature_lib.Public_key.Compressed.t
      and type token_id := Token_id.t
      and type token_id_set := Token_id.Set.t
@@ -43,21 +43,21 @@ module type Converting_ledger_intf =
      and type token_id_set := Token_id.Set.t
      and type account_id := Account_id.t
      and type account_id_set := Account_id.Set.t
-     and type converted_account := Account.Unstable.t
+     and type converted_account := Account.Hardfork.t
 
 module Make
     (Any_ledger : Any_ledger_intf)
     (Stable_db : Stable_db_intf
                    with module Location = Any_ledger.M.Location
                     and module Addr = Any_ledger.M.Addr)
-    (Unstable_db : Unstable_db_intf
+    (Migrated_db : Migrated_db_intf
                      with module Location = Any_ledger.M.Location
                       and module Addr = Any_ledger.M.Addr)
     (Converting_ledger : Converting_ledger_intf
                            with module Location = Any_ledger.M.Location
                             and module Addr = Any_ledger.M.Addr
                            with type primary_ledger = Stable_db.t
-                            and type converting_ledger = Unstable_db.t) =
+                            and type converting_ledger = Migrated_db.t) =
 struct
   module Config = struct
     type backing_type = Stable_db | Converting_db [@@deriving equal, yojson]

src/lib/mina_ledger/root.mli

@@ -11,9 +11,9 @@ module type Stable_db_intf =
      and type hash := Ledger_hash.t
      and type root_hash := Ledger_hash.t
 
-module type Unstable_db_intf =
+module type Migrated_db_intf =
   Merkle_ledger.Intf.Ledger.DATABASE
-    with type account := Account.Unstable.t
+    with type account := Account.Hardfork.t
      and type key := Signature_lib.Public_key.Compressed.t
      and type token_id := Token_id.t
      and type token_id_set := Token_id.Set.t
@@ -42,7 +42,7 @@ module type Converting_ledger_intf =
      and type token_id_set := Token_id.Set.t
      and type account_id := Account_id.t
      and type account_id_set := Account_id.Set.t
-     and type converted_account := Account.Unstable.t
+     and type converted_account := Account.Hardfork.t
 
 (** Make a root ledger. A root ledger is a database-backed, unmasked ledger used
     at the root of a mina ledger mask tree. Currently only a single stable
@@ -55,14 +55,14 @@ module Make
     (Stable_db : Stable_db_intf
                    with module Location = Any_ledger.M.Location
                     and module Addr = Any_ledger.M.Addr)
-    (Unstable_db : Unstable_db_intf
+    (Migrated_db : Migrated_db_intf
                      with module Location = Any_ledger.M.Location
                       and module Addr = Any_ledger.M.Addr)
     (Converting_ledger : Converting_ledger_intf
                            with module Location = Any_ledger.M.Location
                             and module Addr = Any_ledger.M.Addr
                            with type primary_ledger = Stable_db.t
-                            and type converting_ledger = Unstable_db.t) : sig
+                            and type converting_ledger = Migrated_db.t) : sig
   type t
 
   type root_hash = Ledger_hash.t