From 2a75b524e4034ea6e739b19671346dfd6a475ddd Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Tue, 3 Jan 2023 16:54:20 +0100 Subject: [PATCH] Proto: Prefer "smart" over "sc" in encodings --- .../lib_client/client_proto_args.ml | 4 +- .../lib_client/operation_result.ml | 43 ++++++++---------- .../lib_protocol/apply_internal_results.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.ml | 2 +- src/proto_alpha/lib_protocol/bond_id_repr.ml | 6 +-- .../lib_protocol/destination_repr.ml | 2 +- .../lib_protocol/operation_repr.ml | 16 +++---- src/proto_alpha/lib_protocol/receipt_repr.ml | 8 ++-- .../lib_protocol/sc_rollup_PVM_sig.ml | 4 +- .../lib_protocol/sc_rollup_commitment_repr.ml | 4 +- .../lib_protocol/sc_rollup_game_repr.ml | 2 +- ...up_inbox_merkelized_payload_hashes_repr.ml | 7 ++- .../sc_rollup_inbox_message_repr.ml | 4 +- .../lib_protocol/sc_rollup_inbox_repr.ml | 6 +-- .../lib_protocol/sc_rollup_repr.ml | 18 ++++---- .../lib_protocol/sc_rollup_reveal_hash.ml | 4 +- src/proto_alpha/lib_protocol/storage.ml | 4 +- tezt/lib_tezos/operation_core.ml | 2 +- ...th L1 (dac_reveals_data_hash_chain_v0).out | 4 +- ...h L1 (dac_reveals_data_merkle_tree_v0).out | 4 +- ...ith L1 (dac_rollup_arith_uses_reveals).out | 8 ++-- ... with L1 (dac_rollup_arith_wrong_hash).out | 8 ++-- ...ith L1 (rollup_node_applies_dal_pages).out | 12 ++--- ... with L1 (rollup_node_downloads_slots).out | 8 ++-- ...th - RPC API should work and be stable.out | 4 +- ...lpha- arith - boot sector is evaluated.out | 8 ++-- ...ces PVM state with messages (external).out | 44 +++++++++---------- ...ces PVM state with messages (internal).out | 4 +- ...tion of a SCORU executes without error.out | 4 +- ...a refutation game are slashed-rewarded.out | 20 ++++----- ...Alpha- arith - recover bond of stakers.out | 24 +++++----- ...rypoint- -aux- earliness- 0- external).out | 12 ++--- ...rypoint- -aux- earliness- 0- internal).out | 8 ++-- ...oint- -default- earliness- 0- external.out | 12 ++--- ...oint- -default- earliness- 0- internal.out | 8 ++-- ..._0 - RPC API should work and be stable.out | 4 +- ...ces PVM state with messages (external).out | 44 +++++++++---------- ...ces PVM state with messages (internal).out | 4 +- ...tion of a SCORU executes without error.out | 4 +- ...ntrypoint- -aux- earliness- 0- externa.out | 12 ++--- ...ntrypoint- -aux- earliness- 0- interna.out | 8 ++-- ...ntrypoint- -default- earliness- 0- ext.out | 12 ++--- ...ntrypoint- -default- earliness- 0- int.out | 8 ++-- tezt/tests/sc_rollup.ml | 8 ++-- 44 files changed, 213 insertions(+), 221 deletions(-) diff --git a/src/proto_alpha/lib_client/client_proto_args.ml b/src/proto_alpha/lib_client/client_proto_args.ml index 04a71a014798..0ec5c06c15b7 100644 --- a/src/proto_alpha/lib_client/client_proto_args.ml +++ b/src/proto_alpha/lib_client/client_proto_args.ml @@ -909,8 +909,8 @@ module Sc_rollup_params = struct | Some c -> return c | None -> failwith - "Parameter '%s' is an invalid smart contract rollup address \ - encoded in a base58 string." + "Parameter '%s' is an invalid smart rollup address encoded in a \ + base58 string." s) let sc_rollup_address_param ?(name = "smart rollup address") diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index e704021b5cf4..336a094286e5 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -318,7 +318,7 @@ let pp_manager_operation_content (type kind) source ppf {kind; boot_sector; origination_proof = _; parameters_ty} -> Format.fprintf ppf - "Smart contract rollup origination:@,\ + "Smart rollup origination:@,\ Kind: %a@,\ Parameter type: %a@,\ Kernel Blake2B hash: '%a'" @@ -329,13 +329,11 @@ let pp_manager_operation_content (type kind) source ppf Tezos_crypto.Blake2B.pp (Tezos_crypto.Blake2B.hash_string [boot_sector]) | Sc_rollup_add_messages {messages = _} -> - Format.pp_print_string ppf "Smart contract rollup messages submission" + Format.pp_print_string ppf "Smart rollup messages submission:" | Sc_rollup_cement {rollup; commitment} -> Format.fprintf ppf - "Smart contract rollup commitment cementing:@,\ - Address: %a@,\ - Commitment: %a" + "Smart rollup commitment cementing:@,Address: %a@,Commitment: %a" Sc_rollup.Address.pp rollup Sc_rollup.Commitment.Hash.pp @@ -343,7 +341,7 @@ let pp_manager_operation_content (type kind) source ppf | Sc_rollup_publish {rollup; commitment} -> Format.fprintf ppf - "Smart contract rollup commitment publishing:@,\ + "Smart rollup commitment publishing:@,\ Address: %a@,\ @[Commitment:@,\ %a@]" @@ -354,10 +352,7 @@ let pp_manager_operation_content (type kind) source ppf | Sc_rollup_refute {rollup; opponent; refutation} -> Format.fprintf ppf - "Smart contract rollup refutation move:@,\ - Address: %a@,\ - Staker: %a@,\ - Refutation: %a" + "Smart rollup refutation move:@,Address: %a@,Staker: %a@,Refutation: %a" Sc_rollup.Address.pp rollup Sc_rollup.Staker.pp @@ -367,7 +362,7 @@ let pp_manager_operation_content (type kind) source ppf | Sc_rollup_timeout {rollup; stakers = {alice; bob}} -> Format.fprintf ppf - "Smart contract rollup refutation timeout:@,\ + "Smart rollup refutation timeout:@,\ Address: %a@,\ First staker (Alice): %a@,\ Second staker (Bob): %a" @@ -381,7 +376,7 @@ let pp_manager_operation_content (type kind) source ppf {rollup; cemented_commitment; output_proof = _} -> Format.fprintf ppf - "Smart contract output message execution:@,\ + "Smart rollup output message execution:@,\ Address: %a@,\ Cemented commitment: %a" Sc_rollup.Address.pp @@ -391,7 +386,7 @@ let pp_manager_operation_content (type kind) source ppf | Sc_rollup_recover_bond {sc_rollup; staker} -> Format.fprintf ppf - "Smart contract bond retrieval:@,Address: %a@,Staker: %a" + "Smart rollup bond retrieval:@,Address: %a@,Staker: %a" Sc_rollup.Address.pp sc_rollup Tezos_crypto.Signature.Public_key_hash.pp @@ -464,8 +459,8 @@ let pp_balance_updates ppf balance_updates = | Tx_rollup_rejection_rewards -> "tx rollup rejection rewards" | Tx_rollup_rejection_punishments -> "tx rollup rejection punishments" | Sc_rollup_refutation_punishments -> - "sc rollup refutation punishments" - | Sc_rollup_refutation_rewards -> "sc rollup refutation rewards" + "smart rollup refutation punishments" + | Sc_rollup_refutation_rewards -> "smart rollup refutation rewards" in let balance = match origin with @@ -873,17 +868,15 @@ let pp_manager_operation_contents_result ppf op_result = | Tx_rollup_dispatch_tickets_result _ -> "transaction rollup tickets dispatch" | Transfer_ticket_result _ -> "tickets transfer" - | Sc_rollup_originate_result _ -> "smart contract rollup origination" - | Sc_rollup_add_messages_result _ -> - "smart contract rollup messages submission" - | Sc_rollup_cement_result _ -> "smart contract rollup commitment cementing" - | Sc_rollup_publish_result _ -> - "smart contract rollup commitment publishing" - | Sc_rollup_refute_result _ -> "smart contract rollup refutation move" - | Sc_rollup_timeout_result _ -> "smart contract rollup refutation timeout" + | Sc_rollup_originate_result _ -> "smart rollup origination" + | Sc_rollup_add_messages_result _ -> "smart rollup messages submission" + | Sc_rollup_cement_result _ -> "smart rollup commitment cementing" + | Sc_rollup_publish_result _ -> "smart rollup commitment publishing" + | Sc_rollup_refute_result _ -> "smart rollup refutation move" + | Sc_rollup_timeout_result _ -> "smart rollup refutation timeout" | Sc_rollup_execute_outbox_message_result _ -> - "smart contract output message execution" - | Sc_rollup_recover_bond_result _ -> "smart contract bond retrieval" + "smart output message execution" + | Sc_rollup_recover_bond_result _ -> "smart bond retrieval" | Dal_publish_slot_header_result _ -> "data availability slot header publishing" | Zk_rollup_origination_result _ -> "epoxy originate" diff --git a/src/proto_alpha/lib_protocol/apply_internal_results.ml b/src/proto_alpha/lib_protocol/apply_internal_results.ml index dea12c2892f3..abe9115b4606 100644 --- a/src/proto_alpha/lib_protocol/apply_internal_results.ml +++ b/src/proto_alpha/lib_protocol/apply_internal_results.ml @@ -333,7 +333,7 @@ module Internal_operation = struct paid_storage_size_diff; }); case - ~title:"To_sc_rollup" + ~title:"To_smart_rollup" (Tag 2) (obj2 (dft "consumed_milligas" Gas.Arith.n_fp_encoding Gas.Arith.zero) diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index f445473cb8a0..eea14aca5d28 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -408,7 +408,7 @@ module Manager_result = struct paid_storage_size_diff; }); case - ~title:"To_sc_rollup" + ~title:"To_smart_rollup" (Tag 2) (obj2 (dft "consumed_milligas" Gas.Arith.n_fp_encoding Gas.Arith.zero) diff --git a/src/proto_alpha/lib_protocol/bond_id_repr.ml b/src/proto_alpha/lib_protocol/bond_id_repr.ml index 0feb48847f17..0466273d95fb 100644 --- a/src/proto_alpha/lib_protocol/bond_id_repr.ml +++ b/src/proto_alpha/lib_protocol/bond_id_repr.ml @@ -53,8 +53,8 @@ let encoding = (fun id -> Tx_rollup_bond_id id); case (Tag 1) - ~title:"Sc_rollup_bond_id" - (obj1 (req "sc_rollup" Sc_rollup_repr.encoding)) + ~title:"Smart_rollup_bond_id" + (obj1 (req "smart_rollup" Sc_rollup_repr.encoding)) (function Sc_rollup_bond_id id -> Some id | _ -> None) (fun id -> Sc_rollup_bond_id id); ] @@ -83,7 +83,7 @@ let destruct id = else if starts_with ~prefix:Sc_rollup_repr.Address.prefix id then match Sc_rollup_repr.Address.of_b58check_opt id with | Some id -> Result.ok (Sc_rollup_bond_id id) - | None -> Result.error "Cannot parse smart contract rollup id" + | None -> Result.error "Cannot parse smart rollup id" else Result.error "Cannot parse rollup id" let construct = function diff --git a/src/proto_alpha/lib_protocol/destination_repr.ml b/src/proto_alpha/lib_protocol/destination_repr.ml index 4c2859e2134e..e72468b4adb4 100644 --- a/src/proto_alpha/lib_protocol/destination_repr.ml +++ b/src/proto_alpha/lib_protocol/destination_repr.ml @@ -108,7 +108,7 @@ let encoding = "A destination notation compatible with the contract notation as given \ to an RPC or inside scripts. Can be a base58 implicit contract hash, a \ base58 originated contract hash, a base58 originated transaction \ - rollup, or a base58 originated smart-contract rollup." + rollup, or a base58 originated smart rollup." @@ splitted ~binary: (union diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 8a2c1ede9637..c27e2e3b2f14 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -1134,7 +1134,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_origination_tag; - name = "sc_rollup_originate"; + name = "smart_rollup_originate"; encoding = obj4 (req "pvm_kind" Sc_rollups.Kind.encoding) @@ -1176,7 +1176,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_add_message_tag; - name = "sc_rollup_add_messages"; + name = "smart_rollup_add_messages"; encoding = obj1 (req "message" (list (string Hex))); select = (function @@ -1189,7 +1189,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_cement_tag; - name = "sc_rollup_cement"; + name = "smart_rollup_cement"; encoding = obj2 (req "rollup" Sc_rollup_repr.encoding) @@ -1208,7 +1208,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_publish_tag; - name = "sc_rollup_publish"; + name = "smart_rollup_publish"; encoding = obj2 (req "rollup" Sc_rollup_repr.encoding) @@ -1227,7 +1227,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_refute_tag; - name = "sc_rollup_refute"; + name = "smart_rollup_refute"; encoding = obj3 (req "rollup" Sc_rollup_repr.encoding) @@ -1249,7 +1249,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_timeout_tag; - name = "sc_rollup_timeout"; + name = "smart_rollup_timeout"; encoding = obj2 (req "rollup" Sc_rollup_repr.encoding) @@ -1267,7 +1267,7 @@ module Encoding = struct MCase { tag = sc_rollup_execute_outbox_message_tag; - name = "sc_rollup_execute_outbox_message"; + name = "smart_rollup_execute_outbox_message"; encoding = obj3 (req "rollup" Sc_rollup_repr.encoding) @@ -1294,7 +1294,7 @@ module Encoding = struct MCase { tag = sc_rollup_operation_recover_bond_tag; - name = "sc_rollup_recover_bond"; + name = "smart_rollup_recover_bond"; encoding = obj2 (req "rollup" Sc_rollup_repr.Address.encoding) diff --git a/src/proto_alpha/lib_protocol/receipt_repr.ml b/src/proto_alpha/lib_protocol/receipt_repr.ml index 4d8bfa8e7a87..00a7808373ab 100644 --- a/src/proto_alpha/lib_protocol/receipt_repr.ml +++ b/src/proto_alpha/lib_protocol/receipt_repr.ml @@ -235,19 +235,19 @@ let balance_encoding = (fun ((), ()) -> Tx_rollup_rejection_punishments); case (Tag 24) - ~title:"Sc_rollup_refutation_punishments" + ~title:"Smart_rollup_refutation_punishments" (obj2 (req "kind" (constant "burned")) - (req "category" (constant "sc_rollup_refutation_punishments"))) + (req "category" (constant "smart_rollup_refutation_punishments"))) (function | Sc_rollup_refutation_punishments -> Some ((), ()) | _ -> None) (fun ((), ()) -> Sc_rollup_refutation_punishments); case (Tag 25) - ~title:"Sc_rollup_refutation_rewards" + ~title:"Smart_rollup_refutation_rewards" (obj2 (req "kind" (constant "minted")) - (req "category" (constant "sc_rollup_refutation_rewards"))) + (req "category" (constant "smart_rollup_refutation_rewards"))) (function | Sc_rollup_refutation_rewards -> Some ((), ()) | _ -> None) (fun ((), ()) -> Sc_rollup_refutation_rewards); diff --git a/src/proto_alpha/lib_protocol/sc_rollup_PVM_sig.ml b/src/proto_alpha/lib_protocol/sc_rollup_PVM_sig.ml index 024dff2ccaf0..6b6d97d1182a 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_PVM_sig.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_PVM_sig.ml @@ -192,9 +192,9 @@ module Input_hash = Blake2B.Make (Base58) (struct - let name = "Sc_rollup_input_hash" + let name = "Smart_rollup_input_hash" - let title = "A smart contract rollup input hash" + let title = "A smart rollup input hash" let b58check_prefix = "\001\118\125\135" (* "scd1(37)" decoded from base 58. *) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml index b01cd33baac4..a4f92ba7c8cc 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml @@ -38,9 +38,9 @@ module Hash = struct Blake2B.Make (Base58) (struct - let name = "commitment_hash" + let name = "Smart_rollup_commitment_hash" - let title = "The hash of a commitment of a smart contract rollup" + let title = "The hash of a commitment of a smart rollup" let b58check_prefix = hash_prefix diff --git a/src/proto_alpha/lib_protocol/sc_rollup_game_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_game_repr.ml index 11d8e76f2765..62e765ca8b57 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_game_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_game_repr.ml @@ -449,7 +449,7 @@ module Index = struct let rpc_arg = let descr = - "A pair of stakers that index a smart contract rollup refutation game." + "A pair of stakers that index a smart rollup refutation game." in let construct {alice; bob} = Format.sprintf "%s-%s" (Staker.to_b58check alice) (Staker.to_b58check bob) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml index eb928f77322d..87c1022a0dc8 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml @@ -55,11 +55,10 @@ module Hash = struct Blake2B.Make (Base58) (struct - let name = "merkelized_payload_hashes_hash" + let name = "Smart_rollup_merkelized_payload_hashes_hash" let title = - "The merkelized payload hashes' hash of the smart contract rollup \ - inbox" + "The merkelized payload hashes' hash of the smart rollup inbox" let b58check_prefix = hash_prefix @@ -122,7 +121,7 @@ module History = struct include Bounded_history_repr.Make (struct - let name = "level_inbox_history" + let name = "Smart_rollup_level_inbox_history" end) (Hash) (struct diff --git a/src/proto_alpha/lib_protocol/sc_rollup_inbox_message_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_inbox_message_repr.ml index 42bb43c6ef24..a9d3fbb62834 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_inbox_message_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_inbox_message_repr.ml @@ -169,10 +169,10 @@ module Hash = struct Blake2B.Make (Base58) (struct - let name = "serialized_message_hash" + let name = "Smart_rollup_serialized_message_hash" let title = - "The hash of a serialized message of the smart contract rollup inbox." + "The hash of a serialized message of the smart rollup inbox." let b58check_prefix = hash_prefix diff --git a/src/proto_alpha/lib_protocol/sc_rollup_inbox_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_inbox_repr.ml index 7b754276bca5..8e2d417d5e66 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_inbox_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_inbox_repr.ml @@ -112,9 +112,9 @@ module Hash = struct Blake2B.Make (Base58) (struct - let name = "inbox_hash" + let name = "Smart_rollup_inbox_hash" - let title = "The hash of an inbox of a smart contract rollup" + let title = "The hash of an inbox of a smart rollup" let b58check_prefix = hash_prefix @@ -191,7 +191,7 @@ module V1 = struct module History = Bounded_history_repr.Make (struct - let name = "inbox_history" + let name = "Smart_rollup_inbox_history" end) (Hash) (struct diff --git a/src/proto_alpha/lib_protocol/sc_rollup_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_repr.ml index e69d9fdfb58c..3dfe60736150 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_repr.ml @@ -36,9 +36,9 @@ module Address = struct Blake2B.Make (Base58) (struct - let name = "Sc_rollup_hash" + let name = "Smart_rollup_hash" - let title = "A smart contract rollup address" + let title = "A smart rollup address" let b58check_prefix = decoded_prefix @@ -74,9 +74,9 @@ module State_hash = struct Blake2B.Make (Base58) (struct - let name = "state_hash" + let name = "Smart_rollup_state_hash" - let title = "The hash of the VM state of a smart contract rollup" + let title = "The hash of the VM state of a smart rollup" let b58check_prefix = state_hash_prefix @@ -109,7 +109,7 @@ end type t = Address.t let description = - "A smart contract rollup is identified by a base58 address starting with " + "A smart rollup is identified by a base58 address starting with " ^ Address.prefix let pp = Address.pp @@ -117,16 +117,16 @@ let pp = Address.pp let encoding = let open Data_encoding in def - "rollup_address" - ~title:"A smart contract rollup address" + "smart_rollup_address" + ~title:"A smart rollup address" ~description Address.encoding let rpc_arg = RPC_arg.like Address.rpc_arg - ~descr:"A smart contract rollup address." - "sc_rollup_address" + ~descr:"A smart rollup address." + "smart_rollup_address" let in_memory_size (_ : t) = let open Cache_memory_helpers in diff --git a/src/proto_alpha/lib_protocol/sc_rollup_reveal_hash.ml b/src/proto_alpha/lib_protocol/sc_rollup_reveal_hash.ml index cc101757d796..e186bdc52c32 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_reveal_hash.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_reveal_hash.ml @@ -31,9 +31,9 @@ module Blake2B = struct Blake2B.Make (Base58) (struct - let name = "Sc_rollup_reveal_data_blake2b_hash" + let name = "Smart_rollup_reveal_data_blake2b_hash" - let title = "A smart contract rollup reveal hash" + let title = "A smart rollup reveal hash" let b58check_prefix = "\230\206\128\200\196" (* "scrrh1(56)" decoded from Base58. *) diff --git a/src/proto_alpha/lib_protocol/storage.ml b/src/proto_alpha/lib_protocol/storage.ml index 741c625f85b0..b6a09e116daa 100644 --- a/src/proto_alpha/lib_protocol/storage.ml +++ b/src/proto_alpha/lib_protocol/storage.ml @@ -1590,7 +1590,7 @@ module Sc_rollup = struct module Raw_context = Make_subcontext (Registered) (Raw_context) (struct - let name = ["sc_rollup"] + let name = ["smart_rollup"] end) module Indexed_context = @@ -1695,7 +1695,7 @@ module Sc_rollup = struct include Make_single_data_storage (Registered) (Raw_context) (struct - let name = ["sc_rollup_inbox"] + let name = ["inbox"] end) (struct type t = Sc_rollup_inbox_repr.versioned diff --git a/tezt/lib_tezos/operation_core.ml b/tezt/lib_tezos/operation_core.ml index bb90a2afb105..4530b8e583ec 100644 --- a/tezt/lib_tezos/operation_core.ml +++ b/tezt/lib_tezos/operation_core.ml @@ -367,7 +367,7 @@ module Manager = struct let refutation = json_of_refutation_step refutation in strip_null_fields [ - ("kind", `String "sc_rollup_refute"); + ("kind", `String "smart_rollup_refute"); ("rollup", `String sc_rollup); ("opponent", `String opponent); ("refutation", refutation); diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out index 473783e0dce3..f863d65db86c 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out index 473783e0dce3..f863d65db86c 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out index 1fce7298224b..5bd440ea3f58 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -57,8 +57,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000414 payload fees(the block proposer) ....... +ꜩ0.000414 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.461 diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out index af3985021a9b..ae998f8e8144 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -57,7 +57,7 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000414 payload fees(the block proposer) ....... +ꜩ0.000414 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.461 diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out index 4579d8d0cbf5..149838136e9e 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -71,8 +71,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000365 payload fees(the block proposer) ....... +ꜩ0.000365 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1002.610 @@ -100,8 +100,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000626 payload fees(the block proposer) ....... +ꜩ0.000626 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1021.532 diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out index 0cf5e4f11c26..fcc1f81ff8d2 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -71,7 +71,7 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000365 payload fees(the block proposer) ....... +ꜩ0.000365 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1002.610 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out index 821ddf95b810..ae14c5fd5c8f 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out index 3329fd1d3d25..da6c95b285d9 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000645 payload fees(the block proposer) ....... +ꜩ0.000645 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '8eb6ccf70902fcd3fa2040cf27dda202a71d85625516f22a0c9c67fc86057a7b' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,11 +53,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000635 payload fees(the block proposer) ....... +ꜩ0.000635 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: 'b682df8c87f218dfa8151f2eaafe20e6f8d87b243f8fe63de6d49485a8bf6eea' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out index 1f00d20744af..2a3ae6007ba4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -63,8 +63,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000354 payload fees(the block proposer) ....... +ꜩ0.000354 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.273 @@ -103,8 +103,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000354 payload fees(the block proposer) ....... +ꜩ0.000354 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.273 @@ -143,8 +143,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -183,8 +183,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -223,8 +223,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -263,8 +263,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -303,8 +303,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -343,8 +343,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -383,8 +383,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -423,8 +423,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000356 payload fees(the block proposer) ....... +ꜩ0.000356 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.279 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out index 243f9653d285..66adf4afdd2d 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out index 940da7858ab7..18e990d18c59 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out index c053228d3a13..4a0b339076f3 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,14 +53,14 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00105 payload fees(the block proposer) ....... +ꜩ0.00105 - Smart contract rollup commitment publishing: + Smart rollup commitment publishing: Address: [SMART_ROLLUP_HASH] Commitment: compressed_state: [SC_ROLLUP_PVM_STATE_HASH] inbox_level: 4 predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 1 - This smart contract rollup commitment publishing was successfully applied + This smart rollup commitment publishing was successfully applied Consumed gas: 7197.763 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 6 @@ -89,14 +89,14 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00112 payload fees(the block proposer) ....... +ꜩ0.00112 - Smart contract rollup commitment publishing: + Smart rollup commitment publishing: Address: [SMART_ROLLUP_HASH] Commitment: compressed_state: [SC_ROLLUP_PVM_STATE_HASH] inbox_level: 4 predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 2 - This smart contract rollup commitment publishing was successfully applied + This smart rollup commitment publishing was successfully applied Consumed gas: 7895.965 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 7 @@ -125,16 +125,16 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000751 payload fees(the block proposer) ....... +ꜩ0.000751 - Smart contract rollup refutation timeout: + Smart rollup refutation timeout: Address: [SMART_ROLLUP_HASH] First staker (Alice): [PUBLIC_KEY_HASH] Second staker (Bob): [PUBLIC_KEY_HASH] - This smart contract rollup refutation timeout was successfully applied + This smart rollup refutation timeout was successfully applied Consumed gas: 4545.618 Refutation game status: Game ended: [PUBLIC_KEY_HASH] lost because: timeout Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ꜩ10000 - sc rollup refutation punishments .......................................................... +ꜩ10000 - sc rollup refutation rewards .............................................................. -ꜩ5000 + smart rollup refutation punishments ....................................................... +ꜩ10000 + smart rollup refutation rewards ........................................................... -ꜩ5000 [PUBLIC_KEY_HASH] ...................................................... +ꜩ5000 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out index 3c059276b3fd..f1243d8061b2 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: string Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,14 +53,14 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00105 payload fees(the block proposer) ....... +ꜩ0.00105 - Smart contract rollup commitment publishing: + Smart rollup commitment publishing: Address: [SMART_ROLLUP_HASH] Commitment: compressed_state: [SC_ROLLUP_PVM_STATE_HASH] inbox_level: 12 predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 1 - This smart contract rollup commitment publishing was successfully applied + This smart rollup commitment publishing was successfully applied Consumed gas: 7197.763 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 14 @@ -89,14 +89,14 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001072 payload fees(the block proposer) ....... +ꜩ0.001072 - Smart contract rollup commitment publishing: + Smart rollup commitment publishing: Address: [SMART_ROLLUP_HASH] Commitment: compressed_state: [SC_ROLLUP_PVM_STATE_HASH] inbox_level: 12 predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 1 - This smart contract rollup commitment publishing was successfully applied + This smart rollup commitment publishing was successfully applied Consumed gas: 7419.691 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 14 @@ -125,10 +125,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000808 payload fees(the block proposer) ....... +ꜩ0.000808 - Smart contract rollup commitment cementing: + Smart rollup commitment cementing: Address: [SMART_ROLLUP_HASH] Commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract rollup commitment cementing was successfully applied + This smart rollup commitment cementing was successfully applied Consumed gas: 5210.592 Inbox level: 12 @@ -153,10 +153,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 payload fees(the block proposer) ....... +ꜩ1 - Smart contract bond retrieval: + Smart rollup bond retrieval: Address: [SMART_ROLLUP_HASH] Staker: [PUBLIC_KEY_HASH] - This smart contract bond retrieval was successfully applied + This smart bond retrieval was successfully applied Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ꜩ10000 [PUBLIC_KEY_HASH] ...................................................... +ꜩ10000 @@ -183,10 +183,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 payload fees(the block proposer) ....... +ꜩ1 - Smart contract bond retrieval: + Smart rollup bond retrieval: Address: [SMART_ROLLUP_HASH] Staker: [PUBLIC_KEY_HASH] - This smart contract bond retrieval was successfully applied + This smart bond retrieval was successfully applied Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ꜩ10000 [PUBLIC_KEY_HASH] ...................................................... +ꜩ10000 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out index 159eac852956..6ae3d6c6e04b 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,8 +53,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000386 payload fees(the block proposer) ....... +ꜩ0.000386 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.373 @@ -78,10 +78,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00127 payload fees(the block proposer) ....... +ꜩ0.00127 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4747.201 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out index 12b4427e5ca0..cef42efb11bc 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,10 +53,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00127 payload fees(the block proposer) ....... +ꜩ0.00127 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4747.201 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out index ca6ba8c3ebe8..b0b53275e489 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,8 +53,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000382 payload fees(the block proposer) ....... +ꜩ0.000382 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.361 @@ -78,10 +78,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001274 payload fees(the block proposer) ....... +ꜩ0.001274 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4747.234 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out index 159a7d26f241..767bfad89708 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000633 payload fees(the block proposer) ....... +ꜩ0.000633 - Smart contract rollup origination: + Smart rollup origination: Kind: arith Parameter type: bytes Kernel Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,10 +53,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001274 payload fees(the block proposer) ....... +ꜩ0.001274 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4747.234 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out index 9044f7ed1763..6a5944b3f94b 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: string Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out index d9bfbb9c59ac..0dd9cf505f98 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -63,8 +63,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000354 payload fees(the block proposer) ....... +ꜩ0.000354 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.273 @@ -100,8 +100,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000354 payload fees(the block proposer) ....... +ꜩ0.000354 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.273 @@ -137,8 +137,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -174,8 +174,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -211,8 +211,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -248,8 +248,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -285,8 +285,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -322,8 +322,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -359,8 +359,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000355 payload fees(the block proposer) ....... +ꜩ0.000355 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.276 @@ -396,8 +396,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000356 payload fees(the block proposer) ....... +ꜩ0.000356 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.279 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out index b9943232d8d2..8d305321f976 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out index 8af682ae889a..c4b619a93b3c 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: string Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out index 2b305f8ba091..60ecbad7ad8e 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,8 +53,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000379 payload fees(the block proposer) ....... +ꜩ0.000379 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.351 @@ -78,10 +78,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001543 payload fees(the block proposer) ....... +ꜩ0.001543 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4751.843 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out index 6e92920c8cb4..552fdce63347 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,10 +53,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001511 payload fees(the block proposer) ....... +ꜩ0.001511 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4751.299 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out index 78aec6d83ef8..44a58735ae99 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,8 +53,8 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000383 payload fees(the block proposer) ....... +ꜩ0.000383 - Smart contract rollup messages submission - This smart contract rollup messages submission was successfully applied + Smart rollup messages submission: + This smart rollup messages submission was successfully applied Consumed gas: 1001.364 @@ -78,10 +78,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001551 payload fees(the block proposer) ....... +ꜩ0.001551 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4751.944 Balance updates: diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out index c43cba4818a3..2fa4e3bda5eb 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out @@ -19,11 +19,11 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001052 payload fees(the block proposer) ....... +ꜩ0.001052 - Smart contract rollup origination: + Smart rollup origination: Kind: wasm_2_0_0 Parameter type: bytes Kernel Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' - This smart contract rollup origination was successfully applied + This smart rollup origination was successfully applied Consumed gas: 2748.037 Storage size: 6552 bytes Address: [SMART_ROLLUP_HASH] @@ -53,10 +53,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001519 payload fees(the block proposer) ....... +ꜩ0.001519 - Smart contract output message execution: + Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] - This smart contract output message execution was successfully applied + This smart output message execution was successfully applied Paid storage size diff: 5 bytes Consumed gas: 4751.400 Balance updates: diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 6ca533124539..72af26ca0a82 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -735,8 +735,8 @@ let fetch_messages_from_block client = |> List.concat_map JSON.as_list |> List.concat_map (fun op -> JSON.(op |-> "contents" |> as_list)) |> List.filter_map (fun op -> - if JSON.(op |-> "kind" |> as_string) = "sc_rollup_add_messages" then - Some JSON.(op |-> "message" |> as_list) + if JSON.(op |-> "kind" |> as_string) = "smart_rollup_add_messages" + then Some JSON.(op |-> "message" |> as_list) else None) |> List.hd |> List.map (fun message -> JSON.(message |> as_string)) @@ -973,7 +973,7 @@ let sc_rollup_node_batcher sc_rollup_node sc_rollup_client sc_rollup node client let* block = RPC.Client.call client @@ RPC.get_chain_block () in let contents1 = check_l1_block_contains - ~kind:"sc_rollup_add_messages" + ~kind:"smart_rollup_add_messages" ~what:"add messages operations" block in @@ -989,7 +989,7 @@ let sc_rollup_node_batcher sc_rollup_node sc_rollup_client sc_rollup node client let* block = RPC.Client.call client @@ RPC.get_chain_block () in let contents2 = check_l1_block_contains - ~kind:"sc_rollup_add_messages" + ~kind:"smart_rollup_add_messages" ~what:"add messages operations" block in -- GitLab