Merge remote-tracking branch 'origin/develop' into lyh/bump-opam-export-develop

Author: glyh

src/app/archive/lib/extensional.ml

@@ -86,11 +86,11 @@ end
 module Zkapp_command = struct
   [%%versioned
   module Stable = struct
-    module V1 = struct
+    module V2 = struct
       type t =
         { sequence_no : int
         ; fee_payer : Account_update.Body.Fee_payer.Stable.V1.t
-        ; account_updates : Account_update.Body.Simple.Stable.V1.t list
+        ; account_updates : Account_update.Body.Simple.Stable.V2.t list
         ; memo : Signed_command_memo.Stable.V1.t
         ; hash : Transaction_hash.Stable.V1.t
               [@to_yojson Transaction_hash.to_yojson]
@@ -116,7 +116,7 @@ module Block = struct
   module Stable = struct
     [@@@with_versioned_json]
 
-    module V2 = struct
+    module V3 = struct
       (* in accounts_accessed, the int is the ledger index
          in tokens_used, the account id is the token owner
       *)
@@ -141,11 +141,11 @@ module Block = struct
         ; timestamp : Block_time.Stable.V1.t
         ; user_cmds : User_command.Stable.V2.t list
         ; internal_cmds : Internal_command.Stable.V2.t list
-        ; zkapp_cmds : Zkapp_command.Stable.V1.t list
+        ; zkapp_cmds : Zkapp_command.Stable.V2.t list
         ; protocol_version : Protocol_version.Stable.V2.t
         ; proposed_protocol_version : Protocol_version.Stable.V2.t option
         ; chain_status : Chain_status.Stable.V1.t
-        ; accounts_accessed : (int * Account.Stable.V2.t) list
+        ; accounts_accessed : (int * Account.Stable.V3.t) list
         ; accounts_created :
             (Account_id.Stable.V2.t * Currency.Fee.Stable.V1.t) list
         ; tokens_used :

src/app/delegation_verify/submission.ml

@@ -28,7 +28,7 @@ module type Data_source = sig
   val load_block : submission -> t -> string Deferred.Or_error.t
 
   val verify_blockchain_snarks :
-       (Mina_wire_types.Mina_state_protocol_state.Value.V2.t * Mina_base.Proof.t)
+       (Mina_wire_types.Mina_state_protocol_state.Value.V3.t * Mina_base.Proof.t)
        list
     -> unit Async_kernel__Deferred_or_error.t
 

src/lib/blockchain_snark/blockchain.ml

@@ -4,10 +4,10 @@ open Mina_state
 
 [%%versioned
 module Stable = struct
-  module V2 = struct
+  module V3 = struct
     module T = struct
       type t =
-        { state : Protocol_state.Value.Stable.V2.t; proof : Proof.Stable.V2.t }
+        { state : Protocol_state.Value.Stable.V3.t; proof : Proof.Stable.V2.t }
       [@@deriving fields, sexp, yojson]
     end
 

src/lib/blockchain_snark/blockchain.mli

@@ -5,7 +5,7 @@ open Mina_state
 
 [%%versioned:
 module Stable : sig
-  module V2 : sig
+  module V3 : sig
     type t [@@deriving sexp, yojson]
   end
 end]

src/lib/consensus/consensus_intf.ml

@@ -5,8 +5,8 @@ module type Full = sig
     module type of Proof_of_stake
       with module Exported := Proof_of_stake.Exported
        and type Data.Block_data.t = Proof_of_stake.Data.Block_data.t
-       and type Data.Consensus_state.Value.Stable.V2.t =
-        Proof_of_stake.Data.Consensus_state.Value.Stable.V2.t
+       and type Data.Consensus_state.Value.Stable.V3.t =
+        Proof_of_stake.Data.Consensus_state.Value.Stable.V3.t
 
   module Proof_of_stake = Proof_of_stake
 end

src/lib/consensus/intf.ml

@@ -406,7 +406,7 @@ module type S = sig
       module Stable : sig
         [@@@no_toplevel_latest_type]
 
-        module V2 : sig
+        module V3 : sig
           type t
 
           val to_latest : t -> t
@@ -489,7 +489,7 @@ module type S = sig
       module Value : sig
         [%%versioned:
         module Stable : sig
-          module V2 : sig
+          module V3 : sig
             type t [@@deriving hash, equal, compare, sexp, yojson]
           end
         end]
@@ -620,7 +620,7 @@ module type S = sig
     module Epoch_data_for_vrf : sig
       [%%versioned:
       module Stable : sig
-        module V2 : sig
+        module V3 : sig
           type t =
             { epoch_ledger : Mina_base.Epoch_ledger.Value.Stable.V1.t
             ; epoch_seed : Mina_base.Epoch_seed.Stable.V1.t
@@ -629,7 +629,7 @@ module type S = sig
             ; global_slot_since_genesis :
                 Mina_numbers.Global_slot_since_genesis.Stable.V1.t
             ; delegatee_table :
-                Mina_base.Account.Stable.V2.t
+                Mina_base.Account.Stable.V3.t
                 Mina_base.Account.Index.Stable.V1.Table.t
                 Public_key.Compressed.Stable.V1.Table.t
             }

src/lib/consensus/proof_of_stake.ml

@@ -15,8 +15,8 @@ module Wire_types = Mina_wire_types.Consensus_proof_of_stake
 module Make_sig (A : Wire_types.Types.S) = struct
   module type S =
     Proof_of_stake_intf.Full
-      with type Data.Consensus_state.Value.Stable.V2.t =
-        A.Data.Consensus_state.Value.V2.t
+      with type Data.Consensus_state.Value.Stable.V3.t =
+        A.Data.Consensus_state.Value.V3.t
 end
 
 module Make_str (A : Wire_types.Concrete) = struct
@@ -208,7 +208,7 @@ module Make_str (A : Wire_types.Concrete) = struct
       module Stable = struct
         [@@@no_toplevel_latest_type]
 
-        module V2 = struct
+        module V3 = struct
           type t =
             { epoch_ledger : Mina_base.Epoch_ledger.Value.Stable.V1.t
             ; epoch_seed : Mina_base.Epoch_seed.Stable.V1.t
@@ -217,7 +217,7 @@ module Make_str (A : Wire_types.Concrete) = struct
             ; global_slot_since_genesis :
                 Mina_numbers.Global_slot_since_genesis.Stable.V1.t
             ; delegatee_table :
-                Mina_base.Account.Stable.V2.t
+                Mina_base.Account.Stable.V3.t
                 Mina_base.Account.Index.Stable.V1.Table.t
                 Public_key.Compressed.Stable.V1.Table.t
             }
@@ -1691,7 +1691,7 @@ module Make_str (A : Wire_types.Concrete) = struct
       module Value = struct
         [%%versioned
         module Stable = struct
-          module V2 = struct
+          module V3 = struct
             type t =
               ( Length.Stable.V1.t
               , Vrf.Output.Truncated.Stable.V1.t

src/lib/consensus/proof_of_stake.mli

@@ -1,4 +1,4 @@
 include
   Proof_of_stake_intf.Full
-    with type Data.Consensus_state.Value.Stable.V2.t =
-      Mina_wire_types.Consensus_proof_of_stake.Data.Consensus_state.Value.V2.t
+    with type Data.Consensus_state.Value.Stable.V3.t =
+      Mina_wire_types.Consensus_proof_of_stake.Data.Consensus_state.Value.V3.t

src/lib/consensus/proof_of_stake_intf.ml

@@ -16,7 +16,7 @@ module type Full = sig
     module Consensus_state : sig
       include
         module type of Data.Consensus_state
-          with type Value.Stable.V2.t = Data.Consensus_state.Value.Stable.V2.t
+          with type Value.Stable.V3.t = Data.Consensus_state.Value.Stable.V3.t
            and type var = Data.Consensus_state.var
 
       val global_slot : Value.t -> Global_slot.t

src/lib/consensus/stake_proof.ml

@@ -6,12 +6,12 @@ open Signature_lib
 module Stable = struct
   [@@@no_toplevel_latest_type]
 
-  module V2 = struct
+  module V3 = struct
     type t =
       { delegator : Account.Index.Stable.V1.t
       ; delegator_pk : Public_key.Compressed.Stable.V1.t
       ; coinbase_receiver_pk : Public_key.Compressed.Stable.V1.t
-      ; ledger : Mina_ledger.Sparse_ledger.Stable.V2.t
+      ; ledger : Mina_ledger.Sparse_ledger.Stable.V3.t
       ; producer_private_key : Private_key.Stable.V1.t
       ; producer_public_key : Public_key.Stable.V1.t
       }