From 246df56f3ce7c833e287175b977c46153fb16570 Mon Sep 17 00:00:00 2001
From: Andrea Cerone <andrea.cerone@trili.tech>
Date: Wed, 27 Apr 2022 16:43:55 +0100
Subject: [PATCH 1/3] Proto: Scoru: carbonate adding messages to inbox

---
 src/proto_alpha/lib_protocol/TEZOS_PROTOCOL   |  1 +
 src/proto_alpha/lib_protocol/dune.inc         |  5 ++
 .../lib_protocol/sc_rollup_costs.ml           | 67 +++++++++++++++++++
 .../lib_protocol/sc_rollup_costs.mli          | 44 ++++++++++++
 .../lib_protocol/sc_rollup_storage.ml         | 41 +++++++++++-
 .../lib_protocol/sc_rollup_storage.mli        | 12 ++++
 6 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100644 src/proto_alpha/lib_protocol/sc_rollup_costs.ml
 create mode 100644 src/proto_alpha/lib_protocol/sc_rollup_costs.mli

diff --git a/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL
index d081d208e5a4..aa94befd82c5 100644
--- a/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL
+++ b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL
@@ -130,6 +130,7 @@
         "Tx_rollup_inbox_storage",
         "Tx_rollup_commitment_storage",
         "Tx_rollup_storage",
+        "Sc_rollup_costs",
         "Sc_rollup_storage",
 
         "Alpha_context",
diff --git a/src/proto_alpha/lib_protocol/dune.inc b/src/proto_alpha/lib_protocol/dune.inc
index 245068049405..28ea03cd669b 100644
--- a/src/proto_alpha/lib_protocol/dune.inc
+++ b/src/proto_alpha/lib_protocol/dune.inc
@@ -148,6 +148,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
    tx_rollup_inbox_storage.mli tx_rollup_inbox_storage.ml
    tx_rollup_commitment_storage.mli tx_rollup_commitment_storage.ml
    tx_rollup_storage.mli tx_rollup_storage.ml
+   sc_rollup_costs.mli sc_rollup_costs.ml
    sc_rollup_storage.mli sc_rollup_storage.ml
    alpha_context.mli alpha_context.ml
    script_string.mli script_string.ml
@@ -336,6 +337,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
    tx_rollup_inbox_storage.mli tx_rollup_inbox_storage.ml
    tx_rollup_commitment_storage.mli tx_rollup_commitment_storage.ml
    tx_rollup_storage.mli tx_rollup_storage.ml
+   sc_rollup_costs.mli sc_rollup_costs.ml
    sc_rollup_storage.mli sc_rollup_storage.ml
    alpha_context.mli alpha_context.ml
    script_string.mli script_string.ml
@@ -524,6 +526,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
    tx_rollup_inbox_storage.mli tx_rollup_inbox_storage.ml
    tx_rollup_commitment_storage.mli tx_rollup_commitment_storage.ml
    tx_rollup_storage.mli tx_rollup_storage.ml
+   sc_rollup_costs.mli sc_rollup_costs.ml
    sc_rollup_storage.mli sc_rollup_storage.ml
    alpha_context.mli alpha_context.ml
    script_string.mli script_string.ml
@@ -734,6 +737,7 @@ include Tezos_raw_protocol_alpha.Main
    Tx_rollup_inbox_storage
    Tx_rollup_commitment_storage
    Tx_rollup_storage
+   Sc_rollup_costs
    Sc_rollup_storage
    Alpha_context
    Script_string
@@ -963,6 +967,7 @@ include Tezos_raw_protocol_alpha.Main
    tx_rollup_inbox_storage.mli tx_rollup_inbox_storage.ml
    tx_rollup_commitment_storage.mli tx_rollup_commitment_storage.ml
    tx_rollup_storage.mli tx_rollup_storage.ml
+   sc_rollup_costs.mli sc_rollup_costs.ml
    sc_rollup_storage.mli sc_rollup_storage.ml
    alpha_context.mli alpha_context.ml
    script_string.mli script_string.ml
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.ml b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml
new file mode 100644
index 000000000000..6d03f9fc37df
--- /dev/null
+++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.ml
@@ -0,0 +1,67 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* Open Source License                                                       *)
+(* Copyright (c) 2022 Trili Tech, <contact@trili.tech>                       *)
+(*                                                                           *)
+(* Permission is hereby granted, free of charge, to any person obtaining a   *)
+(* copy of this software and associated documentation files (the "Software"),*)
+(* to deal in the Software without restriction, including without limitation *)
+(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
+(* and/or sell copies of the Software, and to permit persons to whom the     *)
+(* Software is furnished to do so, subject to the following conditions:      *)
+(*                                                                           *)
+(* The above copyright notice and this permission notice shall be included   *)
+(* in all copies or substantial portions of the Software.                    *)
+(*                                                                           *)
+(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
+(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
+(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
+(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
+(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
+(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
+(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*                                                                           *)
+(*****************************************************************************)
+
+module S = Saturation_repr
+
+module S_syntax = struct
+  let log2 x = S.safe_int (1 + S.numbits x)
+
+  let ( + ) = S.add
+
+  let ( * ) = S.mul
+end
+
+module Constants = struct
+  (* TODO: https://gitlab.com/tezos/tezos/-/issues/2648
+     Fill in real benchmarked values.
+     Need to create benchmark and fill in values.
+  *)
+  let cost_add_message_base = S.safe_int 430
+
+  let cost_add_message_per_byte = S.safe_int 15
+
+  let cost_add_inbox_per_level = S.safe_int 15
+
+  let cost_update_num_and_size_of_messages = S.safe_int 15
+end
+
+(* We assume that the gas cost of adding messages [[ m_1; ... ; m_n]] at level
+  [l] is linear in the sum of lengths of the messages, and it is logarithmic 
+  in [l]. That is, [cost_add_messages([m_1; .. ; m_n], l)] = 
+  `n * cost_add_message_base + 
+   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 =
+    if Int32.equal l Int32.zero then Saturation_repr.safe_int 0
+    else log2 @@ S.safe_int (Int32.to_int l)
+  in
+  let level_cost = log_level * Constants.cost_add_inbox_per_level in
+  (S.safe_int num_messages * Constants.cost_add_message_base)
+  + level_cost
+  + (Constants.cost_add_message_per_byte * S.safe_int total_messages_size)
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_costs.mli b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli
new file mode 100644
index 000000000000..5bdaff920672
--- /dev/null
+++ b/src/proto_alpha/lib_protocol/sc_rollup_costs.mli
@@ -0,0 +1,44 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* Open Source License                                                       *)
+(* Copyright (c) 2022 Trili Tech, <contact@trili.tech>                       *)
+(*                                                                           *)
+(* Permission is hereby granted, free of charge, to any person obtaining a   *)
+(* copy of this software and associated documentation files (the "Software"),*)
+(* to deal in the Software without restriction, including without limitation *)
+(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
+(* and/or sell copies of the Software, and to permit persons to whom the     *)
+(* Software is furnished to do so, subject to the following conditions:      *)
+(*                                                                           *)
+(* The above copyright notice and this permission notice shall be included   *)
+(* in all copies or substantial portions of the Software.                    *)
+(*                                                                           *)
+(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
+(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
+(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
+(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
+(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
+(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
+(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*                                                                           *)
+(*****************************************************************************)
+
+(** This module contains constants and utility functions for gas metering
+    functions used when handling SC rollups operations in context. *)
+
+module Constants : sig
+  val cost_add_message_base : Gas_limit_repr.cost
+
+  val cost_add_message_per_byte : Gas_limit_repr.cost
+
+  val cost_add_inbox_per_level : Gas_limit_repr.cost
+
+  val cost_update_num_and_size_of_messages : Gas_limit_repr.cost
+end
+
+(** [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 
+    function is used internally in the [Sc_rollup_storage] module. *)
+val cost_add_messages :
+  num_messages:int -> total_messages_size:int -> int32 -> Gas_limit_repr.cost
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
index 7fd702c860a7..c3f26c51001c 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
+++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
@@ -213,6 +213,12 @@ module Store = Storage.Sc_rollup
 module Commitment = Sc_rollup_repr.Commitment
 module Commitment_hash = Sc_rollup_repr.Commitment_hash
 
+module Internal = struct
+  let update_num_and_size_of_messages ~num_messages ~total_messages_size message
+      =
+    (num_messages + 1, total_messages_size + String.length message)
+end
+
 let originate ctxt ~kind ~boot_sector =
   Raw_context.increment_origination_nonce ctxt >>?= fun (ctxt, nonce) ->
   let level = Raw_context.current_level ctxt in
@@ -278,16 +284,45 @@ let assert_inbox_size_ok ctxt next_size =
 let add_messages ctxt rollup messages =
   let open Lwt_tzresult_syntax in
   let open Raw_context in
-  inbox ctxt rollup >>=? fun (inbox, ctxt) ->
+  let* (inbox, ctxt) = inbox ctxt rollup in
+  let* (num_messages, total_messages_size, ctxt) =
+    List.fold_left_es
+      (fun (num_messages, total_messages_size, ctxt) message ->
+        let*? ctxt =
+          Raw_context.consume_gas
+            ctxt
+            Sc_rollup_costs.Constants.cost_update_num_and_size_of_messages
+        in
+        let (num_messages, total_messages_size) =
+          Internal.update_num_and_size_of_messages
+            ~num_messages
+            ~total_messages_size
+            message
+        in
+        return (num_messages, total_messages_size, ctxt))
+      (0, 0, ctxt)
+      messages
+  in
   let next_size =
     Z.add
       (Sc_rollup_inbox_repr.number_of_available_messages inbox)
-      (Z.of_int (List.length messages))
+      (Z.of_int num_messages)
+  in
+  let* () = assert_inbox_size_ok ctxt next_size in
+  let inbox_level = Sc_rollup_inbox_repr.inbox_level inbox in
+  let* origination_level = Storage.Sc_rollup.Initial_level.get ctxt rollup in
+  let levels =
+    Int32.sub
+      (Raw_level_repr.to_int32 inbox_level)
+      (Raw_level_repr.to_int32 origination_level)
   in
-  assert_inbox_size_ok ctxt next_size >>=? fun () ->
   let*? (current_messages, ctxt) =
     Sc_rollup_in_memory_inbox.current_messages ctxt rollup
   in
+  let gas_cost_add_messages =
+    Sc_rollup_costs.cost_add_messages ~num_messages ~total_messages_size levels
+  in
+  let*? ctxt = Raw_context.consume_gas ctxt gas_cost_add_messages in
   let {Level_repr.level; _} = Raw_context.current_level ctxt in
   (*
       Notice that the protocol is forgetful: it throws away the inbox
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
index 35543979aba6..0e574dcdd953 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
+++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
@@ -141,6 +141,18 @@ type error +=
   | (* `Temporary *)
       Sc_rollup_bad_inbox_level
 
+(** Module [Internal] implements functions that are used only internally by
+    the [Sc_rollup_storage] module, but need to be exposed in tests or 
+    benchmarks. 
+  *)
+module Internal : sig
+  (** [update_num_and_size_of_messages ~num_messages ~total_messages_size 
+       message] returns the length and total messages size
+      [messages]. *)
+  val update_num_and_size_of_messages :
+    num_messages:int -> total_messages_size:int -> string -> int * int
+end
+
 (** [originate context ~kind ~boot_sector] produces an address [a] for
    a smart contract rollup using the origination nonce found in
    [context]. This function also initializes the storage with a new
-- 
GitLab


From a09fd764f382c21c40694179de3703ef195c0f2f Mon Sep 17 00:00:00 2001
From: Andrea Cerone <andrea.cerone@trili.tech>
Date: Wed, 27 Apr 2022 16:46:23 +0100
Subject: [PATCH 2/3] Benchmarks: Scoru: carbonate adding messages to inbox

---
 src/lib_benchmark/model.ml                    |  21 ++
 .../sc_rollup_benchmarks.ml                   | 275 ++++++++++++++++++
 2 files changed, 296 insertions(+)
 create mode 100644 src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml

diff --git a/src/lib_benchmark/model.ml b/src/lib_benchmark/model.ml
index 27466c536b0a..86c504a0082e 100644
--- a/src/lib_benchmark/model.ml
+++ b/src/lib_benchmark/model.ml
@@ -459,6 +459,27 @@ let nlogm ~intercept ~coeff =
   end in
   (module M : Model_impl with type arg_type = int * (int * unit))
 
+let n_plus_logm ~intercept ~linear_coeff ~log_coeff =
+  let module M = struct
+    type arg_type = int * (int * unit)
+
+    module Def (X : Costlang.S) = struct
+      open X
+
+      type model_type = size -> size -> size
+
+      let arity = arity_2
+
+      let model =
+        lam ~name:"size1" @@ fun size1 ->
+        lam ~name:"size2" @@ fun size2 ->
+        free ~name:intercept
+        + (free ~name:linear_coeff * size1)
+        + (free ~name:log_coeff * log2 (int 1 + size2))
+    end
+  end in
+  (module M : Model_impl with type arg_type = int * (int * unit))
+
 let trilinear ~coeff1 ~coeff2 ~coeff3 =
   let module M = struct
     type arg_type = int * (int * (int * unit))
diff --git a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml
new file mode 100644
index 000000000000..0a6aec9e6696
--- /dev/null
+++ b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml
@@ -0,0 +1,275 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* Open Source License                                                       *)
+(* Copyright (c) 2022 Trili Tech, <contact@trili.com>                        *)
+(*                                                                           *)
+(* Permission is hereby granted, free of charge, to any person obtaining a   *)
+(* copy of this software and associated documentation files (the "Software"),*)
+(* to deal in the Software without restriction, including without limitation *)
+(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
+(* and/or sell copies of the Software, and to permit persons to whom the     *)
+(* Software is furnished to do so, subject to the following conditions:      *)
+(*                                                                           *)
+(* The above copyright notice and this permission notice shall be included   *)
+(* in all copies or substantial portions of the Software.                    *)
+(*                                                                           *)
+(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
+(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
+(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
+(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
+(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
+(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
+(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*                                                                           *)
+(*****************************************************************************)
+
+open Protocol
+
+(** A benchmark for estimating the gas cost of 
+    {!Sc_rollup_costs.Constants.cost_update_num_and_size_of_messages}. This 
+    value is used to consume the gas cost internally in 
+    [Sc_rollup_storage.add_messages], when computing the number of messages
+    and their totla size in bytes to be added to an inbox.
+*)
+
+module Sc_rollup_update_num_and_size_of_messages_benchmark = struct
+  let name = "Sc_rollup_update_num_and_size_of_messages"
+
+  let info =
+    "Estimating the cost of updating the number and total size of messages \
+     when adding a message to a sc_rollup inbox"
+
+  let tags = ["scoru"]
+
+  type config = {
+    max_num_messages : int;
+    max_messages_size : int;
+    max_new_message_size : int;
+  }
+
+  let config_encoding =
+    let open Data_encoding in
+    conv
+      (fun {max_num_messages; max_messages_size; max_new_message_size} ->
+        (max_num_messages, max_messages_size, max_new_message_size))
+      (fun (max_num_messages, max_messages_size, max_new_message_size) ->
+        {max_num_messages; max_messages_size; max_new_message_size})
+      (obj3
+         (req "max_num_of_messages" int31)
+         (req "max_messages_size" int31)
+         (req "max_new_message_size" int31))
+
+  let default_config =
+    {
+      max_num_messages = 100;
+      max_messages_size = 1000;
+      max_new_message_size = 100;
+    }
+
+  type workload = unit
+
+  let workload_encoding = Data_encoding.unit
+
+  let workload_to_vector () = Sparse_vec.String.of_list []
+
+  let cost_update_num_and_size_ofmessages_model =
+    Model.make
+      ~conv:(fun () -> ())
+      ~model:
+        (Model.unknown_const2
+           ~const1:Builtin_benchmarks.timer_variable
+           ~const2:
+             (Free_variable.of_string "cost_update_num_and_size_of_messages"))
+
+  let models = [("scoru", cost_update_num_and_size_ofmessages_model)]
+
+  let benchmark rng_state conf () =
+    let num_messages =
+      Base_samplers.sample_in_interval
+        ~range:{min = 0; max = conf.max_num_messages}
+        rng_state
+    in
+    let total_messages_size =
+      Base_samplers.sample_in_interval
+        ~range:{min = 0; max = conf.max_messages_size}
+        rng_state
+    in
+    let new_message_size =
+      Base_samplers.sample_in_interval
+        ~range:{min = 0; max = conf.max_new_message_size}
+        rng_state
+    in
+    let new_message =
+      Base_samplers.uniform_string ~nbytes:new_message_size rng_state
+    in
+    let workload = () in
+    let closure () =
+      ignore
+        (Sc_rollup_storage.Internal.update_num_and_size_of_messages
+           ~num_messages
+           ~total_messages_size
+           new_message)
+    in
+    Generator.Plain {workload; closure}
+
+  let create_benchmarks ~rng_state ~bench_num config =
+    List.repeat bench_num (benchmark rng_state config)
+
+  let () =
+    Registration.register_for_codegen
+      name
+      (Model.For_codegen cost_update_num_and_size_ofmessages_model)
+end
+
+(** A benchmark for estimating the gas cost of {!Sc_rollup.Inbox.add_messages}.
+    We assume that the cost (in gas) `cost(n, l)` of adding a message of size
+    [n] bytes, at level [l] since the origination of the rollup, satisfies the
+    equation `cost(n) = c_0 + c_1 * n + c_2 * log(l)`, where `c_0`, `c_1` and 
+    `c_2` are the values to be benchmarked. We also assume that the cost of 
+    adding messages `m_0, ..., m_k` to a rollup inbox is 
+    `\sum_{i=0}^{k} cost(|m_i|, l)`. Thus, it suffices to estimate the cost of 
+    adding a single message to the inbox.
+*)
+
+module Sc_rollup_add_messages_benchmark = struct
+  let name = "Sc_rollup_inbox_add_message"
+
+  let info = "Estimating the costs of adding a single message to a rollup inbox"
+
+  let tags = ["scoru"]
+
+  type config = {max_length : int; max_level : int}
+
+  let config_encoding =
+    let open Data_encoding in
+    conv
+      (fun {max_length; max_level} -> (max_length, max_level))
+      (fun (max_length, max_level) -> {max_length; max_level})
+      (obj2 (req "max_bytes" int31) (req "max_level" int31))
+
+  let default_config = {max_length = 1 lsl 16; max_level = 255}
+
+  type workload = {message_length : int; level : int}
+
+  let workload_encoding =
+    let open Data_encoding in
+    conv
+      (fun {message_length; level} -> (message_length, level))
+      (fun (message_length, level) -> {message_length; level})
+      (obj2 (req "message_length" int31) (req "inbox_level" int31))
+
+  let workload_to_vector {message_length; level} =
+    Sparse_vec.String.of_list
+      [
+        ("message_length", float_of_int message_length);
+        ("inbox_level", float_of_int level);
+      ]
+
+  let add_message_model =
+    Model.make
+      ~conv:(fun {message_length; level} -> (message_length, (level, ())))
+      ~model:
+        (Model.n_plus_logm
+           ~intercept:(Free_variable.of_string "cost_add_message_intercept")
+           ~linear_coeff:(Free_variable.of_string "cost_add_message_per_byte")
+           ~log_coeff:(Free_variable.of_string "cost_add_message_per_level"))
+
+  let models = [("scoru", add_message_model)]
+
+  let benchmark rng_state conf () =
+    let message =
+      Base_samplers.string rng_state ~size:{min = 1; max = conf.max_length}
+    in
+    let last_level_int =
+      Base_samplers.sample_in_interval
+        ~range:{min = 1; max = conf.max_level}
+        rng_state
+    in
+    let last_level =
+      Raw_level_repr.of_int32_exn (Int32.of_int last_level_int)
+    in
+    let message_length = String.length message in
+
+    let new_ctxt =
+      let open Lwt_result_syntax in
+      let* (block, _) = Context.init1 () in
+      let+ b = Incremental.begin_construction block in
+      let state = Incremental.validation_state b in
+      let ctxt = state.ctxt in
+      (* Necessary to originate rollups. *)
+      let ctxt =
+        Alpha_context.Origination_nonce.init ctxt Operation_hash.zero
+      in
+      Alpha_context.Internal_for_tests.to_raw ctxt
+    in
+
+    let ctxt_with_rollup =
+      let open Lwt_result_syntax in
+      let* ctxt = new_ctxt in
+      let+ (rollup, _size, ctxt) =
+        Lwt.map Environment.wrap_tzresult
+        @@ Sc_rollup_storage.originate ctxt ~kind:Example_arith ~boot_sector:""
+      in
+      (rollup, ctxt)
+    in
+
+    let add_message_and_increment_level ctxt rollup =
+      let open Lwt_result_syntax in
+      let+ (inbox, _, ctxt) =
+        Lwt.map Environment.wrap_tzresult
+        @@ Sc_rollup_storage.add_messages ctxt rollup ["CAFEBABE"]
+      in
+      let ctxt = Raw_context.Internal_for_tests.add_level ctxt 1 in
+      (inbox, ctxt)
+    in
+
+    let prepare_benchmark_scenario () =
+      let open Lwt_result_syntax in
+      let rec add_messages_for_level ctxt inbox rollup =
+        if Raw_level_repr.((Raw_context.current_level ctxt).level > last_level)
+        then return (inbox, ctxt)
+        else
+          let* (inbox, ctxt) = add_message_and_increment_level ctxt rollup in
+          add_messages_for_level ctxt inbox rollup
+      in
+      let* (rollup, ctxt) = ctxt_with_rollup in
+      let inbox =
+        Sc_rollup_inbox_repr.empty rollup (Raw_context.current_level ctxt).level
+      in
+      let* (inbox, ctxt) = add_messages_for_level ctxt inbox rollup in
+      let+ (messages, _ctxt) =
+        Lwt.return @@ Environment.wrap_tzresult
+        @@ Raw_context.Sc_rollup_in_memory_inbox.current_messages ctxt rollup
+      in
+      (inbox, messages)
+    in
+
+    let (inbox, current_messages) =
+      match Lwt_main.run @@ prepare_benchmark_scenario () with
+      | Ok result -> result
+      | Error _ -> assert false
+    in
+
+    let workload = {message_length; level = last_level_int} in
+    let closure () =
+      ignore
+        (Sc_rollup_inbox_repr.add_messages_no_history
+           inbox
+           last_level
+           [message]
+           current_messages)
+    in
+    Generator.Plain {workload; closure}
+
+  let create_benchmarks ~rng_state ~bench_num config =
+    List.repeat bench_num (benchmark rng_state config)
+
+  let () =
+    Registration.register_for_codegen name (Model.For_codegen add_message_model)
+end
+
+let () = Registration_helpers.register (module Sc_rollup_add_messages_benchmark)
+
+let () =
+  Registration_helpers.register
+    (module Sc_rollup_update_num_and_size_of_messages_benchmark)
-- 
GitLab


From e77950981486c9045242774b2f9b769b62552909 Mon Sep 17 00:00:00 2001
From: Andrea Cerone <andrea.cerone@trili.tech>
Date: Wed, 27 Apr 2022 16:47:01 +0100
Subject: [PATCH 3/3] Tezt: reset regressions for sc_rollup

---
 ...nt_of_rollup_node_commitment_is_stored.out | 154 +++++++++---------
 ...nt_of_rollup_node_handles_chain_reorgs.out |   6 +-
 ...mmitment_of_rollup_node_messages_reset.out | 154 +++++++++---------
 ...mitment_of_rollup_node_non_final_level.out | 154 +++++++++---------
 .../sc_rollup_inbox_current_messages_hash.out |  16 +-
 .../sc_rollup_inbox_of_rollup_node_basic.out  |  10 +-
 ...box_of_rollup_node_handles_chain_reorg.out |  18 +-
 .../sc_rollup_inbox_of_rollup_node_stops.out  |  22 +--
 tezt/_regressions/sc_rollup_inbox_size.out    |  58 +++----
 .../sc_rollup_node_advances_pvm_state.out     |  60 +++----
 10 files changed, 326 insertions(+), 326 deletions(-)

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 846a5b25d80a..c15883378405 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
@@ -35,7 +35,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -55,7 +55,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -72,7 +72,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -85,14 +85,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -110,7 +110,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.148 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -123,14 +123,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000481
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000481
       payload fees(the block proposer) ....... +ꜩ0.000481
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1653.148
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -148,7 +148,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.713 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -161,14 +161,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000493
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000493
       payload fees(the block proposer) ....... +ꜩ0.000493
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1653.841
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -187,7 +187,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1654.485 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -200,14 +200,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000505
     Expected counter: 6
-    Gas limit: 1752
+    Gas limit: 1755
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000505
       payload fees(the block proposer) ....... +ꜩ0.000505
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1654.485
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -226,7 +226,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.050 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -239,14 +239,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000517
     Expected counter: 7
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000517
       payload fees(the block proposer) ....... +ꜩ0.000517
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.050
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -265,7 +265,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.615 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -278,14 +278,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000529
     Expected counter: 8
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000529
       payload fees(the block proposer) ....... +ꜩ0.000529
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.615
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -304,7 +304,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1656.180 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -317,14 +317,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000541
     Expected counter: 9
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000541
       payload fees(the block proposer) ....... +ꜩ0.000541
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.728
+      Consumed gas: 1656.308
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -344,7 +344,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1656.952 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -357,14 +357,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000553
     Expected counter: 10
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000553
       payload fees(the block proposer) ....... +ꜩ0.000553
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1656.952
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -384,7 +384,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1657.517 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -397,14 +397,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000565
     Expected counter: 11
-    Gas limit: 1752
+    Gas limit: 1758
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000565
       payload fees(the block proposer) ....... +ꜩ0.000565
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1657.517
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
@@ -424,7 +424,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.082 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -437,14 +437,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000577
     Expected counter: 12
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000577
       payload fees(the block proposer) ....... +ꜩ0.000577
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.082
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 13
@@ -464,7 +464,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.647 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -477,14 +477,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000589
     Expected counter: 13
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000589
       payload fees(the block proposer) ....... +ꜩ0.000589
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.647
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 14
@@ -504,7 +504,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.212 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -517,14 +517,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000601
     Expected counter: 14
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000601
       payload fees(the block proposer) ....... +ꜩ0.000601
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.212
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 15
@@ -544,7 +544,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.777 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -557,14 +557,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000613
     Expected counter: 15
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000613
       payload fees(the block proposer) ....... +ꜩ0.000613
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.777
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 16
@@ -584,7 +584,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.342 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -595,16 +595,16 @@ 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.000625
+    Fee to the baker: ꜩ0.000626
     Expected counter: 16
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000625
-      payload fees(the block proposer) ....... +ꜩ0.000625
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000626
+      payload fees(the block proposer) ....... +ꜩ0.000626
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1660.342
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 17
@@ -624,7 +624,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.907 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -635,16 +635,16 @@ 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.000637
+    Fee to the baker: ꜩ0.000638
     Expected counter: 17
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000637
-      payload fees(the block proposer) ....... +ꜩ0.000637
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000638
+      payload fees(the block proposer) ....... +ꜩ0.000638
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.920
+      Consumed gas: 1661.035
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 18
@@ -665,7 +665,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1661.679 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -676,16 +676,16 @@ 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.000649
+    Fee to the baker: ꜩ0.00065
     Expected counter: 18
-    Gas limit: 1752
+    Gas limit: 1762
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00065
+      payload fees(the block proposer) ....... +ꜩ0.00065
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1661.679
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 19
@@ -706,7 +706,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.244 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -717,16 +717,16 @@ 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.000661
+    Fee to the baker: ꜩ0.000662
     Expected counter: 19
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000661
-      payload fees(the block proposer) ....... +ꜩ0.000661
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000662
+      payload fees(the block proposer) ....... +ꜩ0.000662
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.244
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 20
@@ -747,7 +747,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.809 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -758,16 +758,16 @@ 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.000673
+    Fee to the baker: ꜩ0.000674
     Expected counter: 20
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000673
-      payload fees(the block proposer) ....... +ꜩ0.000673
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000674
+      payload fees(the block proposer) ....... +ꜩ0.000674
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.809
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 21
@@ -788,7 +788,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1663.374 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -799,16 +799,16 @@ 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.000685
+    Fee to the baker: ꜩ0.000686
     Expected counter: 21
-    Gas limit: 1752
+    Gas limit: 1764
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000685
-      payload fees(the block proposer) ....... +ꜩ0.000685
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000686
+      payload fees(the block proposer) ....... +ꜩ0.000686
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1663.374
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 22
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 2bb08097092a..e8ce16eb5df9 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
@@ -35,7 +35,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.664 units (will add 100 for safety)
+Estimated gas: 1652.229 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,14 +48,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000457
     Expected counter: 2
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000457
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.664
+      Consumed gas: 1652.229
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 22
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 30136c3f4b76..23bf873660e9 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
@@ -35,7 +35,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -55,7 +55,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -72,7 +72,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -85,14 +85,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -110,7 +110,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.148 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -123,14 +123,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000481
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000481
       payload fees(the block proposer) ....... +ꜩ0.000481
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1653.148
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -148,7 +148,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.713 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -161,14 +161,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000493
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000493
       payload fees(the block proposer) ....... +ꜩ0.000493
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1653.841
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -187,7 +187,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1654.485 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -200,14 +200,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000505
     Expected counter: 6
-    Gas limit: 1752
+    Gas limit: 1755
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000505
       payload fees(the block proposer) ....... +ꜩ0.000505
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1654.485
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -226,7 +226,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.050 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -239,14 +239,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000517
     Expected counter: 7
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000517
       payload fees(the block proposer) ....... +ꜩ0.000517
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.050
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -265,7 +265,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.615 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -278,14 +278,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000529
     Expected counter: 8
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000529
       payload fees(the block proposer) ....... +ꜩ0.000529
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.615
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -304,7 +304,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1656.180 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -317,14 +317,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000541
     Expected counter: 9
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000541
       payload fees(the block proposer) ....... +ꜩ0.000541
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.728
+      Consumed gas: 1656.308
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -344,7 +344,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1656.952 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -357,14 +357,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000553
     Expected counter: 10
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000553
       payload fees(the block proposer) ....... +ꜩ0.000553
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1656.952
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -384,7 +384,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1657.517 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -397,14 +397,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000565
     Expected counter: 11
-    Gas limit: 1752
+    Gas limit: 1758
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000565
       payload fees(the block proposer) ....... +ꜩ0.000565
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1657.517
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
@@ -424,7 +424,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.082 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -437,14 +437,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000577
     Expected counter: 12
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000577
       payload fees(the block proposer) ....... +ꜩ0.000577
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.082
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 13
@@ -464,7 +464,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.647 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -477,14 +477,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000589
     Expected counter: 13
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000589
       payload fees(the block proposer) ....... +ꜩ0.000589
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.647
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 14
@@ -504,7 +504,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.212 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -517,14 +517,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000601
     Expected counter: 14
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000601
       payload fees(the block proposer) ....... +ꜩ0.000601
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.212
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 15
@@ -544,7 +544,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.777 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -557,14 +557,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000613
     Expected counter: 15
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000613
       payload fees(the block proposer) ....... +ꜩ0.000613
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.777
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 16
@@ -584,7 +584,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.342 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -595,16 +595,16 @@ 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.000625
+    Fee to the baker: ꜩ0.000626
     Expected counter: 16
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000625
-      payload fees(the block proposer) ....... +ꜩ0.000625
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000626
+      payload fees(the block proposer) ....... +ꜩ0.000626
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1660.342
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 17
@@ -624,7 +624,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.907 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -635,16 +635,16 @@ 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.000637
+    Fee to the baker: ꜩ0.000638
     Expected counter: 17
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000637
-      payload fees(the block proposer) ....... +ꜩ0.000637
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000638
+      payload fees(the block proposer) ....... +ꜩ0.000638
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.920
+      Consumed gas: 1661.035
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 18
@@ -665,7 +665,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1661.679 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -676,16 +676,16 @@ 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.000649
+    Fee to the baker: ꜩ0.00065
     Expected counter: 18
-    Gas limit: 1752
+    Gas limit: 1762
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00065
+      payload fees(the block proposer) ....... +ꜩ0.00065
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1661.679
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 19
@@ -706,7 +706,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.244 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -717,16 +717,16 @@ 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.000661
+    Fee to the baker: ꜩ0.000662
     Expected counter: 19
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000661
-      payload fees(the block proposer) ....... +ꜩ0.000661
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000662
+      payload fees(the block proposer) ....... +ꜩ0.000662
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.244
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 20
@@ -747,7 +747,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.809 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -758,16 +758,16 @@ 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.000673
+    Fee to the baker: ꜩ0.000674
     Expected counter: 20
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000673
-      payload fees(the block proposer) ....... +ꜩ0.000673
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000674
+      payload fees(the block proposer) ....... +ꜩ0.000674
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.809
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 21
@@ -788,7 +788,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1663.374 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -799,16 +799,16 @@ 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.000685
+    Fee to the baker: ꜩ0.000686
     Expected counter: 21
-    Gas limit: 1752
+    Gas limit: 1764
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000685
-      payload fees(the block proposer) ....... +ꜩ0.000685
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000686
+      payload fees(the block proposer) ....... +ꜩ0.000686
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1663.374
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 22
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 7dd89df2e587..16c07c1bae87 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
@@ -35,7 +35,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -55,7 +55,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -72,7 +72,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -85,14 +85,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -110,7 +110,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.148 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -123,14 +123,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000481
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000481
       payload fees(the block proposer) ....... +ꜩ0.000481
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1653.148
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -148,7 +148,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.713 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -161,14 +161,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000493
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000493
       payload fees(the block proposer) ....... +ꜩ0.000493
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1653.841
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -187,7 +187,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1654.485 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -200,14 +200,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000505
     Expected counter: 6
-    Gas limit: 1752
+    Gas limit: 1755
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000505
       payload fees(the block proposer) ....... +ꜩ0.000505
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1654.485
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -226,7 +226,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.050 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -239,14 +239,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000517
     Expected counter: 7
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000517
       payload fees(the block proposer) ....... +ꜩ0.000517
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.050
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -265,7 +265,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.615 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -278,14 +278,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000529
     Expected counter: 8
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000529
       payload fees(the block proposer) ....... +ꜩ0.000529
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.615
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -304,7 +304,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1656.180 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -317,14 +317,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000541
     Expected counter: 9
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000541
       payload fees(the block proposer) ....... +ꜩ0.000541
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.728
+      Consumed gas: 1656.308
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -344,7 +344,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1656.952 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -357,14 +357,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000553
     Expected counter: 10
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000553
       payload fees(the block proposer) ....... +ꜩ0.000553
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1656.952
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -384,7 +384,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1657.517 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -397,14 +397,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000565
     Expected counter: 11
-    Gas limit: 1752
+    Gas limit: 1758
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000565
       payload fees(the block proposer) ....... +ꜩ0.000565
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1657.517
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
@@ -424,7 +424,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.082 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -437,14 +437,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000577
     Expected counter: 12
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000577
       payload fees(the block proposer) ....... +ꜩ0.000577
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.082
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 13
@@ -464,7 +464,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1658.647 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -477,14 +477,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000589
     Expected counter: 13
-    Gas limit: 1752
+    Gas limit: 1759
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000589
       payload fees(the block proposer) ....... +ꜩ0.000589
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1658.647
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 14
@@ -504,7 +504,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.212 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -517,14 +517,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000601
     Expected counter: 14
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000601
       payload fees(the block proposer) ....... +ꜩ0.000601
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.212
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 15
@@ -544,7 +544,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1659.777 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -557,14 +557,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000613
     Expected counter: 15
-    Gas limit: 1752
+    Gas limit: 1760
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000613
       payload fees(the block proposer) ....... +ꜩ0.000613
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1659.777
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 16
@@ -584,7 +584,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.342 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -595,16 +595,16 @@ 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.000625
+    Fee to the baker: ꜩ0.000626
     Expected counter: 16
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000625
-      payload fees(the block proposer) ....... +ꜩ0.000625
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000626
+      payload fees(the block proposer) ....... +ꜩ0.000626
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1660.342
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 17
@@ -624,7 +624,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1660.907 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -635,16 +635,16 @@ 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.000637
+    Fee to the baker: ꜩ0.000638
     Expected counter: 17
-    Gas limit: 1752
+    Gas limit: 1761
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000637
-      payload fees(the block proposer) ....... +ꜩ0.000637
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000638
+      payload fees(the block proposer) ....... +ꜩ0.000638
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.920
+      Consumed gas: 1661.035
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 18
@@ -665,7 +665,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1661.679 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -676,16 +676,16 @@ 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.000649
+    Fee to the baker: ꜩ0.00065
     Expected counter: 18
-    Gas limit: 1752
+    Gas limit: 1762
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00065
+      payload fees(the block proposer) ....... +ꜩ0.00065
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1661.679
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 19
@@ -706,7 +706,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.244 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -717,16 +717,16 @@ 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.000661
+    Fee to the baker: ꜩ0.000662
     Expected counter: 19
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000661
-      payload fees(the block proposer) ....... +ꜩ0.000661
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000662
+      payload fees(the block proposer) ....... +ꜩ0.000662
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.244
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 20
@@ -747,7 +747,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1662.809 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -758,16 +758,16 @@ 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.000673
+    Fee to the baker: ꜩ0.000674
     Expected counter: 20
-    Gas limit: 1752
+    Gas limit: 1763
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000673
-      payload fees(the block proposer) ....... +ꜩ0.000673
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000674
+      payload fees(the block proposer) ....... +ꜩ0.000674
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1662.809
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 21
@@ -788,7 +788,7 @@ This sequence of operations was run:
 
 ./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"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.984 units (will add 100 for safety)
+Estimated gas: 1663.374 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -799,16 +799,16 @@ 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.000685
+    Fee to the baker: ꜩ0.000686
     Expected counter: 21
-    Gas limit: 1752
+    Gas limit: 1764
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000685
-      payload fees(the block proposer) ....... +ꜩ0.000685
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000686
+      payload fees(the block proposer) ....... +ꜩ0.000686
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.984
+      Consumed gas: 1663.374
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 22
diff --git a/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out b/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out
index b9ddcc0e1c97..036e2c5d0226 100644
--- a/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out
+++ b/tezt/_regressions/sc_rollup_inbox_current_messages_hash.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./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]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1654.974 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -45,14 +45,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.00058
     Expected counter: 2
-    Gas limit: 1752
+    Gas limit: 1755
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.00058
       payload fees(the block proposer) ....... +ꜩ0.00058
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1655.102
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["hello, message number 5", "hello, message number 6", "hello, message number 7", "hello, message number 8", "hello, message number 9", "hello, message number 10"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1656.001 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -82,14 +82,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000608
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000608
       payload fees(the block proposer) ....... +ꜩ0.000608
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1656.129
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:[]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1651.453 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -127,7 +127,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000445
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1651.453
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
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 c8a9ea320c05..8050e6f0a63f 100644
--- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out
+++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -52,7 +52,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -82,14 +82,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
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 1d29969d2c7a..527fdb7222f8 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
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -52,7 +52,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1651.811 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -89,7 +89,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1651.939
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1651.811 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -127,7 +127,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1651.939
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1652.018 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -158,14 +158,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000457
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000457
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1652.018
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
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 41a2d3f856cf..8c2a5cbb2b19 100644
--- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out
+++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -52,7 +52,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -82,14 +82,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1652.018 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -120,14 +120,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000457
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000457
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1652.018
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1652.583 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -158,14 +158,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1652.711
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
diff --git a/tezt/_regressions/sc_rollup_inbox_size.out b/tezt/_regressions/sc_rollup_inbox_size.out
index 2f3e762fc8b1..d769ac90f416 100644
--- a/tezt/_regressions/sc_rollup_inbox_size.out
+++ b/tezt/_regressions/sc_rollup_inbox_size.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1651.589 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -52,7 +52,7 @@ This sequence of operations was run:
       payload fees(the block proposer) ....... +ꜩ0.000457
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1651.717
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.376 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -82,14 +82,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000469
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000469
       payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.504
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.148 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -120,14 +120,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000481
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000481
       payload fees(the block proposer) ....... +ꜩ0.000481
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1653.148
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1653.713 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -158,14 +158,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000493
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000493
       payload fees(the block proposer) ....... +ꜩ0.000493
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1653.841
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -184,7 +184,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1654.485 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -197,14 +197,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000505
     Expected counter: 6
-    Gas limit: 1752
+    Gas limit: 1755
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000505
       payload fees(the block proposer) ....... +ꜩ0.000505
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1654.485
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -223,7 +223,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.050 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -236,14 +236,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000517
     Expected counter: 7
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000517
       payload fees(the block proposer) ....... +ꜩ0.000517
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.050
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -262,7 +262,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1655.615 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -275,14 +275,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000529
     Expected counter: 8
-    Gas limit: 1752
+    Gas limit: 1756
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000529
       payload fees(the block proposer) ....... +ꜩ0.000529
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1655.615
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -301,7 +301,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1656.180 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -314,14 +314,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000541
     Expected counter: 9
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000541
       payload fees(the block proposer) ....... +ꜩ0.000541
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.728
+      Consumed gas: 1656.308
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -341,7 +341,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1656.952 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -354,14 +354,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000553
     Expected counter: 10
-    Gas limit: 1752
+    Gas limit: 1757
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000553
       payload fees(the block proposer) ....... +ꜩ0.000553
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1656.952
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -381,7 +381,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE","CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1657.517 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -394,14 +394,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000565
     Expected counter: 11
-    Gas limit: 1752
+    Gas limit: 1758
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000565
       payload fees(the block proposer) ....... +ꜩ0.000565
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1657.517
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
diff --git a/tezt/_regressions/sc_rollup_node_advances_pvm_state.out b/tezt/_regressions/sc_rollup_node_advances_pvm_state.out
index b673c0e15aa8..1d12019b0c0f 100644
--- a/tezt/_regressions/sc_rollup_node_advances_pvm_state.out
+++ b/tezt/_regressions/sc_rollup_node_advances_pvm_state.out
@@ -41,7 +41,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["31","36","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.024 units (will add 100 for safety)
+Estimated gas: 1652.449 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -54,14 +54,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000463
     Expected counter: 2
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000463
       payload fees(the block proposer) ....... +ꜩ0.000463
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.152
+      Consumed gas: 1652.577
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -90,7 +90,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["32","38","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.216 units (will add 100 for safety)
+Estimated gas: 1652.671 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -103,14 +103,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000463
     Expected counter: 3
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000463
       payload fees(the block proposer) ....... +ꜩ0.000463
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.344
+      Consumed gas: 1652.799
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -140,7 +140,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["33","3130","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1652.908 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -153,14 +153,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 4
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.408
+      Consumed gas: 1652.908
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -190,7 +190,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["34","3132","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.408 units (will add 100 for safety)
+Estimated gas: 1652.908 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -203,14 +203,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 5
-    Gas limit: 1752
+    Gas limit: 1753
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.536
+      Consumed gas: 1653.036
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -241,7 +241,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["35","3134","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1653.115 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -254,14 +254,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 6
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1653.115
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -292,7 +292,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["36","3136","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1653.115 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -305,14 +305,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 7
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1653.115
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -343,7 +343,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["37","3138","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1653.115 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -356,14 +356,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 8
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.600
+      Consumed gas: 1653.115
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -394,7 +394,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["38","3230","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.600 units (will add 100 for safety)
+Estimated gas: 1653.115 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -407,14 +407,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 9
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.728
+      Consumed gas: 1653.243
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -446,7 +446,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["39","3232","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1653.322 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -459,14 +459,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000465
     Expected counter: 10
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000465
       payload fees(the block proposer) ....... +ꜩ0.000465
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1653.322
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -498,7 +498,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["3130","3234","2b"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1651.792 units (will add 100 for safety)
+Estimated gas: 1653.352 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -511,14 +511,14 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000467
     Expected counter: 11
-    Gas limit: 1752
+    Gas limit: 1754
     Storage limit: 0 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000467
       payload fees(the block proposer) ....... +ꜩ0.000467
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1651.792
+      Consumed gas: 1653.352
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
-- 
GitLab