Merge branch 'compatible' into georgeee/remove-transaction-valid-stable

georgeee · web-flow · commit 4caa5af9ae1d · 2025-03-19T16:46:38.000+01:00
diff --git a/src/lib/mina_base/user_command.ml b/src/lib/mina_base/user_command.ml
@@ -138,18 +138,11 @@ module Zero_one_or_two = struct
 end
 
 module Verifiable = struct
-  [%%versioned
-  module Stable = struct
-    module V2 = struct
-      type t =
-        ( Signed_command.Stable.V2.t
-        , Zkapp_command.Verifiable.Stable.V1.t )
-        Poly.Stable.V2.t
-      [@@deriving sexp, compare, equal, hash, yojson]
-
-      let to_latest = Fn.id
-    end
-  end]
+  type t =
+    ( Signed_command.Stable.Latest.t
+    , Zkapp_command.Verifiable.t )
+    Poly.Stable.Latest.t
+  [@@deriving sexp, compare, equal, hash, yojson, bin_io_unversioned]
 
   let fee_payer (t : t) =
     match t with
diff --git a/src/lib/mina_base/zkapp_command.ml b/src/lib/mina_base/zkapp_command.ml
@@ -402,24 +402,14 @@ let check_authorization (p : Account_update.t) : unit Or_error.t =
       Error err
 
 module Verifiable : sig
-  [%%versioned:
-  module Stable : sig
-    module V1 : sig
-      type t = private
-        { fee_payer : Account_update.Fee_payer.Stable.V1.t
-        ; account_updates :
-            ( Side_loaded_verification_key.Stable.V2.t
-            , Zkapp_basic.F.Stable.V1.t )
-            With_hash.Stable.V1.t
-            option
-            Call_forest.With_hashes_and_data.Stable.V1.t
-        ; memo : Signed_command_memo.Stable.V1.t
-        }
-      [@@deriving sexp, compare, equal, hash, yojson]
-
-      val to_latest : t -> t
-    end
-  end]
+  type t = private
+    { fee_payer : Account_update.Fee_payer.t
+    ; account_updates :
+        (Side_loaded_verification_key.t, Zkapp_basic.F.t) With_hash.t option
+        Call_forest.With_hashes_and_data.t
+    ; memo : Signed_command_memo.t
+    }
+  [@@deriving sexp, compare, equal, hash, yojson, bin_io]
 
   val load_vk_from_ledger :
        location_of_account:(Account_id.t -> 'loc option)
@@ -472,24 +462,17 @@ module Verifiable : sig
       with type 'a Command_wrapper.t = 'a With_status.t
        and type cache = Verification_key_wire.t Account_id.Map.t
 end = struct
-  [%%versioned
-  module Stable = struct
-    module V1 = struct
-      type t =
-        { fee_payer : Account_update.Fee_payer.Stable.V1.t
-        ; account_updates :
-            ( Side_loaded_verification_key.Stable.V2.t
-            , Zkapp_basic.F.Stable.V1.t )
-            With_hash.Stable.V1.t
-            option
-            Call_forest.With_hashes_and_data.Stable.V1.t
-        ; memo : Signed_command_memo.Stable.V1.t
-        }
-      [@@deriving sexp, compare, equal, hash, yojson]
-
-      let to_latest = Fn.id
-    end
-  end]
+  type t =
+    { fee_payer : Account_update.Fee_payer.Stable.Latest.t
+    ; account_updates :
+        ( Side_loaded_verification_key.Stable.Latest.t
+        , Zkapp_basic.F.Stable.Latest.t )
+        With_hash.Stable.Latest.t
+        option
+        Call_forest.With_hashes_and_data.Stable.Latest.t
+    ; memo : Signed_command_memo.Stable.Latest.t
+    }
+  [@@deriving sexp, compare, equal, hash, yojson, bin_io_unversioned]
 
   let ok_if_vk_hash_expected ~got ~expected =
     if not @@ Zkapp_basic.F.equal (With_hash.hash got) expected then
diff --git a/src/lib/mina_wire_types/mina_transaction.ml b/src/lib/mina_wire_types/mina_transaction.ml
@@ -10,9 +10,3 @@ end
 module V2 = struct
   type t = Mina_base.User_command.V2.t Poly.V2.t
 end
-
-module Valid = struct
-  module V2 = struct
-    type t = Mina_base.User_command.Valid.V2.t Poly.V2.t
-  end
-end
diff --git a/src/lib/mina_wire_types/test/type_equalities.ml b/src/lib/mina_wire_types/test/type_equalities.ml
@@ -318,7 +318,6 @@ module Mina_transaction = struct
   module W = WT.Mina_transaction
   include Assert_equal1V2 (O.Poly.Stable) (W.Poly)
   include Assert_equal0V2 (O.Stable) (W)
-  include Assert_equal0V2 (O.Valid.Stable) (W.Valid)
 end
 
 module Mina_state = struct
diff --git a/src/lib/network_pool/indexed_pool.ml b/src/lib/network_pool/indexed_pool.ml
@@ -199,7 +199,8 @@ module For_tests = struct
         Set.iter data ~f:(check_fee key) ) ;
     Transaction_hash.Map.iteri pool.all_by_hash ~f:(fun ~key ~data ->
         [%test_eq: Transaction_hash.t]
-          (Transaction_hash.User_command_with_valid_signature.hash data)
+          (Transaction_hash.User_command_with_valid_signature.transaction_hash
+             data )
           key )
 end
 
@@ -327,7 +328,9 @@ let remove_all_by_fee_and_hash_and_expiration_exn :
     Transaction_hash.User_command_with_valid_signature.command cmd
     |> User_command.fee_per_wu
   in
-  let cmd_hash = Transaction_hash.User_command_with_valid_signature.hash cmd in
+  let cmd_hash =
+    Transaction_hash.User_command_with_valid_signature.transaction_hash cmd
+  in
   { t with
     all_by_fee = Map_set.remove_exn t.all_by_fee fee_per_wu cmd
   ; all_by_hash = Map.remove t.all_by_hash cmd_hash
@@ -412,7 +415,8 @@ module Update = struct
           else acc
         in
         let cmd_hash =
-          Transaction_hash.User_command_with_valid_signature.hash cmd
+          Transaction_hash.User_command_with_valid_signature.transaction_hash
+            cmd
         in
         ( match Transaction_hash.User_command_with_valid_signature.data cmd with
         | Zkapp_command p ->
@@ -515,8 +519,10 @@ let transactions ~logger t =
           in
           if
             Transaction_hash.equal
-              (Transaction_hash.User_command_with_valid_signature.hash txn)
-              (Transaction_hash.User_command_with_valid_signature.hash head_txn)
+              (Transaction_hash.User_command_with_valid_signature
+               .transaction_hash txn )
+              (Transaction_hash.User_command_with_valid_signature
+               .transaction_hash head_txn )
           then
             match F_sequence.uncons sender_queue' with
             | Some (next_txn, _) ->
@@ -1177,7 +1183,9 @@ let add_from_backtrack :
   let%map () = check_expiry t.config unchecked in
   let fee_payer = User_command.fee_payer unchecked in
   let fee_per_wu = User_command.fee_per_wu unchecked in
-  let cmd_hash = Transaction_hash.User_command_with_valid_signature.hash cmd in
+  let cmd_hash =
+    Transaction_hash.User_command_with_valid_signature.transaction_hash cmd
+  in
   let consumed = Option.value_exn (currency_consumed cmd) in
   match Map.find t.all_by_sender fee_payer with
   | None ->
@@ -1229,7 +1237,9 @@ let add_from_backtrack :
             t'.all_by_fee fee_per_wu cmd
       ; all_by_hash =
           Map.set t.all_by_hash
-            ~key:(Transaction_hash.User_command_with_valid_signature.hash cmd)
+            ~key:
+              (Transaction_hash.User_command_with_valid_signature
+               .transaction_hash cmd )
             ~data:cmd
       ; all_by_sender =
           Map.set t'.all_by_sender ~key:fee_payer
diff --git a/src/lib/network_pool/test/indexed_pool_tests.ml b/src/lib/network_pool/test/indexed_pool_tests.ml
@@ -494,7 +494,8 @@ let commit_to_pool ledger pool cmd expected_drops =
               (Mina_ledger.Ledger.get ledger loc) )
   in
   let lower =
-    List.map ~f:Transaction_hash.User_command_with_valid_signature.hash
+    List.map
+      ~f:Transaction_hash.User_command_with_valid_signature.transaction_hash
   in
   [%test_eq: Transaction_hash.t list]
     (lower (Sequence.to_list dropped))
@@ -772,7 +773,8 @@ let apply_transactions txns accounts =
             in
             { a with nonce; balance } ) )
 
-let txn_hash = Transaction_hash.User_command_with_valid_signature.hash
+let txn_hash =
+  Transaction_hash.User_command_with_valid_signature.transaction_hash
 
 let application_invalidates_applied_transactions () =
   Quickcheck.test ~trials:1000
diff --git a/src/lib/network_pool/transaction_pool.ml b/src/lib/network_pool/transaction_pool.ml
@@ -681,14 +681,16 @@ struct
               let cmd_hash =
                 With_status.data cmd
                 |> Transaction_hash.User_command_with_valid_signature.create
-                |> Transaction_hash.User_command_with_valid_signature.hash
+                |> Transaction_hash.User_command_with_valid_signature
+                   .transaction_hash
               in
               Set.add set cmd_hash )
         in
         Sequence.to_list dropped_commands
         |> List.partition_tf ~f:(fun cmd ->
                Set.mem command_hashes
-                 (Transaction_hash.User_command_with_valid_signature.hash cmd) )
+                 (Transaction_hash.User_command_with_valid_signature
+                  .transaction_hash cmd ) )
       in
       List.iter committed_commands ~f:(fun cmd ->
           vk_table_lift_hashed vk_table_dec cmd ;
@@ -826,12 +828,10 @@ struct
               ~time_controller ~slot_tx_end:config.Config.slot_tx_end
         ; locally_generated_uncommitted =
             Hashtbl.create
-              ( module Transaction_hash.User_command_with_valid_signature.Stable
-                       .Latest )
+              (module Transaction_hash.User_command_with_valid_signature)
         ; locally_generated_committed =
             Hashtbl.create
-              ( module Transaction_hash.User_command_with_valid_signature.Stable
-                       .Latest )
+              (module Transaction_hash.User_command_with_valid_signature)
         ; current_batch = 0
         ; remaining_in_batch = max_per_15_seconds
         ; config
@@ -1376,12 +1376,16 @@ struct
         in
         let dropped_for_add_hashes =
           List.map dropped_for_add
-            ~f:Transaction_hash.User_command_with_valid_signature.hash
+            ~f:
+              Transaction_hash.User_command_with_valid_signature
+              .transaction_hash
           |> Transaction_hash.Set.of_list
         in
         let dropped_for_size_hashes =
           List.map dropped_for_size
-            ~f:Transaction_hash.User_command_with_valid_signature.hash
+            ~f:
+              Transaction_hash.User_command_with_valid_signature
+              .transaction_hash
           |> Transaction_hash.Set.of_list
         in
         let all_dropped_cmd_hashes =
@@ -1419,8 +1423,8 @@ struct
                 if
                   not
                     (Set.mem all_dropped_cmd_hashes
-                       (Transaction_hash.User_command_with_valid_signature.hash
-                          cmd ) )
+                       (Transaction_hash.User_command_with_valid_signature
+                        .transaction_hash cmd ) )
                 then register_locally_generated t cmd
             | Error _ ->
                 () ) ;
@@ -1443,7 +1447,8 @@ struct
                 *)
                 if
                   Set.mem all_dropped_cmd_hashes
-                    (Transaction_hash.User_command_with_valid_signature.hash cmd)
+                    (Transaction_hash.User_command_with_valid_signature
+                     .transaction_hash cmd )
                 then `Trd cmd
                 else `Fst cmd
             | Error (cmd, error) ->
@@ -1577,7 +1582,8 @@ struct
                       ->
                let cmp = compare batch1 batch2 in
                let get_hash =
-                 Transaction_hash.User_command_with_valid_signature.hash
+                 Transaction_hash.User_command_with_valid_signature
+                 .transaction_hash
                in
                let get_nonce txn =
                  Transaction_hash.User_command_with_valid_signature.command txn
diff --git a/src/lib/transaction/transaction_hash.ml b/src/lib/transaction/transaction_hash.ml
@@ -168,23 +168,8 @@ module User_command_with_valid_signature = struct
 
   let hash_of_yojson = of_yojson
 
-  [%%versioned
-  module Stable = struct
-    module V2 = struct
-      type t =
-        ( (User_command.Valid.Stable.V2.t[@hash.ignore])
-        , (T.Stable.V1.t[@to_yojson hash_to_yojson]) )
-        With_hash.Stable.V1.t
-      [@@deriving sexp, hash, to_yojson]
-
-      let to_latest = Fn.id
-
-      (* Compare only on hashes, comparing on the data too would be slower and
-         add no value.
-      *)
-      let compare (x : t) (y : t) = T.compare x.hash y.hash
-    end
-  end]
+  type t = (User_command.Valid.t, hash) With_hash.t
+  [@@deriving hash, sexp, compare, to_yojson]
 
   let create (c : User_command.Valid.t) : t =
     { data = c; hash = hash_command (User_command.forget_check c) }
@@ -193,12 +178,23 @@ module User_command_with_valid_signature = struct
 
   let command ({ data; _ } : t) = User_command.forget_check data
 
-  let hash ({ hash; _ } : t) = hash
+  let transaction_hash ({ hash; _ } : t) = hash
 
   let forget_check ({ data; hash } : t) =
     { With_hash.data = User_command.forget_check data; hash }
 
-  include Comparable.Make (Stable.Latest)
+  include Comparable.Make (struct
+    type nonrec t = t
+
+    let sexp_of_t = sexp_of_t
+
+    let t_of_sexp = t_of_sexp
+
+    (* Compare only on hashes, comparing on the data too would be slower and
+       add no value.
+    *)
+    let compare (x : t) (y : t) = T.compare x.hash y.hash
+  end)
 
   let make data hash : t = { data; hash }
 end
diff --git a/src/lib/transaction/transaction_hash.mli b/src/lib/transaction/transaction_hash.mli
@@ -51,27 +51,16 @@ include Comparable.S with type t := t
 module User_command_with_valid_signature : sig
   type hash = t [@@deriving sexp, compare, hash, yojson]
 
-  [%%versioned:
-  module Stable : sig
-    [@@@no_toplevel_latest_type]
-
-    module V2 : sig
-      type t =
-        private
-        (User_command.Valid.Stable.V2.t, hash) With_hash.Stable.V1.t
-      [@@deriving sexp, compare, hash, to_yojson]
-    end
-  end]
-
-  type t = Stable.Latest.t [@@deriving sexp, compare, to_yojson]
+  type t = private (User_command.Valid.t, hash) With_hash.t
+  [@@deriving hash, sexp, compare, to_yojson]
 
   val create : User_command.Valid.t -> t
 
   val data : t -> User_command.Valid.t
 
   val command : t -> User_command.t
 
-  val hash : t -> hash
+  val transaction_hash : t -> hash
 
   val forget_check : t -> (User_command.t, hash) With_hash.t
 
diff --git a/src/lib/verifier/prod.ml b/src/lib/verifier/prod.ml
@@ -319,8 +319,7 @@ module Worker = struct
         ; verify_commands =
             f
               ( [%bin_type_class:
-                  User_command.Verifiable.Stable.Latest.t
-                  With_status.Stable.Latest.t
+                  User_command.Verifiable.t With_status.Stable.Latest.t
                   With_id_tag.t
                   list]
               , [%bin_type_class:
