Merge pull request #12651 from MinaProtocol/feature/txn-hash-change-v…

…ersion-byte

src/lib/base58_check/version_bytes.ml

@@ -34,7 +34,7 @@ let state_hash : t = '\x10'
 
 let state_body_hash : t = '\x11'
 
-let transaction_hash : t = '\x12'
+(* don't use \x12, which was for pre-Berkeley hard fork transaction hashes *)
 
 (* used only to deserialize transaction ids, pre-Berkeley hard fork *)
 let signed_command_v1 : t = '\x13'
@@ -57,6 +57,8 @@ let verification_key : t = '\x1B'
 
 let token_id_key : t = '\x1C'
 
+let transaction_hash : t = '\x1D'
+
 (** used for testing only *)
 
 let ledger_test_hash : t = '\x30'

src/lib/blake2/blake2.ml

@@ -52,8 +52,6 @@ module Make () = struct
 
   [%%versioned_binable
   module Stable = struct
-    [@@@with_top_version_tag]
-
     module V1 = struct
       type t = T1.t [@@deriving hash, sexp, compare, equal]
 

src/lib/blake2/intf.ml

@@ -7,8 +7,6 @@ module type S = sig
 
   [%%versioned:
   module Stable : sig
-    [@@@with_top_version_tag]
-
     module V1 : sig
       type t [@@deriving sexp, compare, hash, equal, yojson]
     end

src/lib/mina_base/payment_payload.mli

@@ -16,7 +16,12 @@ module Poly : sig
     end
 
     module V1 : sig
-      type ('pk, 'token_id, 'amount) t
+      type ('pk, 'token_id, 'amount) t =
+        { source_pk : 'pk
+        ; receiver_pk : 'pk
+        ; token_id : 'token_id
+        ; amount : 'amount
+        }
       [@@deriving bin_io, equal, sexp, hash, yojson, version]
     end
 

src/lib/mina_base/signed_command.ml

@@ -86,8 +86,32 @@ module Make_str (_ : Wire_types.Concrete) = struct
         Poly.Stable.V1.t
       [@@deriving compare, sexp, hash, yojson]
 
-      (* don't need to coerce old commands to new ones *)
-      let to_latest _ = failwith "Not implemented"
+      let to_latest ({ payload; signer; signature } : t) : Latest.t =
+        let payload : Signed_command_payload.t =
+          let common : Signed_command_payload.Common.t =
+            { fee = payload.common.fee
+            ; fee_payer_pk = payload.common.fee_payer_pk
+            ; nonce = payload.common.nonce
+            ; valid_until = payload.common.valid_until
+            ; memo = payload.common.memo
+            }
+          in
+          let body : Signed_command_payload.Body.t =
+            match payload.body with
+            | Payment payment_payload ->
+                let payload' : Payment_payload.t =
+                  { source_pk = payment_payload.source_pk
+                  ; receiver_pk = payment_payload.receiver_pk
+                  ; amount = payment_payload.amount
+                  }
+                in
+                Payment payload'
+            | Stake_delegation stake_delegation_payload ->
+                Stake_delegation stake_delegation_payload
+          in
+          { common; body }
+        in
+        { payload; signer; signature }
     end
   end]
 

src/lib/mina_base/signed_command_intf.ml

@@ -263,6 +263,8 @@ module type Full = sig
         , Signature.Stable.V1.t )
         Poly.Stable.V1.t
       [@@deriving compare, sexp, hash, yojson]
+
+      val to_latest : t -> Latest.t
     end
   end]
 

src/lib/mina_base/signed_command_payload.mli

@@ -35,7 +35,10 @@ module Body : sig
     end
 
     module V1 : sig
-      type t [@@deriving compare, equal, sexp, hash, yojson]
+      type t =
+        | Payment of Payment_payload.Stable.V1.t
+        | Stake_delegation of Stake_delegation.Stable.V1.t
+      [@@deriving compare, equal, sexp, hash, yojson]
     end
   end]