From b70a49eef1d4f1c675f6b3e427aae538d34c62c7 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Sun, 22 May 2022 11:48:47 +0100 Subject: [PATCH 1/9] Proto: storage module for scoru types --- src/proto_alpha/lib_protocol/storage.ml | 11 +++++++++++ src/proto_alpha/lib_protocol/storage.mli | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/src/proto_alpha/lib_protocol/storage.ml b/src/proto_alpha/lib_protocol/storage.ml index 536a85c546d3..46c941431516 100644 --- a/src/proto_alpha/lib_protocol/storage.ml +++ b/src/proto_alpha/lib_protocol/storage.ml @@ -1512,6 +1512,17 @@ module Sc_rollup = struct let encoding = Data_encoding.string end) + module Parameters_type = + Indexed_context.Make_carbonated_map + (struct + let name = ["parameters_type"] + end) + (struct + type t = Script_repr.lazy_expr + + let encoding = Script_repr.lazy_expr_encoding + end) + module Initial_level = Indexed_context.Make_map (struct diff --git a/src/proto_alpha/lib_protocol/storage.mli b/src/proto_alpha/lib_protocol/storage.mli index f34a9d1ed398..667740f8fe60 100644 --- a/src/proto_alpha/lib_protocol/storage.mli +++ b/src/proto_alpha/lib_protocol/storage.mli @@ -666,6 +666,7 @@ module Sc_rollup : sig - a PVM kind (provided at creation time, read-only) - a boot sector (provided at creation time, read-only) + - a parameters type specifying the types of parameters the rollup accepts - the L1 block level at which the rollup was created - a merkelized inbox, of which only the root hash is stored - a tree of commitments, rooted at the last cemented commitment @@ -691,6 +692,12 @@ module Sc_rollup : sig and type value = string and type t := Raw_context.t + module Parameters_type : + Non_iterable_indexed_carbonated_data_storage + with type key = Sc_rollup_repr.t + and type value = Script_repr.lazy_expr + and type t := Raw_context.t + module Initial_level : Indexed_data_storage with type key = Sc_rollup_repr.t -- GitLab From 81e80d89661414179c71c71caffdb4e7cd62e521 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Sun, 22 May 2022 11:54:14 +0100 Subject: [PATCH 2/9] Proto: API for sc rollup types --- src/proto_alpha/lib_protocol/sc_rollup_storage.ml | 7 +++++++ src/proto_alpha/lib_protocol/sc_rollup_storage.mli | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml index 7ab813f9220b..42bf08aaf233 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml @@ -73,6 +73,13 @@ let get_boot_sector ctxt rollup = | None -> fail (Sc_rollup_does_not_exist rollup) | Some boot_sector -> return boot_sector +let parameters_type ctxt rollup = + let open Lwt_tzresult_syntax in + let* ctxt, res = Store.Parameters_type.find ctxt rollup in + match res with + | None -> fail (Sc_rollup_does_not_exist rollup) + | Some x -> return (x, ctxt) + module Outbox = struct let level_index ctxt level = let max_active_levels = diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli index 74f5e775730e..564ce61c511f 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli @@ -55,6 +55,14 @@ val initial_level : (** [get_boot_sector ctxt sc_rollup] retrieves the boot sector for [sc_rollup]. *) val get_boot_sector : Raw_context.t -> Sc_rollup_repr.t -> string tzresult Lwt.t +(** [parameters_type ctxt rollup] returns the registered type of a rollup. + Fails with an [Sc_rollup_does_not_exist] error in case there is no + registered type for the rollup. *) +val parameters_type : + Raw_context.t -> + Sc_rollup_repr.t -> + (Script_repr.lazy_expr * Raw_context.t) tzresult Lwt.t + (** A module for managing state concerning a rollup's outbox. *) module Outbox : sig (** [record_applied_message ctxt rollup level ~message_index] marks the -- GitLab From 9a16b28a5ccf236621ff4892819e412bbc0013bb Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Thu, 19 May 2022 10:13:28 +0100 Subject: [PATCH 3/9] Proto: Add type parameter to scoru origination --- .../lib_benchmarks_proto/sc_rollup_benchmarks.ml | 10 +++++++++- src/proto_alpha/lib_client/client_proto_context.ml | 4 ++-- src/proto_alpha/lib_client/client_proto_context.mli | 1 + src/proto_alpha/lib_client/operation_result.ml | 12 ++++++++++-- .../client_proto_context_commands.ml | 9 +++++++++ src/proto_alpha/lib_protocol/alpha_context.mli | 5 +++++ src/proto_alpha/lib_protocol/apply.ml | 4 ++-- src/proto_alpha/lib_protocol/operation_repr.ml | 12 ++++++++---- src/proto_alpha/lib_protocol/operation_repr.mli | 1 + src/proto_alpha/lib_protocol/sc_rollup_operations.ml | 6 +++--- .../lib_protocol/sc_rollup_operations.mli | 3 ++- src/proto_alpha/lib_protocol/sc_rollup_storage.ml | 6 ++++-- src/proto_alpha/lib_protocol/sc_rollup_storage.mli | 1 + src/proto_alpha/lib_protocol/test/helpers/op.ml | 4 ++-- src/proto_alpha/lib_protocol/test/helpers/op.mli | 1 + .../lib_protocol/test/helpers/sc_rollup_helpers.ml | 10 ++++++++-- 16 files changed, 68 insertions(+), 21 deletions(-) diff --git a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml index ef87fd2612e8..50dcf071e28f 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml @@ -207,9 +207,17 @@ module Sc_rollup_add_messages_benchmark = struct let ctxt_with_rollup = let open Lwt_result_syntax in let* ctxt = new_ctxt in + let {Michelson_v1_parser.expanded; _}, _ = + Michelson_v1_parser.parse_expression "unit" + in + let parameters_ty = Alpha_context.Script.lazy_expr expanded in let+ rollup, _size, ctxt = Lwt.map Environment.wrap_tzresult - @@ Sc_rollup_storage.originate ctxt ~kind:Example_arith ~boot_sector:"" + @@ Sc_rollup_storage.originate + ctxt + ~kind:Example_arith + ~boot_sector:"" + ~parameters_ty in (rollup, ctxt) in diff --git a/src/proto_alpha/lib_client/client_proto_context.ml b/src/proto_alpha/lib_client/client_proto_context.ml index 48c315bc7889..581634628ed0 100644 --- a/src/proto_alpha/lib_client/client_proto_context.ml +++ b/src/proto_alpha/lib_client/client_proto_context.ml @@ -1139,14 +1139,14 @@ let transfer_ticket (cctxt : #full) ~chain ~block ?confirmations ?dry_run let sc_rollup_originate (cctxt : #full) ~chain ~block ?confirmations ?dry_run ?verbose_signing ?simulation ?fee ?gas_limit ?storage_limit ?counter ~source - ~kind ~boot_sector ~src_pk ~src_sk ~fee_parameter () = + ~kind ~boot_sector ~parameters_ty ~src_pk ~src_sk ~fee_parameter () = let op = Annotated_manager_operation.Single_manager (Injection.prepare_manager_operation ~fee:(Limit.of_option fee) ~gas_limit:(Limit.of_option gas_limit) ~storage_limit:(Limit.of_option storage_limit) - (Sc_rollup_originate {kind; boot_sector})) + (Sc_rollup_originate {kind; boot_sector; parameters_ty})) in Injection.inject_manager_operation cctxt diff --git a/src/proto_alpha/lib_client/client_proto_context.mli b/src/proto_alpha/lib_client/client_proto_context.mli index ebdc18a4b067..63887eab680b 100644 --- a/src/proto_alpha/lib_client/client_proto_context.mli +++ b/src/proto_alpha/lib_client/client_proto_context.mli @@ -677,6 +677,7 @@ val sc_rollup_originate : source:public_key_hash -> kind:Sc_rollup.Kind.t -> boot_sector:string -> + parameters_ty:Script.lazy_expr -> src_pk:public_key -> src_sk:Client_keys.sk_uri -> fee_parameter:Injection.fee_parameter -> diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 63a9ce79e43e..fdc7ce243ae0 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -268,12 +268,20 @@ let pp_manager_operation_content (type kind) source pp_result ppf source | Transfer_ticket _ -> Format.fprintf ppf "Transfer tickets:@,From: %a" Contract.pp source - | Sc_rollup_originate {kind; boot_sector} -> + | Sc_rollup_originate {kind; boot_sector; parameters_ty} -> let (module R : Sc_rollups.PVM.S) = Sc_rollups.of_kind kind in + let parameters_ty = + WithExceptions.Option.to_exn + ~none:(Failure "ill-serialized parameters type") + (Data_encoding.force_decode parameters_ty) + in Format.fprintf ppf - "Originate smart contract rollup of kind %s with boot sector '%a'" + "Originate smart contract rollup of kind %s and type %a with boot \ + sector '%a'" R.name + Michelson_v1_printer.print_expr + parameters_ty R.pp_boot_sector boot_sector | Sc_rollup_add_messages {rollup; messages = _} -> diff --git a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml index 8cd350191465..a0b8b2d53736 100644 --- a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml +++ b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml @@ -2568,6 +2568,11 @@ let commands_rw () = ~name:"sc_rollup_kind" ~desc:"kind of the smart-contract rollup to be originated" rollup_kind_param + @@ prefixes ["of"; "type"] + @@ param + ~name:"parameters_type" + ~desc:"the type of parameters that the smart-contract rollup accepts" + data_parameter @@ prefixes ["booting"; "with"] @@ param ~name:"boot_sector" @@ -2583,6 +2588,7 @@ let commands_rw () = counter ) source pvm + parameters_ty boot_sector cctxt -> match source with @@ -2592,6 +2598,8 @@ let commands_rw () = | Implicit source -> Client_keys.get_key cctxt source >>=? fun (_, src_pk, src_sk) -> let (module R : Sc_rollups.PVM.S) = pvm in + let Michelson_v1_parser.{expanded; _} = parameters_ty in + let parameters_ty = Script.lazy_expr expanded in boot_sector pvm >>=? fun boot_sector -> sc_rollup_originate cctxt @@ -2610,6 +2618,7 @@ let commands_rw () = ~fee_parameter ~kind:(Sc_rollups.kind_of pvm) ~boot_sector + ~parameters_ty () >>=? fun _res -> return_unit); command diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 6e8973dd8927..69802ef467b0 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -2519,8 +2519,12 @@ module Sc_rollup : sig context -> kind:Kind.t -> boot_sector:string -> + parameters_ty:Script.lazy_expr -> (t * Z.t * context) tzresult Lwt.t + val parameters_type : + context -> t -> (Script.lazy_expr * context) tzresult Lwt.t + val kind : context -> t -> Kind.t option tzresult Lwt.t module Inbox : sig @@ -3113,6 +3117,7 @@ and _ manager_operation = | Sc_rollup_originate : { kind : Sc_rollup.Kind.t; boot_sector : string; + parameters_ty : Script.lazy_expr; } -> Kind.sc_rollup_originate manager_operation | Sc_rollup_add_messages : { diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index 133c64727254..c297a43f71b4 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -1733,8 +1733,8 @@ let apply_external_manager_operation_content : } in return (ctxt, result, []) - | Sc_rollup_originate {kind; boot_sector} -> - Sc_rollup_operations.originate ctxt ~kind ~boot_sector + | Sc_rollup_originate {kind; boot_sector; parameters_ty} -> + Sc_rollup_operations.originate ctxt ~kind ~boot_sector ~parameters_ty >>=? fun ({address; size}, ctxt) -> let consumed_gas = Gas.consumed ~since:before_operation ~until:ctxt in let result = diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 13f51ca5cfd4..405c5d8b9e97 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -361,6 +361,7 @@ and _ manager_operation = | Sc_rollup_originate : { kind : Sc_rollup_repr.Kind.t; boot_sector : string; + parameters_ty : Script_repr.lazy_expr; } -> Kind.sc_rollup_originate manager_operation | Sc_rollup_add_messages : { @@ -913,17 +914,20 @@ module Encoding = struct tag = sc_rollup_operation_origination_tag; name = "sc_rollup_originate"; encoding = - obj2 + obj3 (req "kind" Sc_rollup_repr.Kind.encoding) - (req "boot_sector" Data_encoding.string); + (req "boot_sector" Data_encoding.string) + (req "parameters_ty" Script_repr.lazy_expr_encoding); select = (function | Manager (Sc_rollup_originate _ as op) -> Some op | _ -> None); proj = (function - | Sc_rollup_originate {kind; boot_sector} -> (kind, boot_sector)); + | Sc_rollup_originate {kind; boot_sector; parameters_ty} -> + (kind, boot_sector, parameters_ty)); inj = - (fun (kind, boot_sector) -> Sc_rollup_originate {kind; boot_sector}); + (fun (kind, boot_sector, parameters_ty) -> + Sc_rollup_originate {kind; boot_sector; parameters_ty}); } let[@coq_axiom_with_reason "gadt"] sc_rollup_add_messages_case = diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 8ea799d96b51..e170f93e3cc1 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -428,6 +428,7 @@ and _ manager_operation = | Sc_rollup_originate : { kind : Sc_rollup_repr.Kind.t; boot_sector : string; + parameters_ty : Script_repr.lazy_expr; } -> Kind.sc_rollup_originate manager_operation (* [Sc_rollup_add_messages] adds messages to a given rollup's diff --git a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml index e63007008864..2d933cec5a09 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml @@ -28,6 +28,6 @@ open Sc_rollup type origination_result = {address : Address.t; size : Z.t} -let originate ctxt ~kind ~boot_sector = - originate ctxt ~kind ~boot_sector >>=? fun (address, size, ctxt) -> - return ({address; size}, ctxt) +let originate ctxt ~kind ~boot_sector ~parameters_ty = + originate ctxt ~kind ~boot_sector ~parameters_ty + >>=? fun (address, size, ctxt) -> return ({address; size}, ctxt) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_operations.mli b/src/proto_alpha/lib_protocol/sc_rollup_operations.mli index c050eb81ae61..3c2d389fd47c 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_operations.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_operations.mli @@ -29,9 +29,10 @@ open Alpha_context type origination_result = {address : Sc_rollup.Address.t; size : Z.t} (** [originate context ~kind ~boot_sector] adds a new rollup running in a - given [kind] initialized with a [boot_sector]. *) + given [kind] initialized with a [boot_sector]. *) val originate : context -> kind:Sc_rollup.Kind.t -> boot_sector:string -> + parameters_ty:Script_repr.lazy_expr -> (origination_result * context) tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml index 42bf08aaf233..1f728ef87a87 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml @@ -29,7 +29,7 @@ module Store = Storage.Sc_rollup module Commitment = Sc_rollup_commitment_repr module Commitment_hash = Commitment.Hash -let originate ctxt ~kind ~boot_sector = +let originate ctxt ~kind ~boot_sector ~parameters_ty = Raw_context.increment_origination_nonce ctxt >>?= fun (ctxt, nonce) -> let level = Raw_context.current_level ctxt in Sc_rollup_repr.Address.from_nonce nonce >>?= fun address -> @@ -37,6 +37,8 @@ let originate ctxt ~kind ~boot_sector = Store.Initial_level.add ctxt address (Level_storage.current ctxt).level >>= fun ctxt -> Store.Boot_sector.add ctxt address boot_sector >>= fun ctxt -> + Store.Parameters_type.add ctxt address parameters_ty + >>=? fun (ctxt, param_ty_size_diff, _added) -> let inbox = Sc_rollup_inbox_repr.empty address level.level in Store.Inbox.init ctxt address inbox >>=? fun (ctxt, size_diff) -> Store.Last_cemented_commitment.init ctxt address Commitment_hash.zero @@ -51,7 +53,7 @@ let originate ctxt ~kind ~boot_sector = let size = Z.of_int (origination_size + stored_kind_size + boot_sector_size + addresses_size - + size_diff + lcc_size_diff + stakers_size_diff) + + size_diff + lcc_size_diff + stakers_size_diff + param_ty_size_diff) in return (address, size, ctxt) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli index 564ce61c511f..1d31c45c37b5 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli @@ -35,6 +35,7 @@ val originate : Raw_context.t -> kind:Sc_rollup_repr.Kind.t -> boot_sector:string -> + parameters_ty:Script_repr.lazy_expr -> (Sc_rollup_repr.Address.t * Z.t * Raw_context.t) tzresult Lwt.t (** [kind context address] returns [Some kind] iff [address] is an diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.ml b/src/proto_alpha/lib_protocol/test/helpers/op.ml index a142890b2eae..03d325e1b154 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/op.ml @@ -660,7 +660,7 @@ let originated_sc_rollup op = Sc_rollup.Internal_for_tests.originated_sc_rollup nonce let sc_rollup_origination ?counter ?fee ?gas_limit ?storage_limit ctxt - (src : Contract.t) kind boot_sector = + (src : Contract.t) kind boot_sector parameters_ty = manager_operation ?counter ?fee @@ -668,7 +668,7 @@ let sc_rollup_origination ?counter ?fee ?gas_limit ?storage_limit ctxt ?storage_limit ~source:src ctxt - (Sc_rollup_originate {kind; boot_sector}) + (Sc_rollup_originate {kind; boot_sector; parameters_ty}) >>=? fun to_sign_op -> Context.Contract.manager ctxt src >|=? fun account -> let op = sign account.sk ctxt to_sign_op in diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.mli b/src/proto_alpha/lib_protocol/test/helpers/op.mli index c627b4b16742..849570249e93 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/op.mli @@ -364,6 +364,7 @@ val sc_rollup_origination : Contract.t -> Sc_rollup.Kind.t -> string -> + Script.lazy_expr -> (packed_operation * Sc_rollup.t) tzresult Lwt.t (** [sc_rollup_publish ctxt source rollup commitment] tries to publish a diff --git a/src/proto_alpha/lib_protocol/test/helpers/sc_rollup_helpers.ml b/src/proto_alpha/lib_protocol/test/helpers/sc_rollup_helpers.ml index e7e223328ae9..f006848927b9 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/sc_rollup_helpers.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/sc_rollup_helpers.ml @@ -33,8 +33,14 @@ let originated_rollup op = Contract.Internal_for_tests.originated_contract nonce (** Returns a block in which a rollup originated. *) -let originate_rollup src b baker kind boot_sector = - Op.sc_rollup_origination (B b) src ~fee:(Test_tez.of_int 10) kind boot_sector +let originate_rollup src b baker kind boot_sector parameters_ty = + Op.sc_rollup_origination + (B b) + src + ~fee:(Test_tez.of_int 10) + kind + boot_sector + parameters_ty >>=? fun (operation, _) -> Incremental.begin_construction ~policy:Block.(By_account baker) b >>=? fun incr -> -- GitLab From a3e4c415bc43fe1ab27a0e4006a326d3707317c6 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Tue, 24 May 2022 14:27:01 +0100 Subject: [PATCH 4/9] Proto: validate type on sc rollup origination --- .../lib_protocol/sc_rollup_costs.ml | 7 +- .../lib_protocol/sc_rollup_costs.mli | 5 + .../lib_protocol/sc_rollup_operations.ml | 117 +++++++++++++++++- .../lib_protocol/sc_rollup_operations.mli | 2 + 4 files changed, 126 insertions(+), 5 deletions(-) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.ml b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml index cef08193861d..a870d9f00093 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_costs.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml @@ -54,7 +54,6 @@ end cost_add_message_per_bytes * \sum_{i=1}^n length(m_i) + cost_add_inbox_per_level * l`. *) - let cost_add_messages ~num_messages ~total_messages_size l = let open S_syntax in let log_level = @@ -65,3 +64,9 @@ let cost_add_messages ~num_messages ~total_messages_size l = (S.safe_int num_messages * Constants.cost_add_message_base) + level_cost + (Constants.cost_add_message_per_byte * S.safe_int total_messages_size) + +(* Reusing model from {!Ticket_costs.has_tickets_of_ty_cost}. *) +let is_valid_parameters_ty_cost ~ty_size = + let fixed_cost = S.safe_int 10 in + let coeff = S.safe_int 6 in + S.add fixed_cost (S.mul coeff ty_size) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.mli b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli index 5bdaff920672..979441eaac2f 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_costs.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli @@ -36,6 +36,11 @@ module Constants : sig val cost_update_num_and_size_of_messages : Gas_limit_repr.cost end +(** [is_valid_parameters_ty_cost ty] returns the cost of checking whether a type + is a valid sc rollup parameter. *) +val is_valid_parameters_ty_cost : + ty_size:'a Saturation_repr.t -> Saturation_repr.may_saturate Saturation_repr.t + (** [cost_add_messages ~num_messages ~total_messages_length level] returns the cost of adding [num_messages] with total messages size [total_messages_size] to a sc-rollup inbox at level [level]. This diff --git a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml index 2d933cec5a09..d46ba2429521 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml @@ -2,6 +2,7 @@ (* *) (* Open Source License *) (* Copyright (c) 2021 Nomadic Labs *) +(* Copyright (c) 2022 TriliTech *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -24,10 +25,118 @@ (*****************************************************************************) open Alpha_context -open Sc_rollup -type origination_result = {address : Address.t; size : Z.t} +type error += (* Temporary *) Sc_rollup_invalid_parameters_type + +let () = + let description = "Invalid parameters type for rollup" in + register_error_kind + `Temporary + ~id:"Sc_rollup_invalid_parameters_type" + ~title:"Invalid parameters type" + ~description + ~pp:(fun fmt () -> Format.fprintf fmt "%s" description) + Data_encoding.unit + (function Sc_rollup_invalid_parameters_type -> Some () | _ -> None) + (fun () -> Sc_rollup_invalid_parameters_type) + +type origination_result = {address : Sc_rollup.Address.t; size : Z.t} + +type 'ret continuation = unit -> 'ret tzresult + +(* Only a subset of types are supported for rollups. + This function checks whether or not a type can be used for a rollup. *) +let rec validate_ty : + type a ac ret. + (a, ac) Script_typed_ir.ty -> ret continuation -> ret tzresult = + fun ty k -> + let open Script_typed_ir in + match ty with + (* Valid primitive types. *) + | Unit_t -> (k [@ocaml.tailcall]) () + | Int_t -> (k [@ocaml.tailcall]) () + | Nat_t -> (k [@ocaml.tailcall]) () + | Signature_t -> (k [@ocaml.tailcall]) () + | String_t -> (k [@ocaml.tailcall]) () + | Bytes_t -> (k [@ocaml.tailcall]) () + | Key_hash_t -> (k [@ocaml.tailcall]) () + | Key_t -> (k [@ocaml.tailcall]) () + | Timestamp_t -> (k [@ocaml.tailcall]) () + | Address_t -> (k [@ocaml.tailcall]) () + | Bls12_381_g1_t -> (k [@ocaml.tailcall]) () + | Bls12_381_g2_t -> (k [@ocaml.tailcall]) () + | Bls12_381_fr_t -> (k [@ocaml.tailcall]) () + | Bool_t -> (k [@ocaml.tailcall]) () + | Never_t -> (k [@ocaml.tailcall]) () + | Tx_rollup_l2_address_t -> (k [@ocaml.tailcall]) () + | Chain_id_t -> (k [@ocaml.tailcall]) () + (* Valid collection types. *) + | Ticket_t (ty, _) -> (validate_ty [@ocaml.tailcall]) ty k + | Set_t (ty, _) -> (validate_ty [@ocaml.tailcall]) ty k + | Option_t (ty, _, _) -> (validate_ty [@ocaml.tailcall]) ty k + | List_t (ty, _) -> (validate_ty [@ocaml.tailcall]) ty k + | Pair_t (ty1, ty2, _, _) -> (validate_two_tys [@ocaml.tailcall]) ty1 ty2 k + | Union_t (ty1, ty2, _, _) -> (validate_two_tys [@ocaml.tailcall]) ty1 ty2 k + | Map_t (key_ty, val_ty, _) -> + (validate_two_tys [@ocaml.tailcall]) key_ty val_ty k + (* Invalid types. *) + | Mutez_t -> error Sc_rollup_invalid_parameters_type + | Big_map_t (_key_ty, _val_ty, _) -> error Sc_rollup_invalid_parameters_type + | Contract_t _ -> error Sc_rollup_invalid_parameters_type + | Sapling_transaction_t _ -> error Sc_rollup_invalid_parameters_type + | Sapling_transaction_deprecated_t _ -> + error Sc_rollup_invalid_parameters_type + | Sapling_state_t _ -> error Sc_rollup_invalid_parameters_type + | Operation_t -> error Sc_rollup_invalid_parameters_type + | Chest_t -> error Sc_rollup_invalid_parameters_type + | Chest_key_t -> error Sc_rollup_invalid_parameters_type + | Lambda_t (_, _, _) -> error Sc_rollup_invalid_parameters_type + +and validate_two_tys : + type a ac b bc ret. + (a, ac) Script_typed_ir.ty -> + (b, bc) Script_typed_ir.ty -> + ret continuation -> + ret tzresult = + fun ty1 ty2 k -> + (validate_ty [@ocaml.tailcall]) ty1 (fun () -> + (validate_ty [@ocaml.tailcall]) ty2 k) + +let validate_parameters_ty ctxt parameters_ty = + let open Tzresult_syntax in + (* Parse the type and check that the entrypoints are well-formed. Using + [parse_parameter_ty_and_entrypoints] restricts to [passable] types + (everything but operations), which is OK since [validate_ty] constraints + the type further. *) + let* Ex_parameter_ty_and_entrypoints {arg_type; entrypoints = _}, ctxt = + Script_ir_translator.parse_parameter_ty_and_entrypoints + ctxt + ~legacy:false + (Micheline.root parameters_ty) + in + (* Check that the type is valid for rollups. *) + let* ctxt = + Gas.consume + ctxt + (Sc_rollup_costs.is_valid_parameters_ty_cost + ~ty_size:Script_typed_ir.(ty_size arg_type |> Type_size.to_int)) + in + let+ () = validate_ty arg_type ok in + ctxt let originate ctxt ~kind ~boot_sector ~parameters_ty = - originate ctxt ~kind ~boot_sector ~parameters_ty - >>=? fun (address, size, ctxt) -> return ({address; size}, ctxt) + let open Lwt_tzresult_syntax in + let*? ctxt = + let open Tzresult_syntax in + let* parameters_ty, ctxt = + Script.force_decode_in_context + ~consume_deserialization_gas:When_needed + ctxt + parameters_ty + in + validate_parameters_ty ctxt parameters_ty + in + let+ address, size, ctxt = + Sc_rollup.originate ctxt ~kind ~boot_sector ~parameters_ty + in + ({address; size}, ctxt) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_operations.mli b/src/proto_alpha/lib_protocol/sc_rollup_operations.mli index 3c2d389fd47c..9f817fac6125 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_operations.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_operations.mli @@ -26,6 +26,8 @@ (** High-level operations over smart contract rollups. *) open Alpha_context +type error += (* Temporary *) Sc_rollup_invalid_parameters_type + type origination_result = {address : Sc_rollup.Address.t; size : Z.t} (** [originate context ~kind ~boot_sector] adds a new rollup running in a -- GitLab From 09c72ec4c6036a3fa0acaf383d9ccb4ca0dd6bfd Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Tue, 24 May 2022 14:28:07 +0100 Subject: [PATCH 5/9] Test: make sc rollup test compile --- .../integration/operations/test_sc_rollup.ml | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml index b04d3b36e5fb..b48f9ec6b7ee 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml @@ -54,13 +54,17 @@ let context_init ?(sc_rollup_challenge_window_in_blocks = 10) tup = } (** [test_disable_feature_flag ()] tries to originate a smart contract - rollup when the feature flag is deactivated and checks that it - fails. *) + rollup when the feature flag is deactivated and checks that it + fails. *) let test_disable_feature_flag () = let* b, contract = Context.init1 () in let* i = Incremental.begin_construction b in let kind = Sc_rollup.Kind.Example_arith in - let* op, _ = Op.sc_rollup_origination (I i) contract kind "" in + let* op, _ = + let parameters_ty = Script.lazy_expr @@ Expr.from_string "unit" in + Op.sc_rollup_origination (I i) contract kind "" parameters_ty + in + let expect_failure = function | Environment.Ecoproto_error (Apply.Sc_rollup_feature_disabled as e) :: _ -> Assert.test_error_encodings e ; @@ -102,13 +106,20 @@ let test_sc_rollups_all_well_defined () = all_names_are_valid () (** Initializes the context and originates a SCORU. *) -let init_and_originate ?sc_rollup_challenge_window_in_blocks tup = +let init_and_originate ?sc_rollup_challenge_window_in_blocks tup parameters_ty = let* ctxt, contracts = context_init ?sc_rollup_challenge_window_in_blocks tup in let contract = Context.tup_hd tup contracts in let kind = Sc_rollup.Kind.Example_arith in - let* operation, rollup = Op.sc_rollup_origination (B ctxt) contract kind "" in + let* operation, rollup = + Op.sc_rollup_origination + (B ctxt) + contract + kind + "" + (Script.lazy_expr @@ Expr.from_string parameters_ty) + in let* b = Block.bake ~operation ctxt in return (b, contracts, rollup) @@ -150,7 +161,7 @@ let dummy_commitment ctxt rollup = (** [test_publish_and_cement] creates a rollup, publishes a commitment and then [commitment_freq] blocks later cements that commitment *) let test_publish_and_cement () = - let* ctxt, contracts, rollup = init_and_originate Context.T2 in + let* ctxt, contracts, rollup = init_and_originate Context.T2 "unit" in let _, contract = contracts in let* i = Incremental.begin_construction ctxt in let* c = dummy_commitment i rollup in @@ -171,7 +182,7 @@ let test_publish_and_cement () = publishes two different commitments with the same staker. We check that the second publish fails. *) let test_publish_fails_on_backtrack () = - let* ctxt, contracts, rollup = init_and_originate Context.T2 in + let* ctxt, contracts, rollup = init_and_originate Context.T2 "unit" in let _, contract = contracts in let* i = Incremental.begin_construction ctxt in let* commitment1 = dummy_commitment i rollup in @@ -199,7 +210,7 @@ let test_publish_fails_on_backtrack () = cement one of the commitments; it checks that this fails because the commitment is contested. *) let test_cement_fails_on_conflict () = - let* ctxt, contracts, rollup = init_and_originate Context.T3 in + let* ctxt, contracts, rollup = init_and_originate Context.T3 "unit" in let _, contract1, contract2 = contracts in let* i = Incremental.begin_construction ctxt in let* commitment1 = dummy_commitment i rollup in @@ -253,7 +264,7 @@ let commit_and_cement_after_n_bloc ?expect_failure ctxt contract rollup n = let test_challenge_window_period_boundaries () = let sc_rollup_challenge_window_in_blocks = 10 in let* ctxt, contract, rollup = - init_and_originate ~sc_rollup_challenge_window_in_blocks Context.T1 + init_and_originate ~sc_rollup_challenge_window_in_blocks Context.T1 "unit" in (* Should fail because the waiting period is not strictly greater than the challenge window period. *) -- GitLab From e7f57b6abc641976b8f9eadf371d76e5d41a649d Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Thu, 19 May 2022 11:42:11 +0100 Subject: [PATCH 6/9] Test: adjust tests for expanded sc origination type --- .../lib_protocol/test/unit/test_sc_rollup_storage.ml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml index 770b7a9db8b9..52b4e5734e7a 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml @@ -50,7 +50,15 @@ let new_context () = let new_sc_rollup ctxt = let+ rollup, _size, ctxt = - Sc_rollup_storage.originate ctxt ~kind:Example_arith ~boot_sector:"" + let {Michelson_v1_parser.expanded; _}, _ = + Michelson_v1_parser.parse_expression "unit" + in + let parameters_ty = Alpha_context.Script.lazy_expr expanded in + Sc_rollup_storage.originate + ctxt + ~kind:Example_arith + ~boot_sector:"" + ~parameters_ty in (rollup, ctxt) -- GitLab From 055f2cbf54adb954ed48062dd0017c29741387fb Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Tue, 24 May 2022 14:29:54 +0100 Subject: [PATCH 7/9] Test: add type parameter for sc origination in tezt tests --- tezt/lib_tezos/client.ml | 20 ++++++++++++++++---- tezt/lib_tezos/client.mli | 3 +++ tezt/tests/sc_rollup.ml | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tezt/lib_tezos/client.ml b/tezt/lib_tezos/client.ml index 601fc14b7878..d8485eb2f4bd 100644 --- a/tezt/lib_tezos/client.ml +++ b/tezt/lib_tezos/client.ml @@ -1568,8 +1568,8 @@ let show_voting_period ?endpoint client = | Some period -> return period module Sc_rollup = struct - let spawn_originate ?hooks ?(wait = "none") ?burn_cap ~src ~kind ~boot_sector - client = + let spawn_originate ?hooks ?(wait = "none") ?burn_cap ~src ~kind + ~parameters_ty ~boot_sector client = spawn_command ?hooks client @@ -1583,6 +1583,9 @@ module Sc_rollup = struct "of"; "kind"; kind; + "of"; + "type"; + parameters_ty; "booting"; "with"; boot_sector; @@ -1594,9 +1597,18 @@ module Sc_rollup = struct | None -> Test.fail "Cannot extract rollup address from receipt." | Some x -> return x - let originate ?hooks ?wait ?burn_cap ~src ~kind ~boot_sector client = + let originate ?hooks ?wait ?burn_cap ~src ~kind ~parameters_ty ~boot_sector + client = let process = - spawn_originate ?hooks ?wait ?burn_cap ~src ~kind ~boot_sector client + spawn_originate + ?hooks + ?wait + ?burn_cap + ~src + ~kind + ~boot_sector + ~parameters_ty + client in let* output = Process.check_and_read_stdout process in parse_rollup_address_in_receipt output diff --git a/tezt/lib_tezos/client.mli b/tezt/lib_tezos/client.mli index 4dd11d098a1a..8a6a32dad161 100644 --- a/tezt/lib_tezos/client.mli +++ b/tezt/lib_tezos/client.mli @@ -2,6 +2,7 @@ (* *) (* Open Source License *) (* Copyright (c) 2020 Nomadic Labs *) +(* Copyright (c) 2022 TriliTech *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -1187,6 +1188,7 @@ module Sc_rollup : sig ?burn_cap:Tez.t -> src:string -> kind:string -> + parameters_ty:string -> boot_sector:string -> t -> string Lwt.t @@ -1198,6 +1200,7 @@ module Sc_rollup : sig ?burn_cap:Tez.t -> src:string -> kind:string -> + parameters_ty:string -> boot_sector:string -> t -> Process.t diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 5e5a056fcfec..23bd672106cd 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -110,6 +110,7 @@ let with_fresh_rollup f tezos_node tezos_client bootstrap1_key = ~src:bootstrap1_key ~kind:"arith" ~boot_sector:"" + ~parameters_ty:"unit" tezos_client in let sc_rollup_node = @@ -199,6 +200,7 @@ let test_origination = ~burn_cap:Tez.(of_int 9999999) ~src:bootstrap1_key ~kind:"arith" + ~parameters_ty:"unit" ~boot_sector:"" client in @@ -217,6 +219,7 @@ let with_fresh_rollup ?(boot_sector = "") f tezos_node tezos_client ~burn_cap:Tez.(of_int 9999999) ~src:bootstrap1_key ~kind:"arith" + ~parameters_ty:"unit" ~boot_sector tezos_client in -- GitLab From f171ae4747ffd378465f8dac969970b7cee1e597 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Tue, 24 May 2022 10:09:39 +0100 Subject: [PATCH 8/9] Test: lookup type for originated rollup --- .../integration/operations/test_sc_rollup.ml | 129 ++++++++++++++++-- 1 file changed, 121 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml index b48f9ec6b7ee..1b1dc6981704 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml @@ -40,6 +40,28 @@ exception Sc_rollup_test_error of string let err x = Exn (Sc_rollup_test_error x) +let wrap k = Lwt.map Environment.wrap_tzresult k + +let assert_fails ~loc ?error m = + let open Lwt_result_syntax in + let*! res = m in + match res with + | Ok _ -> Stdlib.failwith "Expected failure" + | Error err_res -> ( + match (err_res, error) with + | Environment.Ecoproto_error err' :: _, Some err when err = err' -> + (* Matched exact error. *) + return_unit + | _, Some _ -> + (* Expected a different error. *) + let msg = + Printf.sprintf "Expected a different error at location %s" loc + in + Stdlib.failwith msg + | _, None -> + (* Any error is ok. *) + return ()) + (** [context_init tup] initializes a context for testing in which the [sc_rollup_enable] constant is set to true. It returns the created context and contracts. *) @@ -106,22 +128,30 @@ let test_sc_rollups_all_well_defined () = all_names_are_valid () (** Initializes the context and originates a SCORU. *) -let init_and_originate ?sc_rollup_challenge_window_in_blocks tup parameters_ty = - let* ctxt, contracts = - context_init ?sc_rollup_challenge_window_in_blocks tup - in - let contract = Context.tup_hd tup contracts in +let sc_originate block contract parameters_ty = let kind = Sc_rollup.Kind.Example_arith in let* operation, rollup = Op.sc_rollup_origination - (B ctxt) + ~counter:(Z.of_int 0) + (B block) contract kind "" (Script.lazy_expr @@ Expr.from_string parameters_ty) in - let* b = Block.bake ~operation ctxt in - return (b, contracts, rollup) + let* incr = Incremental.begin_construction block in + let* incr = Incremental.add_operation incr operation in + let* block = Incremental.finalize_block incr in + return (block, rollup) + +(** Initializes the context and originates a SCORU. *) +let init_and_originate ?sc_rollup_challenge_window_in_blocks tup parameters_ty = + let* block, contracts = + context_init ?sc_rollup_challenge_window_in_blocks tup + in + let contract = Context.tup_hd tup contracts in + let* block, rollup = sc_originate block contract parameters_ty in + return (block, contracts, rollup) let number_of_messages_exn n = match Sc_rollup.Number_of_messages.of_int32 n with @@ -293,6 +323,81 @@ let test_challenge_window_period_boundaries () = in return_unit +(** Test originating with bad type. *) +let test_originating_with_invalid_types () = + let* block, (contract, _, _) = context_init Context.T3 in + let assert_fails_for_type parameters_type = + assert_fails + ~loc:__LOC__ + ~error:Sc_rollup_operations.Sc_rollup_invalid_parameters_type + (sc_originate block contract parameters_type) + in + (* Following types fail at validation time. *) + let* () = + [ + "mutez"; + "big_map string nat"; + "contract string"; + "sapling_state 2"; + "sapling_transaction 2"; + "lambda string nat"; + ] + |> List.iter_es assert_fails_for_type + in + (* Operation fails with a different error as it's not "passable". *) + assert_fails ~loc:__LOC__ (sc_originate block contract "operation") + +let assert_equal_expr ~loc e1 e2 = + let s1 = Format.asprintf "%a" Michelson_v1_printer.print_expr e1 in + let s2 = Format.asprintf "%a" Michelson_v1_printer.print_expr e2 in + Assert.equal_string ~loc s1 s2 + +let test_originating_with_valid_type () = + let* block, contract = context_init Context.T1 in + let assert_parameters_ty parameters_ty = + let* block, rollup = sc_originate block contract parameters_ty in + let* incr = Incremental.begin_construction block in + let ctxt = Incremental.alpha_ctxt incr in + let* expr, _ctxt = wrap @@ Sc_rollup.parameters_type ctxt rollup in + let*? expr, _ctxt = + Environment.wrap_tzresult + @@ Script.force_decode_in_context + ~consume_deserialization_gas:When_needed + ctxt + expr + in + assert_equal_expr ~loc:__LOC__ (Expr.from_string parameters_ty) expr + in + [ + "unit"; + "int"; + "nat"; + "signature"; + "string"; + "bytes"; + "key_hash"; + "key"; + "timestamp"; + "address"; + "bls12_381_fr"; + "bls12_381_g1"; + "bls12_381_g2"; + "bool"; + "never"; + "tx_rollup_l2_address"; + "chain_id"; + "ticket string"; + "set nat"; + "option (ticket string)"; + "list nat"; + "pair nat unit"; + "or nat string"; + "map string int"; + "map (option (pair nat string)) (list (ticket nat))"; + "or (nat %deposit) (string %name)"; + ] + |> List.iter_es assert_parameters_ty + let tests = [ Tztest.tztest @@ -319,4 +424,12 @@ let tests = "check the challenge window period boundaries" `Quick test_challenge_window_period_boundaries; + Tztest.tztest + "originating with invalid types" + `Quick + test_originating_with_invalid_types; + Tztest.tztest + "originating with valid type" + `Quick + test_originating_with_valid_type; ] -- GitLab From 12de1b8c51ca6a1fc32f557929cc85d2f0c7904e Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Mon, 23 May 2022 12:42:33 +0100 Subject: [PATCH 9/9] Test: update regressions --- .../_regressions/rpc/alpha.client.mempool.out | 171 ++++++++++++ tezt/_regressions/rpc/alpha.proxy.mempool.out | 171 ++++++++++++ .../sc_rollup_client_gets_address.out | 26 +- ...nt_of_rollup_node_commitment_is_stored.out | 26 +- ...p_node_first_published_at_level_global.out | 26 +- ...nt_of_rollup_node_handles_chain_reorgs.out | 26 +- ...mmitment_of_rollup_node_messages_reset.out | 26 +- ..._node_no_commitment_publish_before_lcc.out | 26 +- ...mitment_of_rollup_node_non_final_level.out | 26 +- .../sc_rollup_get_initial_level.out | 26 +- .../sc_rollup_get_lcc_hash_with_level.out | 26 +- .../sc_rollup_inbox_current_messages_hash.out | 26 +- .../sc_rollup_inbox_of_rollup_node_basic.out | 26 +- ...box_of_rollup_node_handles_chain_reorg.out | 26 +- .../sc_rollup_inbox_of_rollup_node_stops.out | 26 +- ...inbox_of_rollup_node_too_many_messages.out | 26 +- tezt/_regressions/sc_rollup_inbox_size.out | 26 +- tezt/_regressions/sc_rollup_list.out | 260 +++++++++--------- .../sc_rollup_node_advances_pvm_state.out | 26 +- ...c_rollup_node_boots_into_initial_state.out | 26 +- .../sc_rollup_node_configuration.out | 26 +- .../sc_rollup_node_uses_boot_sector.out | 52 ++-- tezt/_regressions/sc_rollup_origination.out | 26 +- .../sc_rollup_origination_bootsector.out | 26 +- 24 files changed, 758 insertions(+), 416 deletions(-) diff --git a/tezt/_regressions/rpc/alpha.client.mempool.out b/tezt/_regressions/rpc/alpha.client.mempool.out index fabc37468355..cec142591f8c 100644 --- a/tezt/_regressions/rpc/alpha.client.mempool.out +++ b/tezt/_regressions/rpc/alpha.client.mempool.out @@ -3015,9 +3015,87 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, "boot_sector": { "$ref": "#/definitions/unistring" + }, + "parameters_ty": { + "oneOf": [ + { + "title": "Int", + "type": "object", + "properties": { + "int": { + "$ref": "#/definitions/bignum" + } + }, + "required": [ + "int" + ], + "additionalProperties": false + }, + { + "title": "String", + "type": "object", + "properties": { + "string": { + "$ref": "#/definitions/unistring" + } + }, + "required": [ + "string" + ], + "additionalProperties": false + }, + { + "title": "Bytes", + "type": "object", + "properties": { + "bytes": { + "type": "string", + "pattern": "^([a-zA-Z0-9][a-zA-Z0-9])*$" + } + }, + "required": [ + "bytes" + ], + "additionalProperties": false + }, + { + "title": "Sequence", + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + { + "title": "Prim__generic", + "description": "Generic primitive (any number of args with or without annotations)", + "type": "object", + "properties": { + "prim": { + "$ref": "#/definitions/alpha.michelson.v1.primitives" + }, + "args": { + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + "annots": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "prim" + ], + "additionalProperties": false + } + ] } }, "required": [ + "parameters_ty", "boot_sector", "kind", "storage_limit", @@ -6089,6 +6167,21 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "kind": "Variable" }, "kind": "named" + }, + { + "kind": "dyn", + "num_fields": 1, + "size": "Uint30" + }, + { + "name": "parameters_ty", + "layout": { + "kind": "Bytes" + }, + "data_kind": { + "kind": "Variable" + }, + "kind": "named" } ], "name": "Sc_rollup_originate" @@ -13169,9 +13262,87 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, "boot_sector": { "$ref": "#/definitions/unistring" + }, + "parameters_ty": { + "oneOf": [ + { + "title": "Int", + "type": "object", + "properties": { + "int": { + "$ref": "#/definitions/bignum" + } + }, + "required": [ + "int" + ], + "additionalProperties": false + }, + { + "title": "String", + "type": "object", + "properties": { + "string": { + "$ref": "#/definitions/unistring" + } + }, + "required": [ + "string" + ], + "additionalProperties": false + }, + { + "title": "Bytes", + "type": "object", + "properties": { + "bytes": { + "type": "string", + "pattern": "^([a-zA-Z0-9][a-zA-Z0-9])*$" + } + }, + "required": [ + "bytes" + ], + "additionalProperties": false + }, + { + "title": "Sequence", + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + { + "title": "Prim__generic", + "description": "Generic primitive (any number of args with or without annotations)", + "type": "object", + "properties": { + "prim": { + "$ref": "#/definitions/alpha.michelson.v1.primitives" + }, + "args": { + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + "annots": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "prim" + ], + "additionalProperties": false + } + ] } }, "required": [ + "parameters_ty", "boot_sector", "kind", "storage_limit", diff --git a/tezt/_regressions/rpc/alpha.proxy.mempool.out b/tezt/_regressions/rpc/alpha.proxy.mempool.out index f34f4ae77cc2..97e4634b8fb5 100644 --- a/tezt/_regressions/rpc/alpha.proxy.mempool.out +++ b/tezt/_regressions/rpc/alpha.proxy.mempool.out @@ -3036,9 +3036,87 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, "boot_sector": { "$ref": "#/definitions/unistring" + }, + "parameters_ty": { + "oneOf": [ + { + "title": "Int", + "type": "object", + "properties": { + "int": { + "$ref": "#/definitions/bignum" + } + }, + "required": [ + "int" + ], + "additionalProperties": false + }, + { + "title": "String", + "type": "object", + "properties": { + "string": { + "$ref": "#/definitions/unistring" + } + }, + "required": [ + "string" + ], + "additionalProperties": false + }, + { + "title": "Bytes", + "type": "object", + "properties": { + "bytes": { + "type": "string", + "pattern": "^([a-zA-Z0-9][a-zA-Z0-9])*$" + } + }, + "required": [ + "bytes" + ], + "additionalProperties": false + }, + { + "title": "Sequence", + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + { + "title": "Prim__generic", + "description": "Generic primitive (any number of args with or without annotations)", + "type": "object", + "properties": { + "prim": { + "$ref": "#/definitions/alpha.michelson.v1.primitives" + }, + "args": { + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + "annots": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "prim" + ], + "additionalProperties": false + } + ] } }, "required": [ + "parameters_ty", "boot_sector", "kind", "storage_limit", @@ -6110,6 +6188,21 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "kind": "Variable" }, "kind": "named" + }, + { + "kind": "dyn", + "num_fields": 1, + "size": "Uint30" + }, + { + "name": "parameters_ty", + "layout": { + "kind": "Bytes" + }, + "data_kind": { + "kind": "Variable" + }, + "kind": "named" } ], "name": "Sc_rollup_originate" @@ -13190,9 +13283,87 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, "boot_sector": { "$ref": "#/definitions/unistring" + }, + "parameters_ty": { + "oneOf": [ + { + "title": "Int", + "type": "object", + "properties": { + "int": { + "$ref": "#/definitions/bignum" + } + }, + "required": [ + "int" + ], + "additionalProperties": false + }, + { + "title": "String", + "type": "object", + "properties": { + "string": { + "$ref": "#/definitions/unistring" + } + }, + "required": [ + "string" + ], + "additionalProperties": false + }, + { + "title": "Bytes", + "type": "object", + "properties": { + "bytes": { + "type": "string", + "pattern": "^([a-zA-Z0-9][a-zA-Z0-9])*$" + } + }, + "required": [ + "bytes" + ], + "additionalProperties": false + }, + { + "title": "Sequence", + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + { + "title": "Prim__generic", + "description": "Generic primitive (any number of args with or without annotations)", + "type": "object", + "properties": { + "prim": { + "$ref": "#/definitions/alpha.michelson.v1.primitives" + }, + "args": { + "type": "array", + "items": { + "$ref": "#/definitions/micheline.alpha.michelson_v1.expression" + } + }, + "annots": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "prim" + ], + "additionalProperties": false + } + ] } }, "required": [ + "parameters_ty", "boot_sector", "kind", "storage_limit", diff --git a/tezt/_regressions/sc_rollup_client_gets_address.out b/tezt/_regressions/sc_rollup_client_gets_address.out index 9ce404c45775..ab107f0088a8 100644 --- a/tezt/_regressions/sc_rollup_client_gets_address.out +++ b/tezt/_regressions/sc_rollup_client_gets_address.out @@ -1,9 +1,9 @@ sc_rollup_client_gets_address.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,19 +13,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_commitment_is_stored.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_commitment_is_stored.out index d58a65a23010..5ab38cf204c0 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_commitment_is_stored.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_commitment_is_stored.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_commitment_is_stored.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out index 7b0e5c3efb31..1c3f75498e53 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out index acc8c5b32761..61ccdfd78566 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_messages_reset.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_messages_reset.out index 2182fd0ede42..567201ad3d1a 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_messages_reset.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_messages_reset.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_messages_reset.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_no_commitment_publish_before_lcc.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_no_commitment_publish_before_lcc.out index 23c5872192db..462d809478d9 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_no_commitment_publish_before_lcc.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_no_commitment_publish_before_lcc.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_no_commitment_publish_before_lcc.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_non_final_level.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_non_final_level.out index eae2bc2deef1..d8e6bc18cf84 100644 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_non_final_level.out +++ b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_non_final_level.out @@ -1,9 +1,9 @@ sc_rollup_commitment_of_rollup_node_non_final_level.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_get_initial_level.out b/tezt/_regressions/sc_rollup_get_initial_level.out index fa11156b4da3..170e5918d776 100644 --- a/tezt/_regressions/sc_rollup_get_initial_level.out +++ b/tezt/_regressions/sc_rollup_get_initial_level.out @@ -1,9 +1,9 @@ sc_rollup_get_initial_level.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,19 +13,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_get_lcc_hash_with_level.out b/tezt/_regressions/sc_rollup_get_lcc_hash_with_level.out index 22856ec75ac5..232f5d8cad96 100644 --- a/tezt/_regressions/sc_rollup_get_lcc_hash_with_level.out +++ b/tezt/_regressions/sc_rollup_get_lcc_hash_with_level.out @@ -1,9 +1,9 @@ sc_rollup_get_lcc_hash_with_level.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,19 +13,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out b/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out index 540105a2b148..f4324abf4b38 100644 --- a/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out +++ b/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out @@ -1,9 +1,9 @@ sc_rollup_inbox_current_messages_hash.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["hello, message number 0", "hello, message number 1", "hello, message number 2", "hello, message number 3", "hello, message number 4"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out index 4fcb7d827e42..21a292f639e7 100644 --- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out +++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out @@ -1,9 +1,9 @@ sc_rollup_inbox_of_rollup_node_basic.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out index 7e45841959c9..2c2ef6baedfa 100644 --- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out +++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out @@ -1,9 +1,9 @@ sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out index 97bd1ab99687..42b65f4030f3 100644 --- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out +++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out @@ -1,9 +1,9 @@ sc_rollup_inbox_of_rollup_node_stops.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_too_many_messages.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_too_many_messages.out index d452501f111f..0c6df55b67bf 100644 --- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_too_many_messages.out +++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_too_many_messages.out @@ -1,9 +1,9 @@ sc_rollup_inbox_of_rollup_node_too_many_messages.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_inbox_size.out b/tezt/_regressions/sc_rollup_inbox_size.out index e16f10acddf5..dd941d4f4de9 100644 --- a/tezt/_regressions/sc_rollup_inbox_size.out +++ b/tezt/_regressions/sc_rollup_inbox_size.out @@ -1,9 +1,9 @@ sc_rollup_inbox_size.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' diff --git a/tezt/_regressions/sc_rollup_list.out b/tezt/_regressions/sc_rollup_list.out index bb1a87ff9260..1d08769e693b 100644 --- a/tezt/_regressions/sc_rollup_list.out +++ b/tezt/_regressions/sc_rollup_list.out @@ -1,9 +1,9 @@ sc_rollup_list.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,27 +13,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -43,27 +43,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 2 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -73,27 +73,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 3 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -103,27 +103,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 4 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -133,27 +133,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 5 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -163,27 +163,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 6 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -193,27 +193,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 7 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -223,27 +223,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 8 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -253,27 +253,27 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 9 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -283,19 +283,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 10 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_node_advances_pvm_state.out b/tezt/_regressions/sc_rollup_node_advances_pvm_state.out index b334c22a6141..d3e46ceec89b 100644 --- a/tezt/_regressions/sc_rollup_node_advances_pvm_state.out +++ b/tezt/_regressions/sc_rollup_node_advances_pvm_state.out @@ -1,9 +1,9 @@ sc_rollup_node_advances_pvm_state.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_node_boots_into_initial_state.out b/tezt/_regressions/sc_rollup_node_boots_into_initial_state.out index 191dce55f2bf..5f4193240903 100644 --- a/tezt/_regressions/sc_rollup_node_boots_into_initial_state.out +++ b/tezt/_regressions/sc_rollup_node_boots_into_initial_state.out @@ -1,9 +1,9 @@ sc_rollup_node_boots_into_initial_state.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_node_configuration.out b/tezt/_regressions/sc_rollup_node_configuration.out index 5da75046280c..8057cab33fd0 100644 --- a/tezt/_regressions/sc_rollup_node_configuration.out +++ b/tezt/_regressions/sc_rollup_node_configuration.out @@ -1,9 +1,9 @@ sc_rollup_node_configuration.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,19 +13,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_node_uses_boot_sector.out b/tezt/_regressions/sc_rollup_node_uses_boot_sector.out index 92ff067b1abe..c27c8febded0 100644 --- a/tezt/_regressions/sc_rollup_node_uses_boot_sector.out +++ b/tezt/_regressions/sc_rollup_node_uses_boot_sector.out @@ -1,9 +1,9 @@ sc_rollup_node_uses_boot_sector.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with '10 10 10 + +' --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with '10 10 10 + +' --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6546 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6552 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000414 + Fee to the baker: ꜩ0.00044 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6566 bytes + Gas limit: 1901 + Storage limit: 6572 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000414 - payload fees(the block proposer) ....... +ꜩ0.000414 - Originate smart contract rollup of kind arith with boot sector '10 10 10 + +' + [PUBLIC_KEY_HASH] ... -ꜩ0.00044 + payload fees(the block proposer) ....... +ꜩ0.00044 + Originate smart contract rollup of kind arith and type unit with boot sector '10 10 10 + +' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6546 bytes + Consumed gas: 1800.796 + Storage size: 6552 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6365 - storage fees ........................... +ꜩ1.6365 + [PUBLIC_KEY_HASH] ... -ꜩ1.638 + storage fees ........................... +ꜩ1.638 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' @@ -75,10 +75,10 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /state_hash "[SC_ROLLUP_STATE_HASH]" -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with 31 --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with 31 --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6536 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6542 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -88,21 +88,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000404 + Fee to the baker: ꜩ0.00043 Expected counter: 3 - Gas limit: 1701 - Storage limit: 6556 bytes + Gas limit: 1901 + Storage limit: 6562 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000404 - payload fees(the block proposer) ....... +ꜩ0.000404 - Originate smart contract rollup of kind arith with boot sector '31' + [PUBLIC_KEY_HASH] ... -ꜩ0.00043 + payload fees(the block proposer) ....... +ꜩ0.00043 + Originate smart contract rollup of kind arith and type unit with boot sector '31' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6536 bytes + Consumed gas: 1800.796 + Storage size: 6542 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.634 - storage fees ........................... +ꜩ1.634 + [PUBLIC_KEY_HASH] ... -ꜩ1.6355 + storage fees ........................... +ꜩ1.6355 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' diff --git a/tezt/_regressions/sc_rollup_origination.out b/tezt/_regressions/sc_rollup_origination.out index 34b4e1c89b08..879a2f7ca6a1 100644 --- a/tezt/_regressions/sc_rollup_origination.out +++ b/tezt/_regressions/sc_rollup_origination.out @@ -1,9 +1,9 @@ sc_rollup_origination.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6540 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,19 +13,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 + Fee to the baker: ꜩ0.000428 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes + Gas limit: 1901 + Storage limit: 6560 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' + [PUBLIC_KEY_HASH] ... -ꜩ0.000428 + payload fees(the block proposer) ....... +ꜩ0.000428 + Originate smart contract rollup of kind arith and type unit with boot sector '' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes + Consumed gas: 1800.796 + Storage size: 6540 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 + [PUBLIC_KEY_HASH] ... -ꜩ1.635 + storage fees ........................... +ꜩ1.635 diff --git a/tezt/_regressions/sc_rollup_origination_bootsector.out b/tezt/_regressions/sc_rollup_origination_bootsector.out index 49a61b5ba1a5..ab9d90559726 100644 --- a/tezt/_regressions/sc_rollup_origination_bootsector.out +++ b/tezt/_regressions/sc_rollup_origination_bootsector.out @@ -1,9 +1,9 @@ sc_rollup_origination_bootsector.out -./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with '10 10 10 + +' --burn-cap 9999999 +./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with '10 10 10 + +' --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6546 bytes added (will add 20 for safety) +Estimated gas: 1800.796 units (will add 100 for safety) +Estimated storage: 6552 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' NOT waiting for the operation to be included. @@ -13,21 +13,21 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000414 + Fee to the baker: ꜩ0.00044 Expected counter: 1 - Gas limit: 1701 - Storage limit: 6566 bytes + Gas limit: 1901 + Storage limit: 6572 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000414 - payload fees(the block proposer) ....... +ꜩ0.000414 - Originate smart contract rollup of kind arith with boot sector '10 10 10 + +' + [PUBLIC_KEY_HASH] ... -ꜩ0.00044 + payload fees(the block proposer) ....... +ꜩ0.00044 + Originate smart contract rollup of kind arith and type unit with boot sector '10 10 10 + +' This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6546 bytes + Consumed gas: 1800.796 + Storage size: 6552 bytes Address: [SC_ROLLUP_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6365 - storage fees ........................... +ꜩ1.6365 + [PUBLIC_KEY_HASH] ... -ꜩ1.638 + storage fees ........................... +ꜩ1.638 ./tezos-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/boot_sector' -- GitLab