Remove Zkapp_command.Wire.t

src/app/archive/lib/processor.ml

@@ -2079,7 +2079,7 @@ module User_command = struct
       in
       let memo = ps.memo |> Signed_command_memo.to_base58_check in
       let hash =
-        Transaction_hash.hash_command (Zkapp_command ps)
+        Transaction_hash.hash_wrapped_zkapp_command ps
         |> Transaction_hash.to_base58_check
       in
       Mina_caqti.select_insert_into_cols ~select:("id", Caqti_type.int)

src/app/archive/lib/test.ml

@@ -134,7 +134,9 @@ let%test_module "Archive node unit tests" =
       @@ fun () ->
       Async.Quickcheck.async_test ~sexp_of:[%sexp_of: User_command.t]
         user_command_signed_gen ~f:(fun user_command ->
-          let transaction_hash = Transaction_hash.hash_command user_command in
+          let transaction_hash =
+            Transaction_hash.hash_wrapped_command user_command
+          in
           match%map
             let open Deferred.Result.Let_syntax in
             let%bind user_command_id =
@@ -164,7 +166,9 @@ let%test_module "Archive node unit tests" =
       @@ fun () ->
       Async.Quickcheck.async_test ~trials:20 ~sexp_of:[%sexp_of: User_command.t]
         user_command_zkapp_gen ~f:(fun user_command ->
-          let transaction_hash = Transaction_hash.hash_command user_command in
+          let transaction_hash =
+            Transaction_hash.hash_wrapped_command user_command
+          in
           match user_command with
           | Signed_command _ ->
               failwith "zkapp_gen failed"

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

@@ -1381,6 +1381,9 @@ let replay_blocks ~itn_features logger =
                      block
                  | Error err ->
                      failwithf "Could not read block: %s" err () )
+           | Some "sexp" ->
+               fun line ->
+                 Sexp.of_string_conv_exn line Mina_block.Precomputed.t_of_sexp
            | _ ->
                failwith "Expected one of 'json', 'sexp' for -format flag"
          in
@@ -1625,7 +1628,7 @@ let internal_commands ~itn_features logger =
               in
               let spec =
                 [%of_sexp:
-                  ( Transaction_witness.t
+                  ( Transaction_witness.Stable.Latest.t
                   , Ledger_proof.t )
                   Snark_work_lib.Work.Single.Spec.t] sexp
               in

src/app/cli/src/init/client.ml

@@ -336,12 +336,24 @@ let verify_receipt =
       ~doc:"TOKEN_ID The token ID for the account"
       (optional_with_default Token_id.default Cli_lib.Arg_type.token_id)
   in
+  let legacy_json_flag =
+    flag "--legacy" no_arg
+      ~doc:"Use legacy json format (zkapp command with hashes)"
+  in
   let config_files = Cli_lib.Flag.config_files in
   Command.async ~summary:"Verify a receipt of a sent payment"
     (Cli_lib.Background_daemon.rpc_init
-       (Args.zip5 config_files payment_path_flag proof_path_flag address_flag
-          token_flag )
-       ~f:(fun port (config_files, payment_path, proof_path, pk, token_id) ->
+       (Args.zip6 config_files payment_path_flag proof_path_flag address_flag
+          token_flag legacy_json_flag )
+       ~f:(fun
+            port
+            ( config_files
+            , payment_path
+            , proof_path
+            , pk
+            , token_id
+            , use_legacy_json )
+          ->
          let%bind compile_config = load_compile_config config_files in
          let account_id = Account_id.create pk token_id in
          let dispatch_result =
@@ -350,22 +362,40 @@ let verify_receipt =
              read_json payment_path ~flag:"payment-path"
            in
            let%bind proof_json = read_json proof_path ~flag:"proof-path" in
+           let of_payment_json =
+             if use_legacy_json then
+               Fn.compose
+                 (Result.map ~f:User_command.unwrap)
+                 User_command.of_yojson
+             else User_command.Stable.Latest.of_yojson
+           in
+           let of_proof_json =
+             let unwrap_proof =
+               Tuple2.map_snd ~f:(List.map ~f:User_command.unwrap)
+             in
+             if use_legacy_json then
+               Fn.compose
+                 (Result.map ~f:unwrap_proof)
+                 [%of_yojson: Receipt.Chain_hash.t * User_command.t list]
+             else
+               [%of_yojson:
+                 Receipt.Chain_hash.t * User_command.Stable.Latest.t list]
+           in
            let to_deferred_or_error result ~error =
              Result.map_error result ~f:(fun s ->
                  Error.of_string (sprintf "%s: %s" error s) )
              |> Deferred.return
            in
            let%bind payment =
-             User_command.of_yojson payment_json
-             |> to_deferred_or_error
-                  ~error:
-                    (sprintf "Payment file %s has invalid json format"
-                       payment_path )
+             to_deferred_or_error
+               ~error:
+                 (sprintf "Payment file %s has invalid json format" payment_path)
+               (of_payment_json payment_json)
            and proof =
-             [%of_yojson: Receipt.Chain_hash.t * User_command.t list] proof_json
-             |> to_deferred_or_error
-                  ~error:
-                    (sprintf "Proof file %s has invalid json format" proof_path)
+             to_deferred_or_error
+               ~error:
+                 (sprintf "Proof file %s has invalid json format" proof_path)
+               (of_proof_json proof_json)
            in
            Daemon_rpcs.Client.dispatch ~compile_config Verify_proof.rpc
              (account_id, payment, proof)
@@ -2205,7 +2235,8 @@ let receipt_chain_hash =
              in
              let receipt_elt =
                let _txn_commitment, full_txn_commitment =
-                 Zkapp_command.get_transaction_commitments zkapp_cmd
+                 Zkapp_command.get_transaction_commitments
+                   (Zkapp_command.generate zkapp_cmd)
                in
                Receipt.Zkapp_command_elt.Zkapp_command_commitment
                  full_txn_commitment

src/app/cli/src/init/itn.ml

@@ -181,12 +181,13 @@ let create_accounts ~(genesis_constants : Genesis_constants.t)
         Transaction_snark.For_tests.multiple_transfers ~constraint_constants
           multispec )
   in
+  (* TODO do not compute hashes and remoive Zkapp_command.unwrap *)
   let zkapps_batches = List.chunks_of zkapps ~length:zkapps_per_block in
   Deferred.List.iter zkapps_batches ~f:(fun zkapps_batch ->
       Format.printf "Processing batch of %d zkApps@." (List.length zkapps_batch) ;
       List.iteri zkapps_batch ~f:(fun i zkapp ->
           let txn_hash =
-            Transaction_hash.hash_command (Zkapp_command zkapp)
+            Transaction_hash.hash_wrapped_zkapp_command zkapp
             |> Transaction_hash.to_base58_check
           in
           Format.printf " zkApp %d, transaction hash: %s@." i txn_hash ;
@@ -220,7 +221,9 @@ let create_accounts ~(genesis_constants : Genesis_constants.t)
                 balance_change_str ) ) ;
       let%bind res =
         Daemon_rpcs.Client.dispatch ~compile_config
-          Daemon_rpcs.Send_zkapp_commands.rpc zkapps_batch port
+          Daemon_rpcs.Send_zkapp_commands.rpc
+          (List.map ~f:Zkapp_command.unwrap zkapps_batch)
+          port
       in
       ( match res with
       | Ok res_inner -> (

src/app/dump_blocks/dump_blocks.ml

@@ -20,10 +20,14 @@ let mk_io : type a. a Encoding.content -> Encoding.t io -> a codec io =
   { io with
     encoding =
       ( match (content, io.encoding) with
+      | Precomputed, Sexp ->
+          (module Sexp_precomputed)
       | Precomputed, Json ->
           (module Json_precomputed)
       | Precomputed, Binary ->
           (module Binary_precomputed)
+      | Block, Sexp ->
+          (module Sexp_block)
       | Block, Json ->
           failwith "Json encoding for full blocks not supported."
       | Block, Binary ->
@@ -36,8 +40,10 @@ let encoded_block =
       | [ encoding; filename ] ->
           { encoding =
               ( match String.lowercase encoding with
+              | "sexp" ->
+                  Encoding.Sexp
               | "json" ->
-                  Encoding.Json
+                  Json
               | "bin" | "binary" ->
                   Binary
               | _ ->
@@ -92,7 +98,10 @@ let f (type a) ?parent (outputs : a codec io list) make_breadcrumb =
           output_block content output ) ;
       clean_up_persistent_root ~frontier )
 
-let default_outputs = [ { encoding = Encoding.Json; filename = "-" } ]
+let default_outputs =
+  [ { encoding = Encoding.Sexp; filename = "-" }
+  ; { encoding = Encoding.Json; filename = "-" }
+  ]
 
 let command =
   Command.basic

src/app/dump_blocks/encoding.ml

@@ -1,6 +1,6 @@
 open Core
 
-type t = Json | Binary
+type t = Sexp | Json | Binary
 
 type 'a content =
   | Block : Mina_block.Stable.Latest.t content
@@ -43,6 +43,19 @@ module type S = sig
   val of_string : string -> t
 end
 
+module Sexp_block : S with type t = Mina_block.Stable.Latest.t = struct
+  type t = Mina_block.Stable.Latest.t
+
+  let name = "sexp"
+
+  let of_breadcrumb = block_of_breadcrumb
+
+  let to_string b =
+    Mina_block.Stable.Latest.sexp_of_t b |> Sexp.to_string |> append_newline
+
+  let of_string s = Sexp.of_string s |> Mina_block.Stable.Latest.t_of_sexp
+end
+
 module Binary_block : S with type t = Mina_block.Stable.Latest.t = struct
   type t = Mina_block.Stable.Latest.t
 
@@ -80,6 +93,19 @@ let precomputed_of_breadcrumb ?with_parent_statehash breadcrumb =
     ~scheduled_time
     (Breadcrumb.block_with_hash breadcrumb)
 
+module Sexp_precomputed : S with type t = Mina_block.Precomputed.t = struct
+  type t = Mina_block.Precomputed.t
+
+  let name = "sexp"
+
+  let of_breadcrumb = precomputed_of_breadcrumb
+
+  let to_string b =
+    Mina_block.Precomputed.sexp_of_t b |> Sexp.to_string |> append_newline
+
+  let of_string s = Sexp.of_string s |> Mina_block.Precomputed.t_of_sexp
+end
+
 module Json_precomputed : S with type t = Mina_block.Precomputed.t = struct
   type t = Mina_block.Precomputed.t
 

src/app/test_executive/zkapps.ml

@@ -767,6 +767,40 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
            zkapp_command_insufficient_fee "Insufficient fee" )
     in
     let%bind () = wait_for t (Wait_condition.blocks_to_be_produced 1) in
+    let%bind.Deferred () =
+      (* Wait for the start of the next slot, attempting to submit all commands
+         within the same slot.
+         In particular, this has the goal of reducing flakiness around the
+         'insufficient replace fee' test, which becomes an 'invalid nonce'
+         failure if the first transaction has already been included.
+
+         Note that this *isn't* redundant with the block waiting above, because
+         the block will be produced part-way through a slot, and will further
+         take us some time to receive the message about that block production
+         due to polling.
+      *)
+      let next_slot_time =
+        let genesis_timestamp =
+          constants.genesis_constants.protocol.genesis_state_timestamp
+          |> Int64.to_float |> Time.Span.of_ms |> Time.of_span_since_epoch
+        in
+        let block_duration_ms =
+          constants.constraint_constants.block_window_duration_ms
+          |> Int.to_float
+        in
+        let current_slot_span_ms =
+          Time.(diff (now ()) genesis_timestamp) |> Time.Span.to_ms
+        in
+        let target_slot =
+          block_duration_ms /. current_slot_span_ms |> Float.round_up
+        in
+        let target_slot_span_ms =
+          target_slot *. current_slot_span_ms |> Time.Span.of_ms
+        in
+        Time.add genesis_timestamp target_slot_span_ms
+      in
+      after Time.(diff (now ()) next_slot_time)
+    in
     (* Won't be accepted until the previous transactions are applied *)
     let%bind () =
       section_hard "Send a zkApp transaction to update all fields"
@@ -775,16 +809,16 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
            zkapp_command_update_all )
     in
     let%bind () =
-      section_hard "Send a zkapp with an invalid proof"
+      section_hard "Send a zkapp with an insufficient replace fee"
         (send_invalid_zkapp ~logger
            (Network.Node.get_ingress_uri node)
-           zkapp_command_invalid_proof "Invalid_proof" )
+           zkapp_command_insufficient_replace_fee "Insufficient_replace_fee" )
     in
     let%bind () =
-      section_hard "Send a zkapp with an insufficient replace fee"
+      section_hard "Send a zkapp with an invalid proof"
         (send_invalid_zkapp ~logger
            (Network.Node.get_ingress_uri node)
-           zkapp_command_insufficient_replace_fee "Insufficient_replace_fee" )
+           zkapp_command_invalid_proof "Invalid_proof" )
     in
     let%bind () =
       section_hard "Send a zkApp transaction with an invalid nonce"