From 6be630333ea888b0e7c8f62d5b0e83ccf89c412e Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 15 Jul 2022 16:44:17 +0200 Subject: [PATCH 1/7] Proto/SCORU: add gas cost definitions. They will be used to carbonate Sc_rollup_commitment_repr.hash, so the definitions must make sense with regards to its type t. --- .../lib_protocol/sc_rollup_costs.ml | 23 +++++++++++++++++++ .../lib_protocol/sc_rollup_costs.mli | 9 ++++++++ 2 files changed, 32 insertions(+) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.ml b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml index ea85e5b36deb..14e29f2d6c98 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_costs.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml @@ -31,6 +31,8 @@ module S_syntax = struct let ( + ) = S.add let ( * ) = S.mul + + let ( lsr ) = S.shift_right end module Constants = struct @@ -56,6 +58,21 @@ module Constants = struct by the number of characters of a pkh, i.e. 70/35. To be updated when benchmarking is completed. *) let cost_encode_string_per_byte = S.safe_int 2 + + (* Cost of serializing a state hash. *) + let cost_serialize_state_hash = + let len = S.safe_int State_hash.size in + S_syntax.(cost_encode_string_per_byte * len) + + (* Cost of serializing a commitment hash. *) + let cost_serialize_commitment_hash = + let len = S.safe_int Sc_rollup_commitment_repr.Hash.size in + S_syntax.(cost_encode_string_per_byte * len) + + (* Cost of serializing a commitment. The cost of serializing the level and + number of ticks (both int32) is negligible. *) + let cost_serialize_commitment = + S_syntax.(cost_serialize_state_hash + cost_serialize_commitment_hash) end (* We assume that the gas cost of adding messages [[ m_1; ... ; m_n]] at level @@ -103,3 +120,9 @@ let cost_deserialize_output_proof ~bytes_len = let cost_serialize_external_inbox_message ~bytes_len = let len = S.safe_int bytes_len in S_syntax.(Constants.cost_encode_string_per_byte * len) + +(* Equal to Michelson_v1_gas.Cost_of.Interpreter.blake2b. *) +let cost_hash_bytes ~bytes_len = + let open S_syntax in + let v0 = S.safe_int bytes_len in + S.safe_int 430 + v0 + (v0 lsr 3) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.mli b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli index 2b6939922627..7cc527a08641 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_costs.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli @@ -34,6 +34,12 @@ module Constants : sig val cost_add_inbox_per_level : Gas_limit_repr.cost val cost_update_num_and_size_of_messages : Gas_limit_repr.cost + + val cost_serialize_state_hash : Gas_limit_repr.cost + + val cost_serialize_commitment_hash : Gas_limit_repr.cost + + val cost_serialize_commitment : Gas_limit_repr.cost end (** [is_valid_parameters_ty_cost ty] returns the cost of checking whether a type @@ -69,3 +75,6 @@ val cost_deserialize_output_proof : bytes_len:int -> Gas_limit_repr.cost serialization of an external inbox message of length [bytes_len]. It is equal to the estimated cost of encoding a byte multiplied by [bytes_len]. *) val cost_serialize_external_inbox_message : bytes_len:int -> Gas_limit_repr.cost + +(** [cost_hash_bytes ~bytes_len] is the cost of hashing [bytes_len] bytes. *) +val cost_hash_bytes : bytes_len:int -> Gas_limit_repr.cost -- GitLab From dfc8e9230b1e40002ee89e25dc2af45647c77fbf Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Mon, 18 Jul 2022 14:20:49 +0200 Subject: [PATCH 2/7] Proto/SCORU: add the Sc_rollup_bad_commitment_hash error. --- src/proto_alpha/lib_protocol/sc_rollup_errors.ml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_errors.ml b/src/proto_alpha/lib_protocol/sc_rollup_errors.ml index af122706389f..48e47ed1d69d 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_errors.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_errors.ml @@ -67,6 +67,7 @@ type error += staker_balance : Tez_repr.t; min_expected_balance : Tez_repr.t; } + | (* `Temporary *) Sc_rollup_bad_commitment_serialization let () = register_error_kind @@ -431,4 +432,14 @@ let () = (fun (staker, sc_rollup, staker_balance, min_expected_balance) -> Sc_rollup_staker_funds_too_low {staker; sc_rollup; staker_balance; min_expected_balance}) ; + let description = "Could not serialize commitment." in + register_error_kind + `Temporary + ~id:"Sc_rollup_bad_commitment_serialization" + ~title:"Could not serialize commitment." + ~description:"Unable to hash the commitment serialization." + ~pp:(fun ppf () -> Format.fprintf ppf "%s" description) + Data_encoding.empty + (function Sc_rollup_bad_commitment_serialization -> Some () | _ -> None) + (fun () -> Sc_rollup_bad_commitment_serialization) ; () -- GitLab From d1d9abc16738594d6027131ccd78a3ece4f0df68 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 15 Jul 2022 16:53:54 +0200 Subject: [PATCH 3/7] Proto/SCORU: add a commitment carbonated-hash function. It will be renamed later so that it's easier to follow where it is used and where we keep using the uncarbonated version (Sc_rollup_commitment_repr.hash). Also add a helper function in tests. --- .../lib_protocol/alpha_context.mli | 2 ++ .../sc_rollup_commitment_storage.ml | 23 +++++++++++++++++++ .../sc_rollup_commitment_storage.mli | 4 ++++ .../integration/operations/test_sc_rollup.ml | 7 ++++++ 4 files changed, 36 insertions(+) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 3e8fc9f75297..97433b8a938a 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -3235,6 +3235,8 @@ module Sc_rollup : sig val hash : t -> Hash.t + val hash_carbonated : context -> t -> (context * Hash.t) tzresult + val genesis_commitment : origination_level:Raw_level.t -> genesis_state_hash:State_hash.t -> t diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml index 6a01a12ebdbb..1c0b1c60ac01 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml @@ -74,3 +74,26 @@ let get_predecessor_unsafe ctxt rollup node = let open Lwt_tzresult_syntax in let* commitment, ctxt = get_commitment_unsafe ctxt rollup node in return (commitment.predecessor, ctxt) + +let hash_carbonated ctxt commitment = + let open Tzresult_syntax in + let* ctxt = + Raw_context.consume_gas + ctxt + Sc_rollup_costs.Constants.cost_serialize_commitment + in + let commitment_bytes_opt = + Data_encoding.Binary.to_bytes_opt + Sc_rollup_commitment_repr.encoding + commitment + in + let* commitment_bytes = + Option.to_result + ~none:(trace_of_error Sc_rollup_bad_commitment_serialization) + commitment_bytes_opt + in + let bytes_len = Bytes.length commitment_bytes in + let* ctxt = + Raw_context.consume_gas ctxt (Sc_rollup_costs.cost_hash_bytes ~bytes_len) + in + return (ctxt, Sc_rollup_commitment_repr.Hash.hash_bytes [commitment_bytes]) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli index 0934c5adf495..f45271696ea3 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli @@ -196,3 +196,7 @@ val get_predecessor_unsafe : Sc_rollup_repr.t -> Commitment_hash.t -> (Commitment_hash.t * Raw_context.t) tzresult Lwt.t + +(** Hash a commitment and account for gas spent. *) +val hash_carbonated : + Raw_context.t -> Commitment.t -> (Raw_context.t * Commitment_hash.t) tzresult 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 fe6d79239069..3a214675f6a2 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 @@ -382,6 +382,13 @@ let originate_contract incr ~script ~baker ~storage ~source_contract = let* incr = Incremental.begin_construction block in return (contract, incr) +let hash_commitment incr commitment = + let ctxt = Incremental.alpha_ctxt incr in + let+ ctxt, hash = + wrap @@ Lwt.return (Sc_rollup.Commitment.hash_carbonated ctxt commitment) + in + (Incremental.set_alpha_ctxt incr ctxt, hash) + let publish_and_cement_commitment incr ~baker ~originator rollup commitment = let* operation = Op.sc_rollup_publish (I incr) originator rollup commitment in let* incr = Incremental.add_operation incr operation in -- GitLab From 7c0ec76f55e4b513a16ad83abcd94f2d6f8357d4 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 15 Jul 2022 17:10:31 +0200 Subject: [PATCH 4/7] Proto/SCORU: use Sc_rollup_commitment_storage.hash_carbonated. We'll rename Sc_rollup_commitment_repr.hash next, so we'll see all the remaining calls and we can check that we haven't missed a place where hash_accounted should be used instead. --- src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml | 4 +++- src/proto_alpha/lib_protocol/sc_rollup_storage.ml | 4 ++-- .../test/integration/operations/test_sc_rollup.ml | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml index 0c24a69dc6c8..3194eaa1e15f 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml @@ -255,7 +255,9 @@ let refine_stake ctxt rollup staker staked_on commitment = let open Lwt_tzresult_syntax in let* lcc, ctxt = Commitment_storage.last_cemented_commitment ctxt rollup in let* ctxt = assert_refine_conditions_met ctxt rollup lcc commitment in - let new_hash = Commitment.hash commitment in + let*? ctxt, new_hash = + Sc_rollup_commitment_storage.hash_carbonated ctxt commitment + in (* TODO: https://gitlab.com/tezos/tezos/-/issues/2559 Add a test checking that L2 nodes can catch up after going offline. *) let rec go node ctxt = diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml index c021c58c8eee..b6dee2d0ec20 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml @@ -31,8 +31,8 @@ module Commitment_hash = Commitment.Hash let originate ctxt ~kind ~boot_sector ~parameters_ty ~genesis_commitment = let open Lwt_tzresult_syntax in - let genesis_commitment_hash = - Sc_rollup_commitment_repr.hash genesis_commitment + let*? ctxt, genesis_commitment_hash = + Sc_rollup_commitment_storage.hash_carbonated ctxt genesis_commitment in let*? ctxt, nonce = Raw_context.increment_origination_nonce ctxt in let level = Raw_context.current_level ctxt in 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 3a214675f6a2..ebbef40504ed 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 @@ -397,10 +397,10 @@ let publish_and_cement_commitment incr ~baker ~originator rollup commitment = let* block = Block.bake_n constants.parametric.sc_rollup.challenge_window_in_blocks block in - let hash = Sc_rollup.Commitment.hash commitment in let* incr = Incremental.begin_construction ~policy:Block.(By_account baker) block in + let* incr, hash = hash_commitment incr commitment in let* cement_op = Op.sc_rollup_cement (I incr) originator rollup hash in let* incr = Incremental.add_operation incr cement_op in let* block = Incremental.finalize_block incr in @@ -584,7 +584,7 @@ let test_publish_cement_and_recover_bond () = Block.bake_n constants.parametric.sc_rollup.challenge_window_in_blocks b in let* i = Incremental.begin_construction b in - let hash = Sc_rollup.Commitment.hash c in + let* i, hash = hash_commitment i c in (* stake not on LCC *) let* () = recover_bond_not_lcc i contract rollup in let* cement_op = Op.sc_rollup_cement (I i) contract rollup hash in @@ -658,7 +658,7 @@ let test_cement_fails_on_conflict () = Block.bake_n constants.parametric.sc_rollup.challenge_window_in_blocks b in let* i = Incremental.begin_construction b in - let hash = Sc_rollup.Commitment.hash commitment1 in + let* i, hash = hash_commitment i commitment1 in let* cement_op = Op.sc_rollup_cement (I i) contract1 rollup hash in let expect_apply_failure = function | Environment.Ecoproto_error (Sc_rollup_errors.Sc_rollup_disputed as e) :: _ @@ -680,7 +680,7 @@ let commit_and_cement_after_n_bloc ?expect_apply_failure block contract rollup n (* This pattern would add an additional block, so we decrement [n] by one. *) let* b = Block.bake_n (n - 1) b in let* i = Incremental.begin_construction b in - let hash = Sc_rollup.Commitment.hash commitment in + let* i, hash = hash_commitment i commitment in let* cement_op = Op.sc_rollup_cement (I i) contract rollup hash in let* _ = Incremental.add_operation ?expect_apply_failure i cement_op in return_unit -- GitLab From 302f5f78cdc61c0e6f52fce5586294d8d6a33cd2 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 15 Jul 2022 17:40:57 +0200 Subject: [PATCH 5/7] Proto/SCORU: rename Sc_rollup_commitment_repr.hash to hash_uncarbonated. --- src/proto_alpha/bin_sc_rollup_node/RPC_server.ml | 3 ++- src/proto_alpha/bin_sc_rollup_node/commitment.ml | 4 ++-- src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml | 6 ++++-- src/proto_alpha/lib_protocol/alpha_context.mli | 2 +- src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml | 2 +- src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.mli | 2 +- .../test/integration/validate/manager_operation_helpers.ml | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml b/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml index e34755c46787..f0aa3b828ddc 100644 --- a/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml +++ b/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml @@ -53,7 +53,8 @@ let get_dal_slot_subscriptions_exn store = | Some slot_subscriptions -> return slot_subscriptions let commitment_with_hash commitment = - (Protocol.Alpha_context.Sc_rollup.Commitment.hash commitment, commitment) + ( Protocol.Alpha_context.Sc_rollup.Commitment.hash_uncarbonated commitment, + commitment ) module Common = struct let register_current_num_messages store dir = diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment.ml b/src/proto_alpha/bin_sc_rollup_node/commitment.ml index 26ce1f43ca52..661e27db64ac 100644 --- a/src/proto_alpha/bin_sc_rollup_node/commitment.ml +++ b/src/proto_alpha/bin_sc_rollup_node/commitment.ml @@ -125,7 +125,7 @@ let last_commitment_hash node_ctxt let open Lwt_syntax in let+ last_commitment = last_commitment (module Last_commitment_level) store in match last_commitment with - | Some commitment -> Sc_rollup.Commitment.hash commitment + | Some commitment -> Sc_rollup.Commitment.hash_uncarbonated commitment | None -> node_ctxt.Node_context.genesis_info.Sc_rollup.Commitment.commitment_hash @@ -141,7 +141,7 @@ let must_store_commitment node_ctxt current_level store = let update_last_stored_commitment store (commitment : Sc_rollup.Commitment.t) = let open Lwt_syntax in - let commitment_hash = Sc_rollup.Commitment.hash commitment in + let commitment_hash = Sc_rollup.Commitment.hash_uncarbonated commitment in let inbox_level = commitment.inbox_level in let* lcc_level = Store.Last_cemented_commitment_level.get store in (* Do not change the order of these two operations. This guarantees that diff --git a/src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml b/src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml index 0c1bd39d34bd..1fbe9d13e79b 100644 --- a/src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml +++ b/src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml @@ -130,9 +130,11 @@ let timeout_backtracked players = Simple.(emit timeout_backtracked players) let timeout_skipped players = Simple.(emit timeout_skipped players) let conflict_detected (conflict : Sc_rollup.Refutation_storage.conflict) = - let our_commitment_hash = Sc_rollup.Commitment.hash conflict.our_commitment in + let our_commitment_hash = + Sc_rollup.Commitment.hash_uncarbonated conflict.our_commitment + in let their_commitment_hash = - Sc_rollup.Commitment.hash conflict.their_commitment + Sc_rollup.Commitment.hash_uncarbonated conflict.their_commitment in let parent_commitment_hash = conflict.parent_commitment in let other = conflict.other in diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 97433b8a938a..717314e6cdd9 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -3233,7 +3233,7 @@ module Sc_rollup : sig val pp : Format.formatter -> t -> unit - val hash : t -> Hash.t + val hash_uncarbonated : t -> Hash.t val hash_carbonated : context -> t -> (context * Hash.t) tzresult diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml index b6bde1effef3..f6c439383730 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.ml @@ -91,7 +91,7 @@ module V1 = struct (req "predecessor" Hash.encoding) (req "number_of_ticks" Number_of_ticks.encoding)) - let hash commitment = + let hash_uncarbonated commitment = let commitment_bytes = Data_encoding.Binary.to_bytes_exn encoding commitment in diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.mli b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.mli index 53fed4aabfd9..0346e476d141 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_repr.mli @@ -64,7 +64,7 @@ module V1 : sig val encoding : t Data_encoding.t - val hash : t -> Hash.t + val hash_uncarbonated : t -> Hash.t (** [genesis_commitment ~origination_level ~genesis_state_hash] is the commitment that the protocol "publish" and "cement" when originating a new diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml b/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml index 366828a02238..e0b7f60c03ab 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml +++ b/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml @@ -877,7 +877,7 @@ let mk_sc_rollup_cement (oinfos : operation_req) (infos : infos) = (B infos.ctxt.block) (contract_of infos.accounts.source) sc_rollup - (Sc_rollup.Commitment.hash sc_dummy_commitment) + (Sc_rollup.Commitment.hash_uncarbonated sc_dummy_commitment) let mk_sc_rollup_refute (oinfos : operation_req) (infos : infos) = let open Lwt_result_syntax in @@ -944,7 +944,7 @@ let mk_sc_rollup_execute_outbox_message (oinfos : operation_req) (infos : infos) (B infos.ctxt.block) (contract_of infos.accounts.source) sc_rollup - (Sc_rollup.Commitment.hash sc_dummy_commitment) + (Sc_rollup.Commitment.hash_uncarbonated sc_dummy_commitment) ~output_proof:"" let mk_sc_rollup_return_bond (oinfos : operation_req) (infos : infos) = -- GitLab From 5806e9c6924483faf1a8753acdba929e83c2b25c Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 15 Jul 2022 17:44:57 +0200 Subject: [PATCH 6/7] Proto/SCORU: rename Sc_rollup_commitment_storage.hash_carbonated to hash. --- src/proto_alpha/lib_protocol/alpha_context.mli | 2 +- src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml | 2 +- src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli | 2 +- src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml | 4 +--- src/proto_alpha/lib_protocol/sc_rollup_storage.ml | 2 +- .../test/integration/operations/test_sc_rollup.ml | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 717314e6cdd9..35ab2c26cfa0 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -3235,7 +3235,7 @@ module Sc_rollup : sig val hash_uncarbonated : t -> Hash.t - val hash_carbonated : context -> t -> (context * Hash.t) tzresult + val hash : context -> t -> (context * Hash.t) tzresult val genesis_commitment : origination_level:Raw_level.t -> genesis_state_hash:State_hash.t -> t diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml index 1c0b1c60ac01..b6e5f1f23abc 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.ml @@ -75,7 +75,7 @@ let get_predecessor_unsafe ctxt rollup node = let* commitment, ctxt = get_commitment_unsafe ctxt rollup node in return (commitment.predecessor, ctxt) -let hash_carbonated ctxt commitment = +let hash ctxt commitment = let open Tzresult_syntax in let* ctxt = Raw_context.consume_gas diff --git a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli index f45271696ea3..95e8ae693601 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli +++ b/src/proto_alpha/lib_protocol/sc_rollup_commitment_storage.mli @@ -198,5 +198,5 @@ val get_predecessor_unsafe : (Commitment_hash.t * Raw_context.t) tzresult Lwt.t (** Hash a commitment and account for gas spent. *) -val hash_carbonated : +val hash : Raw_context.t -> Commitment.t -> (Raw_context.t * Commitment_hash.t) tzresult diff --git a/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml index 3194eaa1e15f..84c9cbfe586f 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_stake_storage.ml @@ -255,9 +255,7 @@ let refine_stake ctxt rollup staker staked_on commitment = let open Lwt_tzresult_syntax in let* lcc, ctxt = Commitment_storage.last_cemented_commitment ctxt rollup in let* ctxt = assert_refine_conditions_met ctxt rollup lcc commitment in - let*? ctxt, new_hash = - Sc_rollup_commitment_storage.hash_carbonated ctxt commitment - in + let*? ctxt, new_hash = Sc_rollup_commitment_storage.hash ctxt commitment in (* TODO: https://gitlab.com/tezos/tezos/-/issues/2559 Add a test checking that L2 nodes can catch up after going offline. *) let rec go node ctxt = diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml index b6dee2d0ec20..1f31a5a4ae16 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml @@ -32,7 +32,7 @@ module Commitment_hash = Commitment.Hash let originate ctxt ~kind ~boot_sector ~parameters_ty ~genesis_commitment = let open Lwt_tzresult_syntax in let*? ctxt, genesis_commitment_hash = - Sc_rollup_commitment_storage.hash_carbonated ctxt genesis_commitment + Sc_rollup_commitment_storage.hash ctxt genesis_commitment in let*? ctxt, nonce = Raw_context.increment_origination_nonce ctxt in let level = Raw_context.current_level ctxt in 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 ebbef40504ed..50fb11c88545 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 @@ -385,7 +385,7 @@ let originate_contract incr ~script ~baker ~storage ~source_contract = let hash_commitment incr commitment = let ctxt = Incremental.alpha_ctxt incr in let+ ctxt, hash = - wrap @@ Lwt.return (Sc_rollup.Commitment.hash_carbonated ctxt commitment) + wrap @@ Lwt.return (Sc_rollup.Commitment.hash ctxt commitment) in (Incremental.set_alpha_ctxt incr ctxt, hash) -- GitLab From ca7ec1abdec81aa3b85468a4eb4c4ec5b114c92f Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Thu, 21 Jul 2022 17:22:39 +0200 Subject: [PATCH 7/7] Tezt: update regression traces. --- ...ctionality (feature_flag_is_disabled).out | 4 +- ...ctionality (rollup_node_dal_subscript.out | 4 +- ... smart contract optimistic rollup node.out | 4 +- .../Alpha- consecutive commitments.out | 14 +++---- .../Alpha- ensure boot sector is used.out | 8 ++-- ...Alpha- get genesis info of a sc rollup.out | 4 +- ...nt hash and inbox level of a sc rollup.out | 4 +- ...ract rollup address through the client.out | 4 +- .../Alpha- list originated rollups.out | 40 +++++++++---------- ...ances PVM state with internal messages.out | 4 +- ... node advances PVM state with messages.out | 4 +- ...pha- node boots into the initial state.out | 4 +- ...ommitments in the rollup node (commitm.out | 4 +- ...ommitments in the rollup node (first_p.out | 4 +- ...ommitments in the rollup node (handles.out | 4 +- ...ommitments in the rollup node (message.out | 4 +- ...ommitments in the rollup node (no_comm.out | 4 +- ...ommitments in the rollup node (node_us.out | 4 +- ...ommitments in the rollup node (non_fin.out | 4 +- ...ommitments in the rollup node (robust_.out | 4 +- ...ce of inbox in the rollup node (basic).out | 4 +- ...f inbox in the rollup node (handles_ch.out | 4 +- ...ce of inbox in the rollup node (stops).out | 4 +- ...tegy of refutation games (inbox_proof).out | 4 +- ...efutation games (inbox_proof_at_genesi.out | 4 +- ...efutation games (inbox_proof_many_empt.out | 4 +- ...efutation games (inbox_proof_one_empty.out | 4 +- ...tegy of refutation games (pvm_proof_0).out | 4 +- ...tegy of refutation games (pvm_proof_1).out | 4 +- ...tegy of refutation games (pvm_proof_2).out | 4 +- ...tegy of refutation games (pvm_proof_3).out | 4 +- ...efutation games (pvm_proof_at_genesis).out | 4 +- ...strategy of refutation games (timeout).out | 4 +- .../Alpha- originate with boot sector.out | 4 +- ...tion of a SCORU executes without error.out | 4 +- ...ssages in the inbox - check inbox size.out | 4 +- ...s in the inbox - current messages hash.out | 4 +- 37 files changed, 99 insertions(+), 99 deletions(-) diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (feature_flag_is_disabled).out b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (feature_flag_is_disabled).out index 05f47b09ad8e..0aa872b1f5e1 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (feature_flag_is_disabled).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (feature_flag_is_disabled).out @@ -1,7 +1,7 @@ ./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: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: unit Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (rollup_node_dal_subscript.out b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (rollup_node_dal_subscript.out index bb5608070541..d6300a3dacb0 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (rollup_node_dal_subscript.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality (rollup_node_dal_subscript.out @@ -1,7 +1,7 @@ ./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: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: unit Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- configuration of a smart contract optimistic rollup node.out b/tezt/tests/expected/sc_rollup.ml/Alpha- configuration of a smart contract optimistic rollup node.out index 6f3468707429..4c959b604dc8 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- configuration of a smart contract optimistic rollup node.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- configuration of a smart contract optimistic rollup node.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- consecutive commitments.out b/tezt/tests/expected/sc_rollup.ml/Alpha- consecutive commitments.out index 1ab41503c746..c1554ec9e012 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- consecutive commitments.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- consecutive commitments.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -35,7 +35,7 @@ This sequence of operations was run: ./tezos-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SC_ROLLUP_HASH]' with compressed state scs11VNjWyZw4Tgbvsom8epQbox86S2CKkE1UAZkXMM7Pj8MQMLzMf at inbox level 32 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1 Node is bootstrapped. -Estimated gas: 5781.044 units (will add 100 for safety) +Estimated gas: 5781.683 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -61,7 +61,7 @@ This sequence of operations was run: predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 1 This smart contract rollup commitment publishing was successfully applied - Consumed gas: 5781.044 + Consumed gas: 5781.683 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 3 Balance updates: @@ -71,7 +71,7 @@ This sequence of operations was run: ./tezos-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SC_ROLLUP_HASH]' with compressed state scs11VNjWyZw4Tgbvsom8epQbox86S2CKkE1UAZkXMM7Pj8MQMLzMf at inbox level 62 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1 Node is bootstrapped. -Estimated gas: 4244.872 units (will add 100 for safety) +Estimated gas: 4245.511 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -84,7 +84,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000772 Expected counter: 3 - Gas limit: 4345 + Gas limit: 4346 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000772 @@ -97,7 +97,7 @@ This sequence of operations was run: predecessor: [SC_ROLLUP_COMMITMENT_HASH] number_of_ticks: 1 This smart contract rollup commitment publishing was successfully applied - Consumed gas: 4244.872 + Consumed gas: 4245.511 Hash of commit: [SC_ROLLUP_COMMITMENT_HASH] Commitment published at level: 4 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- ensure boot sector is used.out b/tezt/tests/expected/sc_rollup.ml/Alpha- ensure boot sector is used.out index b36cd46cb875..bdcb605c0689 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- ensure boot sector is used.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- ensure boot sector is used.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with '10 10 10 + +' --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.308 units (will add 100 for safety) +Estimated gas: 3109.947 units (will add 100 for safety) Estimated storage: 6664 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '10 10 10 + +' This smart contract rollup origination was successfully applied - Consumed gas: 3109.308 + Consumed gas: 3109.947 Storage size: 6664 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -81,7 +81,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with 31 --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.268 units (will add 100 for safety) +Estimated gas: 3109.907 units (will add 100 for safety) Estimated storage: 6654 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -104,7 +104,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '31' This smart contract rollup origination was successfully applied - Consumed gas: 3109.268 + Consumed gas: 3109.907 Storage size: 6654 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- get genesis info of a sc rollup.out b/tezt/tests/expected/sc_rollup.ml/Alpha- get genesis info of a sc rollup.out index 6f3468707429..4c959b604dc8 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- get genesis info of a sc rollup.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- get genesis info of a sc rollup.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- get last cemented commitment hash and inbox level of a sc rollup.out b/tezt/tests/expected/sc_rollup.ml/Alpha- get last cemented commitment hash and inbox level of a sc rollup.out index 6f3468707429..4c959b604dc8 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- get last cemented commitment hash and inbox level of a sc rollup.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- get last cemented commitment hash and inbox level of a sc rollup.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- getting a smart-contract rollup address through the client.out b/tezt/tests/expected/sc_rollup.ml/Alpha- getting a smart-contract rollup address through the client.out index 6f3468707429..4c959b604dc8 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- getting a smart-contract rollup address through the client.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- getting a smart-contract rollup address through the client.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- list originated rollups.out b/tezt/tests/expected/sc_rollup.ml/Alpha- list originated rollups.out index 5f70c62de3ca..5cff8dbbeb08 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- list originated rollups.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- list originated rollups.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -35,7 +35,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -58,7 +58,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -69,7 +69,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -92,7 +92,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -103,7 +103,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -126,7 +126,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -137,7 +137,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -160,7 +160,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -171,7 +171,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -194,7 +194,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -205,7 +205,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -228,7 +228,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -239,7 +239,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -262,7 +262,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -273,7 +273,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -296,7 +296,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] @@ -307,7 +307,7 @@ This sequence of operations was run: ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -330,7 +330,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with internal messages.out b/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with internal messages.out index 96b1e3fa5c56..fb51fa2758ec 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with internal messages.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with internal messages.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with messages.out b/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with messages.out index 1861a5184c5c..bd9b7565630a 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with messages.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- node advances PVM state with messages.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- node boots into the initial state.out b/tezt/tests/expected/sc_rollup.ml/Alpha- node boots into the initial state.out index 1b9f34822ae3..613ab9064cc1 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- node boots into the initial state.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- node boots into the initial state.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (commitm.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (commitm.out index 1f89335d05be..57d9029ff8d0 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (commitm.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (commitm.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (first_p.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (first_p.out index 6076dcad5f55..5f48be9179b9 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (first_p.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (first_p.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (handles.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (handles.out index 59c907b43afa..4673ebf956f7 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (handles.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (handles.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (message.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (message.out index ebf6a368bbb1..9d8e8103bfdd 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (message.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (message.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out index 719a3ebe5d13..956a73c509e5 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (node_us.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (node_us.out index 29d4ee71be8f..427cae810c2b 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (node_us.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (node_us.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (non_fin.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (non_fin.out index 7a68cb0ade56..0cb295c073cc 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (non_fin.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (non_fin.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (robust_.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (robust_.out index fe982d05b622..b4add3236dd4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (robust_.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (robust_.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (basic).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (basic).out index a27a22eb81de..bf9f00752292 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (basic).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (basic).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (handles_ch.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (handles_ch.out index ecb9c908cb87..1e2eeb737e67 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (handles_ch.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (handles_ch.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (stops).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (stops).out index 41e643b85619..45f6b433b20d 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (stops).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct maintenance of inbox in the rollup node (stops).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof).out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_at_genesi.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_at_genesi.out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_at_genesi.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_at_genesi.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_many_empt.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_many_empt.out index c8514e1c385a..01e610c368fb 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_many_empt.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_many_empt.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_one_empty.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_one_empty.out index 6099128b769e..979f4b7b0907 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_one_empty.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (inbox_proof_one_empty.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_0).out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_0).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_0).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_1).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_1).out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_1).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_1).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_2).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_2).out index b37b0852040b..e96cdffcd407 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_2).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_2).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_3).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_3).out index 13b93702c795..f20d3a5fc5a4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_3).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_3).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_at_genesis).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_at_genesis).out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_at_genesis).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (pvm_proof_at_genesis).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (timeout).out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (timeout).out index fae3d5be6044..e6e6a8133e40 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (timeout).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the winning strategy of refutation games (timeout).out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- originate with boot sector.out b/tezt/tests/expected/sc_rollup.ml/Alpha- originate with boot sector.out index 908e95e03d3f..a511f54f8a1f 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- originate with boot sector.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- originate with boot sector.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with '10 10 10 + +' --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.308 units (will add 100 for safety) +Estimated gas: 3109.947 units (will add 100 for safety) Estimated storage: 6664 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '10 10 10 + +' This smart contract rollup origination was successfully applied - Consumed gas: 3109.308 + Consumed gas: 3109.947 Storage size: 6664 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- origination of a SCORU executes without error.out index 6f3468707429..4c959b604dc8 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- origination of a SCORU executes without error.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- origination of a SCORU executes without error.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - check inbox size.out b/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - check inbox size.out index e9258c69c7f9..dfb1b838d583 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - check inbox size.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - check inbox size.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - current messages hash.out b/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - current messages hash.out index f633af4939bf..9cf0fbe74dea 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - current messages hash.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- pushing messages in the inbox - current messages hash.out @@ -1,7 +1,7 @@ ./tezos-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string booting with --burn-cap 9999999 Node is bootstrapped. -Estimated gas: 3109.260 units (will add 100 for safety) +Estimated gas: 3109.899 units (will add 100 for safety) Estimated storage: 6652 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -24,7 +24,7 @@ This sequence of operations was run: Parameter type: string Boot sector: '' This smart contract rollup origination was successfully applied - Consumed gas: 3109.260 + Consumed gas: 3109.899 Storage size: 6652 bytes Address: [SC_ROLLUP_HASH] Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] -- GitLab