From be2feaeba527e778256e76c0bf9e8042fc2da723 Mon Sep 17 00:00:00 2001 From: Lucas Randazzo Date: Mon, 1 Sep 2025 13:47:54 +0200 Subject: [PATCH 1/3] Proto: update cache --- devtools/yes_wallet/get_delegates_alpha.ml | 6 +++- src/proto_alpha/lib_client/injection.ml | 4 +-- .../lib_plugin/delegate_services.ml | 21 +++++++---- .../lib_protocol/alpha_context.mli | 12 ++++--- src/proto_alpha/lib_protocol/cache_repr.ml | 9 +++-- src/proto_alpha/lib_protocol/cache_repr.mli | 9 +++-- .../delegate_activation_storage.ml | 30 ++++++++-------- .../delegate_activation_storage.mli | 8 +++-- .../lib_protocol/delegate_cycles.ml | 6 ++-- .../delegate_missed_attestations_storage.ml | 6 ++-- .../lib_protocol/delegate_sampler.ml | 18 ++++++---- .../delegate_slashed_deposits_storage.ml | 13 +++---- .../lib_protocol/delegate_storage.ml | 24 ++++++------- .../lib_protocol/delegate_storage.mli | 8 +++-- .../forbidden_delegates_storage.ml | 2 +- src/proto_alpha/lib_protocol/raw_context.ml | 4 +-- src/proto_alpha/lib_protocol/raw_context.mli | 4 +-- src/proto_alpha/lib_protocol/script_cache.ml | 2 +- .../selected_distribution_storage.ml | 35 ++++++++++++------- .../selected_distribution_storage.mli | 16 ++++++--- src/proto_alpha/lib_protocol/stake_storage.ml | 8 +++-- .../lib_protocol/stake_storage.mli | 9 +++-- .../lib_protocol/test/helpers/context.ml | 2 +- 23 files changed, 158 insertions(+), 98 deletions(-) diff --git a/devtools/yes_wallet/get_delegates_alpha.ml b/devtools/yes_wallet/get_delegates_alpha.ml index 41ceb07a7704..88a18fd8e346 100644 --- a/devtools/yes_wallet/get_delegates_alpha.ml +++ b/devtools/yes_wallet/get_delegates_alpha.ml @@ -122,7 +122,11 @@ module Get_delegates = struct |> Lwt.map Environment.wrap_tzresult let deactivated ctxt pkh = - deactivated ctxt pkh |> Lwt.map Environment.wrap_tzresult + let open Lwt_result_syntax in + let* _ctxt, deactivated = + deactivated ctxt pkh |> Lwt.map Environment.wrap_tzresult + in + return deactivated let consensus_key ctxt pkh : Signature.public_key tzresult Lwt.t = let open Lwt_result_syntax in diff --git a/src/proto_alpha/lib_client/injection.ml b/src/proto_alpha/lib_client/injection.ml index caaae413e987..26a33c3cea2c 100644 --- a/src/proto_alpha/lib_client/injection.ml +++ b/src/proto_alpha/lib_client/injection.ml @@ -861,8 +861,8 @@ let may_patch_limits (type kind) (cctxt : #Protocol_client_context.full) let default_safety_guard = match c.operation with | Transaction {destination = Implicit _; _} - | Reveal _ | Set_deposits_limit _ | Increase_paid_storage _ - -> + | Reveal _ | Delegation _ | Set_deposits_limit _ + | Increase_paid_storage _ -> Gas.Arith.zero | _ -> default_safety_guard in diff --git a/src/proto_alpha/lib_plugin/delegate_services.ml b/src/proto_alpha/lib_plugin/delegate_services.ml index b038faba8dac..e02908cb1a53 100644 --- a/src/proto_alpha/lib_plugin/delegate_services.ml +++ b/src/proto_alpha/lib_plugin/delegate_services.ml @@ -1300,7 +1300,7 @@ let f_total_currently_staked ctxt = let info ctxt pkh = let open Lwt_result_syntax in (* General baking information *) - let* deactivated = Delegate.deactivated ctxt pkh in + let* ctxt, deactivated = Delegate.deactivated ctxt pkh in let is_forbidden = Delegate.is_forbidden_delegate ctxt pkh in let* participation = Delegate.For_RPC.participation_info ctxt pkh in let* dal_participation = @@ -1314,7 +1314,7 @@ let info ctxt pkh = return_some dal_participation else return_none in - let* grace_period = Delegate.last_cycle_before_deactivation ctxt pkh in + let* ctxt, grace_period = Delegate.last_cycle_before_deactivation ctxt pkh in let* active_staking_parameters = Delegate.Staking_parameters.of_delegate ctxt pkh in @@ -1416,11 +1416,15 @@ let register () = | {active = true; inactive = false; _} -> List.filter_es (fun pkh -> - let+ deactivated = Delegate.deactivated ctxt pkh in + let+ _ctxt, deactivated = Delegate.deactivated ctxt pkh in not deactivated) delegates | {active = false; inactive = true; _} -> - List.filter_es (fun pkh -> Delegate.deactivated ctxt pkh) delegates + List.filter_es + (fun pkh -> + let+ _ctxt, deactivated = Delegate.deactivated ctxt pkh in + deactivated) + delegates | {active = false; inactive = false; _} (* This case is counter-intuitive, but it represents the default behavior, when no arguments are given *) | {active = true; inactive = true; _} -> @@ -1456,7 +1460,8 @@ let register () = register1 ~chunked:false S.total_staked f_total_staked ; register1 ~chunked:false S.Deprecated.frozen_deposits (fun ctxt pkh () () -> let* () = check_delegate_registered ctxt pkh in - Delegate.initial_frozen_deposits ctxt pkh) ; + let+ _ctxt, ifd = Delegate.initial_frozen_deposits ctxt pkh in + ifd) ; wrap_check_registered ~chunked:false S.Deprecated.unstaked_frozen_deposits @@ -1492,10 +1497,12 @@ let register () = ~delegate:pkh) ; register1 ~chunked:false S.deactivated (fun ctxt pkh () () -> let* () = check_delegate_registered ctxt pkh in - Delegate.deactivated ctxt pkh) ; + let+ _ctxt, deactivated = Delegate.deactivated ctxt pkh in + deactivated) ; register1 ~chunked:false S.grace_period (fun ctxt pkh () () -> let* () = check_delegate_registered ctxt pkh in - Delegate.last_cycle_before_deactivation ctxt pkh) ; + let+ _ctxt, lcbd = Delegate.last_cycle_before_deactivation ctxt pkh in + lcbd) ; register1 ~chunked:false S.current_voting_power (fun ctxt pkh () () -> let* () = check_delegate_registered ctxt pkh in Vote.get_current_voting_power_free ctxt pkh) ; diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 21684e110eec..63255bc56120 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -2413,21 +2413,22 @@ module Delegate : sig context -> public_key_hash -> Tez.t tzresult Lwt.t val initial_frozen_deposits : - context -> public_key_hash -> Tez.t tzresult Lwt.t + context -> public_key_hash -> (context * Tez.t) tzresult Lwt.t (** See {!Contract_delegate_storage.delegated_contracts}. *) val delegated_contracts : context -> public_key_hash -> Contract.t list Lwt.t val registered : context -> public_key_hash -> bool Lwt.t - val deactivated : context -> public_key_hash -> bool tzresult Lwt.t + val deactivated : + context -> public_key_hash -> (context * bool) tzresult Lwt.t (** See {!Forbidden_delegates_storage.is_forbidden}. *) val is_forbidden_delegate : t -> public_key_hash -> bool (** See {!Delegate_activation_storage.last_cycle_before_deactivation}. *) val last_cycle_before_deactivation : - context -> public_key_hash -> Cycle.t tzresult Lwt.t + context -> public_key_hash -> (context * Cycle.t) tzresult Lwt.t module Consensus_key : sig val check_not_tz4 : @@ -4633,7 +4634,8 @@ module Cache : sig val update : context -> identifier -> (cached_value * size) option -> context tzresult - val find : context -> identifier -> cached_value option tzresult Lwt.t + val find : + context -> identifier -> (context * cached_value option) tzresult Lwt.t val list_identifiers : context -> (string * int) list @@ -5317,7 +5319,7 @@ module Stake_distribution : sig val get_selected_distribution : context -> Cycle.t -> - (Signature.public_key_hash * Stake_repr.t) list tzresult Lwt.t + (context * (Signature.public_key_hash * Stake_repr.t) list) tzresult Lwt.t end end diff --git a/src/proto_alpha/lib_protocol/cache_repr.ml b/src/proto_alpha/lib_protocol/cache_repr.ml index 1b05444ffa17..76ea1d16611f 100644 --- a/src/proto_alpha/lib_protocol/cache_repr.ml +++ b/src/proto_alpha/lib_protocol/cache_repr.ml @@ -206,7 +206,10 @@ module type INTERFACE = sig (cached_value * int) option -> Raw_context.t tzresult - val find : Raw_context.t -> identifier -> cached_value option tzresult Lwt.t + val find : + Raw_context.t -> + identifier -> + (Raw_context.t * cached_value option) tzresult Lwt.t val list_identifiers : Raw_context.t -> (identifier * int) list @@ -267,8 +270,8 @@ let register_exn (type cvalue) in let*! value_opt = Admin.find ctxt (mk ~id) in match value_opt with - | None -> return_none - | Some (K v) -> return_some v + | None -> return (ctxt, None) + | Some (K v) -> return (ctxt, Some v) | _ -> (* This execution path is impossible because all the keys of C's namespace (which is unique to C) are constructed with diff --git a/src/proto_alpha/lib_protocol/cache_repr.mli b/src/proto_alpha/lib_protocol/cache_repr.mli index 2d026d423601..5a1e558cb390 100644 --- a/src/proto_alpha/lib_protocol/cache_repr.mli +++ b/src/proto_alpha/lib_protocol/cache_repr.mli @@ -203,12 +203,15 @@ module type INTERFACE = sig (cached_value * size) option -> Raw_context.t tzresult - (** [find ctxt i = Some v] if [v] is the value associated to [i] - in the subcache. Returns [None] if there is no such value in + (** [find ctxt i = (ctxt, Some v)] if [v] is the value associated to [i] + in the subcache. Returns [(ctxt, None)] if there is no such value in the subcache. This function is in the Lwt monad because if the value may have not been constructed (see the lazy loading mode in {!Environment_context}), it is constructed on the fly. *) - val find : Raw_context.t -> identifier -> cached_value option tzresult Lwt.t + val find : + Raw_context.t -> + identifier -> + (Raw_context.t * cached_value option) tzresult Lwt.t (** [list_identifiers ctxt] returns the list of the identifiers of the cached values along with their respective diff --git a/src/proto_alpha/lib_protocol/delegate_activation_storage.ml b/src/proto_alpha/lib_protocol/delegate_activation_storage.ml index f35602d3f9ff..1b81194cd6bd 100644 --- a/src/proto_alpha/lib_protocol/delegate_activation_storage.ml +++ b/src/proto_alpha/lib_protocol/delegate_activation_storage.ml @@ -49,9 +49,9 @@ let tolerated_inactivity_period ctxt delegate = if Cycle_repr.(current_cycle = root) then (* There is no selected distribution at chain initialisation, so we give a low tolerance *) - return tolerance_low + return (ctxt, tolerance_low) else - let* delegates_stakes = + let* ctxt, delegates_stakes = Selected_distribution_storage.get_selected_distribution ctxt current_cycle in match @@ -66,7 +66,7 @@ let tolerated_inactivity_period ctxt delegate = - a delegate reactivation - after decreasing its stake below [minimal_stake] so we give a low tolerance *) - return tolerance_low + return (ctxt, tolerance_low) | Some delegate_stake -> let+ total_stake = Selected_distribution_storage.get_total_active_stake @@ -82,8 +82,8 @@ let tolerated_inactivity_period ctxt delegate = (of_int tolerance_threshold)) in if Compare.Int.(compare_stake_ratio_with_threshold > 0) then - tolerance_low - else tolerance_high + (ctxt, tolerance_low) + else (ctxt, tolerance_high) let is_inactive ctxt delegate = let open Lwt_result_syntax in @@ -92,42 +92,42 @@ let is_inactive ctxt delegate = ctxt (Contract_repr.Implicit delegate) in - if inactive then Lwt.return_ok inactive + if inactive then return (ctxt, inactive) else let* cycle_opt = Storage.Contract.Delegate_last_cycle_before_deactivation.find ctxt (Contract_repr.Implicit delegate) in - let+ tolerance = tolerated_inactivity_period ctxt delegate in + let+ ctxt, tolerance = tolerated_inactivity_period ctxt delegate in match cycle_opt with | Some last_active_cycle -> let ({Level_repr.cycle = current_cycle; _} : Level_repr.t) = Raw_context.current_level ctxt in - Cycle_repr.(add last_active_cycle tolerance < current_cycle) + (ctxt, Cycle_repr.(add last_active_cycle tolerance < current_cycle)) | None -> (* This case is only when called from `set_active`, when creating a contract. *) - false + (ctxt, false) let last_cycle_before_deactivation ctxt delegate = let open Lwt_result_syntax in - let* tolerance = tolerated_inactivity_period ctxt delegate in + let* ctxt, tolerance = tolerated_inactivity_period ctxt delegate in let contract = Contract_repr.Implicit delegate in let+ cycle = Storage.Contract.Delegate_last_cycle_before_deactivation.get ctxt contract in (* we give [tolerance] cycles to the delegate after its last active cycle before it can be deactivated *) - Cycle_repr.add cycle tolerance + (ctxt, Cycle_repr.add cycle tolerance) let set_inactive ctxt delegate = Storage.Contract.Inactive_delegate.add ctxt (Contract_repr.Implicit delegate) let set_active ctxt delegate = let open Lwt_result_syntax in - let* inactive = is_inactive ctxt delegate in + let* ctxt, inactive = is_inactive ctxt delegate in let current_cycle = (Raw_context.current_level ctxt).cycle in let consensus_rights_delay = Constants_storage.consensus_rights_delay ctxt in let delegate_contract = Contract_repr.Implicit delegate in @@ -136,18 +136,18 @@ let set_active ctxt delegate = ctxt delegate_contract in - let last_active_cycle = + let ctxt, last_active_cycle = (* if the delegate is new or inactive, we give it additionally [consensus_rights_delay] because the delegate needs this number of cycles to receive the rights *) match current_last_active_cycle with - | None -> Cycle_repr.add current_cycle consensus_rights_delay + | None -> (ctxt, Cycle_repr.add current_cycle consensus_rights_delay) | Some current_last_active_cycle -> let updated = if inactive then Cycle_repr.add current_cycle consensus_rights_delay else current_cycle in - Cycle_repr.max current_last_active_cycle updated + (ctxt, Cycle_repr.max current_last_active_cycle updated) in let*! ctxt = Storage.Contract.Delegate_last_cycle_before_deactivation.add diff --git a/src/proto_alpha/lib_protocol/delegate_activation_storage.mli b/src/proto_alpha/lib_protocol/delegate_activation_storage.mli index ed30e8e2974d..9607173db0eb 100644 --- a/src/proto_alpha/lib_protocol/delegate_activation_storage.mli +++ b/src/proto_alpha/lib_protocol/delegate_activation_storage.mli @@ -39,12 +39,16 @@ rights yet during the first [consensus_rights_delay] cycles *) val is_inactive : - Raw_context.t -> Signature.Public_key_hash.t -> bool tzresult Lwt.t + Raw_context.t -> + Signature.Public_key_hash.t -> + (Raw_context.t * bool) tzresult Lwt.t (** [last_cycle_before_deactivation ctxt delegate] is the cycle at which the delegate is scheduled to become inactive. *) val last_cycle_before_deactivation : - Raw_context.t -> Signature.Public_key_hash.t -> Cycle_repr.t tzresult Lwt.t + Raw_context.t -> + Signature.Public_key_hash.t -> + (Raw_context.t * Cycle_repr.t) tzresult Lwt.t (** [set_inactive context delegate] adds [delegate] to the set of inactive contracts. *) diff --git a/src/proto_alpha/lib_protocol/delegate_cycles.ml b/src/proto_alpha/lib_protocol/delegate_cycles.ml index 49ebeb3202f8..b8b95395e998 100644 --- a/src/proto_alpha/lib_protocol/delegate_cycles.ml +++ b/src/proto_alpha/lib_protocol/delegate_cycles.ml @@ -39,7 +39,7 @@ let update_activity ctxt last_cycle = ~init:(Ok (ctxt, [])) ~f:(fun delegate acc -> let*? ctxt, deactivated = acc in - let* cycle = + let* ctxt, cycle = Delegate_activation_storage.last_cycle_before_deactivation ctxt delegate @@ -167,7 +167,9 @@ let distribute_attesting_rewards ctxt last_cycle unrevealed_nonces = in (* We cannot use the cached stake info: the detailed stake is needed for reward distribution, but it is not cached. *) - let* delegates = Stake_storage.get_selected_distribution ctxt last_cycle in + let* ctxt, delegates = + Stake_storage.get_selected_distribution ctxt last_cycle + in List.fold_left_es (fun (ctxt, balance_updates) (delegate, active_stake) -> let* ctxt, sufficient_participation = diff --git a/src/proto_alpha/lib_protocol/delegate_missed_attestations_storage.ml b/src/proto_alpha/lib_protocol/delegate_missed_attestations_storage.ml index a21307a7a8a6..38a9f2ef262d 100644 --- a/src/proto_alpha/lib_protocol/delegate_missed_attestations_storage.ml +++ b/src/proto_alpha/lib_protocol/delegate_missed_attestations_storage.ml @@ -300,7 +300,8 @@ module For_RPC = struct let participation_info ctxt delegate = let open Lwt_result_syntax in let level = Level_storage.current ctxt in - let* stake_distribution = + (* We ignore the context because this function is only used for RPCs *) + let* _ctxt, stake_distribution = Stake_storage.get_selected_distribution ctxt level.cycle in match @@ -396,7 +397,8 @@ module For_RPC = struct let dal_participation_info_enabled ctxt delegate = let open Lwt_result_syntax in let level = Level_storage.current ctxt in - let* stake_distribution = + (* We ignore the context because this function is only used for RPCs *) + let* _ctxt, stake_distribution = Stake_storage.get_selected_distribution ctxt level.cycle in match diff --git a/src/proto_alpha/lib_protocol/delegate_sampler.ml b/src/proto_alpha/lib_protocol/delegate_sampler.ml index 3f7040fd8e21..01962ca8b76d 100644 --- a/src/proto_alpha/lib_protocol/delegate_sampler.ml +++ b/src/proto_alpha/lib_protocol/delegate_sampler.ml @@ -56,10 +56,12 @@ module Delegate_sampler_state = struct let get ctxt cycle = let open Lwt_result_syntax in let id = identifier_of_cycle cycle in - let* v_opt = Cache.find ctxt id in + let* ctxt, v_opt = Cache.find ctxt id in match v_opt with - | None -> Storage.Delegate_sampler_state.get ctxt cycle - | Some v -> return v + | None -> + let* v = Storage.Delegate_sampler_state.get ctxt cycle in + return (ctxt, v) + | Some v -> return (ctxt, v) let remove_existing ctxt cycle = let open Lwt_result_syntax in @@ -132,8 +134,8 @@ module Random = struct let open Lwt_result_syntax in let read ctxt = let* seed = Seed_storage.for_cycle ctxt cycle in - let+ state = Delegate_sampler_state.get ctxt cycle in - (seed, state) + let+ ctxt, state = Delegate_sampler_state.get ctxt cycle in + (ctxt, seed, state) in Raw_context.sampler_for_cycle ~read ctxt cycle @@ -179,7 +181,9 @@ let stake_info_for_cycle ctxt cycle = let read ctxt = let* total_stake = Stake_storage.get_total_active_stake ctxt cycle in let total_stake = Stake_repr.staking_weight total_stake in - let* stakes_pkh = Stake_storage.get_selected_distribution ctxt cycle in + let* ctxt, stakes_pkh = + Stake_storage.get_selected_distribution ctxt cycle + in let* stakes_pk = List.rev_map_es (fun (pkh, stake) -> @@ -189,7 +193,7 @@ let stake_info_for_cycle ctxt cycle = (pk, Stake_repr.staking_weight stake)) stakes_pkh in - return (total_stake, stakes_pk) + return (ctxt, total_stake, stakes_pk) in Raw_context.stake_info_for_cycle ~read ctxt cycle diff --git a/src/proto_alpha/lib_protocol/delegate_slashed_deposits_storage.ml b/src/proto_alpha/lib_protocol/delegate_slashed_deposits_storage.ml index 766199f483b0..6feec642dee8 100644 --- a/src/proto_alpha/lib_protocol/delegate_slashed_deposits_storage.ml +++ b/src/proto_alpha/lib_protocol/delegate_slashed_deposits_storage.ml @@ -125,11 +125,11 @@ let get_initial_frozen_deposits_of_misbehaviour_cycle ~current_cycle Delegate_storage.initial_frozen_deposits else if Cycle_repr.equal previous_cycle misbehaviour_cycle then Delegate_storage.initial_frozen_deposits_of_previous_cycle - else fun (_ : Raw_context.t) (_ : Signature.public_key_hash) -> + else fun (ctxt : Raw_context.t) (_ : Signature.public_key_hash) -> (* Denunciation applied too late. We could assert false, but we can also be permissive while keeping the same invariants. *) - return Tez_repr.zero + return (ctxt, Tez_repr.zero) let update_block_denunciations_map_with delegate denunciations initial_block_map = @@ -287,8 +287,8 @@ let apply_block_denunciations ctxt current_cycle block_denunciations_map = new_total_slashing_percentage previous_total_slashing_percentage in - let* frozen_deposits = - let* initial_amount = + let* ctxt, frozen_deposits = + let* ctxt, initial_amount = get_initial_frozen_deposits_of_misbehaviour_cycle ~current_cycle ~misbehaviour_cycle @@ -298,7 +298,7 @@ let apply_block_denunciations ctxt current_cycle block_denunciations_map = let* current_amount = Delegate_storage.current_frozen_deposits ctxt delegate in - return Deposits_repr.{initial_amount; current_amount} + return (ctxt, Deposits_repr.{initial_amount; current_amount}) in let punishing_amount = compute_punishing_amount slashing_percentage frozen_deposits @@ -534,7 +534,8 @@ module For_RPC = struct in let misbehaviour_cycle = level.cycle in let* frozen_deposits = - let* initial_amount = + (* We ignore the context because this function is only used for RPCs *) + let* _ctxt, initial_amount = get_initial_frozen_deposits_of_misbehaviour_cycle ~current_cycle ~misbehaviour_cycle diff --git a/src/proto_alpha/lib_protocol/delegate_storage.ml b/src/proto_alpha/lib_protocol/delegate_storage.ml index d669c71689d6..b529ea3e9c9f 100644 --- a/src/proto_alpha/lib_protocol/delegate_storage.ml +++ b/src/proto_alpha/lib_protocol/delegate_storage.ml @@ -120,10 +120,10 @@ module Contract = struct let open Lwt_result_syntax in let*! is_registered = registered c delegate in if is_registered then - let* () = - let* is_inactive = Delegate_activation_storage.is_inactive c delegate in - fail_unless is_inactive Active_delegate + let* c, is_inactive = + Delegate_activation_storage.is_inactive c delegate in + let* () = fail_unless is_inactive Active_delegate in Stake_storage.set_active c delegate else let contract = Contract_repr.Implicit delegate in @@ -252,22 +252,22 @@ let list = Storage.Delegates.elements let initial_frozen_deposits ctxt delegate = let open Lwt_result_syntax in - let* stake_opt = + let* ctxt, stake_opt = match Raw_context.find_stake_distribution_for_current_cycle ctxt with | Some distribution -> - return (Signature.Public_key_hash.Map.find delegate distribution) + return (ctxt, Signature.Public_key_hash.Map.find delegate distribution) | None -> (* This branch happens when the stake distribution is not initialized in [ctxt], e.g. when RPCs are called or operations are simulated. *) let current_cycle = (Raw_context.current_level ctxt).cycle in - let+ stakes = + let+ ctxt, stakes = Stake_storage.get_selected_distribution ctxt current_cycle in - List.assoc ~equal:Signature.Public_key_hash.equal delegate stakes + (ctxt, List.assoc ~equal:Signature.Public_key_hash.equal delegate stakes) in match stake_opt with - | None -> return Tez_repr.zero - | Some {frozen; weighted_delegated = _} -> return frozen + | None -> return (ctxt, Tez_repr.zero) + | Some {frozen; weighted_delegated = _} -> return (ctxt, frozen) let initial_frozen_deposits_of_previous_cycle ctxt delegate = let open Lwt_result_syntax in @@ -275,14 +275,14 @@ let initial_frozen_deposits_of_previous_cycle ctxt delegate = match Cycle_repr.pred current_cycle with | None -> tzfail No_previous_cycle | Some previous_cycle -> ( - let+ stakes = + let+ ctxt, stakes = Stake_storage.get_selected_distribution ctxt previous_cycle in match List.assoc ~equal:Signature.Public_key_hash.equal delegate stakes with - | None -> Tez_repr.zero - | Some {frozen; weighted_delegated = _} -> frozen) + | None -> (ctxt, Tez_repr.zero) + | Some {frozen; weighted_delegated = _} -> (ctxt, frozen)) let current_frozen_deposits ctxt delegate = let open Lwt_result_syntax in diff --git a/src/proto_alpha/lib_protocol/delegate_storage.mli b/src/proto_alpha/lib_protocol/delegate_storage.mli index 697b8736d96f..d5794da47c7a 100644 --- a/src/proto_alpha/lib_protocol/delegate_storage.mli +++ b/src/proto_alpha/lib_protocol/delegate_storage.mli @@ -103,14 +103,18 @@ val list : Raw_context.t -> Signature.Public_key_hash.t list Lwt.t (** Returns a delegate's initial frozen deposits at the beginning of the current cycle. *) val initial_frozen_deposits : - Raw_context.t -> Signature.public_key_hash -> Tez_repr.t tzresult Lwt.t + Raw_context.t -> + Signature.public_key_hash -> + (Raw_context.t * Tez_repr.t) tzresult Lwt.t (** Returns a delegate's initial frozen deposits at the beginning of the previous cycle. Fails with [No_previous_cycle] if there is no previous cycle. *) val initial_frozen_deposits_of_previous_cycle : - Raw_context.t -> Signature.public_key_hash -> Tez_repr.t tzresult Lwt.t + Raw_context.t -> + Signature.public_key_hash -> + (Raw_context.t * Tez_repr.t) tzresult Lwt.t (** Returns a delegate's current frozen deposits, which is the sum of their own frozen funds and those of their stakers if applicable. *) diff --git a/src/proto_alpha/lib_protocol/forbidden_delegates_storage.ml b/src/proto_alpha/lib_protocol/forbidden_delegates_storage.ml index b45185f28291..b2ff0f3fed76 100644 --- a/src/proto_alpha/lib_protocol/forbidden_delegates_storage.ml +++ b/src/proto_alpha/lib_protocol/forbidden_delegates_storage.ml @@ -81,7 +81,7 @@ let update_at_cycle_end_after_slashing ctxt ~new_cycle = let forbidden_delegates = Raw_context.Consensus.forbidden_delegates ctxt in if Signature.Public_key_hash.Set.is_empty forbidden_delegates then return ctxt else - let* selection_for_new_cycle = + let* ctxt, selection_for_new_cycle = Stake_storage.get_selected_distribution_as_map ctxt new_cycle in let* forbidden_delegates = diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 99611aa8a2e1..43c04500bcca 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -2091,7 +2091,7 @@ let sampler_for_cycle ~read ctxt cycle = match Cycle_repr.Map.find cycle map with | Some (seed, state) -> return (ctxt, seed, state) | None -> - let* seed, state = read ctxt in + let* ctxt, seed, state = read ctxt in let map = Cycle_repr.Map.add cycle (seed, state) map in let ctxt = update_sampler_state ctxt map in return (ctxt, seed, state) @@ -2125,7 +2125,7 @@ let stake_info_for_cycle ~read ctxt cycle = match Cycle_repr.Map.find cycle map with | Some (total_stake, stakes_pk) -> return (ctxt, total_stake, stakes_pk) | None -> - let* total_stake, stakes_pk = read ctxt in + let* ctxt, total_stake, stakes_pk = read ctxt in let stakes_pk = sort_stakes_pk_for_stake_info stakes_pk in let map = Cycle_repr.Map.add cycle (total_stake, stakes_pk) map in let ctxt = update_stake_info ctxt map in diff --git a/src/proto_alpha/lib_protocol/raw_context.mli b/src/proto_alpha/lib_protocol/raw_context.mli index d4947cfe444d..a6cf17ece73a 100644 --- a/src/proto_alpha/lib_protocol/raw_context.mli +++ b/src/proto_alpha/lib_protocol/raw_context.mli @@ -291,7 +291,7 @@ val init_sampler_for_cycle : the [read] function and then cached in [ctxt] like [init_sampler_for_cycle]. *) val sampler_for_cycle : - read:(t -> (Seed_repr.seed * consensus_pk Sampler.t) tzresult Lwt.t) -> + read:(t -> (t * Seed_repr.seed * consensus_pk Sampler.t) tzresult Lwt.t) -> t -> Cycle_repr.t -> (t * Seed_repr.seed * consensus_pk Sampler.t) tzresult Lwt.t @@ -315,7 +315,7 @@ val init_stake_info_for_cycle : the [read] function and then cached in [ctxt] like [init_stake_info_for_cycle]. *) val stake_info_for_cycle : - read:(t -> (Int64.t * (consensus_pk * int64) list) tzresult Lwt.t) -> + read:(t -> (t * Int64.t * (consensus_pk * int64) list) tzresult Lwt.t) -> t -> Cycle_repr.t -> (t * Int64.t * (consensus_pk * int64) list) tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/script_cache.ml b/src/proto_alpha/lib_protocol/script_cache.ml index 70a79eb8f447..35cc6b517814 100644 --- a/src/proto_alpha/lib_protocol/script_cache.ml +++ b/src/proto_alpha/lib_protocol/script_cache.ml @@ -93,7 +93,7 @@ module Cache = (val Cache.register_exn (module Client)) let find ctxt addr = let open Lwt_result_syntax in let identifier = identifier_of_contract addr in - let* contract_opt = Cache.find ctxt identifier in + let* ctxt, contract_opt = Cache.find ctxt identifier in match contract_opt with | Some (unparsed_script, ex_script) -> return (ctxt, identifier, Some (unparsed_script, ex_script)) diff --git a/src/proto_alpha/lib_protocol/selected_distribution_storage.ml b/src/proto_alpha/lib_protocol/selected_distribution_storage.ml index 8b3785499714..ad04f17c97d7 100644 --- a/src/proto_alpha/lib_protocol/selected_distribution_storage.ml +++ b/src/proto_alpha/lib_protocol/selected_distribution_storage.ml @@ -38,18 +38,24 @@ module Selected_distribution_for_cycle = struct let get ctxt cycle = let open Lwt_result_syntax in let id = identifier_of_cycle cycle in - let* value_opt = Cache.find ctxt id in + let* ctxt, value_opt = Cache.find ctxt id in match value_opt with - | None -> Storage.Stake.Selected_distribution_for_cycle.get ctxt cycle - | Some v -> return v + | None -> + let* v = Storage.Stake.Selected_distribution_for_cycle.get ctxt cycle in + return (ctxt, v) + | Some v -> return (ctxt, v) let find ctxt cycle = let open Lwt_result_syntax in let id = identifier_of_cycle cycle in - let* value_opt = Cache.find ctxt id in + let* ctxt, value_opt = Cache.find ctxt id in match value_opt with - | None -> Storage.Stake.Selected_distribution_for_cycle.find ctxt cycle - | Some _ as some_v -> return some_v + | None -> + let* v = + Storage.Stake.Selected_distribution_for_cycle.find ctxt cycle + in + return (ctxt, v) + | Some _ as some_v -> return (ctxt, some_v) let remove_existing ctxt cycle = let open Lwt_result_syntax in @@ -80,16 +86,21 @@ let find_selected_distribution = Selected_distribution_for_cycle.find let get_selected_distribution_as_map ctxt cycle = let open Lwt_result_syntax in - let+ stakes = Selected_distribution_for_cycle.get ctxt cycle in - List.fold_left - (fun map (pkh, stake) -> Signature.Public_key_hash.Map.add pkh stake map) - Signature.Public_key_hash.Map.empty - stakes + let* ctxt, stakes = Selected_distribution_for_cycle.get ctxt cycle in + let stakes_map = + List.fold_left + (fun map (pkh, stake) -> Signature.Public_key_hash.Map.add pkh stake map) + Signature.Public_key_hash.Map.empty + stakes + in + return (ctxt, stakes_map) let prepare_stake_distribution ctxt = let open Lwt_result_syntax in let level = Level_storage.current ctxt in - let+ stake_distribution = get_selected_distribution_as_map ctxt level.cycle in + let+ ctxt, stake_distribution = + get_selected_distribution_as_map ctxt level.cycle + in Raw_context.init_stake_distribution_for_current_cycle ctxt stake_distribution let get_total_active_stake = Storage.Stake.Total_active_stake.get diff --git a/src/proto_alpha/lib_protocol/selected_distribution_storage.mli b/src/proto_alpha/lib_protocol/selected_distribution_storage.mli index 1c48b17c7e7e..c83062b544e5 100644 --- a/src/proto_alpha/lib_protocol/selected_distribution_storage.mli +++ b/src/proto_alpha/lib_protocol/selected_distribution_storage.mli @@ -16,12 +16,15 @@ module Selected_distribution_for_cycle : sig val get : Raw_context.t -> Cycle_repr.cycle -> - (Signature.public_key_hash * Stake_repr.t) list tzresult Lwt.t + (Raw_context.t * (Signature.public_key_hash * Stake_repr.t) list) tzresult + Lwt.t val find : Raw_context.t -> Cycle_repr.cycle -> - (Signature.public_key_hash * Stake_repr.t) list option tzresult Lwt.t + (Raw_context.t * (Signature.public_key_hash * Stake_repr.t) list option) + tzresult + Lwt.t val remove_existing : Raw_context.t -> Cycle_repr.cycle -> Raw_context.t tzresult Lwt.t @@ -39,17 +42,20 @@ val set_selected_distribution_for_cycle : val get_selected_distribution : Raw_context.t -> Cycle_repr.cycle -> - (Signature.public_key_hash * Stake_repr.t) list tzresult Lwt.t + (Raw_context.t * (Signature.public_key_hash * Stake_repr.t) list) tzresult + Lwt.t val find_selected_distribution : Raw_context.t -> Cycle_repr.cycle -> - (Signature.public_key_hash * Stake_repr.t) list option tzresult Lwt.t + (Raw_context.t * (Signature.public_key_hash * Stake_repr.t) list option) + tzresult + Lwt.t val get_selected_distribution_as_map : Raw_context.t -> Cycle_repr.cycle -> - Stake_repr.t Signature.Public_key_hash.Map.t tzresult Lwt.t + (Raw_context.t * Stake_repr.t Signature.Public_key_hash.Map.t) tzresult Lwt.t val prepare_stake_distribution : Raw_context.t -> Raw_context.t tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/stake_storage.ml b/src/proto_alpha/lib_protocol/stake_storage.ml index 12fcad37c15c..4ff6c4debaf3 100644 --- a/src/proto_alpha/lib_protocol/stake_storage.ml +++ b/src/proto_alpha/lib_protocol/stake_storage.ml @@ -68,7 +68,9 @@ let update_stake ~f ctxt delegate = match (had_minimal_stake_before, has_minimal_stake_after) with | true, false -> (* Decrease below the minimal stake. *) - let* inactive = Delegate_activation_storage.is_inactive ctxt delegate in + let* ctxt, inactive = + Delegate_activation_storage.is_inactive ctxt delegate + in if inactive then (* The delegate is inactive so it wasn't in the set and we don't need to update it. *) @@ -80,7 +82,9 @@ let update_stake ~f ctxt delegate = return ctxt | false, true -> (* Increase above the minimal stake. *) - let* inactive = Delegate_activation_storage.is_inactive ctxt delegate in + let* ctxt, inactive = + Delegate_activation_storage.is_inactive ctxt delegate + in if inactive then (* The delegate is inactive so we don't need to add it to the set. *) diff --git a/src/proto_alpha/lib_protocol/stake_storage.mli b/src/proto_alpha/lib_protocol/stake_storage.mli index 0863b260dc7e..5c7034488c20 100644 --- a/src/proto_alpha/lib_protocol/stake_storage.mli +++ b/src/proto_alpha/lib_protocol/stake_storage.mli @@ -107,17 +107,20 @@ val fold_on_active_delegates_with_minimal_stake_s : val get_selected_distribution : Raw_context.t -> Cycle_repr.t -> - (Signature.Public_key_hash.t * Stake_repr.t) list tzresult Lwt.t + (Raw_context.t * (Signature.Public_key_hash.t * Stake_repr.t) list) tzresult + Lwt.t val find_selected_distribution : Raw_context.t -> Cycle_repr.t -> - (Signature.Public_key_hash.t * Stake_repr.t) list option tzresult Lwt.t + (Raw_context.t * (Signature.Public_key_hash.t * Stake_repr.t) list option) + tzresult + Lwt.t val get_selected_distribution_as_map : Raw_context.t -> Cycle_repr.t -> - Stake_repr.t Signature.Public_key_hash.Map.t tzresult Lwt.t + (Raw_context.t * Stake_repr.t Signature.Public_key_hash.Map.t) tzresult Lwt.t (** Copy the stake distribution for the current cycle (from [Storage.Stake.Selected_distribution_for_cycle]) in the raw diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.ml b/src/proto_alpha/lib_protocol/test/helpers/context.ml index df8b519e6e35..898769a67d8e 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/context.ml @@ -642,7 +642,7 @@ module Delegate = struct let stake_for_cycle ctxt cycle pkh = let open Lwt_result_wrap_syntax in let* alpha_ctxt = get_alpha_ctxt ctxt in - let*@ stakes = + let*@ _ctxt, stakes = Protocol.Alpha_context.Stake_distribution.Internal_for_tests .get_selected_distribution alpha_ctxt -- GitLab From 64825c42ef97490429c85b12a158cc2ef14bf9e5 Mon Sep 17 00:00:00 2001 From: Lucas Randazzo Date: Mon, 1 Sep 2025 15:20:35 +0200 Subject: [PATCH 2/3] Tezt: reset regressions --- ...lient) RPC regression tests- contracts.out | 4 +- ...light) RPC regression tests- contracts.out | 4 +- ...proxy) RPC regression tests- contracts.out | 4 +- .../baker_test.ml/Alpha- Baker rewards.out | 2 +- ...companion and consensus keys and stake.out | 12 +-- ...a- register keys with proofs and stake.out | 12 +-- ...lpha- Test register with consensus key.out | 34 ++++----- ... add-approve-transfer-remove liquidity.out | 76 +++++++++---------- .../Alpha- Test trades.out | 76 +++++++++---------- ...- Contract onchain opcodes- test_level.out | 10 +-- ...ha- Contract onchain opcodes- test_now.out | 4 +- ...a- Contract onchain opcodes- test_self.out | 12 +-- ... Contract onchain opcodes- test_sender.out | 20 ++--- ...act onchain opcodes- test_set_delegate.out | 16 ++-- ...- Contract onchain opcodes- test_slice.out | 4 +- ... Contract onchain opcodes- test_source.out | 20 ++--- ...ract onchain opcodes- test_split_bytes.out | 18 ++--- ...act onchain opcodes- test_split_string.out | 18 ++--- ...ract onchain opcodes- test_store_input.out | 12 +-- ... onchain opcodes- test_transfer_amount.out | 6 +- ... onchain opcodes- test_transfer_tokens.out | 16 ++-- .../Alpha- Create contract.out | 6 +- ...lowing dal and baker tutorial commands.out | 24 +++--- ... integration (Use all available slots).out | 4 +- ...ze and gas for contract call operation.out | 2 +- .../Alpha- Self address transfer.out | 8 +- .../Alpha- Ticket updates in receipt.out | 16 ++-- .../Alpha- Create and remove tickets.out | 24 +++--- ...rt-contract rollup should succeed with.out | 6 +- ...rom implicit accounts must be rejected.out | 6 +- ...ameters) from implicit account to orig.out | 6 +- ...mplicit account to originated directly.out | 6 +- ...inated contracts and implicit accounts.out | 20 ++--- ... implicit accounts with some Tez along.out | 4 +- ...icit accounts with the wrong type must.out | 8 +- ...ts from contracts to implicit accounts.out | 6 +- .../Alpha- Send tickets in bigmap.out | 8 +- ...r (with complex parameters) from impli.out | 6 +- ...r from implicit account to originated .out | 6 +- ... contract storage to implicit accounts.out | 16 ++-- ...rom implicit accounts must be rejected.out | 6 +- ...rt-contract rollup should succeed with.out | 12 +-- ...accounts or originated contracts accep.out | 14 ++-- ...rom implicit accounts must be rejected.out | 6 +- ... tx kernel should run e2e (kernel_e2e).out | 40 +++++----- .../expected/views.ml/Alpha- Run views.out | 16 ++-- tezt/tests/operation_size_and_gas.ml | 2 +- 47 files changed, 329 insertions(+), 329 deletions(-) diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- contracts.out index 33935e48a489..de438beb54dd 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- contracts.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- contracts.out @@ -69,11 +69,11 @@ Fatal error: ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]' -{ "balance": "99999554", "delegate": "[PUBLIC_KEY_HASH]", +{ "balance": "99999565", "delegate": "[PUBLIC_KEY_HASH]", "counter": "4", "revealed": true } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"99999554" +"99999565" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/counter' "4" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- contracts.out index fd1600886988..33e01b853fae 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- contracts.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- contracts.out @@ -69,11 +69,11 @@ Fatal error: ./octez-client --mode light rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]' -{ "balance": "99999554", "delegate": "[PUBLIC_KEY_HASH]", +{ "balance": "99999565", "delegate": "[PUBLIC_KEY_HASH]", "counter": "4", "revealed": true } ./octez-client --mode light rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"99999554" +"99999565" ./octez-client --mode light rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/counter' "4" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- contracts.out index dd7f1028264c..4fcb3b18c07e 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- contracts.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- contracts.out @@ -69,11 +69,11 @@ Fatal error: ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]' -{ "balance": "99999554", "delegate": "[PUBLIC_KEY_HASH]", +{ "balance": "99999565", "delegate": "[PUBLIC_KEY_HASH]", "counter": "4", "revealed": true } ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"99999554" +"99999565" ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/counter' "4" diff --git a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out index 4513a0f316ce..84301d432c3b 100644 --- a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out +++ b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out @@ -126,7 +126,7 @@ { "kind": "contract", "contract": "[CONTRACT_HASH]", "change": "666666", "origin": "subsidy" } ], - "consumed_milligas": "2261927", "storage_size": "4629", + "consumed_milligas": "2262613", "storage_size": "4629", "paid_storage_size_diff": "1" } ], "proposer_consensus_key": "[PUBLIC_KEY_HASH]", "baker_consensus_key": "[PUBLIC_KEY_HASH]", diff --git a/tezt/tests/expected/companion_key.ml/Alpha- register key as delegate with companion and consensus keys and stake.out b/tezt/tests/expected/companion_key.ml/Alpha- register key as delegate with companion and consensus keys and stake.out index 3cecc93df11c..ab1536cc86c4 100644 --- a/tezt/tests/expected/companion_key.ml/Alpha- register key as delegate with companion and consensus keys and stake.out +++ b/tezt/tests/expected/companion_key.ml/Alpha- register key as delegate with companion and consensus keys and stake.out @@ -3,7 +3,7 @@ Node is bootstrapped. Estimated gas: 184.813 units (will add 0 for safety) Estimated storage: no bytes added -Estimated gas: 100 units (will add 100 for safety) +Estimated gas: 100 units (will add 0 for safety) Estimated storage: no bytes added Estimated gas: 1671.680 units (will add 100 for safety) Estimated storage: no bytes added @@ -31,16 +31,16 @@ This sequence of operations was run: Contract: [PUBLIC_KEY_HASH] Key: [PUBLIC_KEY] This revelation was successfully applied - Consumed gas: 184.482 + Consumed gas: 184.449 Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00017 + Fee to the baker: ꜩ0.000159 Expected counter: 3 - Gas limit: 200 + Gas limit: 100 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00017 - payload fees(the block proposer) ....... +ꜩ0.00017 + [PUBLIC_KEY_HASH] ... -ꜩ0.000159 + payload fees(the block proposer) ....... +ꜩ0.000159 Delegation: Contract: [PUBLIC_KEY_HASH] To: [PUBLIC_KEY_HASH] diff --git a/tezt/tests/expected/companion_key.ml/Alpha- register keys with proofs and stake.out b/tezt/tests/expected/companion_key.ml/Alpha- register keys with proofs and stake.out index 981c664bcdc4..6049596248cc 100644 --- a/tezt/tests/expected/companion_key.ml/Alpha- register keys with proofs and stake.out +++ b/tezt/tests/expected/companion_key.ml/Alpha- register keys with proofs and stake.out @@ -3,7 +3,7 @@ Node is bootstrapped. Estimated gas: 184.813 units (will add 0 for safety) Estimated storage: no bytes added -Estimated gas: 100 units (will add 100 for safety) +Estimated gas: 100 units (will add 0 for safety) Estimated storage: no bytes added Estimated gas: 1671.680 units (will add 100 for safety) Estimated storage: no bytes added @@ -31,16 +31,16 @@ This sequence of operations was run: Contract: [PUBLIC_KEY_HASH] Key: [PUBLIC_KEY] This revelation was successfully applied - Consumed gas: 184.482 + Consumed gas: 184.449 Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00017 + Fee to the baker: ꜩ0.000159 Expected counter: 3 - Gas limit: 200 + Gas limit: 100 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00017 - payload fees(the block proposer) ....... +ꜩ0.00017 + [PUBLIC_KEY_HASH] ... -ꜩ0.000159 + payload fees(the block proposer) ....... +ꜩ0.000159 Delegation: Contract: [PUBLIC_KEY_HASH] To: [PUBLIC_KEY_HASH] diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out index 576d050bbd9c..213c47266aee 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out @@ -6,7 +6,7 @@ Node is bootstrapped. Estimated gas: 178.785 units (will add 0 for safety) Estimated storage: no bytes added -Estimated gas: 100 units (will add 100 for safety) +Estimated gas: 100 units (will add 0 for safety) Estimated storage: no bytes added Estimated gas: 100 units (will add 100 for safety) Estimated storage: no bytes added @@ -32,16 +32,16 @@ This sequence of operations was run: Contract: [PUBLIC_KEY_HASH] Key: [PUBLIC_KEY] This revelation was successfully applied - Consumed gas: 178.520 + Consumed gas: 178.486 Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00017 + Fee to the baker: ꜩ0.000159 Expected counter: 3 - Gas limit: 200 + Gas limit: 100 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00017 - payload fees(the block proposer) ....... +ꜩ0.00017 + [PUBLIC_KEY_HASH] ... -ꜩ0.000159 + payload fees(the block proposer) ....... +ꜩ0.000159 Delegation: Contract: [PUBLIC_KEY_HASH] To: [PUBLIC_KEY_HASH] @@ -92,18 +92,18 @@ This sequence of operations was run: { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, "pending_staking_parameters": [], "baking_power": "0", "total_staked": "0", - "total_delegated": "999999998916", + "total_delegated": "999999998927", "min_delegated_in_current_cycle": - { "amount": "999999998916", + { "amount": "999999998927", "level": { "level": 3, "level_position": 2, "cycle": 0, "cycle_position": 2, "expected_commitment": false } }, - "own_full_balance": "999999998916", "own_staked": "0", - "own_delegated": "999999998916", "external_staked": "0", + "own_full_balance": "999999998927", "own_staked": "0", + "own_delegated": "999999998927", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "999999998916", + "staking_denominator": "0", "current_voting_power": "999999998927", "voting_power": "0", "voting_info": {}, "consensus_key": { "active": @@ -138,20 +138,20 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "666666666097", - "total_staked": "500000000000", "total_delegated": "499999998293", + "pending_staking_parameters": [], "baking_power": "666666666101", + "total_staked": "500000000000", "total_delegated": "499999998304", "min_delegated_in_current_cycle": - { "amount": "499999998293", + { "amount": "499999998304", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "999999998293", "own_staked": "500000000000", - "own_delegated": "499999998293", "external_staked": "0", + "own_full_balance": "999999998304", "own_staked": "500000000000", + "own_delegated": "499999998304", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "999999998293", + "staking_denominator": "0", "current_voting_power": "999999998304", "voting_power": "0", "voting_info": {}, "consensus_key": { "active": diff --git a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out index 8eb8b6ddb01a..7cc23e898fbe 100644 --- a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out +++ b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out @@ -11,20 +11,20 @@ Pair 1 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint mintOrBurn --arg '(Pair 100000000 "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2375.517 units (will add 100 for safety) +Estimated gas: 2376.203 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF' +Operation hash is 'ooHbPBudda8qHFcLGEyiLJNjFNLKMBrfqVxW9tp4n2iLPSmk17F' NOT waiting for the operation to be included. Use command - octez-client wait for opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for ooHbPBudda8qHFcLGEyiLJNjFNLKMBrfqVxW9tp4n2iLPSmk17F to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx Fee to the baker: ꜩ0.00056 Expected counter: 1 - Gas limit: 2476 + Gas limit: 2477 Storage limit: 91 bytes Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00056 @@ -42,7 +42,7 @@ This sequence of operations was run: Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000 Storage size: 1982 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.881 + Consumed gas: 2376.911 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -50,7 +50,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'op968yui6vHCCztECXMB24FEWbMUHed9jQkXbhL5WGM8wXJw96Q' @@ -82,7 +82,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -90,7 +90,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'op8vSFsuf9xDtpELfAXrAD31oBWvx4kvW2QWoEBUKqsiADKYgZB' @@ -122,7 +122,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -130,7 +130,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap3 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'opG2xrHRo7XfsfQ6ury6ArfyEJ7SbyhGtpuMS5nTuqjV78pJbh8' @@ -162,7 +162,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -170,24 +170,24 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 9001 from bootstrap1 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint addLiquidity --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" 0 1000000000 "2050-01-01T00:00:00Z")' Node is bootstrapped. -Estimated gas: 9497.488 units (will add 100 for safety) +Estimated gas: 9500.234 units (will add 100 for safety) Estimated storage: 147 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k' +Operation hash is 'opG74G1pA9kvKEWmSFq1NEBcbaV6iPdNwcq3aSD79FX8eddTdwj' NOT waiting for the operation to be included. Use command - octez-client wait for onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for opG74G1pA9kvKEWmSFq1NEBcbaV6iPdNwcq3aSD79FX8eddTdwj to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - Fee to the baker: ꜩ0.001315 + Fee to the baker: ꜩ0.001316 Expected counter: 3 - Gas limit: 9598 + Gas limit: 9601 Storage limit: 167 bytes Balance updates: - tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.001315 - payload fees(the block proposer) ....... +ꜩ0.001315 + tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.001316 + payload fees(the block proposer) ....... +ꜩ0.001316 Transaction: Amount: ꜩ9001 From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx @@ -203,7 +203,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4635 bytes Paid storage size diff: 6 bytes - Consumed gas: 1450.590 + Consumed gas: 1451.620 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.0015 storage fees ........................... +ꜩ0.0015 @@ -227,7 +227,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598 Storage size: 2264 bytes Paid storage size diff: 69 bytes - Consumed gas: 3690.965 + Consumed gas: 3691.995 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01725 storage fees ........................... +ꜩ0.01725 @@ -244,7 +244,7 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730 Storage size: 2050 bytes Paid storage size diff: 72 bytes - Consumed gas: 2300.350 + Consumed gas: 2301.380 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.018 storage fees ........................... +ꜩ0.018 @@ -252,20 +252,20 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1AafHA1C1vk959wvHWBispY9Y2f3fxBUUo from bootstrap1 --entrypoint approve --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2376.999 units (will add 100 for safety) +Estimated gas: 2377.685 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'ootV3zW3k66DvpHiUBoAVhb5dvGaFXD1vFcjNiHvLTJhpSTvk41' +Operation hash is 'onzmMUuGctWa8ov9ZefMuR112cQwuMnYBaA8HQzhGTe8khNL7HZ' NOT waiting for the operation to be included. Use command - octez-client wait for ootV3zW3k66DvpHiUBoAVhb5dvGaFXD1vFcjNiHvLTJhpSTvk41 to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for onzmMUuGctWa8ov9ZefMuR112cQwuMnYBaA8HQzhGTe8khNL7HZ to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx Fee to the baker: ꜩ0.000555 Expected counter: 4 - Gas limit: 2477 + Gas limit: 2478 Storage limit: 88 bytes Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000555 @@ -284,7 +284,7 @@ This sequence of operations was run: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000 Storage size: 2118 bytes Paid storage size diff: 68 bytes - Consumed gas: 2377.362 + Consumed gas: 2378.392 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 @@ -292,20 +292,20 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1AafHA1C1vk959wvHWBispY9Y2f3fxBUUo from bootstrap2 --entrypoint transfer --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 3741.852 units (will add 100 for safety) +Estimated gas: 3742.538 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. -Operation hash is 'oo8sACXKDiJJ27gt8kko7jDvywwUS3oLr8ZVEPJ2Kz8HtkQMBya' +Operation hash is 'ooJW9ZL5hBQw8N9hK6jP9SabRvJUCtR89oREcGr7RViSpYMZVSh' NOT waiting for the operation to be included. Use command - octez-client wait for oo8sACXKDiJJ27gt8kko7jDvywwUS3oLr8ZVEPJ2Kz8HtkQMBya to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for ooJW9ZL5hBQw8N9hK6jP9SabRvJUCtR89oREcGr7RViSpYMZVSh to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN Fee to the baker: ꜩ0.000742 Expected counter: 2 - Gas limit: 3842 + Gas limit: 3843 Storage limit: 0 bytes Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.000742 @@ -327,25 +327,25 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2158730 Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000 Storage size: 2118 bytes - Consumed gas: 3742.216 + Consumed gas: 3743.246 ./octez-client --mode mockup call KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 from bootstrap2 --entrypoint removeLiquidity --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000 0 0 "2050-01-01T00:00:00Z")' --burn-cap 10 Node is bootstrapped. -Estimated gas: 11102.578 units (will add 100 for safety) +Estimated gas: 11105.324 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'oo3WBjPrt96asNojRu1AZmsr638ZRRzFLxvV7hpbkEHcje463mP' +Operation hash is 'ooj7PBg4eDZ6VBuainwssR17HbvP67DXN8iKXTcb1AsATiEEGnk' NOT waiting for the operation to be included. Use command - octez-client wait for oo3WBjPrt96asNojRu1AZmsr638ZRRzFLxvV7hpbkEHcje463mP to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for ooj7PBg4eDZ6VBuainwssR17HbvP67DXN8iKXTcb1AsATiEEGnk to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN Fee to the baker: ꜩ0.001473 Expected counter: 3 - Gas limit: 11203 + Gas limit: 11206 Storage limit: 87 bytes Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.001473 @@ -364,7 +364,7 @@ This sequence of operations was run: 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4635 bytes - Consumed gas: 1452.097 + Consumed gas: 1453.127 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -378,7 +378,7 @@ This sequence of operations was run: Updated big_maps: Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] Storage size: 2050 bytes - Consumed gas: 2500.309 + Consumed gas: 2501.339 Internal Transaction: Amount: ꜩ0 From: KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 @@ -394,7 +394,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10 Storage size: 2331 bytes Paid storage size diff: 67 bytes - Consumed gas: 2994.305 + Consumed gas: 2995.335 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 diff --git a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out index bb6348138424..6b50f5659601 100644 --- a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out +++ b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out @@ -11,20 +11,20 @@ Pair 1 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint mintOrBurn --arg '(Pair 100000000 "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2375.517 units (will add 100 for safety) +Estimated gas: 2376.203 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF' +Operation hash is 'ooHbPBudda8qHFcLGEyiLJNjFNLKMBrfqVxW9tp4n2iLPSmk17F' NOT waiting for the operation to be included. Use command - octez-client wait for opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for ooHbPBudda8qHFcLGEyiLJNjFNLKMBrfqVxW9tp4n2iLPSmk17F to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx Fee to the baker: ꜩ0.00056 Expected counter: 1 - Gas limit: 2476 + Gas limit: 2477 Storage limit: 91 bytes Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00056 @@ -42,7 +42,7 @@ This sequence of operations was run: Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000 Storage size: 1982 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.881 + Consumed gas: 2376.911 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -50,7 +50,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'op968yui6vHCCztECXMB24FEWbMUHed9jQkXbhL5WGM8wXJw96Q' @@ -82,7 +82,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -90,7 +90,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'op8vSFsuf9xDtpELfAXrAD31oBWvx4kvW2QWoEBUKqsiADKYgZB' @@ -122,7 +122,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -130,7 +130,7 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap3 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 2377.220 units (will add 100 for safety) +Estimated gas: 2377.906 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is 'opG2xrHRo7XfsfQ6ury6ArfyEJ7SbyhGtpuMS5nTuqjV78pJbh8' @@ -162,7 +162,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2377.584 + Consumed gas: 2378.614 Balance updates: tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 @@ -170,24 +170,24 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 9001 from bootstrap1 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint addLiquidity --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" 0 1000000000 "2050-01-01T00:00:00Z")' Node is bootstrapped. -Estimated gas: 9497.488 units (will add 100 for safety) +Estimated gas: 9500.234 units (will add 100 for safety) Estimated storage: 147 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k' +Operation hash is 'opG74G1pA9kvKEWmSFq1NEBcbaV6iPdNwcq3aSD79FX8eddTdwj' NOT waiting for the operation to be included. Use command - octez-client wait for onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for opG74G1pA9kvKEWmSFq1NEBcbaV6iPdNwcq3aSD79FX8eddTdwj to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - Fee to the baker: ꜩ0.001315 + Fee to the baker: ꜩ0.001316 Expected counter: 3 - Gas limit: 9598 + Gas limit: 9601 Storage limit: 167 bytes Balance updates: - tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.001315 - payload fees(the block proposer) ....... +ꜩ0.001315 + tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.001316 + payload fees(the block proposer) ....... +ꜩ0.001316 Transaction: Amount: ꜩ9001 From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx @@ -203,7 +203,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4635 bytes Paid storage size diff: 6 bytes - Consumed gas: 1450.590 + Consumed gas: 1451.620 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.0015 storage fees ........................... +ꜩ0.0015 @@ -227,7 +227,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598 Storage size: 2264 bytes Paid storage size diff: 69 bytes - Consumed gas: 3690.965 + Consumed gas: 3691.995 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01725 storage fees ........................... +ꜩ0.01725 @@ -244,7 +244,7 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730 Storage size: 2050 bytes Paid storage size diff: 72 bytes - Consumed gas: 2300.350 + Consumed gas: 2301.380 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.018 storage fees ........................... +ꜩ0.018 @@ -252,20 +252,20 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 9001 from bootstrap2 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint xtzToToken --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 0 "2050-01-01T00:00:00Z")' Node is bootstrapped. -Estimated gas: 8070.421 units (will add 100 for safety) +Estimated gas: 8072.137 units (will add 100 for safety) Estimated storage: 327 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'ooTgurzrZgVEpPP8tX9Vh9wFRqgnZnkCrGe2e2cutcyjm9yNThe' +Operation hash is 'onk56S8eM1obPezSs1ySAVB8UNuUxevfirrzSmPAC1gPdELqnVF' NOT waiting for the operation to be included. Use command - octez-client wait for ooTgurzrZgVEpPP8tX9Vh9wFRqgnZnkCrGe2e2cutcyjm9yNThe to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for onk56S8eM1obPezSs1ySAVB8UNuUxevfirrzSmPAC1gPdELqnVF to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN Fee to the baker: ꜩ0.001165 Expected counter: 2 - Gas limit: 8171 + Gas limit: 8173 Storage limit: 347 bytes Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.001165 @@ -285,7 +285,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4636 bytes Paid storage size diff: 1 bytes - Consumed gas: 920.247 + Consumed gas: 921.277 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.00025 storage fees ........................... +ꜩ0.00025 @@ -307,7 +307,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10788 Storage size: 2333 bytes Paid storage size diff: 69 bytes - Consumed gas: 2994.339 + Consumed gas: 2995.369 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01725 storage fees ........................... +ꜩ0.01725 @@ -326,20 +326,20 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint transfer --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" 100)' --burn-cap 10 Node is bootstrapped. -Estimated gas: 3075.593 units (will add 100 for safety) +Estimated gas: 3076.279 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'opCvYgUossHCJMw2bwAuZsKVWZPerUVdvQWEo2JpoM7SAWmX5LU' +Operation hash is 'op7Fm2sKd3qnoxCHie6XetYVtMkaC64pYAQ8GiYYWh6GLh8RMyP' NOT waiting for the operation to be included. Use command - octez-client wait for opCvYgUossHCJMw2bwAuZsKVWZPerUVdvQWEo2JpoM7SAWmX5LU to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for op7Fm2sKd3qnoxCHie6XetYVtMkaC64pYAQ8GiYYWh6GLh8RMyP to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN Fee to the baker: ꜩ0.000675 Expected counter: 3 - Gas limit: 3176 + Gas limit: 3177 Storage limit: 88 bytes Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.000675 @@ -360,7 +360,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10688 Storage size: 2401 bytes Paid storage size diff: 68 bytes - Consumed gas: 3075.957 + Consumed gas: 3076.987 Balance updates: tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 @@ -368,20 +368,20 @@ This sequence of operations was run: ./octez-client --mode mockup call KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 from bootstrap3 --entrypoint tokenToXtz --arg '(Pair "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" 100 0 "2050-01-01T00:00:00Z")' --burn-cap 10 Node is bootstrapped. -Estimated gas: 11067.428 units (will add 100 for safety) +Estimated gas: 11069.144 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. -Operation hash is 'oouiqtyogD9wGzuZxFETeargpq8TChwdnkdf9toy3qSxeeCJ3Wa' +Operation hash is 'onoLdHNmPZpay8j4HyD9xLFrBMFHpvVj9wXDHGV4dAWH5dXTvBf' NOT waiting for the operation to be included. Use command - octez-client wait for oouiqtyogD9wGzuZxFETeargpq8TChwdnkdf9toy3qSxeeCJ3Wa to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + octez-client wait for onoLdHNmPZpay8j4HyD9xLFrBMFHpvVj9wXDHGV4dAWH5dXTvBf to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU Fee to the baker: ꜩ0.001462 Expected counter: 2 - Gas limit: 11168 + Gas limit: 11170 Storage limit: 0 bytes Balance updates: tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU ... -ꜩ0.001462 @@ -400,7 +400,7 @@ This sequence of operations was run: 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4636 bytes - Consumed gas: 920.738 + Consumed gas: 921.768 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -418,7 +418,7 @@ This sequence of operations was run: Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6] Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 10910 Storage size: 2333 bytes - Consumed gas: 3890.781 + Consumed gas: 3891.811 Internal Transaction: Amount: ꜩ164.584923 From: KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_level.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_level.out index 7e80a9ada435..d51745801ac9 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_level.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_level.out @@ -45,7 +45,7 @@ Contract memorized as level. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1277.146 units (will add 100 for safety) +Estimated gas: 1277.832 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -70,7 +70,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 1 Storage size: 40 bytes - Consumed gas: 1277.818 + Consumed gas: 1278.848 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' @@ -81,7 +81,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1277.758 units (will add 100 for safety) +Estimated gas: 1278.788 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -94,7 +94,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000386 Expected counter: 3 - Gas limit: 1378 + Gas limit: 1379 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000386 @@ -106,7 +106,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 4 Storage size: 40 bytes - Consumed gas: 1277.692 + Consumed gas: 1278.722 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_now.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_now.out index 44009ded0d20..ea78c39858f6 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_now.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_now.out @@ -45,7 +45,7 @@ Contract memorized as store_now. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1277.238 units (will add 100 for safety) +Estimated gas: 1277.924 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -70,7 +70,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 1 Storage size: 40 bytes - Consumed gas: 1277.860 + Consumed gas: 1278.890 ./octez-client --mode mockup rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/storage' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_self.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_self.out index a45707bfefb9..3bcafae7743a 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_self.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_self.out @@ -45,7 +45,7 @@ Contract memorized as self. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1279.520 units (will add 100 for safety) +Estimated gas: 1280.206 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -56,13 +56,13 @@ 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.000386 + Fee to the baker: ꜩ0.000387 Expected counter: 2 - Gas limit: 1380 + Gas limit: 1381 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000386 - payload fees(the block proposer) ....... +ꜩ0.000386 + [PUBLIC_KEY_HASH] ... -ꜩ0.000387 + payload fees(the block proposer) ....... +ꜩ0.000387 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -70,7 +70,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x01fabd76c7ade40ef0e6a7b2be514d9e617e0a424800 Storage size: 67 bytes - Consumed gas: 1280.099 + Consumed gas: 1281.129 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out index caf29e0cef4d..e4d080dbd178 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out @@ -95,7 +95,7 @@ Contract memorized as sender. ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1278.793 units (will add 100 for safety) +Estimated gas: 1279.479 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -108,7 +108,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000386 Expected counter: 1 - Gas limit: 1379 + Gas limit: 1380 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000386 @@ -120,7 +120,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 1279.372 + Consumed gas: 1280.402 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' @@ -128,7 +128,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.882 units (will add 100 for safety) +Estimated gas: 2950.297 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -139,13 +139,13 @@ 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.000599 + Fee to the baker: ꜩ0.0006 Expected counter: 2 - Gas limit: 3049 + Gas limit: 3051 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000599 - payload fees(the block proposer) ....... +ꜩ0.000599 + [PUBLIC_KEY_HASH] ... -ꜩ0.0006 + payload fees(the block proposer) ....... +ꜩ0.0006 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -154,7 +154,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 1739.356 + Consumed gas: 1740.386 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -163,7 +163,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x01c144b1848cb3943f64c69648f0b9e477d96c540600 Storage size: 65 bytes - Consumed gas: 1210.707 + Consumed gas: 1211.737 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_set_delegate.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_set_delegate.out index c7e436fac34b..d5b9b1f3d985 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_set_delegate.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_set_delegate.out @@ -45,7 +45,7 @@ Contract memorized as set_delegate. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '(Some "[PUBLIC_KEY_HASH]")' Node is bootstrapped. -Estimated gas: 1385.229 units (will add 100 for safety) +Estimated gas: 1385.915 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -71,7 +71,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 1285.808 + Consumed gas: 1286.838 Internal operations: Internal Delegation: Contract: [CONTRACT_HASH] @@ -82,7 +82,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg None Node is bootstrapped. -Estimated gas: 1379.351 units (will add 100 for safety) +Estimated gas: 1380.037 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -93,13 +93,13 @@ 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.000403 + Fee to the baker: ꜩ0.000404 Expected counter: 3 - Gas limit: 1480 + Gas limit: 1481 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000403 - payload fees(the block proposer) ....... +ꜩ0.000403 + [PUBLIC_KEY_HASH] ... -ꜩ0.000404 + payload fees(the block proposer) ....... +ꜩ0.000404 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -108,7 +108,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 1279.930 + Consumed gas: 1280.960 Internal operations: Internal Delegation: Contract: [CONTRACT_HASH] diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out index 094552210787..9662dbfa4fde 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out @@ -417,7 +417,7 @@ Fatal error: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")' Node is bootstrapped. -Estimated gas: 3625.177 units (will add 100 for safety) +Estimated gas: 3625.863 units (will add 100 for safety) Estimated storage: 257 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -445,7 +445,7 @@ This sequence of operations was run: Updated storage: 0x0103fe5753baadb56a4836e34571ce4cbe82158ee40eba872b848f709699019725ba Storage size: 578 bytes - Consumed gas: 1525.659 + Consumed gas: 1526.689 Internal operations: Internal Transaction: Amount: ꜩ1 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out index b7c989cd3449..29b8bd2e47d6 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out @@ -95,7 +95,7 @@ Contract memorized as source. ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1278.793 units (will add 100 for safety) +Estimated gas: 1279.479 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -108,7 +108,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000386 Expected counter: 1 - Gas limit: 1379 + Gas limit: 1380 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000386 @@ -120,7 +120,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 1279.372 + Consumed gas: 1280.402 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' @@ -128,7 +128,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.882 units (will add 100 for safety) +Estimated gas: 2950.297 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -139,13 +139,13 @@ 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.000599 + Fee to the baker: ꜩ0.0006 Expected counter: 2 - Gas limit: 3049 + Gas limit: 3051 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000599 - payload fees(the block proposer) ....... +ꜩ0.000599 + [PUBLIC_KEY_HASH] ... -ꜩ0.0006 + payload fees(the block proposer) ....... +ꜩ0.0006 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -154,7 +154,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 1739.356 + Consumed gas: 1740.386 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -163,7 +163,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 1210.707 + Consumed gas: 1211.737 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out index 7ed8e75b7ac6..e473fcc28a66 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out @@ -67,7 +67,7 @@ Contract memorized as split_bytes. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg 0xaabbcc Node is bootstrapped. -Estimated gas: 1319.826 units (will add 100 for safety) +Estimated gas: 1320.512 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -78,13 +78,13 @@ 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.000403 + Fee to the baker: ꜩ0.000404 Expected counter: 2 - Gas limit: 1420 + Gas limit: 1421 Storage limit: 38 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000403 - payload fees(the block proposer) ....... +ꜩ0.000403 + [PUBLIC_KEY_HASH] ... -ꜩ0.000404 + payload fees(the block proposer) ....... +ꜩ0.000404 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -94,7 +94,7 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 1320.319 + Consumed gas: 1321.349 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -105,7 +105,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg 0xddeeff Node is bootstrapped. -Estimated gas: 1322.442 units (will add 100 for safety) +Estimated gas: 1323.128 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -118,7 +118,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000404 Expected counter: 3 - Gas limit: 1423 + Gas limit: 1424 Storage limit: 38 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000404 @@ -132,7 +132,7 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff } Storage size: 290 bytes Paid storage size diff: 18 bytes - Consumed gas: 1322.935 + Consumed gas: 1323.965 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out index 13dea81cffaf..a6c2c1df3f18 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out @@ -67,7 +67,7 @@ Contract memorized as split_string. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"abc"' Node is bootstrapped. -Estimated gas: 1319.891 units (will add 100 for safety) +Estimated gas: 1320.577 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -78,13 +78,13 @@ 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.000403 + Fee to the baker: ꜩ0.000404 Expected counter: 2 - Gas limit: 1420 + Gas limit: 1421 Storage limit: 38 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000403 - payload fees(the block proposer) ....... +ꜩ0.000403 + [PUBLIC_KEY_HASH] ... -ꜩ0.000404 + payload fees(the block proposer) ....... +ꜩ0.000404 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -94,7 +94,7 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 1320.384 + Consumed gas: 1321.414 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -105,7 +105,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"def"' Node is bootstrapped. -Estimated gas: 1322.582 units (will add 100 for safety) +Estimated gas: 1323.268 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -118,7 +118,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000404 Expected counter: 3 - Gas limit: 1423 + Gas limit: 1424 Storage limit: 38 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000404 @@ -132,7 +132,7 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" ; "d" ; "e" ; "f" } Storage size: 290 bytes Paid storage size diff: 18 bytes - Consumed gas: 1323.075 + Consumed gas: 1324.105 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out index 4a2d23ec90c1..8d42851b6d6c 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out @@ -45,7 +45,7 @@ Contract memorized as store_input. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"abcdefg"' Node is bootstrapped. -Estimated gas: 1277.540 units (will add 100 for safety) +Estimated gas: 1278.226 units (will add 100 for safety) Estimated storage: 7 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -58,7 +58,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000403 Expected counter: 2 - Gas limit: 1378 + Gas limit: 1379 Storage limit: 27 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000403 @@ -72,7 +72,7 @@ This sequence of operations was run: Updated storage: "abcdefg" Storage size: 48 bytes Paid storage size diff: 7 bytes - Consumed gas: 1278.162 + Consumed gas: 1279.192 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00175 storage fees ........................... +ꜩ0.00175 @@ -83,7 +83,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"xyz"' Node is bootstrapped. -Estimated gas: 1277.556 units (will add 100 for safety) +Estimated gas: 1278.242 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -96,7 +96,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000399 Expected counter: 3 - Gas limit: 1378 + Gas limit: 1379 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000399 @@ -109,7 +109,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: "xyz" Storage size: 44 bytes - Consumed gas: 1278.178 + Consumed gas: 1279.208 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]' diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_amount.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_amount.out index d9fe0987239b..e891b3c00367 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_amount.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_amount.out @@ -45,7 +45,7 @@ Contract memorized as transfer_amount. ./octez-client --mode mockup --wait none transfer 500 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg Unit Node is bootstrapped. -Estimated gas: 1277.412 units (will add 100 for safety) +Estimated gas: 1278.098 units (will add 100 for safety) Estimated storage: 4 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -58,7 +58,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.00039 Expected counter: 2 - Gas limit: 1378 + Gas limit: 1379 Storage limit: 24 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00039 @@ -71,7 +71,7 @@ This sequence of operations was run: Updated storage: 500000000 Storage size: 44 bytes Paid storage size diff: 4 bytes - Consumed gas: 1277.991 + Consumed gas: 1279.021 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001 storage fees ........................... +ꜩ0.001 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out index 336a37392f68..53bdf4dc7030 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out @@ -143,7 +143,7 @@ Contract memorized as transfer_tokens. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.415 units (will add 100 for safety) +Estimated gas: 2949.830 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -156,7 +156,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000599 Expected counter: 4 - Gas limit: 3049 + Gas limit: 3050 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000599 @@ -169,7 +169,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 1741.268 + Consumed gas: 1742.298 Internal operations: Internal Transaction: Amount: ꜩ100 @@ -178,7 +178,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 1208.328 + Consumed gas: 1209.358 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -186,7 +186,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.415 units (will add 100 for safety) +Estimated gas: 2949.830 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -199,7 +199,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000599 Expected counter: 5 - Gas limit: 3049 + Gas limit: 3050 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000599 @@ -212,7 +212,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 1741.268 + Consumed gas: 1742.298 Internal operations: Internal Transaction: Amount: ꜩ100 @@ -221,7 +221,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 1208.328 + Consumed gas: 1209.358 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 diff --git a/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out b/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out index 2a884632e8fc..3134ce28a303 100644 --- a/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out +++ b/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out @@ -55,7 +55,7 @@ Contract memorized as originate_contract. ./octez-client --mode mockup --wait none transfer 1 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg Unit Node is bootstrapped. -Estimated gas: 1793.731 units (will add 100 for safety) +Estimated gas: 1794.417 units (will add 100 for safety) Estimated storage: 295 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -68,7 +68,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000441 Expected counter: 1 - Gas limit: 1894 + Gas limit: 1895 Storage limit: 315 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000441 @@ -80,7 +80,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 93 bytes - Consumed gas: 1289.005 + Consumed gas: 1290.035 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 [CONTRACT_HASH] ... +ꜩ1 diff --git a/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out b/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out index 0f24e6c31272..abbbcb3e2a4a 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out +++ b/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out @@ -39,7 +39,7 @@ This sequence of operations was run: Node is bootstrapped. Estimated gas: 170.702 units (will add 0 for safety) Estimated storage: no bytes added -Estimated gas: 100 units (will add 100 for safety) +Estimated gas: 100 units (will add 0 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -61,16 +61,16 @@ This sequence of operations was run: Contract: [PUBLIC_KEY_HASH] Key: [PUBLIC_KEY] This revelation was successfully applied - Consumed gas: 170.570 + Consumed gas: 170.536 Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00017 + Fee to the baker: ꜩ0.000159 Expected counter: 3 - Gas limit: 200 + Gas limit: 100 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00017 - payload fees(the block proposer) ....... +ꜩ0.00017 + [PUBLIC_KEY_HASH] ... -ꜩ0.000159 + payload fees(the block proposer) ....... +ꜩ0.000159 Delegation: Contract: [PUBLIC_KEY_HASH] To: [PUBLIC_KEY_HASH] @@ -125,19 +125,19 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "499933332977", - "total_staked": "499900000000", "total_delegated": "99998931", + "pending_staking_parameters": [], "baking_power": "499933332980", + "total_staked": "499900000000", "total_delegated": "99998942", "min_delegated_in_current_cycle": - { "amount": "99998931", + { "amount": "99998942", "level": { "level": 4, "level_position": 3, "cycle": 0, "cycle_position": 3, "expected_commitment": true } }, - "own_full_balance": "499999998931", "own_staked": "499900000000", - "own_delegated": "99998931", "external_staked": "0", + "own_full_balance": "499999998942", "own_staked": "499900000000", + "own_delegated": "99998942", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "499999998931", + "staking_denominator": "0", "current_voting_power": "499999998942", "voting_power": "0", "voting_info": {}, "consensus_key": { "active": diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out index 214deca6d01a..0abeae2fe79f 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out @@ -1,6 +1,6 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata 200 OK -{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-40879","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40879","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-258897","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"258897","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"206420","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} +{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-40879","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40879","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-258897","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"258897","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"207450","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", @@ -152,7 +152,7 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata "origin": "subsidy" } ], - "consumed_milligas": "206420", + "consumed_milligas": "207450", "storage_size": "4629" } ], diff --git a/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for contract call operation.out b/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for contract call operation.out index bfafd05f5173..2110d017f07b 100644 --- a/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for contract call operation.out +++ b/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for contract call operation.out @@ -1 +1 @@ -transaction; mini_scenarios/check_signature, 347, 1459.623000 +transaction; mini_scenarios/check_signature, 347, 1460.653000 diff --git a/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out b/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out index 4592b107141d..1e6bfb47de13 100644 --- a/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out +++ b/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out @@ -101,7 +101,7 @@ Contract memorized as self_address_receiver. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2961.427 units (will add 100 for safety) +Estimated gas: 2962.842 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -114,7 +114,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000601 Expected counter: 1 - Gas limit: 3062 + Gas limit: 3063 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000601 @@ -127,7 +127,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 82 bytes - Consumed gas: 1745.840 + Consumed gas: 1746.870 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -137,5 +137,5 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 83 bytes - Consumed gas: 1216.725 + Consumed gas: 1217.755 diff --git a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out index 3e1bc9c2e94a..680d29e3d5c7 100644 --- a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out +++ b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '(Pair "[CONTRACT_HASH]" "[CONTRACT_HASH]")' Node is bootstrapped. -Estimated gas: 7899.569 units (will add 100 for safety) +Estimated gas: 7901.971 units (will add 100 for safety) Estimated storage: 475 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -12,13 +12,13 @@ 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.001138 + Fee to the baker: ꜩ0.001139 Expected counter: 1 - Gas limit: 8000 + Gas limit: 8002 Storage limit: 495 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001138 - payload fees(the block proposer) ....... +ꜩ0.001138 + [PUBLIC_KEY_HASH] ... -ꜩ0.001139 + payload fees(the block proposer) ....... +ꜩ0.001139 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -31,7 +31,7 @@ This sequence of operations was run: Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "green" 1) } Storage size: 525 bytes Paid storage size diff: 325 bytes - Consumed gas: 3193.024 + Consumed gas: 3194.054 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.08125 storage fees ........................... +ꜩ0.08125 @@ -59,7 +59,7 @@ This sequence of operations was run: (Some (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1))) Storage size: 169 bytes Paid storage size diff: 108 bytes - Consumed gas: 2818.019 + Consumed gas: 2819.049 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.027 storage fees ........................... +ꜩ0.027 @@ -79,7 +79,7 @@ This sequence of operations was run: (Some (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1))) Storage size: 88 bytes Paid storage size diff: 42 bytes - Consumed gas: 1889.697 + Consumed gas: 1890.727 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0105 storage fees ........................... +ꜩ0.0105 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out index fb805354308b..589c83b7c7e3 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out @@ -58,7 +58,7 @@ Contract memorized as add_clear_tickets. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "A"' Node is bootstrapped. -Estimated gas: 1751.651 units (will add 100 for safety) +Estimated gas: 1752.337 units (will add 100 for safety) Estimated storage: 105 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -71,7 +71,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000453 Expected counter: 1 - Gas limit: 1852 + Gas limit: 1853 Storage limit: 125 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000453 @@ -87,7 +87,7 @@ This sequence of operations was run: { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "A" 1) } Storage size: 180 bytes Paid storage size diff: 105 bytes - Consumed gas: 1752.186 + Consumed gas: 1753.216 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02625 storage fees ........................... +ꜩ0.02625 @@ -101,7 +101,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint clear --arg Unit Node is bootstrapped. -Estimated gas: 1941.323 units (will add 100 for safety) +Estimated gas: 1942.009 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -114,7 +114,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000466 Expected counter: 2 - Gas limit: 2042 + Gas limit: 2043 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000466 @@ -127,7 +127,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 141 bytes - Consumed gas: 1941.859 + Consumed gas: 1942.889 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -138,7 +138,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "B"' Node is bootstrapped. -Estimated gas: 1751.651 units (will add 100 for safety) +Estimated gas: 1752.337 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -151,7 +151,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000453 Expected counter: 3 - Gas limit: 1852 + Gas limit: 1853 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000453 @@ -166,7 +166,7 @@ This sequence of operations was run: Updated storage: { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) } Storage size: 180 bytes - Consumed gas: 1752.186 + Consumed gas: 1753.216 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -177,7 +177,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "C"' Node is bootstrapped. -Estimated gas: 2433.661 units (will add 100 for safety) +Estimated gas: 2434.347 units (will add 100 for safety) Estimated storage: 105 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -190,7 +190,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000521 Expected counter: 4 - Gas limit: 2534 + Gas limit: 2535 Storage limit: 125 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000521 @@ -207,7 +207,7 @@ This sequence of operations was run: Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) } Storage size: 219 bytes Paid storage size diff: 105 bytes - Consumed gas: 2434.196 + Consumed gas: 2435.226 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02625 storage fees ........................... +ꜩ0.02625 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out index 0b5df1b13f4a..36ab529f6eb6 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 2784.256 units (will add 100 for safety) +Estimated gas: 2785.286 units (will add 100 for safety) Estimated storage: 132 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000584 Expected counter: 3 - Gas limit: 2885 + Gas limit: 2886 Storage limit: 152 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000584 @@ -28,7 +28,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 197 bytes Paid storage size diff: 132 bytes - Consumed gas: 2674.291 + Consumed gas: 2675.321 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.033 storage fees ........................... +ꜩ0.033 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out index 0f74fb28670f..ecf215155487 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -73,7 +73,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 2 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out index 2f058a677b5e..fe546b6fc79f 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint store --arg 'Pair 99 {Pair "garbage" (Ticket "[CONTRACT_HASH]" string "Ticket1" 1) ; Pair "garbage" (Ticket "[CONTRACT_HASH]" string "Ticket2" 2)}' Node is bootstrapped. -Estimated gas: 4002.105 units (will add 100 for safety) +Estimated gas: 4003.135 units (will add 100 for safety) Estimated storage: 222 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000843 Expected counter: 4 - Gas limit: 4103 + Gas limit: 4104 Storage limit: 242 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000843 @@ -33,7 +33,7 @@ This sequence of operations was run: Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket1" 1) } Storage size: 287 bytes Paid storage size diff: 222 bytes - Consumed gas: 4002.072 + Consumed gas: 4003.102 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0555 storage fees ........................... +ꜩ0.0555 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out index 389d74690982..b76593133bf6 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint save --arg 'Pair "[CONTRACT_HASH]" (Pair "Ticket" 1)' Node is bootstrapped. -Estimated gas: 3081.619 units (will add 100 for safety) +Estimated gas: 3082.649 units (will add 100 for safety) Estimated storage: 44 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000635 Expected counter: 4 - Gas limit: 3182 + Gas limit: 3183 Storage limit: 64 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000635 @@ -30,7 +30,7 @@ This sequence of operations was run: { Pair 0x01fb08747351ab3652f772910c4565880d8df616f800 (Pair "Ticket" 1) } Storage size: 238 bytes Paid storage size diff: 44 bytes - Consumed gas: 3081.553 + Consumed gas: 3082.583 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out index d1d253d0e408..ba4778319ebd 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out @@ -163,7 +163,7 @@ Contract memorized as tickets_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 3' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -176,7 +176,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 4 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -190,7 +190,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -263,7 +263,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap2 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1 Node is bootstrapped. -Estimated gas: 3206.843 units (will add 100 for safety) +Estimated gas: 3207.529 units (will add 100 for safety) Estimated storage: 110 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -276,7 +276,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.00063 Expected counter: 1 - Gas limit: 3307 + Gas limit: 3308 Storage limit: 130 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00063 @@ -313,7 +313,7 @@ This sequence of operations was run: { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) } Storage size: 238 bytes Paid storage size diff: 44 bytes - Consumed gas: 1910.859 + Consumed gas: 1911.889 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 @@ -333,7 +333,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 4716.890 units (will add 100 for safety) +Estimated gas: 4718.348 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -346,7 +346,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000781 Expected counter: 6 - Gas limit: 4817 + Gas limit: 4819 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000781 @@ -360,7 +360,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 194 bytes - Consumed gas: 2864.303 + Consumed gas: 2865.333 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -377,7 +377,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 1853.638 + Consumed gas: 1854.668 ./octez-client --mode mockup get ticket balance for '[CONTRACT_HASH]' with ticketer '[CONTRACT_HASH]' and type string and content '"Ticket"' diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out index 322a7fd6c045..f2e9b2423b24 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out @@ -61,7 +61,7 @@ Contract memorized as tickets_send_with_tez. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[PUBLIC_KEY_HASH]"' Node is bootstrapped. -Estimated gas: 3857.132 units (will add 100 for safety) +Estimated gas: 3857.818 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -88,7 +88,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 154 bytes Paid storage size diff: 66 bytes - Consumed gas: 1757.270 + Consumed gas: 1758.300 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out index 5d919fc8d60f..adfae9e6fe2d 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out @@ -109,7 +109,7 @@ Contract memorized as tickets_list_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 4063.855 units (will add 100 for safety) +Estimated gas: 4065.313 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -122,7 +122,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000711 Expected counter: 3 - Gas limit: 4164 + Gas limit: 4166 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000711 @@ -136,7 +136,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 145 bytes Paid storage size diff: 66 bytes - Consumed gas: 2211.251 + Consumed gas: 2212.281 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -149,7 +149,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 42 bytes - Consumed gas: 1853.656 + Consumed gas: 1854.686 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[PUBLIC_KEY_HASH]"' diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out index b882fd2bf3b4..60496bd3d11f 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -73,7 +73,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 2 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out index 99e39b4293a2..c6366aada35f 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out @@ -137,7 +137,7 @@ Contract memorized as send_tickets_in_big_map. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 30 --storage-limit 1000000 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 98835.841 units (will add 100 for safety) +Estimated gas: 98837.342 units (will add 100 for safety) Estimated storage: 10767 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -150,7 +150,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.01019 Expected counter: 1 - Gas limit: 98936 + Gas limit: 98938 Storage limit: 10787 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01019 @@ -266,7 +266,7 @@ This sequence of operations was run: Set temp(1)[40] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1)) Storage size: 320 bytes Paid storage size diff: 67 bytes - Consumed gas: 49910.055 + Consumed gas: 49911.085 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 @@ -283,7 +283,7 @@ This sequence of operations was run: Copy temp(1) to map(5) Storage size: 10783 bytes Paid storage size diff: 10700 bytes - Consumed gas: 48926.775 + Consumed gas: 48927.805 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ2.675 storage fees ........................... +ꜩ2.675 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out index e26b3fd99068..cb00f5bd5e74 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint store --arg 'Pair 99 {Pair "garbage" (Pair "[CONTRACT_HASH]" (Pair "Ticket1" 1)) ; Pair "garbage" (Pair "[CONTRACT_HASH]" (Pair "Ticket2" 2))}' Node is bootstrapped. -Estimated gas: 4001.421 units (will add 100 for safety) +Estimated gas: 4002.451 units (will add 100 for safety) Estimated storage: 222 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000827 Expected counter: 4 - Gas limit: 4102 + Gas limit: 4103 Storage limit: 242 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000827 @@ -33,7 +33,7 @@ This sequence of operations was run: Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket1" 1) } Storage size: 287 bytes Paid storage size diff: 222 bytes - Consumed gas: 4001.388 + Consumed gas: 4002.418 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0555 storage fees ........................... +ꜩ0.0555 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out index f228d2fbf1ef..a39b8ee7fc01 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint save --arg 'Ticket "[CONTRACT_HASH]" string "Ticket" 1' Node is bootstrapped. -Estimated gas: 3081.961 units (will add 100 for safety) +Estimated gas: 3082.991 units (will add 100 for safety) Estimated storage: 44 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000643 Expected counter: 4 - Gas limit: 3182 + Gas limit: 3183 Storage limit: 64 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000643 @@ -30,7 +30,7 @@ This sequence of operations was run: { Pair 0x01fb08747351ab3652f772910c4565880d8df616f800 (Pair "Ticket" 1) } Storage size: 238 bytes Paid storage size diff: 44 bytes - Consumed gas: 3081.895 + Consumed gas: 3082.925 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out index fcbfdfa4f4b6..96fc1c817759 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out @@ -119,7 +119,7 @@ Contract memorized as tickets_bag_implicit. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -132,7 +132,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 3 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -146,7 +146,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -171,7 +171,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap1 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1 Node is bootstrapped. -Estimated gas: 3176.332 units (will add 100 for safety) +Estimated gas: 3177.018 units (will add 100 for safety) Estimated storage: 44 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -184,7 +184,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000626 Expected counter: 4 - Gas limit: 3277 + Gas limit: 3278 Storage limit: 64 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000626 @@ -217,7 +217,7 @@ This sequence of operations was run: { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) } Storage size: 227 bytes Paid storage size diff: 44 bytes - Consumed gas: 1910.352 + Consumed gas: 1911.382 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 @@ -237,7 +237,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[PUBLIC_KEY_HASH]"' Node is bootstrapped. -Estimated gas: 4511.210 units (will add 100 for safety) +Estimated gas: 4511.896 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -264,7 +264,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 183 bytes - Consumed gas: 2411.347 + Consumed gas: 2412.377 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out index 20ac3b1aa29f..ab279f638355 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -73,7 +73,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 2 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out index d916565f422a..50de6c1f1895 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint mint Node is bootstrapped. -Estimated gas: 2222.033 units (will add 100 for safety) +Estimated gas: 2223.063 units (will add 100 for safety) Estimated storage: 221 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000494 Expected counter: 3 - Gas limit: 2323 + Gas limit: 2324 Storage limit: 241 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000494 @@ -30,7 +30,7 @@ This sequence of operations was run: Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket" 1) } Storage size: 309 bytes Paid storage size diff: 221 bytes - Consumed gas: 2222 + Consumed gas: 2223.030 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.05525 storage fees ........................... +ꜩ0.05525 @@ -49,7 +49,7 @@ This sequence of operations was run: ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 3141.953 units (will add 100 for safety) +Estimated gas: 3142.983 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -62,7 +62,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000624 Expected counter: 4 - Gas limit: 3242 + Gas limit: 3243 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000624 @@ -76,7 +76,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 220 bytes - Consumed gas: 3031.954 + Consumed gas: 3032.984 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out index fa54a8a3d896..38556d6d7f71 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out @@ -104,7 +104,7 @@ Contract memorized as tickets_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -117,7 +117,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 3 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -131,7 +131,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -153,7 +153,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[CONTRACT_HASH]" 1' Node is bootstrapped. -Estimated gas: 4063.823 units (will add 100 for safety) +Estimated gas: 4065.281 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -166,7 +166,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000715 Expected counter: 4 - Gas limit: 4164 + Gas limit: 4166 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000715 @@ -180,7 +180,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 2211.236 + Consumed gas: 2212.266 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -193,5 +193,5 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 1853.638 + Consumed gas: 1854.668 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out index 5d34b59352de..bc6964c5c271 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 3858.650 units (will add 100 for safety) +Estimated gas: 3859.336 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -73,7 +73,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000694 Expected counter: 2 - Gas limit: 3959 + Gas limit: 3960 Storage limit: 86 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000694 @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.787 + Consumed gas: 1759.817 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out index 52a59d964c2f..287f9ddf6737 100644 --- a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out +++ b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1000 --arg 'Pair (Pair "[SMART_ROLLUP_HASH]" "[PUBLIC_KEY_HASH]") (Pair 450 "Hello, Ticket!")' Node is bootstrapped. -Estimated gas: 2329.875 units (will add 100 for safety) +Estimated gas: 2330.905 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -12,13 +12,13 @@ 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.000606 + Fee to the baker: ꜩ0.000607 Expected counter: 3 - Gas limit: 2430 + Gas limit: 2431 Storage limit: 87 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000606 - payload fees(the block proposer) ....... +ꜩ0.000606 + [PUBLIC_KEY_HASH] ... -ꜩ0.000607 + payload fees(the block proposer) ....... +ꜩ0.000607 Transaction: Amount: ꜩ0 From: [PUBLIC_KEY_HASH] @@ -29,7 +29,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 205 bytes Paid storage size diff: 67 bytes - Consumed gas: 2222.857 + Consumed gas: 2223.887 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 @@ -110,7 +110,7 @@ GET http://[HOST]:[PORT]/global/block/12/total_ticks ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from bootstrap1 for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 Node is bootstrapped. -Estimated gas: 6269.903 units (will add 100 for safety) +Estimated gas: 6271.963 units (will add 100 for safety) Estimated storage: 125 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -121,19 +121,19 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.001625 + Fee to the baker: ꜩ0.001626 Expected counter: 8 - Gas limit: 6370 + Gas limit: 6372 Storage limit: 145 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001625 - payload fees(the block proposer) ....... +ꜩ0.001625 + [PUBLIC_KEY_HASH] ... -ꜩ0.001626 + payload fees(the block proposer) ....... +ꜩ0.001626 Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] This smart output message execution was successfully applied Paid storage size diff: 72 bytes - Consumed gas: 5060.896 + Consumed gas: 5061.926 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.018 storage fees ........................... +ꜩ0.018 @@ -155,7 +155,7 @@ This sequence of operations was run: { Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 220) } Storage size: 175 bytes Paid storage size diff: 53 bytes - Consumed gas: 1208.974 + Consumed gas: 1210.004 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01325 storage fees ........................... +ꜩ0.01325 @@ -169,7 +169,7 @@ This sequence of operations was run: ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from bootstrap1 for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 Node is bootstrapped. -Estimated gas: 5818.472 units (will add 100 for safety) +Estimated gas: 5820.532 units (will add 100 for safety) Estimated storage: 52 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -180,18 +180,18 @@ 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.001577 + Fee to the baker: ꜩ0.001578 Expected counter: 9 - Gas limit: 5919 + Gas limit: 5921 Storage limit: 72 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001577 - payload fees(the block proposer) ....... +ꜩ0.001577 + [PUBLIC_KEY_HASH] ... -ꜩ0.001578 + payload fees(the block proposer) ....... +ꜩ0.001578 Smart rollup output message execution: Address: [SMART_ROLLUP_HASH] Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH] This smart output message execution was successfully applied - Consumed gas: 4601.209 + Consumed gas: 4602.239 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -211,7 +211,7 @@ This sequence of operations was run: Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 220) } Storage size: 227 bytes Paid storage size diff: 52 bytes - Consumed gas: 1217.197 + Consumed gas: 1218.227 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.013 storage fees ........................... +ꜩ0.013 diff --git a/tezt/tests/expected/views.ml/Alpha- Run views.out b/tezt/tests/expected/views.ml/Alpha- Run views.out index 93b71a2c4f05..ebe615e09fec 100644 --- a/tezt/tests/expected/views.ml/Alpha- Run views.out +++ b/tezt/tests/expected/views.ml/Alpha- Run views.out @@ -107,7 +107,7 @@ Contract memorized as view_check_caller. ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 3582.580 units (will add 100 for safety) +Estimated gas: 3583.266 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -120,7 +120,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000665 Expected counter: 3 - Gas limit: 3683 + Gas limit: 3684 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000665 @@ -133,7 +133,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: None Storage size: 208 bytes - Consumed gas: 3583.116 + Consumed gas: 3584.146 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 [CONTRACT_HASH] ... +ꜩ1 @@ -141,7 +141,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 Node is bootstrapped. -Estimated gas: 1285.773 units (will add 100 for safety) +Estimated gas: 1286.459 units (will add 100 for safety) Estimated storage: 27 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -154,7 +154,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000389 Expected counter: 4 - Gas limit: 1386 + Gas limit: 1387 Storage limit: 47 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000389 @@ -167,7 +167,7 @@ This sequence of operations was run: Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 } Storage size: 179 bytes Paid storage size diff: 27 bytes - Consumed gas: 1286.351 + Consumed gas: 1287.381 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 @@ -177,7 +177,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 3586.212 units (will add 100 for safety) +Estimated gas: 3586.898 units (will add 100 for safety) Estimated storage: 27 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -204,7 +204,7 @@ This sequence of operations was run: Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) Storage size: 235 bytes Paid storage size diff: 27 bytes - Consumed gas: 3586.748 + Consumed gas: 3587.778 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 diff --git a/tezt/tests/operation_size_and_gas.ml b/tezt/tests/operation_size_and_gas.ml index c5be6ebac53e..f163f463b7f8 100644 --- a/tezt/tests/operation_size_and_gas.ml +++ b/tezt/tests/operation_size_and_gas.ml @@ -289,7 +289,7 @@ let test_contract_call = let* signature = Client.sign_bytes ~signer:account.alias ~data:msg client in let data = sf "Pair %S %S %s" account.public_key signature msg in test - ~gas_limit:1460 + ~gas_limit:1470 ~storage_limit:161 ~script_name ~arg:data -- GitLab From d53ecf4ec8fcb79c4151b84061e86566536db82f Mon Sep 17 00:00:00 2001 From: Lucas Randazzo Date: Thu, 4 Sep 2025 10:50:27 +0200 Subject: [PATCH 3/3] Proto/doc: updated changelog --- docs/protocols/alpha.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index e90e25a814ee..b005d1f89022 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -141,6 +141,12 @@ Protocol parameters Bug Fixes --------- +- Updated cache functions to include the context when + needed. Previously backtracked gas costs for some cache calls are + now properly accounted for, increasing by at most 2 units of gas per + function call. Notably, **the ``set delegate`` operation now has a + slightly higher gas cost.** (MR :gl:`!19134`) + Minor Changes ------------- -- GitLab