diff --git a/src/proto_alpha/lib_client/client_proto_programs.ml b/src/proto_alpha/lib_client/client_proto_programs.ml index 8a802bd1f784739a2a5a038b67997b0fb885e906..f79f858fee94d115ce4af5147e1254214c22b14e 100644 --- a/src/proto_alpha/lib_client/client_proto_programs.ml +++ b/src/proto_alpha/lib_client/client_proto_programs.ml @@ -86,7 +86,7 @@ let print_run_result (cctxt : #Client_context.printer) ~show_source ~parsed = %a@]@]@." print_expr storage - (Format.pp_print_list Operation_result.pp_internal_operation_result) + (Format.pp_print_list Operation_result.pp_internal_operation) operations (fun ppf -> function | None -> () @@ -109,7 +109,7 @@ let print_trace_result (cctxt : #Client_context.printer) ~show_source ~parsed = %a@]@]@." print_expr storage - (Format.pp_print_list Operation_result.pp_internal_operation_result) + (Format.pp_print_list Operation_result.pp_internal_operation) operations (fun ppf -> function | None -> () diff --git a/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml index 7e63f5623b322f6aefcf8c5c332b742a043c0251..a5044a04798565a6b78a418dd8a44698a94f36c1 100644 --- a/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml +++ b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml @@ -404,7 +404,7 @@ let report_errors ~details ~show_source ?parsed ppf errs = Format.fprintf ppf "@[Internal operation replay attempt:@,%a@]" - Operation_result.pp_internal_operation_result + Operation_result.pp_internal_operation op ; if rest <> [] then Format.fprintf ppf "@," ; print_trace locations rest diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 32c8bb97833e3c1dbcfab48b7e3dbe9dae1f896c..c12780350e032c79e47a9e8579f0faba88c5db0d 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -29,15 +29,16 @@ open Apply_results let tez_sym = "\xEA\x9C\xA9" -let pp_manager_operation_content (type kind) source internal pp_result ppf - ((operation, result) : kind manager_operation * _) = - Format.fprintf ppf "@[" ; +let pp_internal_operation_result ppf (Apply_results.Internal_contents op) + pp_result res = + let {operation; source; _} = op in + (* For now, try to use the same format as in [pp_manager_operation_content]. *) + Format.fprintf ppf "@[@[Internal " ; (match operation with | Transaction {destination; amount; parameters; entrypoint} -> Format.fprintf ppf - "@[%s:@,Amount: %s%a@,From: %a@,To: %a" - (if internal then "Internal transaction" else "Transaction") + "Transaction:@,Amount: %s%a@,From: %a@,To: %a" tez_sym Tez.pp amount @@ -47,24 +48,21 @@ let pp_manager_operation_content (type kind) source internal pp_result ppf destination ; if not (Entrypoint.is_default entrypoint) then Format.fprintf ppf "@,Entrypoint: %a" Entrypoint.pp entrypoint ; - (if not (Script_repr.is_unit_parameter parameters) then - let expr = - WithExceptions.Option.to_exn - ~none:(Failure "ill-serialized argument") - (Data_encoding.force_decode parameters) - in - Format.fprintf - ppf - "@,Parameter: @[%a@]" - Michelson_v1_printer.print_expr - expr) ; - pp_result ppf result ; - Format.fprintf ppf "@]" - | Origination {delegate; credit; script = {code; storage}} -> + if not (Script_repr.is_unit_parameter parameters) then + let expr = + WithExceptions.Option.to_exn + ~none:(Failure "ill-serialized argument") + (Data_encoding.force_decode parameters) + in + Format.fprintf + ppf + "@,Parameter: @[%a@]" + Michelson_v1_printer.print_expr + expr + | Origination {delegate; credit; script = {code; storage}} -> ( Format.fprintf ppf - "@[%s:@,From: %a@,Credit: %s%a" - (if internal then "Internal origination" else "Origination") + "Origination:@,From: %a@,Credit: %s%a" Contract.pp source tez_sym @@ -89,47 +87,103 @@ let pp_manager_operation_content (type kind) source internal pp_result ppf source Michelson_v1_printer.print_expr storage ; - (match delegate with + match delegate with | None -> Format.fprintf ppf "@,No delegate for this contract" | Some delegate -> Format.fprintf ppf "@,Delegate: %a" Signature.Public_key_hash.pp - delegate) ; - pp_result ppf result ; - Format.fprintf ppf "@]" - | Reveal key -> + delegate) + | Delegation delegate_opt -> ( + Format.fprintf ppf "Delegation:@,Contract: %a@,To: " Contract.pp source ; + match delegate_opt with + | None -> Format.pp_print_string ppf "nobody" + | Some delegate -> Signature.Public_key_hash.pp ppf delegate)) ; + + Format.fprintf ppf "%a@]@]" pp_result res + +let pp_internal_operation ppf op = + pp_internal_operation_result ppf op (fun (_ : Format.formatter) () -> ()) () + +let pp_manager_operation_content (type kind) source pp_result ppf + ((operation, result) : kind manager_operation * _) = + (* For now, try to keep formatting in sync with [pp_internal_operation_result]. *) + Format.fprintf ppf "@[@[" ; + (match operation with + | Transaction {destination; amount; parameters; entrypoint} -> Format.fprintf ppf - "@[%s of manager public key:@,Contract: %a@,Key: %a%a@]" - (if internal then "Internal revelation" else "Revelation") + "Transaction:@,Amount: %s%a@,From: %a@,To: %a" + tez_sym + Tez.pp + amount Contract.pp source - Signature.Public_key.pp - key - pp_result - result - | Delegation None -> + Destination.pp + destination ; + if not (Entrypoint.is_default entrypoint) then + Format.fprintf ppf "@,Entrypoint: %a" Entrypoint.pp entrypoint ; + if not (Script_repr.is_unit_parameter parameters) then + let expr = + WithExceptions.Option.to_exn + ~none:(Failure "ill-serialized argument") + (Data_encoding.force_decode parameters) + in + Format.fprintf + ppf + "@,Parameter: @[%a@]" + Michelson_v1_printer.print_expr + expr + | Origination {delegate; credit; script = {code; storage}} -> ( Format.fprintf ppf - "@[%s:@,Contract: %a@,To: nobody%a@]" - (if internal then "Internal Delegation" else "Delegation") + "Origination:@,From: %a@,Credit: %s%a" Contract.pp source - pp_result - result - | Delegation (Some delegate) -> + tez_sym + Tez.pp + credit ; + let code = + WithExceptions.Option.to_exn + ~none:(Failure "ill-serialized code") + (Data_encoding.force_decode code) + and storage = + WithExceptions.Option.to_exn + ~none:(Failure "ill-serialized storage") + (Data_encoding.force_decode storage) + in + let {Michelson_v1_parser.source; _} = + Michelson_v1_printer.unparse_toplevel code + in + Format.fprintf + ppf + "@,@[Script:@ @[%a@]@,@[Initial storage:@ %a@]" + Format.pp_print_text + source + Michelson_v1_printer.print_expr + storage ; + match delegate with + | None -> Format.fprintf ppf "@,No delegate for this contract" + | Some delegate -> + Format.fprintf + ppf + "@,Delegate: %a" + Signature.Public_key_hash.pp + delegate) + | Reveal key -> Format.fprintf ppf - "@[%s:@,Contract: %a@,To: %a%a@]" - (if internal then "Internal Delegation" else "Delegation") + "Revelation of manager public key:@,Contract: %a@,Key: %a" Contract.pp source - Signature.Public_key_hash.pp - delegate - pp_result - result + Signature.Public_key.pp + key + | Delegation delegate_opt -> ( + Format.fprintf ppf "Delegation:@,Contract: %a@,To: " Contract.pp source ; + match delegate_opt with + | None -> Format.pp_print_string ppf "nobody" + | Some delegate -> Signature.Public_key_hash.pp ppf delegate) | Register_global_constant {value = lazy_value} -> let value = WithExceptions.Option.to_exn @@ -138,210 +192,136 @@ let pp_manager_operation_content (type kind) source internal pp_result ppf in Format.fprintf ppf - "Register Global:@,@[ Value: %a%a@]" + "Register Global:@,Value: %a" Michelson_v1_printer.print_expr value - pp_result - result - | Set_deposits_limit None -> + | Set_deposits_limit limit_opt -> ( Format.fprintf ppf - "@[%s:@,Delegate: %a@,Unlimited deposits%a@]" - (if internal then "Internal set deposits limit" - else "Set deposits limit") + "Set deposits limit:@,Delegate: %a@," Contract.pp - source - pp_result - result - | Set_deposits_limit (Some limit) -> - Format.fprintf - ppf - "@[%s:@,Delegate: %a@,Limit: %a%a@]" - (if internal then "Internal set deposits limit" - else "Set deposits limit") - Contract.pp - source - Tez.pp - limit - pp_result - result + source ; + match limit_opt with + | None -> Format.pp_print_string ppf "Unlimited deposits" + | Some limit -> Format.fprintf ppf "Limit: %a" Tez.pp limit) | Tx_rollup_origination -> - Format.fprintf - ppf - "@[%s:@,From: %a%a@]" - (if internal then "Internal tx rollup origination" - else "Tx rollup origination") - Contract.pp - source - pp_result - result + Format.fprintf ppf "Tx rollup origination:@,From: %a" Contract.pp source | Tx_rollup_submit_batch {tx_rollup; content; burn_limit = _} -> Format.fprintf ppf - "@[%s:%a, %d bytes, From: %a%a@]" - (if internal then "Internal tx rollup transaction" - else "Tx rollup transaction") + "Tx rollup transaction:%a, %d bytes, From: %a" Tx_rollup.pp tx_rollup (String.length content) Contract.pp source - pp_result - result | Tx_rollup_commit {tx_rollup; commitment} -> Format.fprintf ppf - "@[%s:%a, %a@,From: %a%a@]" - (if internal then "Internal tx rollup commitment" - else "Tx rollup commitment") + "Tx rollup commitment:%a, %a@,From: %a" Tx_rollup.pp tx_rollup Tx_rollup_commitment.Full.pp commitment Contract.pp source - pp_result - result | Tx_rollup_return_bond {tx_rollup} -> Format.fprintf ppf - "@[%s:%a @,From: %a%a@]" - (if internal then "Internal tx rollup return commitment bond" - else "Tx rollup return commitment bond") + "Tx rollup return commitment bond:%a @,From: %a" Tx_rollup.pp tx_rollup Contract.pp source - pp_result - result | Tx_rollup_finalize_commitment {tx_rollup} -> Format.fprintf ppf - "@[%s:%a @,From: %a%a@]" - (if internal then "Internal tx rollup finalize commitment" - else "Tx rollup finalize commitment") + "Tx rollup finalize commitment:%a @,From: %a" Tx_rollup.pp tx_rollup Contract.pp source - pp_result - result | Tx_rollup_remove_commitment {tx_rollup; _} -> Format.fprintf ppf - "@[%s:%a @,From: %a%a@]" - (if internal then "Internal tx rollup remove commitment" - else "Tx rollup remove commitment") + "Tx rollup remove commitment:%a @,From: %a" Tx_rollup.pp tx_rollup Contract.pp source - pp_result - result | Tx_rollup_rejection {tx_rollup; _} -> (* FIXME/TORU *) Format.fprintf ppf - "@[%s:%a @,From: %a%a@]" - (if internal then "Internal tx rollup rejection" - else "Tx rollup rejection") + "Tx rollup rejection:%a @,From: %a" Tx_rollup.pp tx_rollup Contract.pp source - pp_result - result | Tx_rollup_dispatch_tickets {tx_rollup; _} -> Format.fprintf ppf - "@[%s:%a@,From: %a%a@]" - (if internal then "Internal tx rollup dispatch tickets" - else "Tx rollup dispatch tickets") + "Tx rollup dispatch tickets:%a@,From: %a" Tx_rollup.pp tx_rollup Contract.pp source - pp_result - result | Transfer_ticket _ -> - Format.fprintf - ppf - "@[%s:@,From: %a%a@]" - (if internal then "Internal transfer ticket" else "Transfer ticket") - Contract.pp - source - pp_result - result + Format.fprintf ppf "Transfer tickets:@,From: %a" Contract.pp source | Sc_rollup_originate {kind; boot_sector} -> let (module R : Sc_rollups.PVM.S) = Sc_rollups.of_kind kind in Format.fprintf ppf - "@[Originate smart contract rollup of kind %s with boot sector \ - '%a'%a@]" + "Originate smart contract rollup of kind %s with boot sector '%a'" R.name R.pp_boot_sector boot_sector - pp_result - result | Sc_rollup_add_messages {rollup; messages = _} -> Format.fprintf ppf - "@[Add a message to the inbox of the smart contract rollup at \ - address %a%a@]" + "Add a message to the inbox of the smart contract rollup at address %a" Sc_rollup.Address.pp rollup - pp_result - result | Sc_rollup_cement {rollup; commitment} -> Format.fprintf ppf - "@[Cement the commitment %a in the smart contract rollup at \ - address %a%a@]" + "Cement the commitment %a in the smart contract rollup at address %a" Sc_rollup.Commitment_hash.pp commitment Sc_rollup.Address.pp rollup - pp_result - result | Sc_rollup_publish {rollup; commitment} -> Format.fprintf ppf - "@[Publish commitment %a in the smart contract rollup at address \ - %a%a@]" + "Publish commitment %a in the smart contract rollup at address %a" Sc_rollup.Commitment.pp commitment Sc_rollup.Address.pp rollup - pp_result - result | Sc_rollup_refute {rollup; opponent; refutation} -> Format.fprintf ppf - "@[Refute staker %a in the smart contract rollup at address %a \ - using refutation %a%a@]" + "Refute staker %a in the smart contract rollup at address %a using \ + refutation %a" Sc_rollup.Staker.pp opponent Sc_rollup.Address.pp rollup Sc_rollup.Game.pp_refutation refutation - pp_result - result | Sc_rollup_timeout {rollup; stakers} -> Format.fprintf ppf - "@[Punish one of the two stakers %a and %a by timeout in the \ - smart contract rollup at address %a%a@]" + "Punish one of the two stakers %a and %a by timeout in the smart \ + contract rollup at address %a" Sc_rollup.Staker.pp (fst stakers) Sc_rollup.Staker.pp (snd stakers) Sc_rollup.Address.pp - rollup - pp_result - result) ; + rollup) ; - Format.fprintf ppf "@]" + Format.fprintf ppf "%a@]@]" pp_result result let pp_balance_updates ppf = function | [] -> () @@ -975,7 +955,7 @@ let pp_manager_operation_contents_and_result ppf Format.fprintf ppf "@,%a" - (pp_manager_operation_content (Contract.Implicit source) false pp_result) + (pp_manager_operation_content (Contract.Implicit source) pp_result) (operation, operation_result) ; (match internal_operation_results with | [] -> () @@ -985,15 +965,11 @@ let pp_manager_operation_contents_and_result ppf "@,@[Internal operations:@ %a@]" (Format.pp_print_list (fun ppf (Internal_manager_operation_result (op, res)) -> - let operation = - manager_operation_of_internal_operation op.operation - in - pp_manager_operation_content - op.source - false - pp_result + pp_internal_operation_result ppf - (operation, res))) + (Internal_contents op) + pp_result + res)) internal_operation_results) ; Format.fprintf ppf "@]" @@ -1154,16 +1130,3 @@ let pp_operation_result ppf let contents_and_result_list = Apply_results.pack_contents_list op res in pp_contents_and_result_list ppf contents_and_result_list ; Format.fprintf ppf "@]@." - -let pp_internal_operation_result ppf (Apply_results.Internal_contents op) = - let operation = manager_operation_of_internal_operation op.operation in - pp_manager_operation_content - op.source - true - (fun _ppf () -> ()) - ppf - (operation, ()) - -let pp_internal_operation ppf (Script_typed_ir.Internal_operation op) = - let op = contents_of_internal_operation op in - pp_internal_operation_result ppf (Internal_contents op) diff --git a/src/proto_alpha/lib_client/operation_result.mli b/src/proto_alpha/lib_client/operation_result.mli index 77298d3a03e1a78e2d92a0841806dd6d7ee03a45..a55ca529bff524d34253d8c4a3140917889dbf2c 100644 --- a/src/proto_alpha/lib_client/operation_result.mli +++ b/src/proto_alpha/lib_client/operation_result.mli @@ -29,9 +29,6 @@ open Alpha_context val tez_sym : string val pp_internal_operation : - Format.formatter -> Script_typed_ir.packed_internal_operation -> unit - -val pp_internal_operation_result : Format.formatter -> Apply_results.packed_internal_contents -> unit val pp_operation_result : diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out index cd7e57f8065debe1b428cb25bb48567f0cb45f40..b4347fb7c62e0e81e87b148661291bd7221ce0c8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out @@ -28,7 +28,7 @@ This sequence of operations was run: Storage size: 93 bytes Consumed gas: 2121.040 Internal operations: - Origination: + Internal Origination: From: [CONTRACT_HASH] Credit: ꜩ0 Script: diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out index d277bc77a3ea6e9117708a69459f0d1641d00bd3..e34749f1ae1d13c661017c7e2c309f487773365d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out @@ -29,7 +29,7 @@ This sequence of operations was run: Storage size: 82 bytes Consumed gas: 3490.352 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out index cde8912d7412df4ab2561ba64770b5ba5e3868a0..91c395de218eca84fbbc3d3953cd161286b5dabd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out @@ -76,7 +76,7 @@ This sequence of operations was run: Storage size: 51 bytes Consumed gas: 2115.714 Internal operations: - Delegation: + Internal Delegation: Contract: [CONTRACT_HASH] To: [CONTRACT_HASH] This delegation was successfully applied @@ -113,7 +113,7 @@ This sequence of operations was run: Storage size: 51 bytes Consumed gas: 1202.968 Internal operations: - Delegation: + Internal Delegation: Contract: [CONTRACT_HASH] To: nobody This delegation was successfully applied diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out index 61bb45fd388bb0f6f94362c0754c7fb9c14a8fc9..f4cbb13672e4e0a1d0dbdf9c8c379322a8bd8567 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out @@ -31,7 +31,7 @@ This sequence of operations was run: Storage size: 578 bytes Consumed gas: 2599.458 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ1000 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out index fcfd182e4ee0c015c6d74b3a699f5ece2a5e5241..327cda1e937d3c1050dcbbcb44bb9ab927f40a0f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out @@ -106,7 +106,7 @@ This sequence of operations was run: Storage size: 55 bytes Consumed gas: 2569.202 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out index 1771ea004a4ca68f1e41d5288f1a93439aca1d68..d8e19643a6b6e35e1e88d80b4bfb0e752fe80d27 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out @@ -174,7 +174,7 @@ This sequence of operations was run: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ100 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -222,7 +222,7 @@ This sequence of operations was run: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ100 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" index 22855f1149aadfec4b9504f5676a33475d908a53..7e774d423d066b864b2992712c39c5fb8d59789a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" @@ -3,7 +3,7 @@ tests_alpha/test_contract_opcodes.py::TestContractOpcodes::test_contract_input_o storage (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") emitted operations - Internal origination: + Internal Origination: From: KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi Credit: ꜩ0.05 Script: diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out index 5c9566781f8303449566483b833dc33fdb637f67..17f4efd1cf99773b949f35e68aee7e7c60ab3986 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out @@ -41,7 +41,7 @@ This sequence of operations was run: [CONTRACT_HASH] ... -ꜩ9001 [CONTRACT_HASH] ... +ꜩ9001 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -62,7 +62,7 @@ This sequence of operations was run: Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out index 4f2ebeecda6c07fce57d9bf938fdf85244874302..8c02661f1b375a88fadf6b01878d250450fe6a52 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out @@ -35,7 +35,7 @@ This sequence of operations was run: Storage size: 4633 bytes Consumed gas: 2278.261 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -48,7 +48,7 @@ This sequence of operations was run: Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] Storage size: 2048 bytes Consumed gas: 1873.367 - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -67,7 +67,7 @@ This sequence of operations was run: Balance updates: [CONTRACT_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 - Transaction: + Internal Transaction: Amount: ꜩ125.105747 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out index 153ae6130672fc7075f4536d72d375ea30726f48..855b33c84d1c4007616b481ed04df75c84b6578a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out @@ -41,7 +41,7 @@ This sequence of operations was run: [CONTRACT_HASH] ... -ꜩ9001 [CONTRACT_HASH] ... +ꜩ9001 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -62,7 +62,7 @@ This sequence of operations was run: Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out index e8f5389bf347bce2a43201ab5d4ebbbc92e5a78d..074ab16c321d7631bb5b5003f576fde73f3dd1f4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out @@ -41,7 +41,7 @@ This sequence of operations was run: [CONTRACT_HASH] ... -ꜩ9001 [CONTRACT_HASH] ... +ꜩ9001 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -60,7 +60,7 @@ This sequence of operations was run: Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 - Transaction: + Internal Transaction: Amount: ꜩ9.001 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out index d26fb91a317744c52b8a6293497766a5eb6b1651..624d58f58ac19d8751cef04fbec4e7810177af26 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out @@ -35,7 +35,7 @@ This sequence of operations was run: Storage size: 4633 bytes Consumed gas: 1747.789 Internal operations: - Transaction: + Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -52,7 +52,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 461 Storage size: 2331 bytes Consumed gas: 3265.725 - Transaction: + Internal Transaction: Amount: ꜩ3891.966034 From: [CONTRACT_HASH] To: [CONTRACT_HASH] @@ -61,7 +61,7 @@ This sequence of operations was run: Balance updates: [CONTRACT_HASH] ... -ꜩ3891.966034 [CONTRACT_HASH] ... +ꜩ3891.966034 - Transaction: + Internal Transaction: Amount: ꜩ3.895862 From: [CONTRACT_HASH] To: [CONTRACT_HASH] diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_future.out b/tezt/_regressions/tx_rollup_finalize_commitment_future.out index a690b5906c77d49e794924f49a282afdace1958b..e9f53dec25f9264bdcf4a2c6f24719b90d021127 100644 --- a/tezt/_regressions/tx_rollup_finalize_commitment_future.out +++ b/tezt/_regressions/tx_rollup_finalize_commitment_future.out @@ -67,8 +67,8 @@ This simulation failed: Gas limit: 1040000 Storage limit: 60000 bytes Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This operation FAILED. + From: [PUBLIC_KEY_HASH] + This operation FAILED. Error: { "id": "proto.alpha.tx_rollup_no_commitment_to_finalize", diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out b/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out index 2141dd66877d8a417b6e16bfca191234104a1508..fb471970b2d2615b8c80b972fcf9e1fa65977e32 100644 --- a/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out +++ b/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out @@ -40,8 +40,8 @@ This simulation failed: Gas limit: 1040000 Storage limit: 60000 bytes Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This operation FAILED. + From: [PUBLIC_KEY_HASH] + This operation FAILED. Error: { "id": "proto.alpha.tx_rollup_no_commitment_to_finalize", diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out b/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out index 78972d080fb3b9fac19fcbcfbdcd54b43c7c2c5b..4d375064906f311da320deec02b0e6b22d9c90a6 100644 --- a/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out +++ b/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out @@ -67,8 +67,8 @@ This simulation failed: Gas limit: 1040000 Storage limit: 60000 bytes Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This operation FAILED. + From: [PUBLIC_KEY_HASH] + This operation FAILED. Error: { "id": "proto.alpha.tx_rollup_no_commitment_to_finalize", diff --git a/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out b/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out index 82a39dfa8dafe1c9a05728bc27b39a255ef1091d..96565ba827317e79bc58b89122468a1c4f035bdf 100644 --- a/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out +++ b/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out @@ -96,8 +96,8 @@ This simulation failed: Gas limit: 1040000 Storage limit: 60000 bytes Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This operation FAILED. + From: [PUBLIC_KEY_HASH] + This operation FAILED. Error: { "id": "proto.alpha.tx_rollup_no_commitment_to_finalize", diff --git a/tezt/_regressions/tx_rollup_rpc_commitment_remove.out b/tezt/_regressions/tx_rollup_rpc_commitment_remove.out index 9ba2ef542e28f82713516e71e86b09aae1139e00..7a7c70f49bd195903de2ca1b43dfa0923dfbd177 100644 --- a/tezt/_regressions/tx_rollup_rpc_commitment_remove.out +++ b/tezt/_regressions/tx_rollup_rpc_commitment_remove.out @@ -120,8 +120,8 @@ This simulation failed: Gas limit: 1040000 Storage limit: 60000 bytes Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This operation FAILED. + From: [PUBLIC_KEY_HASH] + This operation FAILED. Error: { "id": "proto.alpha.tx_rollup_no_commitment_to_finalize", @@ -148,12 +148,12 @@ This sequence of operations was run: [PUBLIC_KEY_HASH] ... -ꜩ0.000505 payload fees(the block proposer) ....... +ꜩ0.000505 Tx rollup finalize commitment:[TX_ROLLUP_HASH] - From: [PUBLIC_KEY_HASH] - This tx rollup finalize operation was successfully applied - Balance updates: - - Consumed gas: 2501.420@finalized level: - 0 + From: [PUBLIC_KEY_HASH] + This tx rollup finalize operation was successfully applied + Balance updates: + + Consumed gas: 2501.420@finalized level: + 0 ./tezos-client --wait none remove commitment of tx rollup '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'