From 84881a81b09b4ce9600a24960a30208d52f5180d Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 21:27:23 +0100 Subject: [PATCH 01/30] Proto/Michelson: introduce parse_parameter_ty_and_entrypoints Currently it is only `parse_parameter_ty` followed by `well_formed_entrypoints`. This function should be used to parse the `parameter` node of a script. --- .../lib_protocol/script_ir_translator.ml | 68 +++++++++++++------ 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 9980521c5219..5c8f0aabd005 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1244,6 +1244,13 @@ let[@coq_struct "ty"] rec parse_comparable_ty : type ex_ty = Ex_ty : 'a ty -> ex_ty +type ex_parameter_ty_and_entrypoints = + | Ex_parameter_ty_and_entrypoints : { + arg_type : 'a ty; + root_name : field_annot option; + } + -> ex_parameter_ty_and_entrypoints + let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_packable_ty : context -> @@ -1921,6 +1928,20 @@ let well_formed_entrypoints (type full) (full : full ty) ~root_name = | None -> Result.return_unit | Some path -> error (Unreachable_entrypoint path) +let parse_parameter_ty_and_entrypoints : + context -> + stack_depth:int -> + legacy:bool -> + root_name:field_annot option -> + Script.node -> + (ex_parameter_ty_and_entrypoints * context) tzresult = + fun ctxt ~stack_depth ~legacy ~root_name node -> + parse_parameter_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node + >>? fun (Ex_ty arg_type, ctxt) -> + (if legacy then Result.return_unit + else well_formed_entrypoints ~root_name arg_type) + >|? fun () -> (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) + let parse_uint ~nb_bits = assert (Compare.Int.(nb_bits >= 0 && nb_bits <= 30)) ; let max_int = (1 lsl nb_bits) - 1 in @@ -4461,15 +4482,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> record_trace (Ill_formed_type (Some "parameter", canonical_code, location arg_type)) - (parse_parameter_ty + (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:(stack_depth + 1) ~legacy + ~root_name arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then Result.return_unit - else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> record_trace (Ill_formed_type (Some "storage", canonical_code, location storage_type)) (parse_storage_ty @@ -5018,12 +5037,15 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_contra (* can only fail because of gas *) parse_toplevel ctxt ~legacy:true code >>? fun ({arg_type; root_name; _}, ctxt) -> - parse_parameter_ty + parse_parameter_ty_and_entrypoints ctxt ~stack_depth:(stack_depth + 1) ~legacy:true + ~root_name arg_type - >>? fun (Ex_ty targ, ctxt) -> + >>? fun ( Ex_parameter_ty_and_entrypoints + {arg_type = targ; root_name}, + ctxt ) -> (* we don't check targ size here because it's a legacy contract code *) Gas_monad.run ctxt @@ find_entrypoint_for_type @@ -5205,14 +5227,18 @@ let parse_contract_for_script : | Error _ -> error (Invalid_contract (loc, contract)) | Ok ({arg_type; root_name; _}, ctxt) -> ( match - parse_parameter_ty + parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy:true + ~root_name arg_type with | Error _ -> error (Invalid_contract (loc, contract)) - | Ok (Ex_ty targ, ctxt) -> ( + | Ok + ( Ex_parameter_ty_and_entrypoints + {arg_type = targ; root_name}, + ctxt ) -> ( (* we don't check targ size here because it's a legacy contract code *) Gas_monad.run ctxt @@ find_entrypoint_for_type @@ -5251,11 +5277,13 @@ let parse_code : let arg_type_loc = location arg_type in record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) - (parse_parameter_ty ctxt ~stack_depth:0 ~legacy arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then Result.return_unit - else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + (parse_parameter_ty_and_entrypoints + ctxt + ~stack_depth:0 + ~legacy + ~root_name + arg_type) + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> let storage_type_loc = location storage_type in record_trace (Ill_formed_type (Some "storage", code, storage_type_loc)) @@ -5361,11 +5389,13 @@ let typecheck_code : let arg_type_loc = location arg_type in record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) - (parse_parameter_ty ctxt ~stack_depth:0 ~legacy arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then Result.return_unit - else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + (parse_parameter_ty_and_entrypoints + ctxt + ~stack_depth:0 + ~legacy + ~root_name + arg_type) + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> let storage_type_loc = location storage_type in record_trace (Ill_formed_type (Some "storage", code, storage_type_loc)) -- GitLab From f0c38a5ca78e4d2659b3be7727cd063d53ac41f0 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 14:44:25 +0100 Subject: [PATCH 02/30] Proto/Michelson: introduce unparse_parameter_ty which is just `unparse_ty` with `add_field_annot`. This function should be used to unparse the `parameter` node of a script. --- src/proto_alpha/lib_protocol/script_interpreter_defs.ml | 6 ++---- src/proto_alpha/lib_protocol/script_ir_translator.ml | 8 ++++++-- src/proto_alpha/lib_protocol/script_ir_translator.mli | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 1894cc1a5efe..6e3e5f1d784d 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -540,10 +540,8 @@ let create_contract (ctxt, sc) gas storage_type param_type code views root_name delegate credit init = let ctxt = update_context gas ctxt in let loc = Micheline.dummy_location in - unparse_ty ~loc ctxt param_type >>?= fun (unparsed_param_type, ctxt) -> - let unparsed_param_type = - Script_ir_translator.add_field_annot root_name unparsed_param_type - in + unparse_parameter_ty ~loc ctxt param_type ~root_name + >>?= fun (unparsed_param_type, ctxt) -> unparse_ty ~loc ctxt storage_type >>?= fun (unparsed_storage_type, ctxt) -> let open Micheline in let view name {input_ty; output_ty; view_code} views = diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 5c8f0aabd005..829d60567413 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -305,6 +305,10 @@ let unparse_comparable_ty ~loc ctxt comp_ty = Gas.consume ctxt (Unparse_costs.unparse_comparable_type comp_ty) >|? fun ctxt -> (unparse_comparable_ty_uncarbonated ~loc comp_ty, ctxt) +let unparse_parameter_ty ~loc ctxt ~root_name ty = + unparse_ty ~loc ctxt ty >|? fun (unparsed, ctxt) -> + (add_field_annot root_name unparsed, ctxt) + let[@coq_struct "function_parameter"] rec strip_var_annots = function | (Int _ | String _ | Bytes _) as atom -> atom | Seq (loc, args) -> Seq (loc, List.map strip_var_annots args) @@ -5760,9 +5764,9 @@ let unparse_script ctxt mode >>=? fun (storage, ctxt) -> Lwt.return (let loc = Micheline.dummy_location in - unparse_ty ~loc ctxt arg_type >>? fun (arg_type, ctxt) -> + unparse_parameter_ty ~loc ctxt arg_type ~root_name + >>? fun (arg_type, ctxt) -> unparse_ty ~loc ctxt storage_type >>? fun (storage_type, ctxt) -> - let arg_type = add_field_annot root_name arg_type in let open Micheline in let view name {input_ty; output_ty; view_code} views = Prim diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 610231722f45..69bf0e0f29d6 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -341,6 +341,13 @@ val add_field_annot : ('loc, 'prim) Micheline.node -> ('loc, 'prim) Micheline.node +val unparse_parameter_ty : + loc:'loc -> + context -> + root_name:Script_ir_annot.field_annot option -> + 'a Script_typed_ir.ty -> + ('loc Script.michelson_node * context) tzresult + (** High-level function to typecheck a Michelson script. This function is not used for validating operations but only for the [typecheck_code] RPC. -- GitLab From 1d5560a883fdf1a873c2be75ee58d13d980d36a8 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 15:06:26 +0100 Subject: [PATCH 03/30] Proto/Michelson: use parse_parameter_ty_and_entrypoints everywhere --- src/proto_alpha/lib_plugin/plugin.ml | 9 +++++---- src/proto_alpha/lib_protocol/contract_services.ml | 14 ++++++++++---- .../lib_protocol/script_ir_translator.ml | 3 +++ .../lib_protocol/script_ir_translator.mli | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 95f149728440..5be3262eeaf1 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -2182,8 +2182,8 @@ module RPC = struct parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - ( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> Gas_monad.run ctxt @@ Script_ir_translator.find_entrypoint ~error_details:Informative @@ -2564,8 +2564,9 @@ module RPC = struct parse_toplevel ~legacy ctxt expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - ( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) + -> Script_ir_translator.list_entrypoints ~root_name arg_type ctxt >|? fun (unreachable_entrypoint, map) -> ( unreachable_entrypoint, diff --git a/src/proto_alpha/lib_protocol/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml index 95905a392922..2f78dbdcb43e 100644 --- a/src/proto_alpha/lib_protocol/contract_services.ml +++ b/src/proto_alpha/lib_protocol/contract_services.ml @@ -367,8 +367,9 @@ let[@coq_axiom_with_reason "gadt"] register () = parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - ( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) + -> Gas_monad.run ctxt @@ Script_ir_translator.find_entrypoint ~error_details:Informative @@ -397,8 +398,13 @@ let[@coq_axiom_with_reason "gadt"] register () = parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - ( ( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> + ( ( parse_parameter_ty_and_entrypoints + ctxt + ~legacy + arg_type + ~root_name + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) + -> Script_ir_translator.list_entrypoints ~root_name arg_type ctxt ) >|? fun (unreachable_entrypoint, map) -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 829d60567413..70ae58c656c3 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -6297,6 +6297,9 @@ let parse_any_ty = parse_any_ty ~stack_depth:0 let parse_ty = parse_ty ~stack_depth:0 +let parse_parameter_ty_and_entrypoints = + parse_parameter_ty_and_entrypoints ~stack_depth:0 + let ty_eq ctxt = ty_eq ~legacy:true ctxt let[@coq_axiom_with_reason "gadt"] get_single_sapling_state ctxt ty x = diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 69bf0e0f29d6..6d3c06a15e96 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -71,6 +71,13 @@ type ex_comparable_ty = type ex_ty = Ex_ty : 'a Script_typed_ir.ty -> ex_ty +type ex_parameter_ty_and_entrypoints = + | Ex_parameter_ty_and_entrypoints : { + arg_type : 'a Script_typed_ir.ty; + root_name : Script_ir_annot.field_annot option; + } + -> ex_parameter_ty_and_entrypoints + type ex_stack_ty = | Ex_stack_ty : ('a, 's) Script_typed_ir.stack_ty -> ex_stack_ty @@ -269,6 +276,13 @@ val parse_parameter_ty : val parse_comparable_ty : context -> Script.node -> (ex_comparable_ty * context) tzresult +val parse_parameter_ty_and_entrypoints : + context -> + legacy:bool -> + root_name:Script_ir_annot.field_annot option -> + Script.node -> + (ex_parameter_ty_and_entrypoints * context) tzresult + val parse_view_input_ty : context -> stack_depth:int -> -- GitLab From e9eb21157811ebbf14273004bb19fcfd46f209ab Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 27 Jan 2022 14:34:01 +0100 Subject: [PATCH 04/30] Proto/Michelson: rename parse_parameter_ty into parse_passable_ty This is to make it clearer the difference between parsing a type that can be a passed as a parameter and parsing the type of the `parameter` node of a script. Note that passable is the terminology used in the Michelson reference documentation. --- src/proto_alpha/lib_plugin/plugin.ml | 2 +- src/proto_alpha/lib_protocol/script_ir_translator.ml | 10 +++++----- src/proto_alpha/lib_protocol/script_ir_translator.mli | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 5be3262eeaf1..2ca39ba2d5b6 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1908,7 +1908,7 @@ module RPC = struct fun ~legacy ctxt (data, exp_ty) -> record_trace (Script_tc_errors.Ill_formed_type (None, exp_ty, 0)) - (Script_ir_translator.parse_parameter_ty + (Script_ir_translator.parse_passable_ty ctxt ~legacy (Micheline.root exp_ty)) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 70ae58c656c3..e3a4a0209f3e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1275,7 +1275,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_pa https://gitlab.com/tezos/tezos/-/issues/301 *) ~allow_ticket:false -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_parameter_ty +and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_passable_ty : context -> stack_depth:int -> @@ -1425,7 +1425,7 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_ty : check_type_annot loc annot >>? fun () -> ok (Ex_ty bls12_381_fr_t, ctxt) | Prim (loc, T_contract, [utl], annot) -> if allow_contract then - parse_parameter_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy utl + parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy utl >>? fun (Ex_ty tl, ctxt) -> check_type_annot loc annot >>? fun () -> contract_t loc tl >|? fun ty -> (Ex_ty ty, ctxt) @@ -1940,7 +1940,7 @@ let parse_parameter_ty_and_entrypoints : Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult = fun ctxt ~stack_depth ~legacy ~root_name node -> - parse_parameter_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node + parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node >>? fun (Ex_ty arg_type, ctxt) -> (if legacy then Result.return_unit else well_formed_entrypoints ~root_name arg_type) @@ -4424,7 +4424,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (address_t, rest) in typed ctxt loc instr stack | (Prim (loc, I_CONTRACT, [ty], annot), Item_t (Address_t _, rest)) -> - parse_parameter_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty + parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty >>?= fun (Ex_ty t, ctxt) -> contract_t loc t >>?= fun contract_ty -> option_t loc contract_ty >>?= fun res_ty -> @@ -6291,7 +6291,7 @@ let parse_big_map_value_ty = parse_big_map_value_ty ~stack_depth:0 let parse_packable_ty = parse_packable_ty ~stack_depth:0 -let parse_parameter_ty = parse_parameter_ty ~stack_depth:0 +let parse_passable_ty = parse_passable_ty ~stack_depth:0 let parse_any_ty = parse_any_ty ~stack_depth:0 diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 6d3c06a15e96..86bd933700bd 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -270,7 +270,7 @@ val parse_big_map_value_ty : val parse_packable_ty : context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult -val parse_parameter_ty : +val parse_passable_ty : context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult val parse_comparable_ty : @@ -320,7 +320,7 @@ val parse_any_ty : context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult (** We expose [parse_ty] for convenience to external tools. Please use - specialized versions such as [parse_packable_ty], [parse_parameter_ty], + specialized versions such as [parse_packable_ty], [parse_passable_ty], [parse_comparable_ty], or [parse_big_map_value_ty] if possible. *) val parse_ty : context -> -- GitLab From ea2b11ebfbbbb35eb999280760087d8985d1563a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 18 Jan 2022 15:31:48 +0100 Subject: [PATCH 05/30] Proto/Michelson: turn root_name into an Entrypoint.t That way we'll get errors earlier. --- .../lib_protocol/entrypoint_repr.ml | 4 + .../lib_protocol/entrypoint_repr.mli | 7 ++ .../lib_protocol/script_ir_annot.ml | 3 + .../lib_protocol/script_ir_annot.mli | 3 + .../lib_protocol/script_ir_translator.ml | 77 ++++++++++--------- .../lib_protocol/script_ir_translator.mli | 14 ++-- .../lib_protocol/script_tc_context.ml | 2 +- .../lib_protocol/script_tc_context.mli | 7 +- .../lib_protocol/script_typed_ir.ml | 4 +- .../lib_protocol/script_typed_ir.mli | 4 +- 10 files changed, 72 insertions(+), 53 deletions(-) diff --git a/src/proto_alpha/lib_protocol/entrypoint_repr.ml b/src/proto_alpha/lib_protocol/entrypoint_repr.ml index 49d59d036623..7d4cb68b5a5d 100644 --- a/src/proto_alpha/lib_protocol/entrypoint_repr.ml +++ b/src/proto_alpha/lib_protocol/entrypoint_repr.ml @@ -157,6 +157,10 @@ let set_delegate = of_string_strict_exn "set_delegate" let remove_delegate = of_string_strict_exn "remove_delegate" +let is_root = ( = ) root + +let to_non_empty_string (name : t) = (name :> Non_empty_string.t) + let to_string (name : t) = (name :> string) let to_address_suffix (name : t) = diff --git a/src/proto_alpha/lib_protocol/entrypoint_repr.mli b/src/proto_alpha/lib_protocol/entrypoint_repr.mli index 8a0d9e997eb1..5ea99bac6f81 100644 --- a/src/proto_alpha/lib_protocol/entrypoint_repr.mli +++ b/src/proto_alpha/lib_protocol/entrypoint_repr.mli @@ -41,6 +41,9 @@ val is_default : t -> bool (** Root entrypoint "root" *) val root : t +(** Checks whether an entrypoint is the root entrypoint *) +val is_root : t -> bool + (** Entrypoint "do" *) val do_ : t @@ -80,6 +83,10 @@ val of_annot_lax_opt : Non_empty_string.t -> t option Accepts "default" and converts "" to "default". *) val of_string_lax : string -> t tzresult +(** Converts an entrypoint to a non-empty string. + "default" is kept as is. *) +val to_non_empty_string : t -> Non_empty_string.t + (** Converts an entrypoint to a string. "default" is kept as is. *) val to_string : t -> string diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index c8ccf6047c71..9e96ad9dc86f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -55,6 +55,9 @@ let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = | None -> false | Some a' -> Entrypoint.(a' = entrypoint)) +let field_annot_of_entrypoint entrypoint = + Field_annot (Entrypoint.to_non_empty_string entrypoint) + let merge_field_annot : type error_trace. legacy:bool -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 50c5be2a100a..afcea9939b7c 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -48,6 +48,9 @@ val field_annot_opt_to_entrypoint_strict : val field_annot_opt_eq_entrypoint_lax : field_annot option -> Entrypoint.t -> bool +(** Converts an entrypoint to a field annot. *) +val field_annot_of_entrypoint : Entrypoint.t -> field_annot + (** Merge field annotations. @return an error {!Inconsistent_type_annotations} if they are both present and different, unless [legacy] *) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index e3a4a0209f3e..9abf2d26cdf8 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -184,6 +184,10 @@ let add_field_annot a = function Prim (loc, prim, args, annots @ unparse_field_annot a) | expr -> expr +let add_entrypoint_annot entrypoint expr = + let a = Option.map Script_ir_annot.field_annot_of_entrypoint entrypoint in + add_field_annot a expr + let rec unparse_comparable_ty_uncarbonated : type a loc. loc:loc -> a comparable_ty -> loc Script.michelson_node = fun ~loc -> function @@ -307,7 +311,7 @@ let unparse_comparable_ty ~loc ctxt comp_ty = let unparse_parameter_ty ~loc ctxt ~root_name ty = unparse_ty ~loc ctxt ty >|? fun (unparsed, ctxt) -> - (add_field_annot root_name unparsed, ctxt) + (add_entrypoint_annot root_name unparsed, ctxt) let[@coq_struct "function_parameter"] rec strip_var_annots = function | (Int _ | String _ | Bytes _) as atom -> atom @@ -1251,7 +1255,7 @@ type ex_ty = Ex_ty : 'a ty -> ex_ty type ex_parameter_ty_and_entrypoints = | Ex_parameter_ty_and_entrypoints : { arg_type : 'a ty; - root_name : field_annot option; + root_name : Entrypoint.t option; } -> ex_parameter_ty_and_entrypoints @@ -1738,7 +1742,7 @@ type toplevel = { arg_type : Script.node; storage_type : Script.node; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; } type ('arg, 'storage) code = { @@ -1746,7 +1750,7 @@ type ('arg, 'storage) code = { arg_type : 'arg ty; storage_type : 'storage ty; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; code_size : Cache_memory_helpers.sint; } @@ -1838,21 +1842,24 @@ let find_entrypoint (type full error_trace) ((fun e -> Prim (loc, D_Right, [f e], [])), t)) | _ -> of_result (Error ()) in - (* This comparison should be taken into account by the caller. *) - if field_annot_opt_eq_entrypoint_lax root_name entrypoint then - return ((fun e -> e), Ex_ty full) - else - find_entrypoint full entrypoint >??$ function - | Ok result -> return result - | Error () -> - if Entrypoint.is_default entrypoint then - return ((fun e -> e), Ex_ty full) - else - of_result - @@ Error - (match error_details with - | Fast -> (Inconsistent_types_fast : error_trace) - | Informative -> trace_of_error @@ No_such_entrypoint entrypoint) + match root_name with + | Some root_name + when (* This comparison should be taken into account by the caller. *) + Entrypoint.(root_name = entrypoint) -> + return ((fun e -> e), Ex_ty full) + | _ -> ( + find_entrypoint full entrypoint >??$ function + | Ok result -> return result + | Error () -> + if Entrypoint.is_default entrypoint then + return ((fun e -> e), Ex_ty full) + else + of_result + @@ Error + (match error_details with + | Fast -> (Inconsistent_types_fast : error_trace) + | Informative -> + trace_of_error @@ No_such_entrypoint entrypoint)) let find_entrypoint_for_type (type full exp error_trace) ~legacy ~error_details ~(full : full ty) ~(expected : exp ty) ~root_name entrypoint loc : @@ -1861,9 +1868,9 @@ let find_entrypoint_for_type (type full exp error_trace) ~legacy ~error_details find_entrypoint ~error_details full ~root_name entrypoint >>$ function | (_, Ex_ty ty) -> ( match root_name with - | Some (Field_annot fa) - when Compare.String.((fa :> string) = "root") - && Entrypoint.is_default entrypoint -> ( + | Some root_name + when Entrypoint.is_root root_name && Entrypoint.is_default entrypoint + -> ( merge_types ~legacy ~error_details:Fast loc ty expected >??$ function | Ok (Eq, ty) -> return (Entrypoint.default, (ty : exp ty)) | Error Inconsistent_types_fast -> @@ -1920,10 +1927,7 @@ let well_formed_entrypoints (type full) (full : full ty) ~root_name = let (init, reachable) = match root_name with | None -> (Entrypoint.Set.empty, false) - | Some (Field_annot name) -> ( - match Entrypoint.of_annot_lax_opt name with - | None -> (Entrypoint.Set.empty, false) - | Some name -> (Entrypoint.Set.singleton name, true)) + | Some name -> (Entrypoint.Set.singleton name, true) in check full [] reachable (None, init) >>? fun (first_unreachable, all) -> if not (Entrypoint.Set.mem Entrypoint.default all) then Result.return_unit @@ -1936,7 +1940,7 @@ let parse_parameter_ty_and_entrypoints : context -> stack_depth:int -> legacy:bool -> - root_name:field_annot option -> + root_name:Entrypoint.t option -> Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult = fun ctxt ~stack_depth ~legacy ~root_name node -> @@ -5156,15 +5160,20 @@ and parse_toplevel : primitive or the toplevel constructor (legacy only) *) Script_ir_annot.extract_field_annot p >>? fun (p, root_name) -> match root_name with - | Some _ -> ok (p, pannot, root_name) + | Some (Field_annot root_name) -> + let root_name = Entrypoint.of_annot_lax_opt root_name in + ok (p, pannot, root_name) | None -> ( match pannot with | [single] when legacy && Compare.Int.(String.length single > 0) - && Compare.Char.(single.[0] = '%') -> - parse_field_annot ploc [single] >>? fun pannot -> - ok (p, [], pannot) + && Compare.Char.(single.[0] = '%') -> ( + parse_field_annot ploc [single] >|? function + | None -> (p, [], None) + | Some (Field_annot pannot) -> + let root_name = Entrypoint.of_annot_lax_opt pannot in + (p, [], root_name)) | _ -> ok (p, pannot, None)) in (* only one field annot is allowed to set the root entrypoint name *) @@ -5490,11 +5499,7 @@ let list_entrypoints (type full) (full : full ty) ctxt ~root_name = let (init, reachable) = match root_name with | None -> (Entrypoint.Map.empty, false) - | Some (Field_annot name) -> ( - match Entrypoint.of_annot_lax_opt name with - | None -> (Entrypoint.Map.empty, false) - | Some name -> (Entrypoint.Map.singleton name ([], unparsed_full), true) - ) + | Some name -> (Entrypoint.Map.singleton name ([], unparsed_full), true) in fold_tree full [] reachable ([], init) [@@coq_axiom_with_reason "unsupported syntax"] diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 86bd933700bd..0ae5e0af13f7 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -74,7 +74,7 @@ type ex_ty = Ex_ty : 'a Script_typed_ir.ty -> ex_ty type ex_parameter_ty_and_entrypoints = | Ex_parameter_ty_and_entrypoints : { arg_type : 'a Script_typed_ir.ty; - root_name : Script_ir_annot.field_annot option; + root_name : Entrypoint.t option; } -> ex_parameter_ty_and_entrypoints @@ -88,7 +88,7 @@ type toplevel = { arg_type : Script.node; storage_type : Script.node; views : Script_typed_ir.view Script_typed_ir.SMap.t; - root_name : Script_ir_annot.field_annot option; + root_name : Entrypoint.t option; } type ('arg, 'storage) code = { @@ -101,7 +101,7 @@ type ('arg, 'storage) code = { arg_type : 'arg Script_typed_ir.ty; storage_type : 'storage Script_typed_ir.ty; views : Script_typed_ir.view Script_typed_ir.SMap.t; - root_name : Script_ir_annot.field_annot option; + root_name : Entrypoint.t option; code_size : Cache_memory_helpers.sint; (** This is an over-approximation of the value size in memory, in bytes, of the contract's static part, that is its source @@ -279,7 +279,7 @@ val parse_comparable_ty : val parse_parameter_ty_and_entrypoints : context -> legacy:bool -> - root_name:Script_ir_annot.field_annot option -> + root_name:Entrypoint.t option -> Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult @@ -358,7 +358,7 @@ val add_field_annot : val unparse_parameter_ty : loc:'loc -> context -> - root_name:Script_ir_annot.field_annot option -> + root_name:Entrypoint.t option -> 'a Script_typed_ir.ty -> ('loc Script.michelson_node * context) tzresult @@ -428,14 +428,14 @@ val parse_contract_for_script : val find_entrypoint : error_details:'error_trace error_details -> 't Script_typed_ir.ty -> - root_name:Script_ir_annot.field_annot option -> + root_name:Entrypoint.t option -> Entrypoint.t -> ((Script.node -> Script.node) * ex_ty, 'error_trace) Gas_monad.t val list_entrypoints : 't Script_typed_ir.ty -> context -> - root_name:Script_ir_annot.field_annot option -> + root_name:Entrypoint.t option -> (Michelson_v1_primitives.prim list list * (Michelson_v1_primitives.prim list * Script.unlocated_michelson_node) Entrypoint.Map.t) diff --git a/src/proto_alpha/lib_protocol/script_tc_context.ml b/src/proto_alpha/lib_protocol/script_tc_context.ml index b0ce61136e14..8103f4e3ac86 100644 --- a/src/proto_alpha/lib_protocol/script_tc_context.ml +++ b/src/proto_alpha/lib_protocol/script_tc_context.ml @@ -31,7 +31,7 @@ type callsite = | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; - root_name : Script_ir_annot.field_annot option; + root_name : Alpha_context.Entrypoint.t option; } -> callsite | View : callsite diff --git a/src/proto_alpha/lib_protocol/script_tc_context.mli b/src/proto_alpha/lib_protocol/script_tc_context.mli index 85582fadb018..482dab7e18e2 100644 --- a/src/proto_alpha/lib_protocol/script_tc_context.mli +++ b/src/proto_alpha/lib_protocol/script_tc_context.mli @@ -50,7 +50,7 @@ type callsite = | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; - root_name : Script_ir_annot.field_annot option; + root_name : Entrypoint.t option; } -> callsite | View : callsite @@ -61,10 +61,7 @@ type t = {callsite : callsite; in_lambda : in_lambda} val init : callsite -> t val toplevel : - storage_type:'sto ty -> - param_type:'param ty -> - Script_ir_annot.field_annot option -> - t + storage_type:'sto ty -> param_type:'param ty -> Entrypoint.t option -> t val view : t diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index baddb74f6870..b3dec886e624 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -515,7 +515,7 @@ type ('arg, 'storage) script = { storage : 'storage; storage_type : 'storage ty; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; code_size : Cache_memory_helpers.sint; (* This is an over-approximation of the value size in memory, in bytes, of the contract's static part, that is its source @@ -971,7 +971,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = arg_type : 'b ty; lambda : ('b * 'a, operation boxed_list * 'a) lambda; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; k : (operation, address * 's, 'r, 'f) kinstr; } -> (public_key_hash option, Tez.t * ('a * 's), 'r, 'f) kinstr diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index d67d25402899..8b1ef28e6da6 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -363,7 +363,7 @@ type ('arg, 'storage) script = { storage : 'storage; storage_type : 'storage ty; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; code_size : Cache_memory_helpers.sint; } @@ -910,7 +910,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = arg_type : 'b ty; lambda : ('b * 'a, operation boxed_list * 'a) lambda; views : view SMap.t; - root_name : field_annot option; + root_name : Entrypoint.t option; k : (operation, address * 's, 'r, 'f) kinstr; } -> (public_key_hash option, Tez.t * ('a * 's), 'r, 'f) kinstr -- GitLab From e9f636731ff3716148432ba1ec1a9caa230e1ef5 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 16:39:32 +0100 Subject: [PATCH 06/30] Proto/Michelson: inline add_field_annot in add_entrypoint_annot Because add_field_annot will disappear soon --- src/proto_alpha/lib_protocol/entrypoint_repr.ml | 2 ++ src/proto_alpha/lib_protocol/entrypoint_repr.mli | 5 +++++ src/proto_alpha/lib_protocol/script_ir_annot.ml | 3 --- src/proto_alpha/lib_protocol/script_ir_annot.mli | 3 --- src/proto_alpha/lib_protocol/script_ir_translator.ml | 6 ++++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/entrypoint_repr.ml b/src/proto_alpha/lib_protocol/entrypoint_repr.ml index 7d4cb68b5a5d..a59dbccc0f4b 100644 --- a/src/proto_alpha/lib_protocol/entrypoint_repr.ml +++ b/src/proto_alpha/lib_protocol/entrypoint_repr.ml @@ -166,6 +166,8 @@ let to_string (name : t) = (name :> string) let to_address_suffix (name : t) = if is_default name then "" else "%" ^ (name :> string) +let unparse_as_field_annot (name : t) = "%" ^ (name :> string) + let of_string_lax_exn str = match of_string_lax' str with Ok name -> name | Error err -> invalid_arg err diff --git a/src/proto_alpha/lib_protocol/entrypoint_repr.mli b/src/proto_alpha/lib_protocol/entrypoint_repr.mli index 5ea99bac6f81..8a31b3b58bc1 100644 --- a/src/proto_alpha/lib_protocol/entrypoint_repr.mli +++ b/src/proto_alpha/lib_protocol/entrypoint_repr.mli @@ -96,6 +96,11 @@ val to_string : t -> string Otherwise it is "%" followed by the entrypoint. *) val to_address_suffix : t -> string +(** Converts an entrypoint to a string used as a field annotation of a + parameter union type. It is "%" followed by the entrypoint. + The default entrypoint is converted to "%default". *) +val unparse_as_field_annot : t -> string + (** Pretty-print an entrypoint *) val pp : Format.formatter -> t -> unit diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 9e96ad9dc86f..c8ccf6047c71 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -55,9 +55,6 @@ let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = | None -> false | Some a' -> Entrypoint.(a' = entrypoint)) -let field_annot_of_entrypoint entrypoint = - Field_annot (Entrypoint.to_non_empty_string entrypoint) - let merge_field_annot : type error_trace. legacy:bool -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index afcea9939b7c..50c5be2a100a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -48,9 +48,6 @@ val field_annot_opt_to_entrypoint_strict : val field_annot_opt_eq_entrypoint_lax : field_annot option -> Entrypoint.t -> bool -(** Converts an entrypoint to a field annot. *) -val field_annot_of_entrypoint : Entrypoint.t -> field_annot - (** Merge field annotations. @return an error {!Inconsistent_type_annotations} if they are both present and different, unless [legacy] *) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 9abf2d26cdf8..72e3c9504efc 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -185,8 +185,10 @@ let add_field_annot a = function | expr -> expr let add_entrypoint_annot entrypoint expr = - let a = Option.map Script_ir_annot.field_annot_of_entrypoint entrypoint in - add_field_annot a expr + match (entrypoint, expr) with + | (Some name, Prim (loc, prim, args, annots)) -> + Prim (loc, prim, args, annots @ [Entrypoint.unparse_as_field_annot name]) + | (_, expr) -> expr let rec unparse_comparable_ty_uncarbonated : type a loc. loc:loc -> a comparable_ty -> loc Script.michelson_node = -- GitLab From fffbd26d462b90d1022d6b76bf537c67ca380620 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 16:39:32 +0100 Subject: [PATCH 07/30] Proto/Michelson: return reachable flag rather than recomputing it In `well_formed_entrypoints` and `list_entrypoints`, the reachable flag is recomputed from the annotation, matching it the same way as is done in the `merge` auxiliary function. I think returning it makes the code easier to understand --- .../lib_protocol/script_ir_translator.ml | 81 ++++++++----------- 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 72e3c9504efc..b75da922df69 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1888,18 +1888,19 @@ let well_formed_entrypoints (type full) (full : full ty) ~root_name = match annot with | None -> ok - (if reachable then acc - else - match ty with - | Union_t _ -> acc - | _ -> ( - match first_unreachable with - | None -> (Some (List.rev path), all) - | Some _ -> acc)) + ( (if reachable then acc + else + match ty with + | Union_t _ -> acc + | _ -> ( + match first_unreachable with + | None -> (Some (List.rev path), all) + | Some _ -> acc)), + reachable ) | Some (Field_annot name) -> Entrypoint.of_annot_lax name >>? fun name -> if Entrypoint.Set.mem name all then error (Duplicate_entrypoint name) - else ok (first_unreachable, Entrypoint.Set.add name all) + else ok ((first_unreachable, Entrypoint.Set.add name all), true) in let rec check : type t. @@ -1911,19 +1912,11 @@ let well_formed_entrypoints (type full) (full : full ty) ~root_name = fun t path reachable acc -> match t with | Union_t ((tl, al), (tr, ar), _) -> - merge (D_Left :: path) al tl reachable acc >>? fun acc -> - merge (D_Right :: path) ar tr reachable acc >>? fun acc -> - check - tl - (D_Left :: path) - (match al with Some _ -> true | None -> reachable) - acc - >>? fun acc -> - check - tr - (D_Right :: path) - (match ar with Some _ -> true | None -> reachable) - acc + merge (D_Left :: path) al tl reachable acc >>? fun (acc, l_reachable) -> + merge (D_Right :: path) ar tr reachable acc + >>? fun (acc, r_reachable) -> + check tl (D_Left :: path) l_reachable acc >>? fun acc -> + check tr (D_Right :: path) r_reachable acc | _ -> ok acc in let (init, reachable) = @@ -5449,25 +5442,25 @@ let list_entrypoints (type full) (full : full ty) ctxt ~root_name = let merge path annot (type t) (ty : t ty) reachable ((unreachables, all) as acc) = match annot with - | None -> ( + | None -> ok - @@ - if reachable then acc - else - match ty with - | Union_t _ -> acc - | _ -> (List.rev path :: unreachables, all)) - | Some (Field_annot name) -> ( - match Entrypoint.of_annot_lax_opt name with + ( (if reachable then acc + else + match ty with + | Union_t _ -> acc + | _ -> (List.rev path :: unreachables, all)), + reachable ) + | Some (Field_annot name) -> + (match Entrypoint.of_annot_lax_opt name with | None -> ok (List.rev path :: unreachables, all) | Some name -> if Entrypoint.Map.mem name all then ok (List.rev path :: unreachables, all) else - unparse_ty ~loc:() ctxt ty >>? fun (unparsed_ty, _) -> - ok - ( unreachables, - Entrypoint.Map.add name (List.rev path, unparsed_ty) all )) + unparse_ty ~loc:() ctxt ty >|? fun (unparsed_ty, _) -> + ( unreachables, + Entrypoint.Map.add name (List.rev path, unparsed_ty) all )) + >|? fun unreachable_all -> (unreachable_all, true) in let rec fold_tree : type t. @@ -5482,19 +5475,11 @@ let list_entrypoints (type full) (full : full ty) ctxt ~root_name = fun t path reachable acc -> match t with | Union_t ((tl, al), (tr, ar), _) -> - merge (D_Left :: path) al tl reachable acc >>? fun acc -> - merge (D_Right :: path) ar tr reachable acc >>? fun acc -> - fold_tree - tl - (D_Left :: path) - (match al with Some _ -> true | None -> reachable) - acc - >>? fun acc -> - fold_tree - tr - (D_Right :: path) - (match ar with Some _ -> true | None -> reachable) - acc + merge (D_Left :: path) al tl reachable acc >>? fun (acc, l_reachable) -> + merge (D_Right :: path) ar tr reachable acc + >>? fun (acc, r_reachable) -> + fold_tree tl (D_Left :: path) l_reachable acc >>? fun acc -> + fold_tree tr (D_Right :: path) r_reachable acc | _ -> ok acc in unparse_ty ~loc:() ctxt full >>? fun (unparsed_full, _) -> -- GitLab From 14f94fa2c0ae4717d8a39dbdbe1708b1a02f7616 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 26 Jan 2022 15:39:54 +0100 Subject: [PATCH 08/30] Proto/Michelson: simplify unparse_ty_uncarbonated `annot` was always `[]` --- .../lib_protocol/script_ir_translator.ml | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index b75da922df69..065c1e61d01f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -230,31 +230,30 @@ let unparse_memo_size ~loc memo_size = let rec unparse_ty_uncarbonated : type a loc. loc:loc -> a ty -> loc Script.michelson_node = fun ~loc ty -> - let prim (name, args, annot) = Prim (loc, name, args, annot) in + let prim (name, args) = Prim (loc, name, args, []) in match ty with - | Unit_t _meta -> prim (T_unit, [], []) - | Int_t _meta -> prim (T_int, [], []) - | Nat_t _meta -> prim (T_nat, [], []) - | Signature_t _meta -> prim (T_signature, [], []) - | String_t _meta -> prim (T_string, [], []) - | Bytes_t _meta -> prim (T_bytes, [], []) - | Mutez_t _meta -> prim (T_mutez, [], []) - | Bool_t _meta -> prim (T_bool, [], []) - | Key_hash_t _meta -> prim (T_key_hash, [], []) - | Key_t _meta -> prim (T_key, [], []) - | Timestamp_t _meta -> prim (T_timestamp, [], []) - | Address_t _meta -> prim (T_address, [], []) - | Operation_t _meta -> prim (T_operation, [], []) - | Chain_id_t _meta -> prim (T_chain_id, [], []) - | Never_t _meta -> prim (T_never, [], []) - | Bls12_381_g1_t _meta -> prim (T_bls12_381_g1, [], []) - | Bls12_381_g2_t _meta -> prim (T_bls12_381_g2, [], []) - | Bls12_381_fr_t _meta -> prim (T_bls12_381_fr, [], []) + | Unit_t _meta -> prim (T_unit, []) + | Int_t _meta -> prim (T_int, []) + | Nat_t _meta -> prim (T_nat, []) + | Signature_t _meta -> prim (T_signature, []) + | String_t _meta -> prim (T_string, []) + | Bytes_t _meta -> prim (T_bytes, []) + | Mutez_t _meta -> prim (T_mutez, []) + | Bool_t _meta -> prim (T_bool, []) + | Key_hash_t _meta -> prim (T_key_hash, []) + | Key_t _meta -> prim (T_key, []) + | Timestamp_t _meta -> prim (T_timestamp, []) + | Address_t _meta -> prim (T_address, []) + | Operation_t _meta -> prim (T_operation, []) + | Chain_id_t _meta -> prim (T_chain_id, []) + | Never_t _meta -> prim (T_never, []) + | Bls12_381_g1_t _meta -> prim (T_bls12_381_g1, []) + | Bls12_381_g2_t _meta -> prim (T_bls12_381_g2, []) + | Bls12_381_fr_t _meta -> prim (T_bls12_381_fr, []) | Contract_t (ut, _meta) -> let t = unparse_ty_uncarbonated ~loc ut in - prim (T_contract, [t], []) + prim (T_contract, [t]) | Pair_t (utl, utr, _meta) -> - let annot = [] in let tl = unparse_ty_uncarbonated ~loc utl in let tr = unparse_ty_uncarbonated ~loc utr in (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) @@ -262,46 +261,44 @@ let rec unparse_ty_uncarbonated : annotation because this annotation would be lost *) prim (match tr with - | Prim (_, T_pair, ts, []) -> (T_pair, tl :: ts, annot) - | _ -> (T_pair, [tl; tr], annot)) + | Prim (_, T_pair, ts, []) -> (T_pair, tl :: ts) + | _ -> (T_pair, [tl; tr])) | Union_t ((utl, l_field), (utr, r_field), _meta) -> - let annot = [] in let utl = unparse_ty_uncarbonated ~loc utl in let tl = add_field_annot l_field utl in let utr = unparse_ty_uncarbonated ~loc utr in let tr = add_field_annot r_field utr in - prim (T_or, [tl; tr], annot) + prim (T_or, [tl; tr]) | Lambda_t (uta, utr, _meta) -> let ta = unparse_ty_uncarbonated ~loc uta in let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_lambda, [ta; tr], []) + prim (T_lambda, [ta; tr]) | Option_t (ut, _meta) -> - let annot = [] in let ut = unparse_ty_uncarbonated ~loc ut in - prim (T_option, [ut], annot) + prim (T_option, [ut]) | List_t (ut, _meta) -> let t = unparse_ty_uncarbonated ~loc ut in - prim (T_list, [t], []) + prim (T_list, [t]) | Ticket_t (ut, _meta) -> let t = unparse_comparable_ty_uncarbonated ~loc ut in - prim (T_ticket, [t], []) + prim (T_ticket, [t]) | Set_t (ut, _meta) -> let t = unparse_comparable_ty_uncarbonated ~loc ut in - prim (T_set, [t], []) + prim (T_set, [t]) | Map_t (uta, utr, _meta) -> let ta = unparse_comparable_ty_uncarbonated ~loc uta in let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_map, [ta; tr], []) + prim (T_map, [ta; tr]) | Big_map_t (uta, utr, _meta) -> let ta = unparse_comparable_ty_uncarbonated ~loc uta in let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_big_map, [ta; tr], []) + prim (T_big_map, [ta; tr]) | Sapling_transaction_t (memo_size, _meta) -> - prim (T_sapling_transaction, [unparse_memo_size ~loc memo_size], []) + prim (T_sapling_transaction, [unparse_memo_size ~loc memo_size]) | Sapling_state_t (memo_size, _meta) -> - prim (T_sapling_state, [unparse_memo_size ~loc memo_size], []) - | Chest_key_t _meta -> prim (T_chest_key, [], []) - | Chest_t _meta -> prim (T_chest, [], []) + prim (T_sapling_state, [unparse_memo_size ~loc memo_size]) + | Chest_key_t _meta -> prim (T_chest_key, []) + | Chest_t _meta -> prim (T_chest, []) let unparse_ty ~loc ctxt ty = Gas.consume ctxt (Unparse_costs.unparse_type ty) >|? fun ctxt -> -- GitLab From a3ed0280e80eab2d6077a3b25b3c92e3f601a295 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 26 Jan 2022 15:41:16 +0100 Subject: [PATCH 09/30] Proto/Michelson: rewrite unparse_ty_uncarbonated so as to makes it clearer the result is always a `Prim` Also it will make it easier to add an annotation in case of entrypoints, avoiding the imperfect `add_field_annot`. --- .../lib_protocol/script_ir_translator.ml | 135 +++++++++--------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 065c1e61d01f..9652ed22fd03 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -230,75 +230,76 @@ let unparse_memo_size ~loc memo_size = let rec unparse_ty_uncarbonated : type a loc. loc:loc -> a ty -> loc Script.michelson_node = fun ~loc ty -> - let prim (name, args) = Prim (loc, name, args, []) in - match ty with - | Unit_t _meta -> prim (T_unit, []) - | Int_t _meta -> prim (T_int, []) - | Nat_t _meta -> prim (T_nat, []) - | Signature_t _meta -> prim (T_signature, []) - | String_t _meta -> prim (T_string, []) - | Bytes_t _meta -> prim (T_bytes, []) - | Mutez_t _meta -> prim (T_mutez, []) - | Bool_t _meta -> prim (T_bool, []) - | Key_hash_t _meta -> prim (T_key_hash, []) - | Key_t _meta -> prim (T_key, []) - | Timestamp_t _meta -> prim (T_timestamp, []) - | Address_t _meta -> prim (T_address, []) - | Operation_t _meta -> prim (T_operation, []) - | Chain_id_t _meta -> prim (T_chain_id, []) - | Never_t _meta -> prim (T_never, []) - | Bls12_381_g1_t _meta -> prim (T_bls12_381_g1, []) - | Bls12_381_g2_t _meta -> prim (T_bls12_381_g2, []) - | Bls12_381_fr_t _meta -> prim (T_bls12_381_fr, []) - | Contract_t (ut, _meta) -> - let t = unparse_ty_uncarbonated ~loc ut in - prim (T_contract, [t]) - | Pair_t (utl, utr, _meta) -> - let tl = unparse_ty_uncarbonated ~loc utl in - let tr = unparse_ty_uncarbonated ~loc utr in - (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) - (* Note that the folding does not happen if the pair on the right has an - annotation because this annotation would be lost *) - prim - (match tr with + let (name, args) = + match ty with + | Unit_t _meta -> (T_unit, []) + | Int_t _meta -> (T_int, []) + | Nat_t _meta -> (T_nat, []) + | Signature_t _meta -> (T_signature, []) + | String_t _meta -> (T_string, []) + | Bytes_t _meta -> (T_bytes, []) + | Mutez_t _meta -> (T_mutez, []) + | Bool_t _meta -> (T_bool, []) + | Key_hash_t _meta -> (T_key_hash, []) + | Key_t _meta -> (T_key, []) + | Timestamp_t _meta -> (T_timestamp, []) + | Address_t _meta -> (T_address, []) + | Operation_t _meta -> (T_operation, []) + | Chain_id_t _meta -> (T_chain_id, []) + | Never_t _meta -> (T_never, []) + | Bls12_381_g1_t _meta -> (T_bls12_381_g1, []) + | Bls12_381_g2_t _meta -> (T_bls12_381_g2, []) + | Bls12_381_fr_t _meta -> (T_bls12_381_fr, []) + | Contract_t (ut, _meta) -> + let t = unparse_ty_uncarbonated ~loc ut in + (T_contract, [t]) + | Pair_t (utl, utr, _meta) -> ( + let tl = unparse_ty_uncarbonated ~loc utl in + let tr = unparse_ty_uncarbonated ~loc utr in + (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) + (* Note that the folding does not happen if the pair on the right has an + annotation because this annotation would be lost *) + match tr with | Prim (_, T_pair, ts, []) -> (T_pair, tl :: ts) | _ -> (T_pair, [tl; tr])) - | Union_t ((utl, l_field), (utr, r_field), _meta) -> - let utl = unparse_ty_uncarbonated ~loc utl in - let tl = add_field_annot l_field utl in - let utr = unparse_ty_uncarbonated ~loc utr in - let tr = add_field_annot r_field utr in - prim (T_or, [tl; tr]) - | Lambda_t (uta, utr, _meta) -> - let ta = unparse_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_lambda, [ta; tr]) - | Option_t (ut, _meta) -> - let ut = unparse_ty_uncarbonated ~loc ut in - prim (T_option, [ut]) - | List_t (ut, _meta) -> - let t = unparse_ty_uncarbonated ~loc ut in - prim (T_list, [t]) - | Ticket_t (ut, _meta) -> - let t = unparse_comparable_ty_uncarbonated ~loc ut in - prim (T_ticket, [t]) - | Set_t (ut, _meta) -> - let t = unparse_comparable_ty_uncarbonated ~loc ut in - prim (T_set, [t]) - | Map_t (uta, utr, _meta) -> - let ta = unparse_comparable_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_map, [ta; tr]) - | Big_map_t (uta, utr, _meta) -> - let ta = unparse_comparable_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in - prim (T_big_map, [ta; tr]) - | Sapling_transaction_t (memo_size, _meta) -> - prim (T_sapling_transaction, [unparse_memo_size ~loc memo_size]) - | Sapling_state_t (memo_size, _meta) -> - prim (T_sapling_state, [unparse_memo_size ~loc memo_size]) - | Chest_key_t _meta -> prim (T_chest_key, []) - | Chest_t _meta -> prim (T_chest, []) + | Union_t ((utl, l_field), (utr, r_field), _meta) -> + let utl = unparse_ty_uncarbonated ~loc utl in + let tl = add_field_annot l_field utl in + let utr = unparse_ty_uncarbonated ~loc utr in + let tr = add_field_annot r_field utr in + (T_or, [tl; tr]) + | Lambda_t (uta, utr, _meta) -> + let ta = unparse_ty_uncarbonated ~loc uta in + let tr = unparse_ty_uncarbonated ~loc utr in + (T_lambda, [ta; tr]) + | Option_t (ut, _meta) -> + let ut = unparse_ty_uncarbonated ~loc ut in + (T_option, [ut]) + | List_t (ut, _meta) -> + let t = unparse_ty_uncarbonated ~loc ut in + (T_list, [t]) + | Ticket_t (ut, _meta) -> + let t = unparse_comparable_ty_uncarbonated ~loc ut in + (T_ticket, [t]) + | Set_t (ut, _meta) -> + let t = unparse_comparable_ty_uncarbonated ~loc ut in + (T_set, [t]) + | Map_t (uta, utr, _meta) -> + let ta = unparse_comparable_ty_uncarbonated ~loc uta in + let tr = unparse_ty_uncarbonated ~loc utr in + (T_map, [ta; tr]) + | Big_map_t (uta, utr, _meta) -> + let ta = unparse_comparable_ty_uncarbonated ~loc uta in + let tr = unparse_ty_uncarbonated ~loc utr in + (T_big_map, [ta; tr]) + | Sapling_transaction_t (memo_size, _meta) -> + (T_sapling_transaction, [unparse_memo_size ~loc memo_size]) + | Sapling_state_t (memo_size, _meta) -> + (T_sapling_state, [unparse_memo_size ~loc memo_size]) + | Chest_key_t _meta -> (T_chest_key, []) + | Chest_t _meta -> (T_chest, []) + in + Prim (loc, name, args, []) let unparse_ty ~loc ctxt ty = Gas.consume ctxt (Unparse_costs.unparse_type ty) >|? fun ctxt -> -- GitLab From 61f69d1934f74690287c483ef1e91939fcee4c06 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 18:53:31 +0100 Subject: [PATCH 10/30] Proto/Michelson: move parse_packable_ty later It doesn't need to be in the mutually recursive definition --- .../lib_protocol/script_ir_translator.ml | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 9652ed22fd03..ac23e43aecd1 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1259,27 +1259,7 @@ type ex_parameter_ty_and_entrypoints = } -> ex_parameter_ty_and_entrypoints -let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_packable_ty - : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:false - ~allow_operation:false - ~allow_contract: - legacy - (* type contract is forbidden in UNPACK because of - https://gitlab.com/tezos/tezos/-/issues/301 *) - ~allow_ticket:false - -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_passable_ty +let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_passable_ty : context -> stack_depth:int -> @@ -1654,6 +1634,20 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_big_ma ~allow_ticket:true value_ty +let parse_packable_ty ctxt ~stack_depth ~legacy node = + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:false + ~allow_operation:false + ~allow_contract: + legacy + (* type contract is forbidden in UNPACK because of + https://gitlab.com/tezos/tezos/-/issues/301 *) + ~allow_ticket:false + node + let parse_storage_ty : context -> stack_depth:int -> -- GitLab From 731a1957409ffe07fde01023a01b6c82d95dd3d3 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 18:53:31 +0100 Subject: [PATCH 11/30] Proto/Michelson: move parse_view_input/output_ty later They don't need to be in the mutually recursive definition --- .../lib_protocol/script_ir_translator.ml | 54 ++++++++----------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index ac23e43aecd1..107d58d28515 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1276,38 +1276,6 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_pa ~allow_contract:true ~allow_ticket:true -and parse_view_input_ty : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:false - ~allow_operation:false - ~allow_contract:true - ~allow_ticket:false - -and parse_view_output_ty : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:false - ~allow_operation:false - ~allow_contract:true - ~allow_ticket:false - and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_normal_storage_ty : context -> @@ -1648,6 +1616,28 @@ let parse_packable_ty ctxt ~stack_depth ~legacy node = ~allow_ticket:false node +let parse_view_input_ty ctxt ~stack_depth ~legacy node = + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:false + ~allow_operation:false + ~allow_contract:true + ~allow_ticket:false + node + +let parse_view_output_ty ctxt ~stack_depth ~legacy node = + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:false + ~allow_operation:false + ~allow_contract:true + ~allow_ticket:false + node + let parse_storage_ty : context -> stack_depth:int -> -- GitLab From cccc580cac3d5457a39b6e59b9e4521dc0422d01 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 18:53:31 +0100 Subject: [PATCH 12/30] Proto/Michelson: move parse_normal_storage_ty later It doesn't need to be in the mutually recursive definition --- .../lib_protocol/script_ir_translator.ml | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 107d58d28515..5320c13c917a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1276,23 +1276,6 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_pa ~allow_contract:true ~allow_ticket:true -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_normal_storage_ty - : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:true - ~allow_operation:false - ~allow_contract:legacy - ~allow_ticket:true - and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_any_ty : context -> @@ -1638,6 +1621,17 @@ let parse_view_output_ty ctxt ~stack_depth ~legacy node = ~allow_ticket:false node +let parse_normal_storage_ty ctxt ~stack_depth ~legacy node = + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:true + ~allow_operation:false + ~allow_contract:legacy + ~allow_ticket:true + node + let parse_storage_ty : context -> stack_depth:int -> -- GitLab From 5d6cf0d7a485c7ccf96e91dab874712d59dce155 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 18:53:31 +0100 Subject: [PATCH 13/30] Proto/Michelson: move parse_passable/any_ty later So that `parse_ty` is the first one in the mutually recursive definition --- .../lib_protocol/script_ir_translator.ml | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 5320c13c917a..c6af664c5f18 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1259,41 +1259,8 @@ type ex_parameter_ty_and_entrypoints = } -> ex_parameter_ty_and_entrypoints -let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_passable_ty +let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:true - ~allow_operation:false - ~allow_contract:true - ~allow_ticket:true - -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_any_ty - : - context -> - stack_depth:int -> - legacy:bool -> - Script.node -> - (ex_ty * context) tzresult = - fun ctxt ~stack_depth ~legacy -> - (parse_ty [@tailcall]) - ctxt - ~stack_depth - ~legacy - ~allow_lazy_storage:true - ~allow_operation:true - ~allow_contract:true - ~allow_ticket:true - -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_ty : context -> stack_depth:int -> legacy:bool -> @@ -1555,6 +1522,40 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_ty : T_ticket; ] +and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_passable_ty + : + context -> + stack_depth:int -> + legacy:bool -> + Script.node -> + (ex_ty * context) tzresult = + fun ctxt ~stack_depth ~legacy -> + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:true + ~allow_operation:false + ~allow_contract:true + ~allow_ticket:true + +and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_any_ty + : + context -> + stack_depth:int -> + legacy:bool -> + Script.node -> + (ex_ty * context) tzresult = + fun ctxt ~stack_depth ~legacy -> + (parse_ty [@tailcall]) + ctxt + ~stack_depth + ~legacy + ~allow_lazy_storage:true + ~allow_operation:true + ~allow_contract:true + ~allow_ticket:true + and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_big_map_ty ctxt ~stack_depth ~legacy big_map_loc args map_annot = Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> -- GitLab From 3e0d629ddc64e044f3d28bbf30c16de5ea1f0a31 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 27 Jan 2022 10:46:52 +0100 Subject: [PATCH 14/30] Proto/Michelson: rewrite parse_ty to ease a later diff --- .../lib_protocol/script_ir_translator.ml | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index c6af664c5f18..61c69e080707 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1282,55 +1282,56 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty if Compare.Int.(stack_depth > 10000) then error Typechecking_too_many_recursive_calls else + let return ctxt ty = (Ex_ty ty, ctxt) in match node with | Prim (loc, T_unit, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty unit_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt unit_t | Prim (loc, T_int, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty int_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt int_t | Prim (loc, T_nat, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty nat_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt nat_t | Prim (loc, T_string, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty string_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt string_t | Prim (loc, T_bytes, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty bytes_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt bytes_t | Prim (loc, T_mutez, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty mutez_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt mutez_t | Prim (loc, T_bool, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty bool_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt bool_t | Prim (loc, T_key, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty key_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt key_t | Prim (loc, T_key_hash, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty key_hash_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt key_hash_t | Prim (loc, T_chest_key, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty chest_key_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt chest_key_t | Prim (loc, T_chest, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty chest_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt chest_t | Prim (loc, T_timestamp, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty timestamp_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt timestamp_t | Prim (loc, T_address, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty address_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt address_t | Prim (loc, T_signature, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty signature_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt signature_t | Prim (loc, T_operation, [], annot) -> if allow_operation then - check_type_annot loc annot >>? fun () -> ok (Ex_ty operation_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt operation_t else error (Unexpected_operation loc) | Prim (loc, T_chain_id, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty chain_id_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt chain_id_t | Prim (loc, T_never, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty never_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt never_t | Prim (loc, T_bls12_381_g1, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty bls12_381_g1_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt bls12_381_g1_t | Prim (loc, T_bls12_381_g2, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty bls12_381_g2_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt bls12_381_g2_t | Prim (loc, T_bls12_381_fr, [], annot) -> - check_type_annot loc annot >>? fun () -> ok (Ex_ty bls12_381_fr_t, ctxt) + check_type_annot loc annot >|? fun () -> return ctxt bls12_381_fr_t | Prim (loc, T_contract, [utl], annot) -> if allow_contract then parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy utl >>? fun (Ex_ty tl, ctxt) -> check_type_annot loc annot >>? fun () -> - contract_t loc tl >|? fun ty -> (Ex_ty ty, ctxt) + contract_t loc tl >|? fun ty -> return ctxt ty else error (Unexpected_contract loc) | Prim (loc, T_pair, utl :: utr, annot) -> extract_field_annot utl >>? fun (utl, _left_field) -> @@ -1361,7 +1362,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty utr >>? fun (Ex_ty tr, ctxt) -> check_type_annot loc annot >>? fun () -> - pair_t loc tl tr >|? fun ty -> (Ex_ty ty, ctxt) + pair_t loc tl tr >|? fun ty -> return ctxt ty | Prim (loc, T_or, [utl; utr], annot) -> extract_field_annot utl >>? fun (utl, left_constr) -> extract_field_annot utr >>? fun (utr, right_constr) -> @@ -1394,7 +1395,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy utr >>? fun (Ex_ty tr, ctxt) -> check_type_annot loc annot >>? fun () -> - lambda_t loc ta tr >|? fun ty -> (Ex_ty ty, ctxt) + lambda_t loc ta tr >|? fun ty -> return ctxt ty | Prim (loc, T_option, [ut], annot) -> (if legacy then (* legacy semantics with (broken) field annotations *) @@ -1412,7 +1413,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_ticket ut >>? fun (Ex_ty t, ctxt) -> - option_t loc t >|? fun ty -> (Ex_ty ty, ctxt) + option_t loc t >|? fun ty -> return ctxt ty | Prim (loc, T_list, [ut], annot) -> parse_ty ctxt @@ -1425,19 +1426,19 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ut >>? fun (Ex_ty t, ctxt) -> check_type_annot loc annot >>? fun () -> - list_t loc t >|? fun ty -> (Ex_ty ty, ctxt) + list_t loc t >|? fun ty -> return ctxt ty | Prim (loc, T_ticket, [ut], annot) -> if allow_ticket then parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt ut >>? fun (Ex_comparable_ty t, ctxt) -> check_type_annot loc annot >>? fun () -> - ticket_t loc t >|? fun ty -> (Ex_ty ty, ctxt) + ticket_t loc t >|? fun ty -> return ctxt ty else error (Unexpected_ticket loc) | Prim (loc, T_set, [ut], annot) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt ut >>? fun (Ex_comparable_ty t, ctxt) -> check_type_annot loc annot >>? fun () -> - set_t loc t >|? fun ty -> (Ex_ty ty, ctxt) + set_t loc t >|? fun ty -> return ctxt ty | Prim (loc, T_map, [uta; utr], annot) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt uta >>? fun (Ex_comparable_ty ta, ctxt) -> @@ -1452,11 +1453,11 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty utr >>? fun (Ex_ty tr, ctxt) -> check_type_annot loc annot >>? fun () -> - map_t loc ta tr >|? fun ty -> (Ex_ty ty, ctxt) + map_t loc ta tr >|? fun ty -> return ctxt ty | Prim (loc, T_sapling_transaction, [memo_size], annot) -> check_type_annot loc annot >>? fun () -> parse_memo_size memo_size >|? fun memo_size -> - (Ex_ty (sapling_transaction_t ~memo_size), ctxt) + return ctxt (sapling_transaction_t ~memo_size) (* /!\ When adding new lazy storage kinds, be careful to use [when allow_lazy_storage] /!\ @@ -1468,7 +1469,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty | Prim (loc, T_sapling_state, [memo_size], annot) when allow_lazy_storage -> check_type_annot loc annot >>? fun () -> parse_memo_size memo_size >|? fun memo_size -> - (Ex_ty (sapling_state_t ~memo_size), ctxt) + return ctxt (sapling_state_t ~memo_size) | Prim (loc, (T_big_map | T_sapling_state), _, _) -> error (Unexpected_lazy_storage loc) | Prim -- GitLab From e7ff92026498656a6afc4551bb3e94c170716183 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 27 Jan 2022 14:24:44 +0100 Subject: [PATCH 15/30] Proto/Michelson: keep root name in parameter type annotation --- src/proto_alpha/lib_plugin/plugin.ml | 10 ++- .../lib_protocol/contract_services.ml | 14 ++-- .../lib_protocol/script_ir_annot.ml | 5 ++ .../lib_protocol/script_ir_annot.mli | 5 +- .../lib_protocol/script_ir_translator.ml | 67 ++++++++----------- .../lib_protocol/script_ir_translator.mli | 2 - 6 files changed, 44 insertions(+), 59 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 2ca39ba2d5b6..647f95463af0 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -2179,10 +2179,9 @@ module RPC = struct let ctxt = Gas.set_unlimited ctxt in let legacy = false in let open Script_ir_translator in - parse_toplevel ctxt ~legacy expr - >>=? fun ({arg_type; root_name; _}, ctxt) -> + parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return - ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> Gas_monad.run ctxt @@ Script_ir_translator.find_entrypoint @@ -2561,10 +2560,9 @@ module RPC = struct let ctxt = Gas.set_unlimited ctxt in let legacy = false in let open Script_ir_translator in - parse_toplevel ~legacy ctxt expr - >>=? fun ({arg_type; root_name; _}, ctxt) -> + parse_toplevel ~legacy ctxt expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return - ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> Script_ir_translator.list_entrypoints ~root_name arg_type ctxt diff --git a/src/proto_alpha/lib_protocol/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml index 2f78dbdcb43e..dd502ea60cc3 100644 --- a/src/proto_alpha/lib_protocol/contract_services.ml +++ b/src/proto_alpha/lib_protocol/contract_services.ml @@ -364,10 +364,9 @@ let[@coq_axiom_with_reason "gadt"] register () = ctxt expr >>?= fun (expr, _) -> - parse_toplevel ctxt ~legacy expr - >>=? fun ({arg_type; root_name; _}, ctxt) -> + parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return - ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> Gas_monad.run ctxt @@ -395,14 +394,9 @@ let[@coq_axiom_with_reason "gadt"] register () = ctxt expr >>?= fun (expr, _) -> - parse_toplevel ctxt ~legacy expr - >>=? fun ({arg_type; root_name; _}, ctxt) -> + parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return - ( ( parse_parameter_ty_and_entrypoints - ctxt - ~legacy - arg_type - ~root_name + ( ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> Script_ir_translator.list_entrypoints ~root_name arg_type ctxt diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index c8ccf6047c71..7913908917af 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -214,6 +214,11 @@ let parse_field_annot : error_unexpected_annot loc vars >>? fun () -> error_unexpected_annot loc types >>? fun () -> get_one_annot loc fields +let is_field_annot loc a = + parse_field_annot loc [a] >|? function + | Some (_a : field_annot) -> true + | None -> false + let extract_field_annot : Script.node -> (Script.node * field_annot option) tzresult = function | Prim (loc, prim, args, annot) -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 50c5be2a100a..2209278c378b 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -72,9 +72,8 @@ val error_unexpected_annot : Script.location -> 'a list -> unit tzresult (** Check a type annotation only. *) val check_type_annot : Script.location -> string list -> unit tzresult -(** Parse a field annotation only. *) -val parse_field_annot : - Script.location -> string list -> field_annot option tzresult +(** Check a field annotation only. *) +val is_field_annot : Script.location -> string -> bool tzresult (** Check an annotation for composed types, of the form [:ty_name %field1 %field2] in any order. *) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 61c69e080707..1f2951f2855a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1722,7 +1722,6 @@ type toplevel = { arg_type : Script.node; storage_type : Script.node; views : view SMap.t; - root_name : Entrypoint.t option; } type ('arg, 'storage) code = { @@ -1913,10 +1912,15 @@ let parse_parameter_ty_and_entrypoints : context -> stack_depth:int -> legacy:bool -> - root_name:Entrypoint.t option -> Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult = - fun ctxt ~stack_depth ~legacy ~root_name node -> + fun ctxt ~stack_depth ~legacy node -> + extract_field_annot node >>? fun (node, root_annot) -> + let root_name = + match root_annot with + | None -> None + | Some (Field_annot annot) -> Entrypoint.of_annot_lax_opt annot + in parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node >>? fun (Ex_ty arg_type, ctxt) -> (if legacy then Result.return_unit @@ -4460,14 +4464,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_two_var_annot loc annot >>?= fun () -> let canonical_code = Micheline.strip_locations code in parse_toplevel ctxt ~legacy canonical_code - >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> + >>?= fun ({arg_type; storage_type; code_field; views}, ctxt) -> record_trace (Ill_formed_type (Some "parameter", canonical_code, location arg_type)) (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:(stack_depth + 1) ~legacy - ~root_name arg_type) >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> record_trace @@ -5017,12 +5020,11 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_contra >>? fun (code, ctxt) -> (* can only fail because of gas *) parse_toplevel ctxt ~legacy:true code - >>? fun ({arg_type; root_name; _}, ctxt) -> + >>? fun ({arg_type; _}, ctxt) -> parse_parameter_ty_and_entrypoints ctxt ~stack_depth:(stack_depth + 1) ~legacy:true - ~root_name arg_type >>? fun ( Ex_parameter_ty_and_entrypoints {arg_type = targ; root_name}, @@ -5128,34 +5130,34 @@ and parse_toplevel : Some (s, sloc, sannot), Some (c, cloc, carrot), views ) -> - let maybe_root_name = + let p_pannot = (* root name can be attached to either the parameter - primitive or the toplevel constructor (legacy only) *) - Script_ir_annot.extract_field_annot p >>? fun (p, root_name) -> + primitive or the toplevel constructor (legacy only). + + In the latter case we move it to the parameter type. + *) + Script_ir_annot.extract_field_annot p >>? fun (_p, root_name) -> match root_name with - | Some (Field_annot root_name) -> - let root_name = Entrypoint.of_annot_lax_opt root_name in - ok (p, pannot, root_name) + | Some _ -> ok (p, pannot) | None -> ( match pannot with | [single] when legacy && Compare.Int.(String.length single > 0) && Compare.Char.(single.[0] = '%') -> ( - parse_field_annot ploc [single] >|? function - | None -> (p, [], None) - | Some (Field_annot pannot) -> - let root_name = Entrypoint.of_annot_lax_opt pannot in - (p, [], root_name)) - | _ -> ok (p, pannot, None)) + is_field_annot ploc single >|? fun is_field_annot -> + match (is_field_annot, p) with + | (true, Prim (loc, prim, args, annots)) -> + (Prim (loc, prim, args, single :: annots), []) + | _ -> (p, [])) + | _ -> ok (p, pannot)) in (* only one field annot is allowed to set the root entrypoint name *) - maybe_root_name >>? fun (arg_type, pannot, root_name) -> + p_pannot >>? fun (arg_type, pannot) -> Script_ir_annot.error_unexpected_annot ploc pannot >>? fun () -> Script_ir_annot.error_unexpected_annot cloc carrot >>? fun () -> Script_ir_annot.error_unexpected_annot sloc sannot >|? fun () -> - ({code_field = c; arg_type; root_name; views; storage_type = s}, ctxt) - ) + ({code_field = c; arg_type; views; storage_type = s}, ctxt)) (* Same as [parse_contract], but does not fail when the contact is missing or if the expected type doesn't match the actual one. In that case None is @@ -5211,13 +5213,12 @@ let parse_contract_for_script : (* can only fail because of gas *) match parse_toplevel ctxt ~legacy:true code with | Error _ -> error (Invalid_contract (loc, contract)) - | Ok ({arg_type; root_name; _}, ctxt) -> ( + | Ok ({arg_type; _}, ctxt) -> ( match parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy:true - ~root_name arg_type with | Error _ -> error (Invalid_contract (loc, contract)) @@ -5259,16 +5260,11 @@ let parse_code : >>?= fun (code, ctxt) -> Global_constants_storage.expand ctxt code >>=? fun (ctxt, code) -> parse_toplevel ctxt ~legacy code - >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> + >>?= fun ({arg_type; storage_type; code_field; views}, ctxt) -> let arg_type_loc = location arg_type in record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) - (parse_parameter_ty_and_entrypoints - ctxt - ~stack_depth:0 - ~legacy - ~root_name - arg_type) + (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy arg_type) >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> let storage_type_loc = location storage_type in record_trace @@ -5370,17 +5366,12 @@ let typecheck_code : (* Constants need to be expanded or [parse_toplevel] may fail. *) Global_constants_storage.expand ctxt code >>=? fun (ctxt, code) -> parse_toplevel ctxt ~legacy code - >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> + >>?= fun ({arg_type; storage_type; code_field; views}, ctxt) -> let type_map = ref [] in let arg_type_loc = location arg_type in record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) - (parse_parameter_ty_and_entrypoints - ctxt - ~stack_depth:0 - ~legacy - ~root_name - arg_type) + (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy arg_type) >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> let storage_type_loc = location storage_type in record_trace diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 0ae5e0af13f7..9f6def7a3634 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -88,7 +88,6 @@ type toplevel = { arg_type : Script.node; storage_type : Script.node; views : Script_typed_ir.view Script_typed_ir.SMap.t; - root_name : Entrypoint.t option; } type ('arg, 'storage) code = { @@ -279,7 +278,6 @@ val parse_comparable_ty : val parse_parameter_ty_and_entrypoints : context -> legacy:bool -> - root_name:Entrypoint.t option -> Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult -- GitLab From ebaa522453a5379e7d2f7722dd188fbe1e54cd5a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 27 Jan 2022 16:42:03 +0100 Subject: [PATCH 16/30] Proto/Michelson: introduce extract_entrypoint_annot which is just `extract_field_annot` composed with `Entrypoint.of_annot_lax_opt` --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 8 ++++++++ src/proto_alpha/lib_protocol/script_ir_annot.mli | 4 ++++ src/proto_alpha/lib_protocol/script_ir_translator.ml | 7 +------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 7913908917af..e3aee7df8175 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -236,6 +236,14 @@ let extract_field_annot : >|? fun field_annot -> (Prim (loc, prim, args, annot), field_annot) | expr -> ok (expr, None) +let extract_entrypoint_annot : + Script.node -> (Script.node * Entrypoint.t option) tzresult = + fun node -> + extract_field_annot node >|? fun (node, field_annot_opt) -> + ( node, + Option.bind field_annot_opt (fun (Field_annot field_annot) -> + Entrypoint.of_annot_lax_opt field_annot) ) + let check_var_annot : Script.location -> string list -> unit tzresult = fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 2209278c378b..7ef9f85a1e75 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -83,6 +83,10 @@ val check_composed_type_annot : Script.location -> string list -> unit tzresult val extract_field_annot : Script.node -> (Script.node * field_annot option) tzresult +(** Extract and remove a field annotation as an entrypoint from a node *) +val extract_entrypoint_annot : + Script.node -> (Script.node * Entrypoint.t option) tzresult + (** Instruction annotations parsing *) (** Check a variable annotation. *) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 1f2951f2855a..29eeed160883 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1915,12 +1915,7 @@ let parse_parameter_ty_and_entrypoints : Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult = fun ctxt ~stack_depth ~legacy node -> - extract_field_annot node >>? fun (node, root_annot) -> - let root_name = - match root_annot with - | None -> None - | Some (Field_annot annot) -> Entrypoint.of_annot_lax_opt annot - in + extract_entrypoint_annot node >>? fun (node, root_name) -> parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node >>? fun (Ex_ty arg_type, ctxt) -> (if legacy then Result.return_unit -- GitLab From 86f1654cee0c3ae3111a06c866e33db1c4290971 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 28 Jan 2022 14:35:00 +0100 Subject: [PATCH 17/30] Proto/Michelson: small rewrites of parse_ty to reduce next diff size --- .../lib_protocol/script_ir_translator.ml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 29eeed160883..8e786a7db587 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1375,7 +1375,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_contract ~allow_ticket utl - >>? fun (Ex_ty tl, ctxt) -> + >>? fun (parsed_l, ctxt) -> parse_ty ctxt ~stack_depth:(stack_depth + 1) @@ -1385,8 +1385,10 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_contract ~allow_ticket utr - >>? fun (Ex_ty tr, ctxt) -> + >>? fun (parsed_r, ctxt) -> check_type_annot loc annot >>? fun () -> + let (Ex_ty tl) = parsed_l in + let (Ex_ty tr) = parsed_r in union_t loc (tl, left_constr) (tr, right_constr) >|? fun ty -> (Ex_ty ty, ctxt) | Prim (loc, T_lambda, [uta; utr], annot) -> @@ -1465,7 +1467,14 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty from another contract with `PUSH t id` or `UNPACK`. *) | Prim (loc, T_big_map, args, annot) when allow_lazy_storage -> - (parse_big_map_ty [@tailcall]) ctxt ~stack_depth ~legacy loc args annot + parse_big_map_ty + ctxt + ~stack_depth:(stack_depth + 1) + ~legacy + loc + args + annot + >|? fun (Ex_ty ty, ctxt) -> return ctxt ty | Prim (loc, T_sapling_state, [memo_size], annot) when allow_lazy_storage -> check_type_annot loc annot >>? fun () -> parse_memo_size memo_size >|? fun memo_size -> -- GitLab From 8f9cefd50d28bd38b4fac6a9a876dbab1c31f7f0 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 28 Jan 2022 14:43:09 +0100 Subject: [PATCH 18/30] Proto/Michelson: introduce parse_ty_ret to make next diff smaller --- .../lib_protocol/script_ir_translator.ml | 73 ++++++++++++++----- 1 file changed, 56 insertions(+), 17 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 8e786a7db587..13296dd422f0 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1259,8 +1259,11 @@ type ex_parameter_ty_and_entrypoints = } -> ex_parameter_ty_and_entrypoints -let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty - : +type ('ret, 'name) parse_ty_ret = + | Don't_parse_entrypoints : (ex_ty, unit) parse_ty_ret + +let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty : + type ret name. context -> stack_depth:int -> legacy:bool -> @@ -1268,8 +1271,9 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty allow_operation:bool -> allow_contract:bool -> allow_ticket:bool -> + ret:(ret, name) parse_ty_ret -> Script.node -> - (ex_ty * context) tzresult = + (ret * context) tzresult = fun ctxt ~stack_depth ~legacy @@ -1277,12 +1281,15 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret node -> Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> if Compare.Int.(stack_depth > 10000) then error Typechecking_too_many_recursive_calls else - let return ctxt ty = (Ex_ty ty, ctxt) in + let return ctxt ty : ret * context = + match ret with Don't_parse_entrypoints -> (Ex_ty ty, ctxt) + in match node with | Prim (loc, T_unit, [], annot) -> check_type_annot loc annot >|? fun () -> return ctxt unit_t @@ -1328,7 +1335,12 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty check_type_annot loc annot >|? fun () -> return ctxt bls12_381_fr_t | Prim (loc, T_contract, [utl], annot) -> if allow_contract then - parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy utl + parse_passable_ty + ctxt + ~stack_depth:(stack_depth + 1) + ~legacy + utl + ~ret:Don't_parse_entrypoints >>? fun (Ex_ty tl, ctxt) -> check_type_annot loc annot >>? fun () -> contract_t loc tl >|? fun ty -> return ctxt ty @@ -1343,6 +1355,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret:Don't_parse_entrypoints utl >>? fun (Ex_ty tl, ctxt) -> (match utr with @@ -1359,13 +1372,18 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret:Don't_parse_entrypoints utr >>? fun (Ex_ty tr, ctxt) -> check_type_annot loc annot >>? fun () -> pair_t loc tl tr >|? fun ty -> return ctxt ty - | Prim (loc, T_or, [utl; utr], annot) -> - extract_field_annot utl >>? fun (utl, left_constr) -> - extract_field_annot utr >>? fun (utr, right_constr) -> + | Prim (loc, T_or, [utl; utr], annot) -> ( + (match ret with + | Don't_parse_entrypoints -> + extract_field_annot utl >>? fun utl_left_constr -> + extract_field_annot utr >|? fun utr_right_constr -> + (utl_left_constr, utr_right_constr)) + >>? fun ((utl, left_constr), (utr, right_constr)) -> parse_ty ctxt ~stack_depth:(stack_depth + 1) @@ -1374,6 +1392,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret utl >>? fun (parsed_l, ctxt) -> parse_ty @@ -1384,13 +1403,16 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret utr >>? fun (parsed_r, ctxt) -> check_type_annot loc annot >>? fun () -> - let (Ex_ty tl) = parsed_l in - let (Ex_ty tr) = parsed_r in - union_t loc (tl, left_constr) (tr, right_constr) >|? fun ty -> - (Ex_ty ty, ctxt) + match ret with + | Don't_parse_entrypoints -> + let (Ex_ty tl) = parsed_l in + let (Ex_ty tr) = parsed_r in + union_t loc (tl, left_constr) (tr, right_constr) >|? fun ty -> + ((Ex_ty ty : ret), ctxt)) | Prim (loc, T_lambda, [uta; utr], annot) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy uta >>? fun (Ex_ty ta, ctxt) -> @@ -1413,6 +1435,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret:Don't_parse_entrypoints ut >>? fun (Ex_ty t, ctxt) -> option_t loc t >|? fun ty -> return ctxt ty @@ -1425,6 +1448,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret:Don't_parse_entrypoints ut >>? fun (Ex_ty t, ctxt) -> check_type_annot loc annot >>? fun () -> @@ -1452,6 +1476,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty ~allow_operation ~allow_contract ~allow_ticket + ~ret:Don't_parse_entrypoints utr >>? fun (Ex_ty tr, ctxt) -> check_type_annot loc annot >>? fun () -> @@ -1532,13 +1557,14 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty T_ticket; ] -and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_passable_ty - : +and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_passable_ty : + type ret name. context -> stack_depth:int -> legacy:bool -> + ret:(ret, name) parse_ty_ret -> Script.node -> - (ex_ty * context) tzresult = + (ret * context) tzresult = fun ctxt ~stack_depth ~legacy -> (parse_ty [@tailcall]) ctxt @@ -1565,6 +1591,7 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_any_ty ~allow_operation:true ~allow_contract:true ~allow_ticket:true + ~ret:Don't_parse_entrypoints and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_big_map_ty ctxt ~stack_depth ~legacy big_map_loc args map_annot = @@ -1594,6 +1621,7 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_big_ma ~allow_operation:false ~allow_contract:legacy ~allow_ticket:true + ~ret:Don't_parse_entrypoints value_ty let parse_packable_ty ctxt ~stack_depth ~legacy node = @@ -1608,6 +1636,7 @@ let parse_packable_ty ctxt ~stack_depth ~legacy node = (* type contract is forbidden in UNPACK because of https://gitlab.com/tezos/tezos/-/issues/301 *) ~allow_ticket:false + ~ret:Don't_parse_entrypoints node let parse_view_input_ty ctxt ~stack_depth ~legacy node = @@ -1619,6 +1648,7 @@ let parse_view_input_ty ctxt ~stack_depth ~legacy node = ~allow_operation:false ~allow_contract:true ~allow_ticket:false + ~ret:Don't_parse_entrypoints node let parse_view_output_ty ctxt ~stack_depth ~legacy node = @@ -1630,6 +1660,7 @@ let parse_view_output_ty ctxt ~stack_depth ~legacy node = ~allow_operation:false ~allow_contract:true ~allow_ticket:false + ~ret:Don't_parse_entrypoints node let parse_normal_storage_ty ctxt ~stack_depth ~legacy node = @@ -1641,6 +1672,7 @@ let parse_normal_storage_ty ctxt ~stack_depth ~legacy node = ~allow_operation:false ~allow_contract:legacy ~allow_ticket:true + ~ret:Don't_parse_entrypoints node let parse_storage_ty : @@ -1925,12 +1957,19 @@ let parse_parameter_ty_and_entrypoints : (ex_parameter_ty_and_entrypoints * context) tzresult = fun ctxt ~stack_depth ~legacy node -> extract_entrypoint_annot node >>? fun (node, root_name) -> - parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy node + parse_passable_ty + ctxt + ~stack_depth:(stack_depth + 1) + ~legacy + ~ret:Don't_parse_entrypoints + node >>? fun (Ex_ty arg_type, ctxt) -> (if legacy then Result.return_unit else well_formed_entrypoints ~root_name arg_type) >|? fun () -> (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) +let parse_passable_ty = parse_passable_ty ~ret:Don't_parse_entrypoints + let parse_uint ~nb_bits = assert (Compare.Int.(nb_bits >= 0 && nb_bits <= 30)) ; let max_int = (1 lsl nb_bits) - 1 in @@ -6260,7 +6299,7 @@ let parse_passable_ty = parse_passable_ty ~stack_depth:0 let parse_any_ty = parse_any_ty ~stack_depth:0 -let parse_ty = parse_ty ~stack_depth:0 +let parse_ty = parse_ty ~stack_depth:0 ~ret:Don't_parse_entrypoints let parse_parameter_ty_and_entrypoints = parse_parameter_ty_and_entrypoints ~stack_depth:0 -- GitLab From 854ff194eb5553fc2ae95544a1a1c5148e04a4d3 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 12 Jan 2021 16:39:32 +0100 Subject: [PATCH 19/30] Proto/Michelson: move entrypoints out of types The pair (root_name, parameter_ty_with_annotations) is replaced by the pair (entrypoints, parameter_ty_with_no_annotations). And ignore union type non-entrypoint field annotations. --- .../interpreter_benchmarks.ml | 2 +- src/proto_alpha/lib_plugin/plugin.ml | 22 +- .../lib_protocol/contract_services.ml | 10 +- .../lib_protocol/script_interpreter.ml | 10 +- .../lib_protocol/script_interpreter_defs.ml | 10 +- .../lib_protocol/script_ir_annot.ml | 4 - .../lib_protocol/script_ir_annot.mli | 4 - .../lib_protocol/script_ir_translator.ml | 263 ++++++++++-------- .../lib_protocol/script_ir_translator.mli | 17 +- .../lib_protocol/script_tc_context.ml | 6 +- .../lib_protocol/script_tc_context.mli | 7 +- .../lib_protocol/script_typed_ir.ml | 23 +- .../lib_protocol/script_typed_ir.mli | 28 +- .../lib_protocol/script_typed_ir_size.ml | 10 +- .../lib_protocol/ticket_operations_diff.ml | 2 +- 15 files changed, 241 insertions(+), 177 deletions(-) diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml index 01eed62fd48e..2b30fba64a83 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml @@ -2206,7 +2206,7 @@ module Registration_section = struct arg_type = unit; lambda; views = SMap.empty; - root_name = None; + entrypoints = no_entrypoints; k = halt (operation @$ address @$ bot); }) () diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 647f95463af0..113c2f259cde 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1933,7 +1933,6 @@ module RPC = struct (* Same as the unparsing functions for types in Script_ir_translator but does not consume gas and never folds (pair a (pair b c)) *) - open Script_ir_translator open Micheline open Michelson_v1_primitives open Script_typed_ir @@ -2002,12 +2001,10 @@ module RPC = struct let tl = unparse_ty ~loc utl in let tr = unparse_ty ~loc utr in return (T_pair, [tl; tr], annot) - | Union_t ((utl, l_field), (utr, r_field), _meta) -> + | Union_t ((utl, _l_field), (utr, _r_field), _meta) -> let annot = [] in - let utl = unparse_ty ~loc utl in - let tl = add_field_annot l_field utl in - let utr = unparse_ty ~loc utr in - let tr = add_field_annot r_field utr in + let tl = unparse_ty ~loc utl in + let tr = unparse_ty ~loc utr in return (T_or, [tl; tr], annot) | Lambda_t (uta, utr, _meta) -> let ta = unparse_ty ~loc uta in @@ -2182,12 +2179,13 @@ module RPC = struct parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type - >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) -> + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, _) + -> Gas_monad.run ctxt @@ Script_ir_translator.find_entrypoint ~error_details:Informative - ~root_name arg_type + entrypoints entrypoint >>? fun (r, ctxt) -> r >>? fun (_f, Ex_ty ty) -> @@ -2447,7 +2445,7 @@ module RPC = struct arg_type; storage_type; views; - root_name; + entrypoints; code_size; }, ctxt ) -> @@ -2465,7 +2463,7 @@ module RPC = struct arg_type; storage_type; views; - root_name; + entrypoints; code_size; storage; } @@ -2563,9 +2561,9 @@ module RPC = struct parse_toplevel ~legacy ctxt expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type - >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, _) -> - Script_ir_translator.list_entrypoints ~root_name arg_type ctxt + Script_ir_translator.list_entrypoints ctxt arg_type entrypoints >|? fun (unreachable_entrypoint, map) -> ( unreachable_entrypoint, Entrypoint.Map.fold diff --git a/src/proto_alpha/lib_protocol/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml index dd502ea60cc3..2cb975ed4e87 100644 --- a/src/proto_alpha/lib_protocol/contract_services.ml +++ b/src/proto_alpha/lib_protocol/contract_services.ml @@ -367,13 +367,13 @@ let[@coq_axiom_with_reason "gadt"] register () = parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type - >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) + >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, _) -> Gas_monad.run ctxt @@ Script_ir_translator.find_entrypoint ~error_details:Informative - ~root_name arg_type + entrypoints entrypoint >>? fun (r, ctxt) -> r |> function @@ -397,9 +397,9 @@ let[@coq_axiom_with_reason "gadt"] register () = parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; _}, ctxt) -> Lwt.return ( ( parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type - >>? fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, _) - -> - Script_ir_translator.list_entrypoints ~root_name arg_type ctxt + >>? fun ( Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, + _ ) -> + Script_ir_translator.list_entrypoints ctxt arg_type entrypoints ) >|? fun (unreachable_entrypoint, map) -> Some diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index b0ca163de6c1..75a226472b82 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -1132,7 +1132,7 @@ and step : type a s b t r f. (a, s, b, t, r, f) step_type = arg_type; lambda = Lam (_, code); views; - root_name; + entrypoints; k; _; } -> @@ -1146,7 +1146,7 @@ and step : type a s b t r f. (a, s, b, t, r, f) step_type = arg_type code views - root_name + entrypoints delegate credit init @@ -1695,13 +1695,13 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal arg_type; storage; storage_type; - root_name; + entrypoints; views; }, ctxt ) -> Gas_monad.run ctxt - (find_entrypoint ~error_details:Informative arg_type ~root_name entrypoint) + (find_entrypoint ~error_details:Informative arg_type entrypoints entrypoint) >>?= fun (r, ctxt) -> record_trace (Bad_contract_parameter step_constants.self) r >>?= fun (box, _) -> @@ -1752,7 +1752,7 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal in let script = Ex_script - {code_size; code; arg_type; storage; storage_type; root_name; views} + {code_size; code; arg_type; storage; storage_type; entrypoints; views} in (* We consume gas after the fact in order to not have to instrument [script_size] (for efficiency). diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 6e3e5f1d784d..188378173072 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -527,20 +527,20 @@ let transfer (ctxt, sc) gas amount tp p destination entrypoint = let (gas, ctxt) = local_gas_counter_and_outdated_context ctxt in return (res, ctxt, gas) -(* [create_contract (ctxt, sc) gas storage_ty param_ty code root_name +(* [create_contract (ctxt, sc) gas storage_ty param_ty code entrypoints delegate credit init] creates an origination operation for a - contract represented by [code], with some [root_name], some initial + contract represented by [code], with some [entrypoints], some initial [credit] (taken to contract being executed), and an initial storage [init] of type [storage_ty]. The type of the new contract argument is [param_ty]. *) (* TODO: https://gitlab.com/tezos/tezos/-/issues/1688 Refactor the sharing part of unparse_script and create_contract *) -let create_contract (ctxt, sc) gas storage_type param_type code views root_name - delegate credit init = +let create_contract (ctxt, sc) gas storage_type param_type code views + entrypoints delegate credit init = let ctxt = update_context gas ctxt in let loc = Micheline.dummy_location in - unparse_parameter_ty ~loc ctxt param_type ~root_name + unparse_parameter_ty ~loc ctxt param_type ~entrypoints >>?= fun (unparsed_param_type, ctxt) -> unparse_ty ~loc ctxt storage_type >>?= fun (unparsed_storage_type, ctxt) -> let open Micheline in diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index e3aee7df8175..b6b002116cd9 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -39,10 +39,6 @@ module FOR_TESTS = struct Field_annot (Non_empty_string.of_string_exn s) end -let unparse_field_annot : field_annot option -> string list = function - | None -> [] - | Some (Field_annot a) -> ["%" ^ (a :> string)] - let field_annot_opt_to_entrypoint_strict ~loc = function | None -> Ok Entrypoint.default | Some (Field_annot a) -> Entrypoint.of_annot_strict ~loc a diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 7ef9f85a1e75..a2928820129e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -32,10 +32,6 @@ module FOR_TESTS : sig val unsafe_field_annot_of_string : string -> field_annot end -(** Unparse annotations to their string representation *) - -val unparse_field_annot : field_annot option -> string list - (** Converts a field annot option to an entrypoint. An error is returned if the field annot is too long or is "default". [None] is converted to [Some default]. diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 13296dd422f0..2d53cd895c25 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -179,11 +179,6 @@ let rec ty_of_comparable_ty : type a. a comparable_ty -> a ty = function ((ty_of_comparable_ty l, None), (ty_of_comparable_ty r, None), tname) | Option_key (t, tname) -> Option_t (ty_of_comparable_ty t, tname) -let add_field_annot a = function - | Prim (loc, prim, args, annots) -> - Prim (loc, prim, args, annots @ unparse_field_annot a) - | expr -> expr - let add_entrypoint_annot entrypoint expr = match (entrypoint, expr) with | (Some name, Prim (loc, prim, args, annots)) -> @@ -262,11 +257,9 @@ let rec unparse_ty_uncarbonated : match tr with | Prim (_, T_pair, ts, []) -> (T_pair, tl :: ts) | _ -> (T_pair, [tl; tr])) - | Union_t ((utl, l_field), (utr, r_field), _meta) -> - let utl = unparse_ty_uncarbonated ~loc utl in - let tl = add_field_annot l_field utl in - let utr = unparse_ty_uncarbonated ~loc utr in - let tr = add_field_annot r_field utr in + | Union_t ((utl, _l_field), (utr, _r_field), _meta) -> + let tl = unparse_ty_uncarbonated ~loc utl in + let tr = unparse_ty_uncarbonated ~loc utr in (T_or, [tl; tr]) | Lambda_t (uta, utr, _meta) -> let ta = unparse_ty_uncarbonated ~loc uta in @@ -309,9 +302,25 @@ let unparse_comparable_ty ~loc ctxt comp_ty = Gas.consume ctxt (Unparse_costs.unparse_comparable_type comp_ty) >|? fun ctxt -> (unparse_comparable_ty_uncarbonated ~loc comp_ty, ctxt) -let unparse_parameter_ty ~loc ctxt ~root_name ty = +let rec add_entrypoints_uncarbonated : + type ty. + ty entrypoints -> 'loc Script.michelson_node -> 'loc Script.michelson_node = + fun entrypoints node -> + match (entrypoints, node) with + | ({nested = Entrypoints_None; name}, node) -> add_entrypoint_annot name node + | ( {nested = Entrypoints_Union {left; right}; name}, + Prim (loc, T_or, [utl; utr], annots) ) -> + let utl = add_entrypoints_uncarbonated left utl in + let utr = add_entrypoints_uncarbonated right utr in + add_entrypoint_annot name @@ Prim (loc, T_or, [utl; utr], annots) + | ({nested = Entrypoints_Union _; _}, _) -> + (* this can only happen if [add_entrypoints_uncarbonated] is not in + sync with [unparse_ty_uncarbonated] *) + assert false + +let unparse_parameter_ty ~loc ctxt ty ~entrypoints = unparse_ty ~loc ctxt ty >|? fun (unparsed, ctxt) -> - (add_entrypoint_annot root_name unparsed, ctxt) + (add_entrypoints_uncarbonated entrypoints unparsed, ctxt) let[@coq_struct "function_parameter"] rec strip_var_annots = function | (Int _ | String _ | Bytes _) as atom -> atom @@ -1255,7 +1264,7 @@ type ex_ty = Ex_ty : 'a ty -> ex_ty type ex_parameter_ty_and_entrypoints = | Ex_parameter_ty_and_entrypoints : { arg_type : 'a ty; - root_name : Entrypoint.t option; + entrypoints : 'a entrypoints; } -> ex_parameter_ty_and_entrypoints @@ -1380,10 +1389,9 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty | Prim (loc, T_or, [utl; utr], annot) -> ( (match ret with | Don't_parse_entrypoints -> - extract_field_annot utl >>? fun utl_left_constr -> - extract_field_annot utr >|? fun utr_right_constr -> - (utl_left_constr, utr_right_constr)) - >>? fun ((utl, left_constr), (utr, right_constr)) -> + extract_field_annot utl >>? fun (utl, _left_constr) -> + extract_field_annot utr >|? fun (utr, _right_constr) -> (utl, utr)) + >>? fun (utl, utr) -> parse_ty ctxt ~stack_depth:(stack_depth + 1) @@ -1411,7 +1419,7 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty | Don't_parse_entrypoints -> let (Ex_ty tl) = parsed_l in let (Ex_ty tr) = parsed_r in - union_t loc (tl, left_constr) (tr, right_constr) >|? fun ty -> + union_t loc (tl, None) (tr, None) >|? fun ty -> ((Ex_ty ty : ret), ctxt)) | Prim (loc, T_lambda, [uta; utr], annot) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy uta @@ -1718,6 +1726,29 @@ let parse_storage_ty : ) | _ -> (parse_normal_storage_ty [@tailcall]) ctxt ~stack_depth ~legacy node +let rec parse_entrypoints_uncarbonated : + type t. + root_name:Entrypoint.t option -> + Script.node -> + t ty -> + t entrypoints tzresult = + fun ~root_name node arg_ty -> + (match root_name with + | Some _ -> ok (node, root_name) + | None -> extract_entrypoint_annot node) + >>? fun (node, name) -> + (match (arg_ty, node) with + | (Union_t ((tl, _al), (tr, _ar), _), Prim (_loc, T_or, [utl; utr], _annot)) + -> + parse_entrypoints_uncarbonated ~root_name:None utl tl >>? fun left -> + parse_entrypoints_uncarbonated ~root_name:None utr tr + >|? fun right : t nested_entrypoints -> Entrypoints_Union {left; right} + | (Union_t _, _) -> + (* this can only happen if [parse_entrypoints_uncarbonated] is not in sync with [parse_ty] *) + assert false + | (_, _) -> ok Entrypoints_None) + >|? fun nested -> {name; nested} + let check_packable ~legacy loc root = let rec check : type t. t ty -> unit tzresult = function (* /!\ When adding new lazy storage kinds, be sure to return an error. /!\ @@ -1770,7 +1801,7 @@ type ('arg, 'storage) code = { arg_type : 'arg ty; storage_type : 'storage ty; views : view SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'arg entrypoints; code_size : Cache_memory_helpers.sint; } @@ -1836,60 +1867,50 @@ type 'before dup_n_proof_argument = -> 'before dup_n_proof_argument let find_entrypoint (type full error_trace) - ~(error_details : error_trace error_details) (full : full ty) ~root_name - entrypoint : ((Script.node -> Script.node) * ex_ty, error_trace) Gas_monad.t - = + ~(error_details : error_trace error_details) (full : full ty) + (entrypoints : full entrypoints) entrypoint : + ((Script.node -> Script.node) * ex_ty, error_trace) Gas_monad.t = let open Gas_monad in let loc = Micheline.dummy_location in let rec find_entrypoint : type t. t ty -> + t entrypoints -> Entrypoint.t -> ((Script.node -> Script.node) * ex_ty, unit) Gas_monad.t = - fun t entrypoint -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> ( - consume_gas Typecheck_costs.find_entrypoint_cycle >>$ fun () -> - if field_annot_opt_eq_entrypoint_lax al entrypoint then - return ((fun e -> Prim (loc, D_Left, [e], [])), Ex_ty tl) - else if field_annot_opt_eq_entrypoint_lax ar entrypoint then - return ((fun e -> Prim (loc, D_Right, [e], [])), Ex_ty tr) - else - find_entrypoint tl entrypoint >??$ function - | Ok (f, t) -> return ((fun e -> Prim (loc, D_Left, [f e], [])), t) - | Error () -> - find_entrypoint tr entrypoint >|$ fun (f, t) -> - ((fun e -> Prim (loc, D_Right, [f e], [])), t)) - | _ -> of_result (Error ()) + fun ty entrypoints entrypoint -> + consume_gas Typecheck_costs.find_entrypoint_cycle >>$ fun () -> + match (ty, entrypoints) with + | (_, {name = Some name; _}) when Entrypoint.(name = entrypoint) -> + return ((fun e -> e), Ex_ty ty) + | ( Union_t ((tl, _al), (tr, _ar), _), + {nested = Entrypoints_Union {left; right}; _} ) -> ( + find_entrypoint tl left entrypoint >??$ function + | Ok (f, t) -> return ((fun e -> Prim (loc, D_Left, [f e], [])), t) + | Error () -> + find_entrypoint tr right entrypoint >|$ fun (f, t) -> + ((fun e -> Prim (loc, D_Right, [f e], [])), t)) + | (_, {nested = Entrypoints_None; _}) -> of_result (Error ()) in - match root_name with - | Some root_name - when (* This comparison should be taken into account by the caller. *) - Entrypoint.(root_name = entrypoint) -> - return ((fun e -> e), Ex_ty full) - | _ -> ( - find_entrypoint full entrypoint >??$ function - | Ok result -> return result - | Error () -> - if Entrypoint.is_default entrypoint then - return ((fun e -> e), Ex_ty full) - else - of_result - @@ Error - (match error_details with - | Fast -> (Inconsistent_types_fast : error_trace) - | Informative -> - trace_of_error @@ No_such_entrypoint entrypoint)) + find_entrypoint full entrypoints entrypoint >??$ function + | Ok f_t -> return f_t + | Error () -> + if Entrypoint.is_default entrypoint then return ((fun e -> e), Ex_ty full) + else + of_result + @@ Error + (match error_details with + | Fast -> (Inconsistent_types_fast : error_trace) + | Informative -> trace_of_error @@ No_such_entrypoint entrypoint) let find_entrypoint_for_type (type full exp error_trace) ~legacy ~error_details - ~(full : full ty) ~(expected : exp ty) ~root_name entrypoint loc : + ~(full : full ty) ~(expected : exp ty) entrypoints entrypoint loc : (Entrypoint.t * exp ty, error_trace) Gas_monad.t = let open Gas_monad in - find_entrypoint ~error_details full ~root_name entrypoint >>$ function + find_entrypoint ~error_details full entrypoints entrypoint >>$ function | (_, Ex_ty ty) -> ( - match root_name with - | Some root_name - when Entrypoint.is_root root_name && Entrypoint.is_default entrypoint + match entrypoints.name with + | Some e when Entrypoint.is_root e && Entrypoint.is_default entrypoint -> ( merge_types ~legacy ~error_details:Fast loc ty expected >??$ function | Ok (Eq, ty) -> return (Entrypoint.default, (ty : exp ty)) @@ -1900,10 +1921,10 @@ let find_entrypoint_for_type (type full exp error_trace) ~legacy ~error_details merge_types ~legacy ~error_details loc ty expected >|$ fun (Eq, ty) -> (entrypoint, (ty : exp ty))) -let well_formed_entrypoints (type full) (full : full ty) ~root_name = - let merge path annot (type t) (ty : t ty) reachable +let well_formed_entrypoints (type full) (full : full ty) entrypoints = + let merge path (type t) (ty : t ty) (entrypoints : t entrypoints) reachable ((first_unreachable, all) as acc) = - match annot with + match entrypoints.name with | None -> ok ( (if reachable then acc @@ -1915,34 +1936,37 @@ let well_formed_entrypoints (type full) (full : full ty) ~root_name = | None -> (Some (List.rev path), all) | Some _ -> acc)), reachable ) - | Some (Field_annot name) -> - Entrypoint.of_annot_lax name >>? fun name -> + | Some name -> if Entrypoint.Set.mem name all then error (Duplicate_entrypoint name) else ok ((first_unreachable, Entrypoint.Set.add name all), true) in let rec check : type t. t ty -> + t entrypoints -> prim list -> bool -> prim list option * Entrypoint.Set.t -> (prim list option * Entrypoint.Set.t) tzresult = - fun t path reachable acc -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> - merge (D_Left :: path) al tl reachable acc >>? fun (acc, l_reachable) -> - merge (D_Right :: path) ar tr reachable acc + fun t entrypoints path reachable acc -> + match (t, entrypoints) with + | ( Union_t ((tl, _al), (tr, _ar), _), + {nested = Entrypoints_Union {left; right}; _} ) -> + merge (D_Left :: path) tl left reachable acc + >>? fun (acc, l_reachable) -> + merge (D_Right :: path) tr right reachable acc >>? fun (acc, r_reachable) -> - check tl (D_Left :: path) l_reachable acc >>? fun acc -> - check tr (D_Right :: path) r_reachable acc + check tl left (D_Left :: path) l_reachable acc >>? fun acc -> + check tr right (D_Right :: path) r_reachable acc | _ -> ok acc in let (init, reachable) = - match root_name with + match entrypoints.name with | None -> (Entrypoint.Set.empty, false) | Some name -> (Entrypoint.Set.singleton name, true) in - check full [] reachable (None, init) >>? fun (first_unreachable, all) -> + check full entrypoints [] reachable (None, init) + >>? fun (first_unreachable, all) -> if not (Entrypoint.Set.mem Entrypoint.default all) then Result.return_unit else match first_unreachable with @@ -1964,9 +1988,10 @@ let parse_parameter_ty_and_entrypoints : ~ret:Don't_parse_entrypoints node >>? fun (Ex_ty arg_type, ctxt) -> + parse_entrypoints_uncarbonated ~root_name node arg_type >>? fun entrypoints -> (if legacy then Result.return_unit - else well_formed_entrypoints ~root_name arg_type) - >|? fun () -> (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) + else well_formed_entrypoints arg_type entrypoints) + >|? fun () -> (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt) let parse_passable_ty = parse_passable_ty ~ret:Don't_parse_entrypoints @@ -4515,7 +4540,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~stack_depth:(stack_depth + 1) ~legacy arg_type) - >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt) + -> record_trace (Ill_formed_type (Some "storage", canonical_code, location storage_type)) (parse_storage_ty @@ -4529,7 +4555,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : trace (Ill_typed_contract (canonical_code, [])) (parse_returning - (Tc_context.toplevel ~storage_type ~param_type:arg_type root_name) + (Tc_context.toplevel ~storage_type ~param_type:arg_type ~entrypoints) ctxt ~legacy ?type_logger @@ -4554,7 +4580,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : apply = (fun kinfo k -> ICreate_contract - {kinfo; storage_type; arg_type; lambda; views; root_name; k}); + {kinfo; storage_type; arg_type; lambda; views; entrypoints; k}); } in let stack = Item_t (operation_t, Item_t (address_t, rest)) in @@ -4625,12 +4651,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | View -> error (Forbidden_instr_in_context (loc, Script_tc_errors.View, prim)) - | Toplevel {param_type; root_name; storage_type = _} -> + | Toplevel {param_type; entrypoints; storage_type = _} -> Gas_monad.run ctxt @@ find_entrypoint ~error_details:Informative param_type - ~root_name + entrypoints entrypoint >>? fun (r, ctxt) -> r >>? fun (_, Ex_ty param_type) -> @@ -5070,7 +5096,7 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_contra ~legacy:true arg_type >>? fun ( Ex_parameter_ty_and_entrypoints - {arg_type = targ; root_name}, + {arg_type = targ; entrypoints}, ctxt ) -> (* we don't check targ size here because it's a legacy contract code *) Gas_monad.run ctxt @@ -5079,7 +5105,7 @@ and[@coq_axiom_with_reason "complex mutually recursive definition"] parse_contra ~error_details:Informative ~full:targ ~expected:arg - ~root_name + entrypoints entrypoint loc >>? fun (entrypoint_arg, ctxt) -> @@ -5267,7 +5293,7 @@ let parse_contract_for_script : | Error _ -> error (Invalid_contract (loc, contract)) | Ok ( Ex_parameter_ty_and_entrypoints - {arg_type = targ; root_name}, + {arg_type = targ; entrypoints}, ctxt ) -> ( (* we don't check targ size here because it's a legacy contract code *) Gas_monad.run ctxt @@ -5276,7 +5302,7 @@ let parse_contract_for_script : ~error_details:Fast ~full:targ ~expected:arg - ~root_name + entrypoints entrypoint loc >|? fun (entrypoint_arg, ctxt) -> @@ -5308,7 +5334,7 @@ let parse_code : record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy arg_type) - >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt) -> let storage_type_loc = location storage_type in record_trace (Ill_formed_type (Some "storage", code, storage_type_loc)) @@ -5320,7 +5346,7 @@ let parse_code : trace (Ill_typed_contract (code, [])) (parse_returning - Tc_context.(toplevel ~storage_type ~param_type:arg_type root_name) + Tc_context.(toplevel ~storage_type ~param_type:arg_type ~entrypoints) ctxt ~legacy ~stack_depth:0 @@ -5347,7 +5373,8 @@ let parse_code : Gas.consume ctxt (Script_typed_ir_size_costs.nodes_cost ~nodes) >>? fun ctxt -> ok - (Ex_code {code; arg_type; storage_type; views; root_name; code_size}, ctxt)) + ( Ex_code {code; arg_type; storage_type; views; entrypoints; code_size}, + ctxt )) let parse_storage : ?type_logger:type_logger -> @@ -5385,7 +5412,8 @@ let[@coq_axiom_with_reason "gadt"] parse_script : (ex_script * context) tzresult Lwt.t = fun ?type_logger ctxt ~legacy ~allow_forged_in_storage {code; storage} -> parse_code ~legacy ctxt ?type_logger ~code - >>=? fun ( Ex_code {code; arg_type; storage_type; views; root_name; code_size}, + >>=? fun ( Ex_code + {code; arg_type; storage_type; views; entrypoints; code_size}, ctxt ) -> parse_storage ?type_logger @@ -5396,7 +5424,7 @@ let[@coq_axiom_with_reason "gadt"] parse_script : ~storage >|=? fun (storage, ctxt) -> ( Ex_script - {code_size; code; arg_type; storage; storage_type; views; root_name}, + {code_size; code; arg_type; storage; storage_type; views; entrypoints}, ctxt ) let typecheck_code : @@ -5415,7 +5443,7 @@ let typecheck_code : record_trace (Ill_formed_type (Some "parameter", code, arg_type_loc)) (parse_parameter_ty_and_entrypoints ctxt ~stack_depth:0 ~legacy arg_type) - >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; root_name}, ctxt) -> + >>?= fun (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt) -> let storage_type_loc = location storage_type in record_trace (Ill_formed_type (Some "storage", code, storage_type_loc)) @@ -5428,7 +5456,7 @@ let typecheck_code : let type_logger = if show_types then Some type_logger else None in let result = parse_returning - (Tc_context.toplevel ~storage_type ~param_type:arg_type root_name) + (Tc_context.toplevel ~storage_type ~param_type:arg_type ~entrypoints) ctxt ~legacy ~stack_depth:0 @@ -5450,10 +5478,11 @@ let typecheck_code : trace (Ill_typed_contract (code, !type_map)) views_result >|=? fun ctxt -> (!type_map, ctxt) -let list_entrypoints (type full) (full : full ty) ctxt ~root_name = - let merge path annot (type t) (ty : t ty) reachable +let list_entrypoints ctxt (type full) (full : full ty) + (entrypoints : full entrypoints) = + let merge path (type t) (ty : t ty) (entrypoints : t entrypoints) reachable ((unreachables, all) as acc) = - match annot with + match entrypoints.name with | None -> ok ( (if reachable then acc @@ -5462,21 +5491,19 @@ let list_entrypoints (type full) (full : full ty) ctxt ~root_name = | Union_t _ -> acc | _ -> (List.rev path :: unreachables, all)), reachable ) - | Some (Field_annot name) -> - (match Entrypoint.of_annot_lax_opt name with - | None -> ok (List.rev path :: unreachables, all) - | Some name -> - if Entrypoint.Map.mem name all then - ok (List.rev path :: unreachables, all) - else - unparse_ty ~loc:() ctxt ty >|? fun (unparsed_ty, _) -> - ( unreachables, - Entrypoint.Map.add name (List.rev path, unparsed_ty) all )) + | Some name -> + (if Entrypoint.Map.mem name all then + ok (List.rev path :: unreachables, all) + else + unparse_ty ~loc:() ctxt ty >|? fun (unparsed_ty, _) -> + ( unreachables, + Entrypoint.Map.add name (List.rev path, unparsed_ty) all )) >|? fun unreachable_all -> (unreachable_all, true) in let rec fold_tree : type t. t ty -> + t entrypoints -> prim list -> bool -> prim list list @@ -5484,23 +5511,25 @@ let list_entrypoints (type full) (full : full ty) ctxt ~root_name = (prim list list * (prim list * Script.unlocated_michelson_node) Entrypoint.Map.t) tzresult = - fun t path reachable acc -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> - merge (D_Left :: path) al tl reachable acc >>? fun (acc, l_reachable) -> - merge (D_Right :: path) ar tr reachable acc + fun t entrypoints path reachable acc -> + match (t, entrypoints) with + | ( Union_t ((tl, _al), (tr, _ar), _), + {nested = Entrypoints_Union {left; right}; _} ) -> + merge (D_Left :: path) tl left reachable acc + >>? fun (acc, l_reachable) -> + merge (D_Right :: path) tr right reachable acc >>? fun (acc, r_reachable) -> - fold_tree tl (D_Left :: path) l_reachable acc >>? fun acc -> - fold_tree tr (D_Right :: path) r_reachable acc + fold_tree tl left (D_Left :: path) l_reachable acc >>? fun acc -> + fold_tree tr right (D_Right :: path) r_reachable acc | _ -> ok acc in unparse_ty ~loc:() ctxt full >>? fun (unparsed_full, _) -> let (init, reachable) = - match root_name with + match entrypoints.name with | None -> (Entrypoint.Map.empty, false) | Some name -> (Entrypoint.Map.singleton name ([], unparsed_full), true) in - fold_tree full [] reachable ([], init) + fold_tree full entrypoints [] reachable ([], init) [@@coq_axiom_with_reason "unsupported syntax"] (* ---- Unparsing (Typed IR -> Untyped expressions) --------------------------*) @@ -5761,14 +5790,14 @@ and[@coq_axiom_with_reason "gadt"] unparse_code ctxt ~stack_depth mode code = (* TODO: https://gitlab.com/tezos/tezos/-/issues/1688 Refactor the sharing part of unparse_script and create_contract *) let unparse_script ctxt mode - {code; arg_type; storage; storage_type; root_name; views; _} = + {code; arg_type; storage; storage_type; entrypoints; views; _} = let (Lam (_, original_code)) = code in unparse_code ctxt ~stack_depth:0 mode original_code >>=? fun (code, ctxt) -> unparse_data ctxt ~stack_depth:0 mode storage_type storage >>=? fun (storage, ctxt) -> Lwt.return (let loc = Micheline.dummy_location in - unparse_parameter_ty ~loc ctxt arg_type ~root_name + unparse_parameter_ty ~loc ctxt arg_type ~entrypoints >>? fun (arg_type, ctxt) -> unparse_ty ~loc ctxt storage_type >>? fun (storage_type, ctxt) -> let open Micheline in @@ -6360,7 +6389,7 @@ let script_size arg_type = _; storage; storage_type; - root_name = _; + entrypoints = _; views = _; }) = let (nodes, storage_size) = diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 9f6def7a3634..9d7c6792a719 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -74,7 +74,7 @@ type ex_ty = Ex_ty : 'a Script_typed_ir.ty -> ex_ty type ex_parameter_ty_and_entrypoints = | Ex_parameter_ty_and_entrypoints : { arg_type : 'a Script_typed_ir.ty; - root_name : Entrypoint.t option; + entrypoints : 'a Script_typed_ir.entrypoints; } -> ex_parameter_ty_and_entrypoints @@ -100,7 +100,7 @@ type ('arg, 'storage) code = { arg_type : 'arg Script_typed_ir.ty; storage_type : 'storage Script_typed_ir.ty; views : Script_typed_ir.view Script_typed_ir.SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'arg Script_typed_ir.entrypoints; code_size : Cache_memory_helpers.sint; (** This is an over-approximation of the value size in memory, in bytes, of the contract's static part, that is its source @@ -348,16 +348,11 @@ val ty_of_comparable_ty : val parse_toplevel : context -> legacy:bool -> Script.expr -> (toplevel * context) tzresult Lwt.t -val add_field_annot : - Script_ir_annot.field_annot option -> - ('loc, 'prim) Micheline.node -> - ('loc, 'prim) Micheline.node - val unparse_parameter_ty : loc:'loc -> context -> - root_name:Entrypoint.t option -> 'a Script_typed_ir.ty -> + entrypoints:'a Script_typed_ir.entrypoints -> ('loc Script.michelson_node * context) tzresult (** High-level function to typecheck a Michelson script. This function is not @@ -426,14 +421,14 @@ val parse_contract_for_script : val find_entrypoint : error_details:'error_trace error_details -> 't Script_typed_ir.ty -> - root_name:Entrypoint.t option -> + 't Script_typed_ir.entrypoints -> Entrypoint.t -> ((Script.node -> Script.node) * ex_ty, 'error_trace) Gas_monad.t val list_entrypoints : - 't Script_typed_ir.ty -> context -> - root_name:Entrypoint.t option -> + 't Script_typed_ir.ty -> + 't Script_typed_ir.entrypoints -> (Michelson_v1_primitives.prim list list * (Michelson_v1_primitives.prim list * Script.unlocated_michelson_node) Entrypoint.Map.t) diff --git a/src/proto_alpha/lib_protocol/script_tc_context.ml b/src/proto_alpha/lib_protocol/script_tc_context.ml index 8103f4e3ac86..2aab85e620b9 100644 --- a/src/proto_alpha/lib_protocol/script_tc_context.ml +++ b/src/proto_alpha/lib_protocol/script_tc_context.ml @@ -31,7 +31,7 @@ type callsite = | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; - root_name : Alpha_context.Entrypoint.t option; + entrypoints : 'param Script_typed_ir.entrypoints; } -> callsite | View : callsite @@ -41,8 +41,8 @@ type t = {callsite : callsite; in_lambda : in_lambda} let init callsite = {callsite; in_lambda = false} -let toplevel ~storage_type ~param_type root_name = - init (Toplevel {storage_type; param_type; root_name}) +let toplevel ~storage_type ~param_type ~entrypoints = + init (Toplevel {storage_type; param_type; entrypoints}) let view = init View diff --git a/src/proto_alpha/lib_protocol/script_tc_context.mli b/src/proto_alpha/lib_protocol/script_tc_context.mli index 482dab7e18e2..4f4255a17176 100644 --- a/src/proto_alpha/lib_protocol/script_tc_context.mli +++ b/src/proto_alpha/lib_protocol/script_tc_context.mli @@ -50,7 +50,7 @@ type callsite = | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; - root_name : Entrypoint.t option; + entrypoints : 'param Script_typed_ir.entrypoints; } -> callsite | View : callsite @@ -61,7 +61,10 @@ type t = {callsite : callsite; in_lambda : in_lambda} val init : callsite -> t val toplevel : - storage_type:'sto ty -> param_type:'param ty -> Entrypoint.t option -> t + storage_type:'sto ty -> + param_type:'param ty -> + entrypoints:'param Script_typed_ir.entrypoints -> + t val view : t diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index b3dec886e624..9ba4d5199aa1 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -509,13 +509,28 @@ type view = { view_code : Script.node; } +type 'arg entrypoints = { + name : Entrypoint.t option; + nested : 'arg nested_entrypoints; +} + +and 'arg nested_entrypoints = + | Entrypoints_Union : { + left : 'l entrypoints; + right : 'r entrypoints; + } + -> ('l, 'r) union nested_entrypoints + | Entrypoints_None : _ nested_entrypoints + +let no_entrypoints = {name = None; nested = Entrypoints_None} + type ('arg, 'storage) script = { code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; arg_type : 'arg ty; storage : 'storage; storage_type : 'storage ty; views : view SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'arg entrypoints; code_size : Cache_memory_helpers.sint; (* This is an over-approximation of the value size in memory, in bytes, of the contract's static part, that is its source @@ -971,7 +986,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = arg_type : 'b ty; lambda : ('b * 'a, operation boxed_list * 'a) lambda; views : view SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'b entrypoints; k : (operation, address * 's, 'r, 'f) kinstr; } -> (public_key_hash option, Tez.t * ('a * 's), 'r, 'f) kinstr @@ -1706,10 +1721,10 @@ let kinstr_rewritek : | IView (kinfo, view_signature, k) -> IView (kinfo, view_signature, f.apply k) | IImplicit_account (kinfo, k) -> IImplicit_account (kinfo, f.apply k) | ICreate_contract - {kinfo; storage_type; arg_type; lambda; views; root_name; k} -> + {kinfo; storage_type; arg_type; lambda; views; entrypoints; k} -> let k = f.apply k in ICreate_contract - {kinfo; storage_type; arg_type; lambda; views; root_name; k} + {kinfo; storage_type; arg_type; lambda; views; entrypoints; k} | ISet_delegate (kinfo, k) -> ISet_delegate (kinfo, f.apply k) | INow (kinfo, k) -> INow (kinfo, f.apply k) | IBalance (kinfo, k) -> IBalance (kinfo, f.apply k) diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index 8b1ef28e6da6..60f5fc11df21 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -357,13 +357,37 @@ type view = { view_code : Script.node; } +(** ['arg entrypoints] represents the tree of entrypoints of a parameter type + ['arg]. + [name] is the name of the entrypoint at that node if it is not [None]. + [nested] are the entrypoints below the node in the tree. + It is always [Entrypoints_None] for non-union nodes. + But it is also ok to have [Entrypoints_None] for a union node, it just + means that there are no entrypoints below that node in the tree. +*) +type 'arg entrypoints = { + name : Entrypoint.t option; + nested : 'arg nested_entrypoints; +} + +and 'arg nested_entrypoints = + | Entrypoints_Union : { + left : 'l entrypoints; + right : 'r entrypoints; + } + -> ('l, 'r) union nested_entrypoints + | Entrypoints_None : _ nested_entrypoints + +(** [no_entrypoints] is [{name = None; nested = Entrypoints_None}] *) +val no_entrypoints : _ entrypoints + type ('arg, 'storage) script = { code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; arg_type : 'arg ty; storage : 'storage; storage_type : 'storage ty; views : view SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'arg entrypoints; code_size : Cache_memory_helpers.sint; } @@ -910,7 +934,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = arg_type : 'b ty; lambda : ('b * 'a, operation boxed_list * 'a) lambda; views : view SMap.t; - root_name : Entrypoint.t option; + entrypoints : 'b entrypoints; k : (operation, address * 's, 'r, 'f) kinstr; } -> (public_key_hash option, Tez.t * ('a * 's), 'r, 'f) kinstr diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml index b856ec4ce291..8934531fc65b 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -538,7 +538,15 @@ and kinstr_size : | ITransfer_tokens (kinfo, _) -> ret_succ_adding accu (base kinfo) | IImplicit_account (kinfo, _) -> ret_succ_adding accu (base kinfo) | ICreate_contract - {kinfo; storage_type; arg_type; lambda; root_name = _; views; k = _} -> + { + kinfo; + storage_type; + arg_type; + lambda; + entrypoints (* TODO? *) = _; + views; + k = _; + } -> let accu = ret_succ_adding (accu ++ ty_size storage_type ++ ty_size arg_type diff --git a/src/proto_alpha/lib_protocol/ticket_operations_diff.ml b/src/proto_alpha/lib_protocol/ticket_operations_diff.ml index 3bfe258068a9..dffafb095a9c 100644 --- a/src/proto_alpha/lib_protocol/ticket_operations_diff.ml +++ b/src/proto_alpha/lib_protocol/ticket_operations_diff.ml @@ -209,7 +209,7 @@ let tickets_of_origination ctxt ~preorigination script = code = _; arg_type = _; views = _; - root_name = _; + entrypoints = _; code_size = _; }, ctxt ) -> -- GitLab From 83f7043d8d03859f61c0323027f1a0861414dec0 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 26 Jan 2022 15:55:18 +0100 Subject: [PATCH 20/30] Proto/Michelson: remove assert false for unparse_parameter_ty --- .../lib_protocol/script_ir_translator.ml | 69 ++++++++----------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 2d53cd895c25..de7edefcb090 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -179,12 +179,6 @@ let rec ty_of_comparable_ty : type a. a comparable_ty -> a ty = function ((ty_of_comparable_ty l, None), (ty_of_comparable_ty r, None), tname) | Option_key (t, tname) -> Option_t (ty_of_comparable_ty t, tname) -let add_entrypoint_annot entrypoint expr = - match (entrypoint, expr) with - | (Some name, Prim (loc, prim, args, annots)) -> - Prim (loc, prim, args, annots @ [Entrypoint.unparse_as_field_annot name]) - | (_, expr) -> expr - let rec unparse_comparable_ty_uncarbonated : type a loc. loc:loc -> a comparable_ty -> loc Script.michelson_node = fun ~loc -> function @@ -222,9 +216,9 @@ let unparse_memo_size ~loc memo_size = let z = Sapling.Memo_size.unparse_to_z memo_size in Int (loc, z) -let rec unparse_ty_uncarbonated : - type a loc. loc:loc -> a ty -> loc Script.michelson_node = - fun ~loc ty -> +let rec unparse_ty_entrypoints_uncarbonated : + type a loc. loc:loc -> a ty -> a entrypoints -> loc Script.michelson_node = + fun ~loc ty {nested = nested_entrypoints; name = entrypoint_name} -> let (name, args) = match ty with | Unit_t _meta -> (T_unit, []) @@ -246,11 +240,11 @@ let rec unparse_ty_uncarbonated : | Bls12_381_g2_t _meta -> (T_bls12_381_g2, []) | Bls12_381_fr_t _meta -> (T_bls12_381_fr, []) | Contract_t (ut, _meta) -> - let t = unparse_ty_uncarbonated ~loc ut in + let t = unparse_ty_entrypoints_uncarbonated ~loc ut no_entrypoints in (T_contract, [t]) | Pair_t (utl, utr, _meta) -> ( - let tl = unparse_ty_uncarbonated ~loc utl in - let tr = unparse_ty_uncarbonated ~loc utr in + let tl = unparse_ty_entrypoints_uncarbonated ~loc utl no_entrypoints in + let tr = unparse_ty_entrypoints_uncarbonated ~loc utr no_entrypoints in (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) (* Note that the folding does not happen if the pair on the right has an annotation because this annotation would be lost *) @@ -258,18 +252,23 @@ let rec unparse_ty_uncarbonated : | Prim (_, T_pair, ts, []) -> (T_pair, tl :: ts) | _ -> (T_pair, [tl; tr])) | Union_t ((utl, _l_field), (utr, _r_field), _meta) -> - let tl = unparse_ty_uncarbonated ~loc utl in - let tr = unparse_ty_uncarbonated ~loc utr in + let (entrypoints_l, entrypoints_r) = + match nested_entrypoints with + | Entrypoints_None -> (no_entrypoints, no_entrypoints) + | Entrypoints_Union {left; right} -> (left, right) + in + let tl = unparse_ty_entrypoints_uncarbonated ~loc utl entrypoints_l in + let tr = unparse_ty_entrypoints_uncarbonated ~loc utr entrypoints_r in (T_or, [tl; tr]) | Lambda_t (uta, utr, _meta) -> - let ta = unparse_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in + let ta = unparse_ty_entrypoints_uncarbonated ~loc uta no_entrypoints in + let tr = unparse_ty_entrypoints_uncarbonated ~loc utr no_entrypoints in (T_lambda, [ta; tr]) | Option_t (ut, _meta) -> - let ut = unparse_ty_uncarbonated ~loc ut in + let ut = unparse_ty_entrypoints_uncarbonated ~loc ut no_entrypoints in (T_option, [ut]) | List_t (ut, _meta) -> - let t = unparse_ty_uncarbonated ~loc ut in + let t = unparse_ty_entrypoints_uncarbonated ~loc ut no_entrypoints in (T_list, [t]) | Ticket_t (ut, _meta) -> let t = unparse_comparable_ty_uncarbonated ~loc ut in @@ -279,11 +278,11 @@ let rec unparse_ty_uncarbonated : (T_set, [t]) | Map_t (uta, utr, _meta) -> let ta = unparse_comparable_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in + let tr = unparse_ty_entrypoints_uncarbonated ~loc utr no_entrypoints in (T_map, [ta; tr]) | Big_map_t (uta, utr, _meta) -> let ta = unparse_comparable_ty_uncarbonated ~loc uta in - let tr = unparse_ty_uncarbonated ~loc utr in + let tr = unparse_ty_entrypoints_uncarbonated ~loc utr no_entrypoints in (T_big_map, [ta; tr]) | Sapling_transaction_t (memo_size, _meta) -> (T_sapling_transaction, [unparse_memo_size ~loc memo_size]) @@ -292,7 +291,15 @@ let rec unparse_ty_uncarbonated : | Chest_key_t _meta -> (T_chest_key, []) | Chest_t _meta -> (T_chest, []) in - Prim (loc, name, args, []) + let annot = + match entrypoint_name with + | None -> [] + | Some name -> [Entrypoint.unparse_as_field_annot name] + in + Prim (loc, name, args, annot) + +let unparse_ty_uncarbonated ~loc ty = + unparse_ty_entrypoints_uncarbonated ~loc ty no_entrypoints let unparse_ty ~loc ctxt ty = Gas.consume ctxt (Unparse_costs.unparse_type ty) >|? fun ctxt -> @@ -302,25 +309,9 @@ let unparse_comparable_ty ~loc ctxt comp_ty = Gas.consume ctxt (Unparse_costs.unparse_comparable_type comp_ty) >|? fun ctxt -> (unparse_comparable_ty_uncarbonated ~loc comp_ty, ctxt) -let rec add_entrypoints_uncarbonated : - type ty. - ty entrypoints -> 'loc Script.michelson_node -> 'loc Script.michelson_node = - fun entrypoints node -> - match (entrypoints, node) with - | ({nested = Entrypoints_None; name}, node) -> add_entrypoint_annot name node - | ( {nested = Entrypoints_Union {left; right}; name}, - Prim (loc, T_or, [utl; utr], annots) ) -> - let utl = add_entrypoints_uncarbonated left utl in - let utr = add_entrypoints_uncarbonated right utr in - add_entrypoint_annot name @@ Prim (loc, T_or, [utl; utr], annots) - | ({nested = Entrypoints_Union _; _}, _) -> - (* this can only happen if [add_entrypoints_uncarbonated] is not in - sync with [unparse_ty_uncarbonated] *) - assert false - let unparse_parameter_ty ~loc ctxt ty ~entrypoints = - unparse_ty ~loc ctxt ty >|? fun (unparsed, ctxt) -> - (add_entrypoints_uncarbonated entrypoints unparsed, ctxt) + Gas.consume ctxt (Unparse_costs.unparse_type ty) >|? fun ctxt -> + (unparse_ty_entrypoints_uncarbonated ~loc ty entrypoints, ctxt) let[@coq_struct "function_parameter"] rec strip_var_annots = function | (Int _ | String _ | Bytes _) as atom -> atom -- GitLab From 9fda0b801bacfce1447660c4536b7e08fc053075 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 27 Jan 2022 13:15:57 +0100 Subject: [PATCH 21/30] Proto/Michelson: integrate parsing of entrypoints into parse_ty --- .../lib_protocol/script_ir_translator.ml | 76 +++++++++++-------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index de7edefcb090..1a5438b1631a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1259,8 +1259,19 @@ type ex_parameter_ty_and_entrypoints = } -> ex_parameter_ty_and_entrypoints +(** [parse_ty] can be used to parse regular types as well as parameter types + together with their entrypoints. + + In the first case, use [~ret:Don't_parse_entrypoints], [parse_ty] will + return an [ex_ty]. + + In the second case, use [~ret:Parse_entrypoints], [parse_ty] will return + an [ex_parameter_ty_and_entrypoints]. +*) type ('ret, 'name) parse_ty_ret = | Don't_parse_entrypoints : (ex_ty, unit) parse_ty_ret + | Parse_entrypoints + : (ex_parameter_ty_and_entrypoints, Entrypoint.t option) parse_ty_ret let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty : type ret name. @@ -1287,8 +1298,17 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty if Compare.Int.(stack_depth > 10000) then error Typechecking_too_many_recursive_calls else + (match ret with + | Don't_parse_entrypoints -> ok (node, (() : name)) + | Parse_entrypoints -> extract_entrypoint_annot node) + >>? fun (node, name) -> let return ctxt ty : ret * context = - match ret with Don't_parse_entrypoints -> (Ex_ty ty, ctxt) + match ret with + | Don't_parse_entrypoints -> (Ex_ty ty, ctxt) + | Parse_entrypoints -> + ( Ex_parameter_ty_and_entrypoints + {arg_type = ty; entrypoints = {name; nested = Entrypoints_None}}, + ctxt ) in match node with | Prim (loc, T_unit, [], annot) -> @@ -1381,7 +1401,8 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty (match ret with | Don't_parse_entrypoints -> extract_field_annot utl >>? fun (utl, _left_constr) -> - extract_field_annot utr >|? fun (utr, _right_constr) -> (utl, utr)) + extract_field_annot utr >|? fun (utr, _right_constr) -> (utl, utr) + | Parse_entrypoints -> ok (utl, utr)) >>? fun (utl, utr) -> parse_ty ctxt @@ -1411,7 +1432,21 @@ let[@coq_axiom_with_reason "complex mutually recursive definition"] rec parse_ty let (Ex_ty tl) = parsed_l in let (Ex_ty tr) = parsed_r in union_t loc (tl, None) (tr, None) >|? fun ty -> - ((Ex_ty ty : ret), ctxt)) + ((Ex_ty ty : ret), ctxt) + | Parse_entrypoints -> + let (Ex_parameter_ty_and_entrypoints + {arg_type = tl; entrypoints = left}) = + parsed_l + in + let (Ex_parameter_ty_and_entrypoints + {arg_type = tr; entrypoints = right}) = + parsed_r + in + union_t loc (tl, None) (tr, None) >|? fun arg_type -> + let entrypoints = + {name; nested = Entrypoints_Union {left; right}} + in + (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt)) | Prim (loc, T_lambda, [uta; utr], annot) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy uta >>? fun (Ex_ty ta, ctxt) -> @@ -1717,29 +1752,6 @@ let parse_storage_ty : ) | _ -> (parse_normal_storage_ty [@tailcall]) ctxt ~stack_depth ~legacy node -let rec parse_entrypoints_uncarbonated : - type t. - root_name:Entrypoint.t option -> - Script.node -> - t ty -> - t entrypoints tzresult = - fun ~root_name node arg_ty -> - (match root_name with - | Some _ -> ok (node, root_name) - | None -> extract_entrypoint_annot node) - >>? fun (node, name) -> - (match (arg_ty, node) with - | (Union_t ((tl, _al), (tr, _ar), _), Prim (_loc, T_or, [utl; utr], _annot)) - -> - parse_entrypoints_uncarbonated ~root_name:None utl tl >>? fun left -> - parse_entrypoints_uncarbonated ~root_name:None utr tr - >|? fun right : t nested_entrypoints -> Entrypoints_Union {left; right} - | (Union_t _, _) -> - (* this can only happen if [parse_entrypoints_uncarbonated] is not in sync with [parse_ty] *) - assert false - | (_, _) -> ok Entrypoints_None) - >|? fun nested -> {name; nested} - let check_packable ~legacy loc root = let rec check : type t. t ty -> unit tzresult = function (* /!\ When adding new lazy storage kinds, be sure to return an error. /!\ @@ -1971,18 +1983,18 @@ let parse_parameter_ty_and_entrypoints : Script.node -> (ex_parameter_ty_and_entrypoints * context) tzresult = fun ctxt ~stack_depth ~legacy node -> - extract_entrypoint_annot node >>? fun (node, root_name) -> parse_passable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy - ~ret:Don't_parse_entrypoints node - >>? fun (Ex_ty arg_type, ctxt) -> - parse_entrypoints_uncarbonated ~root_name node arg_type >>? fun entrypoints -> + ~ret:Parse_entrypoints + >>? fun (res, ctxt) -> (if legacy then Result.return_unit - else well_formed_entrypoints arg_type entrypoints) - >|? fun () -> (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}, ctxt) + else + let (Ex_parameter_ty_and_entrypoints {arg_type; entrypoints}) = res in + well_formed_entrypoints arg_type entrypoints) + >|? fun () -> (res, ctxt) let parse_passable_ty = parse_passable_ty ~ret:Don't_parse_entrypoints -- GitLab From 48d569b82c4d9f39bb9de344abfd39b53eecfad5 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 28 Jan 2022 18:06:40 +0100 Subject: [PATCH 22/30] Tezt: update regression tests outputs --- tezt/_regressions/rpc/alpha.client.contracts.out | 14 ++++---------- tezt/_regressions/rpc/alpha.light.contracts.out | 14 ++++---------- tezt/_regressions/rpc/alpha.proxy.contracts.out | 14 ++++---------- .../rpc/alpha.proxy_server.contracts.out | 14 ++++---------- 4 files changed, 16 insertions(+), 40 deletions(-) diff --git a/tezt/_regressions/rpc/alpha.client.contracts.out b/tezt/_regressions/rpc/alpha.client.contracts.out index 76bb40d80fc3..e4d6c8e4776e 100644 --- a/tezt/_regressions/rpc/alpha.client.contracts.out +++ b/tezt/_regressions/rpc/alpha.client.contracts.out @@ -350,15 +350,11 @@ null { "rem_right": { "prim": "string" }, "rem_left": { "prim": "string" }, "rem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%rem_left" ] }, - { "prim": "string", "annots": [ "%rem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "mem_right": { "prim": "string" }, "mem_left": { "prim": "string" }, "mem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%mem_left" ] }, - { "prim": "string", "annots": [ "%mem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "default": { "prim": "unit" }, "add_right": { "prim": "pair", @@ -370,11 +366,9 @@ null { "prim": "or", "args": [ { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_left" ] }, + "args": [ { "prim": "string" }, { "prim": "nat" } ] }, { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_right" ] } ] } } } + "args": [ { "prim": "string" }, { "prim": "nat" } ] } ] } } } ./tezos-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/script' { "code": diff --git a/tezt/_regressions/rpc/alpha.light.contracts.out b/tezt/_regressions/rpc/alpha.light.contracts.out index 7fe4e8e029d4..a153e10bc955 100644 --- a/tezt/_regressions/rpc/alpha.light.contracts.out +++ b/tezt/_regressions/rpc/alpha.light.contracts.out @@ -388,15 +388,11 @@ protocol of light mode unspecified, using the node's protocol: ProtoALphaALphaAL { "rem_right": { "prim": "string" }, "rem_left": { "prim": "string" }, "rem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%rem_left" ] }, - { "prim": "string", "annots": [ "%rem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "mem_right": { "prim": "string" }, "mem_left": { "prim": "string" }, "mem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%mem_left" ] }, - { "prim": "string", "annots": [ "%mem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "default": { "prim": "unit" }, "add_right": { "prim": "pair", @@ -408,11 +404,9 @@ protocol of light mode unspecified, using the node's protocol: ProtoALphaALphaAL { "prim": "or", "args": [ { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_left" ] }, + "args": [ { "prim": "string" }, { "prim": "nat" } ] }, { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_right" ] } ] } } } + "args": [ { "prim": "string" }, { "prim": "nat" } ] } ] } } } ./tezos-client --mode light rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/script' protocol of light mode unspecified, using the node's protocol: ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK diff --git a/tezt/_regressions/rpc/alpha.proxy.contracts.out b/tezt/_regressions/rpc/alpha.proxy.contracts.out index 314af750e50f..00d077c02a27 100644 --- a/tezt/_regressions/rpc/alpha.proxy.contracts.out +++ b/tezt/_regressions/rpc/alpha.proxy.contracts.out @@ -388,15 +388,11 @@ protocol of proxy unspecified, using the node's protocol: ProtoALphaALphaALphaAL { "rem_right": { "prim": "string" }, "rem_left": { "prim": "string" }, "rem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%rem_left" ] }, - { "prim": "string", "annots": [ "%rem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "mem_right": { "prim": "string" }, "mem_left": { "prim": "string" }, "mem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%mem_left" ] }, - { "prim": "string", "annots": [ "%mem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "default": { "prim": "unit" }, "add_right": { "prim": "pair", @@ -408,11 +404,9 @@ protocol of proxy unspecified, using the node's protocol: ProtoALphaALphaALphaAL { "prim": "or", "args": [ { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_left" ] }, + "args": [ { "prim": "string" }, { "prim": "nat" } ] }, { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_right" ] } ] } } } + "args": [ { "prim": "string" }, { "prim": "nat" } ] } ] } } } ./tezos-client --mode proxy rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/script' protocol of proxy unspecified, using the node's protocol: ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK diff --git a/tezt/_regressions/rpc/alpha.proxy_server.contracts.out b/tezt/_regressions/rpc/alpha.proxy_server.contracts.out index bec70fdc1caa..4a234deb458a 100644 --- a/tezt/_regressions/rpc/alpha.proxy_server.contracts.out +++ b/tezt/_regressions/rpc/alpha.proxy_server.contracts.out @@ -350,15 +350,11 @@ null { "rem_right": { "prim": "string" }, "rem_left": { "prim": "string" }, "rem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%rem_left" ] }, - { "prim": "string", "annots": [ "%rem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "mem_right": { "prim": "string" }, "mem_left": { "prim": "string" }, "mem": { "prim": "or", - "args": - [ { "prim": "string", "annots": [ "%mem_left" ] }, - { "prim": "string", "annots": [ "%mem_right" ] } ] }, + "args": [ { "prim": "string" }, { "prim": "string" } ] }, "default": { "prim": "unit" }, "add_right": { "prim": "pair", @@ -370,11 +366,9 @@ null { "prim": "or", "args": [ { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_left" ] }, + "args": [ { "prim": "string" }, { "prim": "nat" } ] }, { "prim": "pair", - "args": [ { "prim": "string" }, { "prim": "nat" } ], - "annots": [ "%add_right" ] } ] } } } + "args": [ { "prim": "string" }, { "prim": "nat" } ] } ] } } } ./tezos-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/script' { "code": -- GitLab From d0c952c86fb9eb7d7ce9e8b20506723f9fc183fc Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 28 Jan 2022 18:22:36 +0100 Subject: [PATCH 23/30] Tests/Python: update typechecking traces --- ...ck::test_typecheck[attic--accounts.tz].out | 50 ++--- ...ini_scenarios--big_map_entrypoints.tz].out | 6 +- ...heck[mini_scenarios--big_map_magic.tz].out | 8 +- ...k[mini_scenarios--generic_multisig.tz].out | 149 ++++++------- ...ck[mini_scenarios--legacy_multisig.tz].out | 196 ++++++------------ ...eck[mini_scenarios--lqt_fa12.mligo.tz].out | 88 +++----- ...check[mini_scenarios--multiple_en2.tz].out | 26 +-- ...rios--multiple_entrypoints_counter.tz].out | 8 +- ...scenarios--ticket_builder_fungible.tz].out | 7 +- ...arios--ticket_builder_non_fungible.tz].out | 11 +- ..._scenarios--ticket_wallet_fungible.tz].out | 8 +- ...narios--ticket_wallet_non_fungible.tz].out | 8 +- ...pecheck[mini_scenarios--tzip4_view.tz].out | 3 +- ...ypecheck[mini_scenarios--xcat_dapp.tz].out | 9 +- ...typecheck[opcodes--big_map_to_self.tz].out | 7 +- ...heck[opcodes--self_with_entrypoint.tz].out | 16 +- 16 files changed, 217 insertions(+), 383 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out index 27aae3f11dca..78d3fffbf7be 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out @@ -7,19 +7,15 @@ Gas remaining: 1039925.145 units remaining (pair %Withdraw (key %from) (pair (mutez %withdraw_amount) (signature %sig)))) ; storage (map :stored_balance key_hash mutez) ; code { DUP - /* [ pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + /* [ pair (or key_hash (pair key mutez signature)) (map key_hash mutez) + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; CAR - /* [ or (key_hash %Initialize) (pair %Withdraw key mutez signature) - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + /* [ or key_hash (pair key mutez signature) + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; IF_LEFT { DUP /* [ key_hash : key_hash - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DIIP { CDR %stored_balance /* [ map key_hash mutez ] */ ; DUP @@ -59,59 +55,47 @@ Gas remaining: 1039925.145 units remaining /* [ pair (list operation) (map key_hash mutez) ] */ } } { DUP /* [ pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DUP /* [ pair key mutez signature : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DUP /* [ pair key mutez signature : pair key mutez signature : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DUP /* [ pair key mutez signature : pair key mutez signature : pair key mutez signature : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; CAR %from /* [ key : pair key mutez signature : pair key mutez signature : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DIIP { CDAR %withdraw_amount ; PACK /* [ bytes : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; BLAKE2B @signed_amount /* [ bytes : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ } + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ } /* [ key : pair key mutez signature : bytes : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; DIP { CDDR %sig } /* [ key : signature : bytes : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; CHECK_SIGNATURE /* [ bool : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; IF { /* [ pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ } + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ } { PUSH string "Bad signature" /* [ string : pair key mutez signature : pair key mutez signature - : pair (or (key_hash %Initialize) (pair %Withdraw key mutez signature)) - (map key_hash mutez) ] */ ; + : pair (or key_hash (pair key mutez signature)) (map key_hash mutez) ] */ ; FAILWITH /* [] */ } ; DIIP { CDR %stored_balance diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out index ea6e9342f601..249a76bdf260 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out @@ -15,10 +15,8 @@ Gas remaining: 1039940.196 units remaining /* [ big_map string nat ] */) /* [ string : big_map string nat ] */ ; code { UNPAIR - /* [ or (unit %default) - (or (or %mem (string %mem_left) (string %mem_right)) - (or (or %add (pair %add_left string nat) (pair %add_right string nat)) - (or %rem (string %rem_left) (string %rem_right)))) + /* [ or unit + (or (or string string) (or (or (pair string nat) (pair string nat)) (or string string))) : pair (big_map string nat) (big_map string nat) ] */ ; IF_LEFT { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out index dfa1a5e5e416..0e204390f218 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out @@ -9,10 +9,10 @@ Gas remaining: 1039941.750 units remaining (or (pair %import (list (pair string string)) (list (pair string string))) (or (list %add (pair string string)) (list %rem string))))) ; code { UNPAIR - /* [ or (unit %swap) - (or (or %reset (pair (big_map string string) (big_map string string)) unit) - (or (pair %import (list (pair string string)) (list (pair string string))) - (or (list %add (pair string string)) (list %rem string)))) + /* [ or unit + (or (or (pair (big_map string string) (big_map string string)) unit) + (or (pair (list (pair string string)) (list (pair string string))) + (or (list (pair string string)) (list string)))) : or (pair (big_map string string) (big_map string string)) unit ] */ ; IF_LEFT { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out index 51cfc2b46183..fb816429240a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out @@ -13,11 +13,9 @@ Gas remaining: 1039928.351 units remaining (list %sigs (option signature)))) ; storage (pair (nat %stored_counter) (pair (nat %threshold) (list %keys key))) ; code { UNPAIR - /* [ or (unit %default) - (pair %main - (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) - (list (option signature))) : pair nat nat (list key) ] */ ; + /* [ or unit + (pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) + (list (option signature))) : pair nat nat (list key) ] */ ; IF_LEFT { DROP /* [ pair nat nat (list key) ] */ ; @@ -28,224 +26,197 @@ Gas remaining: 1039928.351 units remaining { PUSH mutez 0 /* [ mutez - : pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + : pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) : pair nat nat (list key) ] */ ; AMOUNT /* [ mutez : mutez - : pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + : pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) : pair nat nat (list key) ] */ ; ASSERT_CMPEQ ; SWAP /* [ pair nat nat (list key) - : pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + : pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) ] */ ; DUP /* [ pair nat nat (list key) : pair nat nat (list key) - : pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + : pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) ] */ ; DIP { SWAP - /* [ pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + /* [ pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) : pair nat nat (list key) ] */ } /* [ pair nat nat (list key) - : pair (pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)))) + : pair (pair nat (or (lambda unit (list operation)) (pair nat (list key)))) (list (option signature)) : pair nat nat (list key) ] */ ; DIP { UNPAIR - /* [ pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + /* [ pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; DUP - /* [ pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + /* [ pair nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; SELF /* [ contract unit - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; ADDRESS /* [ address - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; CHAIN_ID /* [ chain_id : address - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; PAIR /* [ pair chain_id address - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; PAIR - /* [ pair (pair chain_id address) - nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + /* [ pair (pair chain_id address) nat (or (lambda unit (list operation)) (pair nat (list key))) + : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; PACK - /* [ bytes - : pair nat - (or (lambda %operation unit (list operation)) (pair %change_keys nat (list key))) + /* [ bytes : pair nat (or (lambda unit (list operation)) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; DIP { UNPAIR @counter - /* [ nat - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ nat : or (lambda unit (list operation)) (pair nat (list key)) : list (option signature) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ nat : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ bytes : nat : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; SWAP /* [ nat : bytes : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ pair nat nat (list key) : nat : bytes : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; UNPAIR @stored_counter /* [ nat : pair nat (list key) : nat : bytes : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ nat : pair nat (list key) : bytes : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ nat : nat : pair nat (list key) : bytes : list (option signature) - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; ASSERT_CMPEQ ; DIP { SWAP /* [ list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ pair nat (list key) : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; UNPAIR @threshold @keys /* [ nat : list key : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIP { PUSH @valid nat 0 /* [ nat : list key : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; SWAP /* [ list key : nat : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; ITER { DIP { SWAP /* [ list (option signature) : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ key : list (option signature) : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; SWAP /* [ list (option signature) : key : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; IF_CONS { IF_SOME { SWAP /* [ list (option signature) : signature : key : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ key : signature : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIIP { DUUP /* [ bytes : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ key : signature : bytes : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; { DUUUP /* [ bytes : key : signature : bytes : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIP { CHECK_SIGNATURE /* [ bool : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ bytes : bool : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; SWAP /* [ bool : bytes : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; IF { DROP - /* [ nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ nat : bytes : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } { FAILWITH /* [] */ } } ; PUSH nat 1 - /* [ nat : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ nat : nat : bytes : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; ADD @valid - /* [ nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ nat : bytes : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ list (option signature) : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } { SWAP /* [ key : list (option signature) : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DROP /* [ list (option signature) : nat : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } } { FAIL } ; SWAP /* [ nat : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ nat : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } /* [ nat : nat : list (option signature) : bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; ASSERT_CMPLE ; IF_CONS { FAIL } - { /* [ bytes - : or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + { /* [ bytes : or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ } ; DROP - /* [ or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; DIP { UNPAIR /* [ nat : pair nat (list key) ] */ ; @@ -255,7 +226,7 @@ Gas remaining: 1039928.351 units remaining /* [ nat : pair nat (list key) ] */ ; PAIR /* [ pair nat nat (list key) ] */ } - /* [ or (lambda %operation unit (list operation)) (pair %change_keys nat (list key)) + /* [ or (lambda unit (list operation)) (pair nat (list key)) : pair nat nat (list key) ] */ ; IF_LEFT { UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out index 9b3a39e38144..c9e95800b662 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out @@ -12,276 +12,201 @@ Gas remaining: 1039931.026 units remaining (list %sigs (option signature))) ; storage (pair (nat %stored_counter) (pair (nat %threshold) (list %keys key))) ; code { UNPAIR - /* [ pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + /* [ pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature)) : pair nat nat (list key) ] */ ; SWAP /* [ pair nat nat (list key) - : pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + : pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature)) ] */ ; DUP /* [ pair nat nat (list key) : pair nat nat (list key) - : pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + : pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature)) ] */ ; DIP { SWAP - /* [ pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + /* [ pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature)) : pair nat nat (list key) ] */ } /* [ pair nat nat (list key) - : pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + : pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature)) : pair nat nat (list key) ] */ ; DIP { UNPAIR - /* [ pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + /* [ pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; DUP - /* [ pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + /* [ pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; SELF /* [ contract - (pair (pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))))) + (pair (pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))))) (list (option signature))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; ADDRESS /* [ address - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; CHAIN_ID /* [ chain_id : address - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; PAIR /* [ pair chain_id address - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; PAIR /* [ pair (pair chain_id address) nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; PACK /* [ bytes - : pair nat - (or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key)))) + : pair nat (or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key)))) : list (option signature) : pair nat nat (list key) ] */ ; DIP { UNPAIR @counter /* [ nat - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : list (option signature) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ nat : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ bytes : nat : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; SWAP /* [ nat : bytes : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ pair nat nat (list key) : nat : bytes : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; UNPAIR @stored_counter /* [ nat : pair nat (list key) : nat : bytes : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ nat : pair nat (list key) : bytes : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ nat : nat : pair nat (list key) : bytes : list (option signature) - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; ASSERT_CMPEQ ; DIP { SWAP /* [ list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ pair nat (list key) : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; UNPAIR @threshold @keys /* [ nat : list key : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIP { PUSH @valid nat 0 /* [ nat : list key : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; SWAP /* [ list key : nat : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; ITER { DIP { SWAP /* [ list (option signature) : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ key : list (option signature) : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; SWAP /* [ list (option signature) : key : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; IF_CONS { IF_SOME { SWAP /* [ list (option signature) : signature : key : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIP { SWAP /* [ key : signature : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIIP { DUUP /* [ bytes : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ key : signature : bytes : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; { DUUUP /* [ bytes : key : signature : bytes : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIP { CHECK_SIGNATURE /* [ bool : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ bytes : bool : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; SWAP /* [ bool : bytes : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; IF { DROP /* [ nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } { FAILWITH /* [] */ } } ; PUSH nat 1 /* [ nat : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; ADD @valid /* [ nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ list (option signature) : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } { SWAP /* [ key : list (option signature) : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DROP /* [ list (option signature) : nat : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } } { FAIL } ; SWAP /* [ nat : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ nat : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ } /* [ nat : nat : list (option signature) : bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; ASSERT_CMPLE ; DROP /* [ bytes - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DROP - /* [ or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + /* [ or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; DIP { UNPAIR /* [ nat : pair nat (list key) ] */ ; @@ -291,17 +216,14 @@ Gas remaining: 1039931.026 units remaining /* [ nat : pair nat (list key) ] */ ; PAIR /* [ pair nat nat (list key) ] */ } - /* [ or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + /* [ or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; NIL operation /* [ list operation - : or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + : or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : pair nat nat (list key) ] */ ; SWAP - /* [ or (pair mutez (contract unit)) - (or (option %delegate key_hash) (pair %change_keys nat (list key))) + /* [ or (pair mutez (contract unit)) (or (option key_hash) (pair nat (list key))) : list operation : pair nat nat (list key) ] */ ; IF_LEFT { UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out index d2d4586547b2..83fdc99cac3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out @@ -16,31 +16,25 @@ Gas remaining: 1039662.882 units remaining (pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (pair (address %admin) (nat %total_supply)))) ; code { DUP - /* [ pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + /* [ pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address nat ] */ ; CDR /* [ pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -49,11 +43,9 @@ Gas remaining: 1039662.882 units remaining 0 /* [ mutez : pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -61,11 +53,9 @@ Gas remaining: 1039662.882 units remaining AMOUNT /* [ mutez : mutez : pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -73,11 +63,9 @@ Gas remaining: 1039662.882 units remaining COMPARE /* [ int : pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -85,11 +73,9 @@ Gas remaining: 1039662.882 units remaining NEQ /* [ bool : pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -98,11 +84,9 @@ Gas remaining: 1039662.882 units remaining "DontSendTez" /* [ string : pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address @@ -110,32 +94,26 @@ Gas remaining: 1039662.882 units remaining FAILWITH /* [] */ } { /* [ pair (big_map address nat) (big_map (pair address address) nat) address nat - : pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + : pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address nat ] */ } ; SWAP - /* [ pair (or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat))) + /* [ pair (or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat))) (big_map address nat) (big_map (pair address address) nat) address nat : pair (big_map address nat) (big_map (pair address address) nat) address nat ] */ ; CAR - /* [ or (or (or (pair %approve address nat) - (pair %getAllowance (pair address address) (contract nat))) - (or (pair %getBalance address (contract nat)) - (pair %getTotalSupply unit (contract nat)))) - (or (pair %mintOrBurn int address) (pair %transfer address address nat)) + /* [ or (or (or (pair address nat) (pair (pair address address) (contract nat))) + (or (pair address (contract nat)) (pair unit (contract nat)))) + (or (pair int address) (pair address address nat)) : pair (big_map address nat) (big_map (pair address address) nat) address nat ] */ ; IF_LEFT { IF_LEFT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out index 737df8b33516..647c54c5dbca 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out @@ -10,33 +10,27 @@ Gas remaining: 1039921.322 units remaining /* [ contract unit : address : pair unit (option address) ] */ ; ADDRESS /* [ address : address : pair unit (option address) ] */ ; - { /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ + { /* [ pair (or (or nat nat) unit) int ] */ COMPARE - /* [ mutez : mutez : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ ; + /* [ mutez : mutez : pair (or (or nat nat) unit) int ] */ ; EQ /* [ bool : pair unit (option address) ] */ ; IF { CDR /* [ option address ] */ ; - { /* [ mutez : mutez : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ + { /* [ mutez : mutez : pair (or (or nat nat) unit) int ] */ IF_NONE - { { /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ - UNIT - /* [ unit ] */ ; - FAILWITH - /* [] */ } } - { /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ } - /* [ bool : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ } ; + { { /* [ pair (or (or nat nat) unit) int ] */ UNIT /* [ unit ] */ ; FAILWITH /* [] */ } } + { /* [ pair (or (or nat nat) unit) int ] */ } + /* [ bool : pair (or (or nat nat) unit) int ] */ } ; DIP { NIL operation - /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int - : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ + /* [ pair (or (or nat nat) unit) int : pair (or (or nat nat) unit) int ] */ /* [ list operation ] */ } /* [] */ ; DUP - /* [ or (or (nat %add) (nat %sub)) (unit %default) - : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ ; + /* [ or (or nat nat) unit : pair (or (or nat nat) unit) int ] */ ; CONTRACT %add unit - /* [ or (or (nat %add) (nat %sub)) (unit %default) : int ] */ ; - { /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ + /* [ or (or nat nat) unit : int ] */ ; + { /* [ pair (or (or nat nat) unit) int ] */ IF_NONE { /* [ address : list operation ] */ } { { UNIT /* [ int ] */ ; FAILWITH /* [] */ } } } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out index d703bb5e6faa..f83302776ac4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out @@ -14,10 +14,8 @@ Gas remaining: 1039924.032 units remaining { CDR /* [ option address ] */ ; ASSERT_SOME - /* [ int : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ ; - DIP { /* [ pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ - NIL operation - /* [ list operation ] */ } + /* [ int : pair (or (or nat nat) unit) int ] */ ; + DIP { /* [ pair (or (or nat nat) unit) int ] */ NIL operation /* [ list operation ] */ } /* [] */ ; DUP /* [ address : address : list operation ] */ ; @@ -147,4 +145,4 @@ Gas remaining: 1039924.032 units remaining /* [ list operation : option address ] */ ; PAIR /* [ pair (list operation) (option address) ] */ } - /* [ mutez : pair (or (or (nat %add) (nat %sub)) (unit %default)) int ] */ } } + /* [ mutez : pair (or (or nat nat) unit) int ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out index 2a3ed74bf5f5..7b30f749d943 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out @@ -8,15 +8,14 @@ Gas remaining: 1039973.685 units remaining storage address ; code { AMOUNT /* [ mutez - : pair (or (ticket %burn unit) (pair %mint (contract (ticket unit)) nat)) address ] */ ; + : pair (or (ticket unit) (pair (contract (ticket unit)) nat)) address ] */ ; PUSH mutez 0 /* [ mutez : mutez - : pair (or (ticket %burn unit) (pair %mint (contract (ticket unit)) nat)) address ] */ ; + : pair (or (ticket unit) (pair (contract (ticket unit)) nat)) address ] */ ; ASSERT_CMPEQ ; UNPAIR - /* [ or (ticket %burn unit) (pair %mint (contract (ticket unit)) nat) - : address ] */ ; + /* [ or (ticket unit) (pair (contract (ticket unit)) nat) : address ] */ ; IF_LEFT { READ_TICKET /* [ pair address unit nat : ticket unit : address ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out index 85b9d0043946..18e09368f4c2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out @@ -5,17 +5,14 @@ Gas remaining: 1039970.718 units remaining { parameter (or (ticket %burn nat) (contract %mint_destination (ticket nat))) ; storage (pair (address %manager) (nat %counter)) ; code { AMOUNT - /* [ mutez - : pair (or (ticket %burn nat) (contract %mint_destination (ticket nat))) address nat ] */ ; + /* [ mutez : pair (or (ticket nat) (contract (ticket nat))) address nat ] */ ; PUSH mutez 0 /* [ mutez : mutez - : pair (or (ticket %burn nat) (contract %mint_destination (ticket nat))) address nat ] */ ; + : pair (or (ticket nat) (contract (ticket nat))) address nat ] */ ; ASSERT_CMPEQ ; - UNPAIR - 3 - /* [ or (ticket %burn nat) (contract %mint_destination (ticket nat)) : address - : nat ] */ ; + UNPAIR 3 + /* [ or (ticket nat) (contract (ticket nat)) : address : nat ] */ ; IF_LEFT { READ_TICKET /* [ pair address nat nat : ticket nat : address : nat ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out index 7040c27ff833..f9fbfb3a64b6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out @@ -8,20 +8,20 @@ Gas remaining: 1039935.806 units remaining storage (pair (address %manager) (big_map %tickets address (ticket unit))) ; code { AMOUNT /* [ mutez - : pair (or (ticket %receive unit) (pair %send (contract (ticket unit)) nat address)) + : pair (or (ticket unit) (pair (contract (ticket unit)) nat address)) address (big_map address (ticket unit)) ] */ ; PUSH mutez 0 /* [ mutez : mutez - : pair (or (ticket %receive unit) (pair %send (contract (ticket unit)) nat address)) + : pair (or (ticket unit) (pair (contract (ticket unit)) nat address)) address (big_map address (ticket unit)) ] */ ; ASSERT_CMPEQ ; UNPAIR 3 - /* [ or (ticket %receive unit) (pair %send (contract (ticket unit)) nat address) - : address : big_map address (ticket unit) ] */ ; + /* [ or (ticket unit) (pair (contract (ticket unit)) nat address) : address + : big_map address (ticket unit) ] */ ; IF_LEFT { READ_TICKET /* [ pair address unit nat : ticket unit : address diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out index 8a9b2c3f6aca..ab9cea0b9396 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out @@ -8,20 +8,20 @@ Gas remaining: 1039952.622 units remaining storage (pair (address %manager) (big_map %tickets (pair address nat) (ticket nat))) ; code { AMOUNT /* [ mutez - : pair (or (ticket %receive nat) (pair %send (contract (ticket nat)) address nat)) + : pair (or (ticket nat) (pair (contract (ticket nat)) address nat)) address (big_map (pair address nat) (ticket nat)) ] */ ; PUSH mutez 0 /* [ mutez : mutez - : pair (or (ticket %receive nat) (pair %send (contract (ticket nat)) address nat)) + : pair (or (ticket nat) (pair (contract (ticket nat)) address nat)) address (big_map (pair address nat) (ticket nat)) ] */ ; ASSERT_CMPEQ ; UNPAIR 3 - /* [ or (ticket %receive nat) (pair %send (contract (ticket nat)) address nat) - : address : big_map (pair address nat) (ticket nat) ] */ ; + /* [ or (ticket nat) (pair (contract (ticket nat)) address nat) : address + : big_map (pair address nat) (ticket nat) ] */ ; IF_LEFT { READ_TICKET /* [ pair address nat nat : ticket nat : address diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out index 6da4ea7906fe..28c899865c48 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out @@ -7,8 +7,7 @@ Gas remaining: 1039984.179 units remaining (pair %view_add (pair int int) (contract int))) ; storage unit ; code { CAR - /* [ or (pair %view_const unit (contract nat)) - (pair %view_add (pair int int) (contract int)) ] */ ; + /* [ or (pair unit (contract nat)) (pair (pair int int) (contract int)) ] */ ; IF_LEFT { CDR /* [ contract nat ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out index 693e47deea5f..904ec5a78968 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out @@ -16,13 +16,11 @@ Gas remaining: 1039911.852 units remaining code { NIL @operations operation /* [ list operation - : pair (or (pair %fund address bytes timestamp) - (or %claim_refund (bytes %preimage_claim) (bytes %refund_hash))) + : pair (or (pair address bytes timestamp) (or bytes bytes)) (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; SWAP - /* [ pair (or (pair %fund address bytes timestamp) - (or %claim_refund (bytes %preimage_claim) (bytes %refund_hash))) + /* [ pair (or (pair address bytes timestamp) (or bytes bytes)) (big_map bytes (pair (pair address address) mutez timestamp)) unit : list operation ] */ ; UNPAPAIR @% @% @% ; @@ -30,8 +28,7 @@ Gas remaining: 1039911.852 units remaining /* [ big_map bytes (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair address address) mutez timestamp) : unit : list operation ] */ } - /* [ or (pair %fund address bytes timestamp) - (or %claim_refund (bytes %preimage_claim) (bytes %refund_hash)) + /* [ or (pair address bytes timestamp) (or bytes bytes) : big_map bytes (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair address address) mutez timestamp) : unit : list operation ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out index 0a2663151c54..bed9ce3261bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out @@ -5,11 +5,10 @@ Gas remaining: 1039984.347 units remaining { parameter (or (pair %have_fun (big_map string nat) unit) (unit %default)) ; storage (big_map string nat) ; code { UNPAIR - /* [ or (pair %have_fun (big_map string nat) unit) (unit %default) - : big_map string nat ] */ ; + /* [ or (pair (big_map string nat) unit) unit : big_map string nat ] */ ; DIP { NIL operation /* [ list operation : big_map string nat ] */ } - /* [ or (pair %have_fun (big_map string nat) unit) (unit %default) - : list operation : big_map string nat ] */ ; + /* [ or (pair (big_map string nat) unit) unit : list operation + : big_map string nat ] */ ; IF_LEFT { DROP /* [ list operation : big_map string nat ] */ } { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out index 3f83a05f3a51..b9dad71d7e47 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out @@ -11,8 +11,7 @@ Gas remaining: 1039965.676 units remaining PACK @Apacked /* [ bytes ] */ ; SELF %default - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) - : bytes ] */ ; + /* [ contract (or (or nat bool) (or unit string)) : bytes ] */ ; PACK @defpacked /* [ bytes : bytes ] */ ; DUP @@ -21,8 +20,7 @@ Gas remaining: 1039965.676 units remaining /* [ bytes : bytes : bytes ] */ ; ASSERT_CMPNEQ ; SELF - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) - : bytes ] */ ; + /* [ contract (or (or nat bool) (or unit string)) : bytes ] */ ; PACK @selfpacked /* [ bytes : bytes ] */ ; ASSERT_CMPEQ ; @@ -39,7 +37,7 @@ Gas remaining: 1039965.676 units remaining DROP /* [] */ ; SELF %maybe_C - /* [ contract (or (unit %Z) (string %C)) ] */ ; + /* [ contract (or unit string) ] */ ; CAST (contract (or unit string)) /* [ contract (or unit string) ] */ ; DROP @@ -51,15 +49,15 @@ Gas remaining: 1039965.676 units remaining DROP /* [] */ ; SELF - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or nat bool) (or unit string)) ] */ ; CAST (contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C)))) - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or nat bool) (or unit string)) ] */ ; DROP /* [] */ ; SELF %default - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or nat bool) (or unit string)) ] */ ; CAST (contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C)))) - /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or nat bool) (or unit string)) ] */ ; DROP /* [] */ ; UNIT -- GitLab From 9362297dba79679461a4e28791c8ca97cd1ed1fc Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 28 Jan 2022 18:38:31 +0100 Subject: [PATCH 24/30] Proto/Michelson: update kinstr_size to count entrypoints too --- .../lib_protocol/script_typed_ir_size.ml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml index 8934531fc65b..6622dc7ae308 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -236,6 +236,17 @@ let views_size views = views zero +let rec entrypoints_size : type arg. arg entrypoints -> nodes_and_size = + fun {name; nested} -> + let name_size = option_size Entrypoint.in_memory_size name in + let nested_size = + match nested with + | Entrypoints_None -> zero + | Entrypoints_Union {left; right} -> + ret_adding (entrypoints_size left ++ entrypoints_size right) h2w + in + ret_succ_adding nested_size name_size + let kinfo_size {iloc = _; kstack_ty = _} = h2w (* The following mutually recursive functions are mostly @@ -538,19 +549,12 @@ and kinstr_size : | ITransfer_tokens (kinfo, _) -> ret_succ_adding accu (base kinfo) | IImplicit_account (kinfo, _) -> ret_succ_adding accu (base kinfo) | ICreate_contract - { - kinfo; - storage_type; - arg_type; - lambda; - entrypoints (* TODO? *) = _; - views; - k = _; - } -> + {kinfo; storage_type; arg_type; lambda; entrypoints; views; k = _} -> let accu = ret_succ_adding (accu ++ ty_size storage_type ++ ty_size arg_type - ++ views_size views) + ++ views_size views + ++ entrypoints_size entrypoints) (base kinfo +! (word_size *? 4)) in (lambda_size [@ocaml.tailcall]) ~count_lambda_nodes accu lambda -- GitLab From 34cc033f0ada973cfdae8c6a2d6f362e5a9d45df Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 31 Jan 2022 13:13:48 +0100 Subject: [PATCH 25/30] Tests/Python: update gas in regtests outputs --- ...Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" index 2ed1226ac74d..9d85c0fc05cd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" @@ -13,37 +13,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039984.194 units remaining) + - location: 8 (remaining gas: 1039984.149 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039984.184 units remaining) + - location: 8 (remaining gas: 1039984.139 units remaining) [ ] - - location: 9 (remaining gas: 1039984.174 units remaining) + - location: 9 (remaining gas: 1039984.129 units remaining) [ Unit ] - - location: 10 (remaining gas: 1039984.159 units remaining) + - location: 10 (remaining gas: 1039984.114 units remaining) [ 50000 Unit ] - - location: 11 (remaining gas: 1039984.144 units remaining) + - location: 11 (remaining gas: 1039984.099 units remaining) [ None 50000 Unit ] - - location: 13 (remaining gas: 1039983.538 units remaining) + - location: 13 (remaining gas: 1039983.493 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - - location: 25 (remaining gas: 1039983.523 units remaining) + - location: 25 (remaining gas: 1039983.478 units remaining) [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - - location: 27 (remaining gas: 1039983.508 units remaining) + - location: 27 (remaining gas: 1039983.463 units remaining) [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 28 (remaining gas: 1039983.493 units remaining) + - location: 28 (remaining gas: 1039983.448 units remaining) [ {} (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 25 (remaining gas: 1039983.463 units remaining) + - location: 25 (remaining gas: 1039983.418 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b {} (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 30 (remaining gas: 1039983.448 units remaining) + - location: 30 (remaining gas: 1039983.403 units remaining) [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 31 (remaining gas: 1039983.433 units remaining) + - location: 31 (remaining gas: 1039983.388 units remaining) [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ] -- GitLab From 2dcf34ed8ef091fd5bf96116723f93c6653fa9d4 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 2 Feb 2022 10:36:03 +0100 Subject: [PATCH 26/30] Tests/Python: update regtests outputs --- ...ct.TestNormalize::test_normalize_type[or (int %a) bool].out | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests_python/tests_alpha/_regtest_outputs/test_contract.TestNormalize::test_normalize_type[or (int %a) bool].out diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestNormalize::test_normalize_type[or (int %a) bool].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestNormalize::test_normalize_type[or (int %a) bool].out new file mode 100644 index 000000000000..d8c2fc8e4a8f --- /dev/null +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestNormalize::test_normalize_type[or (int %a) bool].out @@ -0,0 +1,3 @@ +tests_alpha/test_contract.py::TestNormalize::test_normalize_type[or (int %a) bool] + +or int bool -- GitLab From 0619595c1cb62fba5c27a1cabd2b911249121fac Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 2 Feb 2022 11:05:16 +0100 Subject: [PATCH 27/30] Proto/Michelson: remove dead field_annot_opt_eq_entrypoint_lax --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 8 -------- src/proto_alpha/lib_protocol/script_ir_annot.mli | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index b6b002116cd9..2f06b7c5ebc7 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -43,14 +43,6 @@ let field_annot_opt_to_entrypoint_strict ~loc = function | None -> Ok Entrypoint.default | Some (Field_annot a) -> Entrypoint.of_annot_strict ~loc a -let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = - match field_annot_opt with - | None -> false - | Some (Field_annot a) -> ( - match Entrypoint.of_annot_lax_opt a with - | None -> false - | Some a' -> Entrypoint.(a' = entrypoint)) - let merge_field_annot : type error_trace. legacy:bool -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index a2928820129e..664673928c0e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -39,11 +39,6 @@ end val field_annot_opt_to_entrypoint_strict : loc:Script.location -> field_annot option -> Entrypoint.t tzresult -(** Checks whether a field annot option equals an entrypoint. - When the field annot option is [None], the result is always [false]. *) -val field_annot_opt_eq_entrypoint_lax : - field_annot option -> Entrypoint.t -> bool - (** Merge field annotations. @return an error {!Inconsistent_type_annotations} if they are both present and different, unless [legacy] *) -- GitLab From 83bc005f100f618295cefab1bc945ee33e45cfea Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Sun, 6 Feb 2022 17:35:27 +0100 Subject: [PATCH 28/30] Proto/Michelson: adapt gas for find_entrypoint The function has been rewritten in a previous commit. --- src/proto_alpha/lib_protocol/michelson_v1_gas.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index e75d9db05e2d..c6358b701734 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -952,7 +952,7 @@ module Cost_of = struct (* TODO: https://gitlab.com/tezos/tezos/-/issues/2264 Benchmark. Currently approximated by 2 comparisons of the longest entrypoint. *) - let cost_FIND_ENTRYPOINT = S.mul (S.safe_int 2) (cost_N_ICompare 31 31) + let cost_FIND_ENTRYPOINT = cost_N_ICompare 31 31 (* model SAPLING_TRANSACTION_ENCODING *) let cost_SAPLING_TRANSACTION_ENCODING ~inputs ~outputs = -- GitLab From e1caca4dd4fd10e1d7df0c0ed8d48aa9c0045b89 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Sun, 6 Feb 2022 17:52:52 +0100 Subject: [PATCH 29/30] Tests/Python: update gas in regtests outputs --- ...ddressTransfer::test_send_self_address.out | 8 +- ...ck::test_typecheck[attic--cps_fact.tz].out | 2 +- ...eck[mini_scenarios--authentication.tz].out | 2 +- ...ck[mini_scenarios--create_contract.tz].out | 2 +- ...ck[mini_scenarios--legacy_multisig.tz].out | 2 +- ...check[mini_scenarios--multiple_en2.tz].out | 2 +- ...rios--multiple_entrypoints_counter.tz].out | 2 +- ...heck::test_typecheck[opcodes--self.tz].out | 2 +- ...st_typecheck[opcodes--self_address.tz].out | 2 +- ...check[opcodes--self_after_fib_view.tz].out | 2 +- ...codes--self_after_nonexistent_view.tz].out | 2 +- ...typecheck[opcodes--self_after_view.tz].out | 2 +- ...odes--self_with_default_entrypoint.tz].out | 2 +- ...heck[opcodes--self_with_entrypoint.tz].out | 2 +- ...::test_typecheck[opcodes--view_rec.tz].out | 2 +- ...s.TestContractOnchainLevel::test_level.out | 8 +- ...tractOnchainOpcodes::test_set_delegate.out | 8 +- ...ef0e55c43a9a857214d8761e67b.7da5c9014e.out | 4 +- ...estContractOnchainOpcodes::test_source.out | 10 +- ...ntractOnchainOpcodes::test_split_bytes.out | 8 +- ...tractOnchainOpcodes::test_split_string.out | 8 +- ...ntractOnchainOpcodes::test_store_input.out | 8 +- ...ctOnchainOpcodes::test_transfer_amount.out | 4 +- ...ctOnchainOpcodes::test_transfer_tokens.out | 14 +- ...(Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" | 18 +- ...(Some 5) { Elt \"hello\" 4.0427752f13.out" | 18 +- ...(Some 5) { Elt \"hello\" 4.0793dc66d5.out" | 18 +- ...None { Elt \"1\" 1 ; .df114499b8.out" | 18 +- ...None { Elt \"1\" 1 ; .f9bea98de9.out" | 18 +- ...None { Elt \"hello\" 4 })-.1db12cd837.out" | 18 +- ...None {})-\"hello\"-(Pair N.6fc7d0acf2.out" | 18 +- ..." \"one\" ; Elt \"2\" \"tw.524c5459f8.out" | 26 +- ...ello\" \"hi\" } None)-\"\".33eba403e7.out" | 26 +- ...hello\" \"hi\" } None)-\"h.a5cd1005c9.out" | 26 +- ...one\" ; Elt \"2\" \"two\" .6f3d35b151.out" | 18 +- ...one\" ; Elt \"2\" \"two\" .76aeaa0706.out" | 24 +- ...one\" ; Elt \"2\" \"two\" .7e7197f248.out" | 24 +- ...one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" | 24 +- ...one\" ; Elt \"2\" \"two\" .b688cc94a7.out" | 24 +- ...one\" ; Elt \"2\" \"two\" .c68db221ed.out" | 24 +- ...TestContractOpcodes::test_balance[0.5].out | 10 +- ...s.TestContractOpcodes::test_balance[0].out | 10 +- ...estContractOpcodes::test_balance[1000].out | 10 +- ...s.TestContractOpcodes::test_balance[1].out | 10 +- ...stContractOpcodes::test_balance[1e-06].out | 10 +- ...s.TestContractOpcodes::test_balance[5].out | 10 +- ...Opcodes::test_balance[8000000000000.0].out | 10 +- ... \"two\" }) )-(Right (Righ.7492e8cdea.out" | 52 +- ... \"two\" }))-(Left Unit)-(.21b30dd90f.out" | 26 +- ... \"two\" }))-(Right (Left .2873ef610c.out" | 20 +- ... \"two\" }))-(Right (Left .8a6f480005.out" | 20 +- ... \"two\" }))-(Right (Right.d336ca1903.out" | 50 +- ...Pair \"foo\" \"bar\" } { P.7f2ee47600.out" | 80 +- ...tContractOpcodes::test_check_signature.out | 70 +- ...tract_input_output[abs.tz-Unit-0-Unit].out | 24 +- ....tz-Unit-12039123919239192312931-Unit].out | 24 +- ...act_input_output[abs.tz-Unit-948-Unit].out | 24 +- ...ct_input_output[add.tz-Unit-Unit-Unit].out | 136 ++-- ...r 0x00 0x00-(Some 0x0000000.3c2de60480.out | 14 +- ...r 0x01 0x00-(Some 0x0100000.12b2c1172b.out | 14 +- ...r 0x010000 0x00-(Some 0x010.0e44fc6f40.out | 14 +- ...r 0x010000 0x010000-(Some 0.7e0ed229a3.out | 14 +- ...air -100 100)-(Some \"1970.7c1b1e4e5b.out" | 22 +- ...air 0 \"1970-01-01T00:00:0.528ed42c01.out" | 22 +- ...air 100 100)-(Some \"1970-.6566111ad2.out" | 22 +- ...air \"1970-01-01T00:00:00Z.72c424f3da.out" | 22 +- ...air 100 -100)-(Some \"1970.7c4b12e9aa.out" | 22 +- ...air 100 100)-(Some \"1970-.af32743640.out" | 22 +- ...dhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" | 12 +- ...-None-(Pair False False)-(Some False)].out | 18 +- ...z-None-(Pair False True)-(Some False)].out | 18 +- ...z-None-(Pair True False)-(Some False)].out | 18 +- ....tz-None-(Pair True True)-(Some True)].out | 18 +- ...t_output[and_binary.tz-Unit-Unit-Unit].out | 74 +- ...l_1.tz-False-(Pair False False)-False].out | 12 +- ...al_1.tz-False-(Pair False True)-False].out | 12 +- ...al_1.tz-False-(Pair True False)-False].out | 12 +- ...ical_1.tz-False-(Pair True True)-True].out | 12 +- ...put[balance.tz-111-Unit-4000000000000].out | 10 +- ...lt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out | 24 +- ...lt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out | 24 +- ...lt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out | 24 +- ...lt 1 0 } None)-1-(Pair 4 (S.73700321f8.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-1.1182eca937.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-2.1eead33885.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out | 24 +- ...lt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out | 24 +- ...air {} None)-1-(Pair 4 (Some False))0].out | 24 +- ...air {} None)-1-(Pair 4 (Some False))1].out | 24 +- ... \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" | 24 +- ... \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" | 24 +- ... \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" | 24 +- ... \"foo\" 0 } None)-\"foo\".968709d39d.out" | 24 +- ... \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" | 24 +- ... None)-\"bar\"-(Pair 4 (Some False))].out" | 24 +- ...padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out | 12 +- ...e-Unit-(Some 0x100000000000.d1219ca789.out | 12 +- ...utput[bls12_381_fr_to_int.tz-0-0x00-0].out | 10 +- ...utput[bls12_381_fr_to_int.tz-0-0x01-1].out | 10 +- ...8db8e57af88d9576acd181b89f2.7a85c336ff.out | 10 +- ...9e8abf8dc324a010007addde986.b821eb26b3.out | 10 +- ...ut[bls12_381_fr_to_mutez.tz-0-0x10-16].out | 20 +- ...000000000000000000000000000.0accef5bef.out | 10 +- ...000000000000000000000000000.0ecc537252.out | 10 +- ...000000000000000000000000000.2229b767cd.out | 10 +- ...000000000000000000000000000.2ff549b46b.out | 10 +- ...000000000000000000000000000.bf8a711be6.out | 10 +- ...000000000000000000000000000.d41cbb044b.out | 10 +- ...a5ad0a633e4880d2296f08ec5c1.a50412e458.out | 10 +- ...cd0fa853810e356f1eb79721e80.f3a349c4a7.out | 10 +- ...be1766f92cd82c5e5135c374a03.1b9676e4c2.out | 10 +- ...be1766f92cd82c5e5135c374a03.e966dc6de5.out | 10 +- ...000000000000000000000000000.964835cc43.out | 10 +- ...000000000000000000000000000.b25ea709fb.out | 10 +- ...000000000000000000000000000.eae36753ea.out | 10 +- ...000000000000000000000000000.ee57dac8f7.out | 10 +- ...a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out | 10 +- ...cd0fa853810e356f1eb79721e80.bd5800f6b8.out | 10 +- ...be1766f92cd82c5e5135c374a03.00e897789a.out | 10 +- ...be1766f92cd82c5e5135c374a03.a4697eaa13.out | 10 +- ...000000000000000000000000000.0177355bbf.out | 12 +- ...000000000000000000000000000.744166c609.out | 12 +- ...000000000000000000000000000.9f3c5cdc6a.out | 12 +- ...000000000000000000000000000.a54cb341ba.out | 12 +- ...000000000000000000000000000.b0dc584c94.out | 12 +- ...000000000000000000000000000.bddcad090c.out | 12 +- ...a5ad0a633e4880d2296f08ec5c1.92c153eb47.out | 12 +- ...cd0fa853810e356f1eb79721e80.290ab49d11.out | 12 +- ...be1766f92cd82c5e5135c374a03.69f3589a06.out | 12 +- ...be1766f92cd82c5e5135c374a03.fee3c5cf43.out | 12 +- ...000000000000000000000000000.1bccc033e8.out | 12 +- ...000000000000000000000000000.40958700fe.out | 12 +- ...000000000000000000000000000.6c62b03d78.out | 12 +- ...000000000000000000000000000.d23f269341.out | 12 +- ...a5ad0a633e4880d2296f08ec5c1.927f808504.out | 12 +- ...cd0fa853810e356f1eb79721e80.0c114c956a.out | 12 +- ...be1766f92cd82c5e5135c374a03.03c4f38e68.out | 12 +- ...be1766f92cd82c5e5135c374a03.8ed19cfdd9.out | 12 +- ...input_output[car.tz-0-(Pair 34 17)-34].out | 10 +- ...input_output[cdr.tz-0-(Pair 34 17)-17].out | 10 +- ...prcVkpaWU\")-Unit-(Some \".8420090f97.out" | 12 +- ...770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" | 12 +- ...None-Unit-(Some \"NetXdQprcVkpaWU\")].out" | 12 +- ...mb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out | 82 +- ... Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" | 22 +- ...r 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out | 24 +- ...omb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out | 14 +- ...nput_output[compare.tz-Unit-Unit-Unit].out | 358 ++++----- ...; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out | 200 ++--- ...-{ \"World!\" }-{ \"Hello World!\" }].out" | 16 +- ..."test2\" }-{ \"Hello test1.c27e8c3ee6.out" | 22 +- ...input_output[concat_hello.tz-{}-{}-{}].out | 10 +- ...}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out | 22 +- ...hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out | 16 +- ...output[concat_hello_bytes.tz-{}-{}-{}].out | 10 +- ...; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" | 86 +- ...\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" | 68 +- ...t_output[concat_list.tz-\"\"-{}-\"\"].out" | 14 +- ...ns.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out | 10 +- ..._output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out | 10 +- ...act_input_output[cons.tz-{}-10-{ 10 }].out | 10 +- ...ir { \"A\" } { \"B\" })-(Some False)].out" | 100 +-- ...\"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" | 244 +++--- ...\"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" | 266 +++---- ...air { \"B\" } { \"B\" })-(Some True)].out" | 100 +-- ...ir { \"c\" } { \"B\" })-(Some False)].out" | 100 +-- ..._all.tz-None-(Pair {} {})-(Some True)].out | 38 +- ...wnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" | 18 +- ...Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" | 24 +- ...970-01-01T00:03:20Z\" \"19.90e9215d17.out" | 20 +- ...t[diff_timestamps.tz-111-(Pair 0 0)-0].out | 20 +- ...[diff_timestamps.tz-111-(Pair 0 1)--1].out | 20 +- ...t[diff_timestamps.tz-111-(Pair 1 0)-1].out | 20 +- ...r 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out | 748 +++++++++--------- ... 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out | 748 +++++++++--------- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 30 +- ...p.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out | 20 +- ...z-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out | 20 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out | 42 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 18 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out | 26 +- ..._input_output[dup-n.tz-Unit-Unit-Unit].out | 82 +- ... None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out | 70 +- ... None)-(Pair 10 -3)-(Pair (.3caea50555.out | 70 +- ... None)-(Pair 10 0)-(Pair No.f9448c04fb.out | 70 +- ... None)-(Pair 10 (Left 0))-(Left None)].out | 22 +- ...air 10 (Left 10))-(Left (So.f782cc1dec.out | 22 +- ...air 10 (Left 3))-(Left (Som.016b4db96c.out | 22 +- ...one)-(Pair 10 (Right 0))-(Right None)].out | 22 +- ...air 10 (Right 10))-(Right (.e705a30e07.out | 22 +- ...air 10 (Right 3))-(Right (S.44485eda6a.out | 22 +- ...air 5 (Right 10))-(Right (S.8ab987af15.out | 22 +- ...-{}-Unit-{ Elt \"hello\" \"world\" }].out" | 18 +- ...t[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" | 28 +- ...oncat.tz-\"?\"-\"test\"-\"test_abc\"].out" | 28 +- ...tput[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out | 18 +- ...act_input_output[first.tz-111-{ 4 }-4].out | 18 +- ...me 4) {})-\"hello\"-(Pair .161d86cef6.out" | 18 +- ...me 5) { Elt \"hello\" 4 }).684ab7e326.out" | 18 +- ...me 5) { Elt \"hello\" 4 }).d49817fb83.out" | 18 +- ...e { Elt \"1\" 1 ; .6900b1da14.out" | 18 +- ...e { Elt \"1\" 1 ; .bca0ede8be.out" | 18 +- ... { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" | 18 +- ...ir None {})-\"hello\"-(Pair None {})].out" | 18 +- ... \"1\" \"one\" ; .bc4127094e.out" | 24 +- ..."hello\" \"hi\" })-\"\"-(P.0c03056487.out" | 24 +- ...\"hello\" \"hi\" })-\"hell.cc45544c66.out" | 24 +- ...nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" | 12 +- ...2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" | 12 +- ...xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" | 12 +- ...-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" | 12 +- ..._output[if.tz-None-False-(Some False)].out | 16 +- ...ut_output[if.tz-None-True-(Some True)].out | 16 +- ....tz-\"?\"-(Some \"hello\")-\"hello\"].out" | 12 +- ...ut_output[if_some.tz-\"?\"-None-\"\"].out" | 14 +- ...t_input_output[int.tz-None-0-(Some 0)].out | 12 +- ...t_input_output[int.tz-None-1-(Some 1)].out | 12 +- ...t_output[int.tz-None-9999-(Some 9999)].out | 12 +- ...c20776f726c6421-(Some 0xb6e.34c02678c9.out | 12 +- ...Left \"X\")-(Left True)-(Right True)].out" | 14 +- ...ft \"X\")-(Right \"a\")-(Left \"a\")].out" | 14 +- ...ract_input_output[level.tz-111-Unit-1].out | 10 +- ...{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" | 14 +- ...ut[list_concat.tz-\"abc\"-{}-\"abc\"].out" | 14 +- ...tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out | 14 +- ..._output[list_concat_bytes.tz-0x-{}-0x].out | 14 +- ...b-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out | 14 +- ...list_concat_bytes.tz-0xabcd-{}-0xabcd].out | 14 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 8 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 8 +- ...input_output[list_id.tz-{\"\"}-{}-{}].out" | 8 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 16 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 16 +- ...t_output[list_id_map.tz-{\"\"}-{}-{}].out" | 10 +- ...tput[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out | 26 +- ...tput[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out | 26 +- ...}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out | 92 +-- ...}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out | 92 +-- ...ut_output[list_map_block.tz-{0}-{}-{}].out | 20 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 10 +- ...tput[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 10 +- ...input_output[list_size.tz-111-{ 1 }-1].out | 10 +- ...ct_input_output[list_size.tz-111-{}-0].out | 10 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 120 +-- ...put_output[loop_left.tz-{\"\"}-{}-{}].out" | 36 +- ...0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out | 8 +- ...[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out | 8 +- ...[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out | 8 +- ... Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out | 94 +-- ...-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out | 94 +-- ...foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" | 42 +- ...lt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" | 30 +- ...ract_input_output[map_map.tz-{}-10-{}].out | 18 +- ... 1 } None)-1-(Pair { Elt 0 .7396e5f090.out | 24 +- ... 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out | 24 +- ... 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out | 24 +- ... 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out | 24 +- ... 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out | 24 +- ...air {} None)-1-(Pair {} (Some False))].out | 24 +- ...ar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" | 24 +- ...ar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" | 24 +- ...ar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" | 24 +- ...oo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" | 24 +- ...oo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" | 24 +- ...None)-\"bar\"-(Pair {} (Some False))].out" | 24 +- ... \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" | 10 +- ...\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" | 10 +- ...ut[map_size.tz-111-{ Elt \"a\" 1 }-1].out" | 10 +- ...act_input_output[map_size.tz-111-{}-0].out | 10 +- ...ct_input_output[mul.tz-Unit-Unit-Unit].out | 108 +-- ...0-257-0x0101000000000000000.be11332c7f.out | 24 +- ...2-16-0x10000000000000000000.8230fb4fac.out | 24 +- ...act_input_output[neg.tz-0-(Left -2)-2].out | 14 +- ...ract_input_output[neg.tz-0-(Left 0)-0].out | 14 +- ...act_input_output[neg.tz-0-(Left 2)--2].out | 14 +- ...act_input_output[neg.tz-0-(Right 0)-0].out | 14 +- ...ct_input_output[neg.tz-0-(Right 2)--2].out | 14 +- ...nput_output[none.tz-Some 10-Unit-None].out | 10 +- ..._output[not.tz-None-False-(Some True)].out | 12 +- ..._output[not.tz-None-True-(Some False)].out | 12 +- ...not_binary.tz-None-(Left -8)-(Some 7)].out | 16 +- ...not_binary.tz-None-(Left -9)-(Some 8)].out | 16 +- ...not_binary.tz-None-(Left 0)-(Some -1)].out | 16 +- ...not_binary.tz-None-(Left 7)-(Some -8)].out | 16 +- ...not_binary.tz-None-(Left 8)-(Some -9)].out | 16 +- ...ot_binary.tz-None-(Right 0)-(Some -1)].out | 16 +- ...ot_binary.tz-None-(Right 7)-(Some -8)].out | 16 +- ...ot_binary.tz-None-(Right 8)-(Some -9)].out | 16 +- ...-None-(Pair False False)-(Some False)].out | 20 +- ...tz-None-(Pair False True)-(Some True)].out | 20 +- ...tz-None-(Pair True False)-(Some True)].out | 20 +- ....tz-None-(Pair True True)-(Some True)].out | 20 +- ...or_binary.tz-None-(Pair 0 8)-(Some 8)].out | 14 +- ..._binary.tz-None-(Pair 14 1)-(Some 15)].out | 14 +- ..._binary.tz-None-(Pair 15 4)-(Some 15)].out | 14 +- ...r_binary.tz-None-(Pair 4 8)-(Some 12)].out | 14 +- ...or_binary.tz-None-(Pair 7 7)-(Some 7)].out | 14 +- ...or_binary.tz-None-(Pair 8 0)-(Some 8)].out | 14 +- ... (Pair 1 (Pair \"foobar\".368bdfd73a.out" | 282 +++---- ... (Pair 1 (Pair \"foobar\".735d9ae802.out" | 282 +++---- ...ir \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" | 342 ++++---- ...ir \"edpkuBknW28nW72KG6RoH.4e20b52378.out" | 342 ++++---- ...alse False)-(Some (Pair False False))].out | 10 +- ... False True)-(Some (Pair False True))].out | 10 +- ... True False)-(Some (Pair True False))].out | 10 +- ...ir True True)-(Some (Pair True True))].out | 10 +- ...ntract_input_output[pexec.tz-14-38-52].out | 28 +- ... 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out | 148 ++-- ...utput[ret_int.tz-None-Unit-(Some 300)].out | 12 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 26 +- ...input_output[reverse.tz-{\"\"}-{}-{}].out" | 14 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 76 +- ..._output[reverse_loop.tz-{\"\"}-{}-{}].out" | 28 +- ...tput[sapling_empty_state.tz-{}-Unit-0].out | 10 +- ...output[self_address.tz-Unit-Unit-Unit].out | 32 +- ..._default_entrypoint.tz-Unit-Unit-Unit].out | 34 +- ...entrypoint.tz-Unit-Left (Left 0)-Unit].out | 70 +- ...Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" | 28 +- ..."hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" | 28 +- ...lo\" 0)-\"world\"-(Pair \"world\" 0)].out" | 28 +- ...ir \"hello\" 0)-1-(Pair \"hello\" 1)].out" | 26 +- ... \"hello\" 500)-3-(Pair \"hello\" 3)].out" | 26 +- ..."hello\" 7)-100-(Pair \"hello\" 100)].out" | 26 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 8 +- ...; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" | 8 +- ...tract_input_output[set_id.tz-{}-{}-{}].out | 8 +- ..._iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out | 30 +- ..._input_output[set_iter.tz-111-{ 1 }-1].out | 18 +- ...act_input_output[set_iter.tz-111-{}-0].out | 14 +- ..."World\" } None)-\"\"-(Pai.3d2044726e.out" | 36 +- ...)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" | 36 +- ... None)-\"Hi\"-(Pair {} (Some False))].out" | 36 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 10 +- ...utput[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 10 +- ..._input_output[set_size.tz-111-{ 1 }-1].out | 10 +- ...act_input_output[set_size.tz-111-{}-0].out | 10 +- ...0776f726c6421-(Some 0xf345a.a07ae9dddf.out | 12 +- ...ts.tz-None-(Left (Pair 0 0))-(Some 0)].out | 18 +- ...ts.tz-None-(Left (Pair 0 1))-(Some 0)].out | 18 +- ...ts.tz-None-(Left (Pair 1 2))-(Some 4)].out | 18 +- ....tz-None-(Left (Pair 15 2))-(Some 60)].out | 18 +- ...s.tz-None-(Left (Pair 8 1))-(Some 16)].out | 18 +- ...s.tz-None-(Right (Pair 0 0))-(Some 0)].out | 18 +- ...s.tz-None-(Right (Pair 0 1))-(Some 0)].out | 18 +- ...s.tz-None-(Right (Pair 1 2))-(Some 0)].out | 18 +- ....tz-None-(Right (Pair 15 2))-(Some 3)].out | 18 +- ...s.tz-None-(Right (Pair 8 1))-(Some 4)].out | 18 +- ...ut_output[slice.tz-None-Pair 0 0-None].out | 18 +- ...tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" | 20 +- ...slice.tz-Some \"Foo\"-Pair 0 10-None].out" | 20 +- ...-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" | 20 +- ...z-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" | 20 +- ...[slice.tz-Some \"Foo\"-Pair 1 3-None].out" | 20 +- ...slice.tz-Some \"Foo\"-Pair 10 5-None].out" | 20 +- ...FooFooFooFooFooFooFooFooFo.c508d67bb0.out" | 20 +- ...put[slice_bytes.tz-None-Pair 0 1-None].out | 18 +- ...s.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out | 20 +- ...tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out | 20 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out | 20 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out | 20 +- ...-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out | 20 +- ..._bytes.tz-Some 0xaabbcc-Pair 1 3-None].out | 20 +- ...aabbccaabbccaabbccaabbccaab.df5895de85.out | 20 +- ...d.tz-None-\"Hello\"-(Some \"Hello\")].out" | 10 +- ..._id.tz-None-\"abcd\"-(Some \"abcd\")].out" | 10 +- ...r 100 -100)-\"1970-01-01T00:03:20Z\"].out" | 20 +- ...ir 100 100)-\"1970-01-01T00:00:00Z\"].out" | 20 +- ...Pair 100 200000000000000000.3db82d2c25.out | 20 +- ...00000 1000000)-(Some (Pair .b461aa042b.out | 46 +- ...10000 1010000)-(Some (Pair .1e8cf7679c.out | 46 +- ...t_output[uncomb.tz-0-(Pair 1 4 2)-142].out | 24 +- ...input_output[unpair.tz-Unit-Unit-Unit].out | 318 ++++---- ...dpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" | 20 +- ...Pair False False)-(Some (Left False))].out | 20 +- ... (Pair False True)-(Some (Left True))].out | 20 +- ... (Pair True False)-(Some (Left True))].out | 20 +- ... (Pair True True)-(Some (Left False))].out | 20 +- ...one-Right (Pair 0 0)-(Some (Right 0))].out | 20 +- ...one-Right (Pair 0 1)-(Some (Right 1))].out | 20 +- ...one-Right (Pair 1 0)-(Some (Right 1))].out | 20 +- ...one-Right (Pair 1 1)-(Some (Right 0))].out | 20 +- ...-Right (Pair 42 21)-(Some (Right 63))].out | 20 +- ...-Right (Pair 42 63)-(Some (Right 21))].out | 20 +- ...pcodes.TestContractOpcodes::test_level.out | 10 +- ..._opcodes.TestContractOpcodes::test_now.out | 10 +- ...s.TestContractOpcodes::test_packunpack.out | 58 +- ...roveTransferRemove::test_add_liquidity.out | 4 +- ...ddApproveTransferRemove::test_approval.out | 4 +- ...TransferRemove::test_approved_transfer.out | 4 +- ...roveTransferRemove::test_call_approve1.out | 4 +- ...roveTransferRemove::test_call_approve2.out | 4 +- ...roveTransferRemove::test_call_approve3.out | 4 +- ...eTransferRemove::test_remove_liquidity.out | 4 +- ..._baking.TestTrades::test_add_liquidity.out | 4 +- ...uidity_baking.TestTrades::test_buy_tok.out | 6 +- ..._baking.TestTrades::test_call_approve1.out | 4 +- ..._baking.TestTrades::test_call_approve2.out | 4 +- ..._baking.TestTrades::test_call_approve3.out | 4 +- ...idity_baking.TestTrades::test_sell_tok.out | 6 +- ...idity_baking.TestTrades::test_transfer.out | 4 +- 402 files changed, 6153 insertions(+), 6153 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out index 67a858252965..50a7a58c71f2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestSelfAddressTransfer::test_send_self_address Node is bootstrapped. -Estimated gas: 5192.990 units (will add 100 for safety) +Estimated gas: 5193.095 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000824 Expected counter: [EXPECTED_COUNTER] - Gas limit: 5293 + Gas limit: 5294 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000824 @@ -27,7 +27,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 82 bytes - Consumed gas: 3133.732 + Consumed gas: 3133.802 Internal operations: Transaction: Amount: ꜩ0 @@ -37,6 +37,6 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 83 bytes - Consumed gas: 2059.258 + Consumed gas: 2059.293 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out index 075ec6c54a04..7a05c513e419 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/cps_fact.tz] Well typed -Gas remaining: 1039973.219 units remaining +Gas remaining: 1039973.149 units remaining { storage nat ; parameter nat ; code { UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out index c9c80a6e7458..84f7a47c8a73 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/authentication.tz] Well typed -Gas remaining: 1039978.751 units remaining +Gas remaining: 1039978.716 units remaining { parameter (pair (lambda unit (list operation)) signature) ; storage (pair (nat %counter) key) ; code { UNPPAIPAIR ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out index 49b3c3931ec7..54b58211665f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/create_contract.tz] Well typed -Gas remaining: 1039968.907 units remaining +Gas remaining: 1039968.837 units remaining { parameter (option address) ; storage unit ; code { /* [ pair string string ] */ diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out index c9e95800b662..3bbcd5e4a08b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/legacy_multisig.tz] Well typed -Gas remaining: 1039931.026 units remaining +Gas remaining: 1039930.991 units remaining { parameter (pair (pair :payload (nat %counter) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out index 647c54c5dbca..c2c13dbeca65 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/multiple_en2.tz] Well typed -Gas remaining: 1039921.322 units remaining +Gas remaining: 1039921.252 units remaining { parameter unit ; storage (option address) ; code { SENDER diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out index f83302776ac4..0b3e3c204bbb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/multiple_entrypoints_counter.tz] Well typed -Gas remaining: 1039924.032 units remaining +Gas remaining: 1039923.962 units remaining { parameter unit ; storage (option address) ; code { SENDER diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out index c8fa2465d351..a29b4743e526 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self.tz] Well typed -Gas remaining: 1039996.340 units remaining +Gas remaining: 1039996.305 units remaining { parameter unit ; storage address ; code { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out index 49f29fea1d29..717a13df2cb7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_address.tz] Well typed -Gas remaining: 1039988.984 units remaining +Gas remaining: 1039988.949 units remaining { parameter unit ; storage unit ; code { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out index def66072a7f4..50e71453dcfd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_fib_view.tz] Well typed -Gas remaining: 1039985.135 units remaining +Gas remaining: 1039985.100 units remaining { parameter address ; storage address ; code { CAR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out index 9496c6c3b44f..f9c758e8fca9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_nonexistent_view.tz] Well typed -Gas remaining: 1039985.527 units remaining +Gas remaining: 1039985.492 units remaining { parameter address ; storage address ; code { CAR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out index 344a0011b6a1..bdb76a06c34f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_view.tz] Well typed -Gas remaining: 1039984.961 units remaining +Gas remaining: 1039984.926 units remaining { parameter address ; storage address ; code { CAR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out index c5f864996ab4..21d88f835dd5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_default_entrypoint.tz] Well typed -Gas remaining: 1039987.845 units remaining +Gas remaining: 1039987.880 units remaining { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %default) (string %C))) ; storage unit ; code { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out index b9dad71d7e47..4c3ee75544bf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_entrypoint.tz] Well typed -Gas remaining: 1039965.676 units remaining +Gas remaining: 1039965.501 units remaining { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ; storage unit ; code { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out index 6a7c9ff621d6..f724e21b4697 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_rec.tz] Well typed -Gas remaining: 1039987.709 units remaining +Gas remaining: 1039987.674 units remaining { parameter unit ; storage unit ; view "loop" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out index 8a13c028f1b0..649493f90c7f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out @@ -47,7 +47,7 @@ Contract memorized as level. Injected block at minimal timestamp Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2049.563 units (will add 100 for safety) +Estimated gas: 2049.598 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -72,7 +72,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 4 Storage size: 40 bytes - Consumed gas: 2049.563 + Consumed gas: 2049.598 Balance updates: [CONTRACT_HASH] ... -ꜩ500 [CONTRACT_HASH] ... +ꜩ500 @@ -89,7 +89,7 @@ Injected block at minimal timestamp Injected block at minimal timestamp 4 Node is bootstrapped. -Estimated gas: 1202.350 units (will add 100 for safety) +Estimated gas: 1202.385 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -114,7 +114,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 7 Storage size: 40 bytes - Consumed gas: 1202.350 + Consumed gas: 1202.385 Balance updates: [CONTRACT_HASH] ... -ꜩ500 [CONTRACT_HASH] ... +ꜩ500 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out index b7f5b011a618..967c92068bc6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out @@ -48,7 +48,7 @@ Injected block at minimal timestamp Injected block at minimal timestamp none Node is bootstrapped. -Estimated gas: 3056.061 units (will add 100 for safety) +Estimated gas: 3056.096 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -74,7 +74,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 2056.061 + Consumed gas: 2056.096 Internal operations: Delegation: Contract: [CONTRACT_HASH] @@ -85,7 +85,7 @@ This sequence of operations was run: Injected block at minimal timestamp [CONTRACT_HASH] (known as bootstrap5) Node is bootstrapped. -Estimated gas: 2202.425 units (will add 100 for safety) +Estimated gas: 2202.460 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -111,7 +111,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 1202.425 + Consumed gas: 1202.460 Internal operations: Delegation: Contract: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out index 05e09c848dbf..2a4f8431b44a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")] Node is bootstrapped. -Estimated gas: 3964.704 units (will add 100 for safety) +Estimated gas: 3964.739 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 '[BLOCK_HASH]' @@ -29,7 +29,7 @@ This sequence of operations was run: Updated storage: [OPERATION_HASH]48f709699019725ba Storage size: 578 bytes - Consumed gas: 2544.704 + Consumed gas: 2544.739 Internal operations: Transaction: Amount: ꜩ1000 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out index c1521feba7ee..5e54f2792887 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out @@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as source. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2710.682 units (will add 100 for safety) +Estimated gas: 2710.717 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -71,14 +71,14 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 2710.682 + Consumed gas: 2710.717 Injected block at minimal timestamp "[CONTRACT_HASH]" [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 4338.863 units (will add 100 for safety) +Estimated gas: 4338.968 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -104,7 +104,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 3126.358 + Consumed gas: 3126.428 Internal operations: Transaction: Amount: ꜩ0 @@ -113,7 +113,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 1212.505 + Consumed gas: 1212.540 Injected block at minimal timestamp "[CONTRACT_HASH]" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out index 51842f5fb369..da657a04157e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out @@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as split_bytes. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2097.318 units (will add 100 for safety) +Estimated gas: 2097.353 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 '[BLOCK_HASH]' @@ -95,7 +95,7 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 2097.318 + Consumed gas: 2097.353 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -103,7 +103,7 @@ This sequence of operations was run: Injected block at minimal timestamp { 0xaa ; 0xbb ; 0xcc } Node is bootstrapped. -Estimated gas: 1206.757 units (will add 100 for safety) +Estimated gas: 1206.792 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 '[BLOCK_HASH]' @@ -130,7 +130,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: 1206.757 + Consumed gas: 1206.792 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out index 9d56f4eec394..6a65b180b261 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out @@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as split_string. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2097.362 units (will add 100 for safety) +Estimated gas: 2097.397 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 '[BLOCK_HASH]' @@ -95,7 +95,7 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 2097.362 + Consumed gas: 2097.397 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -103,7 +103,7 @@ This sequence of operations was run: Injected block at minimal timestamp { "a" ; "b" ; "c" } Node is bootstrapped. -Estimated gas: 1206.801 units (will add 100 for safety) +Estimated gas: 1206.836 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 '[BLOCK_HASH]' @@ -130,7 +130,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: 1206.801 + Consumed gas: 1206.836 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out index 7f2aba68a708..342b96840812 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out @@ -112,7 +112,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as store_input. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2049.248 units (will add 100 for safety) +Estimated gas: 2049.283 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 '[BLOCK_HASH]' @@ -139,7 +139,7 @@ This sequence of operations was run: Updated storage: "abcdefg" Storage size: 48 bytes Paid storage size diff: 7 bytes - Consumed gas: 2049.248 + Consumed gas: 2049.283 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00175 storage fees ........................... +ꜩ0.00175 @@ -150,7 +150,7 @@ Injected block at minimal timestamp 200 ꜩ "abcdefg" Node is bootstrapped. -Estimated gas: 1202.528 units (will add 100 for safety) +Estimated gas: 1202.563 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -176,7 +176,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: "xyz" Storage size: 44 bytes - Consumed gas: 1202.528 + Consumed gas: 1202.563 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out index 8645b9b14045..cd57e8bd9c15 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out @@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as transfer_amount. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 2049.528 units (will add 100 for safety) +Estimated gas: 2049.563 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 '[BLOCK_HASH]' @@ -72,7 +72,7 @@ This sequence of operations was run: Updated storage: 500000000 Storage size: 44 bytes Paid storage size diff: 4 bytes - Consumed gas: 2049.528 + Consumed gas: 2049.563 Balance updates: [CONTRACT_HASH] ... -ꜩ0.001 storage fees ........................... +ꜩ0.001 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out index c47144b1f0b3..f814cbf0fa36 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out @@ -143,7 +143,7 @@ Injected block at minimal timestamp [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 5177.026 units (will add 100 for safety) +Estimated gas: 5177.131 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -169,7 +169,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 3128.352 + Consumed gas: 3128.422 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -181,7 +181,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 2048.674 + Consumed gas: 2048.709 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -191,7 +191,7 @@ Injected block at minimal timestamp [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 4323.909 units (will add 100 for safety) +Estimated gas: 4324.014 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -204,7 +204,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.00074 Expected counter: [EXPECTED_COUNTER] - Gas limit: 4424 + Gas limit: 4425 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.00074 @@ -217,7 +217,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 2275.235 + Consumed gas: 2275.305 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -229,7 +229,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 2048.674 + Consumed gas: 2048.709 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" index 8e53e14d2911..654ddd7884db 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" @@ -8,28 +8,28 @@ big_map diff New map(4) of type (big_map string nat) Set map(4)["hello"] to 4 trace - - location: 13 (remaining gas: 1039989.246 units remaining) + - location: 13 (remaining gas: 1039989.211 units remaining) [ (Pair "hello" (Some 4) {}) ] - - location: 13 (remaining gas: 1039989.236 units remaining) + - location: 13 (remaining gas: 1039989.201 units remaining) [ "hello" (Pair (Some 4) {}) ] - - location: 14 (remaining gas: 1039989.221 units remaining) + - location: 14 (remaining gas: 1039989.186 units remaining) [ (Pair (Some 4) {}) ] - - location: 16 (remaining gas: 1039989.211 units remaining) + - location: 16 (remaining gas: 1039989.176 units remaining) [ (Some 4) {} ] - - location: 14 (remaining gas: 1039989.181 units remaining) + - location: 14 (remaining gas: 1039989.146 units remaining) [ "hello" (Some 4) {} ] - - location: 17 (remaining gas: 1039988.109 units remaining) + - location: 17 (remaining gas: 1039988.074 units remaining) [ None { Elt "hello" 4 } ] - - location: 18 (remaining gas: 1039988.094 units remaining) + - location: 18 (remaining gas: 1039988.059 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 19 (remaining gas: 1039988.079 units remaining) + - location: 19 (remaining gas: 1039988.044 units remaining) [ {} (Pair None { Elt "hello" 4 }) ] - - location: 21 (remaining gas: 1039988.064 units remaining) + - location: 21 (remaining gas: 1039988.029 units remaining) [ (Pair {} None { Elt "hello" 4 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" index c25cd2b11aad..88e2b97a2b38 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" @@ -8,28 +8,28 @@ big_map diff New map(4) of type (big_map string nat) Set map(4)["hello"] to 5 trace - - location: 13 (remaining gas: 1039987.916 units remaining) + - location: 13 (remaining gas: 1039987.881 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039987.906 units remaining) + - location: 13 (remaining gas: 1039987.871 units remaining) [ "hello" (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039987.891 units remaining) + - location: 14 (remaining gas: 1039987.856 units remaining) [ (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039987.881 units remaining) + - location: 16 (remaining gas: 1039987.846 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.851 units remaining) + - location: 14 (remaining gas: 1039987.816 units remaining) [ "hello" (Some 5) { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039986.774 units remaining) + - location: 17 (remaining gas: 1039986.739 units remaining) [ (Some 4) { Elt "hello" 5 } ] - - location: 18 (remaining gas: 1039986.759 units remaining) + - location: 18 (remaining gas: 1039986.724 units remaining) [ (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 19 (remaining gas: 1039986.744 units remaining) + - location: 19 (remaining gas: 1039986.709 units remaining) [ {} (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 21 (remaining gas: 1039986.729 units remaining) + - location: 21 (remaining gas: 1039986.694 units remaining) [ (Pair {} (Some 4) { Elt "hello" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" index 05d15f7ae6c6..713612b9f205 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" @@ -9,28 +9,28 @@ big_map diff Set map(4)["hello"] to 4 Set map(4)["hi"] to 5 trace - - location: 13 (remaining gas: 1039987.946 units remaining) + - location: 13 (remaining gas: 1039987.911 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039987.936 units remaining) + - location: 13 (remaining gas: 1039987.901 units remaining) [ "hi" (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039987.921 units remaining) + - location: 14 (remaining gas: 1039987.886 units remaining) [ (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039987.911 units remaining) + - location: 16 (remaining gas: 1039987.876 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.881 units remaining) + - location: 14 (remaining gas: 1039987.846 units remaining) [ "hi" (Some 5) { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039986.906 units remaining) + - location: 17 (remaining gas: 1039986.871 units remaining) [ None { Elt "hello" 4 ; Elt "hi" 5 } ] - - location: 18 (remaining gas: 1039986.891 units remaining) + - location: 18 (remaining gas: 1039986.856 units remaining) [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 19 (remaining gas: 1039986.876 units remaining) + - location: 19 (remaining gas: 1039986.841 units remaining) [ {} (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 21 (remaining gas: 1039986.861 units remaining) + - location: 21 (remaining gas: 1039986.826 units remaining) [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" index 6279c52fd8d7..913ded5119e9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" @@ -9,28 +9,28 @@ big_map diff Set map(4)["2"] to 2 Unset map(4)["1"] trace - - location: 13 (remaining gas: 1039987.042 units remaining) + - location: 13 (remaining gas: 1039987.007 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039987.032 units remaining) + - location: 13 (remaining gas: 1039986.997 units remaining) [ "1" (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 14 (remaining gas: 1039987.017 units remaining) + - location: 14 (remaining gas: 1039986.982 units remaining) [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 16 (remaining gas: 1039987.007 units remaining) + - location: 16 (remaining gas: 1039986.972 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039986.977 units remaining) + - location: 14 (remaining gas: 1039986.942 units remaining) [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039986.033 units remaining) + - location: 17 (remaining gas: 1039985.998 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039986.018 units remaining) + - location: 18 (remaining gas: 1039985.983 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039986.003 units remaining) + - location: 19 (remaining gas: 1039985.968 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039985.988 units remaining) + - location: 21 (remaining gas: 1039985.953 units remaining) [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" index 17bb59cb626c..2accf230a27c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" @@ -9,28 +9,28 @@ big_map diff Set map(4)["2"] to 2 Unset map(4)["1"] trace - - location: 13 (remaining gas: 1039987.042 units remaining) + - location: 13 (remaining gas: 1039987.007 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039987.032 units remaining) + - location: 13 (remaining gas: 1039986.997 units remaining) [ "1" (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 14 (remaining gas: 1039987.017 units remaining) + - location: 14 (remaining gas: 1039986.982 units remaining) [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 16 (remaining gas: 1039987.007 units remaining) + - location: 16 (remaining gas: 1039986.972 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039986.977 units remaining) + - location: 14 (remaining gas: 1039986.942 units remaining) [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039986.033 units remaining) + - location: 17 (remaining gas: 1039985.998 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039986.018 units remaining) + - location: 18 (remaining gas: 1039985.983 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039986.003 units remaining) + - location: 19 (remaining gas: 1039985.968 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039985.988 units remaining) + - location: 21 (remaining gas: 1039985.953 units remaining) [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" index 33d5479c3ae6..36b758a15804 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" @@ -8,28 +8,28 @@ big_map diff New map(4) of type (big_map string nat) Unset map(4)["hello"] trace - - location: 13 (remaining gas: 1039988.016 units remaining) + - location: 13 (remaining gas: 1039987.981 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039988.006 units remaining) + - location: 13 (remaining gas: 1039987.971 units remaining) [ "hello" (Pair None { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039987.991 units remaining) + - location: 14 (remaining gas: 1039987.956 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039987.981 units remaining) + - location: 16 (remaining gas: 1039987.946 units remaining) [ None { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.951 units remaining) + - location: 14 (remaining gas: 1039987.916 units remaining) [ "hello" None { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039986.874 units remaining) + - location: 17 (remaining gas: 1039986.839 units remaining) [ (Some 4) {} ] - - location: 18 (remaining gas: 1039986.859 units remaining) + - location: 18 (remaining gas: 1039986.824 units remaining) [ (Pair (Some 4) {}) ] - - location: 19 (remaining gas: 1039986.844 units remaining) + - location: 19 (remaining gas: 1039986.809 units remaining) [ {} (Pair (Some 4) {}) ] - - location: 21 (remaining gas: 1039986.829 units remaining) + - location: 21 (remaining gas: 1039986.794 units remaining) [ (Pair {} (Some 4) {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" index 9cd26e035a08..9b50beb4545e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" @@ -8,28 +8,28 @@ big_map diff New map(4) of type (big_map string nat) Unset map(4)["hello"] trace - - location: 13 (remaining gas: 1039989.346 units remaining) + - location: 13 (remaining gas: 1039989.311 units remaining) [ (Pair "hello" None {}) ] - - location: 13 (remaining gas: 1039989.336 units remaining) + - location: 13 (remaining gas: 1039989.301 units remaining) [ "hello" (Pair None {}) ] - - location: 14 (remaining gas: 1039989.321 units remaining) + - location: 14 (remaining gas: 1039989.286 units remaining) [ (Pair None {}) ] - - location: 16 (remaining gas: 1039989.311 units remaining) + - location: 16 (remaining gas: 1039989.276 units remaining) [ None {} ] - - location: 14 (remaining gas: 1039989.281 units remaining) + - location: 14 (remaining gas: 1039989.246 units remaining) [ "hello" None {} ] - - location: 17 (remaining gas: 1039988.209 units remaining) + - location: 17 (remaining gas: 1039988.174 units remaining) [ None {} ] - - location: 18 (remaining gas: 1039988.194 units remaining) + - location: 18 (remaining gas: 1039988.159 units remaining) [ (Pair None {}) ] - - location: 19 (remaining gas: 1039988.179 units remaining) + - location: 19 (remaining gas: 1039988.144 units remaining) [ {} (Pair None {}) ] - - location: 21 (remaining gas: 1039988.164 units remaining) + - location: 21 (remaining gas: 1039988.129 units remaining) [ (Pair {} None {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" index 337147c0dc53..e4c9221c2cf9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" @@ -9,38 +9,38 @@ big_map diff Set map(4)["2"] to "two" Set map(4)["1"] to "one" trace - - location: 12 (remaining gas: 1039983.953 units remaining) + - location: 12 (remaining gas: 1039983.918 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 12 (remaining gas: 1039983.943 units remaining) + - location: 12 (remaining gas: 1039983.908 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 13 (remaining gas: 1039983.933 units remaining) + - location: 13 (remaining gas: 1039983.898 units remaining) [ "1" (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 14 (remaining gas: 1039983.918 units remaining) + - location: 14 (remaining gas: 1039983.883 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 17 (remaining gas: 1039983.908 units remaining) + - location: 17 (remaining gas: 1039983.873 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 18 (remaining gas: 1039983.898 units remaining) + - location: 18 (remaining gas: 1039983.863 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: 19 (remaining gas: 1039983.888 units remaining) + - location: 19 (remaining gas: 1039983.853 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 14 (remaining gas: 1039983.858 units remaining) + - location: 14 (remaining gas: 1039983.823 units remaining) [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 20 (remaining gas: 1039982.948 units remaining) + - location: 20 (remaining gas: 1039982.913 units remaining) [ (Some "one") { Elt "1" "one" ; Elt "2" "two" } ] - - location: 21 (remaining gas: 1039982.938 units remaining) + - location: 21 (remaining gas: 1039982.903 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } (Some "one") ] - - location: 22 (remaining gas: 1039982.923 units remaining) + - location: 22 (remaining gas: 1039982.888 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - - location: 23 (remaining gas: 1039982.908 units remaining) + - location: 23 (remaining gas: 1039982.873 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - - location: 25 (remaining gas: 1039982.893 units remaining) + - location: 25 (remaining gas: 1039982.858 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" index ffff5e29c90f..bc3b211a17b4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" @@ -8,38 +8,38 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["hello"] to "hi" trace - - location: 12 (remaining gas: 1039985.031 units remaining) + - location: 12 (remaining gas: 1039984.996 units remaining) [ (Pair "" { Elt "hello" "hi" } None) ] - - location: 12 (remaining gas: 1039985.021 units remaining) + - location: 12 (remaining gas: 1039984.986 units remaining) [ (Pair "" { Elt "hello" "hi" } None) (Pair "" { Elt "hello" "hi" } None) ] - - location: 13 (remaining gas: 1039985.011 units remaining) + - location: 13 (remaining gas: 1039984.976 units remaining) [ "" (Pair "" { Elt "hello" "hi" } None) ] - - location: 14 (remaining gas: 1039984.996 units remaining) + - location: 14 (remaining gas: 1039984.961 units remaining) [ (Pair "" { Elt "hello" "hi" } None) ] - - location: 17 (remaining gas: 1039984.986 units remaining) + - location: 17 (remaining gas: 1039984.951 units remaining) [ (Pair { Elt "hello" "hi" } None) ] - - location: 18 (remaining gas: 1039984.976 units remaining) + - location: 18 (remaining gas: 1039984.941 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039984.966 units remaining) + - location: 19 (remaining gas: 1039984.931 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039984.936 units remaining) + - location: 14 (remaining gas: 1039984.901 units remaining) [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039984.061 units remaining) + - location: 20 (remaining gas: 1039984.026 units remaining) [ None { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039984.051 units remaining) + - location: 21 (remaining gas: 1039984.016 units remaining) [ { Elt "hello" "hi" } None ] - - location: 22 (remaining gas: 1039984.036 units remaining) + - location: 22 (remaining gas: 1039984.001 units remaining) [ (Pair { Elt "hello" "hi" } None) ] - - location: 23 (remaining gas: 1039984.021 units remaining) + - location: 23 (remaining gas: 1039983.986 units remaining) [ {} (Pair { Elt "hello" "hi" } None) ] - - location: 25 (remaining gas: 1039984.006 units remaining) + - location: 25 (remaining gas: 1039983.971 units remaining) [ (Pair {} { Elt "hello" "hi" } None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" index 072de163ff15..dbe7153b136b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" @@ -8,38 +8,38 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["hello"] to "hi" trace - - location: 12 (remaining gas: 1039984.981 units remaining) + - location: 12 (remaining gas: 1039984.946 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 12 (remaining gas: 1039984.971 units remaining) + - location: 12 (remaining gas: 1039984.936 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 13 (remaining gas: 1039984.961 units remaining) + - location: 13 (remaining gas: 1039984.926 units remaining) [ "hello" (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 14 (remaining gas: 1039984.946 units remaining) + - location: 14 (remaining gas: 1039984.911 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 17 (remaining gas: 1039984.936 units remaining) + - location: 17 (remaining gas: 1039984.901 units remaining) [ (Pair { Elt "hello" "hi" } None) ] - - location: 18 (remaining gas: 1039984.926 units remaining) + - location: 18 (remaining gas: 1039984.891 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039984.916 units remaining) + - location: 19 (remaining gas: 1039984.881 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039984.886 units remaining) + - location: 14 (remaining gas: 1039984.851 units remaining) [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039983.840 units remaining) + - location: 20 (remaining gas: 1039983.805 units remaining) [ (Some "hi") { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039983.830 units remaining) + - location: 21 (remaining gas: 1039983.795 units remaining) [ { Elt "hello" "hi" } (Some "hi") ] - - location: 22 (remaining gas: 1039983.815 units remaining) + - location: 22 (remaining gas: 1039983.780 units remaining) [ (Pair { Elt "hello" "hi" } (Some "hi")) ] - - location: 23 (remaining gas: 1039983.800 units remaining) + - location: 23 (remaining gas: 1039983.765 units remaining) [ {} (Pair { Elt "hello" "hi" } (Some "hi")) ] - - location: 25 (remaining gas: 1039983.785 units remaining) + - location: 25 (remaining gas: 1039983.750 units remaining) [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" index 15079a7ea75f..f8bd33517d9b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" @@ -9,28 +9,28 @@ big_map diff Set map(4)["2"] to "two" Set map(4)["1"] to "one" trace - - location: 15 (remaining gas: 1039984.639 units remaining) + - location: 15 (remaining gas: 1039984.604 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.629 units remaining) + - location: 15 (remaining gas: 1039984.594 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.614 units remaining) + - location: 16 (remaining gas: 1039984.579 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.604 units remaining) + - location: 18 (remaining gas: 1039984.569 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.574 units remaining) + - location: 16 (remaining gas: 1039984.539 units remaining) [ {} { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.574 units remaining) + - location: 19 (remaining gas: 1039984.539 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 23 (remaining gas: 1039984.559 units remaining) + - location: 23 (remaining gas: 1039984.524 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039984.544 units remaining) + - location: 24 (remaining gas: 1039984.509 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039984.529 units remaining) + - location: 26 (remaining gas: 1039984.494 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" index 831cd03c4a33..783fc1c3344b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" @@ -9,40 +9,40 @@ big_map diff Set map(4)["2"] to "two" Set map(4)["1"] to "two" trace - - location: 15 (remaining gas: 1039984.121 units remaining) + - location: 15 (remaining gas: 1039984.086 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.111 units remaining) + - location: 15 (remaining gas: 1039984.076 units remaining) [ { Elt "1" (Some "two") } (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.096 units remaining) + - location: 16 (remaining gas: 1039984.061 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.086 units remaining) + - location: 18 (remaining gas: 1039984.051 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.056 units remaining) + - location: 16 (remaining gas: 1039984.021 units remaining) [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.056 units remaining) + - location: 19 (remaining gas: 1039984.021 units remaining) [ (Pair "1" (Some "two")) { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 21 (remaining gas: 1039984.046 units remaining) + - location: 21 (remaining gas: 1039984.011 units remaining) [ "1" (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.111 units remaining) + - location: 22 (remaining gas: 1039983.076 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.096 units remaining) + - location: 19 (remaining gas: 1039983.061 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 23 (remaining gas: 1039983.081 units remaining) + - location: 23 (remaining gas: 1039983.046 units remaining) [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.066 units remaining) + - location: 24 (remaining gas: 1039983.031 units remaining) [ {} (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039983.051 units remaining) + - location: 26 (remaining gas: 1039983.016 units remaining) [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" index 3dc184666ad2..fcccc689f1e4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" @@ -9,40 +9,40 @@ big_map diff Set map(4)["2"] to "two" Set map(4)["1"] to "two" trace - - location: 15 (remaining gas: 1039984.121 units remaining) + - location: 15 (remaining gas: 1039984.086 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.111 units remaining) + - location: 15 (remaining gas: 1039984.076 units remaining) [ { Elt "1" (Some "two") } (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.096 units remaining) + - location: 16 (remaining gas: 1039984.061 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.086 units remaining) + - location: 18 (remaining gas: 1039984.051 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.056 units remaining) + - location: 16 (remaining gas: 1039984.021 units remaining) [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.056 units remaining) + - location: 19 (remaining gas: 1039984.021 units remaining) [ (Pair "1" (Some "two")) { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 21 (remaining gas: 1039984.046 units remaining) + - location: 21 (remaining gas: 1039984.011 units remaining) [ "1" (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.111 units remaining) + - location: 22 (remaining gas: 1039983.076 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.096 units remaining) + - location: 19 (remaining gas: 1039983.061 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 23 (remaining gas: 1039983.081 units remaining) + - location: 23 (remaining gas: 1039983.046 units remaining) [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.066 units remaining) + - location: 24 (remaining gas: 1039983.031 units remaining) [ {} (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039983.051 units remaining) + - location: 26 (remaining gas: 1039983.016 units remaining) [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" index 809729f5eae0..a1810a3cb675 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" @@ -10,40 +10,40 @@ big_map diff Set map(4)["3"] to "three" Set map(4)["1"] to "one" trace - - location: 15 (remaining gas: 1039984.101 units remaining) + - location: 15 (remaining gas: 1039984.066 units remaining) [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.091 units remaining) + - location: 15 (remaining gas: 1039984.056 units remaining) [ { Elt "3" (Some "three") } (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.076 units remaining) + - location: 16 (remaining gas: 1039984.041 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.066 units remaining) + - location: 18 (remaining gas: 1039984.031 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.036 units remaining) + - location: 16 (remaining gas: 1039984.001 units remaining) [ { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.036 units remaining) + - location: 19 (remaining gas: 1039984.001 units remaining) [ (Pair "3" (Some "three")) { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 21 (remaining gas: 1039984.026 units remaining) + - location: 21 (remaining gas: 1039983.991 units remaining) [ "3" (Some "three") { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.091 units remaining) + - location: 22 (remaining gas: 1039983.056 units remaining) [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit ] - - location: 19 (remaining gas: 1039983.076 units remaining) + - location: 19 (remaining gas: 1039983.041 units remaining) [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit ] - - location: 23 (remaining gas: 1039983.061 units remaining) + - location: 23 (remaining gas: 1039983.026 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - - location: 24 (remaining gas: 1039983.046 units remaining) + - location: 24 (remaining gas: 1039983.011 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - - location: 26 (remaining gas: 1039983.031 units remaining) + - location: 26 (remaining gas: 1039982.996 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" index 840edbe77d7a..ce75f55d5e42 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" @@ -10,40 +10,40 @@ big_map diff Unset map(4)["3"] Set map(4)["1"] to "one" trace - - location: 15 (remaining gas: 1039984.265 units remaining) + - location: 15 (remaining gas: 1039984.230 units remaining) [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.255 units remaining) + - location: 15 (remaining gas: 1039984.220 units remaining) [ { Elt "3" None } (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.240 units remaining) + - location: 16 (remaining gas: 1039984.205 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.230 units remaining) + - location: 18 (remaining gas: 1039984.195 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.200 units remaining) + - location: 16 (remaining gas: 1039984.165 units remaining) [ { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.200 units remaining) + - location: 19 (remaining gas: 1039984.165 units remaining) [ (Pair "3" None) { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 21 (remaining gas: 1039984.190 units remaining) + - location: 21 (remaining gas: 1039984.155 units remaining) [ "3" None { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.255 units remaining) + - location: 22 (remaining gas: 1039983.220 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.240 units remaining) + - location: 19 (remaining gas: 1039983.205 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 23 (remaining gas: 1039983.225 units remaining) + - location: 23 (remaining gas: 1039983.190 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.210 units remaining) + - location: 24 (remaining gas: 1039983.175 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039983.195 units remaining) + - location: 26 (remaining gas: 1039983.160 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" index 7ef65e62a328..b8979fc85e20 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" @@ -9,40 +9,40 @@ big_map diff Unset map(4)["2"] Set map(4)["1"] to "one" trace - - location: 15 (remaining gas: 1039984.265 units remaining) + - location: 15 (remaining gas: 1039984.230 units remaining) [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.255 units remaining) + - location: 15 (remaining gas: 1039984.220 units remaining) [ { Elt "2" None } (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 16 (remaining gas: 1039984.240 units remaining) + - location: 16 (remaining gas: 1039984.205 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 18 (remaining gas: 1039984.230 units remaining) + - location: 18 (remaining gas: 1039984.195 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 16 (remaining gas: 1039984.200 units remaining) + - location: 16 (remaining gas: 1039984.165 units remaining) [ { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039984.200 units remaining) + - location: 19 (remaining gas: 1039984.165 units remaining) [ (Pair "2" None) { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 21 (remaining gas: 1039984.190 units remaining) + - location: 21 (remaining gas: 1039984.155 units remaining) [ "2" None { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.255 units remaining) + - location: 22 (remaining gas: 1039983.220 units remaining) [ { Elt "1" "one" } Unit ] - - location: 19 (remaining gas: 1039983.240 units remaining) + - location: 19 (remaining gas: 1039983.205 units remaining) [ { Elt "1" "one" } Unit ] - - location: 23 (remaining gas: 1039983.225 units remaining) + - location: 23 (remaining gas: 1039983.190 units remaining) [ (Pair { Elt "1" "one" } Unit) ] - - location: 24 (remaining gas: 1039983.210 units remaining) + - location: 24 (remaining gas: 1039983.175 units remaining) [ {} (Pair { Elt "1" "one" } Unit) ] - - location: 26 (remaining gas: 1039983.195 units remaining) + - location: 26 (remaining gas: 1039983.160 units remaining) [ (Pair {} { Elt "1" "one" } Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out index ddd26b5b18aa..697460515008 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 500000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 500000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 500000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out index c7f286bb44c4..27140ef7d89a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 0 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 0 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out index a1ed7938b6e1..c185e193dfc9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 1000000000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 1000000000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 1000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out index e27ed8107fed..e1f60bcfde4f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 1000000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 1000000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 1000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out index f7e51d2d2d9c..57fcf5fbe14a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 1 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out index ee4e1500051e..cf6f6cca6d77 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 5000000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 5000000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 5000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out index fb69d27649c8..b3e3ca045f4b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 8000000000000000000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 8000000000000000000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 8000000000000000000) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" index b9c96dabc1dd..230bb88d09f8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" @@ -11,80 +11,80 @@ big_map diff Set map(4)["3"] to "three" Set map(4)["1"] to "one" trace - - location: 43 (remaining gas: 1039916.243 units remaining) + - location: 43 (remaining gas: 1039916.208 units remaining) [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.233 units remaining) + - location: 43 (remaining gas: 1039916.198 units remaining) [ (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.223 units remaining) + - location: 44 (remaining gas: 1039916.188 units remaining) [ (Right (Right (Left { Pair "3" "three" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.213 units remaining) + - location: 60 (remaining gas: 1039916.178 units remaining) [ (Right (Left { Pair "3" "three" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039916.203 units remaining) + - location: 65 (remaining gas: 1039916.168 units remaining) [ (Left { Pair "3" "three" }) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039916.193 units remaining) + - location: 108 (remaining gas: 1039916.158 units remaining) [ { Pair "3" "three" } (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 110 (remaining gas: 1039916.178 units remaining) + - location: 110 (remaining gas: 1039916.143 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 113 (remaining gas: 1039916.168 units remaining) + - location: 113 (remaining gas: 1039916.133 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 113 (remaining gas: 1039916.153 units remaining) + - location: 113 (remaining gas: 1039916.118 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 119 (remaining gas: 1039916.143 units remaining) + - location: 119 (remaining gas: 1039916.108 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 110 (remaining gas: 1039916.113 units remaining) + - location: 110 (remaining gas: 1039916.078 units remaining) [ { Pair "3" "three" } { Elt "1" "one" } { Elt "2" "two" } ] - - location: 120 (remaining gas: 1039916.113 units remaining) + - location: 120 (remaining gas: 1039916.078 units remaining) [ (Pair "3" "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 122 (remaining gas: 1039916.103 units remaining) + - location: 122 (remaining gas: 1039916.068 units remaining) [ "3" "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 123 (remaining gas: 1039916.088 units remaining) + - location: 123 (remaining gas: 1039916.053 units remaining) [ "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 125 (remaining gas: 1039916.073 units remaining) + - location: 125 (remaining gas: 1039916.038 units remaining) [ (Some "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 123 (remaining gas: 1039916.043 units remaining) + - location: 123 (remaining gas: 1039916.008 units remaining) [ "3" (Some "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 126 (remaining gas: 1039915.111 units remaining) + - location: 126 (remaining gas: 1039915.076 units remaining) [ { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" } ] - - location: 120 (remaining gas: 1039915.096 units remaining) + - location: 120 (remaining gas: 1039915.061 units remaining) [ { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" } ] - - location: 127 (remaining gas: 1039915.081 units remaining) + - location: 127 (remaining gas: 1039915.046 units remaining) [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ] - - location: 128 (remaining gas: 1039915.066 units remaining) + - location: 128 (remaining gas: 1039915.031 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039915.051 units remaining) + - location: 108 (remaining gas: 1039915.016 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039915.036 units remaining) + - location: 65 (remaining gas: 1039915.001 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039915.021 units remaining) + - location: 60 (remaining gas: 1039914.986 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039915.006 units remaining) + - location: 44 (remaining gas: 1039914.971 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039914.991 units remaining) + - location: 151 (remaining gas: 1039914.956 units remaining) [ {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039914.976 units remaining) + - location: 153 (remaining gas: 1039914.941 units remaining) [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" index b047481e0954..b963a5de909b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" @@ -10,35 +10,35 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["2"] to "two" trace - - location: 43 (remaining gas: 1039917.151 units remaining) + - location: 43 (remaining gas: 1039917.116 units remaining) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039917.141 units remaining) + - location: 43 (remaining gas: 1039917.106 units remaining) [ (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039917.131 units remaining) + - location: 44 (remaining gas: 1039917.096 units remaining) [ Unit (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 46 (remaining gas: 1039917.121 units remaining) + - location: 46 (remaining gas: 1039917.086 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 48 (remaining gas: 1039917.111 units remaining) + - location: 48 (remaining gas: 1039917.076 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 48 (remaining gas: 1039917.096 units remaining) + - location: 48 (remaining gas: 1039917.061 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 54 (remaining gas: 1039917.086 units remaining) + - location: 54 (remaining gas: 1039917.051 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 55 (remaining gas: 1039917.076 units remaining) + - location: 55 (remaining gas: 1039917.041 units remaining) [ { Elt "2" "two" } { Elt "1" "one" } ] - - location: 56 (remaining gas: 1039917.061 units remaining) + - location: 56 (remaining gas: 1039917.026 units remaining) [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ] - - location: 57 (remaining gas: 1039917.046 units remaining) + - location: 57 (remaining gas: 1039917.011 units remaining) [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 44 (remaining gas: 1039917.031 units remaining) + - location: 44 (remaining gas: 1039916.996 units remaining) [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 151 (remaining gas: 1039917.016 units remaining) + - location: 151 (remaining gas: 1039916.981 units remaining) [ {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 153 (remaining gas: 1039917.001 units remaining) + - location: 153 (remaining gas: 1039916.966 units remaining) [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" index 1bca3d9352dd..96d8412d742c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" @@ -10,30 +10,30 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["3"] to "three" trace - - location: 43 (remaining gas: 1039913.447 units remaining) + - location: 43 (remaining gas: 1039913.412 units remaining) [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039913.437 units remaining) + - location: 43 (remaining gas: 1039913.402 units remaining) [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039913.427 units remaining) + - location: 44 (remaining gas: 1039913.392 units remaining) [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039913.417 units remaining) + - location: 60 (remaining gas: 1039913.382 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 62 (remaining gas: 1039913.407 units remaining) + - location: 62 (remaining gas: 1039913.372 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 63 (remaining gas: 1039913.397 units remaining) + - location: 63 (remaining gas: 1039913.362 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 60 (remaining gas: 1039913.382 units remaining) + - location: 60 (remaining gas: 1039913.347 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 44 (remaining gas: 1039913.367 units remaining) + - location: 44 (remaining gas: 1039913.332 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 151 (remaining gas: 1039913.352 units remaining) + - location: 151 (remaining gas: 1039913.317 units remaining) [ {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 153 (remaining gas: 1039913.337 units remaining) + - location: 153 (remaining gas: 1039913.302 units remaining) [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" index 71807603c0db..b48465826e72 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 43 (remaining gas: 1039916.511 units remaining) + - location: 43 (remaining gas: 1039916.476 units remaining) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.501 units remaining) + - location: 43 (remaining gas: 1039916.466 units remaining) [ (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.491 units remaining) + - location: 44 (remaining gas: 1039916.456 units remaining) [ (Left (Right Unit)) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.481 units remaining) + - location: 60 (remaining gas: 1039916.446 units remaining) [ (Right Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 62 (remaining gas: 1039916.471 units remaining) + - location: 62 (remaining gas: 1039916.436 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) (Right Unit) ] - - location: 63 (remaining gas: 1039916.461 units remaining) + - location: 63 (remaining gas: 1039916.426 units remaining) [ (Right Unit) ] - - location: 60 (remaining gas: 1039916.446 units remaining) + - location: 60 (remaining gas: 1039916.411 units remaining) [ (Right Unit) ] - - location: 44 (remaining gas: 1039916.431 units remaining) + - location: 44 (remaining gas: 1039916.396 units remaining) [ (Right Unit) ] - - location: 151 (remaining gas: 1039916.416 units remaining) + - location: 151 (remaining gas: 1039916.381 units remaining) [ {} (Right Unit) ] - - location: 153 (remaining gas: 1039916.401 units remaining) + - location: 153 (remaining gas: 1039916.366 units remaining) [ (Pair {} (Right Unit)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" index 001fcc066650..6511ee1f85fc 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" @@ -10,74 +10,74 @@ big_map diff New map(4) of type (big_map string string) Unset map(4)["1"] trace - - location: 43 (remaining gas: 1039916.507 units remaining) + - location: 43 (remaining gas: 1039916.472 units remaining) [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.497 units remaining) + - location: 43 (remaining gas: 1039916.462 units remaining) [ (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.487 units remaining) + - location: 44 (remaining gas: 1039916.452 units remaining) [ (Right (Right (Right { "1" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.477 units remaining) + - location: 60 (remaining gas: 1039916.442 units remaining) [ (Right (Right { "1" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039916.467 units remaining) + - location: 65 (remaining gas: 1039916.432 units remaining) [ (Right { "1" }) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039916.457 units remaining) + - location: 108 (remaining gas: 1039916.422 units remaining) [ { "1" } (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 131 (remaining gas: 1039916.442 units remaining) + - location: 131 (remaining gas: 1039916.407 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 134 (remaining gas: 1039916.432 units remaining) + - location: 134 (remaining gas: 1039916.397 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 134 (remaining gas: 1039916.417 units remaining) + - location: 134 (remaining gas: 1039916.382 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 140 (remaining gas: 1039916.407 units remaining) + - location: 140 (remaining gas: 1039916.372 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 131 (remaining gas: 1039916.377 units remaining) + - location: 131 (remaining gas: 1039916.342 units remaining) [ { "1" } { Elt "1" "one" } { Elt "2" "two" } ] - - location: 141 (remaining gas: 1039916.377 units remaining) + - location: 141 (remaining gas: 1039916.342 units remaining) [ "1" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 143 (remaining gas: 1039916.362 units remaining) + - location: 143 (remaining gas: 1039916.327 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 145 (remaining gas: 1039916.347 units remaining) + - location: 145 (remaining gas: 1039916.312 units remaining) [ None { Elt "1" "one" } { Elt "2" "two" } ] - - location: 143 (remaining gas: 1039916.317 units remaining) + - location: 143 (remaining gas: 1039916.282 units remaining) [ "1" None { Elt "1" "one" } { Elt "2" "two" } ] - - location: 147 (remaining gas: 1039915.385 units remaining) + - location: 147 (remaining gas: 1039915.350 units remaining) [ {} { Elt "2" "two" } ] - - location: 141 (remaining gas: 1039915.370 units remaining) + - location: 141 (remaining gas: 1039915.335 units remaining) [ {} { Elt "2" "two" } ] - - location: 148 (remaining gas: 1039915.355 units remaining) + - location: 148 (remaining gas: 1039915.320 units remaining) [ (Pair {} { Elt "2" "two" }) ] - - location: 149 (remaining gas: 1039915.340 units remaining) + - location: 149 (remaining gas: 1039915.305 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039915.325 units remaining) + - location: 108 (remaining gas: 1039915.290 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039915.310 units remaining) + - location: 65 (remaining gas: 1039915.275 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039915.295 units remaining) + - location: 60 (remaining gas: 1039915.260 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039915.280 units remaining) + - location: 44 (remaining gas: 1039915.245 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039915.265 units remaining) + - location: 151 (remaining gas: 1039915.230 units remaining) [ {} (Left (Pair {} { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039915.250 units remaining) + - location: 153 (remaining gas: 1039915.215 units remaining) [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" index 7612c5ac1487..54b39b95fabf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" @@ -10,126 +10,126 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["foo"] to "bar" trace - - location: 43 (remaining gas: 1039918.789 units remaining) + - location: 43 (remaining gas: 1039918.754 units remaining) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - - location: 43 (remaining gas: 1039918.779 units remaining) + - location: 43 (remaining gas: 1039918.744 units remaining) [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit) ] - - location: 44 (remaining gas: 1039918.769 units remaining) + - location: 44 (remaining gas: 1039918.734 units remaining) [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) (Right Unit) ] - - location: 60 (remaining gas: 1039918.759 units remaining) + - location: 60 (remaining gas: 1039918.724 units remaining) [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) (Right Unit) ] - - location: 65 (remaining gas: 1039918.749 units remaining) + - location: 65 (remaining gas: 1039918.714 units remaining) [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) (Right Unit) ] - - location: 67 (remaining gas: 1039918.734 units remaining) + - location: 67 (remaining gas: 1039918.699 units remaining) [ (Right Unit) ] - - location: 70 (remaining gas: 1039918.724 units remaining) + - location: 70 (remaining gas: 1039918.689 units remaining) [ Unit ] - - location: 70 (remaining gas: 1039918.709 units remaining) + - location: 70 (remaining gas: 1039918.674 units remaining) [ Unit ] - - location: 76 (remaining gas: 1039918.699 units remaining) + - location: 76 (remaining gas: 1039918.664 units remaining) [ ] - - location: 67 (remaining gas: 1039918.669 units remaining) + - location: 67 (remaining gas: 1039918.634 units remaining) [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] - - location: 77 (remaining gas: 1039918.659 units remaining) + - location: 77 (remaining gas: 1039918.624 units remaining) [ { Pair "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 78 (remaining gas: 1039918.644 units remaining) + - location: 78 (remaining gas: 1039918.609 units remaining) [ { Pair "gaz" "baz" } ] - - location: 80 (remaining gas: 1039918.629 units remaining) + - location: 80 (remaining gas: 1039918.594 units remaining) [ {} { Pair "gaz" "baz" } ] - - location: 78 (remaining gas: 1039918.599 units remaining) + - location: 78 (remaining gas: 1039918.564 units remaining) [ { Pair "foo" "bar" } {} { Pair "gaz" "baz" } ] - - location: 83 (remaining gas: 1039918.599 units remaining) + - location: 83 (remaining gas: 1039918.564 units remaining) [ (Pair "foo" "bar") {} { Pair "gaz" "baz" } ] - - location: 85 (remaining gas: 1039918.589 units remaining) + - location: 85 (remaining gas: 1039918.554 units remaining) [ "foo" "bar" {} { Pair "gaz" "baz" } ] - - location: 86 (remaining gas: 1039918.574 units remaining) + - location: 86 (remaining gas: 1039918.539 units remaining) [ "bar" {} { Pair "gaz" "baz" } ] - - location: 88 (remaining gas: 1039918.559 units remaining) + - location: 88 (remaining gas: 1039918.524 units remaining) [ (Some "bar") {} { Pair "gaz" "baz" } ] - - location: 86 (remaining gas: 1039918.529 units remaining) + - location: 86 (remaining gas: 1039918.494 units remaining) [ "foo" (Some "bar") {} { Pair "gaz" "baz" } ] - - location: 89 (remaining gas: 1039917.531 units remaining) + - location: 89 (remaining gas: 1039917.496 units remaining) [ { Elt "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 83 (remaining gas: 1039917.516 units remaining) + - location: 83 (remaining gas: 1039917.481 units remaining) [ { Elt "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 90 (remaining gas: 1039917.506 units remaining) + - location: 90 (remaining gas: 1039917.471 units remaining) [ { Pair "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 91 (remaining gas: 1039917.491 units remaining) + - location: 91 (remaining gas: 1039917.456 units remaining) [ { Elt "foo" "bar" } ] - - location: 93 (remaining gas: 1039917.476 units remaining) + - location: 93 (remaining gas: 1039917.441 units remaining) [ {} { Elt "foo" "bar" } ] - - location: 91 (remaining gas: 1039917.446 units remaining) + - location: 91 (remaining gas: 1039917.411 units remaining) [ { Pair "gaz" "baz" } {} { Elt "foo" "bar" } ] - - location: 96 (remaining gas: 1039917.446 units remaining) + - location: 96 (remaining gas: 1039917.411 units remaining) [ (Pair "gaz" "baz") {} { Elt "foo" "bar" } ] - - location: 98 (remaining gas: 1039917.436 units remaining) + - location: 98 (remaining gas: 1039917.401 units remaining) [ "gaz" "baz" {} { Elt "foo" "bar" } ] - - location: 99 (remaining gas: 1039917.421 units remaining) + - location: 99 (remaining gas: 1039917.386 units remaining) [ "baz" {} { Elt "foo" "bar" } ] - - location: 101 (remaining gas: 1039917.406 units remaining) + - location: 101 (remaining gas: 1039917.371 units remaining) [ (Some "baz") {} { Elt "foo" "bar" } ] - - location: 99 (remaining gas: 1039917.376 units remaining) + - location: 99 (remaining gas: 1039917.341 units remaining) [ "gaz" (Some "baz") {} { Elt "foo" "bar" } ] - - location: 102 (remaining gas: 1039916.378 units remaining) + - location: 102 (remaining gas: 1039916.343 units remaining) [ { Elt "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 96 (remaining gas: 1039916.363 units remaining) + - location: 96 (remaining gas: 1039916.328 units remaining) [ { Elt "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 103 (remaining gas: 1039916.353 units remaining) + - location: 103 (remaining gas: 1039916.318 units remaining) [ { Elt "foo" "bar" } { Elt "gaz" "baz" } ] - - location: 104 (remaining gas: 1039916.338 units remaining) + - location: 104 (remaining gas: 1039916.303 units remaining) [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ] - - location: 105 (remaining gas: 1039916.323 units remaining) + - location: 105 (remaining gas: 1039916.288 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 65 (remaining gas: 1039916.308 units remaining) + - location: 65 (remaining gas: 1039916.273 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 60 (remaining gas: 1039916.293 units remaining) + - location: 60 (remaining gas: 1039916.258 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 44 (remaining gas: 1039916.278 units remaining) + - location: 44 (remaining gas: 1039916.243 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 151 (remaining gas: 1039916.263 units remaining) + - location: 151 (remaining gas: 1039916.228 units remaining) [ {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 153 (remaining gas: 1039916.248 units remaining) + - location: 153 (remaining gas: 1039916.213 units remaining) [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out index 59df2ccab853..e08e6db7a436 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out @@ -8,18 +8,18 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039651.625 units remaining) + - location: 9 (remaining gas: 1039651.590 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 9 (remaining gas: 1039651.615 units remaining) + - location: 9 (remaining gas: 1039651.580 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 10 (remaining gas: 1039651.605 units remaining) + - location: 10 (remaining gas: 1039651.570 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @@ -29,20 +29,20 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 11 (remaining gas: 1039651.590 units remaining) + - location: 11 (remaining gas: 1039651.555 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 13 (remaining gas: 1039651.580 units remaining) + - location: 13 (remaining gas: 1039651.545 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 14 (remaining gas: 1039651.570 units remaining) + - location: 14 (remaining gas: 1039651.535 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -50,36 +50,36 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 15 (remaining gas: 1039651.560 units remaining) + - location: 15 (remaining gas: 1039651.525 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 16 (remaining gas: 1039651.545 units remaining) + - location: 16 (remaining gas: 1039651.510 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 18 (remaining gas: 1039651.535 units remaining) + - location: 18 (remaining gas: 1039651.500 units remaining) [ "hello" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 19 (remaining gas: 1039651.044 units remaining) + - location: 19 (remaining gas: 1039651.009 units remaining) [ 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 16 (remaining gas: 1039651.014 units remaining) + - location: 16 (remaining gas: 1039650.979 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 11 (remaining gas: 1039650.984 units remaining) + - location: 11 (remaining gas: 1039650.949 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @@ -88,34 +88,34 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 20 (remaining gas: 1039650.974 units remaining) + - location: 20 (remaining gas: 1039650.939 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 21 (remaining gas: 1039585.162 units remaining) + - location: 21 (remaining gas: 1039585.127 units remaining) [ True (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 22 (remaining gas: 1039585.152 units remaining) + - location: 22 (remaining gas: 1039585.117 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 22 (remaining gas: 1039585.137 units remaining) + - location: 22 (remaining gas: 1039585.102 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 28 (remaining gas: 1039585.127 units remaining) + - location: 28 (remaining gas: 1039585.092 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 29 (remaining gas: 1039585.112 units remaining) + - location: 29 (remaining gas: 1039585.077 units remaining) [ {} (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 31 (remaining gas: 1039585.097 units remaining) + - location: 31 (remaining gas: 1039585.062 units remaining) [ (Pair {} "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -136,18 +136,18 @@ At line 8 characters 14 to 18, script reached FAILWITH instruction with Unit trace - - location: 9 (remaining gas: 1039651.635 units remaining) + - location: 9 (remaining gas: 1039651.600 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 9 (remaining gas: 1039651.625 units remaining) + - location: 9 (remaining gas: 1039651.590 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 10 (remaining gas: 1039651.615 units remaining) + - location: 10 (remaining gas: 1039651.580 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @@ -157,20 +157,20 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 11 (remaining gas: 1039651.600 units remaining) + - location: 11 (remaining gas: 1039651.565 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 13 (remaining gas: 1039651.590 units remaining) + - location: 13 (remaining gas: 1039651.555 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 14 (remaining gas: 1039651.580 units remaining) + - location: 14 (remaining gas: 1039651.545 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -178,36 +178,36 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 15 (remaining gas: 1039651.570 units remaining) + - location: 15 (remaining gas: 1039651.535 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 16 (remaining gas: 1039651.555 units remaining) + - location: 16 (remaining gas: 1039651.520 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 18 (remaining gas: 1039651.545 units remaining) + - location: 18 (remaining gas: 1039651.510 units remaining) [ "abcd" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 19 (remaining gas: 1039651.087 units remaining) + - location: 19 (remaining gas: 1039651.052 units remaining) [ 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 16 (remaining gas: 1039651.057 units remaining) + - location: 16 (remaining gas: 1039651.022 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 11 (remaining gas: 1039651.027 units remaining) + - location: 11 (remaining gas: 1039650.992 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @@ -216,23 +216,23 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 20 (remaining gas: 1039651.017 units remaining) + - location: 20 (remaining gas: 1039650.982 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 21 (remaining gas: 1039585.206 units remaining) + - location: 21 (remaining gas: 1039585.171 units remaining) [ False (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 22 (remaining gas: 1039585.196 units remaining) + - location: 22 (remaining gas: 1039585.161 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 26 (remaining gas: 1039585.186 units remaining) + - location: 26 (remaining gas: 1039585.151 units remaining) [ Unit (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out index a558e24ed724..faec346a2472 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039988.319 units remaining) + - location: 7 (remaining gas: 1039988.284 units remaining) [ (Pair 0 Unit) ] - - location: 7 (remaining gas: 1039988.309 units remaining) + - location: 7 (remaining gas: 1039988.274 units remaining) [ 0 ] - - location: 8 (remaining gas: 1039988.299 units remaining) + - location: 8 (remaining gas: 1039988.264 units remaining) [ 0 0 ] - - location: 9 (remaining gas: 1039988.259 units remaining) + - location: 9 (remaining gas: 1039988.224 units remaining) [ 0 0 ] - - location: 10 (remaining gas: 1039988.234 units remaining) + - location: 10 (remaining gas: 1039988.199 units remaining) [ 0 0 ] - - location: 11 (remaining gas: 1039988.199 units remaining) + - location: 11 (remaining gas: 1039988.164 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039988.184 units remaining) + - location: 13 (remaining gas: 1039988.149 units remaining) [ True ] - - location: 14 (remaining gas: 1039988.174 units remaining) + - location: 14 (remaining gas: 1039988.139 units remaining) [ ] - - location: 14 (remaining gas: 1039988.159 units remaining) + - location: 14 (remaining gas: 1039988.124 units remaining) [ ] - - location: 20 (remaining gas: 1039988.149 units remaining) + - location: 20 (remaining gas: 1039988.114 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039988.134 units remaining) + - location: 21 (remaining gas: 1039988.099 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039988.119 units remaining) + - location: 23 (remaining gas: 1039988.084 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out index 84d2968d9bc7..5efadd48caf7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039988.319 units remaining) + - location: 7 (remaining gas: 1039988.284 units remaining) [ (Pair 12039123919239192312931 Unit) ] - - location: 7 (remaining gas: 1039988.309 units remaining) + - location: 7 (remaining gas: 1039988.274 units remaining) [ 12039123919239192312931 ] - - location: 8 (remaining gas: 1039988.299 units remaining) + - location: 8 (remaining gas: 1039988.264 units remaining) [ 12039123919239192312931 12039123919239192312931 ] - - location: 9 (remaining gas: 1039988.259 units remaining) + - location: 9 (remaining gas: 1039988.224 units remaining) [ -12039123919239192312931 12039123919239192312931 ] - - location: 10 (remaining gas: 1039988.234 units remaining) + - location: 10 (remaining gas: 1039988.199 units remaining) [ 12039123919239192312931 12039123919239192312931 ] - - location: 11 (remaining gas: 1039988.199 units remaining) + - location: 11 (remaining gas: 1039988.164 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039988.184 units remaining) + - location: 13 (remaining gas: 1039988.149 units remaining) [ True ] - - location: 14 (remaining gas: 1039988.174 units remaining) + - location: 14 (remaining gas: 1039988.139 units remaining) [ ] - - location: 14 (remaining gas: 1039988.159 units remaining) + - location: 14 (remaining gas: 1039988.124 units remaining) [ ] - - location: 20 (remaining gas: 1039988.149 units remaining) + - location: 20 (remaining gas: 1039988.114 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039988.134 units remaining) + - location: 21 (remaining gas: 1039988.099 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039988.119 units remaining) + - location: 23 (remaining gas: 1039988.084 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out index 0919fe3067b4..a555a1bb620a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039988.319 units remaining) + - location: 7 (remaining gas: 1039988.284 units remaining) [ (Pair 948 Unit) ] - - location: 7 (remaining gas: 1039988.309 units remaining) + - location: 7 (remaining gas: 1039988.274 units remaining) [ 948 ] - - location: 8 (remaining gas: 1039988.299 units remaining) + - location: 8 (remaining gas: 1039988.264 units remaining) [ 948 948 ] - - location: 9 (remaining gas: 1039988.259 units remaining) + - location: 9 (remaining gas: 1039988.224 units remaining) [ -948 948 ] - - location: 10 (remaining gas: 1039988.234 units remaining) + - location: 10 (remaining gas: 1039988.199 units remaining) [ 948 948 ] - - location: 11 (remaining gas: 1039988.199 units remaining) + - location: 11 (remaining gas: 1039988.164 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039988.184 units remaining) + - location: 13 (remaining gas: 1039988.149 units remaining) [ True ] - - location: 14 (remaining gas: 1039988.174 units remaining) + - location: 14 (remaining gas: 1039988.139 units remaining) [ ] - - location: 14 (remaining gas: 1039988.159 units remaining) + - location: 14 (remaining gas: 1039988.124 units remaining) [ ] - - location: 20 (remaining gas: 1039988.149 units remaining) + - location: 20 (remaining gas: 1039988.114 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039988.134 units remaining) + - location: 21 (remaining gas: 1039988.099 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039988.119 units remaining) + - location: 23 (remaining gas: 1039988.084 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out index a1ff07053236..8b8ab932f781 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out @@ -7,205 +7,205 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039925.003 units remaining) + - location: 7 (remaining gas: 1039924.968 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039924.993 units remaining) + - location: 7 (remaining gas: 1039924.958 units remaining) [ Unit ] - - location: 8 (remaining gas: 1039924.983 units remaining) + - location: 8 (remaining gas: 1039924.948 units remaining) [ 2 Unit ] - - location: 11 (remaining gas: 1039924.973 units remaining) + - location: 11 (remaining gas: 1039924.938 units remaining) [ 2 2 Unit ] - - location: 14 (remaining gas: 1039924.918 units remaining) + - location: 14 (remaining gas: 1039924.883 units remaining) [ 4 Unit ] - - location: 15 (remaining gas: 1039924.908 units remaining) + - location: 15 (remaining gas: 1039924.873 units remaining) [ 4 4 Unit ] - - location: 20 (remaining gas: 1039924.873 units remaining) + - location: 20 (remaining gas: 1039924.838 units remaining) [ 0 Unit ] - - location: 21 (remaining gas: 1039924.858 units remaining) + - location: 21 (remaining gas: 1039924.823 units remaining) [ True Unit ] - - location: 22 (remaining gas: 1039924.848 units remaining) + - location: 22 (remaining gas: 1039924.813 units remaining) [ Unit ] - - location: 22 (remaining gas: 1039924.833 units remaining) + - location: 22 (remaining gas: 1039924.798 units remaining) [ Unit ] - - location: 28 (remaining gas: 1039924.823 units remaining) + - location: 28 (remaining gas: 1039924.788 units remaining) [ 2 Unit ] - - location: 31 (remaining gas: 1039924.813 units remaining) + - location: 31 (remaining gas: 1039924.778 units remaining) [ 2 2 Unit ] - - location: 34 (remaining gas: 1039924.758 units remaining) + - location: 34 (remaining gas: 1039924.723 units remaining) [ 4 Unit ] - - location: 35 (remaining gas: 1039924.748 units remaining) + - location: 35 (remaining gas: 1039924.713 units remaining) [ 4 4 Unit ] - - location: 40 (remaining gas: 1039924.713 units remaining) + - location: 40 (remaining gas: 1039924.678 units remaining) [ 0 Unit ] - - location: 41 (remaining gas: 1039924.698 units remaining) + - location: 41 (remaining gas: 1039924.663 units remaining) [ True Unit ] - - location: 42 (remaining gas: 1039924.688 units remaining) + - location: 42 (remaining gas: 1039924.653 units remaining) [ Unit ] - - location: 42 (remaining gas: 1039924.673 units remaining) + - location: 42 (remaining gas: 1039924.638 units remaining) [ Unit ] - - location: 48 (remaining gas: 1039924.663 units remaining) + - location: 48 (remaining gas: 1039924.628 units remaining) [ 2 Unit ] - - location: 51 (remaining gas: 1039924.653 units remaining) + - location: 51 (remaining gas: 1039924.618 units remaining) [ 2 2 Unit ] - - location: 54 (remaining gas: 1039924.598 units remaining) + - location: 54 (remaining gas: 1039924.563 units remaining) [ 4 Unit ] - - location: 55 (remaining gas: 1039924.588 units remaining) + - location: 55 (remaining gas: 1039924.553 units remaining) [ 4 4 Unit ] - - location: 60 (remaining gas: 1039924.553 units remaining) + - location: 60 (remaining gas: 1039924.518 units remaining) [ 0 Unit ] - - location: 61 (remaining gas: 1039924.538 units remaining) + - location: 61 (remaining gas: 1039924.503 units remaining) [ True Unit ] - - location: 62 (remaining gas: 1039924.528 units remaining) + - location: 62 (remaining gas: 1039924.493 units remaining) [ Unit ] - - location: 62 (remaining gas: 1039924.513 units remaining) + - location: 62 (remaining gas: 1039924.478 units remaining) [ Unit ] - - location: 68 (remaining gas: 1039924.503 units remaining) + - location: 68 (remaining gas: 1039924.468 units remaining) [ 2 Unit ] - - location: 71 (remaining gas: 1039924.493 units remaining) + - location: 71 (remaining gas: 1039924.458 units remaining) [ 2 2 Unit ] - - location: 74 (remaining gas: 1039924.438 units remaining) + - location: 74 (remaining gas: 1039924.403 units remaining) [ 4 Unit ] - - location: 75 (remaining gas: 1039924.428 units remaining) + - location: 75 (remaining gas: 1039924.393 units remaining) [ 4 4 Unit ] - - location: 80 (remaining gas: 1039924.393 units remaining) + - location: 80 (remaining gas: 1039924.358 units remaining) [ 0 Unit ] - - location: 81 (remaining gas: 1039924.378 units remaining) + - location: 81 (remaining gas: 1039924.343 units remaining) [ True Unit ] - - location: 82 (remaining gas: 1039924.368 units remaining) + - location: 82 (remaining gas: 1039924.333 units remaining) [ Unit ] - - location: 82 (remaining gas: 1039924.353 units remaining) + - location: 82 (remaining gas: 1039924.318 units remaining) [ Unit ] - - location: 88 (remaining gas: 1039924.343 units remaining) + - location: 88 (remaining gas: 1039924.308 units remaining) [ 2 Unit ] - - location: 91 (remaining gas: 1039924.333 units remaining) + - location: 91 (remaining gas: 1039924.298 units remaining) [ 2 2 Unit ] - - location: 94 (remaining gas: 1039924.278 units remaining) + - location: 94 (remaining gas: 1039924.243 units remaining) [ 4 Unit ] - - location: 95 (remaining gas: 1039924.268 units remaining) + - location: 95 (remaining gas: 1039924.233 units remaining) [ 4 4 Unit ] - - location: 100 (remaining gas: 1039924.233 units remaining) + - location: 100 (remaining gas: 1039924.198 units remaining) [ 0 Unit ] - - location: 101 (remaining gas: 1039924.218 units remaining) + - location: 101 (remaining gas: 1039924.183 units remaining) [ True Unit ] - - location: 102 (remaining gas: 1039924.208 units remaining) + - location: 102 (remaining gas: 1039924.173 units remaining) [ Unit ] - - location: 102 (remaining gas: 1039924.193 units remaining) + - location: 102 (remaining gas: 1039924.158 units remaining) [ Unit ] - - location: 108 (remaining gas: 1039924.183 units remaining) + - location: 108 (remaining gas: 1039924.148 units remaining) [ 60 Unit ] - - location: 111 (remaining gas: 1039924.173 units remaining) + - location: 111 (remaining gas: 1039924.138 units remaining) [ "2019-09-09T12:08:37Z" 60 Unit ] - - location: 114 (remaining gas: 1039924.118 units remaining) + - location: 114 (remaining gas: 1039924.083 units remaining) [ "2019-09-09T12:09:37Z" Unit ] - - location: 115 (remaining gas: 1039924.108 units remaining) + - location: 115 (remaining gas: 1039924.073 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" Unit ] - - location: 120 (remaining gas: 1039924.073 units remaining) + - location: 120 (remaining gas: 1039924.038 units remaining) [ 0 Unit ] - - location: 121 (remaining gas: 1039924.058 units remaining) + - location: 121 (remaining gas: 1039924.023 units remaining) [ True Unit ] - - location: 122 (remaining gas: 1039924.048 units remaining) + - location: 122 (remaining gas: 1039924.013 units remaining) [ Unit ] - - location: 122 (remaining gas: 1039924.033 units remaining) + - location: 122 (remaining gas: 1039923.998 units remaining) [ Unit ] - - location: 128 (remaining gas: 1039924.023 units remaining) + - location: 128 (remaining gas: 1039923.988 units remaining) [ "2019-09-09T12:08:37Z" Unit ] - - location: 131 (remaining gas: 1039924.013 units remaining) + - location: 131 (remaining gas: 1039923.978 units remaining) [ 60 "2019-09-09T12:08:37Z" Unit ] - - location: 134 (remaining gas: 1039923.958 units remaining) + - location: 134 (remaining gas: 1039923.923 units remaining) [ "2019-09-09T12:09:37Z" Unit ] - - location: 135 (remaining gas: 1039923.948 units remaining) + - location: 135 (remaining gas: 1039923.913 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" Unit ] - - location: 140 (remaining gas: 1039923.913 units remaining) + - location: 140 (remaining gas: 1039923.878 units remaining) [ 0 Unit ] - - location: 141 (remaining gas: 1039923.898 units remaining) + - location: 141 (remaining gas: 1039923.863 units remaining) [ True Unit ] - - location: 142 (remaining gas: 1039923.888 units remaining) + - location: 142 (remaining gas: 1039923.853 units remaining) [ Unit ] - - location: 142 (remaining gas: 1039923.873 units remaining) + - location: 142 (remaining gas: 1039923.838 units remaining) [ Unit ] - - location: 148 (remaining gas: 1039923.863 units remaining) + - location: 148 (remaining gas: 1039923.828 units remaining) [ 1000 Unit ] - - location: 151 (remaining gas: 1039923.853 units remaining) + - location: 151 (remaining gas: 1039923.818 units remaining) [ 1000 1000 Unit ] - - location: 154 (remaining gas: 1039923.833 units remaining) + - location: 154 (remaining gas: 1039923.798 units remaining) [ 2000 Unit ] - - location: 155 (remaining gas: 1039923.823 units remaining) + - location: 155 (remaining gas: 1039923.788 units remaining) [ 2000 2000 Unit ] - - location: 160 (remaining gas: 1039923.788 units remaining) + - location: 160 (remaining gas: 1039923.753 units remaining) [ 0 Unit ] - - location: 161 (remaining gas: 1039923.773 units remaining) + - location: 161 (remaining gas: 1039923.738 units remaining) [ True Unit ] - - location: 162 (remaining gas: 1039923.763 units remaining) + - location: 162 (remaining gas: 1039923.728 units remaining) [ Unit ] - - location: 162 (remaining gas: 1039923.748 units remaining) + - location: 162 (remaining gas: 1039923.713 units remaining) [ Unit ] - - location: 168 (remaining gas: 1039923.733 units remaining) + - location: 168 (remaining gas: 1039923.698 units remaining) [ {} Unit ] - - location: 170 (remaining gas: 1039923.718 units remaining) + - location: 170 (remaining gas: 1039923.683 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out index 24e6cbcdf706..4adc7e217f79 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.524 units remaining) + - location: 10 (remaining gas: 1039992.489 units remaining) [ (Pair (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039992.514 units remaining) + - location: 10 (remaining gas: 1039992.479 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 11 (remaining gas: 1039992.504 units remaining) + - location: 11 (remaining gas: 1039992.469 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.459 units remaining) + - location: 12 (remaining gas: 1039992.424 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039992.444 units remaining) + - location: 13 (remaining gas: 1039992.409 units remaining) [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039992.429 units remaining) + - location: 14 (remaining gas: 1039992.394 units remaining) [ {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039992.414 units remaining) + - location: 16 (remaining gas: 1039992.379 units remaining) [ (Pair {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out index 8da54a4da9bc..d5b4c7a3da2d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.524 units remaining) + - location: 10 (remaining gas: 1039992.489 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039992.514 units remaining) + - location: 10 (remaining gas: 1039992.479 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 11 (remaining gas: 1039992.504 units remaining) + - location: 11 (remaining gas: 1039992.469 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.459 units remaining) + - location: 12 (remaining gas: 1039992.424 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039992.444 units remaining) + - location: 13 (remaining gas: 1039992.409 units remaining) [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039992.429 units remaining) + - location: 14 (remaining gas: 1039992.394 units remaining) [ {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039992.414 units remaining) + - location: 16 (remaining gas: 1039992.379 units remaining) [ (Pair {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out index b8ff832fcd71..0ad0c9d1a62a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.524 units remaining) + - location: 10 (remaining gas: 1039992.489 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039992.514 units remaining) + - location: 10 (remaining gas: 1039992.479 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 11 (remaining gas: 1039992.504 units remaining) + - location: 11 (remaining gas: 1039992.469 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.459 units remaining) + - location: 12 (remaining gas: 1039992.424 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039992.444 units remaining) + - location: 13 (remaining gas: 1039992.409 units remaining) [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039992.429 units remaining) + - location: 14 (remaining gas: 1039992.394 units remaining) [ {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039992.414 units remaining) + - location: 16 (remaining gas: 1039992.379 units remaining) [ (Pair {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out index 6a320b0b7d7c..c7760b07d33f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.524 units remaining) + - location: 10 (remaining gas: 1039992.489 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039992.514 units remaining) + - location: 10 (remaining gas: 1039992.479 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 11 (remaining gas: 1039992.504 units remaining) + - location: 11 (remaining gas: 1039992.469 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.459 units remaining) + - location: 12 (remaining gas: 1039992.424 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039992.444 units remaining) + - location: 13 (remaining gas: 1039992.409 units remaining) [ (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039992.429 units remaining) + - location: 14 (remaining gas: 1039992.394 units remaining) [ {} (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039992.414 units remaining) + - location: 16 (remaining gas: 1039992.379 units remaining) [ (Pair {} (Some 0x0200000000000000000000000000000000000000000000000000000000000000)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" index ff6f287ef478..a7b55ad101eb 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.553 units remaining) + - location: 10 (remaining gas: 1039990.518 units remaining) [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] - - location: 10 (remaining gas: 1039990.543 units remaining) + - location: 10 (remaining gas: 1039990.508 units remaining) [ (Pair -100 "1970-01-01T00:01:40Z") ] - - location: 11 (remaining gas: 1039990.533 units remaining) + - location: 11 (remaining gas: 1039990.498 units remaining) [ (Pair -100 "1970-01-01T00:01:40Z") (Pair -100 "1970-01-01T00:01:40Z") ] - - location: 12 (remaining gas: 1039990.523 units remaining) + - location: 12 (remaining gas: 1039990.488 units remaining) [ -100 (Pair -100 "1970-01-01T00:01:40Z") ] - - location: 13 (remaining gas: 1039990.508 units remaining) + - location: 13 (remaining gas: 1039990.473 units remaining) [ (Pair -100 "1970-01-01T00:01:40Z") ] - - location: 15 (remaining gas: 1039990.498 units remaining) + - location: 15 (remaining gas: 1039990.463 units remaining) [ "1970-01-01T00:01:40Z" ] - - location: 13 (remaining gas: 1039990.468 units remaining) + - location: 13 (remaining gas: 1039990.433 units remaining) [ -100 "1970-01-01T00:01:40Z" ] - - location: 16 (remaining gas: 1039990.413 units remaining) + - location: 16 (remaining gas: 1039990.378 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039990.398 units remaining) + - location: 17 (remaining gas: 1039990.363 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039990.383 units remaining) + - location: 18 (remaining gas: 1039990.348 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039990.368 units remaining) + - location: 20 (remaining gas: 1039990.333 units remaining) [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" index a5ff0af6cea3..03fe3abf21d9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.453 units remaining) + - location: 10 (remaining gas: 1039990.418 units remaining) [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] - - location: 10 (remaining gas: 1039990.443 units remaining) + - location: 10 (remaining gas: 1039990.408 units remaining) [ (Pair 0 "1970-01-01T00:00:00Z") ] - - location: 11 (remaining gas: 1039990.433 units remaining) + - location: 11 (remaining gas: 1039990.398 units remaining) [ (Pair 0 "1970-01-01T00:00:00Z") (Pair 0 "1970-01-01T00:00:00Z") ] - - location: 12 (remaining gas: 1039990.423 units remaining) + - location: 12 (remaining gas: 1039990.388 units remaining) [ 0 (Pair 0 "1970-01-01T00:00:00Z") ] - - location: 13 (remaining gas: 1039990.408 units remaining) + - location: 13 (remaining gas: 1039990.373 units remaining) [ (Pair 0 "1970-01-01T00:00:00Z") ] - - location: 15 (remaining gas: 1039990.398 units remaining) + - location: 15 (remaining gas: 1039990.363 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 13 (remaining gas: 1039990.368 units remaining) + - location: 13 (remaining gas: 1039990.333 units remaining) [ 0 "1970-01-01T00:00:00Z" ] - - location: 16 (remaining gas: 1039990.313 units remaining) + - location: 16 (remaining gas: 1039990.278 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039990.298 units remaining) + - location: 17 (remaining gas: 1039990.263 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039990.283 units remaining) + - location: 18 (remaining gas: 1039990.248 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039990.268 units remaining) + - location: 20 (remaining gas: 1039990.233 units remaining) [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" index afdaa65ea177..d7bb3fd20250 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.553 units remaining) + - location: 10 (remaining gas: 1039990.518 units remaining) [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] - - location: 10 (remaining gas: 1039990.543 units remaining) + - location: 10 (remaining gas: 1039990.508 units remaining) [ (Pair 100 "1970-01-01T00:01:40Z") ] - - location: 11 (remaining gas: 1039990.533 units remaining) + - location: 11 (remaining gas: 1039990.498 units remaining) [ (Pair 100 "1970-01-01T00:01:40Z") (Pair 100 "1970-01-01T00:01:40Z") ] - - location: 12 (remaining gas: 1039990.523 units remaining) + - location: 12 (remaining gas: 1039990.488 units remaining) [ 100 (Pair 100 "1970-01-01T00:01:40Z") ] - - location: 13 (remaining gas: 1039990.508 units remaining) + - location: 13 (remaining gas: 1039990.473 units remaining) [ (Pair 100 "1970-01-01T00:01:40Z") ] - - location: 15 (remaining gas: 1039990.498 units remaining) + - location: 15 (remaining gas: 1039990.463 units remaining) [ "1970-01-01T00:01:40Z" ] - - location: 13 (remaining gas: 1039990.468 units remaining) + - location: 13 (remaining gas: 1039990.433 units remaining) [ 100 "1970-01-01T00:01:40Z" ] - - location: 16 (remaining gas: 1039990.413 units remaining) + - location: 16 (remaining gas: 1039990.378 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 17 (remaining gas: 1039990.398 units remaining) + - location: 17 (remaining gas: 1039990.363 units remaining) [ (Some "1970-01-01T00:03:20Z") ] - - location: 18 (remaining gas: 1039990.383 units remaining) + - location: 18 (remaining gas: 1039990.348 units remaining) [ {} (Some "1970-01-01T00:03:20Z") ] - - location: 20 (remaining gas: 1039990.368 units remaining) + - location: 20 (remaining gas: 1039990.333 units remaining) [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" index 9471de84852e..a9be552b3177 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.453 units remaining) + - location: 10 (remaining gas: 1039990.418 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] - - location: 10 (remaining gas: 1039990.443 units remaining) + - location: 10 (remaining gas: 1039990.408 units remaining) [ (Pair "1970-01-01T00:00:00Z" 0) ] - - location: 11 (remaining gas: 1039990.433 units remaining) + - location: 11 (remaining gas: 1039990.398 units remaining) [ (Pair "1970-01-01T00:00:00Z" 0) (Pair "1970-01-01T00:00:00Z" 0) ] - - location: 12 (remaining gas: 1039990.423 units remaining) + - location: 12 (remaining gas: 1039990.388 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" 0) ] - - location: 13 (remaining gas: 1039990.408 units remaining) + - location: 13 (remaining gas: 1039990.373 units remaining) [ (Pair "1970-01-01T00:00:00Z" 0) ] - - location: 15 (remaining gas: 1039990.398 units remaining) + - location: 15 (remaining gas: 1039990.363 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039990.368 units remaining) + - location: 13 (remaining gas: 1039990.333 units remaining) [ "1970-01-01T00:00:00Z" 0 ] - - location: 16 (remaining gas: 1039990.313 units remaining) + - location: 16 (remaining gas: 1039990.278 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039990.298 units remaining) + - location: 17 (remaining gas: 1039990.263 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039990.283 units remaining) + - location: 18 (remaining gas: 1039990.248 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039990.268 units remaining) + - location: 20 (remaining gas: 1039990.233 units remaining) [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" index fd3b1fe3bc4c..9177e089c1e8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.553 units remaining) + - location: 10 (remaining gas: 1039990.518 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] - - location: 10 (remaining gas: 1039990.543 units remaining) + - location: 10 (remaining gas: 1039990.508 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 11 (remaining gas: 1039990.533 units remaining) + - location: 11 (remaining gas: 1039990.498 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 12 (remaining gas: 1039990.523 units remaining) + - location: 12 (remaining gas: 1039990.488 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 13 (remaining gas: 1039990.508 units remaining) + - location: 13 (remaining gas: 1039990.473 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 15 (remaining gas: 1039990.498 units remaining) + - location: 15 (remaining gas: 1039990.463 units remaining) [ -100 ] - - location: 13 (remaining gas: 1039990.468 units remaining) + - location: 13 (remaining gas: 1039990.433 units remaining) [ "1970-01-01T00:01:40Z" -100 ] - - location: 16 (remaining gas: 1039990.413 units remaining) + - location: 16 (remaining gas: 1039990.378 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039990.398 units remaining) + - location: 17 (remaining gas: 1039990.363 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039990.383 units remaining) + - location: 18 (remaining gas: 1039990.348 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039990.368 units remaining) + - location: 20 (remaining gas: 1039990.333 units remaining) [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" index 6024b7ff6ceb..e127f44167c8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.553 units remaining) + - location: 10 (remaining gas: 1039990.518 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] - - location: 10 (remaining gas: 1039990.543 units remaining) + - location: 10 (remaining gas: 1039990.508 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 11 (remaining gas: 1039990.533 units remaining) + - location: 11 (remaining gas: 1039990.498 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 12 (remaining gas: 1039990.523 units remaining) + - location: 12 (remaining gas: 1039990.488 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 13 (remaining gas: 1039990.508 units remaining) + - location: 13 (remaining gas: 1039990.473 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 15 (remaining gas: 1039990.498 units remaining) + - location: 15 (remaining gas: 1039990.463 units remaining) [ 100 ] - - location: 13 (remaining gas: 1039990.468 units remaining) + - location: 13 (remaining gas: 1039990.433 units remaining) [ "1970-01-01T00:01:40Z" 100 ] - - location: 16 (remaining gas: 1039990.413 units remaining) + - location: 16 (remaining gas: 1039990.378 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 17 (remaining gas: 1039990.398 units remaining) + - location: 17 (remaining gas: 1039990.363 units remaining) [ (Some "1970-01-01T00:03:20Z") ] - - location: 18 (remaining gas: 1039990.383 units remaining) + - location: 18 (remaining gas: 1039990.348 units remaining) [ {} (Some "1970-01-01T00:03:20Z") ] - - location: 20 (remaining gas: 1039990.368 units remaining) + - location: 20 (remaining gas: 1039990.333 units remaining) [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" index 48d573875fe3..ffc33ab1be2c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039343.609 units remaining) + - location: 9 (remaining gas: 1039343.574 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] - - location: 9 (remaining gas: 1039343.599 units remaining) + - location: 9 (remaining gas: 1039343.564 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 10 (remaining gas: 1039343.589 units remaining) + - location: 10 (remaining gas: 1039343.554 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 11 (remaining gas: 1039343.574 units remaining) + - location: 11 (remaining gas: 1039343.539 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 12 (remaining gas: 1039343.559 units remaining) + - location: 12 (remaining gas: 1039343.524 units remaining) [ {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 14 (remaining gas: 1039343.544 units remaining) + - location: 14 (remaining gas: 1039343.509 units remaining) [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out index a4fc8fe3f11c..c86e6ce5360a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.303 units remaining) + - location: 10 (remaining gas: 1039991.268 units remaining) [ (Pair (Pair False False) None) ] - - location: 10 (remaining gas: 1039991.293 units remaining) + - location: 10 (remaining gas: 1039991.258 units remaining) [ (Pair False False) ] - - location: 11 (remaining gas: 1039991.283 units remaining) + - location: 11 (remaining gas: 1039991.248 units remaining) [ False False ] - - location: 12 (remaining gas: 1039991.263 units remaining) + - location: 12 (remaining gas: 1039991.228 units remaining) [ False ] - - location: 13 (remaining gas: 1039991.248 units remaining) + - location: 13 (remaining gas: 1039991.213 units remaining) [ (Some False) ] - - location: 14 (remaining gas: 1039991.233 units remaining) + - location: 14 (remaining gas: 1039991.198 units remaining) [ {} (Some False) ] - - location: 16 (remaining gas: 1039991.218 units remaining) + - location: 16 (remaining gas: 1039991.183 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039991.208 units remaining) + - location: 17 (remaining gas: 1039991.173 units remaining) [ {} (Some False) ] - - location: 18 (remaining gas: 1039991.193 units remaining) + - location: 18 (remaining gas: 1039991.158 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out index 1aebaad3bcf0..26034d0b42d0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.303 units remaining) + - location: 10 (remaining gas: 1039991.268 units remaining) [ (Pair (Pair False True) None) ] - - location: 10 (remaining gas: 1039991.293 units remaining) + - location: 10 (remaining gas: 1039991.258 units remaining) [ (Pair False True) ] - - location: 11 (remaining gas: 1039991.283 units remaining) + - location: 11 (remaining gas: 1039991.248 units remaining) [ False True ] - - location: 12 (remaining gas: 1039991.263 units remaining) + - location: 12 (remaining gas: 1039991.228 units remaining) [ False ] - - location: 13 (remaining gas: 1039991.248 units remaining) + - location: 13 (remaining gas: 1039991.213 units remaining) [ (Some False) ] - - location: 14 (remaining gas: 1039991.233 units remaining) + - location: 14 (remaining gas: 1039991.198 units remaining) [ {} (Some False) ] - - location: 16 (remaining gas: 1039991.218 units remaining) + - location: 16 (remaining gas: 1039991.183 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039991.208 units remaining) + - location: 17 (remaining gas: 1039991.173 units remaining) [ {} (Some False) ] - - location: 18 (remaining gas: 1039991.193 units remaining) + - location: 18 (remaining gas: 1039991.158 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out index bb922eddadd2..acd78d0a73a5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.303 units remaining) + - location: 10 (remaining gas: 1039991.268 units remaining) [ (Pair (Pair True False) None) ] - - location: 10 (remaining gas: 1039991.293 units remaining) + - location: 10 (remaining gas: 1039991.258 units remaining) [ (Pair True False) ] - - location: 11 (remaining gas: 1039991.283 units remaining) + - location: 11 (remaining gas: 1039991.248 units remaining) [ True False ] - - location: 12 (remaining gas: 1039991.263 units remaining) + - location: 12 (remaining gas: 1039991.228 units remaining) [ False ] - - location: 13 (remaining gas: 1039991.248 units remaining) + - location: 13 (remaining gas: 1039991.213 units remaining) [ (Some False) ] - - location: 14 (remaining gas: 1039991.233 units remaining) + - location: 14 (remaining gas: 1039991.198 units remaining) [ {} (Some False) ] - - location: 16 (remaining gas: 1039991.218 units remaining) + - location: 16 (remaining gas: 1039991.183 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039991.208 units remaining) + - location: 17 (remaining gas: 1039991.173 units remaining) [ {} (Some False) ] - - location: 18 (remaining gas: 1039991.193 units remaining) + - location: 18 (remaining gas: 1039991.158 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out index 2d1032293849..1802a1ce9802 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.303 units remaining) + - location: 10 (remaining gas: 1039991.268 units remaining) [ (Pair (Pair True True) None) ] - - location: 10 (remaining gas: 1039991.293 units remaining) + - location: 10 (remaining gas: 1039991.258 units remaining) [ (Pair True True) ] - - location: 11 (remaining gas: 1039991.283 units remaining) + - location: 11 (remaining gas: 1039991.248 units remaining) [ True True ] - - location: 12 (remaining gas: 1039991.263 units remaining) + - location: 12 (remaining gas: 1039991.228 units remaining) [ True ] - - location: 13 (remaining gas: 1039991.248 units remaining) + - location: 13 (remaining gas: 1039991.213 units remaining) [ (Some True) ] - - location: 14 (remaining gas: 1039991.233 units remaining) + - location: 14 (remaining gas: 1039991.198 units remaining) [ {} (Some True) ] - - location: 16 (remaining gas: 1039991.218 units remaining) + - location: 16 (remaining gas: 1039991.183 units remaining) [ (Pair {} (Some True)) ] - - location: 17 (remaining gas: 1039991.208 units remaining) + - location: 17 (remaining gas: 1039991.173 units remaining) [ {} (Some True) ] - - location: 18 (remaining gas: 1039991.193 units remaining) + - location: 18 (remaining gas: 1039991.158 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out index 0337fc64578a..3b41afb74b15 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out @@ -7,87 +7,87 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039960.451 units remaining) + - location: 7 (remaining gas: 1039960.416 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039960.441 units remaining) + - location: 7 (remaining gas: 1039960.406 units remaining) [ ] - - location: 8 (remaining gas: 1039960.431 units remaining) + - location: 8 (remaining gas: 1039960.396 units remaining) [ 5 ] - - location: 11 (remaining gas: 1039960.421 units remaining) + - location: 11 (remaining gas: 1039960.386 units remaining) [ 6 5 ] - - location: 14 (remaining gas: 1039960.371 units remaining) + - location: 14 (remaining gas: 1039960.336 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039960.361 units remaining) + - location: 15 (remaining gas: 1039960.326 units remaining) [ 4 4 ] - - location: 20 (remaining gas: 1039960.326 units remaining) + - location: 20 (remaining gas: 1039960.291 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039960.311 units remaining) + - location: 21 (remaining gas: 1039960.276 units remaining) [ True ] - - location: 22 (remaining gas: 1039960.301 units remaining) + - location: 22 (remaining gas: 1039960.266 units remaining) [ ] - - location: 22 (remaining gas: 1039960.286 units remaining) + - location: 22 (remaining gas: 1039960.251 units remaining) [ ] - - location: 28 (remaining gas: 1039960.276 units remaining) + - location: 28 (remaining gas: 1039960.241 units remaining) [ 6 ] - - location: 31 (remaining gas: 1039960.266 units remaining) + - location: 31 (remaining gas: 1039960.231 units remaining) [ 5 6 ] - - location: 34 (remaining gas: 1039960.216 units remaining) + - location: 34 (remaining gas: 1039960.181 units remaining) [ 4 ] - - location: 35 (remaining gas: 1039960.206 units remaining) + - location: 35 (remaining gas: 1039960.171 units remaining) [ 4 4 ] - - location: 40 (remaining gas: 1039960.171 units remaining) + - location: 40 (remaining gas: 1039960.136 units remaining) [ 0 ] - - location: 41 (remaining gas: 1039960.156 units remaining) + - location: 41 (remaining gas: 1039960.121 units remaining) [ True ] - - location: 42 (remaining gas: 1039960.146 units remaining) + - location: 42 (remaining gas: 1039960.111 units remaining) [ ] - - location: 42 (remaining gas: 1039960.131 units remaining) + - location: 42 (remaining gas: 1039960.096 units remaining) [ ] - - location: 48 (remaining gas: 1039960.121 units remaining) + - location: 48 (remaining gas: 1039960.086 units remaining) [ 12 ] - - location: 51 (remaining gas: 1039960.111 units remaining) + - location: 51 (remaining gas: 1039960.076 units remaining) [ -1 12 ] - - location: 54 (remaining gas: 1039960.061 units remaining) + - location: 54 (remaining gas: 1039960.026 units remaining) [ 12 ] - - location: 55 (remaining gas: 1039960.051 units remaining) + - location: 55 (remaining gas: 1039960.016 units remaining) [ 12 12 ] - - location: 60 (remaining gas: 1039960.016 units remaining) + - location: 60 (remaining gas: 1039959.981 units remaining) [ 0 ] - - location: 61 (remaining gas: 1039960.001 units remaining) + - location: 61 (remaining gas: 1039959.966 units remaining) [ True ] - - location: 62 (remaining gas: 1039959.991 units remaining) + - location: 62 (remaining gas: 1039959.956 units remaining) [ ] - - location: 62 (remaining gas: 1039959.976 units remaining) + - location: 62 (remaining gas: 1039959.941 units remaining) [ ] - - location: 68 (remaining gas: 1039959.966 units remaining) + - location: 68 (remaining gas: 1039959.931 units remaining) [ 12 ] - - location: 71 (remaining gas: 1039959.956 units remaining) + - location: 71 (remaining gas: 1039959.921 units remaining) [ -5 12 ] - - location: 74 (remaining gas: 1039959.906 units remaining) + - location: 74 (remaining gas: 1039959.871 units remaining) [ 8 ] - - location: 75 (remaining gas: 1039959.896 units remaining) + - location: 75 (remaining gas: 1039959.861 units remaining) [ 8 8 ] - - location: 80 (remaining gas: 1039959.861 units remaining) + - location: 80 (remaining gas: 1039959.826 units remaining) [ 0 ] - - location: 81 (remaining gas: 1039959.846 units remaining) + - location: 81 (remaining gas: 1039959.811 units remaining) [ True ] - - location: 82 (remaining gas: 1039959.836 units remaining) + - location: 82 (remaining gas: 1039959.801 units remaining) [ ] - - location: 82 (remaining gas: 1039959.821 units remaining) + - location: 82 (remaining gas: 1039959.786 units remaining) [ ] - - location: 88 (remaining gas: 1039959.811 units remaining) + - location: 88 (remaining gas: 1039959.776 units remaining) [ Unit ] - - location: 89 (remaining gas: 1039959.796 units remaining) + - location: 89 (remaining gas: 1039959.761 units remaining) [ {} Unit ] - - location: 91 (remaining gas: 1039959.781 units remaining) + - location: 91 (remaining gas: 1039959.746 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out index 33b2a0f8b919..746ab1bd6b1f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.804 units remaining) + - location: 9 (remaining gas: 1039993.769 units remaining) [ (Pair (Pair False False) False) ] - - location: 9 (remaining gas: 1039993.794 units remaining) + - location: 9 (remaining gas: 1039993.759 units remaining) [ (Pair False False) ] - - location: 10 (remaining gas: 1039993.784 units remaining) + - location: 10 (remaining gas: 1039993.749 units remaining) [ False False ] - - location: 11 (remaining gas: 1039993.764 units remaining) + - location: 11 (remaining gas: 1039993.729 units remaining) [ False ] - - location: 12 (remaining gas: 1039993.749 units remaining) + - location: 12 (remaining gas: 1039993.714 units remaining) [ {} False ] - - location: 14 (remaining gas: 1039993.734 units remaining) + - location: 14 (remaining gas: 1039993.699 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out index b774e9f07140..ac8db947c875 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.804 units remaining) + - location: 9 (remaining gas: 1039993.769 units remaining) [ (Pair (Pair False True) False) ] - - location: 9 (remaining gas: 1039993.794 units remaining) + - location: 9 (remaining gas: 1039993.759 units remaining) [ (Pair False True) ] - - location: 10 (remaining gas: 1039993.784 units remaining) + - location: 10 (remaining gas: 1039993.749 units remaining) [ False True ] - - location: 11 (remaining gas: 1039993.764 units remaining) + - location: 11 (remaining gas: 1039993.729 units remaining) [ False ] - - location: 12 (remaining gas: 1039993.749 units remaining) + - location: 12 (remaining gas: 1039993.714 units remaining) [ {} False ] - - location: 14 (remaining gas: 1039993.734 units remaining) + - location: 14 (remaining gas: 1039993.699 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out index c60ecc28d9e4..0afd9deb76a6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.804 units remaining) + - location: 9 (remaining gas: 1039993.769 units remaining) [ (Pair (Pair True False) False) ] - - location: 9 (remaining gas: 1039993.794 units remaining) + - location: 9 (remaining gas: 1039993.759 units remaining) [ (Pair True False) ] - - location: 10 (remaining gas: 1039993.784 units remaining) + - location: 10 (remaining gas: 1039993.749 units remaining) [ True False ] - - location: 11 (remaining gas: 1039993.764 units remaining) + - location: 11 (remaining gas: 1039993.729 units remaining) [ False ] - - location: 12 (remaining gas: 1039993.749 units remaining) + - location: 12 (remaining gas: 1039993.714 units remaining) [ {} False ] - - location: 14 (remaining gas: 1039993.734 units remaining) + - location: 14 (remaining gas: 1039993.699 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out index 1b17ddce0005..eda1410e9a8f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.804 units remaining) + - location: 9 (remaining gas: 1039993.769 units remaining) [ (Pair (Pair True True) False) ] - - location: 9 (remaining gas: 1039993.794 units remaining) + - location: 9 (remaining gas: 1039993.759 units remaining) [ (Pair True True) ] - - location: 10 (remaining gas: 1039993.784 units remaining) + - location: 10 (remaining gas: 1039993.749 units remaining) [ True True ] - - location: 11 (remaining gas: 1039993.764 units remaining) + - location: 11 (remaining gas: 1039993.729 units remaining) [ True ] - - location: 12 (remaining gas: 1039993.749 units remaining) + - location: 12 (remaining gas: 1039993.714 units remaining) [ {} True ] - - location: 14 (remaining gas: 1039993.734 units remaining) + - location: 14 (remaining gas: 1039993.699 units remaining) [ (Pair {} True) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out index 8bc1c350c188..2db431486a2a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 111) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.938 units remaining) + - location: 8 (remaining gas: 1039994.903 units remaining) [ 4000000000000 ] - - location: 9 (remaining gas: 1039994.923 units remaining) + - location: 9 (remaining gas: 1039994.888 units remaining) [ {} 4000000000000 ] - - location: 11 (remaining gas: 1039994.908 units remaining) + - location: 11 (remaining gas: 1039994.873 units remaining) [ (Pair {} 4000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out index bd0dba8d0d9e..032afe334a11 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map nat nat) Set map(4)[0] to 1 trace - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 12 (remaining gas: 1039986.976 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039987.001 units remaining) + - location: 12 (remaining gas: 1039986.966 units remaining) [ 1 (Pair { Elt 0 1 } None) ] - - location: 13 (remaining gas: 1039986.986 units remaining) + - location: 13 (remaining gas: 1039986.951 units remaining) [ (Pair { Elt 0 1 } None) ] - - location: 15 (remaining gas: 1039986.976 units remaining) + - location: 15 (remaining gas: 1039986.941 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039986.966 units remaining) + - location: 16 (remaining gas: 1039986.931 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: 13 (remaining gas: 1039986.936 units remaining) + - location: 13 (remaining gas: 1039986.901 units remaining) [ 1 { Elt 0 1 } { Elt 0 1 } ] - - location: 17 (remaining gas: 1039986.163 units remaining) + - location: 17 (remaining gas: 1039986.128 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039986.148 units remaining) + - location: 18 (remaining gas: 1039986.113 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039986.138 units remaining) + - location: 19 (remaining gas: 1039986.103 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039986.123 units remaining) + - location: 20 (remaining gas: 1039986.088 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039986.108 units remaining) + - location: 21 (remaining gas: 1039986.073 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039986.093 units remaining) + - location: 23 (remaining gas: 1039986.058 units remaining) [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out index 26dd95fdafd8..8d90b0cab1ef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map nat nat) Set map(4)[0] to 1 trace - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 12 (remaining gas: 1039986.976 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039987.001 units remaining) + - location: 12 (remaining gas: 1039986.966 units remaining) [ 1 (Pair { Elt 0 1 } None) ] - - location: 13 (remaining gas: 1039986.986 units remaining) + - location: 13 (remaining gas: 1039986.951 units remaining) [ (Pair { Elt 0 1 } None) ] - - location: 15 (remaining gas: 1039986.976 units remaining) + - location: 15 (remaining gas: 1039986.941 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039986.966 units remaining) + - location: 16 (remaining gas: 1039986.931 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: 13 (remaining gas: 1039986.936 units remaining) + - location: 13 (remaining gas: 1039986.901 units remaining) [ 1 { Elt 0 1 } { Elt 0 1 } ] - - location: 17 (remaining gas: 1039986.163 units remaining) + - location: 17 (remaining gas: 1039986.128 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039986.148 units remaining) + - location: 18 (remaining gas: 1039986.113 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039986.138 units remaining) + - location: 19 (remaining gas: 1039986.103 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039986.123 units remaining) + - location: 20 (remaining gas: 1039986.088 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039986.108 units remaining) + - location: 21 (remaining gas: 1039986.073 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039986.093 units remaining) + - location: 23 (remaining gas: 1039986.058 units remaining) [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out index d8bf969f3ea4..a8e3d8cd7304 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map nat nat) Set map(4)[1] to 0 trace - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 12 (remaining gas: 1039986.976 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039987.001 units remaining) + - location: 12 (remaining gas: 1039986.966 units remaining) [ 1 (Pair { Elt 1 0 } None) ] - - location: 13 (remaining gas: 1039986.986 units remaining) + - location: 13 (remaining gas: 1039986.951 units remaining) [ (Pair { Elt 1 0 } None) ] - - location: 15 (remaining gas: 1039986.976 units remaining) + - location: 15 (remaining gas: 1039986.941 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039986.966 units remaining) + - location: 16 (remaining gas: 1039986.931 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: 13 (remaining gas: 1039986.936 units remaining) + - location: 13 (remaining gas: 1039986.901 units remaining) [ 1 { Elt 1 0 } { Elt 1 0 } ] - - location: 17 (remaining gas: 1039986.163 units remaining) + - location: 17 (remaining gas: 1039986.128 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039986.148 units remaining) + - location: 18 (remaining gas: 1039986.113 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039986.138 units remaining) + - location: 19 (remaining gas: 1039986.103 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039986.123 units remaining) + - location: 20 (remaining gas: 1039986.088 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039986.108 units remaining) + - location: 21 (remaining gas: 1039986.073 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039986.093 units remaining) + - location: 23 (remaining gas: 1039986.058 units remaining) [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out index 23d66d24d54b..0d7f4c93a02c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map nat nat) Set map(4)[1] to 0 trace - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 12 (remaining gas: 1039986.976 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039987.001 units remaining) + - location: 12 (remaining gas: 1039986.966 units remaining) [ 1 (Pair { Elt 1 0 } None) ] - - location: 13 (remaining gas: 1039986.986 units remaining) + - location: 13 (remaining gas: 1039986.951 units remaining) [ (Pair { Elt 1 0 } None) ] - - location: 15 (remaining gas: 1039986.976 units remaining) + - location: 15 (remaining gas: 1039986.941 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039986.966 units remaining) + - location: 16 (remaining gas: 1039986.931 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: 13 (remaining gas: 1039986.936 units remaining) + - location: 13 (remaining gas: 1039986.901 units remaining) [ 1 { Elt 1 0 } { Elt 1 0 } ] - - location: 17 (remaining gas: 1039986.163 units remaining) + - location: 17 (remaining gas: 1039986.128 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039986.148 units remaining) + - location: 18 (remaining gas: 1039986.113 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039986.138 units remaining) + - location: 19 (remaining gas: 1039986.103 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039986.123 units remaining) + - location: 20 (remaining gas: 1039986.088 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039986.108 units remaining) + - location: 21 (remaining gas: 1039986.073 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039986.093 units remaining) + - location: 23 (remaining gas: 1039986.058 units remaining) [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out index cc4ce7a2cb45..05594940c067 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 1 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out index c89a3f0e4027..11d652b07892 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 1 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out index e7337b20442e..f89d93fd342c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 2 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out index 2e95aa6a1e15..ab3d92834ae8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 2 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out index 5ffb855ef92e..2b3e5319ba96 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 3 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out index 4f4172fc54be..c070fb8c956b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out @@ -9,36 +9,36 @@ big_map diff Set map(4)[1] to 4 Set map(4)[2] to 11 trace - - location: 12 (remaining gas: 1039985.980 units remaining) + - location: 12 (remaining gas: 1039985.945 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.970 units remaining) + - location: 12 (remaining gas: 1039985.935 units remaining) [ 3 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039985.955 units remaining) + - location: 13 (remaining gas: 1039985.920 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039985.945 units remaining) + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.935 units remaining) + - location: 16 (remaining gas: 1039985.900 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.905 units remaining) + - location: 13 (remaining gas: 1039985.870 units remaining) [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.131 units remaining) + - location: 17 (remaining gas: 1039985.096 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.116 units remaining) + - location: 18 (remaining gas: 1039985.081 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.106 units remaining) + - location: 19 (remaining gas: 1039985.071 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039985.091 units remaining) + - location: 20 (remaining gas: 1039985.056 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039985.076 units remaining) + - location: 21 (remaining gas: 1039985.041 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039985.061 units remaining) + - location: 23 (remaining gas: 1039985.026 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out index 966472a96e33..9e59349f3821 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out @@ -7,36 +7,36 @@ emitted operations big_map diff New map(4) of type (big_map nat nat) trace - - location: 12 (remaining gas: 1039988.004 units remaining) + - location: 12 (remaining gas: 1039987.969 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039987.994 units remaining) + - location: 12 (remaining gas: 1039987.959 units remaining) [ 1 (Pair {} None) ] - - location: 13 (remaining gas: 1039987.979 units remaining) + - location: 13 (remaining gas: 1039987.944 units remaining) [ (Pair {} None) ] - - location: 15 (remaining gas: 1039987.969 units remaining) + - location: 15 (remaining gas: 1039987.934 units remaining) [ {} ] - - location: 16 (remaining gas: 1039987.959 units remaining) + - location: 16 (remaining gas: 1039987.924 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039987.929 units remaining) + - location: 13 (remaining gas: 1039987.894 units remaining) [ 1 {} {} ] - - location: 17 (remaining gas: 1039987.158 units remaining) + - location: 17 (remaining gas: 1039987.123 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039987.143 units remaining) + - location: 18 (remaining gas: 1039987.108 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039987.133 units remaining) + - location: 19 (remaining gas: 1039987.098 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039987.118 units remaining) + - location: 20 (remaining gas: 1039987.083 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039987.103 units remaining) + - location: 21 (remaining gas: 1039987.068 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039987.088 units remaining) + - location: 23 (remaining gas: 1039987.053 units remaining) [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out index fe8b9fb96421..7ee949f66a50 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out @@ -7,36 +7,36 @@ emitted operations big_map diff New map(4) of type (big_map nat nat) trace - - location: 12 (remaining gas: 1039988.004 units remaining) + - location: 12 (remaining gas: 1039987.969 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039987.994 units remaining) + - location: 12 (remaining gas: 1039987.959 units remaining) [ 1 (Pair {} None) ] - - location: 13 (remaining gas: 1039987.979 units remaining) + - location: 13 (remaining gas: 1039987.944 units remaining) [ (Pair {} None) ] - - location: 15 (remaining gas: 1039987.969 units remaining) + - location: 15 (remaining gas: 1039987.934 units remaining) [ {} ] - - location: 16 (remaining gas: 1039987.959 units remaining) + - location: 16 (remaining gas: 1039987.924 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039987.929 units remaining) + - location: 13 (remaining gas: 1039987.894 units remaining) [ 1 {} {} ] - - location: 17 (remaining gas: 1039987.158 units remaining) + - location: 17 (remaining gas: 1039987.123 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039987.143 units remaining) + - location: 18 (remaining gas: 1039987.108 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039987.133 units remaining) + - location: 19 (remaining gas: 1039987.098 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039987.118 units remaining) + - location: 20 (remaining gas: 1039987.083 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039987.103 units remaining) + - location: 21 (remaining gas: 1039987.068 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039987.088 units remaining) + - location: 23 (remaining gas: 1039987.053 units remaining) [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" index 7ca3059033be..1eb54a233c32 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" @@ -9,36 +9,36 @@ big_map diff Set map(4)["bar"] to 4 Set map(4)["foo"] to 11 trace - - location: 12 (remaining gas: 1039985.438 units remaining) + - location: 12 (remaining gas: 1039985.403 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.428 units remaining) + - location: 12 (remaining gas: 1039985.393 units remaining) [ "baz" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039985.413 units remaining) + - location: 13 (remaining gas: 1039985.378 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039985.403 units remaining) + - location: 15 (remaining gas: 1039985.368 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.393 units remaining) + - location: 16 (remaining gas: 1039985.358 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.363 units remaining) + - location: 13 (remaining gas: 1039985.328 units remaining) [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.384 units remaining) + - location: 17 (remaining gas: 1039984.349 units remaining) [ False { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.369 units remaining) + - location: 18 (remaining gas: 1039984.334 units remaining) [ (Some False) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.359 units remaining) + - location: 19 (remaining gas: 1039984.324 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some False) ] - - location: 20 (remaining gas: 1039984.344 units remaining) + - location: 20 (remaining gas: 1039984.309 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 21 (remaining gas: 1039984.329 units remaining) + - location: 21 (remaining gas: 1039984.294 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 23 (remaining gas: 1039984.314 units remaining) + - location: 23 (remaining gas: 1039984.279 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" index 3a8da639832b..c80c33fe190d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" @@ -9,36 +9,36 @@ big_map diff Set map(4)["bar"] to 4 Set map(4)["foo"] to 11 trace - - location: 12 (remaining gas: 1039985.438 units remaining) + - location: 12 (remaining gas: 1039985.403 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.428 units remaining) + - location: 12 (remaining gas: 1039985.393 units remaining) [ "foo" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039985.413 units remaining) + - location: 13 (remaining gas: 1039985.378 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039985.403 units remaining) + - location: 15 (remaining gas: 1039985.368 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.393 units remaining) + - location: 16 (remaining gas: 1039985.358 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.363 units remaining) + - location: 13 (remaining gas: 1039985.328 units remaining) [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.384 units remaining) + - location: 17 (remaining gas: 1039984.349 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.369 units remaining) + - location: 18 (remaining gas: 1039984.334 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.359 units remaining) + - location: 19 (remaining gas: 1039984.324 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.344 units remaining) + - location: 20 (remaining gas: 1039984.309 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.329 units remaining) + - location: 21 (remaining gas: 1039984.294 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.314 units remaining) + - location: 23 (remaining gas: 1039984.279 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" index 43f9d8e9dda8..015cdca28d27 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" @@ -9,36 +9,36 @@ big_map diff Set map(4)["bar"] to 4 Set map(4)["foo"] to 11 trace - - location: 12 (remaining gas: 1039985.438 units remaining) + - location: 12 (remaining gas: 1039985.403 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.428 units remaining) + - location: 12 (remaining gas: 1039985.393 units remaining) [ "bar" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039985.413 units remaining) + - location: 13 (remaining gas: 1039985.378 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039985.403 units remaining) + - location: 15 (remaining gas: 1039985.368 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.393 units remaining) + - location: 16 (remaining gas: 1039985.358 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.363 units remaining) + - location: 13 (remaining gas: 1039985.328 units remaining) [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.384 units remaining) + - location: 17 (remaining gas: 1039984.349 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.369 units remaining) + - location: 18 (remaining gas: 1039984.334 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.359 units remaining) + - location: 19 (remaining gas: 1039984.324 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.344 units remaining) + - location: 20 (remaining gas: 1039984.309 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.329 units remaining) + - location: 21 (remaining gas: 1039984.294 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.314 units remaining) + - location: 23 (remaining gas: 1039984.279 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" index 53bc0976d17d..ec598646164c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map string nat) Set map(4)["foo"] to 0 trace - - location: 12 (remaining gas: 1039986.718 units remaining) + - location: 12 (remaining gas: 1039986.683 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - - location: 12 (remaining gas: 1039986.708 units remaining) + - location: 12 (remaining gas: 1039986.673 units remaining) [ "foo" (Pair { Elt "foo" 0 } None) ] - - location: 13 (remaining gas: 1039986.693 units remaining) + - location: 13 (remaining gas: 1039986.658 units remaining) [ (Pair { Elt "foo" 0 } None) ] - - location: 15 (remaining gas: 1039986.683 units remaining) + - location: 15 (remaining gas: 1039986.648 units remaining) [ { Elt "foo" 0 } ] - - location: 16 (remaining gas: 1039986.673 units remaining) + - location: 16 (remaining gas: 1039986.638 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: 13 (remaining gas: 1039986.643 units remaining) + - location: 13 (remaining gas: 1039986.608 units remaining) [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: 17 (remaining gas: 1039985.665 units remaining) + - location: 17 (remaining gas: 1039985.630 units remaining) [ True { Elt "foo" 0 } ] - - location: 18 (remaining gas: 1039985.650 units remaining) + - location: 18 (remaining gas: 1039985.615 units remaining) [ (Some True) { Elt "foo" 0 } ] - - location: 19 (remaining gas: 1039985.640 units remaining) + - location: 19 (remaining gas: 1039985.605 units remaining) [ { Elt "foo" 0 } (Some True) ] - - location: 20 (remaining gas: 1039985.625 units remaining) + - location: 20 (remaining gas: 1039985.590 units remaining) [ (Pair { Elt "foo" 0 } (Some True)) ] - - location: 21 (remaining gas: 1039985.610 units remaining) + - location: 21 (remaining gas: 1039985.575 units remaining) [ {} (Pair { Elt "foo" 0 } (Some True)) ] - - location: 23 (remaining gas: 1039985.595 units remaining) + - location: 23 (remaining gas: 1039985.560 units remaining) [ (Pair {} { Elt "foo" 0 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" index 138002e1ef11..3e6bad667561 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" @@ -8,36 +8,36 @@ big_map diff New map(4) of type (big_map string nat) Set map(4)["foo"] to 1 trace - - location: 12 (remaining gas: 1039986.718 units remaining) + - location: 12 (remaining gas: 1039986.683 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - - location: 12 (remaining gas: 1039986.708 units remaining) + - location: 12 (remaining gas: 1039986.673 units remaining) [ "bar" (Pair { Elt "foo" 1 } None) ] - - location: 13 (remaining gas: 1039986.693 units remaining) + - location: 13 (remaining gas: 1039986.658 units remaining) [ (Pair { Elt "foo" 1 } None) ] - - location: 15 (remaining gas: 1039986.683 units remaining) + - location: 15 (remaining gas: 1039986.648 units remaining) [ { Elt "foo" 1 } ] - - location: 16 (remaining gas: 1039986.673 units remaining) + - location: 16 (remaining gas: 1039986.638 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: 13 (remaining gas: 1039986.643 units remaining) + - location: 13 (remaining gas: 1039986.608 units remaining) [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: 17 (remaining gas: 1039985.665 units remaining) + - location: 17 (remaining gas: 1039985.630 units remaining) [ False { Elt "foo" 1 } ] - - location: 18 (remaining gas: 1039985.650 units remaining) + - location: 18 (remaining gas: 1039985.615 units remaining) [ (Some False) { Elt "foo" 1 } ] - - location: 19 (remaining gas: 1039985.640 units remaining) + - location: 19 (remaining gas: 1039985.605 units remaining) [ { Elt "foo" 1 } (Some False) ] - - location: 20 (remaining gas: 1039985.625 units remaining) + - location: 20 (remaining gas: 1039985.590 units remaining) [ (Pair { Elt "foo" 1 } (Some False)) ] - - location: 21 (remaining gas: 1039985.610 units remaining) + - location: 21 (remaining gas: 1039985.575 units remaining) [ {} (Pair { Elt "foo" 1 } (Some False)) ] - - location: 23 (remaining gas: 1039985.595 units remaining) + - location: 23 (remaining gas: 1039985.560 units remaining) [ (Pair {} { Elt "foo" 1 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" index f8b48e05251c..d71a657718c4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" @@ -7,36 +7,36 @@ emitted operations big_map diff New map(4) of type (big_map string nat) trace - - location: 12 (remaining gas: 1039987.960 units remaining) + - location: 12 (remaining gas: 1039987.925 units remaining) [ (Pair "bar" {} None) ] - - location: 12 (remaining gas: 1039987.950 units remaining) + - location: 12 (remaining gas: 1039987.915 units remaining) [ "bar" (Pair {} None) ] - - location: 13 (remaining gas: 1039987.935 units remaining) + - location: 13 (remaining gas: 1039987.900 units remaining) [ (Pair {} None) ] - - location: 15 (remaining gas: 1039987.925 units remaining) + - location: 15 (remaining gas: 1039987.890 units remaining) [ {} ] - - location: 16 (remaining gas: 1039987.915 units remaining) + - location: 16 (remaining gas: 1039987.880 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039987.885 units remaining) + - location: 13 (remaining gas: 1039987.850 units remaining) [ "bar" {} {} ] - - location: 17 (remaining gas: 1039986.909 units remaining) + - location: 17 (remaining gas: 1039986.874 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039986.894 units remaining) + - location: 18 (remaining gas: 1039986.859 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039986.884 units remaining) + - location: 19 (remaining gas: 1039986.849 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039986.869 units remaining) + - location: 20 (remaining gas: 1039986.834 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039986.854 units remaining) + - location: 21 (remaining gas: 1039986.819 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039986.839 units remaining) + - location: 23 (remaining gas: 1039986.804 units remaining) [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out index c23a873b9bc2..cdaffebe70b1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.391 units remaining) + - location: 8 (remaining gas: 1039993.356 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.381 units remaining) + - location: 8 (remaining gas: 1039993.346 units remaining) [ ] - - location: 9 (remaining gas: 1039993.371 units remaining) + - location: 9 (remaining gas: 1039993.336 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.356 units remaining) + - location: 12 (remaining gas: 1039993.321 units remaining) [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 13 (remaining gas: 1039993.341 units remaining) + - location: 13 (remaining gas: 1039993.306 units remaining) [ {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 15 (remaining gas: 1039993.326 units remaining) + - location: 15 (remaining gas: 1039993.291 units remaining) [ (Pair {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out index 57750ecd1f73..98817139447e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.391 units remaining) + - location: 8 (remaining gas: 1039993.356 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.381 units remaining) + - location: 8 (remaining gas: 1039993.346 units remaining) [ ] - - location: 9 (remaining gas: 1039993.371 units remaining) + - location: 9 (remaining gas: 1039993.336 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.356 units remaining) + - location: 12 (remaining gas: 1039993.321 units remaining) [ (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - - location: 13 (remaining gas: 1039993.341 units remaining) + - location: 13 (remaining gas: 1039993.306 units remaining) [ {} (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - - location: 15 (remaining gas: 1039993.326 units remaining) + - location: 15 (remaining gas: 1039993.291 units remaining) [ (Pair {} (Some 0x1000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out index b538dd115fcc..23e875e8bfba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.663 units remaining) + - location: 8 (remaining gas: 1039994.628 units remaining) [ 0 ] - - location: 9 (remaining gas: 1039994.648 units remaining) + - location: 9 (remaining gas: 1039994.613 units remaining) [ {} 0 ] - - location: 11 (remaining gas: 1039994.633 units remaining) + - location: 11 (remaining gas: 1039994.598 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out index 2ee44971f749..7ba1dfa939e6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.663 units remaining) + - location: 8 (remaining gas: 1039994.628 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039994.648 units remaining) + - location: 9 (remaining gas: 1039994.613 units remaining) [ {} 1 ] - - location: 11 (remaining gas: 1039994.633 units remaining) + - location: 11 (remaining gas: 1039994.598 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out index d99a8360631f..0374ef2cb915 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ] - - location: 8 (remaining gas: 1039994.663 units remaining) + - location: 8 (remaining gas: 1039994.628 units remaining) [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - - location: 9 (remaining gas: 1039994.648 units remaining) + - location: 9 (remaining gas: 1039994.613 units remaining) [ {} 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - - location: 11 (remaining gas: 1039994.633 units remaining) + - location: 11 (remaining gas: 1039994.598 units remaining) [ (Pair {} 17832688077013577776524784494464728518213913213412866604053735695200962927400) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out index 072eddd6dee5..2d4a04540704 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ] - - location: 8 (remaining gas: 1039994.663 units remaining) + - location: 8 (remaining gas: 1039994.628 units remaining) [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - - location: 9 (remaining gas: 1039994.648 units remaining) + - location: 9 (remaining gas: 1039994.613 units remaining) [ {} 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - - location: 11 (remaining gas: 1039994.633 units remaining) + - location: 11 (remaining gas: 1039994.598 units remaining) [ (Pair {} 11320265829256585830781521966149529460476767408210445238902869222031333517497) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out index 2c09c6747faa..d92f5e4aa288 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039989.509 units remaining) + - location: 7 (remaining gas: 1039989.474 units remaining) [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039989.499 units remaining) + - location: 7 (remaining gas: 1039989.464 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039989.374 units remaining) + - location: 8 (remaining gas: 1039989.339 units remaining) [ 16 ] - - location: 9 (remaining gas: 1039989.359 units remaining) + - location: 9 (remaining gas: 1039989.324 units remaining) [ (Some 16) ] - - location: 11 (remaining gas: 1039989.349 units remaining) + - location: 11 (remaining gas: 1039989.314 units remaining) [ 16 ] - - location: 11 (remaining gas: 1039989.334 units remaining) + - location: 11 (remaining gas: 1039989.299 units remaining) [ 16 ] - - location: 17 (remaining gas: 1039989.324 units remaining) + - location: 17 (remaining gas: 1039989.289 units remaining) [ 1 16 ] - - location: 20 (remaining gas: 1039989.324 units remaining) + - location: 20 (remaining gas: 1039989.289 units remaining) [ 16 ] - - location: 21 (remaining gas: 1039989.309 units remaining) + - location: 21 (remaining gas: 1039989.274 units remaining) [ {} 16 ] - - location: 23 (remaining gas: 1039989.294 units remaining) + - location: 23 (remaining gas: 1039989.259 units remaining) [ (Pair {} 16) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out index ae11b1b77922..1f66b69d84a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ -42 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out index e45e96c05feb..c3185be8619c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 2 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out index 6f951075d84c..3033384d3d58 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ -1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out index a1ad16ec1f37..1e7c193342b7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.458 units remaining) + - location: 8 (remaining gas: 1039994.423 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.443 units remaining) + - location: 9 (remaining gas: 1039994.408 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.428 units remaining) + - location: 11 (remaining gas: 1039994.393 units remaining) [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out index 84906a164a12..6afa5bdab325 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out index 68102fa494aa..a3115bb6788e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out index 894554b52749..e5bf6eedc194 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out index db34b4115d19..94369a796b80 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out index 3106a2674739..be68da535c93 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out index c116e842a71b..5348ea176e75 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out index a4195cc3be89..c62d439881ad 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out index 9f942855e22f..54d20a5524c7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 0 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.458 units remaining) + - location: 8 (remaining gas: 1039994.423 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.443 units remaining) + - location: 9 (remaining gas: 1039994.408 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.428 units remaining) + - location: 11 (remaining gas: 1039994.393 units remaining) [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out index 85b20c111e71..be0bcffab83b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out index 803db298cd4f..e0e973ac70ae 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 2 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.457 units remaining) + - location: 8 (remaining gas: 1039994.422 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039994.442 units remaining) + - location: 9 (remaining gas: 1039994.407 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039994.427 units remaining) + - location: 11 (remaining gas: 1039994.392 units remaining) [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out index 930b37a402b5..aa6e92bc5aa2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out index f9dd4e0b5840..bf0194833221 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out index 0667104a8ab0..09f02c9d4b79 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out index 805487c5c0aa..e1ed8545d7e2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.798 units remaining) + - location: 7 (remaining gas: 1039994.763 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.788 units remaining) + - location: 7 (remaining gas: 1039994.753 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.424 units remaining) + - location: 8 (remaining gas: 1039994.389 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039994.409 units remaining) + - location: 9 (remaining gas: 1039994.374 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039994.394 units remaining) + - location: 11 (remaining gas: 1039994.359 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out index b59d98bd9821..9f666f0692f9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 2 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 2 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out index 47699c6b954e..bd54ae051ac9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ -1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 -1 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out index fa6edceede58..159bc17380af 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 0 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0 ] - - location: 9 (remaining gas: 1039993.850 units remaining) + - location: 9 (remaining gas: 1039993.815 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.835 units remaining) + - location: 10 (remaining gas: 1039993.800 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.820 units remaining) + - location: 12 (remaining gas: 1039993.785 units remaining) [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out index 565d87212883..7177a41a908d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ -42 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 -42 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out index 5c627e828ba3..9aa105dee5fe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 1 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out index 29ecaf0f8bd6..0ad1d287836d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out index e142c2f449f6..9ca38a00e22d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out index 4653f893394d..5bf336f5154e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out index 0f9a7dcaa2ad..20ad78282e81 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out index 911876413e2c..82d61277ad76 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out index a49ced7be2b3..7c8b08569611 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out index 9073ccb95a0a..f9b4c8619995 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 0 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0 ] - - location: 9 (remaining gas: 1039993.850 units remaining) + - location: 9 (remaining gas: 1039993.815 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.835 units remaining) + - location: 10 (remaining gas: 1039993.800 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.820 units remaining) + - location: 12 (remaining gas: 1039993.785 units remaining) [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out index 790176f39a55..be2dd23f0543 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 1 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 1 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out index 2d8931cb7681..1e0b5f4205de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 2 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 2 ] - - location: 9 (remaining gas: 1039993.849 units remaining) + - location: 9 (remaining gas: 1039993.814 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.834 units remaining) + - location: 10 (remaining gas: 1039993.799 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039993.819 units remaining) + - location: 12 (remaining gas: 1039993.784 units remaining) [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out index 42386c0957d8..acfd6d99c04f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out index 05eed80df7fe..7591ca86e29e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out index 154de78b52fa..8bae5dd01bfb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out index 0e82c89bff8a..0b70fee2cd86 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.200 units remaining) + - location: 7 (remaining gas: 1039994.165 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.190 units remaining) + - location: 7 (remaining gas: 1039994.155 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - - location: 8 (remaining gas: 1039994.180 units remaining) + - location: 8 (remaining gas: 1039994.145 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - - location: 9 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.781 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.801 units remaining) + - location: 10 (remaining gas: 1039993.766 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039993.786 units remaining) + - location: 12 (remaining gas: 1039993.751 units remaining) [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out index b45e3a3f76f6..e6ee8d5c748f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.492 units remaining) + - location: 9 (remaining gas: 1039994.457 units remaining) [ (Pair (Pair 34 17) 0) ] - - location: 9 (remaining gas: 1039994.482 units remaining) + - location: 9 (remaining gas: 1039994.447 units remaining) [ (Pair 34 17) ] - - location: 10 (remaining gas: 1039994.472 units remaining) + - location: 10 (remaining gas: 1039994.437 units remaining) [ 34 ] - - location: 11 (remaining gas: 1039994.457 units remaining) + - location: 11 (remaining gas: 1039994.422 units remaining) [ {} 34 ] - - location: 13 (remaining gas: 1039994.442 units remaining) + - location: 13 (remaining gas: 1039994.407 units remaining) [ (Pair {} 34) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out index 3754a4b45720..19d88f06ec07 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.492 units remaining) + - location: 9 (remaining gas: 1039994.457 units remaining) [ (Pair (Pair 34 17) 0) ] - - location: 9 (remaining gas: 1039994.482 units remaining) + - location: 9 (remaining gas: 1039994.447 units remaining) [ (Pair 34 17) ] - - location: 10 (remaining gas: 1039994.472 units remaining) + - location: 10 (remaining gas: 1039994.437 units remaining) [ 17 ] - - location: 11 (remaining gas: 1039994.457 units remaining) + - location: 11 (remaining gas: 1039994.422 units remaining) [ {} 17 ] - - location: 13 (remaining gas: 1039994.442 units remaining) + - location: 13 (remaining gas: 1039994.407 units remaining) [ (Pair {} 17) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" index 530ae4ba6d6b..95a94fee7d1b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.257 units remaining) + - location: 8 (remaining gas: 1039992.222 units remaining) [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - - location: 8 (remaining gas: 1039992.247 units remaining) + - location: 8 (remaining gas: 1039992.212 units remaining) [ ] - - location: 9 (remaining gas: 1039992.232 units remaining) + - location: 9 (remaining gas: 1039992.197 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039992.217 units remaining) + - location: 10 (remaining gas: 1039992.182 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039992.202 units remaining) + - location: 11 (remaining gas: 1039992.167 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039992.187 units remaining) + - location: 13 (remaining gas: 1039992.152 units remaining) [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" index b297aafdc731..252c6527ca5e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.807 units remaining) + - location: 8 (remaining gas: 1039993.772 units remaining) [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - - location: 8 (remaining gas: 1039993.797 units remaining) + - location: 8 (remaining gas: 1039993.762 units remaining) [ ] - - location: 9 (remaining gas: 1039993.782 units remaining) + - location: 9 (remaining gas: 1039993.747 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039993.767 units remaining) + - location: 10 (remaining gas: 1039993.732 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039993.752 units remaining) + - location: 11 (remaining gas: 1039993.717 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039993.737 units remaining) + - location: 13 (remaining gas: 1039993.702 units remaining) [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" index e9a1e54f7ba9..e954fcd38e37 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ ] - - location: 9 (remaining gas: 1039993.932 units remaining) + - location: 9 (remaining gas: 1039993.897 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039993.917 units remaining) + - location: 10 (remaining gas: 1039993.882 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039993.902 units remaining) + - location: 11 (remaining gas: 1039993.867 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039993.887 units remaining) + - location: 13 (remaining gas: 1039993.852 units remaining) [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out index 84381ccb6e39..1cfb3dbfc468 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out @@ -7,117 +7,117 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039950.642 units remaining) + - location: 11 (remaining gas: 1039950.607 units remaining) [ (Pair (Pair 1 4 2 Unit) Unit) ] - - location: 11 (remaining gas: 1039950.632 units remaining) + - location: 11 (remaining gas: 1039950.597 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 12 (remaining gas: 1039950.622 units remaining) + - location: 12 (remaining gas: 1039950.587 units remaining) [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - location: 13 (remaining gas: 1039950.612 units remaining) + - location: 13 (remaining gas: 1039950.577 units remaining) [ 1 (Pair 1 4 2 Unit) ] - - location: 14 (remaining gas: 1039950.602 units remaining) + - location: 14 (remaining gas: 1039950.567 units remaining) [ 1 1 (Pair 1 4 2 Unit) ] - - location: 19 (remaining gas: 1039950.567 units remaining) + - location: 19 (remaining gas: 1039950.532 units remaining) [ 0 (Pair 1 4 2 Unit) ] - - location: 20 (remaining gas: 1039950.552 units remaining) + - location: 20 (remaining gas: 1039950.517 units remaining) [ True (Pair 1 4 2 Unit) ] - - location: 21 (remaining gas: 1039950.542 units remaining) + - location: 21 (remaining gas: 1039950.507 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 21 (remaining gas: 1039950.527 units remaining) + - location: 21 (remaining gas: 1039950.492 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 27 (remaining gas: 1039950.517 units remaining) + - location: 27 (remaining gas: 1039950.482 units remaining) [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - location: 28 (remaining gas: 1039950.487 units remaining) + - location: 28 (remaining gas: 1039950.452 units remaining) [ 1 (Pair 1 4 2 Unit) ] - - location: 30 (remaining gas: 1039950.477 units remaining) + - location: 30 (remaining gas: 1039950.442 units remaining) [ 1 1 (Pair 1 4 2 Unit) ] - - location: 35 (remaining gas: 1039950.442 units remaining) + - location: 35 (remaining gas: 1039950.407 units remaining) [ 0 (Pair 1 4 2 Unit) ] - - location: 36 (remaining gas: 1039950.427 units remaining) + - location: 36 (remaining gas: 1039950.392 units remaining) [ True (Pair 1 4 2 Unit) ] - - location: 37 (remaining gas: 1039950.417 units remaining) + - location: 37 (remaining gas: 1039950.382 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 37 (remaining gas: 1039950.402 units remaining) + - location: 37 (remaining gas: 1039950.367 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 43 (remaining gas: 1039950.392 units remaining) + - location: 43 (remaining gas: 1039950.357 units remaining) [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - location: 44 (remaining gas: 1039950.361 units remaining) + - location: 44 (remaining gas: 1039950.326 units remaining) [ 4 (Pair 1 4 2 Unit) ] - - location: 46 (remaining gas: 1039950.351 units remaining) + - location: 46 (remaining gas: 1039950.316 units remaining) [ 4 4 (Pair 1 4 2 Unit) ] - - location: 51 (remaining gas: 1039950.316 units remaining) + - location: 51 (remaining gas: 1039950.281 units remaining) [ 0 (Pair 1 4 2 Unit) ] - - location: 52 (remaining gas: 1039950.301 units remaining) + - location: 52 (remaining gas: 1039950.266 units remaining) [ True (Pair 1 4 2 Unit) ] - - location: 53 (remaining gas: 1039950.291 units remaining) + - location: 53 (remaining gas: 1039950.256 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 53 (remaining gas: 1039950.276 units remaining) + - location: 53 (remaining gas: 1039950.241 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 59 (remaining gas: 1039950.266 units remaining) + - location: 59 (remaining gas: 1039950.231 units remaining) [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - location: 60 (remaining gas: 1039950.234 units remaining) + - location: 60 (remaining gas: 1039950.199 units remaining) [ 2 (Pair 1 4 2 Unit) ] - - location: 62 (remaining gas: 1039950.224 units remaining) + - location: 62 (remaining gas: 1039950.189 units remaining) [ 2 2 (Pair 1 4 2 Unit) ] - - location: 67 (remaining gas: 1039950.189 units remaining) + - location: 67 (remaining gas: 1039950.154 units remaining) [ 0 (Pair 1 4 2 Unit) ] - - location: 68 (remaining gas: 1039950.174 units remaining) + - location: 68 (remaining gas: 1039950.139 units remaining) [ True (Pair 1 4 2 Unit) ] - - location: 69 (remaining gas: 1039950.164 units remaining) + - location: 69 (remaining gas: 1039950.129 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 69 (remaining gas: 1039950.149 units remaining) + - location: 69 (remaining gas: 1039950.114 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 75 (remaining gas: 1039950.139 units remaining) + - location: 75 (remaining gas: 1039950.104 units remaining) [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - location: 76 (remaining gas: 1039950.106 units remaining) + - location: 76 (remaining gas: 1039950.071 units remaining) [ Unit (Pair 1 4 2 Unit) ] - - location: 78 (remaining gas: 1039950.096 units remaining) + - location: 78 (remaining gas: 1039950.061 units remaining) [ Unit Unit (Pair 1 4 2 Unit) ] - - location: 81 (remaining gas: 1039950.086 units remaining) + - location: 81 (remaining gas: 1039950.051 units remaining) [ 0 (Pair 1 4 2 Unit) ] - - location: 82 (remaining gas: 1039950.071 units remaining) + - location: 82 (remaining gas: 1039950.036 units remaining) [ True (Pair 1 4 2 Unit) ] - - location: 83 (remaining gas: 1039950.061 units remaining) + - location: 83 (remaining gas: 1039950.026 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 83 (remaining gas: 1039950.046 units remaining) + - location: 83 (remaining gas: 1039950.011 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 89 (remaining gas: 1039950.036 units remaining) + - location: 89 (remaining gas: 1039950.001 units remaining) [ ] - - location: 90 (remaining gas: 1039950.026 units remaining) + - location: 90 (remaining gas: 1039949.991 units remaining) [ Unit ] - - location: 91 (remaining gas: 1039950.011 units remaining) + - location: 91 (remaining gas: 1039949.976 units remaining) [ {} Unit ] - - location: 93 (remaining gas: 1039949.996 units remaining) + - location: 93 (remaining gas: 1039949.961 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" index 3a51b3621552..d9f905912bb8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039985.116 units remaining) + - location: 16 (remaining gas: 1039985.081 units remaining) [ (Pair (Pair 1 4 2 Unit) None) ] - - location: 16 (remaining gas: 1039985.106 units remaining) + - location: 16 (remaining gas: 1039985.071 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 17 (remaining gas: 1039985.096 units remaining) + - location: 17 (remaining gas: 1039985.061 units remaining) [ 2 (Pair 1 4 2 Unit) ] - - location: 20 (remaining gas: 1039985.055 units remaining) + - location: 20 (remaining gas: 1039985.020 units remaining) [ (Pair 2 4 2 Unit) ] - - location: 22 (remaining gas: 1039985.045 units remaining) + - location: 22 (remaining gas: 1039985.010 units remaining) [ "toto" (Pair 2 4 2 Unit) ] - - location: 25 (remaining gas: 1039984.999 units remaining) + - location: 25 (remaining gas: 1039984.964 units remaining) [ (Pair 2 4 "toto" Unit) ] - - location: 27 (remaining gas: 1039984.989 units remaining) + - location: 27 (remaining gas: 1039984.954 units remaining) [ 0x01 (Pair 2 4 "toto" Unit) ] - - location: 30 (remaining gas: 1039984.942 units remaining) + - location: 30 (remaining gas: 1039984.907 units remaining) [ (Pair 2 4 "toto" 0x01) ] - - location: 32 (remaining gas: 1039984.927 units remaining) + - location: 32 (remaining gas: 1039984.892 units remaining) [ (Some (Pair 2 4 "toto" 0x01)) ] - - location: 33 (remaining gas: 1039984.912 units remaining) + - location: 33 (remaining gas: 1039984.877 units remaining) [ {} (Some (Pair 2 4 "toto" 0x01)) ] - - location: 35 (remaining gas: 1039984.897 units remaining) + - location: 35 (remaining gas: 1039984.862 units remaining) [ (Pair {} (Some (Pair 2 4 "toto" 0x01))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out index ab1120011e12..0fb38b6d8463 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out @@ -7,33 +7,33 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039985.453 units remaining) + - location: 11 (remaining gas: 1039985.418 units remaining) [ (Pair Unit 1 4 2 Unit) ] - - location: 11 (remaining gas: 1039985.443 units remaining) + - location: 11 (remaining gas: 1039985.408 units remaining) [ (Pair 1 4 2 Unit) ] - - location: 12 (remaining gas: 1039985.433 units remaining) + - location: 12 (remaining gas: 1039985.398 units remaining) [ 2 (Pair 1 4 2 Unit) ] - - location: 15 (remaining gas: 1039985.392 units remaining) + - location: 15 (remaining gas: 1039985.357 units remaining) [ (Pair 2 4 2 Unit) ] - - location: 17 (remaining gas: 1039985.382 units remaining) + - location: 17 (remaining gas: 1039985.347 units remaining) [ 12 (Pair 2 4 2 Unit) ] - - location: 20 (remaining gas: 1039985.339 units remaining) + - location: 20 (remaining gas: 1039985.304 units remaining) [ (Pair 2 12 2 Unit) ] - - location: 22 (remaining gas: 1039985.329 units remaining) + - location: 22 (remaining gas: 1039985.294 units remaining) [ 8 (Pair 2 12 2 Unit) ] - - location: 25 (remaining gas: 1039985.283 units remaining) + - location: 25 (remaining gas: 1039985.248 units remaining) [ (Pair 2 12 8 Unit) ] - - location: 27 (remaining gas: 1039985.273 units remaining) + - location: 27 (remaining gas: 1039985.238 units remaining) [ Unit (Pair 2 12 8 Unit) ] - - location: 28 (remaining gas: 1039985.226 units remaining) + - location: 28 (remaining gas: 1039985.191 units remaining) [ (Pair 2 12 8 Unit) ] - - location: 30 (remaining gas: 1039985.211 units remaining) + - location: 30 (remaining gas: 1039985.176 units remaining) [ {} (Pair 2 12 8 Unit) ] - - location: 32 (remaining gas: 1039985.196 units remaining) + - location: 32 (remaining gas: 1039985.161 units remaining) [ (Pair {} 2 12 8 Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out index b23d86105f2e..5141a8da7c3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.399 units remaining) + - location: 10 (remaining gas: 1039990.364 units remaining) [ (Pair Unit 0 0 0) ] - - location: 10 (remaining gas: 1039990.389 units remaining) + - location: 10 (remaining gas: 1039990.354 units remaining) [ ] - - location: 11 (remaining gas: 1039990.379 units remaining) + - location: 11 (remaining gas: 1039990.344 units remaining) [ 3 ] - - location: 14 (remaining gas: 1039990.369 units remaining) + - location: 14 (remaining gas: 1039990.334 units remaining) [ 2 3 ] - - location: 17 (remaining gas: 1039990.359 units remaining) + - location: 17 (remaining gas: 1039990.324 units remaining) [ 1 2 3 ] - - location: 20 (remaining gas: 1039990.344 units remaining) + - location: 20 (remaining gas: 1039990.309 units remaining) [ {} 1 2 3 ] - - location: 22 (remaining gas: 1039990.330 units remaining) + - location: 22 (remaining gas: 1039990.295 units remaining) [ (Pair {} 1 2 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out index 72e683be9eb4..d0a2f296f00d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out @@ -7,392 +7,392 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039782.668 units remaining) + - location: 7 (remaining gas: 1039782.633 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039782.658 units remaining) + - location: 7 (remaining gas: 1039782.623 units remaining) [ ] - - location: 8 (remaining gas: 1039782.648 units remaining) + - location: 8 (remaining gas: 1039782.613 units remaining) [ True ] - - location: 11 (remaining gas: 1039782.638 units remaining) + - location: 11 (remaining gas: 1039782.603 units remaining) [ True True ] - - location: 12 (remaining gas: 1039782.603 units remaining) + - location: 12 (remaining gas: 1039782.568 units remaining) [ 0 ] - - location: 14 (remaining gas: 1039782.588 units remaining) + - location: 14 (remaining gas: 1039782.553 units remaining) [ True ] - - location: 15 (remaining gas: 1039782.578 units remaining) + - location: 15 (remaining gas: 1039782.543 units remaining) [ ] - - location: 15 (remaining gas: 1039782.563 units remaining) + - location: 15 (remaining gas: 1039782.528 units remaining) [ ] - - location: 21 (remaining gas: 1039782.553 units remaining) + - location: 21 (remaining gas: 1039782.518 units remaining) [ False ] - - location: 24 (remaining gas: 1039782.543 units remaining) + - location: 24 (remaining gas: 1039782.508 units remaining) [ False False ] - - location: 25 (remaining gas: 1039782.508 units remaining) + - location: 25 (remaining gas: 1039782.473 units remaining) [ 0 ] - - location: 27 (remaining gas: 1039782.493 units remaining) + - location: 27 (remaining gas: 1039782.458 units remaining) [ True ] - - location: 28 (remaining gas: 1039782.483 units remaining) + - location: 28 (remaining gas: 1039782.448 units remaining) [ ] - - location: 28 (remaining gas: 1039782.468 units remaining) + - location: 28 (remaining gas: 1039782.433 units remaining) [ ] - - location: 34 (remaining gas: 1039782.458 units remaining) + - location: 34 (remaining gas: 1039782.423 units remaining) [ False ] - - location: 37 (remaining gas: 1039782.448 units remaining) + - location: 37 (remaining gas: 1039782.413 units remaining) [ True False ] - - location: 40 (remaining gas: 1039782.413 units remaining) + - location: 40 (remaining gas: 1039782.378 units remaining) [ 1 ] - - location: 42 (remaining gas: 1039782.398 units remaining) + - location: 42 (remaining gas: 1039782.363 units remaining) [ True ] - - location: 43 (remaining gas: 1039782.388 units remaining) + - location: 43 (remaining gas: 1039782.353 units remaining) [ ] - - location: 43 (remaining gas: 1039782.373 units remaining) + - location: 43 (remaining gas: 1039782.338 units remaining) [ ] - - location: 49 (remaining gas: 1039782.363 units remaining) + - location: 49 (remaining gas: 1039782.328 units remaining) [ True ] - - location: 52 (remaining gas: 1039782.353 units remaining) + - location: 52 (remaining gas: 1039782.318 units remaining) [ False True ] - - location: 55 (remaining gas: 1039782.318 units remaining) + - location: 55 (remaining gas: 1039782.283 units remaining) [ -1 ] - - location: 57 (remaining gas: 1039782.303 units remaining) + - location: 57 (remaining gas: 1039782.268 units remaining) [ True ] - - location: 58 (remaining gas: 1039782.293 units remaining) + - location: 58 (remaining gas: 1039782.258 units remaining) [ ] - - location: 58 (remaining gas: 1039782.278 units remaining) + - location: 58 (remaining gas: 1039782.243 units remaining) [ ] - - location: 64 (remaining gas: 1039782.268 units remaining) + - location: 64 (remaining gas: 1039782.233 units remaining) [ 0xaabbcc ] - - location: 67 (remaining gas: 1039782.258 units remaining) + - location: 67 (remaining gas: 1039782.223 units remaining) [ 0xaabbcc 0xaabbcc ] - - location: 68 (remaining gas: 1039782.223 units remaining) + - location: 68 (remaining gas: 1039782.188 units remaining) [ 0 ] - - location: 70 (remaining gas: 1039782.208 units remaining) + - location: 70 (remaining gas: 1039782.173 units remaining) [ True ] - - location: 71 (remaining gas: 1039782.198 units remaining) + - location: 71 (remaining gas: 1039782.163 units remaining) [ ] - - location: 71 (remaining gas: 1039782.183 units remaining) + - location: 71 (remaining gas: 1039782.148 units remaining) [ ] - - location: 77 (remaining gas: 1039782.173 units remaining) + - location: 77 (remaining gas: 1039782.138 units remaining) [ 0x ] - - location: 80 (remaining gas: 1039782.163 units remaining) + - location: 80 (remaining gas: 1039782.128 units remaining) [ 0x 0x ] - - location: 83 (remaining gas: 1039782.128 units remaining) + - location: 83 (remaining gas: 1039782.093 units remaining) [ 0 ] - - location: 85 (remaining gas: 1039782.113 units remaining) + - location: 85 (remaining gas: 1039782.078 units remaining) [ True ] - - location: 86 (remaining gas: 1039782.103 units remaining) + - location: 86 (remaining gas: 1039782.068 units remaining) [ ] - - location: 86 (remaining gas: 1039782.088 units remaining) + - location: 86 (remaining gas: 1039782.053 units remaining) [ ] - - location: 92 (remaining gas: 1039782.078 units remaining) + - location: 92 (remaining gas: 1039782.043 units remaining) [ 0x ] - - location: 95 (remaining gas: 1039782.068 units remaining) + - location: 95 (remaining gas: 1039782.033 units remaining) [ 0x01 0x ] - - location: 98 (remaining gas: 1039782.033 units remaining) + - location: 98 (remaining gas: 1039781.998 units remaining) [ 1 ] - - location: 100 (remaining gas: 1039782.018 units remaining) + - location: 100 (remaining gas: 1039781.983 units remaining) [ True ] - - location: 101 (remaining gas: 1039782.008 units remaining) + - location: 101 (remaining gas: 1039781.973 units remaining) [ ] - - location: 101 (remaining gas: 1039781.993 units remaining) + - location: 101 (remaining gas: 1039781.958 units remaining) [ ] - - location: 107 (remaining gas: 1039781.983 units remaining) + - location: 107 (remaining gas: 1039781.948 units remaining) [ 0x01 ] - - location: 110 (remaining gas: 1039781.973 units remaining) + - location: 110 (remaining gas: 1039781.938 units remaining) [ 0x02 0x01 ] - - location: 113 (remaining gas: 1039781.938 units remaining) + - location: 113 (remaining gas: 1039781.903 units remaining) [ 1 ] - - location: 115 (remaining gas: 1039781.923 units remaining) + - location: 115 (remaining gas: 1039781.888 units remaining) [ True ] - - location: 116 (remaining gas: 1039781.913 units remaining) + - location: 116 (remaining gas: 1039781.878 units remaining) [ ] - - location: 116 (remaining gas: 1039781.898 units remaining) + - location: 116 (remaining gas: 1039781.863 units remaining) [ ] - - location: 122 (remaining gas: 1039781.888 units remaining) + - location: 122 (remaining gas: 1039781.853 units remaining) [ 0x02 ] - - location: 125 (remaining gas: 1039781.878 units remaining) + - location: 125 (remaining gas: 1039781.843 units remaining) [ 0x01 0x02 ] - - location: 128 (remaining gas: 1039781.843 units remaining) + - location: 128 (remaining gas: 1039781.808 units remaining) [ -1 ] - - location: 130 (remaining gas: 1039781.828 units remaining) + - location: 130 (remaining gas: 1039781.793 units remaining) [ True ] - - location: 131 (remaining gas: 1039781.818 units remaining) + - location: 131 (remaining gas: 1039781.783 units remaining) [ ] - - location: 131 (remaining gas: 1039781.803 units remaining) + - location: 131 (remaining gas: 1039781.768 units remaining) [ ] - - location: 137 (remaining gas: 1039781.793 units remaining) + - location: 137 (remaining gas: 1039781.758 units remaining) [ 1 ] - - location: 140 (remaining gas: 1039781.783 units remaining) + - location: 140 (remaining gas: 1039781.748 units remaining) [ 1 1 ] - - location: 141 (remaining gas: 1039781.748 units remaining) + - location: 141 (remaining gas: 1039781.713 units remaining) [ 0 ] - - location: 143 (remaining gas: 1039781.733 units remaining) + - location: 143 (remaining gas: 1039781.698 units remaining) [ True ] - - location: 144 (remaining gas: 1039781.723 units remaining) + - location: 144 (remaining gas: 1039781.688 units remaining) [ ] - - location: 144 (remaining gas: 1039781.708 units remaining) + - location: 144 (remaining gas: 1039781.673 units remaining) [ ] - - location: 150 (remaining gas: 1039781.698 units remaining) + - location: 150 (remaining gas: 1039781.663 units remaining) [ 10 ] - - location: 153 (remaining gas: 1039781.688 units remaining) + - location: 153 (remaining gas: 1039781.653 units remaining) [ 5 10 ] - - location: 156 (remaining gas: 1039781.653 units remaining) + - location: 156 (remaining gas: 1039781.618 units remaining) [ -1 ] - - location: 158 (remaining gas: 1039781.638 units remaining) + - location: 158 (remaining gas: 1039781.603 units remaining) [ True ] - - location: 159 (remaining gas: 1039781.628 units remaining) + - location: 159 (remaining gas: 1039781.593 units remaining) [ ] - - location: 159 (remaining gas: 1039781.613 units remaining) + - location: 159 (remaining gas: 1039781.578 units remaining) [ ] - - location: 165 (remaining gas: 1039781.603 units remaining) + - location: 165 (remaining gas: 1039781.568 units remaining) [ -4 ] - - location: 168 (remaining gas: 1039781.593 units remaining) + - location: 168 (remaining gas: 1039781.558 units remaining) [ 1923 -4 ] - - location: 171 (remaining gas: 1039781.558 units remaining) + - location: 171 (remaining gas: 1039781.523 units remaining) [ 1 ] - - location: 173 (remaining gas: 1039781.543 units remaining) + - location: 173 (remaining gas: 1039781.508 units remaining) [ True ] - - location: 174 (remaining gas: 1039781.533 units remaining) + - location: 174 (remaining gas: 1039781.498 units remaining) [ ] - - location: 174 (remaining gas: 1039781.518 units remaining) + - location: 174 (remaining gas: 1039781.483 units remaining) [ ] - - location: 180 (remaining gas: 1039781.508 units remaining) + - location: 180 (remaining gas: 1039781.473 units remaining) [ 1 ] - - location: 183 (remaining gas: 1039781.498 units remaining) + - location: 183 (remaining gas: 1039781.463 units remaining) [ 1 1 ] - - location: 184 (remaining gas: 1039781.463 units remaining) + - location: 184 (remaining gas: 1039781.428 units remaining) [ 0 ] - - location: 186 (remaining gas: 1039781.448 units remaining) + - location: 186 (remaining gas: 1039781.413 units remaining) [ True ] - - location: 187 (remaining gas: 1039781.438 units remaining) + - location: 187 (remaining gas: 1039781.403 units remaining) [ ] - - location: 187 (remaining gas: 1039781.423 units remaining) + - location: 187 (remaining gas: 1039781.388 units remaining) [ ] - - location: 193 (remaining gas: 1039781.413 units remaining) + - location: 193 (remaining gas: 1039781.378 units remaining) [ 10 ] - - location: 196 (remaining gas: 1039781.403 units remaining) + - location: 196 (remaining gas: 1039781.368 units remaining) [ 5 10 ] - - location: 199 (remaining gas: 1039781.368 units remaining) + - location: 199 (remaining gas: 1039781.333 units remaining) [ -1 ] - - location: 201 (remaining gas: 1039781.353 units remaining) + - location: 201 (remaining gas: 1039781.318 units remaining) [ True ] - - location: 202 (remaining gas: 1039781.343 units remaining) + - location: 202 (remaining gas: 1039781.308 units remaining) [ ] - - location: 202 (remaining gas: 1039781.328 units remaining) + - location: 202 (remaining gas: 1039781.293 units remaining) [ ] - - location: 208 (remaining gas: 1039781.318 units remaining) + - location: 208 (remaining gas: 1039781.283 units remaining) [ 4 ] - - location: 211 (remaining gas: 1039781.308 units remaining) + - location: 211 (remaining gas: 1039781.273 units remaining) [ 1923 4 ] - - location: 214 (remaining gas: 1039781.273 units remaining) + - location: 214 (remaining gas: 1039781.238 units remaining) [ 1 ] - - location: 216 (remaining gas: 1039781.258 units remaining) + - location: 216 (remaining gas: 1039781.223 units remaining) [ True ] - - location: 217 (remaining gas: 1039781.248 units remaining) + - location: 217 (remaining gas: 1039781.213 units remaining) [ ] - - location: 217 (remaining gas: 1039781.233 units remaining) + - location: 217 (remaining gas: 1039781.198 units remaining) [ ] - - location: 223 (remaining gas: 1039781.223 units remaining) + - location: 223 (remaining gas: 1039781.188 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 226 (remaining gas: 1039781.213 units remaining) + - location: 226 (remaining gas: 1039781.178 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 227 (remaining gas: 1039781.177 units remaining) + - location: 227 (remaining gas: 1039781.142 units remaining) [ 0 ] - - location: 229 (remaining gas: 1039781.162 units remaining) + - location: 229 (remaining gas: 1039781.127 units remaining) [ True ] - - location: 230 (remaining gas: 1039781.152 units remaining) + - location: 230 (remaining gas: 1039781.117 units remaining) [ ] - - location: 230 (remaining gas: 1039781.137 units remaining) + - location: 230 (remaining gas: 1039781.102 units remaining) [ ] - - location: 236 (remaining gas: 1039781.127 units remaining) + - location: 236 (remaining gas: 1039781.092 units remaining) [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - - location: 239 (remaining gas: 1039781.117 units remaining) + - location: 239 (remaining gas: 1039781.082 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - - location: 242 (remaining gas: 1039781.081 units remaining) + - location: 242 (remaining gas: 1039781.046 units remaining) [ -1 ] - - location: 244 (remaining gas: 1039781.066 units remaining) + - location: 244 (remaining gas: 1039781.031 units remaining) [ True ] - - location: 245 (remaining gas: 1039781.056 units remaining) + - location: 245 (remaining gas: 1039781.021 units remaining) [ ] - - location: 245 (remaining gas: 1039781.041 units remaining) + - location: 245 (remaining gas: 1039781.006 units remaining) [ ] - - location: 251 (remaining gas: 1039781.031 units remaining) + - location: 251 (remaining gas: 1039780.996 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 254 (remaining gas: 1039781.021 units remaining) + - location: 254 (remaining gas: 1039780.986 units remaining) [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 257 (remaining gas: 1039780.985 units remaining) + - location: 257 (remaining gas: 1039780.950 units remaining) [ 1 ] - - location: 259 (remaining gas: 1039780.970 units remaining) + - location: 259 (remaining gas: 1039780.935 units remaining) [ True ] - - location: 260 (remaining gas: 1039780.960 units remaining) + - location: 260 (remaining gas: 1039780.925 units remaining) [ ] - - location: 260 (remaining gas: 1039780.945 units remaining) + - location: 260 (remaining gas: 1039780.910 units remaining) [ ] - - location: 266 (remaining gas: 1039780.935 units remaining) + - location: 266 (remaining gas: 1039780.900 units remaining) [ 1 ] - - location: 269 (remaining gas: 1039780.925 units remaining) + - location: 269 (remaining gas: 1039780.890 units remaining) [ 1 1 ] - - location: 270 (remaining gas: 1039780.890 units remaining) + - location: 270 (remaining gas: 1039780.855 units remaining) [ 0 ] - - location: 272 (remaining gas: 1039780.875 units remaining) + - location: 272 (remaining gas: 1039780.840 units remaining) [ True ] - - location: 273 (remaining gas: 1039780.865 units remaining) + - location: 273 (remaining gas: 1039780.830 units remaining) [ ] - - location: 273 (remaining gas: 1039780.850 units remaining) + - location: 273 (remaining gas: 1039780.815 units remaining) [ ] - - location: 279 (remaining gas: 1039780.840 units remaining) + - location: 279 (remaining gas: 1039780.805 units remaining) [ 10 ] - - location: 282 (remaining gas: 1039780.830 units remaining) + - location: 282 (remaining gas: 1039780.795 units remaining) [ 5 10 ] - - location: 285 (remaining gas: 1039780.795 units remaining) + - location: 285 (remaining gas: 1039780.760 units remaining) [ -1 ] - - location: 287 (remaining gas: 1039780.780 units remaining) + - location: 287 (remaining gas: 1039780.745 units remaining) [ True ] - - location: 288 (remaining gas: 1039780.770 units remaining) + - location: 288 (remaining gas: 1039780.735 units remaining) [ ] - - location: 288 (remaining gas: 1039780.755 units remaining) + - location: 288 (remaining gas: 1039780.720 units remaining) [ ] - - location: 294 (remaining gas: 1039780.745 units remaining) + - location: 294 (remaining gas: 1039780.710 units remaining) [ 4 ] - - location: 297 (remaining gas: 1039780.735 units remaining) + - location: 297 (remaining gas: 1039780.700 units remaining) [ 1923 4 ] - - location: 300 (remaining gas: 1039780.700 units remaining) + - location: 300 (remaining gas: 1039780.665 units remaining) [ 1 ] - - location: 302 (remaining gas: 1039780.685 units remaining) + - location: 302 (remaining gas: 1039780.650 units remaining) [ True ] - - location: 303 (remaining gas: 1039780.675 units remaining) + - location: 303 (remaining gas: 1039780.640 units remaining) [ ] - - location: 303 (remaining gas: 1039780.660 units remaining) + - location: 303 (remaining gas: 1039780.625 units remaining) [ ] - - location: 309 (remaining gas: 1039780.650 units remaining) + - location: 309 (remaining gas: 1039780.615 units remaining) [ "AABBCC" ] - - location: 312 (remaining gas: 1039780.640 units remaining) + - location: 312 (remaining gas: 1039780.605 units remaining) [ "AABBCC" "AABBCC" ] - - location: 313 (remaining gas: 1039780.605 units remaining) + - location: 313 (remaining gas: 1039780.570 units remaining) [ 0 ] - - location: 315 (remaining gas: 1039780.590 units remaining) + - location: 315 (remaining gas: 1039780.555 units remaining) [ True ] - - location: 316 (remaining gas: 1039780.580 units remaining) + - location: 316 (remaining gas: 1039780.545 units remaining) [ ] - - location: 316 (remaining gas: 1039780.565 units remaining) + - location: 316 (remaining gas: 1039780.530 units remaining) [ ] - - location: 322 (remaining gas: 1039780.555 units remaining) + - location: 322 (remaining gas: 1039780.520 units remaining) [ "" ] - - location: 325 (remaining gas: 1039780.545 units remaining) + - location: 325 (remaining gas: 1039780.510 units remaining) [ "" "" ] - - location: 328 (remaining gas: 1039780.510 units remaining) + - location: 328 (remaining gas: 1039780.475 units remaining) [ 0 ] - - location: 330 (remaining gas: 1039780.495 units remaining) + - location: 330 (remaining gas: 1039780.460 units remaining) [ True ] - - location: 331 (remaining gas: 1039780.485 units remaining) + - location: 331 (remaining gas: 1039780.450 units remaining) [ ] - - location: 331 (remaining gas: 1039780.470 units remaining) + - location: 331 (remaining gas: 1039780.435 units remaining) [ ] - - location: 337 (remaining gas: 1039780.460 units remaining) + - location: 337 (remaining gas: 1039780.425 units remaining) [ "" ] - - location: 340 (remaining gas: 1039780.450 units remaining) + - location: 340 (remaining gas: 1039780.415 units remaining) [ "a" "" ] - - location: 343 (remaining gas: 1039780.415 units remaining) + - location: 343 (remaining gas: 1039780.380 units remaining) [ 1 ] - - location: 345 (remaining gas: 1039780.400 units remaining) + - location: 345 (remaining gas: 1039780.365 units remaining) [ True ] - - location: 346 (remaining gas: 1039780.390 units remaining) + - location: 346 (remaining gas: 1039780.355 units remaining) [ ] - - location: 346 (remaining gas: 1039780.375 units remaining) + - location: 346 (remaining gas: 1039780.340 units remaining) [ ] - - location: 352 (remaining gas: 1039780.365 units remaining) + - location: 352 (remaining gas: 1039780.330 units remaining) [ "a" ] - - location: 355 (remaining gas: 1039780.355 units remaining) + - location: 355 (remaining gas: 1039780.320 units remaining) [ "b" "a" ] - - location: 358 (remaining gas: 1039780.320 units remaining) + - location: 358 (remaining gas: 1039780.285 units remaining) [ 1 ] - - location: 360 (remaining gas: 1039780.305 units remaining) + - location: 360 (remaining gas: 1039780.270 units remaining) [ True ] - - location: 361 (remaining gas: 1039780.295 units remaining) + - location: 361 (remaining gas: 1039780.260 units remaining) [ ] - - location: 361 (remaining gas: 1039780.280 units remaining) + - location: 361 (remaining gas: 1039780.245 units remaining) [ ] - - location: 367 (remaining gas: 1039780.270 units remaining) + - location: 367 (remaining gas: 1039780.235 units remaining) [ "b" ] - - location: 370 (remaining gas: 1039780.260 units remaining) + - location: 370 (remaining gas: 1039780.225 units remaining) [ "a" "b" ] - - location: 373 (remaining gas: 1039780.225 units remaining) + - location: 373 (remaining gas: 1039780.190 units remaining) [ -1 ] - - location: 375 (remaining gas: 1039780.210 units remaining) + - location: 375 (remaining gas: 1039780.175 units remaining) [ True ] - - location: 376 (remaining gas: 1039780.200 units remaining) + - location: 376 (remaining gas: 1039780.165 units remaining) [ ] - - location: 376 (remaining gas: 1039780.185 units remaining) + - location: 376 (remaining gas: 1039780.150 units remaining) [ ] - - location: 382 (remaining gas: 1039780.175 units remaining) + - location: 382 (remaining gas: 1039780.140 units remaining) [ "2019-09-16T08:38:05Z" ] - - location: 385 (remaining gas: 1039780.165 units remaining) + - location: 385 (remaining gas: 1039780.130 units remaining) [ "2019-09-16T08:38:05Z" "2019-09-16T08:38:05Z" ] - - location: 386 (remaining gas: 1039780.130 units remaining) + - location: 386 (remaining gas: 1039780.095 units remaining) [ 0 ] - - location: 388 (remaining gas: 1039780.115 units remaining) + - location: 388 (remaining gas: 1039780.080 units remaining) [ True ] - - location: 389 (remaining gas: 1039780.105 units remaining) + - location: 389 (remaining gas: 1039780.070 units remaining) [ ] - - location: 389 (remaining gas: 1039780.090 units remaining) + - location: 389 (remaining gas: 1039780.055 units remaining) [ ] - - location: 395 (remaining gas: 1039780.080 units remaining) + - location: 395 (remaining gas: 1039780.045 units remaining) [ "2017-09-16T08:38:04Z" ] - - location: 398 (remaining gas: 1039780.070 units remaining) + - location: 398 (remaining gas: 1039780.035 units remaining) [ "2019-09-16T08:38:05Z" "2017-09-16T08:38:04Z" ] - - location: 401 (remaining gas: 1039780.035 units remaining) + - location: 401 (remaining gas: 1039780 units remaining) [ 1 ] - - location: 403 (remaining gas: 1039780.020 units remaining) + - location: 403 (remaining gas: 1039779.985 units remaining) [ True ] - - location: 404 (remaining gas: 1039780.010 units remaining) + - location: 404 (remaining gas: 1039779.975 units remaining) [ ] - - location: 404 (remaining gas: 1039779.995 units remaining) + - location: 404 (remaining gas: 1039779.960 units remaining) [ ] - - location: 410 (remaining gas: 1039779.985 units remaining) + - location: 410 (remaining gas: 1039779.950 units remaining) [ "2019-09-16T08:38:05Z" ] - - location: 413 (remaining gas: 1039779.975 units remaining) + - location: 413 (remaining gas: 1039779.940 units remaining) [ "2019-09-16T08:38:04Z" "2019-09-16T08:38:05Z" ] - - location: 416 (remaining gas: 1039779.940 units remaining) + - location: 416 (remaining gas: 1039779.905 units remaining) [ -1 ] - - location: 418 (remaining gas: 1039779.925 units remaining) + - location: 418 (remaining gas: 1039779.890 units remaining) [ True ] - - location: 419 (remaining gas: 1039779.915 units remaining) + - location: 419 (remaining gas: 1039779.880 units remaining) [ ] - - location: 419 (remaining gas: 1039779.900 units remaining) + - location: 419 (remaining gas: 1039779.865 units remaining) [ ] - - location: 425 (remaining gas: 1039779.890 units remaining) + - location: 425 (remaining gas: 1039779.855 units remaining) [ Unit ] - - location: 426 (remaining gas: 1039779.875 units remaining) + - location: 426 (remaining gas: 1039779.840 units remaining) [ {} Unit ] - - location: 428 (remaining gas: 1039779.860 units remaining) + - location: 428 (remaining gas: 1039779.825 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out index 8c32b1b907c2..615ce4ca9de6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out @@ -12,326 +12,326 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039962.637 units remaining) + - location: 10 (remaining gas: 1039962.602 units remaining) [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] - - location: 10 (remaining gas: 1039962.627 units remaining) + - location: 10 (remaining gas: 1039962.592 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 11 (remaining gas: 1039962.612 units remaining) + - location: 11 (remaining gas: 1039962.577 units remaining) [ {} { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 14 (remaining gas: 1039962.597 units remaining) + - location: 14 (remaining gas: 1039962.562 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 16 (remaining gas: 1039962.587 units remaining) + - location: 16 (remaining gas: 1039962.552 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.587 units remaining) + - location: 17 (remaining gas: 1039962.552 units remaining) [ -9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 19 (remaining gas: 1039962.572 units remaining) + - location: 19 (remaining gas: 1039962.537 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.557 units remaining) + - location: 17 (remaining gas: 1039962.522 units remaining) [ -1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 19 (remaining gas: 1039962.542 units remaining) + - location: 19 (remaining gas: 1039962.507 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.527 units remaining) + - location: 17 (remaining gas: 1039962.492 units remaining) [ 0 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 19 (remaining gas: 1039962.512 units remaining) + - location: 19 (remaining gas: 1039962.477 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.497 units remaining) + - location: 17 (remaining gas: 1039962.462 units remaining) [ 1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 19 (remaining gas: 1039962.482 units remaining) + - location: 19 (remaining gas: 1039962.447 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.467 units remaining) + - location: 17 (remaining gas: 1039962.432 units remaining) [ 9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 19 (remaining gas: 1039962.452 units remaining) + - location: 19 (remaining gas: 1039962.417 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 17 (remaining gas: 1039962.437 units remaining) + - location: 17 (remaining gas: 1039962.402 units remaining) [ { False ; False ; True ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 14 (remaining gas: 1039962.407 units remaining) + - location: 14 (remaining gas: 1039962.372 units remaining) [ {} { False ; False ; True ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 20 (remaining gas: 1039962.397 units remaining) + - location: 20 (remaining gas: 1039962.362 units remaining) [ { False ; False ; True ; False ; False } {} { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 21 (remaining gas: 1039962.382 units remaining) + - location: 21 (remaining gas: 1039962.347 units remaining) [ { { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 22 (remaining gas: 1039962.367 units remaining) + - location: 22 (remaining gas: 1039962.332 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 24 (remaining gas: 1039962.357 units remaining) + - location: 24 (remaining gas: 1039962.322 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.357 units remaining) + - location: 25 (remaining gas: 1039962.322 units remaining) [ -9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 27 (remaining gas: 1039962.342 units remaining) + - location: 27 (remaining gas: 1039962.307 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.327 units remaining) + - location: 25 (remaining gas: 1039962.292 units remaining) [ -1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 27 (remaining gas: 1039962.312 units remaining) + - location: 27 (remaining gas: 1039962.277 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.297 units remaining) + - location: 25 (remaining gas: 1039962.262 units remaining) [ 0 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 27 (remaining gas: 1039962.282 units remaining) + - location: 27 (remaining gas: 1039962.247 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.267 units remaining) + - location: 25 (remaining gas: 1039962.232 units remaining) [ 1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 27 (remaining gas: 1039962.252 units remaining) + - location: 27 (remaining gas: 1039962.217 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.237 units remaining) + - location: 25 (remaining gas: 1039962.202 units remaining) [ 9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 27 (remaining gas: 1039962.222 units remaining) + - location: 27 (remaining gas: 1039962.187 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 25 (remaining gas: 1039962.207 units remaining) + - location: 25 (remaining gas: 1039962.172 units remaining) [ { True ; True ; False ; True ; True } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 22 (remaining gas: 1039962.177 units remaining) + - location: 22 (remaining gas: 1039962.142 units remaining) [ { { False ; False ; True ; False ; False } } { True ; True ; False ; True ; True } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 28 (remaining gas: 1039962.167 units remaining) + - location: 28 (remaining gas: 1039962.132 units remaining) [ { True ; True ; False ; True ; True } { { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 29 (remaining gas: 1039962.152 units remaining) + - location: 29 (remaining gas: 1039962.117 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 30 (remaining gas: 1039962.137 units remaining) + - location: 30 (remaining gas: 1039962.102 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 32 (remaining gas: 1039962.127 units remaining) + - location: 32 (remaining gas: 1039962.092 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039962.127 units remaining) + - location: 33 (remaining gas: 1039962.092 units remaining) [ -9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 35 (remaining gas: 1039962.112 units remaining) + - location: 35 (remaining gas: 1039962.077 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039962.097 units remaining) + - location: 33 (remaining gas: 1039962.062 units remaining) [ -1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 35 (remaining gas: 1039962.082 units remaining) + - location: 35 (remaining gas: 1039962.047 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039962.067 units remaining) + - location: 33 (remaining gas: 1039962.032 units remaining) [ 0 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 35 (remaining gas: 1039962.052 units remaining) + - location: 35 (remaining gas: 1039962.017 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039962.037 units remaining) + - location: 33 (remaining gas: 1039962.002 units remaining) [ 1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 35 (remaining gas: 1039962.022 units remaining) + - location: 35 (remaining gas: 1039961.987 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039962.007 units remaining) + - location: 33 (remaining gas: 1039961.972 units remaining) [ 9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 35 (remaining gas: 1039961.992 units remaining) + - location: 35 (remaining gas: 1039961.957 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 33 (remaining gas: 1039961.977 units remaining) + - location: 33 (remaining gas: 1039961.942 units remaining) [ { True ; True ; True ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 30 (remaining gas: 1039961.947 units remaining) + - location: 30 (remaining gas: 1039961.912 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { True ; True ; True ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 36 (remaining gas: 1039961.937 units remaining) + - location: 36 (remaining gas: 1039961.902 units remaining) [ { True ; True ; True ; False ; False } { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 37 (remaining gas: 1039961.922 units remaining) + - location: 37 (remaining gas: 1039961.887 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 38 (remaining gas: 1039961.907 units remaining) + - location: 38 (remaining gas: 1039961.872 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 40 (remaining gas: 1039961.897 units remaining) + - location: 40 (remaining gas: 1039961.862 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.897 units remaining) + - location: 41 (remaining gas: 1039961.862 units remaining) [ -9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 43 (remaining gas: 1039961.882 units remaining) + - location: 43 (remaining gas: 1039961.847 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.867 units remaining) + - location: 41 (remaining gas: 1039961.832 units remaining) [ -1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 43 (remaining gas: 1039961.852 units remaining) + - location: 43 (remaining gas: 1039961.817 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.837 units remaining) + - location: 41 (remaining gas: 1039961.802 units remaining) [ 0 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 43 (remaining gas: 1039961.822 units remaining) + - location: 43 (remaining gas: 1039961.787 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.807 units remaining) + - location: 41 (remaining gas: 1039961.772 units remaining) [ 1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 43 (remaining gas: 1039961.792 units remaining) + - location: 43 (remaining gas: 1039961.757 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.777 units remaining) + - location: 41 (remaining gas: 1039961.742 units remaining) [ 9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 43 (remaining gas: 1039961.762 units remaining) + - location: 43 (remaining gas: 1039961.727 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 41 (remaining gas: 1039961.747 units remaining) + - location: 41 (remaining gas: 1039961.712 units remaining) [ { True ; True ; False ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 38 (remaining gas: 1039961.717 units remaining) + - location: 38 (remaining gas: 1039961.682 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { True ; True ; False ; False ; False } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 44 (remaining gas: 1039961.707 units remaining) + - location: 44 (remaining gas: 1039961.672 units remaining) [ { True ; True ; False ; False ; False } { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 45 (remaining gas: 1039961.692 units remaining) + - location: 45 (remaining gas: 1039961.657 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 46 (remaining gas: 1039961.677 units remaining) + - location: 46 (remaining gas: 1039961.642 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 48 (remaining gas: 1039961.667 units remaining) + - location: 48 (remaining gas: 1039961.632 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.667 units remaining) + - location: 49 (remaining gas: 1039961.632 units remaining) [ -9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 51 (remaining gas: 1039961.652 units remaining) + - location: 51 (remaining gas: 1039961.617 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.637 units remaining) + - location: 49 (remaining gas: 1039961.602 units remaining) [ -1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 51 (remaining gas: 1039961.622 units remaining) + - location: 51 (remaining gas: 1039961.587 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.607 units remaining) + - location: 49 (remaining gas: 1039961.572 units remaining) [ 0 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 51 (remaining gas: 1039961.592 units remaining) + - location: 51 (remaining gas: 1039961.557 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.577 units remaining) + - location: 49 (remaining gas: 1039961.542 units remaining) [ 1 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 51 (remaining gas: 1039961.562 units remaining) + - location: 51 (remaining gas: 1039961.527 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.547 units remaining) + - location: 49 (remaining gas: 1039961.512 units remaining) [ 9999999 { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 51 (remaining gas: 1039961.532 units remaining) + - location: 51 (remaining gas: 1039961.497 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 49 (remaining gas: 1039961.517 units remaining) + - location: 49 (remaining gas: 1039961.482 units remaining) [ { False ; False ; True ; True ; True } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 46 (remaining gas: 1039961.487 units remaining) + - location: 46 (remaining gas: 1039961.452 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { False ; False ; True ; True ; True } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 52 (remaining gas: 1039961.477 units remaining) + - location: 52 (remaining gas: 1039961.442 units remaining) [ { False ; False ; True ; True ; True } { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 53 (remaining gas: 1039961.462 units remaining) + - location: 53 (remaining gas: 1039961.427 units remaining) [ { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 54 (remaining gas: 1039961.447 units remaining) + - location: 54 (remaining gas: 1039961.412 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - - location: 56 (remaining gas: 1039961.447 units remaining) + - location: 56 (remaining gas: 1039961.412 units remaining) [ -9999999 ] - - location: 58 (remaining gas: 1039961.432 units remaining) + - location: 58 (remaining gas: 1039961.397 units remaining) [ False ] - - location: 56 (remaining gas: 1039961.417 units remaining) + - location: 56 (remaining gas: 1039961.382 units remaining) [ -1 ] - - location: 58 (remaining gas: 1039961.402 units remaining) + - location: 58 (remaining gas: 1039961.367 units remaining) [ False ] - - location: 56 (remaining gas: 1039961.387 units remaining) + - location: 56 (remaining gas: 1039961.352 units remaining) [ 0 ] - - location: 58 (remaining gas: 1039961.372 units remaining) + - location: 58 (remaining gas: 1039961.337 units remaining) [ False ] - - location: 56 (remaining gas: 1039961.357 units remaining) + - location: 56 (remaining gas: 1039961.322 units remaining) [ 1 ] - - location: 58 (remaining gas: 1039961.342 units remaining) + - location: 58 (remaining gas: 1039961.307 units remaining) [ True ] - - location: 56 (remaining gas: 1039961.327 units remaining) + - location: 56 (remaining gas: 1039961.292 units remaining) [ 9999999 ] - - location: 58 (remaining gas: 1039961.312 units remaining) + - location: 58 (remaining gas: 1039961.277 units remaining) [ True ] - - location: 56 (remaining gas: 1039961.297 units remaining) + - location: 56 (remaining gas: 1039961.262 units remaining) [ { False ; False ; False ; True ; True } ] - - location: 54 (remaining gas: 1039961.267 units remaining) + - location: 54 (remaining gas: 1039961.232 units remaining) [ { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { False ; False ; False ; True ; True } ] - - location: 59 (remaining gas: 1039961.257 units remaining) + - location: 59 (remaining gas: 1039961.222 units remaining) [ { False ; False ; False ; True ; True } { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } ] - - location: 60 (remaining gas: 1039961.242 units remaining) + - location: 60 (remaining gas: 1039961.207 units remaining) [ { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } ] - - location: 61 (remaining gas: 1039961.227 units remaining) + - location: 61 (remaining gas: 1039961.192 units remaining) [ {} { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; @@ -339,7 +339,7 @@ trace { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } ] - - location: 63 (remaining gas: 1039961.212 units remaining) + - location: 63 (remaining gas: 1039961.177 units remaining) [ (Pair {} { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" index 85cbfe2d5742..b8b330c15117 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" @@ -7,22 +7,22 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.305 units remaining) + - location: 9 (remaining gas: 1039992.270 units remaining) [ (Pair { "World!" } {}) ] - - location: 9 (remaining gas: 1039992.295 units remaining) + - location: 9 (remaining gas: 1039992.260 units remaining) [ { "World!" } ] - - location: 10 (remaining gas: 1039992.295 units remaining) + - location: 10 (remaining gas: 1039992.260 units remaining) [ "World!" ] - - location: 12 (remaining gas: 1039992.285 units remaining) + - location: 12 (remaining gas: 1039992.250 units remaining) [ "Hello " "World!" ] - - location: 15 (remaining gas: 1039992.220 units remaining) + - location: 15 (remaining gas: 1039992.185 units remaining) [ "Hello World!" ] - - location: 10 (remaining gas: 1039992.205 units remaining) + - location: 10 (remaining gas: 1039992.170 units remaining) [ { "Hello World!" } ] - - location: 16 (remaining gas: 1039992.190 units remaining) + - location: 16 (remaining gas: 1039992.155 units remaining) [ {} { "Hello World!" } ] - - location: 18 (remaining gas: 1039992.175 units remaining) + - location: 18 (remaining gas: 1039992.140 units remaining) [ (Pair {} { "Hello World!" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" index cce3f270bfb2..b45e35abe4a9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.151 units remaining) + - location: 9 (remaining gas: 1039992.116 units remaining) [ (Pair { "test1" ; "test2" } {}) ] - - location: 9 (remaining gas: 1039992.141 units remaining) + - location: 9 (remaining gas: 1039992.106 units remaining) [ { "test1" ; "test2" } ] - - location: 10 (remaining gas: 1039992.141 units remaining) + - location: 10 (remaining gas: 1039992.106 units remaining) [ "test1" ] - - location: 12 (remaining gas: 1039992.131 units remaining) + - location: 12 (remaining gas: 1039992.096 units remaining) [ "Hello " "test1" ] - - location: 15 (remaining gas: 1039992.066 units remaining) + - location: 15 (remaining gas: 1039992.031 units remaining) [ "Hello test1" ] - - location: 10 (remaining gas: 1039992.051 units remaining) + - location: 10 (remaining gas: 1039992.016 units remaining) [ "test2" ] - - location: 12 (remaining gas: 1039992.041 units remaining) + - location: 12 (remaining gas: 1039992.006 units remaining) [ "Hello " "test2" ] - - location: 15 (remaining gas: 1039991.976 units remaining) + - location: 15 (remaining gas: 1039991.941 units remaining) [ "Hello test2" ] - - location: 10 (remaining gas: 1039991.961 units remaining) + - location: 10 (remaining gas: 1039991.926 units remaining) [ { "Hello test1" ; "Hello test2" } ] - - location: 16 (remaining gas: 1039991.946 units remaining) + - location: 16 (remaining gas: 1039991.911 units remaining) [ {} { "Hello test1" ; "Hello test2" } ] - - location: 18 (remaining gas: 1039991.931 units remaining) + - location: 18 (remaining gas: 1039991.896 units remaining) [ (Pair {} { "Hello test1" ; "Hello test2" }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out index dfa030773d27..69c310380be3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.479 units remaining) + - location: 9 (remaining gas: 1039992.444 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039992.469 units remaining) + - location: 9 (remaining gas: 1039992.434 units remaining) [ {} ] - - location: 10 (remaining gas: 1039992.469 units remaining) + - location: 10 (remaining gas: 1039992.434 units remaining) [ {} ] - - location: 16 (remaining gas: 1039992.454 units remaining) + - location: 16 (remaining gas: 1039992.419 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039992.439 units remaining) + - location: 18 (remaining gas: 1039992.404 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out index 1cf956e38ec1..239699798ebb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.398 units remaining) + - location: 9 (remaining gas: 1039992.363 units remaining) [ (Pair { 0xab ; 0xcd } {}) ] - - location: 9 (remaining gas: 1039992.388 units remaining) + - location: 9 (remaining gas: 1039992.353 units remaining) [ { 0xab ; 0xcd } ] - - location: 10 (remaining gas: 1039992.388 units remaining) + - location: 10 (remaining gas: 1039992.353 units remaining) [ 0xab ] - - location: 12 (remaining gas: 1039992.378 units remaining) + - location: 12 (remaining gas: 1039992.343 units remaining) [ 0xff 0xab ] - - location: 15 (remaining gas: 1039992.313 units remaining) + - location: 15 (remaining gas: 1039992.278 units remaining) [ 0xffab ] - - location: 10 (remaining gas: 1039992.298 units remaining) + - location: 10 (remaining gas: 1039992.263 units remaining) [ 0xcd ] - - location: 12 (remaining gas: 1039992.288 units remaining) + - location: 12 (remaining gas: 1039992.253 units remaining) [ 0xff 0xcd ] - - location: 15 (remaining gas: 1039992.223 units remaining) + - location: 15 (remaining gas: 1039992.188 units remaining) [ 0xffcd ] - - location: 10 (remaining gas: 1039992.208 units remaining) + - location: 10 (remaining gas: 1039992.173 units remaining) [ { 0xffab ; 0xffcd } ] - - location: 16 (remaining gas: 1039992.193 units remaining) + - location: 16 (remaining gas: 1039992.158 units remaining) [ {} { 0xffab ; 0xffcd } ] - - location: 18 (remaining gas: 1039992.178 units remaining) + - location: 18 (remaining gas: 1039992.143 units remaining) [ (Pair {} { 0xffab ; 0xffcd }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out index 72093649ef51..9e72433679cf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out @@ -7,22 +7,22 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.498 units remaining) + - location: 9 (remaining gas: 1039992.463 units remaining) [ (Pair { 0xcd } {}) ] - - location: 9 (remaining gas: 1039992.488 units remaining) + - location: 9 (remaining gas: 1039992.453 units remaining) [ { 0xcd } ] - - location: 10 (remaining gas: 1039992.488 units remaining) + - location: 10 (remaining gas: 1039992.453 units remaining) [ 0xcd ] - - location: 12 (remaining gas: 1039992.478 units remaining) + - location: 12 (remaining gas: 1039992.443 units remaining) [ 0xff 0xcd ] - - location: 15 (remaining gas: 1039992.413 units remaining) + - location: 15 (remaining gas: 1039992.378 units remaining) [ 0xffcd ] - - location: 10 (remaining gas: 1039992.398 units remaining) + - location: 10 (remaining gas: 1039992.363 units remaining) [ { 0xffcd } ] - - location: 16 (remaining gas: 1039992.383 units remaining) + - location: 16 (remaining gas: 1039992.348 units remaining) [ {} { 0xffcd } ] - - location: 18 (remaining gas: 1039992.368 units remaining) + - location: 18 (remaining gas: 1039992.333 units remaining) [ (Pair {} { 0xffcd }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out index 16a9b699f71a..6cd69f555f71 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.598 units remaining) + - location: 9 (remaining gas: 1039992.563 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039992.588 units remaining) + - location: 9 (remaining gas: 1039992.553 units remaining) [ {} ] - - location: 10 (remaining gas: 1039992.588 units remaining) + - location: 10 (remaining gas: 1039992.553 units remaining) [ {} ] - - location: 16 (remaining gas: 1039992.573 units remaining) + - location: 16 (remaining gas: 1039992.538 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039992.558 units remaining) + - location: 18 (remaining gas: 1039992.523 units remaining) [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" index 4d8c7075d1c2..56ea86abf8d3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" @@ -7,113 +7,113 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039987.037 units remaining) + - location: 8 (remaining gas: 1039987.002 units remaining) [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] - - location: 8 (remaining gas: 1039987.027 units remaining) + - location: 8 (remaining gas: 1039986.992 units remaining) [ { "Hello" ; " " ; "World" ; "!" } ] - - location: 9 (remaining gas: 1039987.017 units remaining) + - location: 9 (remaining gas: 1039986.982 units remaining) [ "" { "Hello" ; " " ; "World" ; "!" } ] - - location: 12 (remaining gas: 1039987.007 units remaining) + - location: 12 (remaining gas: 1039986.972 units remaining) [ { "Hello" ; " " ; "World" ; "!" } "" ] - - location: 13 (remaining gas: 1039987.007 units remaining) + - location: 13 (remaining gas: 1039986.972 units remaining) [ "Hello" "" ] - - location: 15 (remaining gas: 1039986.997 units remaining) + - location: 15 (remaining gas: 1039986.962 units remaining) [ "" "Hello" ] - - location: 16 (remaining gas: 1039986.982 units remaining) + - location: 16 (remaining gas: 1039986.947 units remaining) [ "Hello" ] - - location: 18 (remaining gas: 1039986.967 units remaining) + - location: 18 (remaining gas: 1039986.932 units remaining) [ {} "Hello" ] - - location: 20 (remaining gas: 1039986.957 units remaining) + - location: 20 (remaining gas: 1039986.922 units remaining) [ "Hello" {} ] - - location: 21 (remaining gas: 1039986.942 units remaining) + - location: 21 (remaining gas: 1039986.907 units remaining) [ { "Hello" } ] - - location: 16 (remaining gas: 1039986.912 units remaining) + - location: 16 (remaining gas: 1039986.877 units remaining) [ "" { "Hello" } ] - - location: 22 (remaining gas: 1039986.897 units remaining) + - location: 22 (remaining gas: 1039986.862 units remaining) [ { "" ; "Hello" } ] - - location: 23 (remaining gas: 1039986.777 units remaining) + - location: 23 (remaining gas: 1039986.742 units remaining) [ "Hello" ] - - location: 13 (remaining gas: 1039986.762 units remaining) + - location: 13 (remaining gas: 1039986.727 units remaining) [ " " "Hello" ] - - location: 15 (remaining gas: 1039986.752 units remaining) + - location: 15 (remaining gas: 1039986.717 units remaining) [ "Hello" " " ] - - location: 16 (remaining gas: 1039986.737 units remaining) + - location: 16 (remaining gas: 1039986.702 units remaining) [ " " ] - - location: 18 (remaining gas: 1039986.722 units remaining) + - location: 18 (remaining gas: 1039986.687 units remaining) [ {} " " ] - - location: 20 (remaining gas: 1039986.712 units remaining) + - location: 20 (remaining gas: 1039986.677 units remaining) [ " " {} ] - - location: 21 (remaining gas: 1039986.697 units remaining) + - location: 21 (remaining gas: 1039986.662 units remaining) [ { " " } ] - - location: 16 (remaining gas: 1039986.667 units remaining) + - location: 16 (remaining gas: 1039986.632 units remaining) [ "Hello" { " " } ] - - location: 22 (remaining gas: 1039986.652 units remaining) + - location: 22 (remaining gas: 1039986.617 units remaining) [ { "Hello" ; " " } ] - - location: 23 (remaining gas: 1039986.532 units remaining) + - location: 23 (remaining gas: 1039986.497 units remaining) [ "Hello " ] - - location: 13 (remaining gas: 1039986.517 units remaining) + - location: 13 (remaining gas: 1039986.482 units remaining) [ "World" "Hello " ] - - location: 15 (remaining gas: 1039986.507 units remaining) + - location: 15 (remaining gas: 1039986.472 units remaining) [ "Hello " "World" ] - - location: 16 (remaining gas: 1039986.492 units remaining) + - location: 16 (remaining gas: 1039986.457 units remaining) [ "World" ] - - location: 18 (remaining gas: 1039986.477 units remaining) + - location: 18 (remaining gas: 1039986.442 units remaining) [ {} "World" ] - - location: 20 (remaining gas: 1039986.467 units remaining) + - location: 20 (remaining gas: 1039986.432 units remaining) [ "World" {} ] - - location: 21 (remaining gas: 1039986.452 units remaining) + - location: 21 (remaining gas: 1039986.417 units remaining) [ { "World" } ] - - location: 16 (remaining gas: 1039986.422 units remaining) + - location: 16 (remaining gas: 1039986.387 units remaining) [ "Hello " { "World" } ] - - location: 22 (remaining gas: 1039986.407 units remaining) + - location: 22 (remaining gas: 1039986.372 units remaining) [ { "Hello " ; "World" } ] - - location: 23 (remaining gas: 1039986.286 units remaining) + - location: 23 (remaining gas: 1039986.251 units remaining) [ "Hello World" ] - - location: 13 (remaining gas: 1039986.271 units remaining) + - location: 13 (remaining gas: 1039986.236 units remaining) [ "!" "Hello World" ] - - location: 15 (remaining gas: 1039986.261 units remaining) + - location: 15 (remaining gas: 1039986.226 units remaining) [ "Hello World" "!" ] - - location: 16 (remaining gas: 1039986.246 units remaining) + - location: 16 (remaining gas: 1039986.211 units remaining) [ "!" ] - - location: 18 (remaining gas: 1039986.231 units remaining) + - location: 18 (remaining gas: 1039986.196 units remaining) [ {} "!" ] - - location: 20 (remaining gas: 1039986.221 units remaining) + - location: 20 (remaining gas: 1039986.186 units remaining) [ "!" {} ] - - location: 21 (remaining gas: 1039986.206 units remaining) + - location: 21 (remaining gas: 1039986.171 units remaining) [ { "!" } ] - - location: 16 (remaining gas: 1039986.176 units remaining) + - location: 16 (remaining gas: 1039986.141 units remaining) [ "Hello World" { "!" } ] - - location: 22 (remaining gas: 1039986.161 units remaining) + - location: 22 (remaining gas: 1039986.126 units remaining) [ { "Hello World" ; "!" } ] - - location: 23 (remaining gas: 1039986.040 units remaining) + - location: 23 (remaining gas: 1039986.005 units remaining) [ "Hello World!" ] - - location: 13 (remaining gas: 1039986.025 units remaining) + - location: 13 (remaining gas: 1039985.990 units remaining) [ "Hello World!" ] - - location: 24 (remaining gas: 1039986.010 units remaining) + - location: 24 (remaining gas: 1039985.975 units remaining) [ {} "Hello World!" ] - - location: 26 (remaining gas: 1039985.995 units remaining) + - location: 26 (remaining gas: 1039985.960 units remaining) [ (Pair {} "Hello World!") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" index 85657f6e29ea..1600b1d1acde 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" @@ -7,90 +7,90 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039987.241 units remaining) + - location: 8 (remaining gas: 1039987.206 units remaining) [ (Pair { "a" ; "b" ; "c" } "") ] - - location: 8 (remaining gas: 1039987.231 units remaining) + - location: 8 (remaining gas: 1039987.196 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 9 (remaining gas: 1039987.221 units remaining) + - location: 9 (remaining gas: 1039987.186 units remaining) [ "" { "a" ; "b" ; "c" } ] - - location: 12 (remaining gas: 1039987.211 units remaining) + - location: 12 (remaining gas: 1039987.176 units remaining) [ { "a" ; "b" ; "c" } "" ] - - location: 13 (remaining gas: 1039987.211 units remaining) + - location: 13 (remaining gas: 1039987.176 units remaining) [ "a" "" ] - - location: 15 (remaining gas: 1039987.201 units remaining) + - location: 15 (remaining gas: 1039987.166 units remaining) [ "" "a" ] - - location: 16 (remaining gas: 1039987.186 units remaining) + - location: 16 (remaining gas: 1039987.151 units remaining) [ "a" ] - - location: 18 (remaining gas: 1039987.171 units remaining) + - location: 18 (remaining gas: 1039987.136 units remaining) [ {} "a" ] - - location: 20 (remaining gas: 1039987.161 units remaining) + - location: 20 (remaining gas: 1039987.126 units remaining) [ "a" {} ] - - location: 21 (remaining gas: 1039987.146 units remaining) + - location: 21 (remaining gas: 1039987.111 units remaining) [ { "a" } ] - - location: 16 (remaining gas: 1039987.116 units remaining) + - location: 16 (remaining gas: 1039987.081 units remaining) [ "" { "a" } ] - - location: 22 (remaining gas: 1039987.101 units remaining) + - location: 22 (remaining gas: 1039987.066 units remaining) [ { "" ; "a" } ] - - location: 23 (remaining gas: 1039986.981 units remaining) + - location: 23 (remaining gas: 1039986.946 units remaining) [ "a" ] - - location: 13 (remaining gas: 1039986.966 units remaining) + - location: 13 (remaining gas: 1039986.931 units remaining) [ "b" "a" ] - - location: 15 (remaining gas: 1039986.956 units remaining) + - location: 15 (remaining gas: 1039986.921 units remaining) [ "a" "b" ] - - location: 16 (remaining gas: 1039986.941 units remaining) + - location: 16 (remaining gas: 1039986.906 units remaining) [ "b" ] - - location: 18 (remaining gas: 1039986.926 units remaining) + - location: 18 (remaining gas: 1039986.891 units remaining) [ {} "b" ] - - location: 20 (remaining gas: 1039986.916 units remaining) + - location: 20 (remaining gas: 1039986.881 units remaining) [ "b" {} ] - - location: 21 (remaining gas: 1039986.901 units remaining) + - location: 21 (remaining gas: 1039986.866 units remaining) [ { "b" } ] - - location: 16 (remaining gas: 1039986.871 units remaining) + - location: 16 (remaining gas: 1039986.836 units remaining) [ "a" { "b" } ] - - location: 22 (remaining gas: 1039986.856 units remaining) + - location: 22 (remaining gas: 1039986.821 units remaining) [ { "a" ; "b" } ] - - location: 23 (remaining gas: 1039986.736 units remaining) + - location: 23 (remaining gas: 1039986.701 units remaining) [ "ab" ] - - location: 13 (remaining gas: 1039986.721 units remaining) + - location: 13 (remaining gas: 1039986.686 units remaining) [ "c" "ab" ] - - location: 15 (remaining gas: 1039986.711 units remaining) + - location: 15 (remaining gas: 1039986.676 units remaining) [ "ab" "c" ] - - location: 16 (remaining gas: 1039986.696 units remaining) + - location: 16 (remaining gas: 1039986.661 units remaining) [ "c" ] - - location: 18 (remaining gas: 1039986.681 units remaining) + - location: 18 (remaining gas: 1039986.646 units remaining) [ {} "c" ] - - location: 20 (remaining gas: 1039986.671 units remaining) + - location: 20 (remaining gas: 1039986.636 units remaining) [ "c" {} ] - - location: 21 (remaining gas: 1039986.656 units remaining) + - location: 21 (remaining gas: 1039986.621 units remaining) [ { "c" } ] - - location: 16 (remaining gas: 1039986.626 units remaining) + - location: 16 (remaining gas: 1039986.591 units remaining) [ "ab" { "c" } ] - - location: 22 (remaining gas: 1039986.611 units remaining) + - location: 22 (remaining gas: 1039986.576 units remaining) [ { "ab" ; "c" } ] - - location: 23 (remaining gas: 1039986.491 units remaining) + - location: 23 (remaining gas: 1039986.456 units remaining) [ "abc" ] - - location: 13 (remaining gas: 1039986.476 units remaining) + - location: 13 (remaining gas: 1039986.441 units remaining) [ "abc" ] - - location: 24 (remaining gas: 1039986.461 units remaining) + - location: 24 (remaining gas: 1039986.426 units remaining) [ {} "abc" ] - - location: 26 (remaining gas: 1039986.446 units remaining) + - location: 26 (remaining gas: 1039986.411 units remaining) [ (Pair {} "abc") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" index b499b54b28f5..cbdc50c332bf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039987.613 units remaining) + - location: 8 (remaining gas: 1039987.578 units remaining) [ (Pair {} "") ] - - location: 8 (remaining gas: 1039987.603 units remaining) + - location: 8 (remaining gas: 1039987.568 units remaining) [ {} ] - - location: 9 (remaining gas: 1039987.593 units remaining) + - location: 9 (remaining gas: 1039987.558 units remaining) [ "" {} ] - - location: 12 (remaining gas: 1039987.583 units remaining) + - location: 12 (remaining gas: 1039987.548 units remaining) [ {} "" ] - - location: 13 (remaining gas: 1039987.583 units remaining) + - location: 13 (remaining gas: 1039987.548 units remaining) [ "" ] - - location: 24 (remaining gas: 1039987.568 units remaining) + - location: 24 (remaining gas: 1039987.533 units remaining) [ {} "" ] - - location: 26 (remaining gas: 1039987.553 units remaining) + - location: 26 (remaining gas: 1039987.518 units remaining) [ (Pair {} "") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out index 96c73455d483..7ac622baa0c5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.045 units remaining) + - location: 8 (remaining gas: 1039994.010 units remaining) [ (Pair 99 { -5 ; 10 }) ] - - location: 8 (remaining gas: 1039994.035 units remaining) + - location: 8 (remaining gas: 1039994 units remaining) [ 99 { -5 ; 10 } ] - - location: 9 (remaining gas: 1039994.020 units remaining) + - location: 9 (remaining gas: 1039993.985 units remaining) [ { 99 ; -5 ; 10 } ] - - location: 10 (remaining gas: 1039994.005 units remaining) + - location: 10 (remaining gas: 1039993.970 units remaining) [ {} { 99 ; -5 ; 10 } ] - - location: 12 (remaining gas: 1039993.990 units remaining) + - location: 12 (remaining gas: 1039993.955 units remaining) [ (Pair {} { 99 ; -5 ; 10 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out index d3babd6fcb7d..60782e13f783 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.145 units remaining) + - location: 8 (remaining gas: 1039994.110 units remaining) [ (Pair -5 { 10 }) ] - - location: 8 (remaining gas: 1039994.135 units remaining) + - location: 8 (remaining gas: 1039994.100 units remaining) [ -5 { 10 } ] - - location: 9 (remaining gas: 1039994.120 units remaining) + - location: 9 (remaining gas: 1039994.085 units remaining) [ { -5 ; 10 } ] - - location: 10 (remaining gas: 1039994.105 units remaining) + - location: 10 (remaining gas: 1039994.070 units remaining) [ {} { -5 ; 10 } ] - - location: 12 (remaining gas: 1039994.090 units remaining) + - location: 12 (remaining gas: 1039994.055 units remaining) [ (Pair {} { -5 ; 10 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out index 479e6eb03d20..28c6d9f6a348 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out @@ -7,16 +7,16 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.245 units remaining) + - location: 8 (remaining gas: 1039994.210 units remaining) [ (Pair 10 {}) ] - - location: 8 (remaining gas: 1039994.235 units remaining) + - location: 8 (remaining gas: 1039994.200 units remaining) [ 10 {} ] - - location: 9 (remaining gas: 1039994.220 units remaining) + - location: 9 (remaining gas: 1039994.185 units remaining) [ { 10 } ] - - location: 10 (remaining gas: 1039994.205 units remaining) + - location: 10 (remaining gas: 1039994.170 units remaining) [ {} { 10 } ] - - location: 12 (remaining gas: 1039994.190 units remaining) + - location: 12 (remaining gas: 1039994.155 units remaining) [ (Pair {} { 10 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" index a4d658b49653..84979da5a29d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" @@ -7,160 +7,160 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039963.179 units remaining) + - location: 12 (remaining gas: 1039963.144 units remaining) [ (Pair (Pair { "A" } { "B" }) None) ] - - location: 12 (remaining gas: 1039963.169 units remaining) + - location: 12 (remaining gas: 1039963.134 units remaining) [ (Pair { "A" } { "B" }) ] - - location: 13 (remaining gas: 1039963.159 units remaining) + - location: 13 (remaining gas: 1039963.124 units remaining) [ (Pair { "A" } { "B" }) (Pair { "A" } { "B" }) ] - - location: 14 (remaining gas: 1039963.149 units remaining) + - location: 14 (remaining gas: 1039963.114 units remaining) [ { "A" } (Pair { "A" } { "B" }) ] - - location: 15 (remaining gas: 1039963.134 units remaining) + - location: 15 (remaining gas: 1039963.099 units remaining) [ (Pair { "A" } { "B" }) ] - - location: 17 (remaining gas: 1039963.124 units remaining) + - location: 17 (remaining gas: 1039963.089 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039963.094 units remaining) + - location: 15 (remaining gas: 1039963.059 units remaining) [ { "A" } { "B" } ] - - location: 18 (remaining gas: 1039962.874 units remaining) + - location: 18 (remaining gas: 1039962.839 units remaining) [ {} { "A" } { "B" } ] - - location: 20 (remaining gas: 1039962.864 units remaining) + - location: 20 (remaining gas: 1039962.829 units remaining) [ { "A" } {} { "B" } ] - - location: 21 (remaining gas: 1039962.864 units remaining) + - location: 21 (remaining gas: 1039962.829 units remaining) [ "A" {} { "B" } ] - - location: 23 (remaining gas: 1039962.849 units remaining) + - location: 23 (remaining gas: 1039962.814 units remaining) [ (Pair "A" {}) { "B" } ] - - location: 24 (remaining gas: 1039962.839 units remaining) + - location: 24 (remaining gas: 1039962.804 units remaining) [ (Pair "A" {}) (Pair "A" {}) { "B" } ] - - location: 25 (remaining gas: 1039962.829 units remaining) + - location: 25 (remaining gas: 1039962.794 units remaining) [ "A" (Pair "A" {}) { "B" } ] - - location: 26 (remaining gas: 1039962.814 units remaining) + - location: 26 (remaining gas: 1039962.779 units remaining) [ (Pair "A" {}) { "B" } ] - - location: 28 (remaining gas: 1039962.804 units remaining) + - location: 28 (remaining gas: 1039962.769 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039962.774 units remaining) + - location: 26 (remaining gas: 1039962.739 units remaining) [ "A" {} { "B" } ] - - location: 29 (remaining gas: 1039962.764 units remaining) + - location: 29 (remaining gas: 1039962.729 units remaining) [ True "A" {} { "B" } ] - - location: 32 (remaining gas: 1039962.754 units remaining) + - location: 32 (remaining gas: 1039962.719 units remaining) [ "A" True {} { "B" } ] - - location: 33 (remaining gas: 1039962.554 units remaining) + - location: 33 (remaining gas: 1039962.519 units remaining) [ { "A" } { "B" } ] - - location: 21 (remaining gas: 1039962.539 units remaining) + - location: 21 (remaining gas: 1039962.504 units remaining) [ { "A" } { "B" } ] - - location: 34 (remaining gas: 1039962.529 units remaining) + - location: 34 (remaining gas: 1039962.494 units remaining) [ True { "A" } { "B" } ] - - location: 37 (remaining gas: 1039962.519 units remaining) + - location: 37 (remaining gas: 1039962.484 units remaining) [ { "A" } True { "B" } ] - - location: 38 (remaining gas: 1039962.504 units remaining) + - location: 38 (remaining gas: 1039962.469 units remaining) [ (Pair { "A" } True) { "B" } ] - - location: 39 (remaining gas: 1039962.494 units remaining) + - location: 39 (remaining gas: 1039962.459 units remaining) [ { "B" } (Pair { "A" } True) ] - - location: 40 (remaining gas: 1039962.494 units remaining) + - location: 40 (remaining gas: 1039962.459 units remaining) [ "B" (Pair { "A" } True) ] - - location: 42 (remaining gas: 1039962.479 units remaining) + - location: 42 (remaining gas: 1039962.444 units remaining) [ (Pair "B" { "A" } True) ] - - location: 43 (remaining gas: 1039962.469 units remaining) + - location: 43 (remaining gas: 1039962.434 units remaining) [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 44 (remaining gas: 1039962.459 units remaining) + - location: 44 (remaining gas: 1039962.424 units remaining) [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 45 (remaining gas: 1039962.449 units remaining) + - location: 45 (remaining gas: 1039962.414 units remaining) [ "B" (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 46 (remaining gas: 1039962.434 units remaining) + - location: 46 (remaining gas: 1039962.399 units remaining) [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 49 (remaining gas: 1039962.424 units remaining) + - location: 49 (remaining gas: 1039962.389 units remaining) [ (Pair { "A" } True) (Pair "B" { "A" } True) ] - - location: 50 (remaining gas: 1039962.414 units remaining) + - location: 50 (remaining gas: 1039962.379 units remaining) [ { "A" } (Pair "B" { "A" } True) ] - - location: 51 (remaining gas: 1039962.399 units remaining) + - location: 51 (remaining gas: 1039962.364 units remaining) [ (Pair "B" { "A" } True) ] - - location: 54 (remaining gas: 1039962.389 units remaining) + - location: 54 (remaining gas: 1039962.354 units remaining) [ (Pair { "A" } True) ] - - location: 55 (remaining gas: 1039962.379 units remaining) + - location: 55 (remaining gas: 1039962.344 units remaining) [ True ] - - location: 51 (remaining gas: 1039962.349 units remaining) + - location: 51 (remaining gas: 1039962.314 units remaining) [ { "A" } True ] - - location: 56 (remaining gas: 1039962.339 units remaining) + - location: 56 (remaining gas: 1039962.304 units remaining) [ { "A" } { "A" } True ] - - location: 46 (remaining gas: 1039962.309 units remaining) + - location: 46 (remaining gas: 1039962.274 units remaining) [ "B" { "A" } { "A" } True ] - - location: 57 (remaining gas: 1039962.124 units remaining) + - location: 57 (remaining gas: 1039962.089 units remaining) [ False { "A" } True ] - - location: 58 (remaining gas: 1039962.109 units remaining) + - location: 58 (remaining gas: 1039962.074 units remaining) [ { "A" } True ] - - location: 60 (remaining gas: 1039962.099 units remaining) + - location: 60 (remaining gas: 1039962.064 units remaining) [ True { "A" } ] - - location: 58 (remaining gas: 1039962.069 units remaining) + - location: 58 (remaining gas: 1039962.034 units remaining) [ False True { "A" } ] - - location: 61 (remaining gas: 1039962.049 units remaining) + - location: 61 (remaining gas: 1039962.014 units remaining) [ False { "A" } ] - - location: 62 (remaining gas: 1039962.039 units remaining) + - location: 62 (remaining gas: 1039962.004 units remaining) [ { "A" } False ] - - location: 63 (remaining gas: 1039962.024 units remaining) + - location: 63 (remaining gas: 1039961.989 units remaining) [ (Pair { "A" } False) ] - - location: 40 (remaining gas: 1039962.009 units remaining) + - location: 40 (remaining gas: 1039961.974 units remaining) [ (Pair { "A" } False) ] - - location: 64 (remaining gas: 1039961.999 units remaining) + - location: 64 (remaining gas: 1039961.964 units remaining) [ False ] - - location: 65 (remaining gas: 1039961.984 units remaining) + - location: 65 (remaining gas: 1039961.949 units remaining) [ (Some False) ] - - location: 66 (remaining gas: 1039961.969 units remaining) + - location: 66 (remaining gas: 1039961.934 units remaining) [ {} (Some False) ] - - location: 68 (remaining gas: 1039961.954 units remaining) + - location: 68 (remaining gas: 1039961.919 units remaining) [ (Pair {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" index fde6623fdb1e..093e9ee6c623 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" @@ -7,404 +7,404 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039962.499 units remaining) + - location: 12 (remaining gas: 1039962.464 units remaining) [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] - - location: 12 (remaining gas: 1039962.489 units remaining) + - location: 12 (remaining gas: 1039962.454 units remaining) [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - - location: 13 (remaining gas: 1039962.479 units remaining) + - location: 13 (remaining gas: 1039962.444 units remaining) [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - - location: 14 (remaining gas: 1039962.469 units remaining) + - location: 14 (remaining gas: 1039962.434 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - - location: 15 (remaining gas: 1039962.454 units remaining) + - location: 15 (remaining gas: 1039962.419 units remaining) [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - - location: 17 (remaining gas: 1039962.444 units remaining) + - location: 17 (remaining gas: 1039962.409 units remaining) [ { "B" ; "C" ; "asdf" } ] - - location: 15 (remaining gas: 1039962.414 units remaining) + - location: 15 (remaining gas: 1039962.379 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" } ] - - location: 18 (remaining gas: 1039962.194 units remaining) + - location: 18 (remaining gas: 1039962.159 units remaining) [ {} { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" } ] - - location: 20 (remaining gas: 1039962.184 units remaining) + - location: 20 (remaining gas: 1039962.149 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } {} { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039962.184 units remaining) + - location: 21 (remaining gas: 1039962.149 units remaining) [ "B" {} { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039962.169 units remaining) + - location: 23 (remaining gas: 1039962.134 units remaining) [ (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039962.159 units remaining) + - location: 24 (remaining gas: 1039962.124 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039962.149 units remaining) + - location: 25 (remaining gas: 1039962.114 units remaining) [ "B" (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039962.134 units remaining) + - location: 26 (remaining gas: 1039962.099 units remaining) [ (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039962.124 units remaining) + - location: 28 (remaining gas: 1039962.089 units remaining) [ {} { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039962.094 units remaining) + - location: 26 (remaining gas: 1039962.059 units remaining) [ "B" {} { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039962.084 units remaining) + - location: 29 (remaining gas: 1039962.049 units remaining) [ True "B" {} { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039962.074 units remaining) + - location: 32 (remaining gas: 1039962.039 units remaining) [ "B" True {} { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039961.874 units remaining) + - location: 33 (remaining gas: 1039961.839 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039961.859 units remaining) + - location: 21 (remaining gas: 1039961.824 units remaining) [ "B" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039961.844 units remaining) + - location: 23 (remaining gas: 1039961.809 units remaining) [ (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039961.834 units remaining) + - location: 24 (remaining gas: 1039961.799 units remaining) [ (Pair "B" { "B" }) (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039961.824 units remaining) + - location: 25 (remaining gas: 1039961.789 units remaining) [ "B" (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039961.809 units remaining) + - location: 26 (remaining gas: 1039961.774 units remaining) [ (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039961.799 units remaining) + - location: 28 (remaining gas: 1039961.764 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039961.769 units remaining) + - location: 26 (remaining gas: 1039961.734 units remaining) [ "B" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039961.759 units remaining) + - location: 29 (remaining gas: 1039961.724 units remaining) [ True "B" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039961.749 units remaining) + - location: 32 (remaining gas: 1039961.714 units remaining) [ "B" True { "B" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039961.479 units remaining) + - location: 33 (remaining gas: 1039961.444 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039961.464 units remaining) + - location: 21 (remaining gas: 1039961.429 units remaining) [ "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039961.449 units remaining) + - location: 23 (remaining gas: 1039961.414 units remaining) [ (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039961.439 units remaining) + - location: 24 (remaining gas: 1039961.404 units remaining) [ (Pair "asdf" { "B" }) (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039961.429 units remaining) + - location: 25 (remaining gas: 1039961.394 units remaining) [ "asdf" (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039961.414 units remaining) + - location: 26 (remaining gas: 1039961.379 units remaining) [ (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039961.404 units remaining) + - location: 28 (remaining gas: 1039961.369 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039961.374 units remaining) + - location: 26 (remaining gas: 1039961.339 units remaining) [ "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039961.364 units remaining) + - location: 29 (remaining gas: 1039961.329 units remaining) [ True "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039961.354 units remaining) + - location: 32 (remaining gas: 1039961.319 units remaining) [ "asdf" True { "B" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039961.084 units remaining) + - location: 33 (remaining gas: 1039961.049 units remaining) [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039961.069 units remaining) + - location: 21 (remaining gas: 1039961.034 units remaining) [ "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039961.054 units remaining) + - location: 23 (remaining gas: 1039961.019 units remaining) [ (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039961.044 units remaining) + - location: 24 (remaining gas: 1039961.009 units remaining) [ (Pair "C" { "B" ; "asdf" }) (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039961.034 units remaining) + - location: 25 (remaining gas: 1039960.999 units remaining) [ "C" (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039961.019 units remaining) + - location: 26 (remaining gas: 1039960.984 units remaining) [ (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039961.009 units remaining) + - location: 28 (remaining gas: 1039960.974 units remaining) [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039960.979 units remaining) + - location: 26 (remaining gas: 1039960.944 units remaining) [ "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039960.969 units remaining) + - location: 29 (remaining gas: 1039960.934 units remaining) [ True "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039960.959 units remaining) + - location: 32 (remaining gas: 1039960.924 units remaining) [ "C" True { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039960.619 units remaining) + - location: 33 (remaining gas: 1039960.584 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039960.604 units remaining) + - location: 21 (remaining gas: 1039960.569 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 34 (remaining gas: 1039960.594 units remaining) + - location: 34 (remaining gas: 1039960.559 units remaining) [ True { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 37 (remaining gas: 1039960.584 units remaining) + - location: 37 (remaining gas: 1039960.549 units remaining) [ { "B" ; "C" ; "asdf" } True { "B" ; "C" ; "asdf" } ] - - location: 38 (remaining gas: 1039960.569 units remaining) + - location: 38 (remaining gas: 1039960.534 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) { "B" ; "C" ; "asdf" } ] - - location: 39 (remaining gas: 1039960.559 units remaining) + - location: 39 (remaining gas: 1039960.524 units remaining) [ { "B" ; "C" ; "asdf" } (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039960.559 units remaining) + - location: 40 (remaining gas: 1039960.524 units remaining) [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039960.544 units remaining) + - location: 42 (remaining gas: 1039960.509 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039960.534 units remaining) + - location: 43 (remaining gas: 1039960.499 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039960.524 units remaining) + - location: 44 (remaining gas: 1039960.489 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039960.514 units remaining) + - location: 45 (remaining gas: 1039960.479 units remaining) [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039960.499 units remaining) + - location: 46 (remaining gas: 1039960.464 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039960.489 units remaining) + - location: 49 (remaining gas: 1039960.454 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039960.479 units remaining) + - location: 50 (remaining gas: 1039960.444 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039960.464 units remaining) + - location: 51 (remaining gas: 1039960.429 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039960.454 units remaining) + - location: 54 (remaining gas: 1039960.419 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039960.444 units remaining) + - location: 55 (remaining gas: 1039960.409 units remaining) [ True ] - - location: 51 (remaining gas: 1039960.414 units remaining) + - location: 51 (remaining gas: 1039960.379 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039960.404 units remaining) + - location: 56 (remaining gas: 1039960.369 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039960.374 units remaining) + - location: 46 (remaining gas: 1039960.339 units remaining) [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039960.154 units remaining) + - location: 57 (remaining gas: 1039960.119 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039960.139 units remaining) + - location: 58 (remaining gas: 1039960.104 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039960.129 units remaining) + - location: 60 (remaining gas: 1039960.094 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039960.099 units remaining) + - location: 58 (remaining gas: 1039960.064 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039960.079 units remaining) + - location: 61 (remaining gas: 1039960.044 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039960.069 units remaining) + - location: 62 (remaining gas: 1039960.034 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039960.054 units remaining) + - location: 63 (remaining gas: 1039960.019 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039960.039 units remaining) + - location: 40 (remaining gas: 1039960.004 units remaining) [ "C" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039960.024 units remaining) + - location: 42 (remaining gas: 1039959.989 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039960.014 units remaining) + - location: 43 (remaining gas: 1039959.979 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039960.004 units remaining) + - location: 44 (remaining gas: 1039959.969 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039959.994 units remaining) + - location: 45 (remaining gas: 1039959.959 units remaining) [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039959.979 units remaining) + - location: 46 (remaining gas: 1039959.944 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039959.969 units remaining) + - location: 49 (remaining gas: 1039959.934 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039959.959 units remaining) + - location: 50 (remaining gas: 1039959.924 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039959.944 units remaining) + - location: 51 (remaining gas: 1039959.909 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039959.934 units remaining) + - location: 54 (remaining gas: 1039959.899 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039959.924 units remaining) + - location: 55 (remaining gas: 1039959.889 units remaining) [ True ] - - location: 51 (remaining gas: 1039959.894 units remaining) + - location: 51 (remaining gas: 1039959.859 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039959.884 units remaining) + - location: 56 (remaining gas: 1039959.849 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039959.854 units remaining) + - location: 46 (remaining gas: 1039959.819 units remaining) [ "C" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039959.634 units remaining) + - location: 57 (remaining gas: 1039959.599 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039959.619 units remaining) + - location: 58 (remaining gas: 1039959.584 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039959.609 units remaining) + - location: 60 (remaining gas: 1039959.574 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039959.579 units remaining) + - location: 58 (remaining gas: 1039959.544 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039959.559 units remaining) + - location: 61 (remaining gas: 1039959.524 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039959.549 units remaining) + - location: 62 (remaining gas: 1039959.514 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039959.534 units remaining) + - location: 63 (remaining gas: 1039959.499 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039959.519 units remaining) + - location: 40 (remaining gas: 1039959.484 units remaining) [ "asdf" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039959.504 units remaining) + - location: 42 (remaining gas: 1039959.469 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039959.494 units remaining) + - location: 43 (remaining gas: 1039959.459 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039959.484 units remaining) + - location: 44 (remaining gas: 1039959.449 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039959.474 units remaining) + - location: 45 (remaining gas: 1039959.439 units remaining) [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039959.459 units remaining) + - location: 46 (remaining gas: 1039959.424 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039959.449 units remaining) + - location: 49 (remaining gas: 1039959.414 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039959.439 units remaining) + - location: 50 (remaining gas: 1039959.404 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039959.424 units remaining) + - location: 51 (remaining gas: 1039959.389 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039959.414 units remaining) + - location: 54 (remaining gas: 1039959.379 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039959.404 units remaining) + - location: 55 (remaining gas: 1039959.369 units remaining) [ True ] - - location: 51 (remaining gas: 1039959.374 units remaining) + - location: 51 (remaining gas: 1039959.339 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039959.364 units remaining) + - location: 56 (remaining gas: 1039959.329 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039959.334 units remaining) + - location: 46 (remaining gas: 1039959.299 units remaining) [ "asdf" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039959.114 units remaining) + - location: 57 (remaining gas: 1039959.079 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039959.099 units remaining) + - location: 58 (remaining gas: 1039959.064 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039959.089 units remaining) + - location: 60 (remaining gas: 1039959.054 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039959.059 units remaining) + - location: 58 (remaining gas: 1039959.024 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039959.039 units remaining) + - location: 61 (remaining gas: 1039959.004 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039959.029 units remaining) + - location: 62 (remaining gas: 1039958.994 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039959.014 units remaining) + - location: 63 (remaining gas: 1039958.979 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039958.999 units remaining) + - location: 40 (remaining gas: 1039958.964 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 64 (remaining gas: 1039958.989 units remaining) + - location: 64 (remaining gas: 1039958.954 units remaining) [ True ] - - location: 65 (remaining gas: 1039958.974 units remaining) + - location: 65 (remaining gas: 1039958.939 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039958.959 units remaining) + - location: 66 (remaining gas: 1039958.924 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039958.944 units remaining) + - location: 68 (remaining gas: 1039958.909 units remaining) [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" index c7a2fff6e3a6..b3272a685ec6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" @@ -7,431 +7,431 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039962.499 units remaining) + - location: 12 (remaining gas: 1039962.464 units remaining) [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] - - location: 12 (remaining gas: 1039962.489 units remaining) + - location: 12 (remaining gas: 1039962.454 units remaining) [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - - location: 13 (remaining gas: 1039962.479 units remaining) + - location: 13 (remaining gas: 1039962.444 units remaining) [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - - location: 14 (remaining gas: 1039962.469 units remaining) + - location: 14 (remaining gas: 1039962.434 units remaining) [ { "B" ; "C" ; "asdf" } (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - - location: 15 (remaining gas: 1039962.454 units remaining) + - location: 15 (remaining gas: 1039962.419 units remaining) [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - - location: 17 (remaining gas: 1039962.444 units remaining) + - location: 17 (remaining gas: 1039962.409 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } ] - - location: 15 (remaining gas: 1039962.414 units remaining) + - location: 15 (remaining gas: 1039962.379 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 18 (remaining gas: 1039962.194 units remaining) + - location: 18 (remaining gas: 1039962.159 units remaining) [ {} { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 20 (remaining gas: 1039962.184 units remaining) + - location: 20 (remaining gas: 1039962.149 units remaining) [ { "B" ; "C" ; "asdf" } {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 21 (remaining gas: 1039962.184 units remaining) + - location: 21 (remaining gas: 1039962.149 units remaining) [ "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039962.169 units remaining) + - location: 23 (remaining gas: 1039962.134 units remaining) [ (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039962.159 units remaining) + - location: 24 (remaining gas: 1039962.124 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039962.149 units remaining) + - location: 25 (remaining gas: 1039962.114 units remaining) [ "B" (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039962.134 units remaining) + - location: 26 (remaining gas: 1039962.099 units remaining) [ (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039962.124 units remaining) + - location: 28 (remaining gas: 1039962.089 units remaining) [ {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039962.094 units remaining) + - location: 26 (remaining gas: 1039962.059 units remaining) [ "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039962.084 units remaining) + - location: 29 (remaining gas: 1039962.049 units remaining) [ True "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039962.074 units remaining) + - location: 32 (remaining gas: 1039962.039 units remaining) [ "B" True {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039961.874 units remaining) + - location: 33 (remaining gas: 1039961.839 units remaining) [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 21 (remaining gas: 1039961.859 units remaining) + - location: 21 (remaining gas: 1039961.824 units remaining) [ "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039961.844 units remaining) + - location: 23 (remaining gas: 1039961.809 units remaining) [ (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039961.834 units remaining) + - location: 24 (remaining gas: 1039961.799 units remaining) [ (Pair "C" { "B" }) (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039961.824 units remaining) + - location: 25 (remaining gas: 1039961.789 units remaining) [ "C" (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039961.809 units remaining) + - location: 26 (remaining gas: 1039961.774 units remaining) [ (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039961.799 units remaining) + - location: 28 (remaining gas: 1039961.764 units remaining) [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039961.769 units remaining) + - location: 26 (remaining gas: 1039961.734 units remaining) [ "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039961.759 units remaining) + - location: 29 (remaining gas: 1039961.724 units remaining) [ True "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039961.749 units remaining) + - location: 32 (remaining gas: 1039961.714 units remaining) [ "C" True { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039961.479 units remaining) + - location: 33 (remaining gas: 1039961.444 units remaining) [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 21 (remaining gas: 1039961.464 units remaining) + - location: 21 (remaining gas: 1039961.429 units remaining) [ "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039961.449 units remaining) + - location: 23 (remaining gas: 1039961.414 units remaining) [ (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039961.439 units remaining) + - location: 24 (remaining gas: 1039961.404 units remaining) [ (Pair "asdf" { "B" ; "C" }) (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039961.429 units remaining) + - location: 25 (remaining gas: 1039961.394 units remaining) [ "asdf" (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039961.414 units remaining) + - location: 26 (remaining gas: 1039961.379 units remaining) [ (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039961.404 units remaining) + - location: 28 (remaining gas: 1039961.369 units remaining) [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039961.374 units remaining) + - location: 26 (remaining gas: 1039961.339 units remaining) [ "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039961.364 units remaining) + - location: 29 (remaining gas: 1039961.329 units remaining) [ True "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039961.354 units remaining) + - location: 32 (remaining gas: 1039961.319 units remaining) [ "asdf" True { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039961.014 units remaining) + - location: 33 (remaining gas: 1039960.979 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 21 (remaining gas: 1039960.999 units remaining) + - location: 21 (remaining gas: 1039960.964 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 34 (remaining gas: 1039960.989 units remaining) + - location: 34 (remaining gas: 1039960.954 units remaining) [ True { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 37 (remaining gas: 1039960.979 units remaining) + - location: 37 (remaining gas: 1039960.944 units remaining) [ { "B" ; "C" ; "asdf" } True { "B" ; "B" ; "asdf" ; "C" } ] - - location: 38 (remaining gas: 1039960.964 units remaining) + - location: 38 (remaining gas: 1039960.929 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 39 (remaining gas: 1039960.954 units remaining) + - location: 39 (remaining gas: 1039960.919 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039960.954 units remaining) + - location: 40 (remaining gas: 1039960.919 units remaining) [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039960.939 units remaining) + - location: 42 (remaining gas: 1039960.904 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039960.929 units remaining) + - location: 43 (remaining gas: 1039960.894 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039960.919 units remaining) + - location: 44 (remaining gas: 1039960.884 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039960.909 units remaining) + - location: 45 (remaining gas: 1039960.874 units remaining) [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039960.894 units remaining) + - location: 46 (remaining gas: 1039960.859 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039960.884 units remaining) + - location: 49 (remaining gas: 1039960.849 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039960.874 units remaining) + - location: 50 (remaining gas: 1039960.839 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039960.859 units remaining) + - location: 51 (remaining gas: 1039960.824 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039960.849 units remaining) + - location: 54 (remaining gas: 1039960.814 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039960.839 units remaining) + - location: 55 (remaining gas: 1039960.804 units remaining) [ True ] - - location: 51 (remaining gas: 1039960.809 units remaining) + - location: 51 (remaining gas: 1039960.774 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039960.799 units remaining) + - location: 56 (remaining gas: 1039960.764 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039960.769 units remaining) + - location: 46 (remaining gas: 1039960.734 units remaining) [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039960.549 units remaining) + - location: 57 (remaining gas: 1039960.514 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039960.534 units remaining) + - location: 58 (remaining gas: 1039960.499 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039960.524 units remaining) + - location: 60 (remaining gas: 1039960.489 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039960.494 units remaining) + - location: 58 (remaining gas: 1039960.459 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039960.474 units remaining) + - location: 61 (remaining gas: 1039960.439 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039960.464 units remaining) + - location: 62 (remaining gas: 1039960.429 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039960.449 units remaining) + - location: 63 (remaining gas: 1039960.414 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039960.434 units remaining) + - location: 40 (remaining gas: 1039960.399 units remaining) [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039960.419 units remaining) + - location: 42 (remaining gas: 1039960.384 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039960.409 units remaining) + - location: 43 (remaining gas: 1039960.374 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039960.399 units remaining) + - location: 44 (remaining gas: 1039960.364 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039960.389 units remaining) + - location: 45 (remaining gas: 1039960.354 units remaining) [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039960.374 units remaining) + - location: 46 (remaining gas: 1039960.339 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039960.364 units remaining) + - location: 49 (remaining gas: 1039960.329 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039960.354 units remaining) + - location: 50 (remaining gas: 1039960.319 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039960.339 units remaining) + - location: 51 (remaining gas: 1039960.304 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039960.329 units remaining) + - location: 54 (remaining gas: 1039960.294 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039960.319 units remaining) + - location: 55 (remaining gas: 1039960.284 units remaining) [ True ] - - location: 51 (remaining gas: 1039960.289 units remaining) + - location: 51 (remaining gas: 1039960.254 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039960.279 units remaining) + - location: 56 (remaining gas: 1039960.244 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039960.249 units remaining) + - location: 46 (remaining gas: 1039960.214 units remaining) [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039960.029 units remaining) + - location: 57 (remaining gas: 1039959.994 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039960.014 units remaining) + - location: 58 (remaining gas: 1039959.979 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039960.004 units remaining) + - location: 60 (remaining gas: 1039959.969 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039959.974 units remaining) + - location: 58 (remaining gas: 1039959.939 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039959.954 units remaining) + - location: 61 (remaining gas: 1039959.919 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039959.944 units remaining) + - location: 62 (remaining gas: 1039959.909 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039959.929 units remaining) + - location: 63 (remaining gas: 1039959.894 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039959.914 units remaining) + - location: 40 (remaining gas: 1039959.879 units remaining) [ "asdf" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039959.899 units remaining) + - location: 42 (remaining gas: 1039959.864 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039959.889 units remaining) + - location: 43 (remaining gas: 1039959.854 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039959.879 units remaining) + - location: 44 (remaining gas: 1039959.844 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039959.869 units remaining) + - location: 45 (remaining gas: 1039959.834 units remaining) [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039959.854 units remaining) + - location: 46 (remaining gas: 1039959.819 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039959.844 units remaining) + - location: 49 (remaining gas: 1039959.809 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039959.834 units remaining) + - location: 50 (remaining gas: 1039959.799 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039959.819 units remaining) + - location: 51 (remaining gas: 1039959.784 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039959.809 units remaining) + - location: 54 (remaining gas: 1039959.774 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039959.799 units remaining) + - location: 55 (remaining gas: 1039959.764 units remaining) [ True ] - - location: 51 (remaining gas: 1039959.769 units remaining) + - location: 51 (remaining gas: 1039959.734 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039959.759 units remaining) + - location: 56 (remaining gas: 1039959.724 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039959.729 units remaining) + - location: 46 (remaining gas: 1039959.694 units remaining) [ "asdf" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039959.509 units remaining) + - location: 57 (remaining gas: 1039959.474 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039959.494 units remaining) + - location: 58 (remaining gas: 1039959.459 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039959.484 units remaining) + - location: 60 (remaining gas: 1039959.449 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039959.454 units remaining) + - location: 58 (remaining gas: 1039959.419 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039959.434 units remaining) + - location: 61 (remaining gas: 1039959.399 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039959.424 units remaining) + - location: 62 (remaining gas: 1039959.389 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039959.409 units remaining) + - location: 63 (remaining gas: 1039959.374 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039959.394 units remaining) + - location: 40 (remaining gas: 1039959.359 units remaining) [ "C" (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039959.379 units remaining) + - location: 42 (remaining gas: 1039959.344 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039959.369 units remaining) + - location: 43 (remaining gas: 1039959.334 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039959.359 units remaining) + - location: 44 (remaining gas: 1039959.324 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039959.349 units remaining) + - location: 45 (remaining gas: 1039959.314 units remaining) [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 46 (remaining gas: 1039959.334 units remaining) + - location: 46 (remaining gas: 1039959.299 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039959.324 units remaining) + - location: 49 (remaining gas: 1039959.289 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039959.314 units remaining) + - location: 50 (remaining gas: 1039959.279 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 51 (remaining gas: 1039959.299 units remaining) + - location: 51 (remaining gas: 1039959.264 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039959.289 units remaining) + - location: 54 (remaining gas: 1039959.254 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039959.279 units remaining) + - location: 55 (remaining gas: 1039959.244 units remaining) [ True ] - - location: 51 (remaining gas: 1039959.249 units remaining) + - location: 51 (remaining gas: 1039959.214 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 56 (remaining gas: 1039959.239 units remaining) + - location: 56 (remaining gas: 1039959.204 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039959.209 units remaining) + - location: 46 (remaining gas: 1039959.174 units remaining) [ "C" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 57 (remaining gas: 1039958.989 units remaining) + - location: 57 (remaining gas: 1039958.954 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 58 (remaining gas: 1039958.974 units remaining) + - location: 58 (remaining gas: 1039958.939 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039958.964 units remaining) + - location: 60 (remaining gas: 1039958.929 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039958.934 units remaining) + - location: 58 (remaining gas: 1039958.899 units remaining) [ True True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039958.914 units remaining) + - location: 61 (remaining gas: 1039958.879 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039958.904 units remaining) + - location: 62 (remaining gas: 1039958.869 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039958.889 units remaining) + - location: 63 (remaining gas: 1039958.854 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039958.874 units remaining) + - location: 40 (remaining gas: 1039958.839 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 64 (remaining gas: 1039958.864 units remaining) + - location: 64 (remaining gas: 1039958.829 units remaining) [ True ] - - location: 65 (remaining gas: 1039958.849 units remaining) + - location: 65 (remaining gas: 1039958.814 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039958.834 units remaining) + - location: 66 (remaining gas: 1039958.799 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039958.819 units remaining) + - location: 68 (remaining gas: 1039958.784 units remaining) [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" index 17f1e07c7f23..41c54d53b1c1 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" @@ -7,160 +7,160 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039963.179 units remaining) + - location: 12 (remaining gas: 1039963.144 units remaining) [ (Pair (Pair { "B" } { "B" }) None) ] - - location: 12 (remaining gas: 1039963.169 units remaining) + - location: 12 (remaining gas: 1039963.134 units remaining) [ (Pair { "B" } { "B" }) ] - - location: 13 (remaining gas: 1039963.159 units remaining) + - location: 13 (remaining gas: 1039963.124 units remaining) [ (Pair { "B" } { "B" }) (Pair { "B" } { "B" }) ] - - location: 14 (remaining gas: 1039963.149 units remaining) + - location: 14 (remaining gas: 1039963.114 units remaining) [ { "B" } (Pair { "B" } { "B" }) ] - - location: 15 (remaining gas: 1039963.134 units remaining) + - location: 15 (remaining gas: 1039963.099 units remaining) [ (Pair { "B" } { "B" }) ] - - location: 17 (remaining gas: 1039963.124 units remaining) + - location: 17 (remaining gas: 1039963.089 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039963.094 units remaining) + - location: 15 (remaining gas: 1039963.059 units remaining) [ { "B" } { "B" } ] - - location: 18 (remaining gas: 1039962.874 units remaining) + - location: 18 (remaining gas: 1039962.839 units remaining) [ {} { "B" } { "B" } ] - - location: 20 (remaining gas: 1039962.864 units remaining) + - location: 20 (remaining gas: 1039962.829 units remaining) [ { "B" } {} { "B" } ] - - location: 21 (remaining gas: 1039962.864 units remaining) + - location: 21 (remaining gas: 1039962.829 units remaining) [ "B" {} { "B" } ] - - location: 23 (remaining gas: 1039962.849 units remaining) + - location: 23 (remaining gas: 1039962.814 units remaining) [ (Pair "B" {}) { "B" } ] - - location: 24 (remaining gas: 1039962.839 units remaining) + - location: 24 (remaining gas: 1039962.804 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" } ] - - location: 25 (remaining gas: 1039962.829 units remaining) + - location: 25 (remaining gas: 1039962.794 units remaining) [ "B" (Pair "B" {}) { "B" } ] - - location: 26 (remaining gas: 1039962.814 units remaining) + - location: 26 (remaining gas: 1039962.779 units remaining) [ (Pair "B" {}) { "B" } ] - - location: 28 (remaining gas: 1039962.804 units remaining) + - location: 28 (remaining gas: 1039962.769 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039962.774 units remaining) + - location: 26 (remaining gas: 1039962.739 units remaining) [ "B" {} { "B" } ] - - location: 29 (remaining gas: 1039962.764 units remaining) + - location: 29 (remaining gas: 1039962.729 units remaining) [ True "B" {} { "B" } ] - - location: 32 (remaining gas: 1039962.754 units remaining) + - location: 32 (remaining gas: 1039962.719 units remaining) [ "B" True {} { "B" } ] - - location: 33 (remaining gas: 1039962.554 units remaining) + - location: 33 (remaining gas: 1039962.519 units remaining) [ { "B" } { "B" } ] - - location: 21 (remaining gas: 1039962.539 units remaining) + - location: 21 (remaining gas: 1039962.504 units remaining) [ { "B" } { "B" } ] - - location: 34 (remaining gas: 1039962.529 units remaining) + - location: 34 (remaining gas: 1039962.494 units remaining) [ True { "B" } { "B" } ] - - location: 37 (remaining gas: 1039962.519 units remaining) + - location: 37 (remaining gas: 1039962.484 units remaining) [ { "B" } True { "B" } ] - - location: 38 (remaining gas: 1039962.504 units remaining) + - location: 38 (remaining gas: 1039962.469 units remaining) [ (Pair { "B" } True) { "B" } ] - - location: 39 (remaining gas: 1039962.494 units remaining) + - location: 39 (remaining gas: 1039962.459 units remaining) [ { "B" } (Pair { "B" } True) ] - - location: 40 (remaining gas: 1039962.494 units remaining) + - location: 40 (remaining gas: 1039962.459 units remaining) [ "B" (Pair { "B" } True) ] - - location: 42 (remaining gas: 1039962.479 units remaining) + - location: 42 (remaining gas: 1039962.444 units remaining) [ (Pair "B" { "B" } True) ] - - location: 43 (remaining gas: 1039962.469 units remaining) + - location: 43 (remaining gas: 1039962.434 units remaining) [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 44 (remaining gas: 1039962.459 units remaining) + - location: 44 (remaining gas: 1039962.424 units remaining) [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 45 (remaining gas: 1039962.449 units remaining) + - location: 45 (remaining gas: 1039962.414 units remaining) [ "B" (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 46 (remaining gas: 1039962.434 units remaining) + - location: 46 (remaining gas: 1039962.399 units remaining) [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 49 (remaining gas: 1039962.424 units remaining) + - location: 49 (remaining gas: 1039962.389 units remaining) [ (Pair { "B" } True) (Pair "B" { "B" } True) ] - - location: 50 (remaining gas: 1039962.414 units remaining) + - location: 50 (remaining gas: 1039962.379 units remaining) [ { "B" } (Pair "B" { "B" } True) ] - - location: 51 (remaining gas: 1039962.399 units remaining) + - location: 51 (remaining gas: 1039962.364 units remaining) [ (Pair "B" { "B" } True) ] - - location: 54 (remaining gas: 1039962.389 units remaining) + - location: 54 (remaining gas: 1039962.354 units remaining) [ (Pair { "B" } True) ] - - location: 55 (remaining gas: 1039962.379 units remaining) + - location: 55 (remaining gas: 1039962.344 units remaining) [ True ] - - location: 51 (remaining gas: 1039962.349 units remaining) + - location: 51 (remaining gas: 1039962.314 units remaining) [ { "B" } True ] - - location: 56 (remaining gas: 1039962.339 units remaining) + - location: 56 (remaining gas: 1039962.304 units remaining) [ { "B" } { "B" } True ] - - location: 46 (remaining gas: 1039962.309 units remaining) + - location: 46 (remaining gas: 1039962.274 units remaining) [ "B" { "B" } { "B" } True ] - - location: 57 (remaining gas: 1039962.124 units remaining) + - location: 57 (remaining gas: 1039962.089 units remaining) [ True { "B" } True ] - - location: 58 (remaining gas: 1039962.109 units remaining) + - location: 58 (remaining gas: 1039962.074 units remaining) [ { "B" } True ] - - location: 60 (remaining gas: 1039962.099 units remaining) + - location: 60 (remaining gas: 1039962.064 units remaining) [ True { "B" } ] - - location: 58 (remaining gas: 1039962.069 units remaining) + - location: 58 (remaining gas: 1039962.034 units remaining) [ True True { "B" } ] - - location: 61 (remaining gas: 1039962.049 units remaining) + - location: 61 (remaining gas: 1039962.014 units remaining) [ True { "B" } ] - - location: 62 (remaining gas: 1039962.039 units remaining) + - location: 62 (remaining gas: 1039962.004 units remaining) [ { "B" } True ] - - location: 63 (remaining gas: 1039962.024 units remaining) + - location: 63 (remaining gas: 1039961.989 units remaining) [ (Pair { "B" } True) ] - - location: 40 (remaining gas: 1039962.009 units remaining) + - location: 40 (remaining gas: 1039961.974 units remaining) [ (Pair { "B" } True) ] - - location: 64 (remaining gas: 1039961.999 units remaining) + - location: 64 (remaining gas: 1039961.964 units remaining) [ True ] - - location: 65 (remaining gas: 1039961.984 units remaining) + - location: 65 (remaining gas: 1039961.949 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039961.969 units remaining) + - location: 66 (remaining gas: 1039961.934 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039961.954 units remaining) + - location: 68 (remaining gas: 1039961.919 units remaining) [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" index ad1d85e8b7e2..b68011c56466 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" @@ -7,160 +7,160 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039963.179 units remaining) + - location: 12 (remaining gas: 1039963.144 units remaining) [ (Pair (Pair { "c" } { "B" }) None) ] - - location: 12 (remaining gas: 1039963.169 units remaining) + - location: 12 (remaining gas: 1039963.134 units remaining) [ (Pair { "c" } { "B" }) ] - - location: 13 (remaining gas: 1039963.159 units remaining) + - location: 13 (remaining gas: 1039963.124 units remaining) [ (Pair { "c" } { "B" }) (Pair { "c" } { "B" }) ] - - location: 14 (remaining gas: 1039963.149 units remaining) + - location: 14 (remaining gas: 1039963.114 units remaining) [ { "c" } (Pair { "c" } { "B" }) ] - - location: 15 (remaining gas: 1039963.134 units remaining) + - location: 15 (remaining gas: 1039963.099 units remaining) [ (Pair { "c" } { "B" }) ] - - location: 17 (remaining gas: 1039963.124 units remaining) + - location: 17 (remaining gas: 1039963.089 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039963.094 units remaining) + - location: 15 (remaining gas: 1039963.059 units remaining) [ { "c" } { "B" } ] - - location: 18 (remaining gas: 1039962.874 units remaining) + - location: 18 (remaining gas: 1039962.839 units remaining) [ {} { "c" } { "B" } ] - - location: 20 (remaining gas: 1039962.864 units remaining) + - location: 20 (remaining gas: 1039962.829 units remaining) [ { "c" } {} { "B" } ] - - location: 21 (remaining gas: 1039962.864 units remaining) + - location: 21 (remaining gas: 1039962.829 units remaining) [ "c" {} { "B" } ] - - location: 23 (remaining gas: 1039962.849 units remaining) + - location: 23 (remaining gas: 1039962.814 units remaining) [ (Pair "c" {}) { "B" } ] - - location: 24 (remaining gas: 1039962.839 units remaining) + - location: 24 (remaining gas: 1039962.804 units remaining) [ (Pair "c" {}) (Pair "c" {}) { "B" } ] - - location: 25 (remaining gas: 1039962.829 units remaining) + - location: 25 (remaining gas: 1039962.794 units remaining) [ "c" (Pair "c" {}) { "B" } ] - - location: 26 (remaining gas: 1039962.814 units remaining) + - location: 26 (remaining gas: 1039962.779 units remaining) [ (Pair "c" {}) { "B" } ] - - location: 28 (remaining gas: 1039962.804 units remaining) + - location: 28 (remaining gas: 1039962.769 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039962.774 units remaining) + - location: 26 (remaining gas: 1039962.739 units remaining) [ "c" {} { "B" } ] - - location: 29 (remaining gas: 1039962.764 units remaining) + - location: 29 (remaining gas: 1039962.729 units remaining) [ True "c" {} { "B" } ] - - location: 32 (remaining gas: 1039962.754 units remaining) + - location: 32 (remaining gas: 1039962.719 units remaining) [ "c" True {} { "B" } ] - - location: 33 (remaining gas: 1039962.554 units remaining) + - location: 33 (remaining gas: 1039962.519 units remaining) [ { "c" } { "B" } ] - - location: 21 (remaining gas: 1039962.539 units remaining) + - location: 21 (remaining gas: 1039962.504 units remaining) [ { "c" } { "B" } ] - - location: 34 (remaining gas: 1039962.529 units remaining) + - location: 34 (remaining gas: 1039962.494 units remaining) [ True { "c" } { "B" } ] - - location: 37 (remaining gas: 1039962.519 units remaining) + - location: 37 (remaining gas: 1039962.484 units remaining) [ { "c" } True { "B" } ] - - location: 38 (remaining gas: 1039962.504 units remaining) + - location: 38 (remaining gas: 1039962.469 units remaining) [ (Pair { "c" } True) { "B" } ] - - location: 39 (remaining gas: 1039962.494 units remaining) + - location: 39 (remaining gas: 1039962.459 units remaining) [ { "B" } (Pair { "c" } True) ] - - location: 40 (remaining gas: 1039962.494 units remaining) + - location: 40 (remaining gas: 1039962.459 units remaining) [ "B" (Pair { "c" } True) ] - - location: 42 (remaining gas: 1039962.479 units remaining) + - location: 42 (remaining gas: 1039962.444 units remaining) [ (Pair "B" { "c" } True) ] - - location: 43 (remaining gas: 1039962.469 units remaining) + - location: 43 (remaining gas: 1039962.434 units remaining) [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 44 (remaining gas: 1039962.459 units remaining) + - location: 44 (remaining gas: 1039962.424 units remaining) [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 45 (remaining gas: 1039962.449 units remaining) + - location: 45 (remaining gas: 1039962.414 units remaining) [ "B" (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 46 (remaining gas: 1039962.434 units remaining) + - location: 46 (remaining gas: 1039962.399 units remaining) [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 49 (remaining gas: 1039962.424 units remaining) + - location: 49 (remaining gas: 1039962.389 units remaining) [ (Pair { "c" } True) (Pair "B" { "c" } True) ] - - location: 50 (remaining gas: 1039962.414 units remaining) + - location: 50 (remaining gas: 1039962.379 units remaining) [ { "c" } (Pair "B" { "c" } True) ] - - location: 51 (remaining gas: 1039962.399 units remaining) + - location: 51 (remaining gas: 1039962.364 units remaining) [ (Pair "B" { "c" } True) ] - - location: 54 (remaining gas: 1039962.389 units remaining) + - location: 54 (remaining gas: 1039962.354 units remaining) [ (Pair { "c" } True) ] - - location: 55 (remaining gas: 1039962.379 units remaining) + - location: 55 (remaining gas: 1039962.344 units remaining) [ True ] - - location: 51 (remaining gas: 1039962.349 units remaining) + - location: 51 (remaining gas: 1039962.314 units remaining) [ { "c" } True ] - - location: 56 (remaining gas: 1039962.339 units remaining) + - location: 56 (remaining gas: 1039962.304 units remaining) [ { "c" } { "c" } True ] - - location: 46 (remaining gas: 1039962.309 units remaining) + - location: 46 (remaining gas: 1039962.274 units remaining) [ "B" { "c" } { "c" } True ] - - location: 57 (remaining gas: 1039962.124 units remaining) + - location: 57 (remaining gas: 1039962.089 units remaining) [ False { "c" } True ] - - location: 58 (remaining gas: 1039962.109 units remaining) + - location: 58 (remaining gas: 1039962.074 units remaining) [ { "c" } True ] - - location: 60 (remaining gas: 1039962.099 units remaining) + - location: 60 (remaining gas: 1039962.064 units remaining) [ True { "c" } ] - - location: 58 (remaining gas: 1039962.069 units remaining) + - location: 58 (remaining gas: 1039962.034 units remaining) [ False True { "c" } ] - - location: 61 (remaining gas: 1039962.049 units remaining) + - location: 61 (remaining gas: 1039962.014 units remaining) [ False { "c" } ] - - location: 62 (remaining gas: 1039962.039 units remaining) + - location: 62 (remaining gas: 1039962.004 units remaining) [ { "c" } False ] - - location: 63 (remaining gas: 1039962.024 units remaining) + - location: 63 (remaining gas: 1039961.989 units remaining) [ (Pair { "c" } False) ] - - location: 40 (remaining gas: 1039962.009 units remaining) + - location: 40 (remaining gas: 1039961.974 units remaining) [ (Pair { "c" } False) ] - - location: 64 (remaining gas: 1039961.999 units remaining) + - location: 64 (remaining gas: 1039961.964 units remaining) [ False ] - - location: 65 (remaining gas: 1039961.984 units remaining) + - location: 65 (remaining gas: 1039961.949 units remaining) [ (Some False) ] - - location: 66 (remaining gas: 1039961.969 units remaining) + - location: 66 (remaining gas: 1039961.934 units remaining) [ {} (Some False) ] - - location: 68 (remaining gas: 1039961.954 units remaining) + - location: 68 (remaining gas: 1039961.919 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out index 41875cbdb75f..00273be9fba3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out @@ -7,57 +7,57 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039963.427 units remaining) + - location: 12 (remaining gas: 1039963.392 units remaining) [ (Pair (Pair {} {}) None) ] - - location: 12 (remaining gas: 1039963.417 units remaining) + - location: 12 (remaining gas: 1039963.382 units remaining) [ (Pair {} {}) ] - - location: 13 (remaining gas: 1039963.407 units remaining) + - location: 13 (remaining gas: 1039963.372 units remaining) [ (Pair {} {}) (Pair {} {}) ] - - location: 14 (remaining gas: 1039963.397 units remaining) + - location: 14 (remaining gas: 1039963.362 units remaining) [ {} (Pair {} {}) ] - - location: 15 (remaining gas: 1039963.382 units remaining) + - location: 15 (remaining gas: 1039963.347 units remaining) [ (Pair {} {}) ] - - location: 17 (remaining gas: 1039963.372 units remaining) + - location: 17 (remaining gas: 1039963.337 units remaining) [ {} ] - - location: 15 (remaining gas: 1039963.342 units remaining) + - location: 15 (remaining gas: 1039963.307 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039963.122 units remaining) + - location: 18 (remaining gas: 1039963.087 units remaining) [ {} {} {} ] - - location: 20 (remaining gas: 1039963.112 units remaining) + - location: 20 (remaining gas: 1039963.077 units remaining) [ {} {} {} ] - - location: 21 (remaining gas: 1039963.112 units remaining) + - location: 21 (remaining gas: 1039963.077 units remaining) [ {} {} ] - - location: 34 (remaining gas: 1039963.102 units remaining) + - location: 34 (remaining gas: 1039963.067 units remaining) [ True {} {} ] - - location: 37 (remaining gas: 1039963.092 units remaining) + - location: 37 (remaining gas: 1039963.057 units remaining) [ {} True {} ] - - location: 38 (remaining gas: 1039963.077 units remaining) + - location: 38 (remaining gas: 1039963.042 units remaining) [ (Pair {} True) {} ] - - location: 39 (remaining gas: 1039963.067 units remaining) + - location: 39 (remaining gas: 1039963.032 units remaining) [ {} (Pair {} True) ] - - location: 40 (remaining gas: 1039963.067 units remaining) + - location: 40 (remaining gas: 1039963.032 units remaining) [ (Pair {} True) ] - - location: 64 (remaining gas: 1039963.057 units remaining) + - location: 64 (remaining gas: 1039963.022 units remaining) [ True ] - - location: 65 (remaining gas: 1039963.042 units remaining) + - location: 65 (remaining gas: 1039963.007 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039963.027 units remaining) + - location: 66 (remaining gas: 1039962.992 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039963.012 units remaining) + - location: 68 (remaining gas: 1039962.977 units remaining) [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" index 320057609853..56ee3f21f17e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" @@ -7,23 +7,23 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039340.345 units remaining) + - location: 7 (remaining gas: 1039340.310 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - - location: 7 (remaining gas: 1039340.335 units remaining) + - location: 7 (remaining gas: 1039340.300 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 8 (remaining gas: 1039340.085 units remaining) + - location: 8 (remaining gas: 1039340.050 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 11 (remaining gas: 1039340.075 units remaining) + - location: 11 (remaining gas: 1039340.040 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 11 (remaining gas: 1039340.060 units remaining) + - location: 11 (remaining gas: 1039340.025 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 17 (remaining gas: 1039340.050 units remaining) + - location: 17 (remaining gas: 1039340.015 units remaining) [ ] - - location: 18 (remaining gas: 1039340.040 units remaining) + - location: 18 (remaining gas: 1039340.005 units remaining) [ Unit ] - - location: 19 (remaining gas: 1039340.025 units remaining) + - location: 19 (remaining gas: 1039339.990 units remaining) [ {} Unit ] - - location: 21 (remaining gas: 1039340.010 units remaining) + - location: 21 (remaining gas: 1039339.975 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" index 9d85c0fc05cd..7b85638e5ab9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" @@ -13,37 +13,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039984.149 units remaining) + - location: 8 (remaining gas: 1039984.114 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039984.139 units remaining) + - location: 8 (remaining gas: 1039984.104 units remaining) [ ] - - location: 9 (remaining gas: 1039984.129 units remaining) + - location: 9 (remaining gas: 1039984.094 units remaining) [ Unit ] - - location: 10 (remaining gas: 1039984.114 units remaining) + - location: 10 (remaining gas: 1039984.079 units remaining) [ 50000 Unit ] - - location: 11 (remaining gas: 1039984.099 units remaining) + - location: 11 (remaining gas: 1039984.064 units remaining) [ None 50000 Unit ] - - location: 13 (remaining gas: 1039983.493 units remaining) + - location: 13 (remaining gas: 1039983.458 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - - location: 25 (remaining gas: 1039983.478 units remaining) + - location: 25 (remaining gas: 1039983.443 units remaining) [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - - location: 27 (remaining gas: 1039983.463 units remaining) + - location: 27 (remaining gas: 1039983.428 units remaining) [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 28 (remaining gas: 1039983.448 units remaining) + - location: 28 (remaining gas: 1039983.413 units remaining) [ {} (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 25 (remaining gas: 1039983.418 units remaining) + - location: 25 (remaining gas: 1039983.383 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b {} (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 30 (remaining gas: 1039983.403 units remaining) + - location: 30 (remaining gas: 1039983.368 units remaining) [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 31 (remaining gas: 1039983.388 units remaining) + - location: 31 (remaining gas: 1039983.353 units remaining) [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" index 483caa2addef..dc7d892b88e4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.353 units remaining) + - location: 9 (remaining gas: 1039991.318 units remaining) [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039991.343 units remaining) + - location: 9 (remaining gas: 1039991.308 units remaining) [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - - location: 10 (remaining gas: 1039991.333 units remaining) + - location: 10 (remaining gas: 1039991.298 units remaining) [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - - location: 11 (remaining gas: 1039991.323 units remaining) + - location: 11 (remaining gas: 1039991.288 units remaining) [ "1970-01-01T00:03:20Z" (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - - location: 12 (remaining gas: 1039991.308 units remaining) + - location: 12 (remaining gas: 1039991.273 units remaining) [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - - location: 14 (remaining gas: 1039991.298 units remaining) + - location: 14 (remaining gas: 1039991.263 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039991.268 units remaining) + - location: 12 (remaining gas: 1039991.233 units remaining) [ "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039991.213 units remaining) + - location: 15 (remaining gas: 1039991.178 units remaining) [ 200 ] - - location: 16 (remaining gas: 1039991.198 units remaining) + - location: 16 (remaining gas: 1039991.163 units remaining) [ {} 200 ] - - location: 18 (remaining gas: 1039991.183 units remaining) + - location: 18 (remaining gas: 1039991.148 units remaining) [ (Pair {} 200) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out index 5c58c2ea7e51..2c0bbf81baf2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ 0 ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} 0 ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out index 00df34dd87a2..46c9387e6cab 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ "1970-01-01T00:00:01Z" ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z" ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} -1 ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} -1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out index 2573c9d64ded..2fc1c7d6bc33 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:00:01Z" (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ 1 ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} 1 ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out index 7b06f8f50ec3..59baabd67f42 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out @@ -7,111 +7,111 @@ emitted operations big_map diff trace - - location: 24 (remaining gas: 1039868.707 units remaining) + - location: 24 (remaining gas: 1039868.672 units remaining) [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ] - - location: 24 (remaining gas: 1039868.697 units remaining) + - location: 24 (remaining gas: 1039868.662 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 25 (remaining gas: 1039868.687 units remaining) + - location: 25 (remaining gas: 1039868.652 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 27 (remaining gas: 1039868.677 units remaining) + - location: 27 (remaining gas: 1039868.642 units remaining) [ 17 (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 28 (remaining gas: 1039868.662 units remaining) + - location: 28 (remaining gas: 1039868.627 units remaining) [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 30 (remaining gas: 1039868.652 units remaining) + - location: 30 (remaining gas: 1039868.617 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 28 (remaining gas: 1039868.622 units remaining) + - location: 28 (remaining gas: 1039868.587 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 31 (remaining gas: 1039868.574 units remaining) + - location: 31 (remaining gas: 1039868.539 units remaining) [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 34 (remaining gas: 1039868.564 units remaining) + - location: 34 (remaining gas: 1039868.529 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 31 (remaining gas: 1039868.539 units remaining) + - location: 31 (remaining gas: 1039868.504 units remaining) [ 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 31 (remaining gas: 1039868.529 units remaining) + - location: 31 (remaining gas: 1039868.494 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 31 (remaining gas: 1039868.529 units remaining) + - location: 31 (remaining gas: 1039868.494 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 35 (remaining gas: 1039868.480 units remaining) + - location: 35 (remaining gas: 1039868.445 units remaining) [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 38 (remaining gas: 1039868.470 units remaining) + - location: 38 (remaining gas: 1039868.435 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 35 (remaining gas: 1039868.445 units remaining) + - location: 35 (remaining gas: 1039868.410 units remaining) [ 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 35 (remaining gas: 1039868.435 units remaining) + - location: 35 (remaining gas: 1039868.400 units remaining) [ 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 35 (remaining gas: 1039868.425 units remaining) + - location: 35 (remaining gas: 1039868.390 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 35 (remaining gas: 1039868.425 units remaining) + - location: 35 (remaining gas: 1039868.390 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.374 units remaining) + - location: 39 (remaining gas: 1039868.339 units remaining) [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 42 (remaining gas: 1039868.364 units remaining) + - location: 42 (remaining gas: 1039868.329 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.339 units remaining) + - location: 39 (remaining gas: 1039868.304 units remaining) [ 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.329 units remaining) + - location: 39 (remaining gas: 1039868.294 units remaining) [ 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.319 units remaining) + - location: 39 (remaining gas: 1039868.284 units remaining) [ 16 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.309 units remaining) + - location: 39 (remaining gas: 1039868.274 units remaining) [ 17 16 15 @@ -119,7 +119,7 @@ trace 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 39 (remaining gas: 1039868.309 units remaining) + - location: 39 (remaining gas: 1039868.274 units remaining) [ 17 16 15 @@ -127,32 +127,32 @@ trace 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.257 units remaining) + - location: 43 (remaining gas: 1039868.222 units remaining) [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 46 (remaining gas: 1039868.247 units remaining) + - location: 46 (remaining gas: 1039868.212 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.222 units remaining) + - location: 43 (remaining gas: 1039868.187 units remaining) [ 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.212 units remaining) + - location: 43 (remaining gas: 1039868.177 units remaining) [ 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.202 units remaining) + - location: 43 (remaining gas: 1039868.167 units remaining) [ 15 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.192 units remaining) + - location: 43 (remaining gas: 1039868.157 units remaining) [ 16 15 14 @@ -160,7 +160,7 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.182 units remaining) + - location: 43 (remaining gas: 1039868.147 units remaining) [ 17 16 15 @@ -169,7 +169,7 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 43 (remaining gas: 1039868.182 units remaining) + - location: 43 (remaining gas: 1039868.147 units remaining) [ 17 16 15 @@ -178,32 +178,32 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.128 units remaining) + - location: 47 (remaining gas: 1039868.093 units remaining) [ (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 50 (remaining gas: 1039868.118 units remaining) + - location: 50 (remaining gas: 1039868.083 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.093 units remaining) + - location: 47 (remaining gas: 1039868.058 units remaining) [ 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.083 units remaining) + - location: 47 (remaining gas: 1039868.048 units remaining) [ 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.073 units remaining) + - location: 47 (remaining gas: 1039868.038 units remaining) [ 14 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.063 units remaining) + - location: 47 (remaining gas: 1039868.028 units remaining) [ 15 14 13 @@ -211,7 +211,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.053 units remaining) + - location: 47 (remaining gas: 1039868.018 units remaining) [ 16 15 14 @@ -220,7 +220,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.043 units remaining) + - location: 47 (remaining gas: 1039868.008 units remaining) [ 17 16 15 @@ -230,7 +230,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 47 (remaining gas: 1039868.043 units remaining) + - location: 47 (remaining gas: 1039868.008 units remaining) [ 17 16 15 @@ -240,32 +240,32 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.988 units remaining) + - location: 51 (remaining gas: 1039867.953 units remaining) [ (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 54 (remaining gas: 1039867.978 units remaining) + - location: 54 (remaining gas: 1039867.943 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.953 units remaining) + - location: 51 (remaining gas: 1039867.918 units remaining) [ 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.943 units remaining) + - location: 51 (remaining gas: 1039867.908 units remaining) [ 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.933 units remaining) + - location: 51 (remaining gas: 1039867.898 units remaining) [ 13 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.923 units remaining) + - location: 51 (remaining gas: 1039867.888 units remaining) [ 14 13 12 @@ -273,7 +273,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.913 units remaining) + - location: 51 (remaining gas: 1039867.878 units remaining) [ 15 14 13 @@ -282,7 +282,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.903 units remaining) + - location: 51 (remaining gas: 1039867.868 units remaining) [ 16 15 14 @@ -292,7 +292,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.893 units remaining) + - location: 51 (remaining gas: 1039867.858 units remaining) [ 17 16 15 @@ -303,7 +303,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 51 (remaining gas: 1039867.893 units remaining) + - location: 51 (remaining gas: 1039867.858 units remaining) [ 17 16 15 @@ -314,32 +314,32 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.835 units remaining) + - location: 55 (remaining gas: 1039867.800 units remaining) [ (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 58 (remaining gas: 1039867.825 units remaining) + - location: 58 (remaining gas: 1039867.790 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.800 units remaining) + - location: 55 (remaining gas: 1039867.765 units remaining) [ 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.790 units remaining) + - location: 55 (remaining gas: 1039867.755 units remaining) [ 11 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.780 units remaining) + - location: 55 (remaining gas: 1039867.745 units remaining) [ 12 11 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.770 units remaining) + - location: 55 (remaining gas: 1039867.735 units remaining) [ 13 12 11 @@ -347,7 +347,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.760 units remaining) + - location: 55 (remaining gas: 1039867.725 units remaining) [ 14 13 12 @@ -356,7 +356,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.750 units remaining) + - location: 55 (remaining gas: 1039867.715 units remaining) [ 15 14 13 @@ -366,7 +366,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.740 units remaining) + - location: 55 (remaining gas: 1039867.705 units remaining) [ 16 15 14 @@ -377,7 +377,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.730 units remaining) + - location: 55 (remaining gas: 1039867.695 units remaining) [ 17 16 15 @@ -389,7 +389,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 55 (remaining gas: 1039867.730 units remaining) + - location: 55 (remaining gas: 1039867.695 units remaining) [ 17 16 15 @@ -401,32 +401,32 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.671 units remaining) + - location: 59 (remaining gas: 1039867.636 units remaining) [ (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 62 (remaining gas: 1039867.661 units remaining) + - location: 62 (remaining gas: 1039867.626 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.636 units remaining) + - location: 59 (remaining gas: 1039867.601 units remaining) [ 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.626 units remaining) + - location: 59 (remaining gas: 1039867.591 units remaining) [ 10 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.616 units remaining) + - location: 59 (remaining gas: 1039867.581 units remaining) [ 11 10 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.606 units remaining) + - location: 59 (remaining gas: 1039867.571 units remaining) [ 12 11 10 @@ -434,7 +434,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.596 units remaining) + - location: 59 (remaining gas: 1039867.561 units remaining) [ 13 12 11 @@ -443,7 +443,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.586 units remaining) + - location: 59 (remaining gas: 1039867.551 units remaining) [ 14 13 12 @@ -453,7 +453,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.576 units remaining) + - location: 59 (remaining gas: 1039867.541 units remaining) [ 15 14 13 @@ -464,7 +464,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.566 units remaining) + - location: 59 (remaining gas: 1039867.531 units remaining) [ 16 15 14 @@ -476,7 +476,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.556 units remaining) + - location: 59 (remaining gas: 1039867.521 units remaining) [ 17 16 15 @@ -489,7 +489,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 59 (remaining gas: 1039867.556 units remaining) + - location: 59 (remaining gas: 1039867.521 units remaining) [ 17 16 15 @@ -502,32 +502,32 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.495 units remaining) + - location: 63 (remaining gas: 1039867.460 units remaining) [ (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 66 (remaining gas: 1039867.485 units remaining) + - location: 66 (remaining gas: 1039867.450 units remaining) [ 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.460 units remaining) + - location: 63 (remaining gas: 1039867.425 units remaining) [ 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.450 units remaining) + - location: 63 (remaining gas: 1039867.415 units remaining) [ 9 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.440 units remaining) + - location: 63 (remaining gas: 1039867.405 units remaining) [ 10 9 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.430 units remaining) + - location: 63 (remaining gas: 1039867.395 units remaining) [ 11 10 9 @@ -535,7 +535,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.420 units remaining) + - location: 63 (remaining gas: 1039867.385 units remaining) [ 12 11 10 @@ -544,7 +544,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.410 units remaining) + - location: 63 (remaining gas: 1039867.375 units remaining) [ 13 12 11 @@ -554,7 +554,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.400 units remaining) + - location: 63 (remaining gas: 1039867.365 units remaining) [ 14 13 12 @@ -565,7 +565,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.390 units remaining) + - location: 63 (remaining gas: 1039867.355 units remaining) [ 15 14 13 @@ -577,7 +577,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.380 units remaining) + - location: 63 (remaining gas: 1039867.345 units remaining) [ 16 15 14 @@ -590,7 +590,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.370 units remaining) + - location: 63 (remaining gas: 1039867.335 units remaining) [ 17 16 15 @@ -604,7 +604,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 63 (remaining gas: 1039867.370 units remaining) + - location: 63 (remaining gas: 1039867.335 units remaining) [ 17 16 15 @@ -618,32 +618,32 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.308 units remaining) + - location: 67 (remaining gas: 1039867.273 units remaining) [ (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 70 (remaining gas: 1039867.298 units remaining) + - location: 70 (remaining gas: 1039867.263 units remaining) [ 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.273 units remaining) + - location: 67 (remaining gas: 1039867.238 units remaining) [ 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.263 units remaining) + - location: 67 (remaining gas: 1039867.228 units remaining) [ 8 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.253 units remaining) + - location: 67 (remaining gas: 1039867.218 units remaining) [ 9 8 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.243 units remaining) + - location: 67 (remaining gas: 1039867.208 units remaining) [ 10 9 8 @@ -651,7 +651,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.233 units remaining) + - location: 67 (remaining gas: 1039867.198 units remaining) [ 11 10 9 @@ -660,7 +660,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.223 units remaining) + - location: 67 (remaining gas: 1039867.188 units remaining) [ 12 11 10 @@ -670,7 +670,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.213 units remaining) + - location: 67 (remaining gas: 1039867.178 units remaining) [ 13 12 11 @@ -681,7 +681,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.203 units remaining) + - location: 67 (remaining gas: 1039867.168 units remaining) [ 14 13 12 @@ -693,7 +693,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.193 units remaining) + - location: 67 (remaining gas: 1039867.158 units remaining) [ 15 14 13 @@ -706,7 +706,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.183 units remaining) + - location: 67 (remaining gas: 1039867.148 units remaining) [ 16 15 14 @@ -720,7 +720,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.173 units remaining) + - location: 67 (remaining gas: 1039867.138 units remaining) [ 17 16 15 @@ -735,7 +735,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 67 (remaining gas: 1039867.173 units remaining) + - location: 67 (remaining gas: 1039867.138 units remaining) [ 17 16 15 @@ -750,32 +750,32 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.109 units remaining) + - location: 71 (remaining gas: 1039867.074 units remaining) [ (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 74 (remaining gas: 1039867.099 units remaining) + - location: 74 (remaining gas: 1039867.064 units remaining) [ 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.074 units remaining) + - location: 71 (remaining gas: 1039867.039 units remaining) [ 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.064 units remaining) + - location: 71 (remaining gas: 1039867.029 units remaining) [ 7 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.054 units remaining) + - location: 71 (remaining gas: 1039867.019 units remaining) [ 8 7 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.044 units remaining) + - location: 71 (remaining gas: 1039867.009 units remaining) [ 9 8 7 @@ -783,7 +783,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.034 units remaining) + - location: 71 (remaining gas: 1039866.999 units remaining) [ 10 9 8 @@ -792,7 +792,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.024 units remaining) + - location: 71 (remaining gas: 1039866.989 units remaining) [ 11 10 9 @@ -802,7 +802,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.014 units remaining) + - location: 71 (remaining gas: 1039866.979 units remaining) [ 12 11 10 @@ -813,7 +813,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039867.004 units remaining) + - location: 71 (remaining gas: 1039866.969 units remaining) [ 13 12 11 @@ -825,7 +825,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039866.994 units remaining) + - location: 71 (remaining gas: 1039866.959 units remaining) [ 14 13 12 @@ -838,7 +838,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039866.984 units remaining) + - location: 71 (remaining gas: 1039866.949 units remaining) [ 15 14 13 @@ -852,7 +852,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039866.974 units remaining) + - location: 71 (remaining gas: 1039866.939 units remaining) [ 16 15 14 @@ -867,7 +867,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039866.964 units remaining) + - location: 71 (remaining gas: 1039866.929 units remaining) [ 17 16 15 @@ -883,7 +883,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 71 (remaining gas: 1039866.964 units remaining) + - location: 71 (remaining gas: 1039866.929 units remaining) [ 17 16 15 @@ -899,32 +899,32 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.899 units remaining) + - location: 75 (remaining gas: 1039866.864 units remaining) [ (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 78 (remaining gas: 1039866.889 units remaining) + - location: 78 (remaining gas: 1039866.854 units remaining) [ 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.864 units remaining) + - location: 75 (remaining gas: 1039866.829 units remaining) [ 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.854 units remaining) + - location: 75 (remaining gas: 1039866.819 units remaining) [ 6 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.844 units remaining) + - location: 75 (remaining gas: 1039866.809 units remaining) [ 7 6 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.834 units remaining) + - location: 75 (remaining gas: 1039866.799 units remaining) [ 8 7 6 @@ -932,7 +932,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.824 units remaining) + - location: 75 (remaining gas: 1039866.789 units remaining) [ 9 8 7 @@ -941,7 +941,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.814 units remaining) + - location: 75 (remaining gas: 1039866.779 units remaining) [ 10 9 8 @@ -951,7 +951,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.804 units remaining) + - location: 75 (remaining gas: 1039866.769 units remaining) [ 11 10 9 @@ -962,7 +962,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.794 units remaining) + - location: 75 (remaining gas: 1039866.759 units remaining) [ 12 11 10 @@ -974,7 +974,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.784 units remaining) + - location: 75 (remaining gas: 1039866.749 units remaining) [ 13 12 11 @@ -987,7 +987,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.774 units remaining) + - location: 75 (remaining gas: 1039866.739 units remaining) [ 14 13 12 @@ -1001,7 +1001,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.764 units remaining) + - location: 75 (remaining gas: 1039866.729 units remaining) [ 15 14 13 @@ -1016,7 +1016,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.754 units remaining) + - location: 75 (remaining gas: 1039866.719 units remaining) [ 16 15 14 @@ -1032,7 +1032,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.744 units remaining) + - location: 75 (remaining gas: 1039866.709 units remaining) [ 17 16 15 @@ -1049,7 +1049,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 75 (remaining gas: 1039866.744 units remaining) + - location: 75 (remaining gas: 1039866.709 units remaining) [ 17 16 15 @@ -1066,32 +1066,32 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.677 units remaining) + - location: 79 (remaining gas: 1039866.642 units remaining) [ (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 82 (remaining gas: 1039866.667 units remaining) + - location: 82 (remaining gas: 1039866.632 units remaining) [ 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.642 units remaining) + - location: 79 (remaining gas: 1039866.607 units remaining) [ 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.632 units remaining) + - location: 79 (remaining gas: 1039866.597 units remaining) [ 5 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.622 units remaining) + - location: 79 (remaining gas: 1039866.587 units remaining) [ 6 5 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.612 units remaining) + - location: 79 (remaining gas: 1039866.577 units remaining) [ 7 6 5 @@ -1099,7 +1099,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.602 units remaining) + - location: 79 (remaining gas: 1039866.567 units remaining) [ 8 7 6 @@ -1108,7 +1108,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.592 units remaining) + - location: 79 (remaining gas: 1039866.557 units remaining) [ 9 8 7 @@ -1118,7 +1118,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.582 units remaining) + - location: 79 (remaining gas: 1039866.547 units remaining) [ 10 9 8 @@ -1129,7 +1129,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.572 units remaining) + - location: 79 (remaining gas: 1039866.537 units remaining) [ 11 10 9 @@ -1141,7 +1141,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.562 units remaining) + - location: 79 (remaining gas: 1039866.527 units remaining) [ 12 11 10 @@ -1154,7 +1154,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.552 units remaining) + - location: 79 (remaining gas: 1039866.517 units remaining) [ 13 12 11 @@ -1168,7 +1168,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.542 units remaining) + - location: 79 (remaining gas: 1039866.507 units remaining) [ 14 13 12 @@ -1183,7 +1183,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.532 units remaining) + - location: 79 (remaining gas: 1039866.497 units remaining) [ 15 14 13 @@ -1199,7 +1199,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.522 units remaining) + - location: 79 (remaining gas: 1039866.487 units remaining) [ 16 15 14 @@ -1216,7 +1216,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.512 units remaining) + - location: 79 (remaining gas: 1039866.477 units remaining) [ 17 16 15 @@ -1234,7 +1234,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 79 (remaining gas: 1039866.512 units remaining) + - location: 79 (remaining gas: 1039866.477 units remaining) [ 17 16 15 @@ -1252,32 +1252,32 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.444 units remaining) + - location: 83 (remaining gas: 1039866.409 units remaining) [ (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 86 (remaining gas: 1039866.434 units remaining) + - location: 86 (remaining gas: 1039866.399 units remaining) [ 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.409 units remaining) + - location: 83 (remaining gas: 1039866.374 units remaining) [ 3 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.399 units remaining) + - location: 83 (remaining gas: 1039866.364 units remaining) [ 4 3 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.389 units remaining) + - location: 83 (remaining gas: 1039866.354 units remaining) [ 5 4 3 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.379 units remaining) + - location: 83 (remaining gas: 1039866.344 units remaining) [ 6 5 4 @@ -1285,7 +1285,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.369 units remaining) + - location: 83 (remaining gas: 1039866.334 units remaining) [ 7 6 5 @@ -1294,7 +1294,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.359 units remaining) + - location: 83 (remaining gas: 1039866.324 units remaining) [ 8 7 6 @@ -1304,7 +1304,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.349 units remaining) + - location: 83 (remaining gas: 1039866.314 units remaining) [ 9 8 7 @@ -1315,7 +1315,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.339 units remaining) + - location: 83 (remaining gas: 1039866.304 units remaining) [ 10 9 8 @@ -1327,7 +1327,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.329 units remaining) + - location: 83 (remaining gas: 1039866.294 units remaining) [ 11 10 9 @@ -1340,7 +1340,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.319 units remaining) + - location: 83 (remaining gas: 1039866.284 units remaining) [ 12 11 10 @@ -1354,7 +1354,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.309 units remaining) + - location: 83 (remaining gas: 1039866.274 units remaining) [ 13 12 11 @@ -1369,7 +1369,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.299 units remaining) + - location: 83 (remaining gas: 1039866.264 units remaining) [ 14 13 12 @@ -1385,7 +1385,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.289 units remaining) + - location: 83 (remaining gas: 1039866.254 units remaining) [ 15 14 13 @@ -1402,7 +1402,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.279 units remaining) + - location: 83 (remaining gas: 1039866.244 units remaining) [ 16 15 14 @@ -1420,7 +1420,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.269 units remaining) + - location: 83 (remaining gas: 1039866.234 units remaining) [ 17 16 15 @@ -1439,7 +1439,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 83 (remaining gas: 1039866.269 units remaining) + - location: 83 (remaining gas: 1039866.234 units remaining) [ 17 16 15 @@ -1458,7 +1458,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 87 (remaining gas: 1039866.209 units remaining) + - location: 87 (remaining gas: 1039866.174 units remaining) [ 17 16 15 @@ -1477,7 +1477,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 89 (remaining gas: 1039866.143 units remaining) + - location: 89 (remaining gas: 1039866.108 units remaining) [ 16 17 15 @@ -1496,7 +1496,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 91 (remaining gas: 1039866.070 units remaining) + - location: 91 (remaining gas: 1039866.035 units remaining) [ 15 16 17 @@ -1515,7 +1515,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 93 (remaining gas: 1039865.991 units remaining) + - location: 93 (remaining gas: 1039865.956 units remaining) [ 14 15 16 @@ -1534,7 +1534,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 95 (remaining gas: 1039865.904 units remaining) + - location: 95 (remaining gas: 1039865.869 units remaining) [ 13 14 15 @@ -1553,7 +1553,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 97 (remaining gas: 1039865.811 units remaining) + - location: 97 (remaining gas: 1039865.776 units remaining) [ 12 13 14 @@ -1572,7 +1572,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 99 (remaining gas: 1039865.711 units remaining) + - location: 99 (remaining gas: 1039865.676 units remaining) [ 11 12 13 @@ -1591,7 +1591,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 101 (remaining gas: 1039865.605 units remaining) + - location: 101 (remaining gas: 1039865.570 units remaining) [ 10 11 12 @@ -1610,7 +1610,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 103 (remaining gas: 1039865.491 units remaining) + - location: 103 (remaining gas: 1039865.456 units remaining) [ 9 10 11 @@ -1629,7 +1629,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 105 (remaining gas: 1039865.371 units remaining) + - location: 105 (remaining gas: 1039865.336 units remaining) [ 8 9 10 @@ -1648,7 +1648,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 107 (remaining gas: 1039865.244 units remaining) + - location: 107 (remaining gas: 1039865.209 units remaining) [ 7 8 9 @@ -1667,7 +1667,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 109 (remaining gas: 1039865.111 units remaining) + - location: 109 (remaining gas: 1039865.076 units remaining) [ 6 7 8 @@ -1686,7 +1686,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 111 (remaining gas: 1039864.970 units remaining) + - location: 111 (remaining gas: 1039864.935 units remaining) [ 5 6 7 @@ -1705,7 +1705,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 113 (remaining gas: 1039864.823 units remaining) + - location: 113 (remaining gas: 1039864.788 units remaining) [ 4 5 6 @@ -1724,7 +1724,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 115 (remaining gas: 1039864.669 units remaining) + - location: 115 (remaining gas: 1039864.634 units remaining) [ 3 4 5 @@ -1743,7 +1743,7 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 117 (remaining gas: 1039864.509 units remaining) + - location: 117 (remaining gas: 1039864.474 units remaining) [ 2 3 4 @@ -1762,7 +1762,7 @@ trace 17 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 119 (remaining gas: 1039864.341 units remaining) + - location: 119 (remaining gas: 1039864.306 units remaining) [ 1 2 3 @@ -1781,7 +1781,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 121 (remaining gas: 1039864.281 units remaining) + - location: 121 (remaining gas: 1039864.246 units remaining) [ 1 2 3 @@ -1800,7 +1800,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 123 (remaining gas: 1039864.215 units remaining) + - location: 123 (remaining gas: 1039864.180 units remaining) [ 2 1 3 @@ -1819,7 +1819,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 125 (remaining gas: 1039864.142 units remaining) + - location: 125 (remaining gas: 1039864.107 units remaining) [ 3 2 1 @@ -1838,7 +1838,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 127 (remaining gas: 1039864.063 units remaining) + - location: 127 (remaining gas: 1039864.028 units remaining) [ 4 3 2 @@ -1857,7 +1857,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 129 (remaining gas: 1039863.976 units remaining) + - location: 129 (remaining gas: 1039863.941 units remaining) [ 5 4 3 @@ -1876,7 +1876,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 131 (remaining gas: 1039863.883 units remaining) + - location: 131 (remaining gas: 1039863.848 units remaining) [ 6 5 4 @@ -1895,7 +1895,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 133 (remaining gas: 1039863.783 units remaining) + - location: 133 (remaining gas: 1039863.748 units remaining) [ 7 6 5 @@ -1914,7 +1914,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 135 (remaining gas: 1039863.677 units remaining) + - location: 135 (remaining gas: 1039863.642 units remaining) [ 8 7 6 @@ -1933,7 +1933,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 137 (remaining gas: 1039863.563 units remaining) + - location: 137 (remaining gas: 1039863.528 units remaining) [ 9 8 7 @@ -1952,7 +1952,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 139 (remaining gas: 1039863.443 units remaining) + - location: 139 (remaining gas: 1039863.408 units remaining) [ 10 9 8 @@ -1971,7 +1971,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 141 (remaining gas: 1039863.316 units remaining) + - location: 141 (remaining gas: 1039863.281 units remaining) [ 11 10 9 @@ -1990,7 +1990,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 143 (remaining gas: 1039863.183 units remaining) + - location: 143 (remaining gas: 1039863.148 units remaining) [ 12 11 10 @@ -2009,7 +2009,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 145 (remaining gas: 1039863.042 units remaining) + - location: 145 (remaining gas: 1039863.007 units remaining) [ 13 12 11 @@ -2028,7 +2028,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 147 (remaining gas: 1039862.895 units remaining) + - location: 147 (remaining gas: 1039862.860 units remaining) [ 14 13 12 @@ -2047,7 +2047,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 149 (remaining gas: 1039862.741 units remaining) + - location: 149 (remaining gas: 1039862.706 units remaining) [ 15 14 13 @@ -2066,7 +2066,7 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 151 (remaining gas: 1039862.581 units remaining) + - location: 151 (remaining gas: 1039862.546 units remaining) [ 16 15 14 @@ -2085,7 +2085,7 @@ trace 1 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 153 (remaining gas: 1039862.413 units remaining) + - location: 153 (remaining gas: 1039862.378 units remaining) [ 17 16 15 @@ -2104,36 +2104,36 @@ trace 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.345 units remaining) + - location: 156 (remaining gas: 1039862.310 units remaining) [ 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 159 (remaining gas: 1039862.330 units remaining) + - location: 159 (remaining gas: 1039862.295 units remaining) [ (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.305 units remaining) + - location: 156 (remaining gas: 1039862.270 units remaining) [ 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.295 units remaining) + - location: 156 (remaining gas: 1039862.260 units remaining) [ 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.285 units remaining) + - location: 156 (remaining gas: 1039862.250 units remaining) [ 5 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.275 units remaining) + - location: 156 (remaining gas: 1039862.240 units remaining) [ 6 5 4 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.265 units remaining) + - location: 156 (remaining gas: 1039862.230 units remaining) [ 7 6 5 @@ -2141,7 +2141,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.255 units remaining) + - location: 156 (remaining gas: 1039862.220 units remaining) [ 8 7 6 @@ -2150,7 +2150,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.245 units remaining) + - location: 156 (remaining gas: 1039862.210 units remaining) [ 9 8 7 @@ -2160,7 +2160,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.235 units remaining) + - location: 156 (remaining gas: 1039862.200 units remaining) [ 10 9 8 @@ -2171,7 +2171,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.225 units remaining) + - location: 156 (remaining gas: 1039862.190 units remaining) [ 11 10 9 @@ -2183,7 +2183,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.215 units remaining) + - location: 156 (remaining gas: 1039862.180 units remaining) [ 12 11 10 @@ -2196,7 +2196,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.205 units remaining) + - location: 156 (remaining gas: 1039862.170 units remaining) [ 13 12 11 @@ -2210,7 +2210,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.195 units remaining) + - location: 156 (remaining gas: 1039862.160 units remaining) [ 14 13 12 @@ -2225,7 +2225,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.185 units remaining) + - location: 156 (remaining gas: 1039862.150 units remaining) [ 15 14 13 @@ -2241,7 +2241,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.175 units remaining) + - location: 156 (remaining gas: 1039862.140 units remaining) [ 16 15 14 @@ -2258,7 +2258,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.165 units remaining) + - location: 156 (remaining gas: 1039862.130 units remaining) [ 17 16 15 @@ -2276,7 +2276,7 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 156 (remaining gas: 1039862.165 units remaining) + - location: 156 (remaining gas: 1039862.130 units remaining) [ 17 16 15 @@ -2294,36 +2294,36 @@ trace 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.098 units remaining) + - location: 160 (remaining gas: 1039862.063 units remaining) [ 3 (Pair 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 163 (remaining gas: 1039862.083 units remaining) + - location: 163 (remaining gas: 1039862.048 units remaining) [ (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.058 units remaining) + - location: 160 (remaining gas: 1039862.023 units remaining) [ 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.048 units remaining) + - location: 160 (remaining gas: 1039862.013 units remaining) [ 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.038 units remaining) + - location: 160 (remaining gas: 1039862.003 units remaining) [ 6 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.028 units remaining) + - location: 160 (remaining gas: 1039861.993 units remaining) [ 7 6 5 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.018 units remaining) + - location: 160 (remaining gas: 1039861.983 units remaining) [ 8 7 6 @@ -2331,7 +2331,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039862.008 units remaining) + - location: 160 (remaining gas: 1039861.973 units remaining) [ 9 8 7 @@ -2340,7 +2340,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.998 units remaining) + - location: 160 (remaining gas: 1039861.963 units remaining) [ 10 9 8 @@ -2350,7 +2350,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.988 units remaining) + - location: 160 (remaining gas: 1039861.953 units remaining) [ 11 10 9 @@ -2361,7 +2361,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.978 units remaining) + - location: 160 (remaining gas: 1039861.943 units remaining) [ 12 11 10 @@ -2373,7 +2373,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.968 units remaining) + - location: 160 (remaining gas: 1039861.933 units remaining) [ 13 12 11 @@ -2386,7 +2386,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.958 units remaining) + - location: 160 (remaining gas: 1039861.923 units remaining) [ 14 13 12 @@ -2400,7 +2400,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.948 units remaining) + - location: 160 (remaining gas: 1039861.913 units remaining) [ 15 14 13 @@ -2415,7 +2415,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.938 units remaining) + - location: 160 (remaining gas: 1039861.903 units remaining) [ 16 15 14 @@ -2431,7 +2431,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.928 units remaining) + - location: 160 (remaining gas: 1039861.893 units remaining) [ 17 16 15 @@ -2448,7 +2448,7 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 160 (remaining gas: 1039861.928 units remaining) + - location: 160 (remaining gas: 1039861.893 units remaining) [ 17 16 15 @@ -2465,36 +2465,36 @@ trace 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.863 units remaining) + - location: 164 (remaining gas: 1039861.828 units remaining) [ 4 (Pair 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 167 (remaining gas: 1039861.848 units remaining) + - location: 167 (remaining gas: 1039861.813 units remaining) [ (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.823 units remaining) + - location: 164 (remaining gas: 1039861.788 units remaining) [ 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.813 units remaining) + - location: 164 (remaining gas: 1039861.778 units remaining) [ 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.803 units remaining) + - location: 164 (remaining gas: 1039861.768 units remaining) [ 7 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.793 units remaining) + - location: 164 (remaining gas: 1039861.758 units remaining) [ 8 7 6 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.783 units remaining) + - location: 164 (remaining gas: 1039861.748 units remaining) [ 9 8 7 @@ -2502,7 +2502,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.773 units remaining) + - location: 164 (remaining gas: 1039861.738 units remaining) [ 10 9 8 @@ -2511,7 +2511,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.763 units remaining) + - location: 164 (remaining gas: 1039861.728 units remaining) [ 11 10 9 @@ -2521,7 +2521,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.753 units remaining) + - location: 164 (remaining gas: 1039861.718 units remaining) [ 12 11 10 @@ -2532,7 +2532,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.743 units remaining) + - location: 164 (remaining gas: 1039861.708 units remaining) [ 13 12 11 @@ -2544,7 +2544,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.733 units remaining) + - location: 164 (remaining gas: 1039861.698 units remaining) [ 14 13 12 @@ -2557,7 +2557,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.723 units remaining) + - location: 164 (remaining gas: 1039861.688 units remaining) [ 15 14 13 @@ -2571,7 +2571,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.713 units remaining) + - location: 164 (remaining gas: 1039861.678 units remaining) [ 16 15 14 @@ -2586,7 +2586,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.703 units remaining) + - location: 164 (remaining gas: 1039861.668 units remaining) [ 17 16 15 @@ -2602,7 +2602,7 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 164 (remaining gas: 1039861.703 units remaining) + - location: 164 (remaining gas: 1039861.668 units remaining) [ 17 16 15 @@ -2618,36 +2618,36 @@ trace 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.639 units remaining) + - location: 168 (remaining gas: 1039861.604 units remaining) [ 5 (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 171 (remaining gas: 1039861.624 units remaining) + - location: 171 (remaining gas: 1039861.589 units remaining) [ (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.599 units remaining) + - location: 168 (remaining gas: 1039861.564 units remaining) [ 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.589 units remaining) + - location: 168 (remaining gas: 1039861.554 units remaining) [ 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.579 units remaining) + - location: 168 (remaining gas: 1039861.544 units remaining) [ 8 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.569 units remaining) + - location: 168 (remaining gas: 1039861.534 units remaining) [ 9 8 7 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.559 units remaining) + - location: 168 (remaining gas: 1039861.524 units remaining) [ 10 9 8 @@ -2655,7 +2655,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.549 units remaining) + - location: 168 (remaining gas: 1039861.514 units remaining) [ 11 10 9 @@ -2664,7 +2664,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.539 units remaining) + - location: 168 (remaining gas: 1039861.504 units remaining) [ 12 11 10 @@ -2674,7 +2674,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.529 units remaining) + - location: 168 (remaining gas: 1039861.494 units remaining) [ 13 12 11 @@ -2685,7 +2685,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.519 units remaining) + - location: 168 (remaining gas: 1039861.484 units remaining) [ 14 13 12 @@ -2697,7 +2697,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.509 units remaining) + - location: 168 (remaining gas: 1039861.474 units remaining) [ 15 14 13 @@ -2710,7 +2710,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.499 units remaining) + - location: 168 (remaining gas: 1039861.464 units remaining) [ 16 15 14 @@ -2724,7 +2724,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.489 units remaining) + - location: 168 (remaining gas: 1039861.454 units remaining) [ 17 16 15 @@ -2739,7 +2739,7 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 168 (remaining gas: 1039861.489 units remaining) + - location: 168 (remaining gas: 1039861.454 units remaining) [ 17 16 15 @@ -2754,36 +2754,36 @@ trace 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.427 units remaining) + - location: 172 (remaining gas: 1039861.392 units remaining) [ 6 (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 175 (remaining gas: 1039861.412 units remaining) + - location: 175 (remaining gas: 1039861.377 units remaining) [ (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.387 units remaining) + - location: 172 (remaining gas: 1039861.352 units remaining) [ 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.377 units remaining) + - location: 172 (remaining gas: 1039861.342 units remaining) [ 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.367 units remaining) + - location: 172 (remaining gas: 1039861.332 units remaining) [ 9 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.357 units remaining) + - location: 172 (remaining gas: 1039861.322 units remaining) [ 10 9 8 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.347 units remaining) + - location: 172 (remaining gas: 1039861.312 units remaining) [ 11 10 9 @@ -2791,7 +2791,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.337 units remaining) + - location: 172 (remaining gas: 1039861.302 units remaining) [ 12 11 10 @@ -2800,7 +2800,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.327 units remaining) + - location: 172 (remaining gas: 1039861.292 units remaining) [ 13 12 11 @@ -2810,7 +2810,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.317 units remaining) + - location: 172 (remaining gas: 1039861.282 units remaining) [ 14 13 12 @@ -2821,7 +2821,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.307 units remaining) + - location: 172 (remaining gas: 1039861.272 units remaining) [ 15 14 13 @@ -2833,7 +2833,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.297 units remaining) + - location: 172 (remaining gas: 1039861.262 units remaining) [ 16 15 14 @@ -2846,7 +2846,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.287 units remaining) + - location: 172 (remaining gas: 1039861.252 units remaining) [ 17 16 15 @@ -2860,7 +2860,7 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 172 (remaining gas: 1039861.287 units remaining) + - location: 172 (remaining gas: 1039861.252 units remaining) [ 17 16 15 @@ -2874,36 +2874,36 @@ trace 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.226 units remaining) + - location: 176 (remaining gas: 1039861.191 units remaining) [ 7 (Pair 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 179 (remaining gas: 1039861.211 units remaining) + - location: 179 (remaining gas: 1039861.176 units remaining) [ (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.186 units remaining) + - location: 176 (remaining gas: 1039861.151 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.176 units remaining) + - location: 176 (remaining gas: 1039861.141 units remaining) [ 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.166 units remaining) + - location: 176 (remaining gas: 1039861.131 units remaining) [ 10 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.156 units remaining) + - location: 176 (remaining gas: 1039861.121 units remaining) [ 11 10 9 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.146 units remaining) + - location: 176 (remaining gas: 1039861.111 units remaining) [ 12 11 10 @@ -2911,7 +2911,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.136 units remaining) + - location: 176 (remaining gas: 1039861.101 units remaining) [ 13 12 11 @@ -2920,7 +2920,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.126 units remaining) + - location: 176 (remaining gas: 1039861.091 units remaining) [ 14 13 12 @@ -2930,7 +2930,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.116 units remaining) + - location: 176 (remaining gas: 1039861.081 units remaining) [ 15 14 13 @@ -2941,7 +2941,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.106 units remaining) + - location: 176 (remaining gas: 1039861.071 units remaining) [ 16 15 14 @@ -2953,7 +2953,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.096 units remaining) + - location: 176 (remaining gas: 1039861.061 units remaining) [ 17 16 15 @@ -2966,7 +2966,7 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 176 (remaining gas: 1039861.096 units remaining) + - location: 176 (remaining gas: 1039861.061 units remaining) [ 17 16 15 @@ -2979,36 +2979,36 @@ trace 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039861.037 units remaining) + - location: 180 (remaining gas: 1039861.002 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 183 (remaining gas: 1039861.022 units remaining) + - location: 183 (remaining gas: 1039860.987 units remaining) [ (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.997 units remaining) + - location: 180 (remaining gas: 1039860.962 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.987 units remaining) + - location: 180 (remaining gas: 1039860.952 units remaining) [ 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.977 units remaining) + - location: 180 (remaining gas: 1039860.942 units remaining) [ 11 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.967 units remaining) + - location: 180 (remaining gas: 1039860.932 units remaining) [ 12 11 10 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.957 units remaining) + - location: 180 (remaining gas: 1039860.922 units remaining) [ 13 12 11 @@ -3016,7 +3016,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.947 units remaining) + - location: 180 (remaining gas: 1039860.912 units remaining) [ 14 13 12 @@ -3025,7 +3025,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.937 units remaining) + - location: 180 (remaining gas: 1039860.902 units remaining) [ 15 14 13 @@ -3035,7 +3035,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.927 units remaining) + - location: 180 (remaining gas: 1039860.892 units remaining) [ 16 15 14 @@ -3046,7 +3046,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.917 units remaining) + - location: 180 (remaining gas: 1039860.882 units remaining) [ 17 16 15 @@ -3058,7 +3058,7 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 180 (remaining gas: 1039860.917 units remaining) + - location: 180 (remaining gas: 1039860.882 units remaining) [ 17 16 15 @@ -3070,36 +3070,36 @@ trace 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.859 units remaining) + - location: 184 (remaining gas: 1039860.824 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 187 (remaining gas: 1039860.844 units remaining) + - location: 187 (remaining gas: 1039860.809 units remaining) [ (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.819 units remaining) + - location: 184 (remaining gas: 1039860.784 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.809 units remaining) + - location: 184 (remaining gas: 1039860.774 units remaining) [ 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.799 units remaining) + - location: 184 (remaining gas: 1039860.764 units remaining) [ 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.789 units remaining) + - location: 184 (remaining gas: 1039860.754 units remaining) [ 13 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.779 units remaining) + - location: 184 (remaining gas: 1039860.744 units remaining) [ 14 13 12 @@ -3107,7 +3107,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.769 units remaining) + - location: 184 (remaining gas: 1039860.734 units remaining) [ 15 14 13 @@ -3116,7 +3116,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.759 units remaining) + - location: 184 (remaining gas: 1039860.724 units remaining) [ 16 15 14 @@ -3126,7 +3126,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.749 units remaining) + - location: 184 (remaining gas: 1039860.714 units remaining) [ 17 16 15 @@ -3137,7 +3137,7 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 184 (remaining gas: 1039860.749 units remaining) + - location: 184 (remaining gas: 1039860.714 units remaining) [ 17 16 15 @@ -3148,36 +3148,36 @@ trace 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.694 units remaining) + - location: 188 (remaining gas: 1039860.659 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 191 (remaining gas: 1039860.679 units remaining) + - location: 191 (remaining gas: 1039860.644 units remaining) [ (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.654 units remaining) + - location: 188 (remaining gas: 1039860.619 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.644 units remaining) + - location: 188 (remaining gas: 1039860.609 units remaining) [ 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.634 units remaining) + - location: 188 (remaining gas: 1039860.599 units remaining) [ 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.624 units remaining) + - location: 188 (remaining gas: 1039860.589 units remaining) [ 14 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.614 units remaining) + - location: 188 (remaining gas: 1039860.579 units remaining) [ 15 14 13 @@ -3185,7 +3185,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.604 units remaining) + - location: 188 (remaining gas: 1039860.569 units remaining) [ 16 15 14 @@ -3194,7 +3194,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.594 units remaining) + - location: 188 (remaining gas: 1039860.559 units remaining) [ 17 16 15 @@ -3204,7 +3204,7 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 188 (remaining gas: 1039860.594 units remaining) + - location: 188 (remaining gas: 1039860.559 units remaining) [ 17 16 15 @@ -3214,36 +3214,36 @@ trace 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.540 units remaining) + - location: 192 (remaining gas: 1039860.505 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 195 (remaining gas: 1039860.525 units remaining) + - location: 195 (remaining gas: 1039860.490 units remaining) [ (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.500 units remaining) + - location: 192 (remaining gas: 1039860.465 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.490 units remaining) + - location: 192 (remaining gas: 1039860.455 units remaining) [ 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.480 units remaining) + - location: 192 (remaining gas: 1039860.445 units remaining) [ 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.470 units remaining) + - location: 192 (remaining gas: 1039860.435 units remaining) [ 15 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.460 units remaining) + - location: 192 (remaining gas: 1039860.425 units remaining) [ 16 15 14 @@ -3251,7 +3251,7 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.450 units remaining) + - location: 192 (remaining gas: 1039860.415 units remaining) [ 17 16 15 @@ -3260,7 +3260,7 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 192 (remaining gas: 1039860.450 units remaining) + - location: 192 (remaining gas: 1039860.415 units remaining) [ 17 16 15 @@ -3269,36 +3269,36 @@ trace 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.398 units remaining) + - location: 196 (remaining gas: 1039860.363 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 199 (remaining gas: 1039860.383 units remaining) + - location: 199 (remaining gas: 1039860.348 units remaining) [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.358 units remaining) + - location: 196 (remaining gas: 1039860.323 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.348 units remaining) + - location: 196 (remaining gas: 1039860.313 units remaining) [ 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.338 units remaining) + - location: 196 (remaining gas: 1039860.303 units remaining) [ 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.328 units remaining) + - location: 196 (remaining gas: 1039860.293 units remaining) [ 16 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.318 units remaining) + - location: 196 (remaining gas: 1039860.283 units remaining) [ 17 16 15 @@ -3306,7 +3306,7 @@ trace 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 196 (remaining gas: 1039860.318 units remaining) + - location: 196 (remaining gas: 1039860.283 units remaining) [ 17 16 15 @@ -3314,118 +3314,118 @@ trace 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.267 units remaining) + - location: 200 (remaining gas: 1039860.232 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 203 (remaining gas: 1039860.252 units remaining) + - location: 203 (remaining gas: 1039860.217 units remaining) [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.227 units remaining) + - location: 200 (remaining gas: 1039860.192 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.217 units remaining) + - location: 200 (remaining gas: 1039860.182 units remaining) [ 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.207 units remaining) + - location: 200 (remaining gas: 1039860.172 units remaining) [ 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.197 units remaining) + - location: 200 (remaining gas: 1039860.162 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 200 (remaining gas: 1039860.197 units remaining) + - location: 200 (remaining gas: 1039860.162 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 204 (remaining gas: 1039860.148 units remaining) + - location: 204 (remaining gas: 1039860.113 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 207 (remaining gas: 1039860.133 units remaining) + - location: 207 (remaining gas: 1039860.098 units remaining) [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 204 (remaining gas: 1039860.108 units remaining) + - location: 204 (remaining gas: 1039860.073 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 204 (remaining gas: 1039860.098 units remaining) + - location: 204 (remaining gas: 1039860.063 units remaining) [ 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 204 (remaining gas: 1039860.088 units remaining) + - location: 204 (remaining gas: 1039860.053 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 204 (remaining gas: 1039860.088 units remaining) + - location: 204 (remaining gas: 1039860.053 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 208 (remaining gas: 1039860.040 units remaining) + - location: 208 (remaining gas: 1039860.005 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 211 (remaining gas: 1039860.025 units remaining) + - location: 211 (remaining gas: 1039859.990 units remaining) [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 208 (remaining gas: 1039860 units remaining) + - location: 208 (remaining gas: 1039859.965 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 208 (remaining gas: 1039859.990 units remaining) + - location: 208 (remaining gas: 1039859.955 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 208 (remaining gas: 1039859.990 units remaining) + - location: 208 (remaining gas: 1039859.955 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 212 (remaining gas: 1039859.975 units remaining) + - location: 212 (remaining gas: 1039859.940 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 214 (remaining gas: 1039859.960 units remaining) + - location: 214 (remaining gas: 1039859.925 units remaining) [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 212 (remaining gas: 1039859.930 units remaining) + - location: 212 (remaining gas: 1039859.895 units remaining) [ 17 (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 215 (remaining gas: 1039859.915 units remaining) + - location: 215 (remaining gas: 1039859.880 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - - location: 218 (remaining gas: 1039859.160 units remaining) + - location: 218 (remaining gas: 1039859.125 units remaining) [ 0 ] - - location: 219 (remaining gas: 1039859.145 units remaining) + - location: 219 (remaining gas: 1039859.110 units remaining) [ True ] - - location: 220 (remaining gas: 1039859.135 units remaining) + - location: 220 (remaining gas: 1039859.100 units remaining) [ ] - - location: 220 (remaining gas: 1039859.120 units remaining) + - location: 220 (remaining gas: 1039859.085 units remaining) [ ] - - location: 226 (remaining gas: 1039859.110 units remaining) + - location: 226 (remaining gas: 1039859.075 units remaining) [ Unit ] - - location: 227 (remaining gas: 1039859.095 units remaining) + - location: 227 (remaining gas: 1039859.060 units remaining) [ {} Unit ] - - location: 229 (remaining gas: 1039859.080 units remaining) + - location: 229 (remaining gas: 1039859.045 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out index 5abea80af373..106e44050497 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out @@ -7,111 +7,111 @@ emitted operations big_map diff trace - - location: 24 (remaining gas: 1039868.707 units remaining) + - location: 24 (remaining gas: 1039868.672 units remaining) [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ] - - location: 24 (remaining gas: 1039868.697 units remaining) + - location: 24 (remaining gas: 1039868.662 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 25 (remaining gas: 1039868.687 units remaining) + - location: 25 (remaining gas: 1039868.652 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 27 (remaining gas: 1039868.677 units remaining) + - location: 27 (remaining gas: 1039868.642 units remaining) [ 2 (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 28 (remaining gas: 1039868.662 units remaining) + - location: 28 (remaining gas: 1039868.627 units remaining) [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 30 (remaining gas: 1039868.652 units remaining) + - location: 30 (remaining gas: 1039868.617 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 28 (remaining gas: 1039868.622 units remaining) + - location: 28 (remaining gas: 1039868.587 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 31 (remaining gas: 1039868.574 units remaining) + - location: 31 (remaining gas: 1039868.539 units remaining) [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 34 (remaining gas: 1039868.564 units remaining) + - location: 34 (remaining gas: 1039868.529 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 31 (remaining gas: 1039868.539 units remaining) + - location: 31 (remaining gas: 1039868.504 units remaining) [ 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 31 (remaining gas: 1039868.529 units remaining) + - location: 31 (remaining gas: 1039868.494 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 31 (remaining gas: 1039868.529 units remaining) + - location: 31 (remaining gas: 1039868.494 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 35 (remaining gas: 1039868.480 units remaining) + - location: 35 (remaining gas: 1039868.445 units remaining) [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 38 (remaining gas: 1039868.470 units remaining) + - location: 38 (remaining gas: 1039868.435 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 35 (remaining gas: 1039868.445 units remaining) + - location: 35 (remaining gas: 1039868.410 units remaining) [ 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 35 (remaining gas: 1039868.435 units remaining) + - location: 35 (remaining gas: 1039868.400 units remaining) [ 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 35 (remaining gas: 1039868.425 units remaining) + - location: 35 (remaining gas: 1039868.390 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 35 (remaining gas: 1039868.425 units remaining) + - location: 35 (remaining gas: 1039868.390 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.374 units remaining) + - location: 39 (remaining gas: 1039868.339 units remaining) [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 42 (remaining gas: 1039868.364 units remaining) + - location: 42 (remaining gas: 1039868.329 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.339 units remaining) + - location: 39 (remaining gas: 1039868.304 units remaining) [ 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.329 units remaining) + - location: 39 (remaining gas: 1039868.294 units remaining) [ 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.319 units remaining) + - location: 39 (remaining gas: 1039868.284 units remaining) [ 3 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.309 units remaining) + - location: 39 (remaining gas: 1039868.274 units remaining) [ 2 3 12 @@ -119,7 +119,7 @@ trace 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 39 (remaining gas: 1039868.309 units remaining) + - location: 39 (remaining gas: 1039868.274 units remaining) [ 2 3 12 @@ -127,32 +127,32 @@ trace 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.257 units remaining) + - location: 43 (remaining gas: 1039868.222 units remaining) [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 46 (remaining gas: 1039868.247 units remaining) + - location: 46 (remaining gas: 1039868.212 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.222 units remaining) + - location: 43 (remaining gas: 1039868.187 units remaining) [ 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.212 units remaining) + - location: 43 (remaining gas: 1039868.177 units remaining) [ 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.202 units remaining) + - location: 43 (remaining gas: 1039868.167 units remaining) [ 12 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.192 units remaining) + - location: 43 (remaining gas: 1039868.157 units remaining) [ 3 12 16 @@ -160,7 +160,7 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.182 units remaining) + - location: 43 (remaining gas: 1039868.147 units remaining) [ 2 3 12 @@ -169,7 +169,7 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 43 (remaining gas: 1039868.182 units remaining) + - location: 43 (remaining gas: 1039868.147 units remaining) [ 2 3 12 @@ -178,32 +178,32 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.128 units remaining) + - location: 47 (remaining gas: 1039868.093 units remaining) [ (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 50 (remaining gas: 1039868.118 units remaining) + - location: 50 (remaining gas: 1039868.083 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.093 units remaining) + - location: 47 (remaining gas: 1039868.058 units remaining) [ 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.083 units remaining) + - location: 47 (remaining gas: 1039868.048 units remaining) [ 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.073 units remaining) + - location: 47 (remaining gas: 1039868.038 units remaining) [ 16 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.063 units remaining) + - location: 47 (remaining gas: 1039868.028 units remaining) [ 12 16 10 @@ -211,7 +211,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.053 units remaining) + - location: 47 (remaining gas: 1039868.018 units remaining) [ 3 12 16 @@ -220,7 +220,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.043 units remaining) + - location: 47 (remaining gas: 1039868.008 units remaining) [ 2 3 12 @@ -230,7 +230,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 47 (remaining gas: 1039868.043 units remaining) + - location: 47 (remaining gas: 1039868.008 units remaining) [ 2 3 12 @@ -240,32 +240,32 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.988 units remaining) + - location: 51 (remaining gas: 1039867.953 units remaining) [ (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 54 (remaining gas: 1039867.978 units remaining) + - location: 54 (remaining gas: 1039867.943 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.953 units remaining) + - location: 51 (remaining gas: 1039867.918 units remaining) [ 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.943 units remaining) + - location: 51 (remaining gas: 1039867.908 units remaining) [ 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.933 units remaining) + - location: 51 (remaining gas: 1039867.898 units remaining) [ 10 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.923 units remaining) + - location: 51 (remaining gas: 1039867.888 units remaining) [ 16 10 14 @@ -273,7 +273,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.913 units remaining) + - location: 51 (remaining gas: 1039867.878 units remaining) [ 12 16 10 @@ -282,7 +282,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.903 units remaining) + - location: 51 (remaining gas: 1039867.868 units remaining) [ 3 12 16 @@ -292,7 +292,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.893 units remaining) + - location: 51 (remaining gas: 1039867.858 units remaining) [ 2 3 12 @@ -303,7 +303,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 51 (remaining gas: 1039867.893 units remaining) + - location: 51 (remaining gas: 1039867.858 units remaining) [ 2 3 12 @@ -314,32 +314,32 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.835 units remaining) + - location: 55 (remaining gas: 1039867.800 units remaining) [ (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 58 (remaining gas: 1039867.825 units remaining) + - location: 58 (remaining gas: 1039867.790 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.800 units remaining) + - location: 55 (remaining gas: 1039867.765 units remaining) [ 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.790 units remaining) + - location: 55 (remaining gas: 1039867.755 units remaining) [ 19 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.780 units remaining) + - location: 55 (remaining gas: 1039867.745 units remaining) [ 14 19 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.770 units remaining) + - location: 55 (remaining gas: 1039867.735 units remaining) [ 10 14 19 @@ -347,7 +347,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.760 units remaining) + - location: 55 (remaining gas: 1039867.725 units remaining) [ 16 10 14 @@ -356,7 +356,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.750 units remaining) + - location: 55 (remaining gas: 1039867.715 units remaining) [ 12 16 10 @@ -366,7 +366,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.740 units remaining) + - location: 55 (remaining gas: 1039867.705 units remaining) [ 3 12 16 @@ -377,7 +377,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.730 units remaining) + - location: 55 (remaining gas: 1039867.695 units remaining) [ 2 3 12 @@ -389,7 +389,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 55 (remaining gas: 1039867.730 units remaining) + - location: 55 (remaining gas: 1039867.695 units remaining) [ 2 3 12 @@ -401,32 +401,32 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.671 units remaining) + - location: 59 (remaining gas: 1039867.636 units remaining) [ (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 62 (remaining gas: 1039867.661 units remaining) + - location: 62 (remaining gas: 1039867.626 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.636 units remaining) + - location: 59 (remaining gas: 1039867.601 units remaining) [ 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.626 units remaining) + - location: 59 (remaining gas: 1039867.591 units remaining) [ 9 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.616 units remaining) + - location: 59 (remaining gas: 1039867.581 units remaining) [ 19 9 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.606 units remaining) + - location: 59 (remaining gas: 1039867.571 units remaining) [ 14 19 9 @@ -434,7 +434,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.596 units remaining) + - location: 59 (remaining gas: 1039867.561 units remaining) [ 10 14 19 @@ -443,7 +443,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.586 units remaining) + - location: 59 (remaining gas: 1039867.551 units remaining) [ 16 10 14 @@ -453,7 +453,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.576 units remaining) + - location: 59 (remaining gas: 1039867.541 units remaining) [ 12 16 10 @@ -464,7 +464,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.566 units remaining) + - location: 59 (remaining gas: 1039867.531 units remaining) [ 3 12 16 @@ -476,7 +476,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.556 units remaining) + - location: 59 (remaining gas: 1039867.521 units remaining) [ 2 3 12 @@ -489,7 +489,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 59 (remaining gas: 1039867.556 units remaining) + - location: 59 (remaining gas: 1039867.521 units remaining) [ 2 3 12 @@ -502,32 +502,32 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.495 units remaining) + - location: 63 (remaining gas: 1039867.460 units remaining) [ (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 66 (remaining gas: 1039867.485 units remaining) + - location: 66 (remaining gas: 1039867.450 units remaining) [ 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.460 units remaining) + - location: 63 (remaining gas: 1039867.425 units remaining) [ 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.450 units remaining) + - location: 63 (remaining gas: 1039867.415 units remaining) [ 18 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.440 units remaining) + - location: 63 (remaining gas: 1039867.405 units remaining) [ 9 18 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.430 units remaining) + - location: 63 (remaining gas: 1039867.395 units remaining) [ 19 9 18 @@ -535,7 +535,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.420 units remaining) + - location: 63 (remaining gas: 1039867.385 units remaining) [ 14 19 9 @@ -544,7 +544,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.410 units remaining) + - location: 63 (remaining gas: 1039867.375 units remaining) [ 10 14 19 @@ -554,7 +554,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.400 units remaining) + - location: 63 (remaining gas: 1039867.365 units remaining) [ 16 10 14 @@ -565,7 +565,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.390 units remaining) + - location: 63 (remaining gas: 1039867.355 units remaining) [ 12 16 10 @@ -577,7 +577,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.380 units remaining) + - location: 63 (remaining gas: 1039867.345 units remaining) [ 3 12 16 @@ -590,7 +590,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.370 units remaining) + - location: 63 (remaining gas: 1039867.335 units remaining) [ 2 3 12 @@ -604,7 +604,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 63 (remaining gas: 1039867.370 units remaining) + - location: 63 (remaining gas: 1039867.335 units remaining) [ 2 3 12 @@ -618,32 +618,32 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.308 units remaining) + - location: 67 (remaining gas: 1039867.273 units remaining) [ (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 70 (remaining gas: 1039867.298 units remaining) + - location: 70 (remaining gas: 1039867.263 units remaining) [ 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.273 units remaining) + - location: 67 (remaining gas: 1039867.238 units remaining) [ 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.263 units remaining) + - location: 67 (remaining gas: 1039867.228 units remaining) [ 6 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.253 units remaining) + - location: 67 (remaining gas: 1039867.218 units remaining) [ 18 6 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.243 units remaining) + - location: 67 (remaining gas: 1039867.208 units remaining) [ 9 18 6 @@ -651,7 +651,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.233 units remaining) + - location: 67 (remaining gas: 1039867.198 units remaining) [ 19 9 18 @@ -660,7 +660,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.223 units remaining) + - location: 67 (remaining gas: 1039867.188 units remaining) [ 14 19 9 @@ -670,7 +670,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.213 units remaining) + - location: 67 (remaining gas: 1039867.178 units remaining) [ 10 14 19 @@ -681,7 +681,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.203 units remaining) + - location: 67 (remaining gas: 1039867.168 units remaining) [ 16 10 14 @@ -693,7 +693,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.193 units remaining) + - location: 67 (remaining gas: 1039867.158 units remaining) [ 12 16 10 @@ -706,7 +706,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.183 units remaining) + - location: 67 (remaining gas: 1039867.148 units remaining) [ 3 12 16 @@ -720,7 +720,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.173 units remaining) + - location: 67 (remaining gas: 1039867.138 units remaining) [ 2 3 12 @@ -735,7 +735,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 67 (remaining gas: 1039867.173 units remaining) + - location: 67 (remaining gas: 1039867.138 units remaining) [ 2 3 12 @@ -750,32 +750,32 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.109 units remaining) + - location: 71 (remaining gas: 1039867.074 units remaining) [ (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 74 (remaining gas: 1039867.099 units remaining) + - location: 74 (remaining gas: 1039867.064 units remaining) [ 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.074 units remaining) + - location: 71 (remaining gas: 1039867.039 units remaining) [ 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.064 units remaining) + - location: 71 (remaining gas: 1039867.029 units remaining) [ 8 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.054 units remaining) + - location: 71 (remaining gas: 1039867.019 units remaining) [ 6 8 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.044 units remaining) + - location: 71 (remaining gas: 1039867.009 units remaining) [ 18 6 8 @@ -783,7 +783,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.034 units remaining) + - location: 71 (remaining gas: 1039866.999 units remaining) [ 9 18 6 @@ -792,7 +792,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.024 units remaining) + - location: 71 (remaining gas: 1039866.989 units remaining) [ 19 9 18 @@ -802,7 +802,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.014 units remaining) + - location: 71 (remaining gas: 1039866.979 units remaining) [ 14 19 9 @@ -813,7 +813,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039867.004 units remaining) + - location: 71 (remaining gas: 1039866.969 units remaining) [ 10 14 19 @@ -825,7 +825,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039866.994 units remaining) + - location: 71 (remaining gas: 1039866.959 units remaining) [ 16 10 14 @@ -838,7 +838,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039866.984 units remaining) + - location: 71 (remaining gas: 1039866.949 units remaining) [ 12 16 10 @@ -852,7 +852,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039866.974 units remaining) + - location: 71 (remaining gas: 1039866.939 units remaining) [ 3 12 16 @@ -867,7 +867,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039866.964 units remaining) + - location: 71 (remaining gas: 1039866.929 units remaining) [ 2 3 12 @@ -883,7 +883,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 71 (remaining gas: 1039866.964 units remaining) + - location: 71 (remaining gas: 1039866.929 units remaining) [ 2 3 12 @@ -899,32 +899,32 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.899 units remaining) + - location: 75 (remaining gas: 1039866.864 units remaining) [ (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 78 (remaining gas: 1039866.889 units remaining) + - location: 78 (remaining gas: 1039866.854 units remaining) [ 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.864 units remaining) + - location: 75 (remaining gas: 1039866.829 units remaining) [ 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.854 units remaining) + - location: 75 (remaining gas: 1039866.819 units remaining) [ 11 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.844 units remaining) + - location: 75 (remaining gas: 1039866.809 units remaining) [ 8 11 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.834 units remaining) + - location: 75 (remaining gas: 1039866.799 units remaining) [ 6 8 11 @@ -932,7 +932,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.824 units remaining) + - location: 75 (remaining gas: 1039866.789 units remaining) [ 18 6 8 @@ -941,7 +941,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.814 units remaining) + - location: 75 (remaining gas: 1039866.779 units remaining) [ 9 18 6 @@ -951,7 +951,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.804 units remaining) + - location: 75 (remaining gas: 1039866.769 units remaining) [ 19 9 18 @@ -962,7 +962,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.794 units remaining) + - location: 75 (remaining gas: 1039866.759 units remaining) [ 14 19 9 @@ -974,7 +974,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.784 units remaining) + - location: 75 (remaining gas: 1039866.749 units remaining) [ 10 14 19 @@ -987,7 +987,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.774 units remaining) + - location: 75 (remaining gas: 1039866.739 units remaining) [ 16 10 14 @@ -1001,7 +1001,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.764 units remaining) + - location: 75 (remaining gas: 1039866.729 units remaining) [ 12 16 10 @@ -1016,7 +1016,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.754 units remaining) + - location: 75 (remaining gas: 1039866.719 units remaining) [ 3 12 16 @@ -1032,7 +1032,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.744 units remaining) + - location: 75 (remaining gas: 1039866.709 units remaining) [ 2 3 12 @@ -1049,7 +1049,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 75 (remaining gas: 1039866.744 units remaining) + - location: 75 (remaining gas: 1039866.709 units remaining) [ 2 3 12 @@ -1066,32 +1066,32 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.677 units remaining) + - location: 79 (remaining gas: 1039866.642 units remaining) [ (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 82 (remaining gas: 1039866.667 units remaining) + - location: 82 (remaining gas: 1039866.632 units remaining) [ 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.642 units remaining) + - location: 79 (remaining gas: 1039866.607 units remaining) [ 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.632 units remaining) + - location: 79 (remaining gas: 1039866.597 units remaining) [ 4 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.622 units remaining) + - location: 79 (remaining gas: 1039866.587 units remaining) [ 11 4 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.612 units remaining) + - location: 79 (remaining gas: 1039866.577 units remaining) [ 8 11 4 @@ -1099,7 +1099,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.602 units remaining) + - location: 79 (remaining gas: 1039866.567 units remaining) [ 6 8 11 @@ -1108,7 +1108,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.592 units remaining) + - location: 79 (remaining gas: 1039866.557 units remaining) [ 18 6 8 @@ -1118,7 +1118,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.582 units remaining) + - location: 79 (remaining gas: 1039866.547 units remaining) [ 9 18 6 @@ -1129,7 +1129,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.572 units remaining) + - location: 79 (remaining gas: 1039866.537 units remaining) [ 19 9 18 @@ -1141,7 +1141,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.562 units remaining) + - location: 79 (remaining gas: 1039866.527 units remaining) [ 14 19 9 @@ -1154,7 +1154,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.552 units remaining) + - location: 79 (remaining gas: 1039866.517 units remaining) [ 10 14 19 @@ -1168,7 +1168,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.542 units remaining) + - location: 79 (remaining gas: 1039866.507 units remaining) [ 16 10 14 @@ -1183,7 +1183,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.532 units remaining) + - location: 79 (remaining gas: 1039866.497 units remaining) [ 12 16 10 @@ -1199,7 +1199,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.522 units remaining) + - location: 79 (remaining gas: 1039866.487 units remaining) [ 3 12 16 @@ -1216,7 +1216,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.512 units remaining) + - location: 79 (remaining gas: 1039866.477 units remaining) [ 2 3 12 @@ -1234,7 +1234,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 79 (remaining gas: 1039866.512 units remaining) + - location: 79 (remaining gas: 1039866.477 units remaining) [ 2 3 12 @@ -1252,32 +1252,32 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.444 units remaining) + - location: 83 (remaining gas: 1039866.409 units remaining) [ (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 86 (remaining gas: 1039866.434 units remaining) + - location: 86 (remaining gas: 1039866.399 units remaining) [ 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.409 units remaining) + - location: 83 (remaining gas: 1039866.374 units remaining) [ 15 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.399 units remaining) + - location: 83 (remaining gas: 1039866.364 units remaining) [ 13 15 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.389 units remaining) + - location: 83 (remaining gas: 1039866.354 units remaining) [ 4 13 15 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.379 units remaining) + - location: 83 (remaining gas: 1039866.344 units remaining) [ 11 4 13 @@ -1285,7 +1285,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.369 units remaining) + - location: 83 (remaining gas: 1039866.334 units remaining) [ 8 11 4 @@ -1294,7 +1294,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.359 units remaining) + - location: 83 (remaining gas: 1039866.324 units remaining) [ 6 8 11 @@ -1304,7 +1304,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.349 units remaining) + - location: 83 (remaining gas: 1039866.314 units remaining) [ 18 6 8 @@ -1315,7 +1315,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.339 units remaining) + - location: 83 (remaining gas: 1039866.304 units remaining) [ 9 18 6 @@ -1327,7 +1327,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.329 units remaining) + - location: 83 (remaining gas: 1039866.294 units remaining) [ 19 9 18 @@ -1340,7 +1340,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.319 units remaining) + - location: 83 (remaining gas: 1039866.284 units remaining) [ 14 19 9 @@ -1354,7 +1354,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.309 units remaining) + - location: 83 (remaining gas: 1039866.274 units remaining) [ 10 14 19 @@ -1369,7 +1369,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.299 units remaining) + - location: 83 (remaining gas: 1039866.264 units remaining) [ 16 10 14 @@ -1385,7 +1385,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.289 units remaining) + - location: 83 (remaining gas: 1039866.254 units remaining) [ 12 16 10 @@ -1402,7 +1402,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.279 units remaining) + - location: 83 (remaining gas: 1039866.244 units remaining) [ 3 12 16 @@ -1420,7 +1420,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.269 units remaining) + - location: 83 (remaining gas: 1039866.234 units remaining) [ 2 3 12 @@ -1439,7 +1439,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 83 (remaining gas: 1039866.269 units remaining) + - location: 83 (remaining gas: 1039866.234 units remaining) [ 2 3 12 @@ -1458,7 +1458,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 87 (remaining gas: 1039866.209 units remaining) + - location: 87 (remaining gas: 1039866.174 units remaining) [ 2 3 12 @@ -1477,7 +1477,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 89 (remaining gas: 1039866.143 units remaining) + - location: 89 (remaining gas: 1039866.108 units remaining) [ 3 2 12 @@ -1496,7 +1496,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 91 (remaining gas: 1039866.070 units remaining) + - location: 91 (remaining gas: 1039866.035 units remaining) [ 12 3 2 @@ -1515,7 +1515,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 93 (remaining gas: 1039865.991 units remaining) + - location: 93 (remaining gas: 1039865.956 units remaining) [ 16 12 3 @@ -1534,7 +1534,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 95 (remaining gas: 1039865.904 units remaining) + - location: 95 (remaining gas: 1039865.869 units remaining) [ 10 16 12 @@ -1553,7 +1553,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 97 (remaining gas: 1039865.811 units remaining) + - location: 97 (remaining gas: 1039865.776 units remaining) [ 14 10 16 @@ -1572,7 +1572,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 99 (remaining gas: 1039865.711 units remaining) + - location: 99 (remaining gas: 1039865.676 units remaining) [ 19 14 10 @@ -1591,7 +1591,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 101 (remaining gas: 1039865.605 units remaining) + - location: 101 (remaining gas: 1039865.570 units remaining) [ 9 19 14 @@ -1610,7 +1610,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 103 (remaining gas: 1039865.491 units remaining) + - location: 103 (remaining gas: 1039865.456 units remaining) [ 18 9 19 @@ -1629,7 +1629,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 105 (remaining gas: 1039865.371 units remaining) + - location: 105 (remaining gas: 1039865.336 units remaining) [ 6 18 9 @@ -1648,7 +1648,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 107 (remaining gas: 1039865.244 units remaining) + - location: 107 (remaining gas: 1039865.209 units remaining) [ 8 6 18 @@ -1667,7 +1667,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 109 (remaining gas: 1039865.111 units remaining) + - location: 109 (remaining gas: 1039865.076 units remaining) [ 11 8 6 @@ -1686,7 +1686,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 111 (remaining gas: 1039864.970 units remaining) + - location: 111 (remaining gas: 1039864.935 units remaining) [ 4 11 8 @@ -1705,7 +1705,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 113 (remaining gas: 1039864.823 units remaining) + - location: 113 (remaining gas: 1039864.788 units remaining) [ 13 4 11 @@ -1724,7 +1724,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 115 (remaining gas: 1039864.669 units remaining) + - location: 115 (remaining gas: 1039864.634 units remaining) [ 15 13 4 @@ -1743,7 +1743,7 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 117 (remaining gas: 1039864.509 units remaining) + - location: 117 (remaining gas: 1039864.474 units remaining) [ 5 15 13 @@ -1762,7 +1762,7 @@ trace 2 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 119 (remaining gas: 1039864.341 units remaining) + - location: 119 (remaining gas: 1039864.306 units remaining) [ 1 5 15 @@ -1781,7 +1781,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 121 (remaining gas: 1039864.281 units remaining) + - location: 121 (remaining gas: 1039864.246 units remaining) [ 1 5 15 @@ -1800,7 +1800,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 123 (remaining gas: 1039864.215 units remaining) + - location: 123 (remaining gas: 1039864.180 units remaining) [ 5 1 15 @@ -1819,7 +1819,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 125 (remaining gas: 1039864.142 units remaining) + - location: 125 (remaining gas: 1039864.107 units remaining) [ 15 5 1 @@ -1838,7 +1838,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 127 (remaining gas: 1039864.063 units remaining) + - location: 127 (remaining gas: 1039864.028 units remaining) [ 13 15 5 @@ -1857,7 +1857,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 129 (remaining gas: 1039863.976 units remaining) + - location: 129 (remaining gas: 1039863.941 units remaining) [ 4 13 15 @@ -1876,7 +1876,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 131 (remaining gas: 1039863.883 units remaining) + - location: 131 (remaining gas: 1039863.848 units remaining) [ 11 4 13 @@ -1895,7 +1895,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 133 (remaining gas: 1039863.783 units remaining) + - location: 133 (remaining gas: 1039863.748 units remaining) [ 8 11 4 @@ -1914,7 +1914,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 135 (remaining gas: 1039863.677 units remaining) + - location: 135 (remaining gas: 1039863.642 units remaining) [ 6 8 11 @@ -1933,7 +1933,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 137 (remaining gas: 1039863.563 units remaining) + - location: 137 (remaining gas: 1039863.528 units remaining) [ 18 6 8 @@ -1952,7 +1952,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 139 (remaining gas: 1039863.443 units remaining) + - location: 139 (remaining gas: 1039863.408 units remaining) [ 9 18 6 @@ -1971,7 +1971,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 141 (remaining gas: 1039863.316 units remaining) + - location: 141 (remaining gas: 1039863.281 units remaining) [ 19 9 18 @@ -1990,7 +1990,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 143 (remaining gas: 1039863.183 units remaining) + - location: 143 (remaining gas: 1039863.148 units remaining) [ 14 19 9 @@ -2009,7 +2009,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 145 (remaining gas: 1039863.042 units remaining) + - location: 145 (remaining gas: 1039863.007 units remaining) [ 10 14 19 @@ -2028,7 +2028,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 147 (remaining gas: 1039862.895 units remaining) + - location: 147 (remaining gas: 1039862.860 units remaining) [ 16 10 14 @@ -2047,7 +2047,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 149 (remaining gas: 1039862.741 units remaining) + - location: 149 (remaining gas: 1039862.706 units remaining) [ 12 16 10 @@ -2066,7 +2066,7 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 151 (remaining gas: 1039862.581 units remaining) + - location: 151 (remaining gas: 1039862.546 units remaining) [ 3 12 16 @@ -2085,7 +2085,7 @@ trace 1 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 153 (remaining gas: 1039862.413 units remaining) + - location: 153 (remaining gas: 1039862.378 units remaining) [ 2 3 12 @@ -2104,36 +2104,36 @@ trace 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.345 units remaining) + - location: 156 (remaining gas: 1039862.310 units remaining) [ 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 159 (remaining gas: 1039862.330 units remaining) + - location: 159 (remaining gas: 1039862.295 units remaining) [ (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.305 units remaining) + - location: 156 (remaining gas: 1039862.270 units remaining) [ 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.295 units remaining) + - location: 156 (remaining gas: 1039862.260 units remaining) [ 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.285 units remaining) + - location: 156 (remaining gas: 1039862.250 units remaining) [ 4 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.275 units remaining) + - location: 156 (remaining gas: 1039862.240 units remaining) [ 11 4 13 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.265 units remaining) + - location: 156 (remaining gas: 1039862.230 units remaining) [ 8 11 4 @@ -2141,7 +2141,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.255 units remaining) + - location: 156 (remaining gas: 1039862.220 units remaining) [ 6 8 11 @@ -2150,7 +2150,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.245 units remaining) + - location: 156 (remaining gas: 1039862.210 units remaining) [ 18 6 8 @@ -2160,7 +2160,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.235 units remaining) + - location: 156 (remaining gas: 1039862.200 units remaining) [ 9 18 6 @@ -2171,7 +2171,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.225 units remaining) + - location: 156 (remaining gas: 1039862.190 units remaining) [ 19 9 18 @@ -2183,7 +2183,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.215 units remaining) + - location: 156 (remaining gas: 1039862.180 units remaining) [ 14 19 9 @@ -2196,7 +2196,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.205 units remaining) + - location: 156 (remaining gas: 1039862.170 units remaining) [ 10 14 19 @@ -2210,7 +2210,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.195 units remaining) + - location: 156 (remaining gas: 1039862.160 units remaining) [ 16 10 14 @@ -2225,7 +2225,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.185 units remaining) + - location: 156 (remaining gas: 1039862.150 units remaining) [ 12 16 10 @@ -2241,7 +2241,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.175 units remaining) + - location: 156 (remaining gas: 1039862.140 units remaining) [ 3 12 16 @@ -2258,7 +2258,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.165 units remaining) + - location: 156 (remaining gas: 1039862.130 units remaining) [ 2 3 12 @@ -2276,7 +2276,7 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 156 (remaining gas: 1039862.165 units remaining) + - location: 156 (remaining gas: 1039862.130 units remaining) [ 2 3 12 @@ -2294,36 +2294,36 @@ trace 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.098 units remaining) + - location: 160 (remaining gas: 1039862.063 units remaining) [ 15 (Pair 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 163 (remaining gas: 1039862.083 units remaining) + - location: 163 (remaining gas: 1039862.048 units remaining) [ (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.058 units remaining) + - location: 160 (remaining gas: 1039862.023 units remaining) [ 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.048 units remaining) + - location: 160 (remaining gas: 1039862.013 units remaining) [ 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.038 units remaining) + - location: 160 (remaining gas: 1039862.003 units remaining) [ 11 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.028 units remaining) + - location: 160 (remaining gas: 1039861.993 units remaining) [ 8 11 4 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.018 units remaining) + - location: 160 (remaining gas: 1039861.983 units remaining) [ 6 8 11 @@ -2331,7 +2331,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039862.008 units remaining) + - location: 160 (remaining gas: 1039861.973 units remaining) [ 18 6 8 @@ -2340,7 +2340,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.998 units remaining) + - location: 160 (remaining gas: 1039861.963 units remaining) [ 9 18 6 @@ -2350,7 +2350,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.988 units remaining) + - location: 160 (remaining gas: 1039861.953 units remaining) [ 19 9 18 @@ -2361,7 +2361,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.978 units remaining) + - location: 160 (remaining gas: 1039861.943 units remaining) [ 14 19 9 @@ -2373,7 +2373,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.968 units remaining) + - location: 160 (remaining gas: 1039861.933 units remaining) [ 10 14 19 @@ -2386,7 +2386,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.958 units remaining) + - location: 160 (remaining gas: 1039861.923 units remaining) [ 16 10 14 @@ -2400,7 +2400,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.948 units remaining) + - location: 160 (remaining gas: 1039861.913 units remaining) [ 12 16 10 @@ -2415,7 +2415,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.938 units remaining) + - location: 160 (remaining gas: 1039861.903 units remaining) [ 3 12 16 @@ -2431,7 +2431,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.928 units remaining) + - location: 160 (remaining gas: 1039861.893 units remaining) [ 2 3 12 @@ -2448,7 +2448,7 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 160 (remaining gas: 1039861.928 units remaining) + - location: 160 (remaining gas: 1039861.893 units remaining) [ 2 3 12 @@ -2465,36 +2465,36 @@ trace 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.863 units remaining) + - location: 164 (remaining gas: 1039861.828 units remaining) [ 13 (Pair 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 167 (remaining gas: 1039861.848 units remaining) + - location: 167 (remaining gas: 1039861.813 units remaining) [ (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.823 units remaining) + - location: 164 (remaining gas: 1039861.788 units remaining) [ 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.813 units remaining) + - location: 164 (remaining gas: 1039861.778 units remaining) [ 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.803 units remaining) + - location: 164 (remaining gas: 1039861.768 units remaining) [ 8 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.793 units remaining) + - location: 164 (remaining gas: 1039861.758 units remaining) [ 6 8 11 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.783 units remaining) + - location: 164 (remaining gas: 1039861.748 units remaining) [ 18 6 8 @@ -2502,7 +2502,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.773 units remaining) + - location: 164 (remaining gas: 1039861.738 units remaining) [ 9 18 6 @@ -2511,7 +2511,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.763 units remaining) + - location: 164 (remaining gas: 1039861.728 units remaining) [ 19 9 18 @@ -2521,7 +2521,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.753 units remaining) + - location: 164 (remaining gas: 1039861.718 units remaining) [ 14 19 9 @@ -2532,7 +2532,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.743 units remaining) + - location: 164 (remaining gas: 1039861.708 units remaining) [ 10 14 19 @@ -2544,7 +2544,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.733 units remaining) + - location: 164 (remaining gas: 1039861.698 units remaining) [ 16 10 14 @@ -2557,7 +2557,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.723 units remaining) + - location: 164 (remaining gas: 1039861.688 units remaining) [ 12 16 10 @@ -2571,7 +2571,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.713 units remaining) + - location: 164 (remaining gas: 1039861.678 units remaining) [ 3 12 16 @@ -2586,7 +2586,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.703 units remaining) + - location: 164 (remaining gas: 1039861.668 units remaining) [ 2 3 12 @@ -2602,7 +2602,7 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 164 (remaining gas: 1039861.703 units remaining) + - location: 164 (remaining gas: 1039861.668 units remaining) [ 2 3 12 @@ -2618,36 +2618,36 @@ trace 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.639 units remaining) + - location: 168 (remaining gas: 1039861.604 units remaining) [ 4 (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 171 (remaining gas: 1039861.624 units remaining) + - location: 171 (remaining gas: 1039861.589 units remaining) [ (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.599 units remaining) + - location: 168 (remaining gas: 1039861.564 units remaining) [ 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.589 units remaining) + - location: 168 (remaining gas: 1039861.554 units remaining) [ 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.579 units remaining) + - location: 168 (remaining gas: 1039861.544 units remaining) [ 6 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.569 units remaining) + - location: 168 (remaining gas: 1039861.534 units remaining) [ 18 6 8 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.559 units remaining) + - location: 168 (remaining gas: 1039861.524 units remaining) [ 9 18 6 @@ -2655,7 +2655,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.549 units remaining) + - location: 168 (remaining gas: 1039861.514 units remaining) [ 19 9 18 @@ -2664,7 +2664,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.539 units remaining) + - location: 168 (remaining gas: 1039861.504 units remaining) [ 14 19 9 @@ -2674,7 +2674,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.529 units remaining) + - location: 168 (remaining gas: 1039861.494 units remaining) [ 10 14 19 @@ -2685,7 +2685,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.519 units remaining) + - location: 168 (remaining gas: 1039861.484 units remaining) [ 16 10 14 @@ -2697,7 +2697,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.509 units remaining) + - location: 168 (remaining gas: 1039861.474 units remaining) [ 12 16 10 @@ -2710,7 +2710,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.499 units remaining) + - location: 168 (remaining gas: 1039861.464 units remaining) [ 3 12 16 @@ -2724,7 +2724,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.489 units remaining) + - location: 168 (remaining gas: 1039861.454 units remaining) [ 2 3 12 @@ -2739,7 +2739,7 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 168 (remaining gas: 1039861.489 units remaining) + - location: 168 (remaining gas: 1039861.454 units remaining) [ 2 3 12 @@ -2754,36 +2754,36 @@ trace 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.427 units remaining) + - location: 172 (remaining gas: 1039861.392 units remaining) [ 11 (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 175 (remaining gas: 1039861.412 units remaining) + - location: 175 (remaining gas: 1039861.377 units remaining) [ (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.387 units remaining) + - location: 172 (remaining gas: 1039861.352 units remaining) [ 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.377 units remaining) + - location: 172 (remaining gas: 1039861.342 units remaining) [ 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.367 units remaining) + - location: 172 (remaining gas: 1039861.332 units remaining) [ 18 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.357 units remaining) + - location: 172 (remaining gas: 1039861.322 units remaining) [ 9 18 6 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.347 units remaining) + - location: 172 (remaining gas: 1039861.312 units remaining) [ 19 9 18 @@ -2791,7 +2791,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.337 units remaining) + - location: 172 (remaining gas: 1039861.302 units remaining) [ 14 19 9 @@ -2800,7 +2800,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.327 units remaining) + - location: 172 (remaining gas: 1039861.292 units remaining) [ 10 14 19 @@ -2810,7 +2810,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.317 units remaining) + - location: 172 (remaining gas: 1039861.282 units remaining) [ 16 10 14 @@ -2821,7 +2821,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.307 units remaining) + - location: 172 (remaining gas: 1039861.272 units remaining) [ 12 16 10 @@ -2833,7 +2833,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.297 units remaining) + - location: 172 (remaining gas: 1039861.262 units remaining) [ 3 12 16 @@ -2846,7 +2846,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.287 units remaining) + - location: 172 (remaining gas: 1039861.252 units remaining) [ 2 3 12 @@ -2860,7 +2860,7 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 172 (remaining gas: 1039861.287 units remaining) + - location: 172 (remaining gas: 1039861.252 units remaining) [ 2 3 12 @@ -2874,36 +2874,36 @@ trace 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.226 units remaining) + - location: 176 (remaining gas: 1039861.191 units remaining) [ 8 (Pair 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 179 (remaining gas: 1039861.211 units remaining) + - location: 179 (remaining gas: 1039861.176 units remaining) [ (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.186 units remaining) + - location: 176 (remaining gas: 1039861.151 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.176 units remaining) + - location: 176 (remaining gas: 1039861.141 units remaining) [ 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.166 units remaining) + - location: 176 (remaining gas: 1039861.131 units remaining) [ 9 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.156 units remaining) + - location: 176 (remaining gas: 1039861.121 units remaining) [ 19 9 18 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.146 units remaining) + - location: 176 (remaining gas: 1039861.111 units remaining) [ 14 19 9 @@ -2911,7 +2911,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.136 units remaining) + - location: 176 (remaining gas: 1039861.101 units remaining) [ 10 14 19 @@ -2920,7 +2920,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.126 units remaining) + - location: 176 (remaining gas: 1039861.091 units remaining) [ 16 10 14 @@ -2930,7 +2930,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.116 units remaining) + - location: 176 (remaining gas: 1039861.081 units remaining) [ 12 16 10 @@ -2941,7 +2941,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.106 units remaining) + - location: 176 (remaining gas: 1039861.071 units remaining) [ 3 12 16 @@ -2953,7 +2953,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.096 units remaining) + - location: 176 (remaining gas: 1039861.061 units remaining) [ 2 3 12 @@ -2966,7 +2966,7 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 176 (remaining gas: 1039861.096 units remaining) + - location: 176 (remaining gas: 1039861.061 units remaining) [ 2 3 12 @@ -2979,36 +2979,36 @@ trace 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039861.037 units remaining) + - location: 180 (remaining gas: 1039861.002 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 183 (remaining gas: 1039861.022 units remaining) + - location: 183 (remaining gas: 1039860.987 units remaining) [ (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.997 units remaining) + - location: 180 (remaining gas: 1039860.962 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.987 units remaining) + - location: 180 (remaining gas: 1039860.952 units remaining) [ 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.977 units remaining) + - location: 180 (remaining gas: 1039860.942 units remaining) [ 19 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.967 units remaining) + - location: 180 (remaining gas: 1039860.932 units remaining) [ 14 19 9 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.957 units remaining) + - location: 180 (remaining gas: 1039860.922 units remaining) [ 10 14 19 @@ -3016,7 +3016,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.947 units remaining) + - location: 180 (remaining gas: 1039860.912 units remaining) [ 16 10 14 @@ -3025,7 +3025,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.937 units remaining) + - location: 180 (remaining gas: 1039860.902 units remaining) [ 12 16 10 @@ -3035,7 +3035,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.927 units remaining) + - location: 180 (remaining gas: 1039860.892 units remaining) [ 3 12 16 @@ -3046,7 +3046,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.917 units remaining) + - location: 180 (remaining gas: 1039860.882 units remaining) [ 2 3 12 @@ -3058,7 +3058,7 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 180 (remaining gas: 1039860.917 units remaining) + - location: 180 (remaining gas: 1039860.882 units remaining) [ 2 3 12 @@ -3070,36 +3070,36 @@ trace 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.859 units remaining) + - location: 184 (remaining gas: 1039860.824 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 187 (remaining gas: 1039860.844 units remaining) + - location: 187 (remaining gas: 1039860.809 units remaining) [ (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.819 units remaining) + - location: 184 (remaining gas: 1039860.784 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.809 units remaining) + - location: 184 (remaining gas: 1039860.774 units remaining) [ 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.799 units remaining) + - location: 184 (remaining gas: 1039860.764 units remaining) [ 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.789 units remaining) + - location: 184 (remaining gas: 1039860.754 units remaining) [ 10 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.779 units remaining) + - location: 184 (remaining gas: 1039860.744 units remaining) [ 16 10 14 @@ -3107,7 +3107,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.769 units remaining) + - location: 184 (remaining gas: 1039860.734 units remaining) [ 12 16 10 @@ -3116,7 +3116,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.759 units remaining) + - location: 184 (remaining gas: 1039860.724 units remaining) [ 3 12 16 @@ -3126,7 +3126,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.749 units remaining) + - location: 184 (remaining gas: 1039860.714 units remaining) [ 2 3 12 @@ -3137,7 +3137,7 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 184 (remaining gas: 1039860.749 units remaining) + - location: 184 (remaining gas: 1039860.714 units remaining) [ 2 3 12 @@ -3148,36 +3148,36 @@ trace 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.694 units remaining) + - location: 188 (remaining gas: 1039860.659 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 191 (remaining gas: 1039860.679 units remaining) + - location: 191 (remaining gas: 1039860.644 units remaining) [ (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.654 units remaining) + - location: 188 (remaining gas: 1039860.619 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.644 units remaining) + - location: 188 (remaining gas: 1039860.609 units remaining) [ 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.634 units remaining) + - location: 188 (remaining gas: 1039860.599 units remaining) [ 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.624 units remaining) + - location: 188 (remaining gas: 1039860.589 units remaining) [ 16 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.614 units remaining) + - location: 188 (remaining gas: 1039860.579 units remaining) [ 12 16 10 @@ -3185,7 +3185,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.604 units remaining) + - location: 188 (remaining gas: 1039860.569 units remaining) [ 3 12 16 @@ -3194,7 +3194,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.594 units remaining) + - location: 188 (remaining gas: 1039860.559 units remaining) [ 2 3 12 @@ -3204,7 +3204,7 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 188 (remaining gas: 1039860.594 units remaining) + - location: 188 (remaining gas: 1039860.559 units remaining) [ 2 3 12 @@ -3214,36 +3214,36 @@ trace 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.540 units remaining) + - location: 192 (remaining gas: 1039860.505 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 195 (remaining gas: 1039860.525 units remaining) + - location: 195 (remaining gas: 1039860.490 units remaining) [ (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.500 units remaining) + - location: 192 (remaining gas: 1039860.465 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.490 units remaining) + - location: 192 (remaining gas: 1039860.455 units remaining) [ 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.480 units remaining) + - location: 192 (remaining gas: 1039860.445 units remaining) [ 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.470 units remaining) + - location: 192 (remaining gas: 1039860.435 units remaining) [ 12 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.460 units remaining) + - location: 192 (remaining gas: 1039860.425 units remaining) [ 3 12 16 @@ -3251,7 +3251,7 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.450 units remaining) + - location: 192 (remaining gas: 1039860.415 units remaining) [ 2 3 12 @@ -3260,7 +3260,7 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 192 (remaining gas: 1039860.450 units remaining) + - location: 192 (remaining gas: 1039860.415 units remaining) [ 2 3 12 @@ -3269,36 +3269,36 @@ trace 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.398 units remaining) + - location: 196 (remaining gas: 1039860.363 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 199 (remaining gas: 1039860.383 units remaining) + - location: 199 (remaining gas: 1039860.348 units remaining) [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.358 units remaining) + - location: 196 (remaining gas: 1039860.323 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.348 units remaining) + - location: 196 (remaining gas: 1039860.313 units remaining) [ 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.338 units remaining) + - location: 196 (remaining gas: 1039860.303 units remaining) [ 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.328 units remaining) + - location: 196 (remaining gas: 1039860.293 units remaining) [ 3 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.318 units remaining) + - location: 196 (remaining gas: 1039860.283 units remaining) [ 2 3 12 @@ -3306,7 +3306,7 @@ trace 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 196 (remaining gas: 1039860.318 units remaining) + - location: 196 (remaining gas: 1039860.283 units remaining) [ 2 3 12 @@ -3314,118 +3314,118 @@ trace 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.267 units remaining) + - location: 200 (remaining gas: 1039860.232 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 203 (remaining gas: 1039860.252 units remaining) + - location: 203 (remaining gas: 1039860.217 units remaining) [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.227 units remaining) + - location: 200 (remaining gas: 1039860.192 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.217 units remaining) + - location: 200 (remaining gas: 1039860.182 units remaining) [ 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.207 units remaining) + - location: 200 (remaining gas: 1039860.172 units remaining) [ 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.197 units remaining) + - location: 200 (remaining gas: 1039860.162 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 200 (remaining gas: 1039860.197 units remaining) + - location: 200 (remaining gas: 1039860.162 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 204 (remaining gas: 1039860.148 units remaining) + - location: 204 (remaining gas: 1039860.113 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 207 (remaining gas: 1039860.133 units remaining) + - location: 207 (remaining gas: 1039860.098 units remaining) [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 204 (remaining gas: 1039860.108 units remaining) + - location: 204 (remaining gas: 1039860.073 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 204 (remaining gas: 1039860.098 units remaining) + - location: 204 (remaining gas: 1039860.063 units remaining) [ 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 204 (remaining gas: 1039860.088 units remaining) + - location: 204 (remaining gas: 1039860.053 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 204 (remaining gas: 1039860.088 units remaining) + - location: 204 (remaining gas: 1039860.053 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 208 (remaining gas: 1039860.040 units remaining) + - location: 208 (remaining gas: 1039860.005 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 211 (remaining gas: 1039860.025 units remaining) + - location: 211 (remaining gas: 1039859.990 units remaining) [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 208 (remaining gas: 1039860 units remaining) + - location: 208 (remaining gas: 1039859.965 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 208 (remaining gas: 1039859.990 units remaining) + - location: 208 (remaining gas: 1039859.955 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 208 (remaining gas: 1039859.990 units remaining) + - location: 208 (remaining gas: 1039859.955 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 212 (remaining gas: 1039859.975 units remaining) + - location: 212 (remaining gas: 1039859.940 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 214 (remaining gas: 1039859.960 units remaining) + - location: 214 (remaining gas: 1039859.925 units remaining) [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 212 (remaining gas: 1039859.930 units remaining) + - location: 212 (remaining gas: 1039859.895 units remaining) [ 2 (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 215 (remaining gas: 1039859.915 units remaining) + - location: 215 (remaining gas: 1039859.880 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - - location: 218 (remaining gas: 1039859.160 units remaining) + - location: 218 (remaining gas: 1039859.125 units remaining) [ 0 ] - - location: 219 (remaining gas: 1039859.145 units remaining) + - location: 219 (remaining gas: 1039859.110 units remaining) [ True ] - - location: 220 (remaining gas: 1039859.135 units remaining) + - location: 220 (remaining gas: 1039859.100 units remaining) [ ] - - location: 220 (remaining gas: 1039859.120 units remaining) + - location: 220 (remaining gas: 1039859.085 units remaining) [ ] - - location: 226 (remaining gas: 1039859.110 units remaining) + - location: 226 (remaining gas: 1039859.075 units remaining) [ Unit ] - - location: 227 (remaining gas: 1039859.095 units remaining) + - location: 227 (remaining gas: 1039859.060 units remaining) [ {} Unit ] - - location: 229 (remaining gas: 1039859.080 units remaining) + - location: 229 (remaining gas: 1039859.045 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index ade6c6bd5e3b..59872a393f88 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -7,55 +7,55 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039987.170 units remaining) + - location: 15 (remaining gas: 1039987.135 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039987.160 units remaining) + - location: 15 (remaining gas: 1039987.125 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - - location: 16 (remaining gas: 1039987.150 units remaining) + - location: 16 (remaining gas: 1039987.115 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039987.140 units remaining) + - location: 17 (remaining gas: 1039987.105 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039987.130 units remaining) + - location: 18 (remaining gas: 1039987.095 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039987.120 units remaining) + - location: 19 (remaining gas: 1039987.085 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039987.033 units remaining) + - location: 20 (remaining gas: 1039986.998 units remaining) [ 5 1 2 3 4 ] - - location: 22 (remaining gas: 1039987.018 units remaining) + - location: 22 (remaining gas: 1039986.983 units remaining) [ 1 2 3 4 ] - - location: 24 (remaining gas: 1039987.008 units remaining) + - location: 24 (remaining gas: 1039986.973 units remaining) [ 2 3 4 ] - - location: 25 (remaining gas: 1039986.998 units remaining) + - location: 25 (remaining gas: 1039986.963 units remaining) [ 3 4 ] - - location: 26 (remaining gas: 1039986.988 units remaining) + - location: 26 (remaining gas: 1039986.953 units remaining) [ 4 ] - - location: 27 (remaining gas: 1039986.978 units remaining) + - location: 27 (remaining gas: 1039986.943 units remaining) [ ] - - location: 22 (remaining gas: 1039986.948 units remaining) + - location: 22 (remaining gas: 1039986.913 units remaining) [ 5 ] - - location: 28 (remaining gas: 1039986.933 units remaining) + - location: 28 (remaining gas: 1039986.898 units remaining) [ {} 5 ] - - location: 30 (remaining gas: 1039986.918 units remaining) + - location: 30 (remaining gas: 1039986.883 units remaining) [ (Pair {} 5) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out index a7c4a8ebd79f..6af54bd22461 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.758 units remaining) + - location: 11 (remaining gas: 1039990.723 units remaining) [ (Pair (Pair 1 1) 0 0) ] - - location: 11 (remaining gas: 1039990.748 units remaining) + - location: 11 (remaining gas: 1039990.713 units remaining) [ (Pair 1 1) ] - - location: 12 (remaining gas: 1039990.738 units remaining) + - location: 12 (remaining gas: 1039990.703 units remaining) [ 1 1 ] - - location: 13 (remaining gas: 1039990.728 units remaining) + - location: 13 (remaining gas: 1039990.693 units remaining) [ 1 1 1 ] - - location: 14 (remaining gas: 1039990.713 units remaining) + - location: 14 (remaining gas: 1039990.678 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039990.658 units remaining) + - location: 16 (remaining gas: 1039990.623 units remaining) [ 2 ] - - location: 14 (remaining gas: 1039990.628 units remaining) + - location: 14 (remaining gas: 1039990.593 units remaining) [ 1 2 ] - - location: 17 (remaining gas: 1039990.613 units remaining) + - location: 17 (remaining gas: 1039990.578 units remaining) [ (Pair 1 2) ] - - location: 18 (remaining gas: 1039990.598 units remaining) + - location: 18 (remaining gas: 1039990.563 units remaining) [ {} (Pair 1 2) ] - - location: 20 (remaining gas: 1039990.583 units remaining) + - location: 20 (remaining gas: 1039990.548 units remaining) [ (Pair {} 1 2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out index 3246148af33e..a893c50eb3a5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.758 units remaining) + - location: 11 (remaining gas: 1039990.723 units remaining) [ (Pair (Pair 15 9) 0 0) ] - - location: 11 (remaining gas: 1039990.748 units remaining) + - location: 11 (remaining gas: 1039990.713 units remaining) [ (Pair 15 9) ] - - location: 12 (remaining gas: 1039990.738 units remaining) + - location: 12 (remaining gas: 1039990.703 units remaining) [ 15 9 ] - - location: 13 (remaining gas: 1039990.728 units remaining) + - location: 13 (remaining gas: 1039990.693 units remaining) [ 15 15 9 ] - - location: 14 (remaining gas: 1039990.713 units remaining) + - location: 14 (remaining gas: 1039990.678 units remaining) [ 15 9 ] - - location: 16 (remaining gas: 1039990.658 units remaining) + - location: 16 (remaining gas: 1039990.623 units remaining) [ 24 ] - - location: 14 (remaining gas: 1039990.628 units remaining) + - location: 14 (remaining gas: 1039990.593 units remaining) [ 15 24 ] - - location: 17 (remaining gas: 1039990.613 units remaining) + - location: 17 (remaining gas: 1039990.578 units remaining) [ (Pair 15 24) ] - - location: 18 (remaining gas: 1039990.598 units remaining) + - location: 18 (remaining gas: 1039990.563 units remaining) [ {} (Pair 15 24) ] - - location: 20 (remaining gas: 1039990.583 units remaining) + - location: 20 (remaining gas: 1039990.548 units remaining) [ (Pair {} 15 24) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out index 47c2e282f80d..cb7c3722fbb0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out @@ -7,87 +7,87 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.010 units remaining) + - location: 15 (remaining gas: 1039985.975 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039986 units remaining) + - location: 15 (remaining gas: 1039985.965 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - - location: 16 (remaining gas: 1039985.990 units remaining) + - location: 16 (remaining gas: 1039985.955 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039985.980 units remaining) + - location: 17 (remaining gas: 1039985.945 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039985.970 units remaining) + - location: 18 (remaining gas: 1039985.935 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039985.960 units remaining) + - location: 19 (remaining gas: 1039985.925 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039985.908 units remaining) + - location: 20 (remaining gas: 1039985.873 units remaining) [ ] - - location: 23 (remaining gas: 1039985.898 units remaining) + - location: 23 (remaining gas: 1039985.863 units remaining) [ 6 ] - - location: 20 (remaining gas: 1039985.873 units remaining) + - location: 20 (remaining gas: 1039985.838 units remaining) [ 5 6 ] - - location: 20 (remaining gas: 1039985.863 units remaining) + - location: 20 (remaining gas: 1039985.828 units remaining) [ 4 5 6 ] - - location: 20 (remaining gas: 1039985.853 units remaining) + - location: 20 (remaining gas: 1039985.818 units remaining) [ 3 4 5 6 ] - - location: 20 (remaining gas: 1039985.843 units remaining) + - location: 20 (remaining gas: 1039985.808 units remaining) [ 2 3 4 5 6 ] - - location: 20 (remaining gas: 1039985.833 units remaining) + - location: 20 (remaining gas: 1039985.798 units remaining) [ 1 2 3 4 5 6 ] - - location: 20 (remaining gas: 1039985.833 units remaining) + - location: 20 (remaining gas: 1039985.798 units remaining) [ 1 2 3 4 5 6 ] - - location: 26 (remaining gas: 1039985.823 units remaining) + - location: 26 (remaining gas: 1039985.788 units remaining) [ 2 3 4 5 6 ] - - location: 27 (remaining gas: 1039985.813 units remaining) + - location: 27 (remaining gas: 1039985.778 units remaining) [ 3 4 5 6 ] - - location: 28 (remaining gas: 1039985.803 units remaining) + - location: 28 (remaining gas: 1039985.768 units remaining) [ 4 5 6 ] - - location: 29 (remaining gas: 1039985.793 units remaining) + - location: 29 (remaining gas: 1039985.758 units remaining) [ 5 6 ] - - location: 30 (remaining gas: 1039985.783 units remaining) + - location: 30 (remaining gas: 1039985.748 units remaining) [ 6 ] - - location: 31 (remaining gas: 1039985.768 units remaining) + - location: 31 (remaining gas: 1039985.733 units remaining) [ {} 6 ] - - location: 33 (remaining gas: 1039985.753 units remaining) + - location: 33 (remaining gas: 1039985.718 units remaining) [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index b25d8283552c..41e806f2d751 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -7,33 +7,33 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039990.347 units remaining) + - location: 15 (remaining gas: 1039990.312 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039990.337 units remaining) + - location: 15 (remaining gas: 1039990.302 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - - location: 16 (remaining gas: 1039990.327 units remaining) + - location: 16 (remaining gas: 1039990.292 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039990.317 units remaining) + - location: 17 (remaining gas: 1039990.282 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039990.307 units remaining) + - location: 18 (remaining gas: 1039990.272 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039990.297 units remaining) + - location: 19 (remaining gas: 1039990.262 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039990.227 units remaining) + - location: 20 (remaining gas: 1039990.192 units remaining) [ 5 ] - - location: 22 (remaining gas: 1039990.212 units remaining) + - location: 22 (remaining gas: 1039990.177 units remaining) [ {} 5 ] - - location: 24 (remaining gas: 1039990.197 units remaining) + - location: 24 (remaining gas: 1039990.162 units remaining) [ (Pair {} 5) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out index 548d4395ae5b..e92f19d3bddd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out @@ -7,51 +7,51 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039987.936 units remaining) + - location: 15 (remaining gas: 1039987.901 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039987.926 units remaining) + - location: 15 (remaining gas: 1039987.891 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - - location: 16 (remaining gas: 1039987.916 units remaining) + - location: 16 (remaining gas: 1039987.881 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039987.906 units remaining) + - location: 17 (remaining gas: 1039987.871 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039987.896 units remaining) + - location: 18 (remaining gas: 1039987.861 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039987.886 units remaining) + - location: 19 (remaining gas: 1039987.851 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039987.799 units remaining) + - location: 20 (remaining gas: 1039987.764 units remaining) [ 2 3 4 5 1 ] - - location: 22 (remaining gas: 1039987.789 units remaining) + - location: 22 (remaining gas: 1039987.754 units remaining) [ 3 4 5 1 ] - - location: 23 (remaining gas: 1039987.779 units remaining) + - location: 23 (remaining gas: 1039987.744 units remaining) [ 4 5 1 ] - - location: 24 (remaining gas: 1039987.769 units remaining) + - location: 24 (remaining gas: 1039987.734 units remaining) [ 5 1 ] - - location: 25 (remaining gas: 1039987.759 units remaining) + - location: 25 (remaining gas: 1039987.724 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039987.744 units remaining) + - location: 26 (remaining gas: 1039987.709 units remaining) [ {} 1 ] - - location: 28 (remaining gas: 1039987.729 units remaining) + - location: 28 (remaining gas: 1039987.694 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out index 203847e7e66e..2e0a572414c3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out @@ -7,38 +7,38 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039951.987 units remaining) + - location: 7 (remaining gas: 1039951.952 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039951.977 units remaining) + - location: 7 (remaining gas: 1039951.942 units remaining) [ ] - - location: 8 (remaining gas: 1039951.967 units remaining) + - location: 8 (remaining gas: 1039951.932 units remaining) [ 5 ] - - location: 11 (remaining gas: 1039951.957 units remaining) + - location: 11 (remaining gas: 1039951.922 units remaining) [ 4 5 ] - - location: 14 (remaining gas: 1039951.947 units remaining) + - location: 14 (remaining gas: 1039951.912 units remaining) [ 3 4 5 ] - - location: 17 (remaining gas: 1039951.937 units remaining) + - location: 17 (remaining gas: 1039951.902 units remaining) [ 2 3 4 5 ] - - location: 20 (remaining gas: 1039951.927 units remaining) + - location: 20 (remaining gas: 1039951.892 units remaining) [ 1 2 3 4 5 ] - - location: 23 (remaining gas: 1039951.906 units remaining) + - location: 23 (remaining gas: 1039951.871 units remaining) [ 1 1 2 3 4 5 ] - - location: 25 (remaining gas: 1039951.896 units remaining) + - location: 25 (remaining gas: 1039951.861 units remaining) [ 1 1 1 @@ -46,40 +46,40 @@ trace 3 4 5 ] - - location: 30 (remaining gas: 1039951.861 units remaining) + - location: 30 (remaining gas: 1039951.826 units remaining) [ 0 1 2 3 4 5 ] - - location: 31 (remaining gas: 1039951.846 units remaining) + - location: 31 (remaining gas: 1039951.811 units remaining) [ True 1 2 3 4 5 ] - - location: 32 (remaining gas: 1039951.836 units remaining) + - location: 32 (remaining gas: 1039951.801 units remaining) [ 1 2 3 4 5 ] - - location: 32 (remaining gas: 1039951.821 units remaining) + - location: 32 (remaining gas: 1039951.786 units remaining) [ 1 2 3 4 5 ] - - location: 38 (remaining gas: 1039951.799 units remaining) + - location: 38 (remaining gas: 1039951.764 units remaining) [ 2 1 2 3 4 5 ] - - location: 40 (remaining gas: 1039951.789 units remaining) + - location: 40 (remaining gas: 1039951.754 units remaining) [ 2 2 1 @@ -87,40 +87,40 @@ trace 3 4 5 ] - - location: 45 (remaining gas: 1039951.754 units remaining) + - location: 45 (remaining gas: 1039951.719 units remaining) [ 0 1 2 3 4 5 ] - - location: 46 (remaining gas: 1039951.739 units remaining) + - location: 46 (remaining gas: 1039951.704 units remaining) [ True 1 2 3 4 5 ] - - location: 47 (remaining gas: 1039951.729 units remaining) + - location: 47 (remaining gas: 1039951.694 units remaining) [ 1 2 3 4 5 ] - - location: 47 (remaining gas: 1039951.714 units remaining) + - location: 47 (remaining gas: 1039951.679 units remaining) [ 1 2 3 4 5 ] - - location: 53 (remaining gas: 1039951.691 units remaining) + - location: 53 (remaining gas: 1039951.656 units remaining) [ 3 1 2 3 4 5 ] - - location: 55 (remaining gas: 1039951.681 units remaining) + - location: 55 (remaining gas: 1039951.646 units remaining) [ 3 3 1 @@ -128,40 +128,40 @@ trace 3 4 5 ] - - location: 60 (remaining gas: 1039951.646 units remaining) + - location: 60 (remaining gas: 1039951.611 units remaining) [ 0 1 2 3 4 5 ] - - location: 61 (remaining gas: 1039951.631 units remaining) + - location: 61 (remaining gas: 1039951.596 units remaining) [ True 1 2 3 4 5 ] - - location: 62 (remaining gas: 1039951.621 units remaining) + - location: 62 (remaining gas: 1039951.586 units remaining) [ 1 2 3 4 5 ] - - location: 62 (remaining gas: 1039951.606 units remaining) + - location: 62 (remaining gas: 1039951.571 units remaining) [ 1 2 3 4 5 ] - - location: 68 (remaining gas: 1039951.582 units remaining) + - location: 68 (remaining gas: 1039951.547 units remaining) [ 4 1 2 3 4 5 ] - - location: 70 (remaining gas: 1039951.572 units remaining) + - location: 70 (remaining gas: 1039951.537 units remaining) [ 4 4 1 @@ -169,40 +169,40 @@ trace 3 4 5 ] - - location: 75 (remaining gas: 1039951.537 units remaining) + - location: 75 (remaining gas: 1039951.502 units remaining) [ 0 1 2 3 4 5 ] - - location: 76 (remaining gas: 1039951.522 units remaining) + - location: 76 (remaining gas: 1039951.487 units remaining) [ True 1 2 3 4 5 ] - - location: 77 (remaining gas: 1039951.512 units remaining) + - location: 77 (remaining gas: 1039951.477 units remaining) [ 1 2 3 4 5 ] - - location: 77 (remaining gas: 1039951.497 units remaining) + - location: 77 (remaining gas: 1039951.462 units remaining) [ 1 2 3 4 5 ] - - location: 83 (remaining gas: 1039951.472 units remaining) + - location: 83 (remaining gas: 1039951.437 units remaining) [ 5 1 2 3 4 5 ] - - location: 85 (remaining gas: 1039951.462 units remaining) + - location: 85 (remaining gas: 1039951.427 units remaining) [ 5 5 1 @@ -210,39 +210,39 @@ trace 3 4 5 ] - - location: 90 (remaining gas: 1039951.427 units remaining) + - location: 90 (remaining gas: 1039951.392 units remaining) [ 0 1 2 3 4 5 ] - - location: 91 (remaining gas: 1039951.412 units remaining) + - location: 91 (remaining gas: 1039951.377 units remaining) [ True 1 2 3 4 5 ] - - location: 92 (remaining gas: 1039951.402 units remaining) + - location: 92 (remaining gas: 1039951.367 units remaining) [ 1 2 3 4 5 ] - - location: 92 (remaining gas: 1039951.387 units remaining) + - location: 92 (remaining gas: 1039951.352 units remaining) [ 1 2 3 4 5 ] - - location: 98 (remaining gas: 1039951.315 units remaining) + - location: 98 (remaining gas: 1039951.280 units remaining) [ ] - - location: 100 (remaining gas: 1039951.305 units remaining) + - location: 100 (remaining gas: 1039951.270 units remaining) [ Unit ] - - location: 101 (remaining gas: 1039951.290 units remaining) + - location: 101 (remaining gas: 1039951.255 units remaining) [ {} Unit ] - - location: 103 (remaining gas: 1039951.275 units remaining) + - location: 103 (remaining gas: 1039951.240 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out index f6a21e9db0bc..00cb54ca79a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out @@ -7,136 +7,136 @@ emitted operations big_map diff trace - - location: 25 (remaining gas: 1039969.963 units remaining) + - location: 25 (remaining gas: 1039969.928 units remaining) [ (Pair (Pair -8 2) None None None None) ] - - location: 25 (remaining gas: 1039969.953 units remaining) + - location: 25 (remaining gas: 1039969.918 units remaining) [ (Pair -8 2) ] - - location: 26 (remaining gas: 1039969.943 units remaining) + - location: 26 (remaining gas: 1039969.908 units remaining) [ (Pair -8 2) (Pair -8 2) ] - - location: 27 (remaining gas: 1039969.933 units remaining) + - location: 27 (remaining gas: 1039969.898 units remaining) [ -8 2 (Pair -8 2) ] - - location: 28 (remaining gas: 1039969.908 units remaining) + - location: 28 (remaining gas: 1039969.873 units remaining) [ 8 2 (Pair -8 2) ] - - location: 29 (remaining gas: 1039969.893 units remaining) + - location: 29 (remaining gas: 1039969.858 units remaining) [ 2 (Pair -8 2) ] - - location: 31 (remaining gas: 1039969.868 units remaining) + - location: 31 (remaining gas: 1039969.833 units remaining) [ 2 (Pair -8 2) ] - - location: 29 (remaining gas: 1039969.838 units remaining) + - location: 29 (remaining gas: 1039969.803 units remaining) [ 8 2 (Pair -8 2) ] - - location: 32 (remaining gas: 1039969.698 units remaining) + - location: 32 (remaining gas: 1039969.663 units remaining) [ (Some (Pair 4 0)) (Pair -8 2) ] - - location: 33 (remaining gas: 1039969.688 units remaining) + - location: 33 (remaining gas: 1039969.653 units remaining) [ (Pair -8 2) (Some (Pair 4 0)) ] - - location: 34 (remaining gas: 1039969.678 units remaining) + - location: 34 (remaining gas: 1039969.643 units remaining) [ (Pair -8 2) (Pair -8 2) (Some (Pair 4 0)) ] - - location: 35 (remaining gas: 1039969.668 units remaining) + - location: 35 (remaining gas: 1039969.633 units remaining) [ -8 2 (Pair -8 2) (Some (Pair 4 0)) ] - - location: 36 (remaining gas: 1039969.643 units remaining) + - location: 36 (remaining gas: 1039969.608 units remaining) [ 8 2 (Pair -8 2) (Some (Pair 4 0)) ] - - location: 37 (remaining gas: 1039969.503 units remaining) + - location: 37 (remaining gas: 1039969.468 units remaining) [ (Some (Pair 4 0)) (Pair -8 2) (Some (Pair 4 0)) ] - - location: 38 (remaining gas: 1039969.493 units remaining) + - location: 38 (remaining gas: 1039969.458 units remaining) [ (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 39 (remaining gas: 1039969.483 units remaining) + - location: 39 (remaining gas: 1039969.448 units remaining) [ (Pair -8 2) (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 40 (remaining gas: 1039969.473 units remaining) + - location: 40 (remaining gas: 1039969.438 units remaining) [ -8 2 (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 41 (remaining gas: 1039969.458 units remaining) + - location: 41 (remaining gas: 1039969.423 units remaining) [ 2 (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 43 (remaining gas: 1039969.433 units remaining) + - location: 43 (remaining gas: 1039969.398 units remaining) [ 2 (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 41 (remaining gas: 1039969.403 units remaining) + - location: 41 (remaining gas: 1039969.368 units remaining) [ -8 2 (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 44 (remaining gas: 1039969.263 units remaining) + - location: 44 (remaining gas: 1039969.228 units remaining) [ (Some (Pair -4 0)) (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 45 (remaining gas: 1039969.253 units remaining) + - location: 45 (remaining gas: 1039969.218 units remaining) [ (Pair -8 2) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 46 (remaining gas: 1039969.243 units remaining) + - location: 46 (remaining gas: 1039969.208 units remaining) [ -8 2 (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 47 (remaining gas: 1039969.103 units remaining) + - location: 47 (remaining gas: 1039969.068 units remaining) [ (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 49 (remaining gas: 1039969.055 units remaining) + - location: 49 (remaining gas: 1039969.020 units remaining) [ (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 52 (remaining gas: 1039969.040 units remaining) + - location: 52 (remaining gas: 1039969.005 units remaining) [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 49 (remaining gas: 1039969.015 units remaining) + - location: 49 (remaining gas: 1039968.980 units remaining) [ (Some (Pair -4 0)) (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ (Some (Pair -4 0)) (Some (Pair -4 0)) (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ (Some (Pair -4 0)) (Some (Pair -4 0)) (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 53 (remaining gas: 1039968.990 units remaining) + - location: 53 (remaining gas: 1039968.955 units remaining) [ (Some (Pair -4 0)) (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 55 (remaining gas: 1039968.975 units remaining) + - location: 55 (remaining gas: 1039968.940 units remaining) [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 53 (remaining gas: 1039968.945 units remaining) + - location: 53 (remaining gas: 1039968.910 units remaining) [ (Some (Pair -4 0)) (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 56 (remaining gas: 1039968.930 units remaining) + - location: 56 (remaining gas: 1039968.895 units remaining) [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 57 (remaining gas: 1039968.915 units remaining) + - location: 57 (remaining gas: 1039968.880 units remaining) [ {} (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 59 (remaining gas: 1039968.900 units remaining) + - location: 59 (remaining gas: 1039968.865 units remaining) [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out index b2d3aa4b773f..0e7eafb3e6c8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out @@ -7,136 +7,136 @@ emitted operations big_map diff trace - - location: 25 (remaining gas: 1039969.963 units remaining) + - location: 25 (remaining gas: 1039969.928 units remaining) [ (Pair (Pair 10 -3) None None None None) ] - - location: 25 (remaining gas: 1039969.953 units remaining) + - location: 25 (remaining gas: 1039969.918 units remaining) [ (Pair 10 -3) ] - - location: 26 (remaining gas: 1039969.943 units remaining) + - location: 26 (remaining gas: 1039969.908 units remaining) [ (Pair 10 -3) (Pair 10 -3) ] - - location: 27 (remaining gas: 1039969.933 units remaining) + - location: 27 (remaining gas: 1039969.898 units remaining) [ 10 -3 (Pair 10 -3) ] - - location: 28 (remaining gas: 1039969.908 units remaining) + - location: 28 (remaining gas: 1039969.873 units remaining) [ 10 -3 (Pair 10 -3) ] - - location: 29 (remaining gas: 1039969.893 units remaining) + - location: 29 (remaining gas: 1039969.858 units remaining) [ -3 (Pair 10 -3) ] - - location: 31 (remaining gas: 1039969.868 units remaining) + - location: 31 (remaining gas: 1039969.833 units remaining) [ 3 (Pair 10 -3) ] - - location: 29 (remaining gas: 1039969.838 units remaining) + - location: 29 (remaining gas: 1039969.803 units remaining) [ 10 3 (Pair 10 -3) ] - - location: 32 (remaining gas: 1039969.698 units remaining) + - location: 32 (remaining gas: 1039969.663 units remaining) [ (Some (Pair 3 1)) (Pair 10 -3) ] - - location: 33 (remaining gas: 1039969.688 units remaining) + - location: 33 (remaining gas: 1039969.653 units remaining) [ (Pair 10 -3) (Some (Pair 3 1)) ] - - location: 34 (remaining gas: 1039969.678 units remaining) + - location: 34 (remaining gas: 1039969.643 units remaining) [ (Pair 10 -3) (Pair 10 -3) (Some (Pair 3 1)) ] - - location: 35 (remaining gas: 1039969.668 units remaining) + - location: 35 (remaining gas: 1039969.633 units remaining) [ 10 -3 (Pair 10 -3) (Some (Pair 3 1)) ] - - location: 36 (remaining gas: 1039969.643 units remaining) + - location: 36 (remaining gas: 1039969.608 units remaining) [ 10 -3 (Pair 10 -3) (Some (Pair 3 1)) ] - - location: 37 (remaining gas: 1039969.503 units remaining) + - location: 37 (remaining gas: 1039969.468 units remaining) [ (Some (Pair -3 1)) (Pair 10 -3) (Some (Pair 3 1)) ] - - location: 38 (remaining gas: 1039969.493 units remaining) + - location: 38 (remaining gas: 1039969.458 units remaining) [ (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 39 (remaining gas: 1039969.483 units remaining) + - location: 39 (remaining gas: 1039969.448 units remaining) [ (Pair 10 -3) (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 40 (remaining gas: 1039969.473 units remaining) + - location: 40 (remaining gas: 1039969.438 units remaining) [ 10 -3 (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 41 (remaining gas: 1039969.458 units remaining) + - location: 41 (remaining gas: 1039969.423 units remaining) [ -3 (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 43 (remaining gas: 1039969.433 units remaining) + - location: 43 (remaining gas: 1039969.398 units remaining) [ 3 (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 41 (remaining gas: 1039969.403 units remaining) + - location: 41 (remaining gas: 1039969.368 units remaining) [ 10 3 (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 44 (remaining gas: 1039969.263 units remaining) + - location: 44 (remaining gas: 1039969.228 units remaining) [ (Some (Pair 3 1)) (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 45 (remaining gas: 1039969.253 units remaining) + - location: 45 (remaining gas: 1039969.218 units remaining) [ (Pair 10 -3) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 46 (remaining gas: 1039969.243 units remaining) + - location: 46 (remaining gas: 1039969.208 units remaining) [ 10 -3 (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 47 (remaining gas: 1039969.103 units remaining) + - location: 47 (remaining gas: 1039969.068 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 49 (remaining gas: 1039969.055 units remaining) + - location: 49 (remaining gas: 1039969.020 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 52 (remaining gas: 1039969.040 units remaining) + - location: 52 (remaining gas: 1039969.005 units remaining) [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 49 (remaining gas: 1039969.015 units remaining) + - location: 49 (remaining gas: 1039968.980 units remaining) [ (Some (Pair 3 1)) (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 53 (remaining gas: 1039968.990 units remaining) + - location: 53 (remaining gas: 1039968.955 units remaining) [ (Some (Pair 3 1)) (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 55 (remaining gas: 1039968.975 units remaining) + - location: 55 (remaining gas: 1039968.940 units remaining) [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 53 (remaining gas: 1039968.945 units remaining) + - location: 53 (remaining gas: 1039968.910 units remaining) [ (Some (Pair -3 1)) (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 56 (remaining gas: 1039968.930 units remaining) + - location: 56 (remaining gas: 1039968.895 units remaining) [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 57 (remaining gas: 1039968.915 units remaining) + - location: 57 (remaining gas: 1039968.880 units remaining) [ {} (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 59 (remaining gas: 1039968.900 units remaining) + - location: 59 (remaining gas: 1039968.865 units remaining) [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out index d60041e6b509..563a089aca93 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out @@ -7,136 +7,136 @@ emitted operations big_map diff trace - - location: 25 (remaining gas: 1039969.963 units remaining) + - location: 25 (remaining gas: 1039969.928 units remaining) [ (Pair (Pair 10 0) None None None None) ] - - location: 25 (remaining gas: 1039969.953 units remaining) + - location: 25 (remaining gas: 1039969.918 units remaining) [ (Pair 10 0) ] - - location: 26 (remaining gas: 1039969.943 units remaining) + - location: 26 (remaining gas: 1039969.908 units remaining) [ (Pair 10 0) (Pair 10 0) ] - - location: 27 (remaining gas: 1039969.933 units remaining) + - location: 27 (remaining gas: 1039969.898 units remaining) [ 10 0 (Pair 10 0) ] - - location: 28 (remaining gas: 1039969.908 units remaining) + - location: 28 (remaining gas: 1039969.873 units remaining) [ 10 0 (Pair 10 0) ] - - location: 29 (remaining gas: 1039969.893 units remaining) + - location: 29 (remaining gas: 1039969.858 units remaining) [ 0 (Pair 10 0) ] - - location: 31 (remaining gas: 1039969.868 units remaining) + - location: 31 (remaining gas: 1039969.833 units remaining) [ 0 (Pair 10 0) ] - - location: 29 (remaining gas: 1039969.838 units remaining) + - location: 29 (remaining gas: 1039969.803 units remaining) [ 10 0 (Pair 10 0) ] - - location: 32 (remaining gas: 1039969.698 units remaining) + - location: 32 (remaining gas: 1039969.663 units remaining) [ None (Pair 10 0) ] - - location: 33 (remaining gas: 1039969.688 units remaining) + - location: 33 (remaining gas: 1039969.653 units remaining) [ (Pair 10 0) None ] - - location: 34 (remaining gas: 1039969.678 units remaining) + - location: 34 (remaining gas: 1039969.643 units remaining) [ (Pair 10 0) (Pair 10 0) None ] - - location: 35 (remaining gas: 1039969.668 units remaining) + - location: 35 (remaining gas: 1039969.633 units remaining) [ 10 0 (Pair 10 0) None ] - - location: 36 (remaining gas: 1039969.643 units remaining) + - location: 36 (remaining gas: 1039969.608 units remaining) [ 10 0 (Pair 10 0) None ] - - location: 37 (remaining gas: 1039969.503 units remaining) + - location: 37 (remaining gas: 1039969.468 units remaining) [ None (Pair 10 0) None ] - - location: 38 (remaining gas: 1039969.493 units remaining) + - location: 38 (remaining gas: 1039969.458 units remaining) [ (Pair 10 0) None None ] - - location: 39 (remaining gas: 1039969.483 units remaining) + - location: 39 (remaining gas: 1039969.448 units remaining) [ (Pair 10 0) (Pair 10 0) None None ] - - location: 40 (remaining gas: 1039969.473 units remaining) + - location: 40 (remaining gas: 1039969.438 units remaining) [ 10 0 (Pair 10 0) None None ] - - location: 41 (remaining gas: 1039969.458 units remaining) + - location: 41 (remaining gas: 1039969.423 units remaining) [ 0 (Pair 10 0) None None ] - - location: 43 (remaining gas: 1039969.433 units remaining) + - location: 43 (remaining gas: 1039969.398 units remaining) [ 0 (Pair 10 0) None None ] - - location: 41 (remaining gas: 1039969.403 units remaining) + - location: 41 (remaining gas: 1039969.368 units remaining) [ 10 0 (Pair 10 0) None None ] - - location: 44 (remaining gas: 1039969.263 units remaining) + - location: 44 (remaining gas: 1039969.228 units remaining) [ None (Pair 10 0) None None ] - - location: 45 (remaining gas: 1039969.253 units remaining) + - location: 45 (remaining gas: 1039969.218 units remaining) [ (Pair 10 0) None None None ] - - location: 46 (remaining gas: 1039969.243 units remaining) + - location: 46 (remaining gas: 1039969.208 units remaining) [ 10 0 None None None ] - - location: 47 (remaining gas: 1039969.103 units remaining) + - location: 47 (remaining gas: 1039969.068 units remaining) [ None None None None ] - - location: 49 (remaining gas: 1039969.055 units remaining) + - location: 49 (remaining gas: 1039969.020 units remaining) [ None None ] - - location: 52 (remaining gas: 1039969.040 units remaining) + - location: 52 (remaining gas: 1039969.005 units remaining) [ (Pair None None) ] - - location: 49 (remaining gas: 1039969.015 units remaining) + - location: 49 (remaining gas: 1039968.980 units remaining) [ None (Pair None None) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ None None (Pair None None) ] - - location: 49 (remaining gas: 1039969.005 units remaining) + - location: 49 (remaining gas: 1039968.970 units remaining) [ None None (Pair None None) ] - - location: 53 (remaining gas: 1039968.990 units remaining) + - location: 53 (remaining gas: 1039968.955 units remaining) [ None (Pair None None) ] - - location: 55 (remaining gas: 1039968.975 units remaining) + - location: 55 (remaining gas: 1039968.940 units remaining) [ (Pair None None None) ] - - location: 53 (remaining gas: 1039968.945 units remaining) + - location: 53 (remaining gas: 1039968.910 units remaining) [ None (Pair None None None) ] - - location: 56 (remaining gas: 1039968.930 units remaining) + - location: 56 (remaining gas: 1039968.895 units remaining) [ (Pair None None None None) ] - - location: 57 (remaining gas: 1039968.915 units remaining) + - location: 57 (remaining gas: 1039968.880 units remaining) [ {} (Pair None None None None) ] - - location: 59 (remaining gas: 1039968.900 units remaining) + - location: 59 (remaining gas: 1039968.865 units remaining) [ (Pair {} None None None None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out index dfd3b4405591..2e8c911a4980 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Left 0)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Left 0)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Left 0) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Left 0) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 0 10 ] - - location: 24 (remaining gas: 1039981.851 units remaining) + - location: 24 (remaining gas: 1039981.816 units remaining) [ 10 0 ] - - location: 25 (remaining gas: 1039981.711 units remaining) + - location: 25 (remaining gas: 1039981.676 units remaining) [ None ] - - location: 26 (remaining gas: 1039981.696 units remaining) + - location: 26 (remaining gas: 1039981.661 units remaining) [ (Left None) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Left None) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Left None) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Left None)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out index 547a688c5b29..d595f4c00d60 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Left 10)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Left 10)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Left 10) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Left 10) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 10 10 ] - - location: 24 (remaining gas: 1039981.851 units remaining) + - location: 24 (remaining gas: 1039981.816 units remaining) [ 10 10 ] - - location: 25 (remaining gas: 1039981.711 units remaining) + - location: 25 (remaining gas: 1039981.676 units remaining) [ (Some (Pair 1 0)) ] - - location: 26 (remaining gas: 1039981.696 units remaining) + - location: 26 (remaining gas: 1039981.661 units remaining) [ (Left (Some (Pair 1 0))) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Left (Some (Pair 1 0))) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Left (Some (Pair 1 0))) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Left (Some (Pair 1 0)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out index 7981f7eaf5b5..631e0410f9ef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Left 3)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Left 3)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Left 3) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Left 3) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 3 10 ] - - location: 24 (remaining gas: 1039981.851 units remaining) + - location: 24 (remaining gas: 1039981.816 units remaining) [ 10 3 ] - - location: 25 (remaining gas: 1039981.711 units remaining) + - location: 25 (remaining gas: 1039981.676 units remaining) [ (Some (Pair 3 1)) ] - - location: 26 (remaining gas: 1039981.696 units remaining) + - location: 26 (remaining gas: 1039981.661 units remaining) [ (Left (Some (Pair 3 1))) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Left (Some (Pair 3 1))) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Left (Some (Pair 3 1))) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Left (Some (Pair 3 1)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out index 349bd9d7f219..c10c5d6a39ee 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Right 0)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Right 0)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Right 0) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Right 0) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 0 10 ] - - location: 32 (remaining gas: 1039981.851 units remaining) + - location: 32 (remaining gas: 1039981.816 units remaining) [ 10 0 ] - - location: 33 (remaining gas: 1039981.711 units remaining) + - location: 33 (remaining gas: 1039981.676 units remaining) [ None ] - - location: 34 (remaining gas: 1039981.696 units remaining) + - location: 34 (remaining gas: 1039981.661 units remaining) [ (Right None) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Right None) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Right None) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Right None)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out index d3ad8f699115..c9694cb85c3e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Right 10)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Right 10)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Right 10) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Right 10) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 10 10 ] - - location: 32 (remaining gas: 1039981.851 units remaining) + - location: 32 (remaining gas: 1039981.816 units remaining) [ 10 10 ] - - location: 33 (remaining gas: 1039981.711 units remaining) + - location: 33 (remaining gas: 1039981.676 units remaining) [ (Some (Pair 1 0)) ] - - location: 34 (remaining gas: 1039981.696 units remaining) + - location: 34 (remaining gas: 1039981.661 units remaining) [ (Right (Some (Pair 1 0))) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Right (Some (Pair 1 0))) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Right (Some (Pair 1 0))) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Right (Some (Pair 1 0)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out index 2fa368526f1f..0e263b6639a6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 10 (Right 3)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 10 (Right 3)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 10 (Right 3) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Right 3) 10 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 3 10 ] - - location: 32 (remaining gas: 1039981.851 units remaining) + - location: 32 (remaining gas: 1039981.816 units remaining) [ 10 3 ] - - location: 33 (remaining gas: 1039981.711 units remaining) + - location: 33 (remaining gas: 1039981.676 units remaining) [ (Some (Pair 3 1)) ] - - location: 34 (remaining gas: 1039981.696 units remaining) + - location: 34 (remaining gas: 1039981.661 units remaining) [ (Right (Some (Pair 3 1))) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Right (Some (Pair 3 1))) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Right (Some (Pair 3 1))) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Right (Some (Pair 3 1)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out index acdb678ccf73..cf59a571ac77 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 19 (remaining gas: 1039981.901 units remaining) + - location: 19 (remaining gas: 1039981.866 units remaining) [ (Pair (Pair 5 (Right 10)) (Left None)) ] - - location: 19 (remaining gas: 1039981.891 units remaining) + - location: 19 (remaining gas: 1039981.856 units remaining) [ (Pair 5 (Right 10)) ] - - location: 20 (remaining gas: 1039981.881 units remaining) + - location: 20 (remaining gas: 1039981.846 units remaining) [ 5 (Right 10) ] - - location: 21 (remaining gas: 1039981.871 units remaining) + - location: 21 (remaining gas: 1039981.836 units remaining) [ (Right 10) 5 ] - - location: 22 (remaining gas: 1039981.861 units remaining) + - location: 22 (remaining gas: 1039981.826 units remaining) [ 10 5 ] - - location: 32 (remaining gas: 1039981.851 units remaining) + - location: 32 (remaining gas: 1039981.816 units remaining) [ 5 10 ] - - location: 33 (remaining gas: 1039981.711 units remaining) + - location: 33 (remaining gas: 1039981.676 units remaining) [ (Some (Pair 0 5)) ] - - location: 34 (remaining gas: 1039981.696 units remaining) + - location: 34 (remaining gas: 1039981.661 units remaining) [ (Right (Some (Pair 0 5))) ] - - location: 22 (remaining gas: 1039981.681 units remaining) + - location: 22 (remaining gas: 1039981.646 units remaining) [ (Right (Some (Pair 0 5))) ] - - location: 39 (remaining gas: 1039981.666 units remaining) + - location: 39 (remaining gas: 1039981.631 units remaining) [ {} (Right (Some (Pair 0 5))) ] - - location: 41 (remaining gas: 1039981.651 units remaining) + - location: 41 (remaining gas: 1039981.616 units remaining) [ (Pair {} (Right (Some (Pair 0 5)))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" index 1ec854ed7f52..6d65f1a59a47 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" @@ -7,27 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.971 units remaining) + - location: 9 (remaining gas: 1039989.936 units remaining) [ (Pair Unit {}) ] - - location: 9 (remaining gas: 1039989.961 units remaining) + - location: 9 (remaining gas: 1039989.926 units remaining) [ ] - - location: 10 (remaining gas: 1039989.741 units remaining) + - location: 10 (remaining gas: 1039989.706 units remaining) [ {} ] - - location: 13 (remaining gas: 1039989.731 units remaining) + - location: 13 (remaining gas: 1039989.696 units remaining) [ "world" {} ] - - location: 16 (remaining gas: 1039989.716 units remaining) + - location: 16 (remaining gas: 1039989.681 units remaining) [ (Some "world") {} ] - - location: 17 (remaining gas: 1039989.706 units remaining) + - location: 17 (remaining gas: 1039989.671 units remaining) [ "hello" (Some "world") {} ] - - location: 20 (remaining gas: 1039989.556 units remaining) + - location: 20 (remaining gas: 1039989.521 units remaining) [ { Elt "hello" "world" } ] - - location: 21 (remaining gas: 1039989.541 units remaining) + - location: 21 (remaining gas: 1039989.506 units remaining) [ {} { Elt "hello" "world" } ] - - location: 23 (remaining gas: 1039989.526 units remaining) + - location: 23 (remaining gas: 1039989.491 units remaining) [ (Pair {} { Elt "hello" "world" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" index 2e05fec539c5..40a26874c767 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" @@ -7,42 +7,42 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039987.134 units remaining) + - location: 7 (remaining gas: 1039987.099 units remaining) [ (Pair "" "?") ] - - location: 7 (remaining gas: 1039987.124 units remaining) + - location: 7 (remaining gas: 1039987.089 units remaining) [ "" ] - - location: 8 (remaining gas: 1039987.114 units remaining) + - location: 8 (remaining gas: 1039987.079 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } "" ] - - location: 22 (remaining gas: 1039987.104 units remaining) + - location: 22 (remaining gas: 1039987.069 units remaining) [ "" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - - location: 12 (remaining gas: 1039987.094 units remaining) + - location: 12 (remaining gas: 1039987.059 units remaining) [ "_abc" "" ] - - location: 15 (remaining gas: 1039987.079 units remaining) + - location: 15 (remaining gas: 1039987.044 units remaining) [ {} "_abc" "" ] - - location: 17 (remaining gas: 1039987.069 units remaining) + - location: 17 (remaining gas: 1039987.034 units remaining) [ "_abc" {} "" ] - - location: 18 (remaining gas: 1039987.054 units remaining) + - location: 18 (remaining gas: 1039987.019 units remaining) [ { "_abc" } "" ] - - location: 19 (remaining gas: 1039987.044 units remaining) + - location: 19 (remaining gas: 1039987.009 units remaining) [ "" { "_abc" } ] - - location: 20 (remaining gas: 1039987.029 units remaining) + - location: 20 (remaining gas: 1039986.994 units remaining) [ { "" ; "_abc" } ] - - location: 21 (remaining gas: 1039986.909 units remaining) + - location: 21 (remaining gas: 1039986.874 units remaining) [ "_abc" ] - - location: 23 (remaining gas: 1039986.879 units remaining) + - location: 23 (remaining gas: 1039986.844 units remaining) [ "_abc" ] - - location: 24 (remaining gas: 1039986.864 units remaining) + - location: 24 (remaining gas: 1039986.829 units remaining) [ {} "_abc" ] - - location: 26 (remaining gas: 1039986.849 units remaining) + - location: 26 (remaining gas: 1039986.814 units remaining) [ (Pair {} "_abc") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" index efbecfee0761..9ffd73b11dfe 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" @@ -7,42 +7,42 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039987.094 units remaining) + - location: 7 (remaining gas: 1039987.059 units remaining) [ (Pair "test" "?") ] - - location: 7 (remaining gas: 1039987.084 units remaining) + - location: 7 (remaining gas: 1039987.049 units remaining) [ "test" ] - - location: 8 (remaining gas: 1039987.074 units remaining) + - location: 8 (remaining gas: 1039987.039 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } "test" ] - - location: 22 (remaining gas: 1039987.064 units remaining) + - location: 22 (remaining gas: 1039987.029 units remaining) [ "test" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - - location: 12 (remaining gas: 1039987.054 units remaining) + - location: 12 (remaining gas: 1039987.019 units remaining) [ "_abc" "test" ] - - location: 15 (remaining gas: 1039987.039 units remaining) + - location: 15 (remaining gas: 1039987.004 units remaining) [ {} "_abc" "test" ] - - location: 17 (remaining gas: 1039987.029 units remaining) + - location: 17 (remaining gas: 1039986.994 units remaining) [ "_abc" {} "test" ] - - location: 18 (remaining gas: 1039987.014 units remaining) + - location: 18 (remaining gas: 1039986.979 units remaining) [ { "_abc" } "test" ] - - location: 19 (remaining gas: 1039987.004 units remaining) + - location: 19 (remaining gas: 1039986.969 units remaining) [ "test" { "_abc" } ] - - location: 20 (remaining gas: 1039986.989 units remaining) + - location: 20 (remaining gas: 1039986.954 units remaining) [ { "test" ; "_abc" } ] - - location: 21 (remaining gas: 1039986.869 units remaining) + - location: 21 (remaining gas: 1039986.834 units remaining) [ "test_abc" ] - - location: 23 (remaining gas: 1039986.839 units remaining) + - location: 23 (remaining gas: 1039986.804 units remaining) [ "test_abc" ] - - location: 24 (remaining gas: 1039986.824 units remaining) + - location: 24 (remaining gas: 1039986.789 units remaining) [ {} "test_abc" ] - - location: 26 (remaining gas: 1039986.809 units remaining) + - location: 26 (remaining gas: 1039986.774 units remaining) [ (Pair {} "test_abc") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out index 98493699ef01..0aed02f3b5f7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.033 units remaining) + - location: 8 (remaining gas: 1039990.998 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - - location: 8 (remaining gas: 1039991.023 units remaining) + - location: 8 (remaining gas: 1039990.988 units remaining) [ { 1 ; 2 ; 3 ; 4 } ] - - location: 9 (remaining gas: 1039991.013 units remaining) + - location: 9 (remaining gas: 1039990.978 units remaining) [ 1 { 2 ; 3 ; 4 } ] - - location: 11 (remaining gas: 1039990.998 units remaining) + - location: 11 (remaining gas: 1039990.963 units remaining) [ { 2 ; 3 ; 4 } ] - - location: 13 (remaining gas: 1039990.988 units remaining) + - location: 13 (remaining gas: 1039990.953 units remaining) [ ] - - location: 11 (remaining gas: 1039990.958 units remaining) + - location: 11 (remaining gas: 1039990.923 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039990.943 units remaining) + - location: 9 (remaining gas: 1039990.908 units remaining) [ 1 ] - - location: 18 (remaining gas: 1039990.928 units remaining) + - location: 18 (remaining gas: 1039990.893 units remaining) [ {} 1 ] - - location: 20 (remaining gas: 1039990.913 units remaining) + - location: 20 (remaining gas: 1039990.878 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out index 2379dd4a38fb..6730f6e90a79 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.333 units remaining) + - location: 8 (remaining gas: 1039991.298 units remaining) [ (Pair { 4 } 111) ] - - location: 8 (remaining gas: 1039991.323 units remaining) + - location: 8 (remaining gas: 1039991.288 units remaining) [ { 4 } ] - - location: 9 (remaining gas: 1039991.313 units remaining) + - location: 9 (remaining gas: 1039991.278 units remaining) [ 4 {} ] - - location: 11 (remaining gas: 1039991.298 units remaining) + - location: 11 (remaining gas: 1039991.263 units remaining) [ {} ] - - location: 13 (remaining gas: 1039991.288 units remaining) + - location: 13 (remaining gas: 1039991.253 units remaining) [ ] - - location: 11 (remaining gas: 1039991.258 units remaining) + - location: 11 (remaining gas: 1039991.223 units remaining) [ 4 ] - - location: 9 (remaining gas: 1039991.243 units remaining) + - location: 9 (remaining gas: 1039991.208 units remaining) [ 4 ] - - location: 18 (remaining gas: 1039991.228 units remaining) + - location: 18 (remaining gas: 1039991.193 units remaining) [ {} 4 ] - - location: 20 (remaining gas: 1039991.213 units remaining) + - location: 20 (remaining gas: 1039991.178 units remaining) [ (Pair {} 4) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" index 2f62f59c3b8e..1fd8642fad59 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.746 units remaining) + - location: 13 (remaining gas: 1039989.711 units remaining) [ (Pair "hello" (Some 4) {}) ] - - location: 13 (remaining gas: 1039989.736 units remaining) + - location: 13 (remaining gas: 1039989.701 units remaining) [ "hello" (Pair (Some 4) {}) ] - - location: 14 (remaining gas: 1039989.721 units remaining) + - location: 14 (remaining gas: 1039989.686 units remaining) [ (Pair (Some 4) {}) ] - - location: 16 (remaining gas: 1039989.711 units remaining) + - location: 16 (remaining gas: 1039989.676 units remaining) [ (Some 4) {} ] - - location: 14 (remaining gas: 1039989.681 units remaining) + - location: 14 (remaining gas: 1039989.646 units remaining) [ "hello" (Some 4) {} ] - - location: 17 (remaining gas: 1039989.496 units remaining) + - location: 17 (remaining gas: 1039989.461 units remaining) [ None { Elt "hello" 4 } ] - - location: 18 (remaining gas: 1039989.481 units remaining) + - location: 18 (remaining gas: 1039989.446 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 19 (remaining gas: 1039989.466 units remaining) + - location: 19 (remaining gas: 1039989.431 units remaining) [ {} (Pair None { Elt "hello" 4 }) ] - - location: 21 (remaining gas: 1039989.451 units remaining) + - location: 21 (remaining gas: 1039989.416 units remaining) [ (Pair {} None { Elt "hello" 4 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" index c2dc9980dbd5..d886d32784bf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.362 units remaining) + - location: 13 (remaining gas: 1039989.327 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039989.352 units remaining) + - location: 13 (remaining gas: 1039989.317 units remaining) [ "hi" (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039989.337 units remaining) + - location: 14 (remaining gas: 1039989.302 units remaining) [ (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039989.327 units remaining) + - location: 16 (remaining gas: 1039989.292 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039989.297 units remaining) + - location: 14 (remaining gas: 1039989.262 units remaining) [ "hi" (Some 5) { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039989.007 units remaining) + - location: 17 (remaining gas: 1039988.972 units remaining) [ None { Elt "hello" 4 ; Elt "hi" 5 } ] - - location: 18 (remaining gas: 1039988.992 units remaining) + - location: 18 (remaining gas: 1039988.957 units remaining) [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 19 (remaining gas: 1039988.977 units remaining) + - location: 19 (remaining gas: 1039988.942 units remaining) [ {} (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 21 (remaining gas: 1039988.962 units remaining) + - location: 21 (remaining gas: 1039988.927 units remaining) [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" index 278285df4c7b..1b8afd70795e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.332 units remaining) + - location: 13 (remaining gas: 1039989.297 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039989.322 units remaining) + - location: 13 (remaining gas: 1039989.287 units remaining) [ "hello" (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039989.307 units remaining) + - location: 14 (remaining gas: 1039989.272 units remaining) [ (Pair (Some 5) { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039989.297 units remaining) + - location: 16 (remaining gas: 1039989.262 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039989.267 units remaining) + - location: 14 (remaining gas: 1039989.232 units remaining) [ "hello" (Some 5) { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039988.977 units remaining) + - location: 17 (remaining gas: 1039988.942 units remaining) [ (Some 4) { Elt "hello" 5 } ] - - location: 18 (remaining gas: 1039988.962 units remaining) + - location: 18 (remaining gas: 1039988.927 units remaining) [ (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 19 (remaining gas: 1039988.947 units remaining) + - location: 19 (remaining gas: 1039988.912 units remaining) [ {} (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 21 (remaining gas: 1039988.932 units remaining) + - location: 21 (remaining gas: 1039988.897 units remaining) [ (Pair {} (Some 4) { Elt "hello" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" index 821f58aa9d24..9c953fcb754d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.033 units remaining) + - location: 13 (remaining gas: 1039988.998 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039989.023 units remaining) + - location: 13 (remaining gas: 1039988.988 units remaining) [ "1" (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 14 (remaining gas: 1039989.008 units remaining) + - location: 14 (remaining gas: 1039988.973 units remaining) [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 16 (remaining gas: 1039988.998 units remaining) + - location: 16 (remaining gas: 1039988.963 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039988.968 units remaining) + - location: 14 (remaining gas: 1039988.933 units remaining) [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039988.573 units remaining) + - location: 17 (remaining gas: 1039988.538 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039988.558 units remaining) + - location: 18 (remaining gas: 1039988.523 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039988.543 units remaining) + - location: 19 (remaining gas: 1039988.508 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039988.528 units remaining) + - location: 21 (remaining gas: 1039988.493 units remaining) [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" index 487825f06e0e..37bb20a35e4f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.033 units remaining) + - location: 13 (remaining gas: 1039988.998 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039989.023 units remaining) + - location: 13 (remaining gas: 1039988.988 units remaining) [ "1" (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 14 (remaining gas: 1039989.008 units remaining) + - location: 14 (remaining gas: 1039988.973 units remaining) [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 16 (remaining gas: 1039988.998 units remaining) + - location: 16 (remaining gas: 1039988.963 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039988.968 units remaining) + - location: 14 (remaining gas: 1039988.933 units remaining) [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039988.573 units remaining) + - location: 17 (remaining gas: 1039988.538 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039988.558 units remaining) + - location: 18 (remaining gas: 1039988.523 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039988.543 units remaining) + - location: 19 (remaining gas: 1039988.508 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039988.528 units remaining) + - location: 21 (remaining gas: 1039988.493 units remaining) [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" index 1ecdc175d21b..966274c19503 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.432 units remaining) + - location: 13 (remaining gas: 1039989.397 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039989.422 units remaining) + - location: 13 (remaining gas: 1039989.387 units remaining) [ "hello" (Pair None { Elt "hello" 4 }) ] - - location: 14 (remaining gas: 1039989.407 units remaining) + - location: 14 (remaining gas: 1039989.372 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 16 (remaining gas: 1039989.397 units remaining) + - location: 16 (remaining gas: 1039989.362 units remaining) [ None { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039989.367 units remaining) + - location: 14 (remaining gas: 1039989.332 units remaining) [ "hello" None { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039989.077 units remaining) + - location: 17 (remaining gas: 1039989.042 units remaining) [ (Some 4) {} ] - - location: 18 (remaining gas: 1039989.062 units remaining) + - location: 18 (remaining gas: 1039989.027 units remaining) [ (Pair (Some 4) {}) ] - - location: 19 (remaining gas: 1039989.047 units remaining) + - location: 19 (remaining gas: 1039989.012 units remaining) [ {} (Pair (Some 4) {}) ] - - location: 21 (remaining gas: 1039989.032 units remaining) + - location: 21 (remaining gas: 1039988.997 units remaining) [ (Pair {} (Some 4) {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" index d20d43daa64a..ba5721ffcc0e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039989.846 units remaining) + - location: 13 (remaining gas: 1039989.811 units remaining) [ (Pair "hello" None {}) ] - - location: 13 (remaining gas: 1039989.836 units remaining) + - location: 13 (remaining gas: 1039989.801 units remaining) [ "hello" (Pair None {}) ] - - location: 14 (remaining gas: 1039989.821 units remaining) + - location: 14 (remaining gas: 1039989.786 units remaining) [ (Pair None {}) ] - - location: 16 (remaining gas: 1039989.811 units remaining) + - location: 16 (remaining gas: 1039989.776 units remaining) [ None {} ] - - location: 14 (remaining gas: 1039989.781 units remaining) + - location: 14 (remaining gas: 1039989.746 units remaining) [ "hello" None {} ] - - location: 17 (remaining gas: 1039989.596 units remaining) + - location: 17 (remaining gas: 1039989.561 units remaining) [ None {} ] - - location: 18 (remaining gas: 1039989.581 units remaining) + - location: 18 (remaining gas: 1039989.546 units remaining) [ (Pair None {}) ] - - location: 19 (remaining gas: 1039989.566 units remaining) + - location: 19 (remaining gas: 1039989.531 units remaining) [ {} (Pair None {}) ] - - location: 21 (remaining gas: 1039989.551 units remaining) + - location: 21 (remaining gas: 1039989.516 units remaining) [ (Pair {} None {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" index 21fb40db2d53..0fefdbd87e81 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" @@ -7,35 +7,35 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039986.547 units remaining) + - location: 12 (remaining gas: 1039986.512 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 12 (remaining gas: 1039986.537 units remaining) + - location: 12 (remaining gas: 1039986.502 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 13 (remaining gas: 1039986.527 units remaining) + - location: 13 (remaining gas: 1039986.492 units remaining) [ "1" (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 14 (remaining gas: 1039986.512 units remaining) + - location: 14 (remaining gas: 1039986.477 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 17 (remaining gas: 1039986.502 units remaining) + - location: 17 (remaining gas: 1039986.467 units remaining) [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 18 (remaining gas: 1039986.492 units remaining) + - location: 18 (remaining gas: 1039986.457 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: 19 (remaining gas: 1039986.482 units remaining) + - location: 19 (remaining gas: 1039986.447 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 14 (remaining gas: 1039986.452 units remaining) + - location: 14 (remaining gas: 1039986.417 units remaining) [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 20 (remaining gas: 1039986.267 units remaining) + - location: 20 (remaining gas: 1039986.232 units remaining) [ (Some "one") { Elt "1" "one" ; Elt "2" "two" } ] - - location: 21 (remaining gas: 1039986.252 units remaining) + - location: 21 (remaining gas: 1039986.217 units remaining) [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 22 (remaining gas: 1039986.237 units remaining) + - location: 22 (remaining gas: 1039986.202 units remaining) [ {} (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 24 (remaining gas: 1039986.222 units remaining) + - location: 24 (remaining gas: 1039986.187 units remaining) [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" index 661527f607b2..8f6afc7af6de 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" @@ -7,35 +7,35 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.050 units remaining) + - location: 12 (remaining gas: 1039987.015 units remaining) [ (Pair "" None { Elt "hello" "hi" }) ] - - location: 12 (remaining gas: 1039987.040 units remaining) + - location: 12 (remaining gas: 1039987.005 units remaining) [ (Pair "" None { Elt "hello" "hi" }) (Pair "" None { Elt "hello" "hi" }) ] - - location: 13 (remaining gas: 1039987.030 units remaining) + - location: 13 (remaining gas: 1039986.995 units remaining) [ "" (Pair "" None { Elt "hello" "hi" }) ] - - location: 14 (remaining gas: 1039987.015 units remaining) + - location: 14 (remaining gas: 1039986.980 units remaining) [ (Pair "" None { Elt "hello" "hi" }) ] - - location: 17 (remaining gas: 1039987.005 units remaining) + - location: 17 (remaining gas: 1039986.970 units remaining) [ (Pair None { Elt "hello" "hi" }) ] - - location: 18 (remaining gas: 1039986.995 units remaining) + - location: 18 (remaining gas: 1039986.960 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039986.985 units remaining) + - location: 19 (remaining gas: 1039986.950 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039986.955 units remaining) + - location: 14 (remaining gas: 1039986.920 units remaining) [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039986.805 units remaining) + - location: 20 (remaining gas: 1039986.770 units remaining) [ None { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039986.790 units remaining) + - location: 21 (remaining gas: 1039986.755 units remaining) [ (Pair None { Elt "hello" "hi" }) ] - - location: 22 (remaining gas: 1039986.775 units remaining) + - location: 22 (remaining gas: 1039986.740 units remaining) [ {} (Pair None { Elt "hello" "hi" }) ] - - location: 24 (remaining gas: 1039986.760 units remaining) + - location: 24 (remaining gas: 1039986.725 units remaining) [ (Pair {} None { Elt "hello" "hi" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" index 47b5f1d0a74f..89fb6dccea85 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" @@ -7,35 +7,35 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987 units remaining) + - location: 12 (remaining gas: 1039986.965 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 12 (remaining gas: 1039986.990 units remaining) + - location: 12 (remaining gas: 1039986.955 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 13 (remaining gas: 1039986.980 units remaining) + - location: 13 (remaining gas: 1039986.945 units remaining) [ "hello" (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 14 (remaining gas: 1039986.965 units remaining) + - location: 14 (remaining gas: 1039986.930 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 17 (remaining gas: 1039986.955 units remaining) + - location: 17 (remaining gas: 1039986.920 units remaining) [ (Pair None { Elt "hello" "hi" }) ] - - location: 18 (remaining gas: 1039986.945 units remaining) + - location: 18 (remaining gas: 1039986.910 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039986.935 units remaining) + - location: 19 (remaining gas: 1039986.900 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039986.905 units remaining) + - location: 14 (remaining gas: 1039986.870 units remaining) [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039986.755 units remaining) + - location: 20 (remaining gas: 1039986.720 units remaining) [ (Some "hi") { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039986.740 units remaining) + - location: 21 (remaining gas: 1039986.705 units remaining) [ (Pair (Some "hi") { Elt "hello" "hi" }) ] - - location: 22 (remaining gas: 1039986.725 units remaining) + - location: 22 (remaining gas: 1039986.690 units remaining) [ {} (Pair (Some "hi") { Elt "hello" "hi" }) ] - - location: 24 (remaining gas: 1039986.710 units remaining) + - location: 24 (remaining gas: 1039986.675 units remaining) [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" index 962bc6cd74ac..a3b9ef45c25b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039668.957 units remaining) + - location: 8 (remaining gas: 1039668.922 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] - - location: 8 (remaining gas: 1039668.947 units remaining) + - location: 8 (remaining gas: 1039668.912 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - - location: 9 (remaining gas: 1039668.292 units remaining) + - location: 9 (remaining gas: 1039668.257 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 10 (remaining gas: 1039668.277 units remaining) + - location: 10 (remaining gas: 1039668.242 units remaining) [ (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - - location: 11 (remaining gas: 1039668.262 units remaining) + - location: 11 (remaining gas: 1039668.227 units remaining) [ {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - - location: 13 (remaining gas: 1039668.247 units remaining) + - location: 13 (remaining gas: 1039668.212 units remaining) [ (Pair {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" index 0a5b1b75d2e7..4eff0f9dee97 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039668.957 units remaining) + - location: 8 (remaining gas: 1039668.922 units remaining) [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] - - location: 8 (remaining gas: 1039668.947 units remaining) + - location: 8 (remaining gas: 1039668.912 units remaining) [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ] - - location: 9 (remaining gas: 1039668.292 units remaining) + - location: 9 (remaining gas: 1039668.257 units remaining) [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] - - location: 10 (remaining gas: 1039668.277 units remaining) + - location: 10 (remaining gas: 1039668.242 units remaining) [ (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - - location: 11 (remaining gas: 1039668.262 units remaining) + - location: 11 (remaining gas: 1039668.227 units remaining) [ {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - - location: 13 (remaining gas: 1039668.247 units remaining) + - location: 13 (remaining gas: 1039668.212 units remaining) [ (Pair {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" index d1bae668b06b..57a29f4430c9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.241 units remaining) + - location: 7 (remaining gas: 1039994.206 units remaining) [ (Pair "12345" 0x00) ] - - location: 7 (remaining gas: 1039994.231 units remaining) + - location: 7 (remaining gas: 1039994.196 units remaining) [ "12345" ] - - location: 8 (remaining gas: 1039993.740 units remaining) + - location: 8 (remaining gas: 1039993.705 units remaining) [ 0x0501000000053132333435 ] - - location: 9 (remaining gas: 1039993.298 units remaining) + - location: 9 (remaining gas: 1039993.263 units remaining) [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - - location: 10 (remaining gas: 1039993.283 units remaining) + - location: 10 (remaining gas: 1039993.248 units remaining) [ {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - - location: 12 (remaining gas: 1039993.268 units remaining) + - location: 12 (remaining gas: 1039993.233 units remaining) [ (Pair {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" index 4bdd4b8c90b2..619ef6fc1053 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.221 units remaining) + - location: 7 (remaining gas: 1039994.186 units remaining) [ (Pair "abcdefg" 0x00) ] - - location: 7 (remaining gas: 1039994.211 units remaining) + - location: 7 (remaining gas: 1039994.176 units remaining) [ "abcdefg" ] - - location: 8 (remaining gas: 1039993.654 units remaining) + - location: 8 (remaining gas: 1039993.619 units remaining) [ 0x05010000000761626364656667 ] - - location: 9 (remaining gas: 1039993.210 units remaining) + - location: 9 (remaining gas: 1039993.175 units remaining) [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - - location: 10 (remaining gas: 1039993.195 units remaining) + - location: 10 (remaining gas: 1039993.160 units remaining) [ {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - - location: 12 (remaining gas: 1039993.180 units remaining) + - location: 12 (remaining gas: 1039993.145 units remaining) [ (Pair {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out index 78000447bc99..f30f8164c9f8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.305 units remaining) + - location: 8 (remaining gas: 1039991.270 units remaining) [ (Pair False None) ] - - location: 8 (remaining gas: 1039991.295 units remaining) + - location: 8 (remaining gas: 1039991.260 units remaining) [ False ] - - location: 9 (remaining gas: 1039991.285 units remaining) + - location: 9 (remaining gas: 1039991.250 units remaining) [ ] - - location: 15 (remaining gas: 1039991.275 units remaining) + - location: 15 (remaining gas: 1039991.240 units remaining) [ False ] - - location: 9 (remaining gas: 1039991.260 units remaining) + - location: 9 (remaining gas: 1039991.225 units remaining) [ False ] - - location: 18 (remaining gas: 1039991.245 units remaining) + - location: 18 (remaining gas: 1039991.210 units remaining) [ (Some False) ] - - location: 19 (remaining gas: 1039991.230 units remaining) + - location: 19 (remaining gas: 1039991.195 units remaining) [ {} (Some False) ] - - location: 21 (remaining gas: 1039991.215 units remaining) + - location: 21 (remaining gas: 1039991.180 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out index c5bbb20cc517..3d03cd077371 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.305 units remaining) + - location: 8 (remaining gas: 1039991.270 units remaining) [ (Pair True None) ] - - location: 8 (remaining gas: 1039991.295 units remaining) + - location: 8 (remaining gas: 1039991.260 units remaining) [ True ] - - location: 9 (remaining gas: 1039991.285 units remaining) + - location: 9 (remaining gas: 1039991.250 units remaining) [ ] - - location: 11 (remaining gas: 1039991.275 units remaining) + - location: 11 (remaining gas: 1039991.240 units remaining) [ True ] - - location: 9 (remaining gas: 1039991.260 units remaining) + - location: 9 (remaining gas: 1039991.225 units remaining) [ True ] - - location: 18 (remaining gas: 1039991.245 units remaining) + - location: 18 (remaining gas: 1039991.210 units remaining) [ (Some True) ] - - location: 19 (remaining gas: 1039991.230 units remaining) + - location: 19 (remaining gas: 1039991.195 units remaining) [ {} (Some True) ] - - location: 21 (remaining gas: 1039991.215 units remaining) + - location: 21 (remaining gas: 1039991.180 units remaining) [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" index 4de67a4117e8..483d7328565a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.411 units remaining) + - location: 8 (remaining gas: 1039992.376 units remaining) [ (Pair (Some "hello") "?") ] - - location: 8 (remaining gas: 1039992.401 units remaining) + - location: 8 (remaining gas: 1039992.366 units remaining) [ (Some "hello") ] - - location: 10 (remaining gas: 1039992.391 units remaining) + - location: 10 (remaining gas: 1039992.356 units remaining) [ "hello" ] - - location: 10 (remaining gas: 1039992.376 units remaining) + - location: 10 (remaining gas: 1039992.341 units remaining) [ "hello" ] - - location: 16 (remaining gas: 1039992.361 units remaining) + - location: 16 (remaining gas: 1039992.326 units remaining) [ {} "hello" ] - - location: 18 (remaining gas: 1039992.346 units remaining) + - location: 18 (remaining gas: 1039992.311 units remaining) [ (Pair {} "hello") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" index f0aeb837b13c..f347d03b81c7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.575 units remaining) + - location: 8 (remaining gas: 1039992.540 units remaining) [ (Pair None "?") ] - - location: 8 (remaining gas: 1039992.565 units remaining) + - location: 8 (remaining gas: 1039992.530 units remaining) [ None ] - - location: 10 (remaining gas: 1039992.555 units remaining) + - location: 10 (remaining gas: 1039992.520 units remaining) [ ] - - location: 12 (remaining gas: 1039992.545 units remaining) + - location: 12 (remaining gas: 1039992.510 units remaining) [ "" ] - - location: 10 (remaining gas: 1039992.530 units remaining) + - location: 10 (remaining gas: 1039992.495 units remaining) [ "" ] - - location: 16 (remaining gas: 1039992.515 units remaining) + - location: 16 (remaining gas: 1039992.480 units remaining) [ {} "" ] - - location: 18 (remaining gas: 1039992.500 units remaining) + - location: 18 (remaining gas: 1039992.465 units remaining) [ (Pair {} "") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out index 1059a78650d4..8d78b6c68596 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair 0 None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ 0 ] - - location: 9 (remaining gas: 1039993.932 units remaining) + - location: 9 (remaining gas: 1039993.897 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039993.917 units remaining) + - location: 10 (remaining gas: 1039993.882 units remaining) [ (Some 0) ] - - location: 11 (remaining gas: 1039993.902 units remaining) + - location: 11 (remaining gas: 1039993.867 units remaining) [ {} (Some 0) ] - - location: 13 (remaining gas: 1039993.887 units remaining) + - location: 13 (remaining gas: 1039993.852 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out index 1c24805d4b05..52562caf6018 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair 1 None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039993.932 units remaining) + - location: 9 (remaining gas: 1039993.897 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039993.917 units remaining) + - location: 10 (remaining gas: 1039993.882 units remaining) [ (Some 1) ] - - location: 11 (remaining gas: 1039993.902 units remaining) + - location: 11 (remaining gas: 1039993.867 units remaining) [ {} (Some 1) ] - - location: 13 (remaining gas: 1039993.887 units remaining) + - location: 13 (remaining gas: 1039993.852 units remaining) [ (Pair {} (Some 1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out index 578f60d987c6..27184d1204ac 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair 9999 None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ 9999 ] - - location: 9 (remaining gas: 1039993.932 units remaining) + - location: 9 (remaining gas: 1039993.897 units remaining) [ 9999 ] - - location: 10 (remaining gas: 1039993.917 units remaining) + - location: 10 (remaining gas: 1039993.882 units remaining) [ (Some 9999) ] - - location: 11 (remaining gas: 1039993.902 units remaining) + - location: 11 (remaining gas: 1039993.867 units remaining) [ {} (Some 9999) ] - - location: 13 (remaining gas: 1039993.887 units remaining) + - location: 13 (remaining gas: 1039993.852 units remaining) [ (Pair {} (Some 9999)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out index 25fae40bf954..0fc27b979846 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ 0x48656c6c6f2c20776f726c6421 ] - - location: 9 (remaining gas: 1039992.490 units remaining) + - location: 9 (remaining gas: 1039992.455 units remaining) [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] - - location: 10 (remaining gas: 1039992.475 units remaining) + - location: 10 (remaining gas: 1039992.440 units remaining) [ (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - - location: 11 (remaining gas: 1039992.460 units remaining) + - location: 11 (remaining gas: 1039992.425 units remaining) [ {} (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - - location: 13 (remaining gas: 1039992.445 units remaining) + - location: 13 (remaining gas: 1039992.410 units remaining) [ (Pair {} (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" index 9de674574b4d..256e4de0b4f5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.856 units remaining) + - location: 11 (remaining gas: 1039990.821 units remaining) [ (Pair (Left True) (Left "X")) ] - - location: 11 (remaining gas: 1039990.846 units remaining) + - location: 11 (remaining gas: 1039990.811 units remaining) [ (Left True) ] - - location: 12 (remaining gas: 1039990.836 units remaining) + - location: 12 (remaining gas: 1039990.801 units remaining) [ True ] - - location: 14 (remaining gas: 1039990.821 units remaining) + - location: 14 (remaining gas: 1039990.786 units remaining) [ (Right True) ] - - location: 12 (remaining gas: 1039990.806 units remaining) + - location: 12 (remaining gas: 1039990.771 units remaining) [ (Right True) ] - - location: 19 (remaining gas: 1039990.791 units remaining) + - location: 19 (remaining gas: 1039990.756 units remaining) [ {} (Right True) ] - - location: 21 (remaining gas: 1039990.776 units remaining) + - location: 21 (remaining gas: 1039990.741 units remaining) [ (Pair {} (Right True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" index 4fa41324bd7b..059fbc2dd35c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.832 units remaining) + - location: 11 (remaining gas: 1039990.797 units remaining) [ (Pair (Right "a") (Left "X")) ] - - location: 11 (remaining gas: 1039990.822 units remaining) + - location: 11 (remaining gas: 1039990.787 units remaining) [ (Right "a") ] - - location: 12 (remaining gas: 1039990.812 units remaining) + - location: 12 (remaining gas: 1039990.777 units remaining) [ "a" ] - - location: 17 (remaining gas: 1039990.797 units remaining) + - location: 17 (remaining gas: 1039990.762 units remaining) [ (Left "a") ] - - location: 12 (remaining gas: 1039990.782 units remaining) + - location: 12 (remaining gas: 1039990.747 units remaining) [ (Left "a") ] - - location: 19 (remaining gas: 1039990.767 units remaining) + - location: 19 (remaining gas: 1039990.732 units remaining) [ {} (Left "a") ] - - location: 21 (remaining gas: 1039990.752 units remaining) + - location: 21 (remaining gas: 1039990.717 units remaining) [ (Pair {} (Left "a")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out index d9be7a6b468c..95e375d860c4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 111) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.923 units remaining) + - location: 8 (remaining gas: 1039994.888 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039994.908 units remaining) + - location: 9 (remaining gas: 1039994.873 units remaining) [ {} 1 ] - - location: 11 (remaining gas: 1039994.893 units remaining) + - location: 11 (remaining gas: 1039994.858 units remaining) [ (Pair {} 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" index b06bba5cdf30..a0d9b86974ae 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.898 units remaining) + - location: 8 (remaining gas: 1039992.863 units remaining) [ (Pair { "d" ; "e" ; "f" } "abc") ] - - location: 8 (remaining gas: 1039992.888 units remaining) + - location: 8 (remaining gas: 1039992.853 units remaining) [ { "d" ; "e" ; "f" } "abc" ] - - location: 9 (remaining gas: 1039992.878 units remaining) + - location: 9 (remaining gas: 1039992.843 units remaining) [ "abc" { "d" ; "e" ; "f" } ] - - location: 10 (remaining gas: 1039992.863 units remaining) + - location: 10 (remaining gas: 1039992.828 units remaining) [ { "abc" ; "d" ; "e" ; "f" } ] - - location: 11 (remaining gas: 1039992.723 units remaining) + - location: 11 (remaining gas: 1039992.688 units remaining) [ "abcdef" ] - - location: 12 (remaining gas: 1039992.708 units remaining) + - location: 12 (remaining gas: 1039992.673 units remaining) [ {} "abcdef" ] - - location: 14 (remaining gas: 1039992.693 units remaining) + - location: 14 (remaining gas: 1039992.658 units remaining) [ (Pair {} "abcdef") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" index 150760d68327..9f4523410f6d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.270 units remaining) + - location: 8 (remaining gas: 1039993.235 units remaining) [ (Pair {} "abc") ] - - location: 8 (remaining gas: 1039993.260 units remaining) + - location: 8 (remaining gas: 1039993.225 units remaining) [ {} "abc" ] - - location: 9 (remaining gas: 1039993.250 units remaining) + - location: 9 (remaining gas: 1039993.215 units remaining) [ "abc" {} ] - - location: 10 (remaining gas: 1039993.235 units remaining) + - location: 10 (remaining gas: 1039993.200 units remaining) [ { "abc" } ] - - location: 11 (remaining gas: 1039993.125 units remaining) + - location: 11 (remaining gas: 1039993.090 units remaining) [ "abc" ] - - location: 12 (remaining gas: 1039993.110 units remaining) + - location: 12 (remaining gas: 1039993.075 units remaining) [ {} "abc" ] - - location: 14 (remaining gas: 1039993.095 units remaining) + - location: 14 (remaining gas: 1039993.060 units remaining) [ (Pair {} "abc") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out index 338ab9e96d29..80c6378ce0d3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.014 units remaining) + - location: 8 (remaining gas: 1039992.979 units remaining) [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] - - location: 8 (remaining gas: 1039993.004 units remaining) + - location: 8 (remaining gas: 1039992.969 units remaining) [ { 0x00 ; 0x11 ; 0x00 } 0x ] - - location: 9 (remaining gas: 1039992.994 units remaining) + - location: 9 (remaining gas: 1039992.959 units remaining) [ 0x { 0x00 ; 0x11 ; 0x00 } ] - - location: 10 (remaining gas: 1039992.979 units remaining) + - location: 10 (remaining gas: 1039992.944 units remaining) [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] - - location: 11 (remaining gas: 1039992.839 units remaining) + - location: 11 (remaining gas: 1039992.804 units remaining) [ 0x001100 ] - - location: 12 (remaining gas: 1039992.824 units remaining) + - location: 12 (remaining gas: 1039992.789 units remaining) [ {} 0x001100 ] - - location: 14 (remaining gas: 1039992.809 units remaining) + - location: 14 (remaining gas: 1039992.774 units remaining) [ (Pair {} 0x001100) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out index 127d27fa0eab..64bba0d20c6f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.314 units remaining) + - location: 8 (remaining gas: 1039993.279 units remaining) [ (Pair {} 0x) ] - - location: 8 (remaining gas: 1039993.304 units remaining) + - location: 8 (remaining gas: 1039993.269 units remaining) [ {} 0x ] - - location: 9 (remaining gas: 1039993.294 units remaining) + - location: 9 (remaining gas: 1039993.259 units remaining) [ 0x {} ] - - location: 10 (remaining gas: 1039993.279 units remaining) + - location: 10 (remaining gas: 1039993.244 units remaining) [ { 0x } ] - - location: 11 (remaining gas: 1039993.169 units remaining) + - location: 11 (remaining gas: 1039993.134 units remaining) [ 0x ] - - location: 12 (remaining gas: 1039993.154 units remaining) + - location: 12 (remaining gas: 1039993.119 units remaining) [ {} 0x ] - - location: 14 (remaining gas: 1039993.139 units remaining) + - location: 14 (remaining gas: 1039993.104 units remaining) [ (Pair {} 0x) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out index bd7f5da25b05..64db1164ae61 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.014 units remaining) + - location: 8 (remaining gas: 1039992.979 units remaining) [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] - - location: 8 (remaining gas: 1039993.004 units remaining) + - location: 8 (remaining gas: 1039992.969 units remaining) [ { 0xcd ; 0xef ; 0x00 } 0x00ab ] - - location: 9 (remaining gas: 1039992.994 units remaining) + - location: 9 (remaining gas: 1039992.959 units remaining) [ 0x00ab { 0xcd ; 0xef ; 0x00 } ] - - location: 10 (remaining gas: 1039992.979 units remaining) + - location: 10 (remaining gas: 1039992.944 units remaining) [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] - - location: 11 (remaining gas: 1039992.839 units remaining) + - location: 11 (remaining gas: 1039992.804 units remaining) [ 0x00abcdef00 ] - - location: 12 (remaining gas: 1039992.824 units remaining) + - location: 12 (remaining gas: 1039992.789 units remaining) [ {} 0x00abcdef00 ] - - location: 14 (remaining gas: 1039992.809 units remaining) + - location: 14 (remaining gas: 1039992.774 units remaining) [ (Pair {} 0x00abcdef00) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out index 3020010ddbf2..557292bfe57a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.314 units remaining) + - location: 8 (remaining gas: 1039993.279 units remaining) [ (Pair {} 0xabcd) ] - - location: 8 (remaining gas: 1039993.304 units remaining) + - location: 8 (remaining gas: 1039993.269 units remaining) [ {} 0xabcd ] - - location: 9 (remaining gas: 1039993.294 units remaining) + - location: 9 (remaining gas: 1039993.259 units remaining) [ 0xabcd {} ] - - location: 10 (remaining gas: 1039993.279 units remaining) + - location: 10 (remaining gas: 1039993.244 units remaining) [ { 0xabcd } ] - - location: 11 (remaining gas: 1039993.169 units remaining) + - location: 11 (remaining gas: 1039993.134 units remaining) [ 0xabcd ] - - location: 12 (remaining gas: 1039993.154 units remaining) + - location: 12 (remaining gas: 1039993.119 units remaining) [ {} 0xabcd ] - - location: 14 (remaining gas: 1039993.139 units remaining) + - location: 14 (remaining gas: 1039993.104 units remaining) [ (Pair {} 0xabcd) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index 0bedb95ed4a1..9b2b3897a9ae 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.539 units remaining) + - location: 9 (remaining gas: 1039994.504 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - - location: 9 (remaining gas: 1039994.529 units remaining) + - location: 9 (remaining gas: 1039994.494 units remaining) [ { "1" ; "2" ; "3" } ] - - location: 10 (remaining gas: 1039994.514 units remaining) + - location: 10 (remaining gas: 1039994.479 units remaining) [ {} { "1" ; "2" ; "3" } ] - - location: 12 (remaining gas: 1039994.499 units remaining) + - location: 12 (remaining gas: 1039994.464 units remaining) [ (Pair {} { "1" ; "2" ; "3" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index c3c30cc3783c..321c62f44f73 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.539 units remaining) + - location: 9 (remaining gas: 1039994.504 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - - location: 9 (remaining gas: 1039994.529 units remaining) + - location: 9 (remaining gas: 1039994.494 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 10 (remaining gas: 1039994.514 units remaining) + - location: 10 (remaining gas: 1039994.479 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 12 (remaining gas: 1039994.499 units remaining) + - location: 12 (remaining gas: 1039994.464 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" index 6deb204e20a4..cbc61ea2041f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.911 units remaining) + - location: 9 (remaining gas: 1039994.876 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039994.901 units remaining) + - location: 9 (remaining gas: 1039994.866 units remaining) [ {} ] - - location: 10 (remaining gas: 1039994.886 units remaining) + - location: 10 (remaining gas: 1039994.851 units remaining) [ {} {} ] - - location: 12 (remaining gas: 1039994.871 units remaining) + - location: 12 (remaining gas: 1039994.836 units remaining) [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index 85f6274d0a6d..4946ab418957 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.518 units remaining) + - location: 9 (remaining gas: 1039993.483 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - - location: 9 (remaining gas: 1039993.508 units remaining) + - location: 9 (remaining gas: 1039993.473 units remaining) [ { "1" ; "2" ; "3" } ] - - location: 10 (remaining gas: 1039993.508 units remaining) + - location: 10 (remaining gas: 1039993.473 units remaining) [ "1" ] - - location: 10 (remaining gas: 1039993.493 units remaining) + - location: 10 (remaining gas: 1039993.458 units remaining) [ "2" ] - - location: 10 (remaining gas: 1039993.478 units remaining) + - location: 10 (remaining gas: 1039993.443 units remaining) [ "3" ] - - location: 10 (remaining gas: 1039993.463 units remaining) + - location: 10 (remaining gas: 1039993.428 units remaining) [ { "1" ; "2" ; "3" } ] - - location: 12 (remaining gas: 1039993.448 units remaining) + - location: 12 (remaining gas: 1039993.413 units remaining) [ {} { "1" ; "2" ; "3" } ] - - location: 14 (remaining gas: 1039993.433 units remaining) + - location: 14 (remaining gas: 1039993.398 units remaining) [ (Pair {} { "1" ; "2" ; "3" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 6f971cdfea11..e9a2e43bf8b3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.518 units remaining) + - location: 9 (remaining gas: 1039993.483 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - - location: 9 (remaining gas: 1039993.508 units remaining) + - location: 9 (remaining gas: 1039993.473 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 10 (remaining gas: 1039993.508 units remaining) + - location: 10 (remaining gas: 1039993.473 units remaining) [ "a" ] - - location: 10 (remaining gas: 1039993.493 units remaining) + - location: 10 (remaining gas: 1039993.458 units remaining) [ "b" ] - - location: 10 (remaining gas: 1039993.478 units remaining) + - location: 10 (remaining gas: 1039993.443 units remaining) [ "c" ] - - location: 10 (remaining gas: 1039993.463 units remaining) + - location: 10 (remaining gas: 1039993.428 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 12 (remaining gas: 1039993.448 units remaining) + - location: 12 (remaining gas: 1039993.413 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 14 (remaining gas: 1039993.433 units remaining) + - location: 14 (remaining gas: 1039993.398 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" index afdb1ab4330e..7f9e4cfbf18d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.890 units remaining) + - location: 9 (remaining gas: 1039993.855 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039993.880 units remaining) + - location: 9 (remaining gas: 1039993.845 units remaining) [ {} ] - - location: 10 (remaining gas: 1039993.880 units remaining) + - location: 10 (remaining gas: 1039993.845 units remaining) [ {} ] - - location: 12 (remaining gas: 1039993.865 units remaining) + - location: 12 (remaining gas: 1039993.830 units remaining) [ {} {} ] - - location: 14 (remaining gas: 1039993.850 units remaining) + - location: 14 (remaining gas: 1039993.815 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out index 9887e15868ce..bafcc409dcee 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.873 units remaining) + - location: 8 (remaining gas: 1039991.838 units remaining) [ (Pair { 10 ; 2 ; 1 } 0) ] - - location: 8 (remaining gas: 1039991.863 units remaining) + - location: 8 (remaining gas: 1039991.828 units remaining) [ { 10 ; 2 ; 1 } ] - - location: 9 (remaining gas: 1039991.853 units remaining) + - location: 9 (remaining gas: 1039991.818 units remaining) [ 1 { 10 ; 2 ; 1 } ] - - location: 12 (remaining gas: 1039991.843 units remaining) + - location: 12 (remaining gas: 1039991.808 units remaining) [ { 10 ; 2 ; 1 } 1 ] - - location: 13 (remaining gas: 1039991.843 units remaining) + - location: 13 (remaining gas: 1039991.808 units remaining) [ 10 1 ] - - location: 15 (remaining gas: 1039991.739 units remaining) + - location: 15 (remaining gas: 1039991.704 units remaining) [ 10 ] - - location: 13 (remaining gas: 1039991.724 units remaining) + - location: 13 (remaining gas: 1039991.689 units remaining) [ 2 10 ] - - location: 15 (remaining gas: 1039991.620 units remaining) + - location: 15 (remaining gas: 1039991.585 units remaining) [ 20 ] - - location: 13 (remaining gas: 1039991.605 units remaining) + - location: 13 (remaining gas: 1039991.570 units remaining) [ 1 20 ] - - location: 15 (remaining gas: 1039991.501 units remaining) + - location: 15 (remaining gas: 1039991.466 units remaining) [ 20 ] - - location: 13 (remaining gas: 1039991.486 units remaining) + - location: 13 (remaining gas: 1039991.451 units remaining) [ 20 ] - - location: 16 (remaining gas: 1039991.471 units remaining) + - location: 16 (remaining gas: 1039991.436 units remaining) [ {} 20 ] - - location: 18 (remaining gas: 1039991.456 units remaining) + - location: 18 (remaining gas: 1039991.421 units remaining) [ (Pair {} 20) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out index eda57844eb97..0f0d4eab8199 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.873 units remaining) + - location: 8 (remaining gas: 1039991.838 units remaining) [ (Pair { 3 ; 6 ; 9 } 0) ] - - location: 8 (remaining gas: 1039991.863 units remaining) + - location: 8 (remaining gas: 1039991.828 units remaining) [ { 3 ; 6 ; 9 } ] - - location: 9 (remaining gas: 1039991.853 units remaining) + - location: 9 (remaining gas: 1039991.818 units remaining) [ 1 { 3 ; 6 ; 9 } ] - - location: 12 (remaining gas: 1039991.843 units remaining) + - location: 12 (remaining gas: 1039991.808 units remaining) [ { 3 ; 6 ; 9 } 1 ] - - location: 13 (remaining gas: 1039991.843 units remaining) + - location: 13 (remaining gas: 1039991.808 units remaining) [ 3 1 ] - - location: 15 (remaining gas: 1039991.739 units remaining) + - location: 15 (remaining gas: 1039991.704 units remaining) [ 3 ] - - location: 13 (remaining gas: 1039991.724 units remaining) + - location: 13 (remaining gas: 1039991.689 units remaining) [ 6 3 ] - - location: 15 (remaining gas: 1039991.620 units remaining) + - location: 15 (remaining gas: 1039991.585 units remaining) [ 18 ] - - location: 13 (remaining gas: 1039991.605 units remaining) + - location: 13 (remaining gas: 1039991.570 units remaining) [ 9 18 ] - - location: 15 (remaining gas: 1039991.501 units remaining) + - location: 15 (remaining gas: 1039991.466 units remaining) [ 162 ] - - location: 13 (remaining gas: 1039991.486 units remaining) + - location: 13 (remaining gas: 1039991.451 units remaining) [ 162 ] - - location: 16 (remaining gas: 1039991.471 units remaining) + - location: 16 (remaining gas: 1039991.436 units remaining) [ {} 162 ] - - location: 18 (remaining gas: 1039991.456 units remaining) + - location: 18 (remaining gas: 1039991.421 units remaining) [ (Pair {} 162) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out index a21be156f630..0cd55a887042 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out @@ -7,130 +7,130 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039985.969 units remaining) + - location: 9 (remaining gas: 1039985.934 units remaining) [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] - - location: 9 (remaining gas: 1039985.959 units remaining) + - location: 9 (remaining gas: 1039985.924 units remaining) [ { 1 ; 1 ; 1 ; 1 } ] - - location: 10 (remaining gas: 1039985.949 units remaining) + - location: 10 (remaining gas: 1039985.914 units remaining) [ 0 { 1 ; 1 ; 1 ; 1 } ] - - location: 13 (remaining gas: 1039985.939 units remaining) + - location: 13 (remaining gas: 1039985.904 units remaining) [ { 1 ; 1 ; 1 ; 1 } 0 ] - - location: 14 (remaining gas: 1039985.939 units remaining) + - location: 14 (remaining gas: 1039985.904 units remaining) [ 1 0 ] - - location: 16 (remaining gas: 1039985.924 units remaining) + - location: 16 (remaining gas: 1039985.889 units remaining) [ 0 ] - - location: 18 (remaining gas: 1039985.914 units remaining) + - location: 18 (remaining gas: 1039985.879 units remaining) [ 0 0 ] - - location: 16 (remaining gas: 1039985.884 units remaining) + - location: 16 (remaining gas: 1039985.849 units remaining) [ 1 0 0 ] - - location: 19 (remaining gas: 1039985.829 units remaining) + - location: 19 (remaining gas: 1039985.794 units remaining) [ 1 0 ] - - location: 20 (remaining gas: 1039985.814 units remaining) + - location: 20 (remaining gas: 1039985.779 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039985.804 units remaining) + - location: 22 (remaining gas: 1039985.769 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039985.749 units remaining) + - location: 25 (remaining gas: 1039985.714 units remaining) [ 1 ] - - location: 20 (remaining gas: 1039985.719 units remaining) + - location: 20 (remaining gas: 1039985.684 units remaining) [ 1 1 ] - - location: 14 (remaining gas: 1039985.704 units remaining) + - location: 14 (remaining gas: 1039985.669 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039985.689 units remaining) + - location: 16 (remaining gas: 1039985.654 units remaining) [ 1 ] - - location: 18 (remaining gas: 1039985.679 units remaining) + - location: 18 (remaining gas: 1039985.644 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039985.649 units remaining) + - location: 16 (remaining gas: 1039985.614 units remaining) [ 1 1 1 ] - - location: 19 (remaining gas: 1039985.594 units remaining) + - location: 19 (remaining gas: 1039985.559 units remaining) [ 2 1 ] - - location: 20 (remaining gas: 1039985.579 units remaining) + - location: 20 (remaining gas: 1039985.544 units remaining) [ 1 ] - - location: 22 (remaining gas: 1039985.569 units remaining) + - location: 22 (remaining gas: 1039985.534 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039985.514 units remaining) + - location: 25 (remaining gas: 1039985.479 units remaining) [ 2 ] - - location: 20 (remaining gas: 1039985.484 units remaining) + - location: 20 (remaining gas: 1039985.449 units remaining) [ 2 2 ] - - location: 14 (remaining gas: 1039985.469 units remaining) + - location: 14 (remaining gas: 1039985.434 units remaining) [ 1 2 ] - - location: 16 (remaining gas: 1039985.454 units remaining) + - location: 16 (remaining gas: 1039985.419 units remaining) [ 2 ] - - location: 18 (remaining gas: 1039985.444 units remaining) + - location: 18 (remaining gas: 1039985.409 units remaining) [ 2 2 ] - - location: 16 (remaining gas: 1039985.414 units remaining) + - location: 16 (remaining gas: 1039985.379 units remaining) [ 1 2 2 ] - - location: 19 (remaining gas: 1039985.359 units remaining) + - location: 19 (remaining gas: 1039985.324 units remaining) [ 3 2 ] - - location: 20 (remaining gas: 1039985.344 units remaining) + - location: 20 (remaining gas: 1039985.309 units remaining) [ 2 ] - - location: 22 (remaining gas: 1039985.334 units remaining) + - location: 22 (remaining gas: 1039985.299 units remaining) [ 1 2 ] - - location: 25 (remaining gas: 1039985.279 units remaining) + - location: 25 (remaining gas: 1039985.244 units remaining) [ 3 ] - - location: 20 (remaining gas: 1039985.249 units remaining) + - location: 20 (remaining gas: 1039985.214 units remaining) [ 3 3 ] - - location: 14 (remaining gas: 1039985.234 units remaining) + - location: 14 (remaining gas: 1039985.199 units remaining) [ 1 3 ] - - location: 16 (remaining gas: 1039985.219 units remaining) + - location: 16 (remaining gas: 1039985.184 units remaining) [ 3 ] - - location: 18 (remaining gas: 1039985.209 units remaining) + - location: 18 (remaining gas: 1039985.174 units remaining) [ 3 3 ] - - location: 16 (remaining gas: 1039985.179 units remaining) + - location: 16 (remaining gas: 1039985.144 units remaining) [ 1 3 3 ] - - location: 19 (remaining gas: 1039985.124 units remaining) + - location: 19 (remaining gas: 1039985.089 units remaining) [ 4 3 ] - - location: 20 (remaining gas: 1039985.109 units remaining) + - location: 20 (remaining gas: 1039985.074 units remaining) [ 3 ] - - location: 22 (remaining gas: 1039985.099 units remaining) + - location: 22 (remaining gas: 1039985.064 units remaining) [ 1 3 ] - - location: 25 (remaining gas: 1039985.044 units remaining) + - location: 25 (remaining gas: 1039985.009 units remaining) [ 4 ] - - location: 20 (remaining gas: 1039985.014 units remaining) + - location: 20 (remaining gas: 1039984.979 units remaining) [ 4 4 ] - - location: 14 (remaining gas: 1039984.999 units remaining) + - location: 14 (remaining gas: 1039984.964 units remaining) [ { 1 ; 2 ; 3 ; 4 } 4 ] - - location: 26 (remaining gas: 1039984.984 units remaining) + - location: 26 (remaining gas: 1039984.949 units remaining) [ {} { 1 ; 2 ; 3 ; 4 } 4 ] - - location: 28 (remaining gas: 1039984.969 units remaining) + - location: 28 (remaining gas: 1039984.934 units remaining) [ (Pair {} { 1 ; 2 ; 3 ; 4 }) 4 ] - - location: 29 (remaining gas: 1039984.954 units remaining) + - location: 29 (remaining gas: 1039984.919 units remaining) [ 4 ] - - location: 31 (remaining gas: 1039984.944 units remaining) + - location: 31 (remaining gas: 1039984.909 units remaining) [ ] - - location: 29 (remaining gas: 1039984.914 units remaining) + - location: 29 (remaining gas: 1039984.879 units remaining) [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out index 37cadd2fbd3d..8387ebdf4da7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out @@ -7,130 +7,130 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039985.969 units remaining) + - location: 9 (remaining gas: 1039985.934 units remaining) [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] - - location: 9 (remaining gas: 1039985.959 units remaining) + - location: 9 (remaining gas: 1039985.924 units remaining) [ { 1 ; 2 ; 3 ; 0 } ] - - location: 10 (remaining gas: 1039985.949 units remaining) + - location: 10 (remaining gas: 1039985.914 units remaining) [ 0 { 1 ; 2 ; 3 ; 0 } ] - - location: 13 (remaining gas: 1039985.939 units remaining) + - location: 13 (remaining gas: 1039985.904 units remaining) [ { 1 ; 2 ; 3 ; 0 } 0 ] - - location: 14 (remaining gas: 1039985.939 units remaining) + - location: 14 (remaining gas: 1039985.904 units remaining) [ 1 0 ] - - location: 16 (remaining gas: 1039985.924 units remaining) + - location: 16 (remaining gas: 1039985.889 units remaining) [ 0 ] - - location: 18 (remaining gas: 1039985.914 units remaining) + - location: 18 (remaining gas: 1039985.879 units remaining) [ 0 0 ] - - location: 16 (remaining gas: 1039985.884 units remaining) + - location: 16 (remaining gas: 1039985.849 units remaining) [ 1 0 0 ] - - location: 19 (remaining gas: 1039985.829 units remaining) + - location: 19 (remaining gas: 1039985.794 units remaining) [ 1 0 ] - - location: 20 (remaining gas: 1039985.814 units remaining) + - location: 20 (remaining gas: 1039985.779 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039985.804 units remaining) + - location: 22 (remaining gas: 1039985.769 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039985.749 units remaining) + - location: 25 (remaining gas: 1039985.714 units remaining) [ 1 ] - - location: 20 (remaining gas: 1039985.719 units remaining) + - location: 20 (remaining gas: 1039985.684 units remaining) [ 1 1 ] - - location: 14 (remaining gas: 1039985.704 units remaining) + - location: 14 (remaining gas: 1039985.669 units remaining) [ 2 1 ] - - location: 16 (remaining gas: 1039985.689 units remaining) + - location: 16 (remaining gas: 1039985.654 units remaining) [ 1 ] - - location: 18 (remaining gas: 1039985.679 units remaining) + - location: 18 (remaining gas: 1039985.644 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039985.649 units remaining) + - location: 16 (remaining gas: 1039985.614 units remaining) [ 2 1 1 ] - - location: 19 (remaining gas: 1039985.594 units remaining) + - location: 19 (remaining gas: 1039985.559 units remaining) [ 3 1 ] - - location: 20 (remaining gas: 1039985.579 units remaining) + - location: 20 (remaining gas: 1039985.544 units remaining) [ 1 ] - - location: 22 (remaining gas: 1039985.569 units remaining) + - location: 22 (remaining gas: 1039985.534 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039985.514 units remaining) + - location: 25 (remaining gas: 1039985.479 units remaining) [ 2 ] - - location: 20 (remaining gas: 1039985.484 units remaining) + - location: 20 (remaining gas: 1039985.449 units remaining) [ 3 2 ] - - location: 14 (remaining gas: 1039985.469 units remaining) + - location: 14 (remaining gas: 1039985.434 units remaining) [ 3 2 ] - - location: 16 (remaining gas: 1039985.454 units remaining) + - location: 16 (remaining gas: 1039985.419 units remaining) [ 2 ] - - location: 18 (remaining gas: 1039985.444 units remaining) + - location: 18 (remaining gas: 1039985.409 units remaining) [ 2 2 ] - - location: 16 (remaining gas: 1039985.414 units remaining) + - location: 16 (remaining gas: 1039985.379 units remaining) [ 3 2 2 ] - - location: 19 (remaining gas: 1039985.359 units remaining) + - location: 19 (remaining gas: 1039985.324 units remaining) [ 5 2 ] - - location: 20 (remaining gas: 1039985.344 units remaining) + - location: 20 (remaining gas: 1039985.309 units remaining) [ 2 ] - - location: 22 (remaining gas: 1039985.334 units remaining) + - location: 22 (remaining gas: 1039985.299 units remaining) [ 1 2 ] - - location: 25 (remaining gas: 1039985.279 units remaining) + - location: 25 (remaining gas: 1039985.244 units remaining) [ 3 ] - - location: 20 (remaining gas: 1039985.249 units remaining) + - location: 20 (remaining gas: 1039985.214 units remaining) [ 5 3 ] - - location: 14 (remaining gas: 1039985.234 units remaining) + - location: 14 (remaining gas: 1039985.199 units remaining) [ 0 3 ] - - location: 16 (remaining gas: 1039985.219 units remaining) + - location: 16 (remaining gas: 1039985.184 units remaining) [ 3 ] - - location: 18 (remaining gas: 1039985.209 units remaining) + - location: 18 (remaining gas: 1039985.174 units remaining) [ 3 3 ] - - location: 16 (remaining gas: 1039985.179 units remaining) + - location: 16 (remaining gas: 1039985.144 units remaining) [ 0 3 3 ] - - location: 19 (remaining gas: 1039985.124 units remaining) + - location: 19 (remaining gas: 1039985.089 units remaining) [ 3 3 ] - - location: 20 (remaining gas: 1039985.109 units remaining) + - location: 20 (remaining gas: 1039985.074 units remaining) [ 3 ] - - location: 22 (remaining gas: 1039985.099 units remaining) + - location: 22 (remaining gas: 1039985.064 units remaining) [ 1 3 ] - - location: 25 (remaining gas: 1039985.044 units remaining) + - location: 25 (remaining gas: 1039985.009 units remaining) [ 4 ] - - location: 20 (remaining gas: 1039985.014 units remaining) + - location: 20 (remaining gas: 1039984.979 units remaining) [ 3 4 ] - - location: 14 (remaining gas: 1039984.999 units remaining) + - location: 14 (remaining gas: 1039984.964 units remaining) [ { 1 ; 3 ; 5 ; 3 } 4 ] - - location: 26 (remaining gas: 1039984.984 units remaining) + - location: 26 (remaining gas: 1039984.949 units remaining) [ {} { 1 ; 3 ; 5 ; 3 } 4 ] - - location: 28 (remaining gas: 1039984.969 units remaining) + - location: 28 (remaining gas: 1039984.934 units remaining) [ (Pair {} { 1 ; 3 ; 5 ; 3 }) 4 ] - - location: 29 (remaining gas: 1039984.954 units remaining) + - location: 29 (remaining gas: 1039984.919 units remaining) [ 4 ] - - location: 31 (remaining gas: 1039984.944 units remaining) + - location: 31 (remaining gas: 1039984.909 units remaining) [ ] - - location: 29 (remaining gas: 1039984.914 units remaining) + - location: 29 (remaining gas: 1039984.879 units remaining) [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out index cab0bbf5e03d..18535839aa04 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out @@ -7,30 +7,30 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039986.369 units remaining) + - location: 9 (remaining gas: 1039986.334 units remaining) [ (Pair {} { 0 }) ] - - location: 9 (remaining gas: 1039986.359 units remaining) + - location: 9 (remaining gas: 1039986.324 units remaining) [ {} ] - - location: 10 (remaining gas: 1039986.349 units remaining) + - location: 10 (remaining gas: 1039986.314 units remaining) [ 0 {} ] - - location: 13 (remaining gas: 1039986.339 units remaining) + - location: 13 (remaining gas: 1039986.304 units remaining) [ {} 0 ] - - location: 14 (remaining gas: 1039986.339 units remaining) + - location: 14 (remaining gas: 1039986.304 units remaining) [ {} 0 ] - - location: 26 (remaining gas: 1039986.324 units remaining) + - location: 26 (remaining gas: 1039986.289 units remaining) [ {} {} 0 ] - - location: 28 (remaining gas: 1039986.309 units remaining) + - location: 28 (remaining gas: 1039986.274 units remaining) [ (Pair {} {}) 0 ] - - location: 29 (remaining gas: 1039986.294 units remaining) + - location: 29 (remaining gas: 1039986.259 units remaining) [ 0 ] - - location: 31 (remaining gas: 1039986.284 units remaining) + - location: 31 (remaining gas: 1039986.249 units remaining) [ ] - - location: 29 (remaining gas: 1039986.254 units remaining) + - location: 29 (remaining gas: 1039986.219 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index b09709703df3..fcd637c1b31d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.220 units remaining) + - location: 8 (remaining gas: 1039994.185 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - - location: 8 (remaining gas: 1039994.210 units remaining) + - location: 8 (remaining gas: 1039994.175 units remaining) [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - - location: 9 (remaining gas: 1039994.195 units remaining) + - location: 9 (remaining gas: 1039994.160 units remaining) [ 6 ] - - location: 10 (remaining gas: 1039994.180 units remaining) + - location: 10 (remaining gas: 1039994.145 units remaining) [ {} 6 ] - - location: 12 (remaining gas: 1039994.165 units remaining) + - location: 12 (remaining gas: 1039994.130 units remaining) [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out index e0d9021dfb8c..381694882c37 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.520 units remaining) + - location: 8 (remaining gas: 1039994.485 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039994.510 units remaining) + - location: 8 (remaining gas: 1039994.475 units remaining) [ { 1 ; 2 ; 3 } ] - - location: 9 (remaining gas: 1039994.495 units remaining) + - location: 9 (remaining gas: 1039994.460 units remaining) [ 3 ] - - location: 10 (remaining gas: 1039994.480 units remaining) + - location: 10 (remaining gas: 1039994.445 units remaining) [ {} 3 ] - - location: 12 (remaining gas: 1039994.465 units remaining) + - location: 12 (remaining gas: 1039994.430 units remaining) [ (Pair {} 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out index 10654a706a3d..4cd5d366db7d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.720 units remaining) + - location: 8 (remaining gas: 1039994.685 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039994.710 units remaining) + - location: 8 (remaining gas: 1039994.675 units remaining) [ { 1 } ] - - location: 9 (remaining gas: 1039994.695 units remaining) + - location: 9 (remaining gas: 1039994.660 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039994.680 units remaining) + - location: 10 (remaining gas: 1039994.645 units remaining) [ {} 1 ] - - location: 12 (remaining gas: 1039994.665 units remaining) + - location: 12 (remaining gas: 1039994.630 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out index 68e11d5ca14b..057263b03eaa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.820 units remaining) + - location: 8 (remaining gas: 1039994.785 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039994.810 units remaining) + - location: 8 (remaining gas: 1039994.775 units remaining) [ {} ] - - location: 9 (remaining gas: 1039994.795 units remaining) + - location: 9 (remaining gas: 1039994.760 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039994.780 units remaining) + - location: 10 (remaining gas: 1039994.745 units remaining) [ {} 0 ] - - location: 12 (remaining gas: 1039994.765 units remaining) + - location: 12 (remaining gas: 1039994.730 units remaining) [ (Pair {} 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index eb75db54d14f..e1a96c951e9f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,157 +7,157 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039977.710 units remaining) + - location: 9 (remaining gas: 1039977.675 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039977.700 units remaining) + - location: 9 (remaining gas: 1039977.665 units remaining) [ { "c" ; "b" ; "a" } ] - - location: 10 (remaining gas: 1039977.685 units remaining) + - location: 10 (remaining gas: 1039977.650 units remaining) [ {} { "c" ; "b" ; "a" } ] - - location: 12 (remaining gas: 1039977.675 units remaining) + - location: 12 (remaining gas: 1039977.640 units remaining) [ { "c" ; "b" ; "a" } {} ] - - location: 13 (remaining gas: 1039977.660 units remaining) + - location: 13 (remaining gas: 1039977.625 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] - - location: 14 (remaining gas: 1039977.645 units remaining) + - location: 14 (remaining gas: 1039977.610 units remaining) [ (Left (Pair { "c" ; "b" ; "a" } {})) ] - - location: 17 (remaining gas: 1039977.645 units remaining) + - location: 17 (remaining gas: 1039977.610 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] - - location: 19 (remaining gas: 1039977.635 units remaining) + - location: 19 (remaining gas: 1039977.600 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) (Pair { "c" ; "b" ; "a" } {}) ] - - location: 20 (remaining gas: 1039977.625 units remaining) + - location: 20 (remaining gas: 1039977.590 units remaining) [ { "c" ; "b" ; "a" } (Pair { "c" ; "b" ; "a" } {}) ] - - location: 21 (remaining gas: 1039977.610 units remaining) + - location: 21 (remaining gas: 1039977.575 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] - - location: 23 (remaining gas: 1039977.600 units remaining) + - location: 23 (remaining gas: 1039977.565 units remaining) [ {} ] - - location: 21 (remaining gas: 1039977.570 units remaining) + - location: 21 (remaining gas: 1039977.535 units remaining) [ { "c" ; "b" ; "a" } {} ] - - location: 24 (remaining gas: 1039977.560 units remaining) + - location: 24 (remaining gas: 1039977.525 units remaining) [ "c" { "b" ; "a" } {} ] - - location: 26 (remaining gas: 1039977.550 units remaining) + - location: 26 (remaining gas: 1039977.515 units remaining) [ { "b" ; "a" } "c" {} ] - - location: 27 (remaining gas: 1039977.535 units remaining) + - location: 27 (remaining gas: 1039977.500 units remaining) [ "c" {} ] - - location: 29 (remaining gas: 1039977.520 units remaining) + - location: 29 (remaining gas: 1039977.485 units remaining) [ { "c" } ] - - location: 27 (remaining gas: 1039977.490 units remaining) + - location: 27 (remaining gas: 1039977.455 units remaining) [ { "b" ; "a" } { "c" } ] - - location: 30 (remaining gas: 1039977.475 units remaining) + - location: 30 (remaining gas: 1039977.440 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] - - location: 31 (remaining gas: 1039977.460 units remaining) + - location: 31 (remaining gas: 1039977.425 units remaining) [ (Left (Pair { "b" ; "a" } { "c" })) ] - - location: 24 (remaining gas: 1039977.445 units remaining) + - location: 24 (remaining gas: 1039977.410 units remaining) [ (Left (Pair { "b" ; "a" } { "c" })) ] - - location: 17 (remaining gas: 1039977.430 units remaining) + - location: 17 (remaining gas: 1039977.395 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] - - location: 19 (remaining gas: 1039977.420 units remaining) + - location: 19 (remaining gas: 1039977.385 units remaining) [ (Pair { "b" ; "a" } { "c" }) (Pair { "b" ; "a" } { "c" }) ] - - location: 20 (remaining gas: 1039977.410 units remaining) + - location: 20 (remaining gas: 1039977.375 units remaining) [ { "b" ; "a" } (Pair { "b" ; "a" } { "c" }) ] - - location: 21 (remaining gas: 1039977.395 units remaining) + - location: 21 (remaining gas: 1039977.360 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] - - location: 23 (remaining gas: 1039977.385 units remaining) + - location: 23 (remaining gas: 1039977.350 units remaining) [ { "c" } ] - - location: 21 (remaining gas: 1039977.355 units remaining) + - location: 21 (remaining gas: 1039977.320 units remaining) [ { "b" ; "a" } { "c" } ] - - location: 24 (remaining gas: 1039977.345 units remaining) + - location: 24 (remaining gas: 1039977.310 units remaining) [ "b" { "a" } { "c" } ] - - location: 26 (remaining gas: 1039977.335 units remaining) + - location: 26 (remaining gas: 1039977.300 units remaining) [ { "a" } "b" { "c" } ] - - location: 27 (remaining gas: 1039977.320 units remaining) + - location: 27 (remaining gas: 1039977.285 units remaining) [ "b" { "c" } ] - - location: 29 (remaining gas: 1039977.305 units remaining) + - location: 29 (remaining gas: 1039977.270 units remaining) [ { "b" ; "c" } ] - - location: 27 (remaining gas: 1039977.275 units remaining) + - location: 27 (remaining gas: 1039977.240 units remaining) [ { "a" } { "b" ; "c" } ] - - location: 30 (remaining gas: 1039977.260 units remaining) + - location: 30 (remaining gas: 1039977.225 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] - - location: 31 (remaining gas: 1039977.245 units remaining) + - location: 31 (remaining gas: 1039977.210 units remaining) [ (Left (Pair { "a" } { "b" ; "c" })) ] - - location: 24 (remaining gas: 1039977.230 units remaining) + - location: 24 (remaining gas: 1039977.195 units remaining) [ (Left (Pair { "a" } { "b" ; "c" })) ] - - location: 17 (remaining gas: 1039977.215 units remaining) + - location: 17 (remaining gas: 1039977.180 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] - - location: 19 (remaining gas: 1039977.205 units remaining) + - location: 19 (remaining gas: 1039977.170 units remaining) [ (Pair { "a" } { "b" ; "c" }) (Pair { "a" } { "b" ; "c" }) ] - - location: 20 (remaining gas: 1039977.195 units remaining) + - location: 20 (remaining gas: 1039977.160 units remaining) [ { "a" } (Pair { "a" } { "b" ; "c" }) ] - - location: 21 (remaining gas: 1039977.180 units remaining) + - location: 21 (remaining gas: 1039977.145 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] - - location: 23 (remaining gas: 1039977.170 units remaining) + - location: 23 (remaining gas: 1039977.135 units remaining) [ { "b" ; "c" } ] - - location: 21 (remaining gas: 1039977.140 units remaining) + - location: 21 (remaining gas: 1039977.105 units remaining) [ { "a" } { "b" ; "c" } ] - - location: 24 (remaining gas: 1039977.130 units remaining) + - location: 24 (remaining gas: 1039977.095 units remaining) [ "a" {} { "b" ; "c" } ] - - location: 26 (remaining gas: 1039977.120 units remaining) + - location: 26 (remaining gas: 1039977.085 units remaining) [ {} "a" { "b" ; "c" } ] - - location: 27 (remaining gas: 1039977.105 units remaining) + - location: 27 (remaining gas: 1039977.070 units remaining) [ "a" { "b" ; "c" } ] - - location: 29 (remaining gas: 1039977.090 units remaining) + - location: 29 (remaining gas: 1039977.055 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 27 (remaining gas: 1039977.060 units remaining) + - location: 27 (remaining gas: 1039977.025 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 30 (remaining gas: 1039977.045 units remaining) + - location: 30 (remaining gas: 1039977.010 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: 31 (remaining gas: 1039977.030 units remaining) + - location: 31 (remaining gas: 1039976.995 units remaining) [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - - location: 24 (remaining gas: 1039977.015 units remaining) + - location: 24 (remaining gas: 1039976.980 units remaining) [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - - location: 17 (remaining gas: 1039977 units remaining) + - location: 17 (remaining gas: 1039976.965 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: 19 (remaining gas: 1039976.990 units remaining) + - location: 19 (remaining gas: 1039976.955 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) (Pair {} { "a" ; "b" ; "c" }) ] - - location: 20 (remaining gas: 1039976.980 units remaining) + - location: 20 (remaining gas: 1039976.945 units remaining) [ {} (Pair {} { "a" ; "b" ; "c" }) ] - - location: 21 (remaining gas: 1039976.965 units remaining) + - location: 21 (remaining gas: 1039976.930 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: 23 (remaining gas: 1039976.955 units remaining) + - location: 23 (remaining gas: 1039976.920 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 21 (remaining gas: 1039976.925 units remaining) + - location: 21 (remaining gas: 1039976.890 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 24 (remaining gas: 1039976.915 units remaining) + - location: 24 (remaining gas: 1039976.880 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 35 (remaining gas: 1039976.900 units remaining) + - location: 35 (remaining gas: 1039976.865 units remaining) [ (Right { "a" ; "b" ; "c" }) ] - - location: 24 (remaining gas: 1039976.885 units remaining) + - location: 24 (remaining gas: 1039976.850 units remaining) [ (Right { "a" ; "b" ; "c" }) ] - - location: 17 (remaining gas: 1039976.870 units remaining) + - location: 17 (remaining gas: 1039976.835 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 41 (remaining gas: 1039976.855 units remaining) + - location: 41 (remaining gas: 1039976.820 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 43 (remaining gas: 1039976.840 units remaining) + - location: 43 (remaining gas: 1039976.805 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" index 7f462a9179e3..e78e39b6c474 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" @@ -7,46 +7,46 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039978.082 units remaining) + - location: 9 (remaining gas: 1039978.047 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039978.072 units remaining) + - location: 9 (remaining gas: 1039978.037 units remaining) [ {} ] - - location: 10 (remaining gas: 1039978.057 units remaining) + - location: 10 (remaining gas: 1039978.022 units remaining) [ {} {} ] - - location: 12 (remaining gas: 1039978.047 units remaining) + - location: 12 (remaining gas: 1039978.012 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039978.032 units remaining) + - location: 13 (remaining gas: 1039977.997 units remaining) [ (Pair {} {}) ] - - location: 14 (remaining gas: 1039978.017 units remaining) + - location: 14 (remaining gas: 1039977.982 units remaining) [ (Left (Pair {} {})) ] - - location: 17 (remaining gas: 1039978.017 units remaining) + - location: 17 (remaining gas: 1039977.982 units remaining) [ (Pair {} {}) ] - - location: 19 (remaining gas: 1039978.007 units remaining) + - location: 19 (remaining gas: 1039977.972 units remaining) [ (Pair {} {}) (Pair {} {}) ] - - location: 20 (remaining gas: 1039977.997 units remaining) + - location: 20 (remaining gas: 1039977.962 units remaining) [ {} (Pair {} {}) ] - - location: 21 (remaining gas: 1039977.982 units remaining) + - location: 21 (remaining gas: 1039977.947 units remaining) [ (Pair {} {}) ] - - location: 23 (remaining gas: 1039977.972 units remaining) + - location: 23 (remaining gas: 1039977.937 units remaining) [ {} ] - - location: 21 (remaining gas: 1039977.942 units remaining) + - location: 21 (remaining gas: 1039977.907 units remaining) [ {} {} ] - - location: 24 (remaining gas: 1039977.932 units remaining) + - location: 24 (remaining gas: 1039977.897 units remaining) [ {} ] - - location: 35 (remaining gas: 1039977.917 units remaining) + - location: 35 (remaining gas: 1039977.882 units remaining) [ (Right {}) ] - - location: 24 (remaining gas: 1039977.902 units remaining) + - location: 24 (remaining gas: 1039977.867 units remaining) [ (Right {}) ] - - location: 17 (remaining gas: 1039977.887 units remaining) + - location: 17 (remaining gas: 1039977.852 units remaining) [ {} ] - - location: 41 (remaining gas: 1039977.872 units remaining) + - location: 41 (remaining gas: 1039977.837 units remaining) [ {} {} ] - - location: 43 (remaining gas: 1039977.857 units remaining) + - location: 43 (remaining gas: 1039977.822 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out index c82e1f9d784b..501b3a275e13 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039993.699 units remaining) + - location: 11 (remaining gas: 1039993.664 units remaining) [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] - - location: 11 (remaining gas: 1039993.689 units remaining) + - location: 11 (remaining gas: 1039993.654 units remaining) [ { Elt 0 0 ; Elt 3 4 } ] - - location: 12 (remaining gas: 1039993.674 units remaining) + - location: 12 (remaining gas: 1039993.639 units remaining) [ {} { Elt 0 0 ; Elt 3 4 } ] - - location: 14 (remaining gas: 1039993.659 units remaining) + - location: 14 (remaining gas: 1039993.624 units remaining) [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out index f12c37d60aa2..e8ed742b8ff6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039994.154 units remaining) + - location: 11 (remaining gas: 1039994.119 units remaining) [ (Pair { Elt 0 0 } {}) ] - - location: 11 (remaining gas: 1039994.144 units remaining) + - location: 11 (remaining gas: 1039994.109 units remaining) [ { Elt 0 0 } ] - - location: 12 (remaining gas: 1039994.129 units remaining) + - location: 12 (remaining gas: 1039994.094 units remaining) [ {} { Elt 0 0 } ] - - location: 14 (remaining gas: 1039994.114 units remaining) + - location: 14 (remaining gas: 1039994.079 units remaining) [ (Pair {} { Elt 0 0 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out index d73d851b21a6..42311f0bfebb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039994.154 units remaining) + - location: 11 (remaining gas: 1039994.119 units remaining) [ (Pair { Elt 0 1 } {}) ] - - location: 11 (remaining gas: 1039994.144 units remaining) + - location: 11 (remaining gas: 1039994.109 units remaining) [ { Elt 0 1 } ] - - location: 12 (remaining gas: 1039994.129 units remaining) + - location: 12 (remaining gas: 1039994.094 units remaining) [ {} { Elt 0 1 } ] - - location: 14 (remaining gas: 1039994.114 units remaining) + - location: 14 (remaining gas: 1039994.079 units remaining) [ (Pair {} { Elt 0 1 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out index 60478164d757..3280441454db 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out @@ -7,146 +7,146 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039978.509 units remaining) + - location: 11 (remaining gas: 1039978.474 units remaining) [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] - - location: 11 (remaining gas: 1039978.499 units remaining) + - location: 11 (remaining gas: 1039978.464 units remaining) [ { Elt 0 100 ; Elt 2 100 } ] - - location: 12 (remaining gas: 1039978.489 units remaining) + - location: 12 (remaining gas: 1039978.454 units remaining) [ 0 { Elt 0 100 ; Elt 2 100 } ] - - location: 15 (remaining gas: 1039978.479 units remaining) + - location: 15 (remaining gas: 1039978.444 units remaining) [ 0 0 { Elt 0 100 ; Elt 2 100 } ] - - location: 18 (remaining gas: 1039978.464 units remaining) + - location: 18 (remaining gas: 1039978.429 units remaining) [ (Pair 0 0) { Elt 0 100 ; Elt 2 100 } ] - - location: 19 (remaining gas: 1039978.454 units remaining) + - location: 19 (remaining gas: 1039978.419 units remaining) [ { Elt 0 100 ; Elt 2 100 } (Pair 0 0) ] - - location: 20 (remaining gas: 1039978.454 units remaining) + - location: 20 (remaining gas: 1039978.419 units remaining) [ (Pair 0 100) (Pair 0 0) ] - - location: 22 (remaining gas: 1039978.439 units remaining) + - location: 22 (remaining gas: 1039978.404 units remaining) [ (Pair 0 0) ] - - location: 24 (remaining gas: 1039978.429 units remaining) + - location: 24 (remaining gas: 1039978.394 units remaining) [ (Pair 0 0) (Pair 0 0) ] - - location: 25 (remaining gas: 1039978.419 units remaining) + - location: 25 (remaining gas: 1039978.384 units remaining) [ 0 (Pair 0 0) ] - - location: 26 (remaining gas: 1039978.404 units remaining) + - location: 26 (remaining gas: 1039978.369 units remaining) [ (Pair 0 0) ] - - location: 28 (remaining gas: 1039978.394 units remaining) + - location: 28 (remaining gas: 1039978.359 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039978.364 units remaining) + - location: 26 (remaining gas: 1039978.329 units remaining) [ 0 0 ] - - location: 22 (remaining gas: 1039978.334 units remaining) + - location: 22 (remaining gas: 1039978.299 units remaining) [ (Pair 0 100) 0 0 ] - - location: 29 (remaining gas: 1039978.324 units remaining) + - location: 29 (remaining gas: 1039978.289 units remaining) [ (Pair 0 100) (Pair 0 100) 0 0 ] - - location: 30 (remaining gas: 1039978.309 units remaining) + - location: 30 (remaining gas: 1039978.274 units remaining) [ (Pair 0 100) 0 0 ] - - location: 32 (remaining gas: 1039978.299 units remaining) + - location: 32 (remaining gas: 1039978.264 units remaining) [ 0 0 0 ] - - location: 33 (remaining gas: 1039978.244 units remaining) + - location: 33 (remaining gas: 1039978.209 units remaining) [ 0 0 ] - - location: 30 (remaining gas: 1039978.214 units remaining) + - location: 30 (remaining gas: 1039978.179 units remaining) [ (Pair 0 100) 0 0 ] - - location: 34 (remaining gas: 1039978.204 units remaining) + - location: 34 (remaining gas: 1039978.169 units remaining) [ 0 (Pair 0 100) 0 ] - - location: 35 (remaining gas: 1039978.189 units remaining) + - location: 35 (remaining gas: 1039978.154 units remaining) [ (Pair 0 100) 0 ] - - location: 37 (remaining gas: 1039978.179 units remaining) + - location: 37 (remaining gas: 1039978.144 units remaining) [ 100 0 ] - - location: 38 (remaining gas: 1039978.124 units remaining) + - location: 38 (remaining gas: 1039978.089 units remaining) [ 100 ] - - location: 35 (remaining gas: 1039978.094 units remaining) + - location: 35 (remaining gas: 1039978.059 units remaining) [ 0 100 ] - - location: 39 (remaining gas: 1039978.079 units remaining) + - location: 39 (remaining gas: 1039978.044 units remaining) [ (Pair 0 100) ] - - location: 20 (remaining gas: 1039978.064 units remaining) + - location: 20 (remaining gas: 1039978.029 units remaining) [ (Pair 2 100) (Pair 0 100) ] - - location: 22 (remaining gas: 1039978.049 units remaining) + - location: 22 (remaining gas: 1039978.014 units remaining) [ (Pair 0 100) ] - - location: 24 (remaining gas: 1039978.039 units remaining) + - location: 24 (remaining gas: 1039978.004 units remaining) [ (Pair 0 100) (Pair 0 100) ] - - location: 25 (remaining gas: 1039978.029 units remaining) + - location: 25 (remaining gas: 1039977.994 units remaining) [ 0 (Pair 0 100) ] - - location: 26 (remaining gas: 1039978.014 units remaining) + - location: 26 (remaining gas: 1039977.979 units remaining) [ (Pair 0 100) ] - - location: 28 (remaining gas: 1039978.004 units remaining) + - location: 28 (remaining gas: 1039977.969 units remaining) [ 100 ] - - location: 26 (remaining gas: 1039977.974 units remaining) + - location: 26 (remaining gas: 1039977.939 units remaining) [ 0 100 ] - - location: 22 (remaining gas: 1039977.944 units remaining) + - location: 22 (remaining gas: 1039977.909 units remaining) [ (Pair 2 100) 0 100 ] - - location: 29 (remaining gas: 1039977.934 units remaining) + - location: 29 (remaining gas: 1039977.899 units remaining) [ (Pair 2 100) (Pair 2 100) 0 100 ] - - location: 30 (remaining gas: 1039977.919 units remaining) + - location: 30 (remaining gas: 1039977.884 units remaining) [ (Pair 2 100) 0 100 ] - - location: 32 (remaining gas: 1039977.909 units remaining) + - location: 32 (remaining gas: 1039977.874 units remaining) [ 2 0 100 ] - - location: 33 (remaining gas: 1039977.854 units remaining) + - location: 33 (remaining gas: 1039977.819 units remaining) [ 2 100 ] - - location: 30 (remaining gas: 1039977.824 units remaining) + - location: 30 (remaining gas: 1039977.789 units remaining) [ (Pair 2 100) 2 100 ] - - location: 34 (remaining gas: 1039977.814 units remaining) + - location: 34 (remaining gas: 1039977.779 units remaining) [ 2 (Pair 2 100) 100 ] - - location: 35 (remaining gas: 1039977.799 units remaining) + - location: 35 (remaining gas: 1039977.764 units remaining) [ (Pair 2 100) 100 ] - - location: 37 (remaining gas: 1039977.789 units remaining) + - location: 37 (remaining gas: 1039977.754 units remaining) [ 100 100 ] - - location: 38 (remaining gas: 1039977.734 units remaining) + - location: 38 (remaining gas: 1039977.699 units remaining) [ 200 ] - - location: 35 (remaining gas: 1039977.704 units remaining) + - location: 35 (remaining gas: 1039977.669 units remaining) [ 2 200 ] - - location: 39 (remaining gas: 1039977.689 units remaining) + - location: 39 (remaining gas: 1039977.654 units remaining) [ (Pair 2 200) ] - - location: 20 (remaining gas: 1039977.674 units remaining) + - location: 20 (remaining gas: 1039977.639 units remaining) [ (Pair 2 200) ] - - location: 40 (remaining gas: 1039977.659 units remaining) + - location: 40 (remaining gas: 1039977.624 units remaining) [ {} (Pair 2 200) ] - - location: 42 (remaining gas: 1039977.644 units remaining) + - location: 42 (remaining gas: 1039977.609 units remaining) [ (Pair {} 2 200) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out index 0935fc6df613..a3ebd840d9e0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out @@ -7,146 +7,146 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039978.509 units remaining) + - location: 11 (remaining gas: 1039978.474 units remaining) [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] - - location: 11 (remaining gas: 1039978.499 units remaining) + - location: 11 (remaining gas: 1039978.464 units remaining) [ { Elt 1 1 ; Elt 2 100 } ] - - location: 12 (remaining gas: 1039978.489 units remaining) + - location: 12 (remaining gas: 1039978.454 units remaining) [ 0 { Elt 1 1 ; Elt 2 100 } ] - - location: 15 (remaining gas: 1039978.479 units remaining) + - location: 15 (remaining gas: 1039978.444 units remaining) [ 0 0 { Elt 1 1 ; Elt 2 100 } ] - - location: 18 (remaining gas: 1039978.464 units remaining) + - location: 18 (remaining gas: 1039978.429 units remaining) [ (Pair 0 0) { Elt 1 1 ; Elt 2 100 } ] - - location: 19 (remaining gas: 1039978.454 units remaining) + - location: 19 (remaining gas: 1039978.419 units remaining) [ { Elt 1 1 ; Elt 2 100 } (Pair 0 0) ] - - location: 20 (remaining gas: 1039978.454 units remaining) + - location: 20 (remaining gas: 1039978.419 units remaining) [ (Pair 1 1) (Pair 0 0) ] - - location: 22 (remaining gas: 1039978.439 units remaining) + - location: 22 (remaining gas: 1039978.404 units remaining) [ (Pair 0 0) ] - - location: 24 (remaining gas: 1039978.429 units remaining) + - location: 24 (remaining gas: 1039978.394 units remaining) [ (Pair 0 0) (Pair 0 0) ] - - location: 25 (remaining gas: 1039978.419 units remaining) + - location: 25 (remaining gas: 1039978.384 units remaining) [ 0 (Pair 0 0) ] - - location: 26 (remaining gas: 1039978.404 units remaining) + - location: 26 (remaining gas: 1039978.369 units remaining) [ (Pair 0 0) ] - - location: 28 (remaining gas: 1039978.394 units remaining) + - location: 28 (remaining gas: 1039978.359 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039978.364 units remaining) + - location: 26 (remaining gas: 1039978.329 units remaining) [ 0 0 ] - - location: 22 (remaining gas: 1039978.334 units remaining) + - location: 22 (remaining gas: 1039978.299 units remaining) [ (Pair 1 1) 0 0 ] - - location: 29 (remaining gas: 1039978.324 units remaining) + - location: 29 (remaining gas: 1039978.289 units remaining) [ (Pair 1 1) (Pair 1 1) 0 0 ] - - location: 30 (remaining gas: 1039978.309 units remaining) + - location: 30 (remaining gas: 1039978.274 units remaining) [ (Pair 1 1) 0 0 ] - - location: 32 (remaining gas: 1039978.299 units remaining) + - location: 32 (remaining gas: 1039978.264 units remaining) [ 1 0 0 ] - - location: 33 (remaining gas: 1039978.244 units remaining) + - location: 33 (remaining gas: 1039978.209 units remaining) [ 1 0 ] - - location: 30 (remaining gas: 1039978.214 units remaining) + - location: 30 (remaining gas: 1039978.179 units remaining) [ (Pair 1 1) 1 0 ] - - location: 34 (remaining gas: 1039978.204 units remaining) + - location: 34 (remaining gas: 1039978.169 units remaining) [ 1 (Pair 1 1) 0 ] - - location: 35 (remaining gas: 1039978.189 units remaining) + - location: 35 (remaining gas: 1039978.154 units remaining) [ (Pair 1 1) 0 ] - - location: 37 (remaining gas: 1039978.179 units remaining) + - location: 37 (remaining gas: 1039978.144 units remaining) [ 1 0 ] - - location: 38 (remaining gas: 1039978.124 units remaining) + - location: 38 (remaining gas: 1039978.089 units remaining) [ 1 ] - - location: 35 (remaining gas: 1039978.094 units remaining) + - location: 35 (remaining gas: 1039978.059 units remaining) [ 1 1 ] - - location: 39 (remaining gas: 1039978.079 units remaining) + - location: 39 (remaining gas: 1039978.044 units remaining) [ (Pair 1 1) ] - - location: 20 (remaining gas: 1039978.064 units remaining) + - location: 20 (remaining gas: 1039978.029 units remaining) [ (Pair 2 100) (Pair 1 1) ] - - location: 22 (remaining gas: 1039978.049 units remaining) + - location: 22 (remaining gas: 1039978.014 units remaining) [ (Pair 1 1) ] - - location: 24 (remaining gas: 1039978.039 units remaining) + - location: 24 (remaining gas: 1039978.004 units remaining) [ (Pair 1 1) (Pair 1 1) ] - - location: 25 (remaining gas: 1039978.029 units remaining) + - location: 25 (remaining gas: 1039977.994 units remaining) [ 1 (Pair 1 1) ] - - location: 26 (remaining gas: 1039978.014 units remaining) + - location: 26 (remaining gas: 1039977.979 units remaining) [ (Pair 1 1) ] - - location: 28 (remaining gas: 1039978.004 units remaining) + - location: 28 (remaining gas: 1039977.969 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039977.974 units remaining) + - location: 26 (remaining gas: 1039977.939 units remaining) [ 1 1 ] - - location: 22 (remaining gas: 1039977.944 units remaining) + - location: 22 (remaining gas: 1039977.909 units remaining) [ (Pair 2 100) 1 1 ] - - location: 29 (remaining gas: 1039977.934 units remaining) + - location: 29 (remaining gas: 1039977.899 units remaining) [ (Pair 2 100) (Pair 2 100) 1 1 ] - - location: 30 (remaining gas: 1039977.919 units remaining) + - location: 30 (remaining gas: 1039977.884 units remaining) [ (Pair 2 100) 1 1 ] - - location: 32 (remaining gas: 1039977.909 units remaining) + - location: 32 (remaining gas: 1039977.874 units remaining) [ 2 1 1 ] - - location: 33 (remaining gas: 1039977.854 units remaining) + - location: 33 (remaining gas: 1039977.819 units remaining) [ 3 1 ] - - location: 30 (remaining gas: 1039977.824 units remaining) + - location: 30 (remaining gas: 1039977.789 units remaining) [ (Pair 2 100) 3 1 ] - - location: 34 (remaining gas: 1039977.814 units remaining) + - location: 34 (remaining gas: 1039977.779 units remaining) [ 3 (Pair 2 100) 1 ] - - location: 35 (remaining gas: 1039977.799 units remaining) + - location: 35 (remaining gas: 1039977.764 units remaining) [ (Pair 2 100) 1 ] - - location: 37 (remaining gas: 1039977.789 units remaining) + - location: 37 (remaining gas: 1039977.754 units remaining) [ 100 1 ] - - location: 38 (remaining gas: 1039977.734 units remaining) + - location: 38 (remaining gas: 1039977.699 units remaining) [ 101 ] - - location: 35 (remaining gas: 1039977.704 units remaining) + - location: 35 (remaining gas: 1039977.669 units remaining) [ 3 101 ] - - location: 39 (remaining gas: 1039977.689 units remaining) + - location: 39 (remaining gas: 1039977.654 units remaining) [ (Pair 3 101) ] - - location: 20 (remaining gas: 1039977.674 units remaining) + - location: 20 (remaining gas: 1039977.639 units remaining) [ (Pair 3 101) ] - - location: 40 (remaining gas: 1039977.659 units remaining) + - location: 40 (remaining gas: 1039977.624 units remaining) [ {} (Pair 3 101) ] - - location: 42 (remaining gas: 1039977.644 units remaining) + - location: 42 (remaining gas: 1039977.609 units remaining) [ (Pair {} 3 101) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" index 8cfcbddf2845..9e964cdadbae 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" @@ -7,62 +7,62 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.041 units remaining) + - location: 9 (remaining gas: 1039988.006 units remaining) [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 9 (remaining gas: 1039987.996 units remaining) [ 15 { Elt "bar" 5 ; Elt "foo" 1 } ] - - location: 10 (remaining gas: 1039988.021 units remaining) + - location: 10 (remaining gas: 1039987.986 units remaining) [ { Elt "bar" 5 ; Elt "foo" 1 } 15 ] - - location: 11 (remaining gas: 1039988.021 units remaining) + - location: 11 (remaining gas: 1039987.986 units remaining) [ (Pair "bar" 5) 15 ] - - location: 13 (remaining gas: 1039988.011 units remaining) + - location: 13 (remaining gas: 1039987.976 units remaining) [ 5 15 ] - - location: 14 (remaining gas: 1039987.996 units remaining) + - location: 14 (remaining gas: 1039987.961 units remaining) [ 15 ] - - location: 16 (remaining gas: 1039987.986 units remaining) + - location: 16 (remaining gas: 1039987.951 units remaining) [ 15 15 ] - - location: 14 (remaining gas: 1039987.956 units remaining) + - location: 14 (remaining gas: 1039987.921 units remaining) [ 5 15 15 ] - - location: 17 (remaining gas: 1039987.901 units remaining) + - location: 17 (remaining gas: 1039987.866 units remaining) [ 20 15 ] - - location: 11 (remaining gas: 1039987.886 units remaining) + - location: 11 (remaining gas: 1039987.851 units remaining) [ (Pair "foo" 1) 15 ] - - location: 13 (remaining gas: 1039987.876 units remaining) + - location: 13 (remaining gas: 1039987.841 units remaining) [ 1 15 ] - - location: 14 (remaining gas: 1039987.861 units remaining) + - location: 14 (remaining gas: 1039987.826 units remaining) [ 15 ] - - location: 16 (remaining gas: 1039987.851 units remaining) + - location: 16 (remaining gas: 1039987.816 units remaining) [ 15 15 ] - - location: 14 (remaining gas: 1039987.821 units remaining) + - location: 14 (remaining gas: 1039987.786 units remaining) [ 1 15 15 ] - - location: 17 (remaining gas: 1039987.766 units remaining) + - location: 17 (remaining gas: 1039987.731 units remaining) [ 16 15 ] - - location: 11 (remaining gas: 1039987.751 units remaining) + - location: 11 (remaining gas: 1039987.716 units remaining) [ { Elt "bar" 20 ; Elt "foo" 16 } 15 ] - - location: 18 (remaining gas: 1039987.736 units remaining) + - location: 18 (remaining gas: 1039987.701 units remaining) [ 15 ] - - location: 20 (remaining gas: 1039987.726 units remaining) + - location: 20 (remaining gas: 1039987.691 units remaining) [ ] - - location: 18 (remaining gas: 1039987.696 units remaining) + - location: 18 (remaining gas: 1039987.661 units remaining) [ { Elt "bar" 20 ; Elt "foo" 16 } ] - - location: 21 (remaining gas: 1039987.681 units remaining) + - location: 21 (remaining gas: 1039987.646 units remaining) [ {} { Elt "bar" 20 ; Elt "foo" 16 } ] - - location: 23 (remaining gas: 1039987.666 units remaining) + - location: 23 (remaining gas: 1039987.631 units remaining) [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" index 5897851b7ff1..37438b67d79b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" @@ -7,44 +7,44 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.540 units remaining) + - location: 9 (remaining gas: 1039988.505 units remaining) [ (Pair 10 { Elt "foo" 1 }) ] - - location: 9 (remaining gas: 1039988.530 units remaining) + - location: 9 (remaining gas: 1039988.495 units remaining) [ 10 { Elt "foo" 1 } ] - - location: 10 (remaining gas: 1039988.520 units remaining) + - location: 10 (remaining gas: 1039988.485 units remaining) [ { Elt "foo" 1 } 10 ] - - location: 11 (remaining gas: 1039988.520 units remaining) + - location: 11 (remaining gas: 1039988.485 units remaining) [ (Pair "foo" 1) 10 ] - - location: 13 (remaining gas: 1039988.510 units remaining) + - location: 13 (remaining gas: 1039988.475 units remaining) [ 1 10 ] - - location: 14 (remaining gas: 1039988.495 units remaining) + - location: 14 (remaining gas: 1039988.460 units remaining) [ 10 ] - - location: 16 (remaining gas: 1039988.485 units remaining) + - location: 16 (remaining gas: 1039988.450 units remaining) [ 10 10 ] - - location: 14 (remaining gas: 1039988.455 units remaining) + - location: 14 (remaining gas: 1039988.420 units remaining) [ 1 10 10 ] - - location: 17 (remaining gas: 1039988.400 units remaining) + - location: 17 (remaining gas: 1039988.365 units remaining) [ 11 10 ] - - location: 11 (remaining gas: 1039988.385 units remaining) + - location: 11 (remaining gas: 1039988.350 units remaining) [ { Elt "foo" 11 } 10 ] - - location: 18 (remaining gas: 1039988.370 units remaining) + - location: 18 (remaining gas: 1039988.335 units remaining) [ 10 ] - - location: 20 (remaining gas: 1039988.360 units remaining) + - location: 20 (remaining gas: 1039988.325 units remaining) [ ] - - location: 18 (remaining gas: 1039988.330 units remaining) + - location: 18 (remaining gas: 1039988.295 units remaining) [ { Elt "foo" 11 } ] - - location: 21 (remaining gas: 1039988.315 units remaining) + - location: 21 (remaining gas: 1039988.280 units remaining) [ {} { Elt "foo" 11 } ] - - location: 23 (remaining gas: 1039988.300 units remaining) + - location: 23 (remaining gas: 1039988.265 units remaining) [ (Pair {} { Elt "foo" 11 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out index 0ca64ebf5d18..9a6196b356c0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.934 units remaining) + - location: 9 (remaining gas: 1039988.899 units remaining) [ (Pair 10 {}) ] - - location: 9 (remaining gas: 1039988.924 units remaining) + - location: 9 (remaining gas: 1039988.889 units remaining) [ 10 {} ] - - location: 10 (remaining gas: 1039988.914 units remaining) + - location: 10 (remaining gas: 1039988.879 units remaining) [ {} 10 ] - - location: 11 (remaining gas: 1039988.914 units remaining) + - location: 11 (remaining gas: 1039988.879 units remaining) [ {} 10 ] - - location: 18 (remaining gas: 1039988.899 units remaining) + - location: 18 (remaining gas: 1039988.864 units remaining) [ 10 ] - - location: 20 (remaining gas: 1039988.889 units remaining) + - location: 20 (remaining gas: 1039988.854 units remaining) [ ] - - location: 18 (remaining gas: 1039988.859 units remaining) + - location: 18 (remaining gas: 1039988.824 units remaining) [ {} ] - - location: 21 (remaining gas: 1039988.844 units remaining) + - location: 21 (remaining gas: 1039988.809 units remaining) [ {} {} ] - - location: 23 (remaining gas: 1039988.829 units remaining) + - location: 23 (remaining gas: 1039988.794 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out index c5f013f84022..0aa14d08350b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.154 units remaining) + - location: 12 (remaining gas: 1039988.119 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039988.144 units remaining) + - location: 12 (remaining gas: 1039988.109 units remaining) [ 1 (Pair { Elt 0 1 } None) ] - - location: 13 (remaining gas: 1039988.129 units remaining) + - location: 13 (remaining gas: 1039988.094 units remaining) [ (Pair { Elt 0 1 } None) ] - - location: 15 (remaining gas: 1039988.119 units remaining) + - location: 15 (remaining gas: 1039988.084 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039988.109 units remaining) + - location: 16 (remaining gas: 1039988.074 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: 13 (remaining gas: 1039988.079 units remaining) + - location: 13 (remaining gas: 1039988.044 units remaining) [ 1 { Elt 0 1 } { Elt 0 1 } ] - - location: 17 (remaining gas: 1039987.929 units remaining) + - location: 17 (remaining gas: 1039987.894 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039987.914 units remaining) + - location: 18 (remaining gas: 1039987.879 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039987.904 units remaining) + - location: 19 (remaining gas: 1039987.869 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039987.889 units remaining) + - location: 20 (remaining gas: 1039987.854 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039987.874 units remaining) + - location: 21 (remaining gas: 1039987.839 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039987.859 units remaining) + - location: 23 (remaining gas: 1039987.824 units remaining) [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out index 0ae9faf00e8a..c77bf93510c4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.154 units remaining) + - location: 12 (remaining gas: 1039988.119 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039988.144 units remaining) + - location: 12 (remaining gas: 1039988.109 units remaining) [ 1 (Pair { Elt 1 0 } None) ] - - location: 13 (remaining gas: 1039988.129 units remaining) + - location: 13 (remaining gas: 1039988.094 units remaining) [ (Pair { Elt 1 0 } None) ] - - location: 15 (remaining gas: 1039988.119 units remaining) + - location: 15 (remaining gas: 1039988.084 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039988.109 units remaining) + - location: 16 (remaining gas: 1039988.074 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: 13 (remaining gas: 1039988.079 units remaining) + - location: 13 (remaining gas: 1039988.044 units remaining) [ 1 { Elt 1 0 } { Elt 1 0 } ] - - location: 17 (remaining gas: 1039987.929 units remaining) + - location: 17 (remaining gas: 1039987.894 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039987.914 units remaining) + - location: 18 (remaining gas: 1039987.879 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039987.904 units remaining) + - location: 19 (remaining gas: 1039987.869 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039987.889 units remaining) + - location: 20 (remaining gas: 1039987.854 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039987.874 units remaining) + - location: 21 (remaining gas: 1039987.839 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039987.859 units remaining) + - location: 23 (remaining gas: 1039987.824 units remaining) [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out index fbfcb4b062a0..f8a527892eb6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.699 units remaining) + - location: 12 (remaining gas: 1039987.664 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039987.689 units remaining) + - location: 12 (remaining gas: 1039987.654 units remaining) [ 1 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039987.674 units remaining) + - location: 13 (remaining gas: 1039987.639 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039987.664 units remaining) + - location: 15 (remaining gas: 1039987.629 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039987.654 units remaining) + - location: 16 (remaining gas: 1039987.619 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039987.624 units remaining) + - location: 13 (remaining gas: 1039987.589 units remaining) [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039987.439 units remaining) + - location: 17 (remaining gas: 1039987.404 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039987.424 units remaining) + - location: 18 (remaining gas: 1039987.389 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039987.414 units remaining) + - location: 19 (remaining gas: 1039987.379 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039987.399 units remaining) + - location: 20 (remaining gas: 1039987.364 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039987.384 units remaining) + - location: 21 (remaining gas: 1039987.349 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039987.369 units remaining) + - location: 23 (remaining gas: 1039987.334 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out index 258a7023a461..dabbe2eca24b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.699 units remaining) + - location: 12 (remaining gas: 1039987.664 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039987.689 units remaining) + - location: 12 (remaining gas: 1039987.654 units remaining) [ 2 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039987.674 units remaining) + - location: 13 (remaining gas: 1039987.639 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039987.664 units remaining) + - location: 15 (remaining gas: 1039987.629 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039987.654 units remaining) + - location: 16 (remaining gas: 1039987.619 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039987.624 units remaining) + - location: 13 (remaining gas: 1039987.589 units remaining) [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039987.439 units remaining) + - location: 17 (remaining gas: 1039987.404 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039987.424 units remaining) + - location: 18 (remaining gas: 1039987.389 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039987.414 units remaining) + - location: 19 (remaining gas: 1039987.379 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039987.399 units remaining) + - location: 20 (remaining gas: 1039987.364 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039987.384 units remaining) + - location: 21 (remaining gas: 1039987.349 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039987.369 units remaining) + - location: 23 (remaining gas: 1039987.334 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out index a4e8a62b75f3..2beab2ac82bd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.699 units remaining) + - location: 12 (remaining gas: 1039987.664 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039987.689 units remaining) + - location: 12 (remaining gas: 1039987.654 units remaining) [ 3 (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 13 (remaining gas: 1039987.674 units remaining) + - location: 13 (remaining gas: 1039987.639 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - - location: 15 (remaining gas: 1039987.664 units remaining) + - location: 15 (remaining gas: 1039987.629 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039987.654 units remaining) + - location: 16 (remaining gas: 1039987.619 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039987.624 units remaining) + - location: 13 (remaining gas: 1039987.589 units remaining) [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039987.439 units remaining) + - location: 17 (remaining gas: 1039987.404 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039987.424 units remaining) + - location: 18 (remaining gas: 1039987.389 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039987.414 units remaining) + - location: 19 (remaining gas: 1039987.379 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039987.399 units remaining) + - location: 20 (remaining gas: 1039987.364 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039987.384 units remaining) + - location: 21 (remaining gas: 1039987.349 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039987.369 units remaining) + - location: 23 (remaining gas: 1039987.334 units remaining) [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out index 6d5c95773cf3..5af21b8e3478 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.504 units remaining) + - location: 12 (remaining gas: 1039988.469 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039988.494 units remaining) + - location: 12 (remaining gas: 1039988.459 units remaining) [ 1 (Pair {} None) ] - - location: 13 (remaining gas: 1039988.479 units remaining) + - location: 13 (remaining gas: 1039988.444 units remaining) [ (Pair {} None) ] - - location: 15 (remaining gas: 1039988.469 units remaining) + - location: 15 (remaining gas: 1039988.434 units remaining) [ {} ] - - location: 16 (remaining gas: 1039988.459 units remaining) + - location: 16 (remaining gas: 1039988.424 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039988.429 units remaining) + - location: 13 (remaining gas: 1039988.394 units remaining) [ 1 {} {} ] - - location: 17 (remaining gas: 1039988.314 units remaining) + - location: 17 (remaining gas: 1039988.279 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039988.299 units remaining) + - location: 18 (remaining gas: 1039988.264 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039988.289 units remaining) + - location: 19 (remaining gas: 1039988.254 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039988.274 units remaining) + - location: 20 (remaining gas: 1039988.239 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039988.259 units remaining) + - location: 21 (remaining gas: 1039988.224 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039988.244 units remaining) + - location: 23 (remaining gas: 1039988.209 units remaining) [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" index 23c7eb87344d..2e9c60db5e60 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.567 units remaining) + - location: 12 (remaining gas: 1039987.532 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039987.557 units remaining) + - location: 12 (remaining gas: 1039987.522 units remaining) [ "bar" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039987.542 units remaining) + - location: 13 (remaining gas: 1039987.507 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039987.532 units remaining) + - location: 15 (remaining gas: 1039987.497 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039987.522 units remaining) + - location: 16 (remaining gas: 1039987.487 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039987.492 units remaining) + - location: 13 (remaining gas: 1039987.457 units remaining) [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039987.307 units remaining) + - location: 17 (remaining gas: 1039987.272 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039987.292 units remaining) + - location: 18 (remaining gas: 1039987.257 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039987.282 units remaining) + - location: 19 (remaining gas: 1039987.247 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039987.267 units remaining) + - location: 20 (remaining gas: 1039987.232 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039987.252 units remaining) + - location: 21 (remaining gas: 1039987.217 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039987.237 units remaining) + - location: 23 (remaining gas: 1039987.202 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" index 281368a76454..4a57c7c38a68 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.567 units remaining) + - location: 12 (remaining gas: 1039987.532 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039987.557 units remaining) + - location: 12 (remaining gas: 1039987.522 units remaining) [ "foo" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039987.542 units remaining) + - location: 13 (remaining gas: 1039987.507 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039987.532 units remaining) + - location: 15 (remaining gas: 1039987.497 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039987.522 units remaining) + - location: 16 (remaining gas: 1039987.487 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039987.492 units remaining) + - location: 13 (remaining gas: 1039987.457 units remaining) [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039987.307 units remaining) + - location: 17 (remaining gas: 1039987.272 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039987.292 units remaining) + - location: 18 (remaining gas: 1039987.257 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039987.282 units remaining) + - location: 19 (remaining gas: 1039987.247 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039987.267 units remaining) + - location: 20 (remaining gas: 1039987.232 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039987.252 units remaining) + - location: 21 (remaining gas: 1039987.217 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039987.237 units remaining) + - location: 23 (remaining gas: 1039987.202 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" index 8a566fac9d76..039363f8a15e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039987.567 units remaining) + - location: 12 (remaining gas: 1039987.532 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039987.557 units remaining) + - location: 12 (remaining gas: 1039987.522 units remaining) [ "baz" (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 13 (remaining gas: 1039987.542 units remaining) + - location: 13 (remaining gas: 1039987.507 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 15 (remaining gas: 1039987.532 units remaining) + - location: 15 (remaining gas: 1039987.497 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039987.522 units remaining) + - location: 16 (remaining gas: 1039987.487 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039987.492 units remaining) + - location: 13 (remaining gas: 1039987.457 units remaining) [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039987.307 units remaining) + - location: 17 (remaining gas: 1039987.272 units remaining) [ False { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039987.292 units remaining) + - location: 18 (remaining gas: 1039987.257 units remaining) [ (Some False) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039987.282 units remaining) + - location: 19 (remaining gas: 1039987.247 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some False) ] - - location: 20 (remaining gas: 1039987.267 units remaining) + - location: 20 (remaining gas: 1039987.232 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 21 (remaining gas: 1039987.252 units remaining) + - location: 21 (remaining gas: 1039987.217 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 23 (remaining gas: 1039987.237 units remaining) + - location: 23 (remaining gas: 1039987.202 units remaining) [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" index 9ecfc7adbfbc..e768177c6b8f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.066 units remaining) + - location: 12 (remaining gas: 1039988.031 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - - location: 12 (remaining gas: 1039988.056 units remaining) + - location: 12 (remaining gas: 1039988.021 units remaining) [ "foo" (Pair { Elt "foo" 0 } None) ] - - location: 13 (remaining gas: 1039988.041 units remaining) + - location: 13 (remaining gas: 1039988.006 units remaining) [ (Pair { Elt "foo" 0 } None) ] - - location: 15 (remaining gas: 1039988.031 units remaining) + - location: 15 (remaining gas: 1039987.996 units remaining) [ { Elt "foo" 0 } ] - - location: 16 (remaining gas: 1039988.021 units remaining) + - location: 16 (remaining gas: 1039987.986 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: 13 (remaining gas: 1039987.991 units remaining) + - location: 13 (remaining gas: 1039987.956 units remaining) [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: 17 (remaining gas: 1039987.841 units remaining) + - location: 17 (remaining gas: 1039987.806 units remaining) [ True { Elt "foo" 0 } ] - - location: 18 (remaining gas: 1039987.826 units remaining) + - location: 18 (remaining gas: 1039987.791 units remaining) [ (Some True) { Elt "foo" 0 } ] - - location: 19 (remaining gas: 1039987.816 units remaining) + - location: 19 (remaining gas: 1039987.781 units remaining) [ { Elt "foo" 0 } (Some True) ] - - location: 20 (remaining gas: 1039987.801 units remaining) + - location: 20 (remaining gas: 1039987.766 units remaining) [ (Pair { Elt "foo" 0 } (Some True)) ] - - location: 21 (remaining gas: 1039987.786 units remaining) + - location: 21 (remaining gas: 1039987.751 units remaining) [ {} (Pair { Elt "foo" 0 } (Some True)) ] - - location: 23 (remaining gas: 1039987.771 units remaining) + - location: 23 (remaining gas: 1039987.736 units remaining) [ (Pair {} { Elt "foo" 0 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" index 6a2472436bc7..51a23f9fcff6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.066 units remaining) + - location: 12 (remaining gas: 1039988.031 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - - location: 12 (remaining gas: 1039988.056 units remaining) + - location: 12 (remaining gas: 1039988.021 units remaining) [ "bar" (Pair { Elt "foo" 1 } None) ] - - location: 13 (remaining gas: 1039988.041 units remaining) + - location: 13 (remaining gas: 1039988.006 units remaining) [ (Pair { Elt "foo" 1 } None) ] - - location: 15 (remaining gas: 1039988.031 units remaining) + - location: 15 (remaining gas: 1039987.996 units remaining) [ { Elt "foo" 1 } ] - - location: 16 (remaining gas: 1039988.021 units remaining) + - location: 16 (remaining gas: 1039987.986 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: 13 (remaining gas: 1039987.991 units remaining) + - location: 13 (remaining gas: 1039987.956 units remaining) [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: 17 (remaining gas: 1039987.841 units remaining) + - location: 17 (remaining gas: 1039987.806 units remaining) [ False { Elt "foo" 1 } ] - - location: 18 (remaining gas: 1039987.826 units remaining) + - location: 18 (remaining gas: 1039987.791 units remaining) [ (Some False) { Elt "foo" 1 } ] - - location: 19 (remaining gas: 1039987.816 units remaining) + - location: 19 (remaining gas: 1039987.781 units remaining) [ { Elt "foo" 1 } (Some False) ] - - location: 20 (remaining gas: 1039987.801 units remaining) + - location: 20 (remaining gas: 1039987.766 units remaining) [ (Pair { Elt "foo" 1 } (Some False)) ] - - location: 21 (remaining gas: 1039987.786 units remaining) + - location: 21 (remaining gas: 1039987.751 units remaining) [ {} (Pair { Elt "foo" 1 } (Some False)) ] - - location: 23 (remaining gas: 1039987.771 units remaining) + - location: 23 (remaining gas: 1039987.736 units remaining) [ (Pair {} { Elt "foo" 1 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" index 1747fa61361c..f7ab8ff143ff 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039988.460 units remaining) + - location: 12 (remaining gas: 1039988.425 units remaining) [ (Pair "bar" {} None) ] - - location: 12 (remaining gas: 1039988.450 units remaining) + - location: 12 (remaining gas: 1039988.415 units remaining) [ "bar" (Pair {} None) ] - - location: 13 (remaining gas: 1039988.435 units remaining) + - location: 13 (remaining gas: 1039988.400 units remaining) [ (Pair {} None) ] - - location: 15 (remaining gas: 1039988.425 units remaining) + - location: 15 (remaining gas: 1039988.390 units remaining) [ {} ] - - location: 16 (remaining gas: 1039988.415 units remaining) + - location: 16 (remaining gas: 1039988.380 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039988.385 units remaining) + - location: 13 (remaining gas: 1039988.350 units remaining) [ "bar" {} {} ] - - location: 17 (remaining gas: 1039988.270 units remaining) + - location: 17 (remaining gas: 1039988.235 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039988.255 units remaining) + - location: 18 (remaining gas: 1039988.220 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039988.245 units remaining) + - location: 19 (remaining gas: 1039988.210 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039988.230 units remaining) + - location: 20 (remaining gas: 1039988.195 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039988.215 units remaining) + - location: 21 (remaining gas: 1039988.180 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039988.200 units remaining) + - location: 23 (remaining gas: 1039988.165 units remaining) [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" index bfe70cf6aa34..e11ff0a0ae6e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.503 units remaining) + - location: 9 (remaining gas: 1039991.468 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ] - - location: 9 (remaining gas: 1039991.493 units remaining) + - location: 9 (remaining gas: 1039991.458 units remaining) [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ] - - location: 10 (remaining gas: 1039991.478 units remaining) + - location: 10 (remaining gas: 1039991.443 units remaining) [ 6 ] - - location: 11 (remaining gas: 1039991.463 units remaining) + - location: 11 (remaining gas: 1039991.428 units remaining) [ {} 6 ] - - location: 13 (remaining gas: 1039991.448 units remaining) + - location: 13 (remaining gas: 1039991.413 units remaining) [ (Pair {} 6) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" index 014289173791..2cacce308faf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.290 units remaining) + - location: 9 (remaining gas: 1039993.255 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] - - location: 9 (remaining gas: 1039993.280 units remaining) + - location: 9 (remaining gas: 1039993.245 units remaining) [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ] - - location: 10 (remaining gas: 1039993.265 units remaining) + - location: 10 (remaining gas: 1039993.230 units remaining) [ 3 ] - - location: 11 (remaining gas: 1039993.250 units remaining) + - location: 11 (remaining gas: 1039993.215 units remaining) [ {} 3 ] - - location: 13 (remaining gas: 1039993.235 units remaining) + - location: 13 (remaining gas: 1039993.200 units remaining) [ (Pair {} 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" index 2c18a9098385..a447a091a2b0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.318 units remaining) + - location: 9 (remaining gas: 1039994.283 units remaining) [ (Pair { Elt "a" 1 } 111) ] - - location: 9 (remaining gas: 1039994.308 units remaining) + - location: 9 (remaining gas: 1039994.273 units remaining) [ { Elt "a" 1 } ] - - location: 10 (remaining gas: 1039994.293 units remaining) + - location: 10 (remaining gas: 1039994.258 units remaining) [ 1 ] - - location: 11 (remaining gas: 1039994.278 units remaining) + - location: 11 (remaining gas: 1039994.243 units remaining) [ {} 1 ] - - location: 13 (remaining gas: 1039994.263 units remaining) + - location: 13 (remaining gas: 1039994.228 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out index 33a295f6177a..e33dd2106d07 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.692 units remaining) + - location: 9 (remaining gas: 1039994.657 units remaining) [ (Pair {} 111) ] - - location: 9 (remaining gas: 1039994.682 units remaining) + - location: 9 (remaining gas: 1039994.647 units remaining) [ {} ] - - location: 10 (remaining gas: 1039994.667 units remaining) + - location: 10 (remaining gas: 1039994.632 units remaining) [ 0 ] - - location: 11 (remaining gas: 1039994.652 units remaining) + - location: 11 (remaining gas: 1039994.617 units remaining) [ {} 0 ] - - location: 13 (remaining gas: 1039994.637 units remaining) + - location: 13 (remaining gas: 1039994.602 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out index 256307a9aa96..ea0a08482b97 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out @@ -7,125 +7,125 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039944.576 units remaining) + - location: 7 (remaining gas: 1039944.541 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039944.566 units remaining) + - location: 7 (remaining gas: 1039944.531 units remaining) [ Unit ] - - location: 8 (remaining gas: 1039944.556 units remaining) + - location: 8 (remaining gas: 1039944.521 units remaining) [ ] - - location: 9 (remaining gas: 1039944.546 units remaining) + - location: 9 (remaining gas: 1039944.511 units remaining) [ 7987 ] - - location: 12 (remaining gas: 1039944.536 units remaining) + - location: 12 (remaining gas: 1039944.501 units remaining) [ 10 7987 ] - - location: 15 (remaining gas: 1039944.536 units remaining) + - location: 15 (remaining gas: 1039944.501 units remaining) [ 79870 ] - - location: 16 (remaining gas: 1039944.526 units remaining) + - location: 16 (remaining gas: 1039944.491 units remaining) [ 79870 79870 ] - - location: 19 (remaining gas: 1039944.491 units remaining) + - location: 19 (remaining gas: 1039944.456 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039944.476 units remaining) + - location: 21 (remaining gas: 1039944.441 units remaining) [ True ] - - location: 22 (remaining gas: 1039944.466 units remaining) + - location: 22 (remaining gas: 1039944.431 units remaining) [ ] - - location: 22 (remaining gas: 1039944.451 units remaining) + - location: 22 (remaining gas: 1039944.416 units remaining) [ ] - - location: 28 (remaining gas: 1039944.441 units remaining) + - location: 28 (remaining gas: 1039944.406 units remaining) [ 10 ] - - location: 31 (remaining gas: 1039944.431 units remaining) + - location: 31 (remaining gas: 1039944.396 units remaining) [ 7987 10 ] - - location: 34 (remaining gas: 1039944.431 units remaining) + - location: 34 (remaining gas: 1039944.396 units remaining) [ 79870 ] - - location: 35 (remaining gas: 1039944.421 units remaining) + - location: 35 (remaining gas: 1039944.386 units remaining) [ 79870 79870 ] - - location: 38 (remaining gas: 1039944.386 units remaining) + - location: 38 (remaining gas: 1039944.351 units remaining) [ 0 ] - - location: 40 (remaining gas: 1039944.371 units remaining) + - location: 40 (remaining gas: 1039944.336 units remaining) [ True ] - - location: 41 (remaining gas: 1039944.361 units remaining) + - location: 41 (remaining gas: 1039944.326 units remaining) [ ] - - location: 41 (remaining gas: 1039944.346 units remaining) + - location: 41 (remaining gas: 1039944.311 units remaining) [ ] - - location: 47 (remaining gas: 1039944.336 units remaining) + - location: 47 (remaining gas: 1039944.301 units remaining) [ 10 ] - - location: 50 (remaining gas: 1039944.326 units remaining) + - location: 50 (remaining gas: 1039944.291 units remaining) [ -7987 10 ] - - location: 53 (remaining gas: 1039944.220 units remaining) + - location: 53 (remaining gas: 1039944.185 units remaining) [ -79870 ] - - location: 54 (remaining gas: 1039944.210 units remaining) + - location: 54 (remaining gas: 1039944.175 units remaining) [ -79870 -79870 ] - - location: 57 (remaining gas: 1039944.175 units remaining) + - location: 57 (remaining gas: 1039944.140 units remaining) [ 0 ] - - location: 59 (remaining gas: 1039944.160 units remaining) + - location: 59 (remaining gas: 1039944.125 units remaining) [ True ] - - location: 60 (remaining gas: 1039944.150 units remaining) + - location: 60 (remaining gas: 1039944.115 units remaining) [ ] - - location: 60 (remaining gas: 1039944.135 units remaining) + - location: 60 (remaining gas: 1039944.100 units remaining) [ ] - - location: 66 (remaining gas: 1039944.125 units remaining) + - location: 66 (remaining gas: 1039944.090 units remaining) [ 10 ] - - location: 69 (remaining gas: 1039944.115 units remaining) + - location: 69 (remaining gas: 1039944.080 units remaining) [ -7987 10 ] - - location: 72 (remaining gas: 1039944.009 units remaining) + - location: 72 (remaining gas: 1039943.974 units remaining) [ -79870 ] - - location: 73 (remaining gas: 1039943.999 units remaining) + - location: 73 (remaining gas: 1039943.964 units remaining) [ -79870 -79870 ] - - location: 76 (remaining gas: 1039943.964 units remaining) + - location: 76 (remaining gas: 1039943.929 units remaining) [ 0 ] - - location: 78 (remaining gas: 1039943.949 units remaining) + - location: 78 (remaining gas: 1039943.914 units remaining) [ True ] - - location: 79 (remaining gas: 1039943.939 units remaining) + - location: 79 (remaining gas: 1039943.904 units remaining) [ ] - - location: 79 (remaining gas: 1039943.924 units remaining) + - location: 79 (remaining gas: 1039943.889 units remaining) [ ] - - location: 85 (remaining gas: 1039943.914 units remaining) + - location: 85 (remaining gas: 1039943.879 units remaining) [ -10 ] - - location: 88 (remaining gas: 1039943.904 units remaining) + - location: 88 (remaining gas: 1039943.869 units remaining) [ 7987 -10 ] - - location: 91 (remaining gas: 1039943.798 units remaining) + - location: 91 (remaining gas: 1039943.763 units remaining) [ -79870 ] - - location: 92 (remaining gas: 1039943.788 units remaining) + - location: 92 (remaining gas: 1039943.753 units remaining) [ -79870 -79870 ] - - location: 95 (remaining gas: 1039943.753 units remaining) + - location: 95 (remaining gas: 1039943.718 units remaining) [ 0 ] - - location: 97 (remaining gas: 1039943.738 units remaining) + - location: 97 (remaining gas: 1039943.703 units remaining) [ True ] - - location: 98 (remaining gas: 1039943.728 units remaining) + - location: 98 (remaining gas: 1039943.693 units remaining) [ ] - - location: 98 (remaining gas: 1039943.713 units remaining) + - location: 98 (remaining gas: 1039943.678 units remaining) [ ] - - location: 104 (remaining gas: 1039943.703 units remaining) + - location: 104 (remaining gas: 1039943.668 units remaining) [ 10 ] - - location: 107 (remaining gas: 1039943.693 units remaining) + - location: 107 (remaining gas: 1039943.658 units remaining) [ 7987 10 ] - - location: 110 (remaining gas: 1039943.587 units remaining) + - location: 110 (remaining gas: 1039943.552 units remaining) [ 79870 ] - - location: 111 (remaining gas: 1039943.577 units remaining) + - location: 111 (remaining gas: 1039943.542 units remaining) [ 79870 79870 ] - - location: 114 (remaining gas: 1039943.542 units remaining) + - location: 114 (remaining gas: 1039943.507 units remaining) [ 0 ] - - location: 116 (remaining gas: 1039943.527 units remaining) + - location: 116 (remaining gas: 1039943.492 units remaining) [ True ] - - location: 117 (remaining gas: 1039943.517 units remaining) + - location: 117 (remaining gas: 1039943.482 units remaining) [ ] - - location: 117 (remaining gas: 1039943.502 units remaining) + - location: 117 (remaining gas: 1039943.467 units remaining) [ ] - - location: 123 (remaining gas: 1039943.492 units remaining) + - location: 123 (remaining gas: 1039943.457 units remaining) [ Unit ] - - location: 124 (remaining gas: 1039943.477 units remaining) + - location: 124 (remaining gas: 1039943.442 units remaining) [ {} Unit ] - - location: 126 (remaining gas: 1039943.462 units remaining) + - location: 126 (remaining gas: 1039943.427 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out index 6192d4f1bf13..4e380dc4e5d5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039987.713 units remaining) + - location: 7 (remaining gas: 1039987.678 units remaining) [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039987.703 units remaining) + - location: 7 (remaining gas: 1039987.668 units remaining) [ 257 ] - - location: 8 (remaining gas: 1039987.693 units remaining) + - location: 8 (remaining gas: 1039987.658 units remaining) [ 1 257 ] - - location: 11 (remaining gas: 1039987.683 units remaining) + - location: 11 (remaining gas: 1039987.648 units remaining) [ 257 1 ] - - location: 12 (remaining gas: 1039987.543 units remaining) + - location: 12 (remaining gas: 1039987.508 units remaining) [ (Some (Pair 257 0)) ] - - location: 14 (remaining gas: 1039987.533 units remaining) + - location: 14 (remaining gas: 1039987.498 units remaining) [ (Pair 257 0) ] - - location: 14 (remaining gas: 1039987.518 units remaining) + - location: 14 (remaining gas: 1039987.483 units remaining) [ (Pair 257 0) ] - - location: 20 (remaining gas: 1039987.508 units remaining) + - location: 20 (remaining gas: 1039987.473 units remaining) [ 257 ] - - location: 21 (remaining gas: 1039987.498 units remaining) + - location: 21 (remaining gas: 1039987.463 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 257 ] - - location: 24 (remaining gas: 1039987.166 units remaining) + - location: 24 (remaining gas: 1039987.131 units remaining) [ 0x0101000000000000000000000000000000000000000000000000000000000000 ] - - location: 25 (remaining gas: 1039987.151 units remaining) + - location: 25 (remaining gas: 1039987.116 units remaining) [ {} 0x0101000000000000000000000000000000000000000000000000000000000000 ] - - location: 27 (remaining gas: 1039987.136 units remaining) + - location: 27 (remaining gas: 1039987.101 units remaining) [ (Pair {} 0x0101000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out index 56e069daa229..ffb7a6773c6c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039987.713 units remaining) + - location: 7 (remaining gas: 1039987.678 units remaining) [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039987.703 units remaining) + - location: 7 (remaining gas: 1039987.668 units remaining) [ 16 ] - - location: 8 (remaining gas: 1039987.693 units remaining) + - location: 8 (remaining gas: 1039987.658 units remaining) [ 1 16 ] - - location: 11 (remaining gas: 1039987.683 units remaining) + - location: 11 (remaining gas: 1039987.648 units remaining) [ 16 1 ] - - location: 12 (remaining gas: 1039987.543 units remaining) + - location: 12 (remaining gas: 1039987.508 units remaining) [ (Some (Pair 16 0)) ] - - location: 14 (remaining gas: 1039987.533 units remaining) + - location: 14 (remaining gas: 1039987.498 units remaining) [ (Pair 16 0) ] - - location: 14 (remaining gas: 1039987.518 units remaining) + - location: 14 (remaining gas: 1039987.483 units remaining) [ (Pair 16 0) ] - - location: 20 (remaining gas: 1039987.508 units remaining) + - location: 20 (remaining gas: 1039987.473 units remaining) [ 16 ] - - location: 21 (remaining gas: 1039987.498 units remaining) + - location: 21 (remaining gas: 1039987.463 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 16 ] - - location: 24 (remaining gas: 1039987.167 units remaining) + - location: 24 (remaining gas: 1039987.132 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 25 (remaining gas: 1039987.152 units remaining) + - location: 25 (remaining gas: 1039987.117 units remaining) [ {} 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 27 (remaining gas: 1039987.137 units remaining) + - location: 27 (remaining gas: 1039987.102 units remaining) [ (Pair {} 0x1000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out index 067dc2690f1d..c5fdc6ed66cf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.571 units remaining) + - location: 9 (remaining gas: 1039992.536 units remaining) [ (Pair (Left -2) 0) ] - - location: 9 (remaining gas: 1039992.561 units remaining) + - location: 9 (remaining gas: 1039992.526 units remaining) [ (Left -2) ] - - location: 10 (remaining gas: 1039992.551 units remaining) + - location: 10 (remaining gas: 1039992.516 units remaining) [ -2 ] - - location: 12 (remaining gas: 1039992.511 units remaining) + - location: 12 (remaining gas: 1039992.476 units remaining) [ 2 ] - - location: 10 (remaining gas: 1039992.496 units remaining) + - location: 10 (remaining gas: 1039992.461 units remaining) [ 2 ] - - location: 15 (remaining gas: 1039992.481 units remaining) + - location: 15 (remaining gas: 1039992.446 units remaining) [ {} 2 ] - - location: 17 (remaining gas: 1039992.466 units remaining) + - location: 17 (remaining gas: 1039992.431 units remaining) [ (Pair {} 2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out index fb41b7c043d5..4a0f3929cc46 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.571 units remaining) + - location: 9 (remaining gas: 1039992.536 units remaining) [ (Pair (Left 0) 0) ] - - location: 9 (remaining gas: 1039992.561 units remaining) + - location: 9 (remaining gas: 1039992.526 units remaining) [ (Left 0) ] - - location: 10 (remaining gas: 1039992.551 units remaining) + - location: 10 (remaining gas: 1039992.516 units remaining) [ 0 ] - - location: 12 (remaining gas: 1039992.511 units remaining) + - location: 12 (remaining gas: 1039992.476 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039992.496 units remaining) + - location: 10 (remaining gas: 1039992.461 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039992.481 units remaining) + - location: 15 (remaining gas: 1039992.446 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039992.466 units remaining) + - location: 17 (remaining gas: 1039992.431 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out index cdadc9c23b91..8f1e974a7807 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.571 units remaining) + - location: 9 (remaining gas: 1039992.536 units remaining) [ (Pair (Left 2) 0) ] - - location: 9 (remaining gas: 1039992.561 units remaining) + - location: 9 (remaining gas: 1039992.526 units remaining) [ (Left 2) ] - - location: 10 (remaining gas: 1039992.551 units remaining) + - location: 10 (remaining gas: 1039992.516 units remaining) [ 2 ] - - location: 12 (remaining gas: 1039992.511 units remaining) + - location: 12 (remaining gas: 1039992.476 units remaining) [ -2 ] - - location: 10 (remaining gas: 1039992.496 units remaining) + - location: 10 (remaining gas: 1039992.461 units remaining) [ -2 ] - - location: 15 (remaining gas: 1039992.481 units remaining) + - location: 15 (remaining gas: 1039992.446 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039992.466 units remaining) + - location: 17 (remaining gas: 1039992.431 units remaining) [ (Pair {} -2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out index e8a5ec37b0c2..5cc41aaf28b2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.571 units remaining) + - location: 9 (remaining gas: 1039992.536 units remaining) [ (Pair (Right 0) 0) ] - - location: 9 (remaining gas: 1039992.561 units remaining) + - location: 9 (remaining gas: 1039992.526 units remaining) [ (Right 0) ] - - location: 10 (remaining gas: 1039992.551 units remaining) + - location: 10 (remaining gas: 1039992.516 units remaining) [ 0 ] - - location: 14 (remaining gas: 1039992.511 units remaining) + - location: 14 (remaining gas: 1039992.476 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039992.496 units remaining) + - location: 10 (remaining gas: 1039992.461 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039992.481 units remaining) + - location: 15 (remaining gas: 1039992.446 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039992.466 units remaining) + - location: 17 (remaining gas: 1039992.431 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out index 4798833d1957..7728e88c466d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.571 units remaining) + - location: 9 (remaining gas: 1039992.536 units remaining) [ (Pair (Right 2) 0) ] - - location: 9 (remaining gas: 1039992.561 units remaining) + - location: 9 (remaining gas: 1039992.526 units remaining) [ (Right 2) ] - - location: 10 (remaining gas: 1039992.551 units remaining) + - location: 10 (remaining gas: 1039992.516 units remaining) [ 2 ] - - location: 14 (remaining gas: 1039992.511 units remaining) + - location: 14 (remaining gas: 1039992.476 units remaining) [ -2 ] - - location: 10 (remaining gas: 1039992.496 units remaining) + - location: 10 (remaining gas: 1039992.461 units remaining) [ -2 ] - - location: 15 (remaining gas: 1039992.481 units remaining) + - location: 15 (remaining gas: 1039992.446 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039992.466 units remaining) + - location: 17 (remaining gas: 1039992.431 units remaining) [ (Pair {} -2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out index 47adcfb5b6df..e299682e5d22 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.327 units remaining) + - location: 8 (remaining gas: 1039994.292 units remaining) [ (Pair Unit (Some 10)) ] - - location: 8 (remaining gas: 1039994.317 units remaining) + - location: 8 (remaining gas: 1039994.282 units remaining) [ ] - - location: 9 (remaining gas: 1039994.302 units remaining) + - location: 9 (remaining gas: 1039994.267 units remaining) [ None ] - - location: 11 (remaining gas: 1039994.287 units remaining) + - location: 11 (remaining gas: 1039994.252 units remaining) [ {} None ] - - location: 13 (remaining gas: 1039994.272 units remaining) + - location: 13 (remaining gas: 1039994.237 units remaining) [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out index 5db82f3f26e3..5379d4d3e3f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair False None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ False ] - - location: 9 (remaining gas: 1039993.937 units remaining) + - location: 9 (remaining gas: 1039993.902 units remaining) [ True ] - - location: 10 (remaining gas: 1039993.922 units remaining) + - location: 10 (remaining gas: 1039993.887 units remaining) [ (Some True) ] - - location: 11 (remaining gas: 1039993.907 units remaining) + - location: 11 (remaining gas: 1039993.872 units remaining) [ {} (Some True) ] - - location: 13 (remaining gas: 1039993.892 units remaining) + - location: 13 (remaining gas: 1039993.857 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out index 02d7b0a455c1..8a42e4ddfc1e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair True None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ True ] - - location: 9 (remaining gas: 1039993.937 units remaining) + - location: 9 (remaining gas: 1039993.902 units remaining) [ False ] - - location: 10 (remaining gas: 1039993.922 units remaining) + - location: 10 (remaining gas: 1039993.887 units remaining) [ (Some False) ] - - location: 11 (remaining gas: 1039993.907 units remaining) + - location: 11 (remaining gas: 1039993.872 units remaining) [ {} (Some False) ] - - location: 13 (remaining gas: 1039993.892 units remaining) + - location: 13 (remaining gas: 1039993.857 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out index 5c2f2897056a..7cbaf7f26f6f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Left -8) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Left -8) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ -8 ] - - location: 13 (remaining gas: 1039991.500 units remaining) + - location: 13 (remaining gas: 1039991.465 units remaining) [ 7 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ 7 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some 7) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some 7) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some 7)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out index 9c5f42cc4a0b..e322fab29da9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Left -9) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Left -9) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ -9 ] - - location: 13 (remaining gas: 1039991.500 units remaining) + - location: 13 (remaining gas: 1039991.465 units remaining) [ 8 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ 8 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some 8) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some 8) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some 8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out index 9501c3a50e13..ebee77dd4abb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Left 0) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Left 0) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039991.500 units remaining) + - location: 13 (remaining gas: 1039991.465 units remaining) [ -1 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out index 1aa86fadeb18..8a42209fa149 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Left 7) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Left 7) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 7 ] - - location: 13 (remaining gas: 1039991.500 units remaining) + - location: 13 (remaining gas: 1039991.465 units remaining) [ -8 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -8 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out index 93812c591c77..a1feef1e96e9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Left 8) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Left 8) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039991.500 units remaining) + - location: 13 (remaining gas: 1039991.465 units remaining) [ -9 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -9 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -9)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out index b16b9af7f1ac..76b99d676811 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Right 0) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Right 0) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039991.500 units remaining) + - location: 15 (remaining gas: 1039991.465 units remaining) [ -1 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out index 246e8e4c05d8..6ead18b56233 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Right 7) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Right 7) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 7 ] - - location: 15 (remaining gas: 1039991.500 units remaining) + - location: 15 (remaining gas: 1039991.465 units remaining) [ -8 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -8 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out index 0f6f27c70f9e..be9ec7d6b06b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.570 units remaining) + - location: 10 (remaining gas: 1039991.535 units remaining) [ (Pair (Right 8) None) ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.525 units remaining) [ (Right 8) ] - - location: 11 (remaining gas: 1039991.550 units remaining) + - location: 11 (remaining gas: 1039991.515 units remaining) [ 8 ] - - location: 15 (remaining gas: 1039991.500 units remaining) + - location: 15 (remaining gas: 1039991.465 units remaining) [ -9 ] - - location: 11 (remaining gas: 1039991.485 units remaining) + - location: 11 (remaining gas: 1039991.450 units remaining) [ -9 ] - - location: 16 (remaining gas: 1039991.470 units remaining) + - location: 16 (remaining gas: 1039991.435 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039991.455 units remaining) + - location: 17 (remaining gas: 1039991.420 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039991.440 units remaining) + - location: 19 (remaining gas: 1039991.405 units remaining) [ (Pair {} (Some -9)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out index d55e810c3130..8759d876c46f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.715 units remaining) + - location: 10 (remaining gas: 1039990.680 units remaining) [ (Pair (Pair False False) None) ] - - location: 10 (remaining gas: 1039990.705 units remaining) + - location: 10 (remaining gas: 1039990.670 units remaining) [ (Pair False False) ] - - location: 11 (remaining gas: 1039990.695 units remaining) + - location: 11 (remaining gas: 1039990.660 units remaining) [ (Pair False False) (Pair False False) ] - - location: 12 (remaining gas: 1039990.685 units remaining) + - location: 12 (remaining gas: 1039990.650 units remaining) [ False (Pair False False) ] - - location: 13 (remaining gas: 1039990.675 units remaining) + - location: 13 (remaining gas: 1039990.640 units remaining) [ (Pair False False) False ] - - location: 14 (remaining gas: 1039990.665 units remaining) + - location: 14 (remaining gas: 1039990.630 units remaining) [ False False ] - - location: 15 (remaining gas: 1039990.650 units remaining) + - location: 15 (remaining gas: 1039990.615 units remaining) [ False ] - - location: 16 (remaining gas: 1039990.635 units remaining) + - location: 16 (remaining gas: 1039990.600 units remaining) [ (Some False) ] - - location: 17 (remaining gas: 1039990.620 units remaining) + - location: 17 (remaining gas: 1039990.585 units remaining) [ {} (Some False) ] - - location: 19 (remaining gas: 1039990.605 units remaining) + - location: 19 (remaining gas: 1039990.570 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out index 7d17223ca924..a8393663ba6f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.715 units remaining) + - location: 10 (remaining gas: 1039990.680 units remaining) [ (Pair (Pair False True) None) ] - - location: 10 (remaining gas: 1039990.705 units remaining) + - location: 10 (remaining gas: 1039990.670 units remaining) [ (Pair False True) ] - - location: 11 (remaining gas: 1039990.695 units remaining) + - location: 11 (remaining gas: 1039990.660 units remaining) [ (Pair False True) (Pair False True) ] - - location: 12 (remaining gas: 1039990.685 units remaining) + - location: 12 (remaining gas: 1039990.650 units remaining) [ False (Pair False True) ] - - location: 13 (remaining gas: 1039990.675 units remaining) + - location: 13 (remaining gas: 1039990.640 units remaining) [ (Pair False True) False ] - - location: 14 (remaining gas: 1039990.665 units remaining) + - location: 14 (remaining gas: 1039990.630 units remaining) [ True False ] - - location: 15 (remaining gas: 1039990.650 units remaining) + - location: 15 (remaining gas: 1039990.615 units remaining) [ True ] - - location: 16 (remaining gas: 1039990.635 units remaining) + - location: 16 (remaining gas: 1039990.600 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039990.620 units remaining) + - location: 17 (remaining gas: 1039990.585 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039990.605 units remaining) + - location: 19 (remaining gas: 1039990.570 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out index 81cc0bf90dad..915310362124 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.715 units remaining) + - location: 10 (remaining gas: 1039990.680 units remaining) [ (Pair (Pair True False) None) ] - - location: 10 (remaining gas: 1039990.705 units remaining) + - location: 10 (remaining gas: 1039990.670 units remaining) [ (Pair True False) ] - - location: 11 (remaining gas: 1039990.695 units remaining) + - location: 11 (remaining gas: 1039990.660 units remaining) [ (Pair True False) (Pair True False) ] - - location: 12 (remaining gas: 1039990.685 units remaining) + - location: 12 (remaining gas: 1039990.650 units remaining) [ True (Pair True False) ] - - location: 13 (remaining gas: 1039990.675 units remaining) + - location: 13 (remaining gas: 1039990.640 units remaining) [ (Pair True False) True ] - - location: 14 (remaining gas: 1039990.665 units remaining) + - location: 14 (remaining gas: 1039990.630 units remaining) [ False True ] - - location: 15 (remaining gas: 1039990.650 units remaining) + - location: 15 (remaining gas: 1039990.615 units remaining) [ True ] - - location: 16 (remaining gas: 1039990.635 units remaining) + - location: 16 (remaining gas: 1039990.600 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039990.620 units remaining) + - location: 17 (remaining gas: 1039990.585 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039990.605 units remaining) + - location: 19 (remaining gas: 1039990.570 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out index 50735e670ce9..8b9317c87b31 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039990.715 units remaining) + - location: 10 (remaining gas: 1039990.680 units remaining) [ (Pair (Pair True True) None) ] - - location: 10 (remaining gas: 1039990.705 units remaining) + - location: 10 (remaining gas: 1039990.670 units remaining) [ (Pair True True) ] - - location: 11 (remaining gas: 1039990.695 units remaining) + - location: 11 (remaining gas: 1039990.660 units remaining) [ (Pair True True) (Pair True True) ] - - location: 12 (remaining gas: 1039990.685 units remaining) + - location: 12 (remaining gas: 1039990.650 units remaining) [ True (Pair True True) ] - - location: 13 (remaining gas: 1039990.675 units remaining) + - location: 13 (remaining gas: 1039990.640 units remaining) [ (Pair True True) True ] - - location: 14 (remaining gas: 1039990.665 units remaining) + - location: 14 (remaining gas: 1039990.630 units remaining) [ True True ] - - location: 15 (remaining gas: 1039990.650 units remaining) + - location: 15 (remaining gas: 1039990.615 units remaining) [ True ] - - location: 16 (remaining gas: 1039990.635 units remaining) + - location: 16 (remaining gas: 1039990.600 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039990.620 units remaining) + - location: 17 (remaining gas: 1039990.585 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039990.605 units remaining) + - location: 19 (remaining gas: 1039990.570 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out index 1e36e297499d..807dd3877e24 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 0 8) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 0 8) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 0 8 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 8) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 8) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out index 080987a3a6ba..95988010344a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 14 1) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 14 1) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 14 1 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 15 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 15) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 15) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 15)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out index 0fdfdbc56b7d..b8605f1a082f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 15 4) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 15 4) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 15 4 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 15 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 15) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 15) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 15)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out index b1617f9c8d9f..5b84b6362c93 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 4 8) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 4 8) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 4 8 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 12 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 12) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 12) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 12)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out index 1d631c0f25bc..0a35709f9200 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 7 7) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 7 7) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 7 7 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 7 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 7) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 7) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 7)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out index c2afc7fa249a..114f5acbf86a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out @@ -7,20 +7,20 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039992.824 units remaining) + - location: 10 (remaining gas: 1039992.789 units remaining) [ (Pair (Pair 8 0) None) ] - - location: 10 (remaining gas: 1039992.814 units remaining) + - location: 10 (remaining gas: 1039992.779 units remaining) [ (Pair 8 0) ] - - location: 11 (remaining gas: 1039992.804 units remaining) + - location: 11 (remaining gas: 1039992.769 units remaining) [ 8 0 ] - - location: 12 (remaining gas: 1039992.749 units remaining) + - location: 12 (remaining gas: 1039992.714 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039992.734 units remaining) + - location: 13 (remaining gas: 1039992.699 units remaining) [ (Some 8) ] - - location: 14 (remaining gas: 1039992.719 units remaining) + - location: 14 (remaining gas: 1039992.684 units remaining) [ {} (Some 8) ] - - location: 16 (remaining gas: 1039992.704 units remaining) + - location: 16 (remaining gas: 1039992.669 units remaining) [ (Pair {} (Some 8)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" index d5ff5550e326..4432c8ae7dcd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039185.305 units remaining) + - location: 16 (remaining gas: 1039185.270 units remaining) [ (Pair (Pair -1 1 "foobar" @@ -18,7 +18,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") Unit) ] - - location: 16 (remaining gas: 1039185.295 units remaining) + - location: 16 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 "foobar" @@ -28,7 +28,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 17 (remaining gas: 1039185.285 units remaining) + - location: 17 (remaining gas: 1039185.250 units remaining) [ (Pair -1 1 "foobar" @@ -47,7 +47,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 18 (remaining gas: 1039185.275 units remaining) + - location: 18 (remaining gas: 1039185.240 units remaining) [ -1 (Pair -1 1 @@ -58,7 +58,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039185.260 units remaining) + - location: 19 (remaining gas: 1039185.225 units remaining) [ (Pair -1 1 "foobar" @@ -68,7 +68,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 21 (remaining gas: 1039185.250 units remaining) + - location: 21 (remaining gas: 1039185.215 units remaining) [ -1 (Pair 1 "foobar" @@ -78,7 +78,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039185.220 units remaining) + - location: 19 (remaining gas: 1039185.185 units remaining) [ -1 -1 (Pair 1 @@ -89,7 +89,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 22 (remaining gas: 1039184.993 units remaining) + - location: 22 (remaining gas: 1039184.958 units remaining) [ 0x050041 -1 (Pair 1 @@ -100,7 +100,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 23 (remaining gas: 1039184.573 units remaining) + - location: 23 (remaining gas: 1039184.538 units remaining) [ (Some -1) -1 (Pair 1 @@ -111,7 +111,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 26 (remaining gas: 1039184.563 units remaining) + - location: 26 (remaining gas: 1039184.528 units remaining) [ -1 -1 (Pair 1 @@ -122,7 +122,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 26 (remaining gas: 1039184.548 units remaining) + - location: 26 (remaining gas: 1039184.513 units remaining) [ -1 -1 (Pair 1 @@ -133,7 +133,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 34 (remaining gas: 1039184.513 units remaining) + - location: 34 (remaining gas: 1039184.478 units remaining) [ 0 (Pair 1 "foobar" @@ -143,7 +143,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 35 (remaining gas: 1039184.498 units remaining) + - location: 35 (remaining gas: 1039184.463 units remaining) [ True (Pair 1 "foobar" @@ -153,7 +153,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 36 (remaining gas: 1039184.488 units remaining) + - location: 36 (remaining gas: 1039184.453 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -162,7 +162,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 36 (remaining gas: 1039184.473 units remaining) + - location: 36 (remaining gas: 1039184.438 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -171,7 +171,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 42 (remaining gas: 1039184.463 units remaining) + - location: 42 (remaining gas: 1039184.428 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -188,7 +188,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 43 (remaining gas: 1039184.453 units remaining) + - location: 43 (remaining gas: 1039184.418 units remaining) [ 1 (Pair 1 "foobar" @@ -198,7 +198,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039184.438 units remaining) + - location: 44 (remaining gas: 1039184.403 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -207,7 +207,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 46 (remaining gas: 1039184.428 units remaining) + - location: 46 (remaining gas: 1039184.393 units remaining) [ 1 (Pair "foobar" 0x00aabbcc @@ -216,7 +216,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039184.398 units remaining) + - location: 44 (remaining gas: 1039184.363 units remaining) [ 1 1 (Pair "foobar" @@ -226,7 +226,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 47 (remaining gas: 1039184.171 units remaining) + - location: 47 (remaining gas: 1039184.136 units remaining) [ 0x050001 1 (Pair "foobar" @@ -236,7 +236,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 48 (remaining gas: 1039183.751 units remaining) + - location: 48 (remaining gas: 1039183.716 units remaining) [ (Some 1) 1 (Pair "foobar" @@ -246,7 +246,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 51 (remaining gas: 1039183.741 units remaining) + - location: 51 (remaining gas: 1039183.706 units remaining) [ 1 1 (Pair "foobar" @@ -256,7 +256,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 51 (remaining gas: 1039183.726 units remaining) + - location: 51 (remaining gas: 1039183.691 units remaining) [ 1 1 (Pair "foobar" @@ -266,7 +266,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 59 (remaining gas: 1039183.691 units remaining) + - location: 59 (remaining gas: 1039183.656 units remaining) [ 0 (Pair "foobar" 0x00aabbcc @@ -275,7 +275,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 60 (remaining gas: 1039183.676 units remaining) + - location: 60 (remaining gas: 1039183.641 units remaining) [ True (Pair "foobar" 0x00aabbcc @@ -284,7 +284,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 61 (remaining gas: 1039183.666 units remaining) + - location: 61 (remaining gas: 1039183.631 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -292,7 +292,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 61 (remaining gas: 1039183.651 units remaining) + - location: 61 (remaining gas: 1039183.616 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -300,7 +300,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 67 (remaining gas: 1039183.641 units remaining) + - location: 67 (remaining gas: 1039183.606 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -315,7 +315,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 68 (remaining gas: 1039183.631 units remaining) + - location: 68 (remaining gas: 1039183.596 units remaining) [ "foobar" (Pair "foobar" 0x00aabbcc @@ -324,7 +324,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039183.616 units remaining) + - location: 69 (remaining gas: 1039183.581 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -332,7 +332,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 71 (remaining gas: 1039183.606 units remaining) + - location: 71 (remaining gas: 1039183.571 units remaining) [ "foobar" (Pair 0x00aabbcc 1000 @@ -340,7 +340,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039183.576 units remaining) + - location: 69 (remaining gas: 1039183.541 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -349,7 +349,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 72 (remaining gas: 1039183.052 units remaining) + - location: 72 (remaining gas: 1039183.017 units remaining) [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc @@ -358,7 +358,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 73 (remaining gas: 1039182.377 units remaining) + - location: 73 (remaining gas: 1039182.342 units remaining) [ (Some "foobar") "foobar" (Pair 0x00aabbcc @@ -367,7 +367,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 76 (remaining gas: 1039182.367 units remaining) + - location: 76 (remaining gas: 1039182.332 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -376,7 +376,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 76 (remaining gas: 1039182.352 units remaining) + - location: 76 (remaining gas: 1039182.317 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -385,7 +385,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 84 (remaining gas: 1039182.317 units remaining) + - location: 84 (remaining gas: 1039182.282 units remaining) [ 0 (Pair 0x00aabbcc 1000 @@ -393,7 +393,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 85 (remaining gas: 1039182.302 units remaining) + - location: 85 (remaining gas: 1039182.267 units remaining) [ True (Pair 0x00aabbcc 1000 @@ -401,21 +401,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 86 (remaining gas: 1039182.292 units remaining) + - location: 86 (remaining gas: 1039182.257 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 86 (remaining gas: 1039182.277 units remaining) + - location: 86 (remaining gas: 1039182.242 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 92 (remaining gas: 1039182.267 units remaining) + - location: 92 (remaining gas: 1039182.232 units remaining) [ (Pair 0x00aabbcc 1000 False @@ -428,7 +428,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 93 (remaining gas: 1039182.257 units remaining) + - location: 93 (remaining gas: 1039182.222 units remaining) [ 0x00aabbcc (Pair 0x00aabbcc 1000 @@ -436,21 +436,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039182.242 units remaining) + - location: 94 (remaining gas: 1039182.207 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 96 (remaining gas: 1039182.232 units remaining) + - location: 96 (remaining gas: 1039182.197 units remaining) [ 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039182.202 units remaining) + - location: 94 (remaining gas: 1039182.167 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -458,7 +458,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 97 (remaining gas: 1039181.744 units remaining) + - location: 97 (remaining gas: 1039181.709 units remaining) [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 @@ -466,7 +466,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 98 (remaining gas: 1039181.183 units remaining) + - location: 98 (remaining gas: 1039181.148 units remaining) [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 @@ -474,7 +474,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 101 (remaining gas: 1039181.173 units remaining) + - location: 101 (remaining gas: 1039181.138 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -482,7 +482,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 101 (remaining gas: 1039181.158 units remaining) + - location: 101 (remaining gas: 1039181.123 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -490,33 +490,33 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 109 (remaining gas: 1039181.123 units remaining) + - location: 109 (remaining gas: 1039181.088 units remaining) [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 110 (remaining gas: 1039181.108 units remaining) + - location: 110 (remaining gas: 1039181.073 units remaining) [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 111 (remaining gas: 1039181.098 units remaining) + - location: 111 (remaining gas: 1039181.063 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 111 (remaining gas: 1039181.083 units remaining) + - location: 111 (remaining gas: 1039181.048 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 117 (remaining gas: 1039181.073 units remaining) + - location: 117 (remaining gas: 1039181.038 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -527,83 +527,83 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 118 (remaining gas: 1039181.063 units remaining) + - location: 118 (remaining gas: 1039181.028 units remaining) [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039181.048 units remaining) + - location: 119 (remaining gas: 1039181.013 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 121 (remaining gas: 1039181.038 units remaining) + - location: 121 (remaining gas: 1039181.003 units remaining) [ 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039181.008 units remaining) + - location: 119 (remaining gas: 1039180.973 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 122 (remaining gas: 1039180.748 units remaining) + - location: 122 (remaining gas: 1039180.713 units remaining) [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 123 (remaining gas: 1039180.308 units remaining) + - location: 123 (remaining gas: 1039180.273 units remaining) [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 126 (remaining gas: 1039180.298 units remaining) + - location: 126 (remaining gas: 1039180.263 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 126 (remaining gas: 1039180.283 units remaining) + - location: 126 (remaining gas: 1039180.248 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 134 (remaining gas: 1039180.248 units remaining) + - location: 134 (remaining gas: 1039180.213 units remaining) [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 135 (remaining gas: 1039180.233 units remaining) + - location: 135 (remaining gas: 1039180.198 units remaining) [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 136 (remaining gas: 1039180.223 units remaining) + - location: 136 (remaining gas: 1039180.188 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 136 (remaining gas: 1039180.208 units remaining) + - location: 136 (remaining gas: 1039180.173 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 142 (remaining gas: 1039180.198 units remaining) + - location: 142 (remaining gas: 1039180.163 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -612,234 +612,234 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 143 (remaining gas: 1039180.188 units remaining) + - location: 143 (remaining gas: 1039180.153 units remaining) [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039180.173 units remaining) + - location: 144 (remaining gas: 1039180.138 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 146 (remaining gas: 1039180.163 units remaining) + - location: 146 (remaining gas: 1039180.128 units remaining) [ False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039180.133 units remaining) + - location: 144 (remaining gas: 1039180.098 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 147 (remaining gas: 1039179.906 units remaining) + - location: 147 (remaining gas: 1039179.871 units remaining) [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 148 (remaining gas: 1039179.486 units remaining) + - location: 148 (remaining gas: 1039179.451 units remaining) [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 151 (remaining gas: 1039179.476 units remaining) + - location: 151 (remaining gas: 1039179.441 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 151 (remaining gas: 1039179.461 units remaining) + - location: 151 (remaining gas: 1039179.426 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 159 (remaining gas: 1039179.426 units remaining) + - location: 159 (remaining gas: 1039179.391 units remaining) [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 160 (remaining gas: 1039179.411 units remaining) + - location: 160 (remaining gas: 1039179.376 units remaining) [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 161 (remaining gas: 1039179.401 units remaining) + - location: 161 (remaining gas: 1039179.366 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 161 (remaining gas: 1039179.386 units remaining) + - location: 161 (remaining gas: 1039179.351 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 167 (remaining gas: 1039179.376 units remaining) + - location: 167 (remaining gas: 1039179.341 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 168 (remaining gas: 1039179.366 units remaining) + - location: 168 (remaining gas: 1039179.331 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039179.351 units remaining) + - location: 169 (remaining gas: 1039179.316 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 171 (remaining gas: 1039179.341 units remaining) + - location: 171 (remaining gas: 1039179.306 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039179.311 units remaining) + - location: 169 (remaining gas: 1039179.276 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 172 (remaining gas: 1039178.221 units remaining) + - location: 172 (remaining gas: 1039178.186 units remaining) [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 173 (remaining gas: 1039177.268 units remaining) + - location: 173 (remaining gas: 1039177.233 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 176 (remaining gas: 1039177.258 units remaining) + - location: 176 (remaining gas: 1039177.223 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 176 (remaining gas: 1039177.243 units remaining) + - location: 176 (remaining gas: 1039177.208 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 184 (remaining gas: 1039177.207 units remaining) + - location: 184 (remaining gas: 1039177.172 units remaining) [ 0 (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 185 (remaining gas: 1039177.192 units remaining) + - location: 185 (remaining gas: 1039177.157 units remaining) [ True (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 186 (remaining gas: 1039177.182 units remaining) + - location: 186 (remaining gas: 1039177.147 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 186 (remaining gas: 1039177.167 units remaining) + - location: 186 (remaining gas: 1039177.132 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 192 (remaining gas: 1039177.157 units remaining) + - location: 192 (remaining gas: 1039177.122 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 193 (remaining gas: 1039177.147 units remaining) + - location: 193 (remaining gas: 1039177.112 units remaining) [ "2019-09-09T08:35:33Z" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 194 (remaining gas: 1039177.132 units remaining) + - location: 194 (remaining gas: 1039177.097 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 196 (remaining gas: 1039177.122 units remaining) + - location: 196 (remaining gas: 1039177.087 units remaining) [ "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 194 (remaining gas: 1039177.092 units remaining) + - location: 194 (remaining gas: 1039177.057 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 197 (remaining gas: 1039176.733 units remaining) + - location: 197 (remaining gas: 1039176.698 units remaining) [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 198 (remaining gas: 1039176.233 units remaining) + - location: 198 (remaining gas: 1039176.198 units remaining) [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 201 (remaining gas: 1039176.223 units remaining) + - location: 201 (remaining gas: 1039176.188 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 201 (remaining gas: 1039176.208 units remaining) + - location: 201 (remaining gas: 1039176.173 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 209 (remaining gas: 1039176.173 units remaining) + - location: 209 (remaining gas: 1039176.138 units remaining) [ 0 "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 210 (remaining gas: 1039176.158 units remaining) + - location: 210 (remaining gas: 1039176.123 units remaining) [ True "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 211 (remaining gas: 1039176.148 units remaining) + - location: 211 (remaining gas: 1039176.113 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 211 (remaining gas: 1039176.133 units remaining) + - location: 211 (remaining gas: 1039176.098 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 217 (remaining gas: 1039176.123 units remaining) + - location: 217 (remaining gas: 1039176.088 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 218 (remaining gas: 1039165.170 units remaining) + - location: 218 (remaining gas: 1039165.135 units remaining) [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 219 (remaining gas: 1038514.247 units remaining) + - location: 219 (remaining gas: 1038514.212 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 222 (remaining gas: 1038514.237 units remaining) + - location: 222 (remaining gas: 1038514.202 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 222 (remaining gas: 1038514.222 units remaining) + - location: 222 (remaining gas: 1038514.187 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 230 (remaining gas: 1038514.186 units remaining) + - location: 230 (remaining gas: 1038514.151 units remaining) [ 0 ] - - location: 231 (remaining gas: 1038514.171 units remaining) + - location: 231 (remaining gas: 1038514.136 units remaining) [ True ] - - location: 232 (remaining gas: 1038514.161 units remaining) + - location: 232 (remaining gas: 1038514.126 units remaining) [ ] - - location: 232 (remaining gas: 1038514.146 units remaining) + - location: 232 (remaining gas: 1038514.111 units remaining) [ ] - - location: 238 (remaining gas: 1038514.136 units remaining) + - location: 238 (remaining gas: 1038514.101 units remaining) [ 0 ] - - location: 241 (remaining gas: 1038513.909 units remaining) + - location: 241 (remaining gas: 1038513.874 units remaining) [ 0x050000 ] - - location: 242 (remaining gas: 1038513.489 units remaining) + - location: 242 (remaining gas: 1038513.454 units remaining) [ (Some 0) ] - - location: 245 (remaining gas: 1038513.479 units remaining) + - location: 245 (remaining gas: 1038513.444 units remaining) [ 0 ] - - location: 245 (remaining gas: 1038513.464 units remaining) + - location: 245 (remaining gas: 1038513.429 units remaining) [ 0 ] - - location: 251 (remaining gas: 1038513.454 units remaining) + - location: 251 (remaining gas: 1038513.419 units remaining) [ ] - - location: 252 (remaining gas: 1038513.444 units remaining) + - location: 252 (remaining gas: 1038513.409 units remaining) [ -1 ] - - location: 255 (remaining gas: 1038513.217 units remaining) + - location: 255 (remaining gas: 1038513.182 units remaining) [ 0x050041 ] - - location: 256 (remaining gas: 1038416.897 units remaining) + - location: 256 (remaining gas: 1038416.862 units remaining) [ None ] - - location: 259 (remaining gas: 1038416.887 units remaining) + - location: 259 (remaining gas: 1038416.852 units remaining) [ ] - - location: 259 (remaining gas: 1038416.872 units remaining) + - location: 259 (remaining gas: 1038416.837 units remaining) [ ] - - location: 265 (remaining gas: 1038416.862 units remaining) + - location: 265 (remaining gas: 1038416.827 units remaining) [ 0x ] - - location: 268 (remaining gas: 1038416.602 units remaining) + - location: 268 (remaining gas: 1038416.567 units remaining) [ None ] - - location: 271 (remaining gas: 1038416.592 units remaining) + - location: 271 (remaining gas: 1038416.557 units remaining) [ ] - - location: 271 (remaining gas: 1038416.577 units remaining) + - location: 271 (remaining gas: 1038416.542 units remaining) [ ] - - location: 277 (remaining gas: 1038416.567 units remaining) + - location: 277 (remaining gas: 1038416.532 units remaining) [ 0x04 ] - - location: 280 (remaining gas: 1038416.287 units remaining) + - location: 280 (remaining gas: 1038416.252 units remaining) [ None ] - - location: 283 (remaining gas: 1038416.277 units remaining) + - location: 283 (remaining gas: 1038416.242 units remaining) [ ] - - location: 283 (remaining gas: 1038416.262 units remaining) + - location: 283 (remaining gas: 1038416.227 units remaining) [ ] - - location: 289 (remaining gas: 1038416.252 units remaining) + - location: 289 (remaining gas: 1038416.217 units remaining) [ 0x05 ] - - location: 292 (remaining gas: 1038415.972 units remaining) + - location: 292 (remaining gas: 1038415.937 units remaining) [ None ] - - location: 295 (remaining gas: 1038415.962 units remaining) + - location: 295 (remaining gas: 1038415.927 units remaining) [ ] - - location: 295 (remaining gas: 1038415.947 units remaining) + - location: 295 (remaining gas: 1038415.912 units remaining) [ ] - - location: 301 (remaining gas: 1038415.937 units remaining) + - location: 301 (remaining gas: 1038415.902 units remaining) [ Unit ] - - location: 302 (remaining gas: 1038415.922 units remaining) + - location: 302 (remaining gas: 1038415.887 units remaining) [ {} Unit ] - - location: 304 (remaining gas: 1038415.907 units remaining) + - location: 304 (remaining gas: 1038415.872 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" index f609a0094ae4..208711b0ec8d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039185.305 units remaining) + - location: 16 (remaining gas: 1039185.270 units remaining) [ (Pair (Pair -1 1 "foobar" @@ -18,7 +18,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") Unit) ] - - location: 16 (remaining gas: 1039185.295 units remaining) + - location: 16 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 "foobar" @@ -28,7 +28,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 17 (remaining gas: 1039185.285 units remaining) + - location: 17 (remaining gas: 1039185.250 units remaining) [ (Pair -1 1 "foobar" @@ -47,7 +47,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 18 (remaining gas: 1039185.275 units remaining) + - location: 18 (remaining gas: 1039185.240 units remaining) [ -1 (Pair -1 1 @@ -58,7 +58,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039185.260 units remaining) + - location: 19 (remaining gas: 1039185.225 units remaining) [ (Pair -1 1 "foobar" @@ -68,7 +68,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 21 (remaining gas: 1039185.250 units remaining) + - location: 21 (remaining gas: 1039185.215 units remaining) [ -1 (Pair 1 "foobar" @@ -78,7 +78,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039185.220 units remaining) + - location: 19 (remaining gas: 1039185.185 units remaining) [ -1 -1 (Pair 1 @@ -89,7 +89,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 22 (remaining gas: 1039184.993 units remaining) + - location: 22 (remaining gas: 1039184.958 units remaining) [ 0x050041 -1 (Pair 1 @@ -100,7 +100,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 23 (remaining gas: 1039184.573 units remaining) + - location: 23 (remaining gas: 1039184.538 units remaining) [ (Some -1) -1 (Pair 1 @@ -111,7 +111,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 26 (remaining gas: 1039184.563 units remaining) + - location: 26 (remaining gas: 1039184.528 units remaining) [ -1 -1 (Pair 1 @@ -122,7 +122,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 26 (remaining gas: 1039184.548 units remaining) + - location: 26 (remaining gas: 1039184.513 units remaining) [ -1 -1 (Pair 1 @@ -133,7 +133,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 34 (remaining gas: 1039184.513 units remaining) + - location: 34 (remaining gas: 1039184.478 units remaining) [ 0 (Pair 1 "foobar" @@ -143,7 +143,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 35 (remaining gas: 1039184.498 units remaining) + - location: 35 (remaining gas: 1039184.463 units remaining) [ True (Pair 1 "foobar" @@ -153,7 +153,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 36 (remaining gas: 1039184.488 units remaining) + - location: 36 (remaining gas: 1039184.453 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -162,7 +162,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 36 (remaining gas: 1039184.473 units remaining) + - location: 36 (remaining gas: 1039184.438 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -171,7 +171,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 42 (remaining gas: 1039184.463 units remaining) + - location: 42 (remaining gas: 1039184.428 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -188,7 +188,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 43 (remaining gas: 1039184.453 units remaining) + - location: 43 (remaining gas: 1039184.418 units remaining) [ 1 (Pair 1 "foobar" @@ -198,7 +198,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039184.438 units remaining) + - location: 44 (remaining gas: 1039184.403 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -207,7 +207,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 46 (remaining gas: 1039184.428 units remaining) + - location: 46 (remaining gas: 1039184.393 units remaining) [ 1 (Pair "foobar" 0x00aabbcc @@ -216,7 +216,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039184.398 units remaining) + - location: 44 (remaining gas: 1039184.363 units remaining) [ 1 1 (Pair "foobar" @@ -226,7 +226,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 47 (remaining gas: 1039184.171 units remaining) + - location: 47 (remaining gas: 1039184.136 units remaining) [ 0x050001 1 (Pair "foobar" @@ -236,7 +236,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 48 (remaining gas: 1039183.751 units remaining) + - location: 48 (remaining gas: 1039183.716 units remaining) [ (Some 1) 1 (Pair "foobar" @@ -246,7 +246,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 51 (remaining gas: 1039183.741 units remaining) + - location: 51 (remaining gas: 1039183.706 units remaining) [ 1 1 (Pair "foobar" @@ -256,7 +256,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 51 (remaining gas: 1039183.726 units remaining) + - location: 51 (remaining gas: 1039183.691 units remaining) [ 1 1 (Pair "foobar" @@ -266,7 +266,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 59 (remaining gas: 1039183.691 units remaining) + - location: 59 (remaining gas: 1039183.656 units remaining) [ 0 (Pair "foobar" 0x00aabbcc @@ -275,7 +275,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 60 (remaining gas: 1039183.676 units remaining) + - location: 60 (remaining gas: 1039183.641 units remaining) [ True (Pair "foobar" 0x00aabbcc @@ -284,7 +284,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 61 (remaining gas: 1039183.666 units remaining) + - location: 61 (remaining gas: 1039183.631 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -292,7 +292,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 61 (remaining gas: 1039183.651 units remaining) + - location: 61 (remaining gas: 1039183.616 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -300,7 +300,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 67 (remaining gas: 1039183.641 units remaining) + - location: 67 (remaining gas: 1039183.606 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -315,7 +315,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 68 (remaining gas: 1039183.631 units remaining) + - location: 68 (remaining gas: 1039183.596 units remaining) [ "foobar" (Pair "foobar" 0x00aabbcc @@ -324,7 +324,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039183.616 units remaining) + - location: 69 (remaining gas: 1039183.581 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -332,7 +332,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 71 (remaining gas: 1039183.606 units remaining) + - location: 71 (remaining gas: 1039183.571 units remaining) [ "foobar" (Pair 0x00aabbcc 1000 @@ -340,7 +340,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039183.576 units remaining) + - location: 69 (remaining gas: 1039183.541 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -349,7 +349,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 72 (remaining gas: 1039183.052 units remaining) + - location: 72 (remaining gas: 1039183.017 units remaining) [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc @@ -358,7 +358,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 73 (remaining gas: 1039182.377 units remaining) + - location: 73 (remaining gas: 1039182.342 units remaining) [ (Some "foobar") "foobar" (Pair 0x00aabbcc @@ -367,7 +367,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 76 (remaining gas: 1039182.367 units remaining) + - location: 76 (remaining gas: 1039182.332 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -376,7 +376,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 76 (remaining gas: 1039182.352 units remaining) + - location: 76 (remaining gas: 1039182.317 units remaining) [ "foobar" "foobar" (Pair 0x00aabbcc @@ -385,7 +385,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 84 (remaining gas: 1039182.317 units remaining) + - location: 84 (remaining gas: 1039182.282 units remaining) [ 0 (Pair 0x00aabbcc 1000 @@ -393,7 +393,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 85 (remaining gas: 1039182.302 units remaining) + - location: 85 (remaining gas: 1039182.267 units remaining) [ True (Pair 0x00aabbcc 1000 @@ -401,21 +401,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 86 (remaining gas: 1039182.292 units remaining) + - location: 86 (remaining gas: 1039182.257 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 86 (remaining gas: 1039182.277 units remaining) + - location: 86 (remaining gas: 1039182.242 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 92 (remaining gas: 1039182.267 units remaining) + - location: 92 (remaining gas: 1039182.232 units remaining) [ (Pair 0x00aabbcc 1000 False @@ -428,7 +428,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 93 (remaining gas: 1039182.257 units remaining) + - location: 93 (remaining gas: 1039182.222 units remaining) [ 0x00aabbcc (Pair 0x00aabbcc 1000 @@ -436,21 +436,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039182.242 units remaining) + - location: 94 (remaining gas: 1039182.207 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 96 (remaining gas: 1039182.232 units remaining) + - location: 96 (remaining gas: 1039182.197 units remaining) [ 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039182.202 units remaining) + - location: 94 (remaining gas: 1039182.167 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -458,7 +458,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 97 (remaining gas: 1039181.744 units remaining) + - location: 97 (remaining gas: 1039181.709 units remaining) [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 @@ -466,7 +466,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 98 (remaining gas: 1039181.183 units remaining) + - location: 98 (remaining gas: 1039181.148 units remaining) [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 @@ -474,7 +474,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 101 (remaining gas: 1039181.173 units remaining) + - location: 101 (remaining gas: 1039181.138 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -482,7 +482,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 101 (remaining gas: 1039181.158 units remaining) + - location: 101 (remaining gas: 1039181.123 units remaining) [ 0x00aabbcc 0x00aabbcc (Pair 1000 @@ -490,33 +490,33 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 109 (remaining gas: 1039181.123 units remaining) + - location: 109 (remaining gas: 1039181.088 units remaining) [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 110 (remaining gas: 1039181.108 units remaining) + - location: 110 (remaining gas: 1039181.073 units remaining) [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 111 (remaining gas: 1039181.098 units remaining) + - location: 111 (remaining gas: 1039181.063 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 111 (remaining gas: 1039181.083 units remaining) + - location: 111 (remaining gas: 1039181.048 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 117 (remaining gas: 1039181.073 units remaining) + - location: 117 (remaining gas: 1039181.038 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -527,83 +527,83 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 118 (remaining gas: 1039181.063 units remaining) + - location: 118 (remaining gas: 1039181.028 units remaining) [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039181.048 units remaining) + - location: 119 (remaining gas: 1039181.013 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 121 (remaining gas: 1039181.038 units remaining) + - location: 121 (remaining gas: 1039181.003 units remaining) [ 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039181.008 units remaining) + - location: 119 (remaining gas: 1039180.973 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 122 (remaining gas: 1039180.748 units remaining) + - location: 122 (remaining gas: 1039180.713 units remaining) [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 123 (remaining gas: 1039180.308 units remaining) + - location: 123 (remaining gas: 1039180.273 units remaining) [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 126 (remaining gas: 1039180.298 units remaining) + - location: 126 (remaining gas: 1039180.263 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 126 (remaining gas: 1039180.283 units remaining) + - location: 126 (remaining gas: 1039180.248 units remaining) [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 134 (remaining gas: 1039180.248 units remaining) + - location: 134 (remaining gas: 1039180.213 units remaining) [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 135 (remaining gas: 1039180.233 units remaining) + - location: 135 (remaining gas: 1039180.198 units remaining) [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 136 (remaining gas: 1039180.223 units remaining) + - location: 136 (remaining gas: 1039180.188 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 136 (remaining gas: 1039180.208 units remaining) + - location: 136 (remaining gas: 1039180.173 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 142 (remaining gas: 1039180.198 units remaining) + - location: 142 (remaining gas: 1039180.163 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -612,234 +612,234 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 143 (remaining gas: 1039180.188 units remaining) + - location: 143 (remaining gas: 1039180.153 units remaining) [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039180.173 units remaining) + - location: 144 (remaining gas: 1039180.138 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 146 (remaining gas: 1039180.163 units remaining) + - location: 146 (remaining gas: 1039180.128 units remaining) [ False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039180.133 units remaining) + - location: 144 (remaining gas: 1039180.098 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 147 (remaining gas: 1039179.906 units remaining) + - location: 147 (remaining gas: 1039179.871 units remaining) [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 148 (remaining gas: 1039179.486 units remaining) + - location: 148 (remaining gas: 1039179.451 units remaining) [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 151 (remaining gas: 1039179.476 units remaining) + - location: 151 (remaining gas: 1039179.441 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 151 (remaining gas: 1039179.461 units remaining) + - location: 151 (remaining gas: 1039179.426 units remaining) [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 159 (remaining gas: 1039179.426 units remaining) + - location: 159 (remaining gas: 1039179.391 units remaining) [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 160 (remaining gas: 1039179.411 units remaining) + - location: 160 (remaining gas: 1039179.376 units remaining) [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 161 (remaining gas: 1039179.401 units remaining) + - location: 161 (remaining gas: 1039179.366 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 161 (remaining gas: 1039179.386 units remaining) + - location: 161 (remaining gas: 1039179.351 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 167 (remaining gas: 1039179.376 units remaining) + - location: 167 (remaining gas: 1039179.341 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 168 (remaining gas: 1039179.366 units remaining) + - location: 168 (remaining gas: 1039179.331 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039179.351 units remaining) + - location: 169 (remaining gas: 1039179.316 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 171 (remaining gas: 1039179.341 units remaining) + - location: 171 (remaining gas: 1039179.306 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039179.311 units remaining) + - location: 169 (remaining gas: 1039179.276 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 172 (remaining gas: 1039178.221 units remaining) + - location: 172 (remaining gas: 1039178.186 units remaining) [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 173 (remaining gas: 1039177.268 units remaining) + - location: 173 (remaining gas: 1039177.233 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 176 (remaining gas: 1039177.258 units remaining) + - location: 176 (remaining gas: 1039177.223 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 176 (remaining gas: 1039177.243 units remaining) + - location: 176 (remaining gas: 1039177.208 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 184 (remaining gas: 1039177.207 units remaining) + - location: 184 (remaining gas: 1039177.172 units remaining) [ 0 (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 185 (remaining gas: 1039177.192 units remaining) + - location: 185 (remaining gas: 1039177.157 units remaining) [ True (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 186 (remaining gas: 1039177.182 units remaining) + - location: 186 (remaining gas: 1039177.147 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 186 (remaining gas: 1039177.167 units remaining) + - location: 186 (remaining gas: 1039177.132 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 192 (remaining gas: 1039177.157 units remaining) + - location: 192 (remaining gas: 1039177.122 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 193 (remaining gas: 1039177.147 units remaining) + - location: 193 (remaining gas: 1039177.112 units remaining) [ "2019-09-09T08:35:33Z" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 194 (remaining gas: 1039177.132 units remaining) + - location: 194 (remaining gas: 1039177.097 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 196 (remaining gas: 1039177.122 units remaining) + - location: 196 (remaining gas: 1039177.087 units remaining) [ "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 194 (remaining gas: 1039177.092 units remaining) + - location: 194 (remaining gas: 1039177.057 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 197 (remaining gas: 1039176.733 units remaining) + - location: 197 (remaining gas: 1039176.698 units remaining) [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 198 (remaining gas: 1039176.233 units remaining) + - location: 198 (remaining gas: 1039176.198 units remaining) [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 201 (remaining gas: 1039176.223 units remaining) + - location: 201 (remaining gas: 1039176.188 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 201 (remaining gas: 1039176.208 units remaining) + - location: 201 (remaining gas: 1039176.173 units remaining) [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 209 (remaining gas: 1039176.173 units remaining) + - location: 209 (remaining gas: 1039176.138 units remaining) [ 0 "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 210 (remaining gas: 1039176.158 units remaining) + - location: 210 (remaining gas: 1039176.123 units remaining) [ True "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 211 (remaining gas: 1039176.148 units remaining) + - location: 211 (remaining gas: 1039176.113 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 211 (remaining gas: 1039176.133 units remaining) + - location: 211 (remaining gas: 1039176.098 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 217 (remaining gas: 1039176.123 units remaining) + - location: 217 (remaining gas: 1039176.088 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 218 (remaining gas: 1039165.170 units remaining) + - location: 218 (remaining gas: 1039165.135 units remaining) [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 219 (remaining gas: 1038514.247 units remaining) + - location: 219 (remaining gas: 1038514.212 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 222 (remaining gas: 1038514.237 units remaining) + - location: 222 (remaining gas: 1038514.202 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 222 (remaining gas: 1038514.222 units remaining) + - location: 222 (remaining gas: 1038514.187 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 230 (remaining gas: 1038514.186 units remaining) + - location: 230 (remaining gas: 1038514.151 units remaining) [ 0 ] - - location: 231 (remaining gas: 1038514.171 units remaining) + - location: 231 (remaining gas: 1038514.136 units remaining) [ True ] - - location: 232 (remaining gas: 1038514.161 units remaining) + - location: 232 (remaining gas: 1038514.126 units remaining) [ ] - - location: 232 (remaining gas: 1038514.146 units remaining) + - location: 232 (remaining gas: 1038514.111 units remaining) [ ] - - location: 238 (remaining gas: 1038514.136 units remaining) + - location: 238 (remaining gas: 1038514.101 units remaining) [ 0 ] - - location: 241 (remaining gas: 1038513.909 units remaining) + - location: 241 (remaining gas: 1038513.874 units remaining) [ 0x050000 ] - - location: 242 (remaining gas: 1038513.489 units remaining) + - location: 242 (remaining gas: 1038513.454 units remaining) [ (Some 0) ] - - location: 245 (remaining gas: 1038513.479 units remaining) + - location: 245 (remaining gas: 1038513.444 units remaining) [ 0 ] - - location: 245 (remaining gas: 1038513.464 units remaining) + - location: 245 (remaining gas: 1038513.429 units remaining) [ 0 ] - - location: 251 (remaining gas: 1038513.454 units remaining) + - location: 251 (remaining gas: 1038513.419 units remaining) [ ] - - location: 252 (remaining gas: 1038513.444 units remaining) + - location: 252 (remaining gas: 1038513.409 units remaining) [ -1 ] - - location: 255 (remaining gas: 1038513.217 units remaining) + - location: 255 (remaining gas: 1038513.182 units remaining) [ 0x050041 ] - - location: 256 (remaining gas: 1038416.897 units remaining) + - location: 256 (remaining gas: 1038416.862 units remaining) [ None ] - - location: 259 (remaining gas: 1038416.887 units remaining) + - location: 259 (remaining gas: 1038416.852 units remaining) [ ] - - location: 259 (remaining gas: 1038416.872 units remaining) + - location: 259 (remaining gas: 1038416.837 units remaining) [ ] - - location: 265 (remaining gas: 1038416.862 units remaining) + - location: 265 (remaining gas: 1038416.827 units remaining) [ 0x ] - - location: 268 (remaining gas: 1038416.602 units remaining) + - location: 268 (remaining gas: 1038416.567 units remaining) [ None ] - - location: 271 (remaining gas: 1038416.592 units remaining) + - location: 271 (remaining gas: 1038416.557 units remaining) [ ] - - location: 271 (remaining gas: 1038416.577 units remaining) + - location: 271 (remaining gas: 1038416.542 units remaining) [ ] - - location: 277 (remaining gas: 1038416.567 units remaining) + - location: 277 (remaining gas: 1038416.532 units remaining) [ 0x04 ] - - location: 280 (remaining gas: 1038416.287 units remaining) + - location: 280 (remaining gas: 1038416.252 units remaining) [ None ] - - location: 283 (remaining gas: 1038416.277 units remaining) + - location: 283 (remaining gas: 1038416.242 units remaining) [ ] - - location: 283 (remaining gas: 1038416.262 units remaining) + - location: 283 (remaining gas: 1038416.227 units remaining) [ ] - - location: 289 (remaining gas: 1038416.252 units remaining) + - location: 289 (remaining gas: 1038416.217 units remaining) [ 0x05 ] - - location: 292 (remaining gas: 1038415.972 units remaining) + - location: 292 (remaining gas: 1038415.937 units remaining) [ None ] - - location: 295 (remaining gas: 1038415.962 units remaining) + - location: 295 (remaining gas: 1038415.927 units remaining) [ ] - - location: 295 (remaining gas: 1038415.947 units remaining) + - location: 295 (remaining gas: 1038415.912 units remaining) [ ] - - location: 301 (remaining gas: 1038415.937 units remaining) + - location: 301 (remaining gas: 1038415.902 units remaining) [ Unit ] - - location: 302 (remaining gas: 1038415.922 units remaining) + - location: 302 (remaining gas: 1038415.887 units remaining) [ {} Unit ] - - location: 304 (remaining gas: 1038415.907 units remaining) + - location: 304 (remaining gas: 1038415.872 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" index 5c63b603a7c6..32837e805789 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 28 (remaining gas: 1039468.020 units remaining) + - location: 28 (remaining gas: 1039467.985 units remaining) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -19,7 +19,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) Unit) ] - - location: 28 (remaining gas: 1039468.010 units remaining) + - location: 28 (remaining gas: 1039467.975 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -30,7 +30,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 29 (remaining gas: 1039468 units remaining) + - location: 29 (remaining gas: 1039467.965 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -51,7 +51,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 30 (remaining gas: 1039467.990 units remaining) + - location: 30 (remaining gas: 1039467.955 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -63,7 +63,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 31 (remaining gas: 1039467.975 units remaining) + - location: 31 (remaining gas: 1039467.940 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -74,7 +74,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 33 (remaining gas: 1039467.965 units remaining) + - location: 33 (remaining gas: 1039467.930 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -85,7 +85,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 31 (remaining gas: 1039467.935 units remaining) + - location: 31 (remaining gas: 1039467.900 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -97,7 +97,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 34 (remaining gas: 1039466.063 units remaining) + - location: 34 (remaining gas: 1039466.028 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -109,7 +109,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 35 (remaining gas: 1039466.048 units remaining) + - location: 35 (remaining gas: 1039466.013 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -120,7 +120,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 37 (remaining gas: 1039464.176 units remaining) + - location: 37 (remaining gas: 1039464.141 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -131,7 +131,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 38 (remaining gas: 1039143.032 units remaining) + - location: 38 (remaining gas: 1039142.997 units remaining) [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -142,7 +142,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 41 (remaining gas: 1039143.022 units remaining) + - location: 41 (remaining gas: 1039142.987 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -153,7 +153,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 41 (remaining gas: 1039143.007 units remaining) + - location: 41 (remaining gas: 1039142.972 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -164,7 +164,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 47 (remaining gas: 1039141.135 units remaining) + - location: 47 (remaining gas: 1039141.100 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -175,7 +175,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 35 (remaining gas: 1039141.105 units remaining) + - location: 35 (remaining gas: 1039141.070 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit @@ -187,7 +187,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 50 (remaining gas: 1039141.070 units remaining) + - location: 50 (remaining gas: 1039141.035 units remaining) [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -198,7 +198,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 51 (remaining gas: 1039141.055 units remaining) + - location: 51 (remaining gas: 1039141.020 units remaining) [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -209,7 +209,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 52 (remaining gas: 1039141.045 units remaining) + - location: 52 (remaining gas: 1039141.010 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -219,7 +219,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 52 (remaining gas: 1039141.030 units remaining) + - location: 52 (remaining gas: 1039140.995 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -229,7 +229,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 58 (remaining gas: 1039141.020 units remaining) + - location: 58 (remaining gas: 1039140.985 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -248,7 +248,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 59 (remaining gas: 1039141.010 units remaining) + - location: 59 (remaining gas: 1039140.975 units remaining) [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -259,7 +259,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 60 (remaining gas: 1039140.995 units remaining) + - location: 60 (remaining gas: 1039140.960 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -269,7 +269,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 62 (remaining gas: 1039140.985 units remaining) + - location: 62 (remaining gas: 1039140.950 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -279,7 +279,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 60 (remaining gas: 1039140.955 units remaining) + - location: 60 (remaining gas: 1039140.920 units remaining) [ Unit Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -290,7 +290,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 63 (remaining gas: 1039140.728 units remaining) + - location: 63 (remaining gas: 1039140.693 units remaining) [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -301,7 +301,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 64 (remaining gas: 1039140.713 units remaining) + - location: 64 (remaining gas: 1039140.678 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -311,7 +311,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 66 (remaining gas: 1039140.486 units remaining) + - location: 66 (remaining gas: 1039140.451 units remaining) [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -321,7 +321,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 67 (remaining gas: 1039140.066 units remaining) + - location: 67 (remaining gas: 1039140.031 units remaining) [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -331,7 +331,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 70 (remaining gas: 1039140.056 units remaining) + - location: 70 (remaining gas: 1039140.021 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -341,7 +341,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 70 (remaining gas: 1039140.041 units remaining) + - location: 70 (remaining gas: 1039140.006 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -351,7 +351,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 76 (remaining gas: 1039139.814 units remaining) + - location: 76 (remaining gas: 1039139.779 units remaining) [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -361,7 +361,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 64 (remaining gas: 1039139.784 units remaining) + - location: 64 (remaining gas: 1039139.749 units remaining) [ 0x05030b 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -372,7 +372,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 79 (remaining gas: 1039139.749 units remaining) + - location: 79 (remaining gas: 1039139.714 units remaining) [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -382,7 +382,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 80 (remaining gas: 1039139.734 units remaining) + - location: 80 (remaining gas: 1039139.699 units remaining) [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -392,7 +392,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 81 (remaining gas: 1039139.724 units remaining) + - location: 81 (remaining gas: 1039139.689 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -401,7 +401,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 81 (remaining gas: 1039139.709 units remaining) + - location: 81 (remaining gas: 1039139.674 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -410,7 +410,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 87 (remaining gas: 1039139.699 units remaining) + - location: 87 (remaining gas: 1039139.664 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -427,7 +427,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 88 (remaining gas: 1039139.689 units remaining) + - location: 88 (remaining gas: 1039139.654 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -437,7 +437,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 89 (remaining gas: 1039139.674 units remaining) + - location: 89 (remaining gas: 1039139.639 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -446,7 +446,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 91 (remaining gas: 1039139.664 units remaining) + - location: 91 (remaining gas: 1039139.629 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -455,7 +455,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 89 (remaining gas: 1039139.634 units remaining) + - location: 89 (remaining gas: 1039139.599 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -465,7 +465,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 92 (remaining gas: 1039137.147 units remaining) + - location: 92 (remaining gas: 1039137.112 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -475,7 +475,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 93 (remaining gas: 1039137.132 units remaining) + - location: 93 (remaining gas: 1039137.097 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -484,7 +484,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 95 (remaining gas: 1039134.645 units remaining) + - location: 95 (remaining gas: 1039134.610 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -493,7 +493,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 96 (remaining gas: 1039132.842 units remaining) + - location: 96 (remaining gas: 1039132.807 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -502,7 +502,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 99 (remaining gas: 1039132.832 units remaining) + - location: 99 (remaining gas: 1039132.797 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -511,7 +511,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 99 (remaining gas: 1039132.817 units remaining) + - location: 99 (remaining gas: 1039132.782 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -520,7 +520,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 105 (remaining gas: 1039130.330 units remaining) + - location: 105 (remaining gas: 1039130.295 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -529,7 +529,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 93 (remaining gas: 1039130.300 units remaining) + - location: 93 (remaining gas: 1039130.265 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -539,7 +539,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 108 (remaining gas: 1039130.264 units remaining) + - location: 108 (remaining gas: 1039130.229 units remaining) [ 0 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -548,7 +548,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 109 (remaining gas: 1039130.249 units remaining) + - location: 109 (remaining gas: 1039130.214 units remaining) [ True (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -557,7 +557,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 110 (remaining gas: 1039130.239 units remaining) + - location: 110 (remaining gas: 1039130.204 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -565,7 +565,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 110 (remaining gas: 1039130.224 units remaining) + - location: 110 (remaining gas: 1039130.189 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -573,7 +573,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 116 (remaining gas: 1039130.214 units remaining) + - location: 116 (remaining gas: 1039130.179 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -588,7 +588,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 117 (remaining gas: 1039130.204 units remaining) + - location: 117 (remaining gas: 1039130.169 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -597,7 +597,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 118 (remaining gas: 1039130.189 units remaining) + - location: 118 (remaining gas: 1039130.154 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -605,7 +605,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 120 (remaining gas: 1039130.179 units remaining) + - location: 120 (remaining gas: 1039130.144 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -613,7 +613,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 118 (remaining gas: 1039130.149 units remaining) + - location: 118 (remaining gas: 1039130.114 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } @@ -622,7 +622,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 121 (remaining gas: 1039127.500 units remaining) + - location: 121 (remaining gas: 1039127.465 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } @@ -631,7 +631,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 122 (remaining gas: 1039127.485 units remaining) + - location: 122 (remaining gas: 1039127.450 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -639,7 +639,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 124 (remaining gas: 1039124.836 units remaining) + - location: 124 (remaining gas: 1039124.801 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } @@ -647,7 +647,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 125 (remaining gas: 1039122.892 units remaining) + - location: 125 (remaining gas: 1039122.857 units remaining) [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) (Pair { Unit } { True } @@ -655,7 +655,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 129 (remaining gas: 1039122.882 units remaining) + - location: 129 (remaining gas: 1039122.847 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } @@ -663,7 +663,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 129 (remaining gas: 1039122.867 units remaining) + - location: 129 (remaining gas: 1039122.832 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } @@ -671,7 +671,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 135 (remaining gas: 1039120.218 units remaining) + - location: 135 (remaining gas: 1039120.183 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } @@ -679,7 +679,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 122 (remaining gas: 1039120.188 units remaining) + - location: 122 (remaining gas: 1039120.153 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } @@ -688,7 +688,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 138 (remaining gas: 1039120.152 units remaining) + - location: 138 (remaining gas: 1039120.117 units remaining) [ 0 (Pair { Unit } { True } @@ -696,7 +696,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 139 (remaining gas: 1039120.137 units remaining) + - location: 139 (remaining gas: 1039120.102 units remaining) [ True (Pair { Unit } { True } @@ -704,21 +704,21 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 140 (remaining gas: 1039120.127 units remaining) + - location: 140 (remaining gas: 1039120.092 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 140 (remaining gas: 1039120.112 units remaining) + - location: 140 (remaining gas: 1039120.077 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 146 (remaining gas: 1039120.102 units remaining) + - location: 146 (remaining gas: 1039120.067 units remaining) [ (Pair { Unit } { True } (Pair 19 10) @@ -731,7 +731,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 147 (remaining gas: 1039120.092 units remaining) + - location: 147 (remaining gas: 1039120.057 units remaining) [ { Unit } (Pair { Unit } { True } @@ -739,21 +739,21 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 148 (remaining gas: 1039120.077 units remaining) + - location: 148 (remaining gas: 1039120.042 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 150 (remaining gas: 1039120.067 units remaining) + - location: 150 (remaining gas: 1039120.032 units remaining) [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 148 (remaining gas: 1039120.037 units remaining) + - location: 148 (remaining gas: 1039120.002 units remaining) [ { Unit } { Unit } (Pair { True } @@ -761,7 +761,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 151 (remaining gas: 1039119.549 units remaining) + - location: 151 (remaining gas: 1039119.514 units remaining) [ 0x050200000002030b { Unit } (Pair { True } @@ -769,49 +769,49 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 152 (remaining gas: 1039119.534 units remaining) + - location: 152 (remaining gas: 1039119.499 units remaining) [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 154 (remaining gas: 1039119.046 units remaining) + - location: 154 (remaining gas: 1039119.011 units remaining) [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 155 (remaining gas: 1039118.425 units remaining) + - location: 155 (remaining gas: 1039118.390 units remaining) [ (Some { Unit }) (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 159 (remaining gas: 1039118.415 units remaining) + - location: 159 (remaining gas: 1039118.380 units remaining) [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 159 (remaining gas: 1039118.400 units remaining) + - location: 159 (remaining gas: 1039118.365 units remaining) [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 165 (remaining gas: 1039117.912 units remaining) + - location: 165 (remaining gas: 1039117.877 units remaining) [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 152 (remaining gas: 1039117.882 units remaining) + - location: 152 (remaining gas: 1039117.847 units remaining) [ 0x050200000002030b 0x050200000002030b (Pair { True } @@ -819,33 +819,33 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 168 (remaining gas: 1039117.847 units remaining) + - location: 168 (remaining gas: 1039117.812 units remaining) [ 0 (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 169 (remaining gas: 1039117.832 units remaining) + - location: 169 (remaining gas: 1039117.797 units remaining) [ True (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 170 (remaining gas: 1039117.822 units remaining) + - location: 170 (remaining gas: 1039117.787 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 170 (remaining gas: 1039117.807 units remaining) + - location: 170 (remaining gas: 1039117.772 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 176 (remaining gas: 1039117.797 units remaining) + - location: 176 (remaining gas: 1039117.762 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @@ -856,105 +856,105 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 177 (remaining gas: 1039117.787 units remaining) + - location: 177 (remaining gas: 1039117.752 units remaining) [ { True } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 178 (remaining gas: 1039117.772 units remaining) + - location: 178 (remaining gas: 1039117.737 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 180 (remaining gas: 1039117.762 units remaining) + - location: 180 (remaining gas: 1039117.727 units remaining) [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 178 (remaining gas: 1039117.732 units remaining) + - location: 178 (remaining gas: 1039117.697 units remaining) [ { True } { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 181 (remaining gas: 1039117.244 units remaining) + - location: 181 (remaining gas: 1039117.209 units remaining) [ 0x050200000002030a { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 182 (remaining gas: 1039117.229 units remaining) + - location: 182 (remaining gas: 1039117.194 units remaining) [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 184 (remaining gas: 1039116.741 units remaining) + - location: 184 (remaining gas: 1039116.706 units remaining) [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 185 (remaining gas: 1039115.920 units remaining) + - location: 185 (remaining gas: 1039115.885 units remaining) [ (Some { True }) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 189 (remaining gas: 1039115.910 units remaining) + - location: 189 (remaining gas: 1039115.875 units remaining) [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 189 (remaining gas: 1039115.895 units remaining) + - location: 189 (remaining gas: 1039115.860 units remaining) [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 195 (remaining gas: 1039115.407 units remaining) + - location: 195 (remaining gas: 1039115.372 units remaining) [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 182 (remaining gas: 1039115.377 units remaining) + - location: 182 (remaining gas: 1039115.342 units remaining) [ 0x050200000002030a 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 198 (remaining gas: 1039115.342 units remaining) + - location: 198 (remaining gas: 1039115.307 units remaining) [ 0 (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 199 (remaining gas: 1039115.327 units remaining) + - location: 199 (remaining gas: 1039115.292 units remaining) [ True (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 200 (remaining gas: 1039115.317 units remaining) + - location: 200 (remaining gas: 1039115.282 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 200 (remaining gas: 1039115.302 units remaining) + - location: 200 (remaining gas: 1039115.267 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 206 (remaining gas: 1039115.292 units remaining) + - location: 206 (remaining gas: 1039115.257 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } @@ -963,232 +963,232 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 207 (remaining gas: 1039115.282 units remaining) + - location: 207 (remaining gas: 1039115.247 units remaining) [ (Pair 19 10) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 208 (remaining gas: 1039115.267 units remaining) + - location: 208 (remaining gas: 1039115.232 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 210 (remaining gas: 1039115.257 units remaining) + - location: 210 (remaining gas: 1039115.222 units remaining) [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 208 (remaining gas: 1039115.227 units remaining) + - location: 208 (remaining gas: 1039115.192 units remaining) [ (Pair 19 10) (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 211 (remaining gas: 1039114.676 units remaining) + - location: 211 (remaining gas: 1039114.641 units remaining) [ 0x0507070013000a (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 212 (remaining gas: 1039114.661 units remaining) + - location: 212 (remaining gas: 1039114.626 units remaining) [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 214 (remaining gas: 1039114.110 units remaining) + - location: 214 (remaining gas: 1039114.075 units remaining) [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 215 (remaining gas: 1039113.410 units remaining) + - location: 215 (remaining gas: 1039113.375 units remaining) [ (Some (Pair 19 10)) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 220 (remaining gas: 1039113.400 units remaining) + - location: 220 (remaining gas: 1039113.365 units remaining) [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 220 (remaining gas: 1039113.385 units remaining) + - location: 220 (remaining gas: 1039113.350 units remaining) [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 226 (remaining gas: 1039112.834 units remaining) + - location: 226 (remaining gas: 1039112.799 units remaining) [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 212 (remaining gas: 1039112.804 units remaining) + - location: 212 (remaining gas: 1039112.769 units remaining) [ 0x0507070013000a 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 229 (remaining gas: 1039112.769 units remaining) + - location: 229 (remaining gas: 1039112.734 units remaining) [ 0 (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 230 (remaining gas: 1039112.754 units remaining) + - location: 230 (remaining gas: 1039112.719 units remaining) [ True (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 231 (remaining gas: 1039112.744 units remaining) + - location: 231 (remaining gas: 1039112.709 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 231 (remaining gas: 1039112.729 units remaining) + - location: 231 (remaining gas: 1039112.694 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 237 (remaining gas: 1039112.719 units remaining) + - location: 237 (remaining gas: 1039112.684 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 238 (remaining gas: 1039112.709 units remaining) + - location: 238 (remaining gas: 1039112.674 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 239 (remaining gas: 1039112.694 units remaining) + - location: 239 (remaining gas: 1039112.659 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 241 (remaining gas: 1039112.684 units remaining) + - location: 241 (remaining gas: 1039112.649 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 239 (remaining gas: 1039112.654 units remaining) + - location: 239 (remaining gas: 1039112.619 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 242 (remaining gas: 1039111.402 units remaining) + - location: 242 (remaining gas: 1039111.367 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 243 (remaining gas: 1039111.387 units remaining) + - location: 243 (remaining gas: 1039111.352 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 245 (remaining gas: 1039110.135 units remaining) + - location: 245 (remaining gas: 1039110.100 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 246 (remaining gas: 1039109.042 units remaining) + - location: 246 (remaining gas: 1039109.007 units remaining) [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 251 (remaining gas: 1039109.032 units remaining) + - location: 251 (remaining gas: 1039108.997 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 251 (remaining gas: 1039109.017 units remaining) + - location: 251 (remaining gas: 1039108.982 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 257 (remaining gas: 1039107.765 units remaining) + - location: 257 (remaining gas: 1039107.730 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 243 (remaining gas: 1039107.735 units remaining) + - location: 243 (remaining gas: 1039107.700 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 260 (remaining gas: 1039107.700 units remaining) + - location: 260 (remaining gas: 1039107.665 units remaining) [ 0 (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 261 (remaining gas: 1039107.685 units remaining) + - location: 261 (remaining gas: 1039107.650 units remaining) [ True (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 262 (remaining gas: 1039107.675 units remaining) + - location: 262 (remaining gas: 1039107.640 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 262 (remaining gas: 1039107.660 units remaining) + - location: 262 (remaining gas: 1039107.625 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 268 (remaining gas: 1039107.650 units remaining) + - location: 268 (remaining gas: 1039107.615 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 269 (remaining gas: 1039107.640 units remaining) + - location: 269 (remaining gas: 1039107.605 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 270 (remaining gas: 1039107.625 units remaining) + - location: 270 (remaining gas: 1039107.590 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 272 (remaining gas: 1039107.615 units remaining) + - location: 272 (remaining gas: 1039107.580 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 270 (remaining gas: 1039107.585 units remaining) + - location: 270 (remaining gas: 1039107.550 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 273 (remaining gas: 1039105.980 units remaining) + - location: 273 (remaining gas: 1039105.945 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 274 (remaining gas: 1039105.965 units remaining) + - location: 274 (remaining gas: 1039105.930 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 276 (remaining gas: 1039104.360 units remaining) + - location: 276 (remaining gas: 1039104.325 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - - location: 277 (remaining gas: 1039102.504 units remaining) + - location: 277 (remaining gas: 1039102.469 units remaining) [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) { PACK } ] - - location: 282 (remaining gas: 1039102.494 units remaining) + - location: 282 (remaining gas: 1039102.459 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 282 (remaining gas: 1039102.479 units remaining) + - location: 282 (remaining gas: 1039102.444 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 288 (remaining gas: 1039100.874 units remaining) + - location: 288 (remaining gas: 1039100.839 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - - location: 274 (remaining gas: 1039100.844 units remaining) + - location: 274 (remaining gas: 1039100.809 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - - location: 291 (remaining gas: 1039100.809 units remaining) + - location: 291 (remaining gas: 1039100.774 units remaining) [ 0 { PACK } ] - - location: 292 (remaining gas: 1039100.794 units remaining) + - location: 292 (remaining gas: 1039100.759 units remaining) [ True { PACK } ] - - location: 293 (remaining gas: 1039100.784 units remaining) + - location: 293 (remaining gas: 1039100.749 units remaining) [ { PACK } ] - - location: 293 (remaining gas: 1039100.769 units remaining) + - location: 293 (remaining gas: 1039100.734 units remaining) [ { PACK } ] - - location: 299 (remaining gas: 1039100.759 units remaining) + - location: 299 (remaining gas: 1039100.724 units remaining) [ { PACK } { PACK } ] - - location: 300 (remaining gas: 1039100.086 units remaining) + - location: 300 (remaining gas: 1039100.051 units remaining) [ 0x050200000002030c { PACK } ] - - location: 301 (remaining gas: 1039100.071 units remaining) + - location: 301 (remaining gas: 1039100.036 units remaining) [ { PACK } ] - - location: 303 (remaining gas: 1039099.398 units remaining) + - location: 303 (remaining gas: 1039099.363 units remaining) [ 0x050200000002030c ] - - location: 304 (remaining gas: 1039098.217 units remaining) + - location: 304 (remaining gas: 1039098.182 units remaining) [ (Some { PACK }) ] - - location: 309 (remaining gas: 1039098.207 units remaining) + - location: 309 (remaining gas: 1039098.172 units remaining) [ { PACK } ] - - location: 309 (remaining gas: 1039098.192 units remaining) + - location: 309 (remaining gas: 1039098.157 units remaining) [ { PACK } ] - - location: 315 (remaining gas: 1039097.519 units remaining) + - location: 315 (remaining gas: 1039097.484 units remaining) [ 0x050200000002030c ] - - location: 301 (remaining gas: 1039097.489 units remaining) + - location: 301 (remaining gas: 1039097.454 units remaining) [ 0x050200000002030c 0x050200000002030c ] - - location: 318 (remaining gas: 1039097.454 units remaining) + - location: 318 (remaining gas: 1039097.419 units remaining) [ 0 ] - - location: 319 (remaining gas: 1039097.439 units remaining) + - location: 319 (remaining gas: 1039097.404 units remaining) [ True ] - - location: 320 (remaining gas: 1039097.429 units remaining) + - location: 320 (remaining gas: 1039097.394 units remaining) [ ] - - location: 320 (remaining gas: 1039097.414 units remaining) + - location: 320 (remaining gas: 1039097.379 units remaining) [ ] - - location: 326 (remaining gas: 1039097.404 units remaining) + - location: 326 (remaining gas: 1039097.369 units remaining) [ Unit ] - - location: 327 (remaining gas: 1039097.389 units remaining) + - location: 327 (remaining gas: 1039097.354 units remaining) [ {} Unit ] - - location: 329 (remaining gas: 1039097.374 units remaining) + - location: 329 (remaining gas: 1039097.339 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" index 5d88b0765272..04ddb496fb96 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 28 (remaining gas: 1039478.033 units remaining) + - location: 28 (remaining gas: 1039477.998 units remaining) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -19,7 +19,7 @@ trace {} { DUP ; DROP ; PACK }) Unit) ] - - location: 28 (remaining gas: 1039478.023 units remaining) + - location: 28 (remaining gas: 1039477.988 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -30,7 +30,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 29 (remaining gas: 1039478.013 units remaining) + - location: 29 (remaining gas: 1039477.978 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -51,7 +51,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 30 (remaining gas: 1039478.003 units remaining) + - location: 30 (remaining gas: 1039477.968 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -63,7 +63,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 31 (remaining gas: 1039477.988 units remaining) + - location: 31 (remaining gas: 1039477.953 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -74,7 +74,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 33 (remaining gas: 1039477.978 units remaining) + - location: 33 (remaining gas: 1039477.943 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -85,7 +85,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 31 (remaining gas: 1039477.948 units remaining) + - location: 31 (remaining gas: 1039477.913 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -97,7 +97,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 34 (remaining gas: 1039476.076 units remaining) + - location: 34 (remaining gas: 1039476.041 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -109,7 +109,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 35 (remaining gas: 1039476.061 units remaining) + - location: 35 (remaining gas: 1039476.026 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -120,7 +120,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 37 (remaining gas: 1039474.189 units remaining) + - location: 37 (remaining gas: 1039474.154 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -131,7 +131,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 38 (remaining gas: 1039153.045 units remaining) + - location: 38 (remaining gas: 1039153.010 units remaining) [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -142,7 +142,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 41 (remaining gas: 1039153.035 units remaining) + - location: 41 (remaining gas: 1039153 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -153,7 +153,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 41 (remaining gas: 1039153.020 units remaining) + - location: 41 (remaining gas: 1039152.985 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -164,7 +164,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 47 (remaining gas: 1039151.148 units remaining) + - location: 47 (remaining gas: 1039151.113 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -175,7 +175,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 35 (remaining gas: 1039151.118 units remaining) + - location: 35 (remaining gas: 1039151.083 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit @@ -187,7 +187,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 50 (remaining gas: 1039151.083 units remaining) + - location: 50 (remaining gas: 1039151.048 units remaining) [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -198,7 +198,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 51 (remaining gas: 1039151.068 units remaining) + - location: 51 (remaining gas: 1039151.033 units remaining) [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -209,7 +209,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 52 (remaining gas: 1039151.058 units remaining) + - location: 52 (remaining gas: 1039151.023 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -219,7 +219,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 52 (remaining gas: 1039151.043 units remaining) + - location: 52 (remaining gas: 1039151.008 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -229,7 +229,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 58 (remaining gas: 1039151.033 units remaining) + - location: 58 (remaining gas: 1039150.998 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -248,7 +248,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 59 (remaining gas: 1039151.023 units remaining) + - location: 59 (remaining gas: 1039150.988 units remaining) [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -259,7 +259,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 60 (remaining gas: 1039151.008 units remaining) + - location: 60 (remaining gas: 1039150.973 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -269,7 +269,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 62 (remaining gas: 1039150.998 units remaining) + - location: 62 (remaining gas: 1039150.963 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -279,7 +279,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 60 (remaining gas: 1039150.968 units remaining) + - location: 60 (remaining gas: 1039150.933 units remaining) [ Unit Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -290,7 +290,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 63 (remaining gas: 1039150.741 units remaining) + - location: 63 (remaining gas: 1039150.706 units remaining) [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -301,7 +301,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 64 (remaining gas: 1039150.726 units remaining) + - location: 64 (remaining gas: 1039150.691 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -311,7 +311,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 66 (remaining gas: 1039150.499 units remaining) + - location: 66 (remaining gas: 1039150.464 units remaining) [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -321,7 +321,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 67 (remaining gas: 1039150.079 units remaining) + - location: 67 (remaining gas: 1039150.044 units remaining) [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -331,7 +331,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 70 (remaining gas: 1039150.069 units remaining) + - location: 70 (remaining gas: 1039150.034 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -341,7 +341,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 70 (remaining gas: 1039150.054 units remaining) + - location: 70 (remaining gas: 1039150.019 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -351,7 +351,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 76 (remaining gas: 1039149.827 units remaining) + - location: 76 (remaining gas: 1039149.792 units remaining) [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -361,7 +361,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 64 (remaining gas: 1039149.797 units remaining) + - location: 64 (remaining gas: 1039149.762 units remaining) [ 0x05030b 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -372,7 +372,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 79 (remaining gas: 1039149.762 units remaining) + - location: 79 (remaining gas: 1039149.727 units remaining) [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -382,7 +382,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 80 (remaining gas: 1039149.747 units remaining) + - location: 80 (remaining gas: 1039149.712 units remaining) [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -392,7 +392,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 81 (remaining gas: 1039149.737 units remaining) + - location: 81 (remaining gas: 1039149.702 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -401,7 +401,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 81 (remaining gas: 1039149.722 units remaining) + - location: 81 (remaining gas: 1039149.687 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -410,7 +410,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 87 (remaining gas: 1039149.712 units remaining) + - location: 87 (remaining gas: 1039149.677 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -427,7 +427,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 88 (remaining gas: 1039149.702 units remaining) + - location: 88 (remaining gas: 1039149.667 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -437,7 +437,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 89 (remaining gas: 1039149.687 units remaining) + - location: 89 (remaining gas: 1039149.652 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -446,7 +446,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 91 (remaining gas: 1039149.677 units remaining) + - location: 91 (remaining gas: 1039149.642 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -455,7 +455,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 89 (remaining gas: 1039149.647 units remaining) + - location: 89 (remaining gas: 1039149.612 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None @@ -465,7 +465,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 92 (remaining gas: 1039147.160 units remaining) + - location: 92 (remaining gas: 1039147.125 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None @@ -475,7 +475,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 93 (remaining gas: 1039147.145 units remaining) + - location: 93 (remaining gas: 1039147.110 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -484,7 +484,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 95 (remaining gas: 1039144.658 units remaining) + - location: 95 (remaining gas: 1039144.623 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} @@ -493,7 +493,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 96 (remaining gas: 1039142.855 units remaining) + - location: 96 (remaining gas: 1039142.820 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair None {} @@ -502,7 +502,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 99 (remaining gas: 1039142.845 units remaining) + - location: 99 (remaining gas: 1039142.810 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} @@ -511,7 +511,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 99 (remaining gas: 1039142.830 units remaining) + - location: 99 (remaining gas: 1039142.795 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} @@ -520,7 +520,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 105 (remaining gas: 1039140.343 units remaining) + - location: 105 (remaining gas: 1039140.308 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} @@ -529,7 +529,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 93 (remaining gas: 1039140.313 units remaining) + - location: 93 (remaining gas: 1039140.278 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None @@ -539,7 +539,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 108 (remaining gas: 1039140.277 units remaining) + - location: 108 (remaining gas: 1039140.242 units remaining) [ 0 (Pair None {} @@ -548,7 +548,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 109 (remaining gas: 1039140.262 units remaining) + - location: 109 (remaining gas: 1039140.227 units remaining) [ True (Pair None {} @@ -557,7 +557,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 110 (remaining gas: 1039140.252 units remaining) + - location: 110 (remaining gas: 1039140.217 units remaining) [ (Pair None {} {} @@ -565,7 +565,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 110 (remaining gas: 1039140.237 units remaining) + - location: 110 (remaining gas: 1039140.202 units remaining) [ (Pair None {} {} @@ -573,7 +573,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 116 (remaining gas: 1039140.227 units remaining) + - location: 116 (remaining gas: 1039140.192 units remaining) [ (Pair None {} {} @@ -588,7 +588,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 117 (remaining gas: 1039140.217 units remaining) + - location: 117 (remaining gas: 1039140.182 units remaining) [ None (Pair None {} @@ -597,7 +597,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 118 (remaining gas: 1039140.202 units remaining) + - location: 118 (remaining gas: 1039140.167 units remaining) [ (Pair None {} {} @@ -605,7 +605,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 120 (remaining gas: 1039140.192 units remaining) + - location: 120 (remaining gas: 1039140.157 units remaining) [ None (Pair {} {} @@ -613,7 +613,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 118 (remaining gas: 1039140.162 units remaining) + - location: 118 (remaining gas: 1039140.127 units remaining) [ None None (Pair {} @@ -622,7 +622,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 121 (remaining gas: 1039139.935 units remaining) + - location: 121 (remaining gas: 1039139.900 units remaining) [ 0x050306 None (Pair {} @@ -631,7 +631,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 122 (remaining gas: 1039139.920 units remaining) + - location: 122 (remaining gas: 1039139.885 units remaining) [ None (Pair {} {} @@ -639,7 +639,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 124 (remaining gas: 1039139.693 units remaining) + - location: 124 (remaining gas: 1039139.658 units remaining) [ 0x050306 (Pair {} {} @@ -647,7 +647,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 125 (remaining gas: 1039139.273 units remaining) + - location: 125 (remaining gas: 1039139.238 units remaining) [ (Some None) (Pair {} {} @@ -655,7 +655,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 129 (remaining gas: 1039139.263 units remaining) + - location: 129 (remaining gas: 1039139.228 units remaining) [ None (Pair {} {} @@ -663,7 +663,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 129 (remaining gas: 1039139.248 units remaining) + - location: 129 (remaining gas: 1039139.213 units remaining) [ None (Pair {} {} @@ -671,7 +671,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 135 (remaining gas: 1039139.021 units remaining) + - location: 135 (remaining gas: 1039138.986 units remaining) [ 0x050306 (Pair {} {} @@ -679,7 +679,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 122 (remaining gas: 1039138.991 units remaining) + - location: 122 (remaining gas: 1039138.956 units remaining) [ 0x050306 0x050306 (Pair {} @@ -688,7 +688,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 138 (remaining gas: 1039138.956 units remaining) + - location: 138 (remaining gas: 1039138.921 units remaining) [ 0 (Pair {} {} @@ -696,7 +696,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 139 (remaining gas: 1039138.941 units remaining) + - location: 139 (remaining gas: 1039138.906 units remaining) [ True (Pair {} {} @@ -704,21 +704,21 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 140 (remaining gas: 1039138.931 units remaining) + - location: 140 (remaining gas: 1039138.896 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 140 (remaining gas: 1039138.916 units remaining) + - location: 140 (remaining gas: 1039138.881 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 146 (remaining gas: 1039138.906 units remaining) + - location: 146 (remaining gas: 1039138.871 units remaining) [ (Pair {} {} (Pair 40 -10) @@ -731,7 +731,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 147 (remaining gas: 1039138.896 units remaining) + - location: 147 (remaining gas: 1039138.861 units remaining) [ {} (Pair {} {} @@ -739,294 +739,294 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 148 (remaining gas: 1039138.881 units remaining) + - location: 148 (remaining gas: 1039138.846 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 150 (remaining gas: 1039138.871 units remaining) + - location: 150 (remaining gas: 1039138.836 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 148 (remaining gas: 1039138.841 units remaining) + - location: 148 (remaining gas: 1039138.806 units remaining) [ {} {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 151 (remaining gas: 1039138.515 units remaining) + - location: 151 (remaining gas: 1039138.480 units remaining) [ 0x050200000000 {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 152 (remaining gas: 1039138.500 units remaining) + - location: 152 (remaining gas: 1039138.465 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 154 (remaining gas: 1039138.174 units remaining) + - location: 154 (remaining gas: 1039138.139 units remaining) [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 155 (remaining gas: 1039137.694 units remaining) + - location: 155 (remaining gas: 1039137.659 units remaining) [ (Some {}) (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 159 (remaining gas: 1039137.684 units remaining) + - location: 159 (remaining gas: 1039137.649 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 159 (remaining gas: 1039137.669 units remaining) + - location: 159 (remaining gas: 1039137.634 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 165 (remaining gas: 1039137.343 units remaining) + - location: 165 (remaining gas: 1039137.308 units remaining) [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 152 (remaining gas: 1039137.313 units remaining) + - location: 152 (remaining gas: 1039137.278 units remaining) [ 0x050200000000 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 168 (remaining gas: 1039137.278 units remaining) + - location: 168 (remaining gas: 1039137.243 units remaining) [ 0 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 169 (remaining gas: 1039137.263 units remaining) + - location: 169 (remaining gas: 1039137.228 units remaining) [ True (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 170 (remaining gas: 1039137.253 units remaining) + - location: 170 (remaining gas: 1039137.218 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 170 (remaining gas: 1039137.238 units remaining) + - location: 170 (remaining gas: 1039137.203 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 176 (remaining gas: 1039137.228 units remaining) + - location: 176 (remaining gas: 1039137.193 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 177 (remaining gas: 1039137.218 units remaining) + - location: 177 (remaining gas: 1039137.183 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 178 (remaining gas: 1039137.203 units remaining) + - location: 178 (remaining gas: 1039137.168 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 180 (remaining gas: 1039137.193 units remaining) + - location: 180 (remaining gas: 1039137.158 units remaining) [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 178 (remaining gas: 1039137.163 units remaining) + - location: 178 (remaining gas: 1039137.128 units remaining) [ {} {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 181 (remaining gas: 1039136.837 units remaining) + - location: 181 (remaining gas: 1039136.802 units remaining) [ 0x050200000000 {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 182 (remaining gas: 1039136.822 units remaining) + - location: 182 (remaining gas: 1039136.787 units remaining) [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 184 (remaining gas: 1039136.496 units remaining) + - location: 184 (remaining gas: 1039136.461 units remaining) [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 185 (remaining gas: 1039136.016 units remaining) + - location: 185 (remaining gas: 1039135.981 units remaining) [ (Some {}) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 189 (remaining gas: 1039136.006 units remaining) + - location: 189 (remaining gas: 1039135.971 units remaining) [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 189 (remaining gas: 1039135.991 units remaining) + - location: 189 (remaining gas: 1039135.956 units remaining) [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 195 (remaining gas: 1039135.665 units remaining) + - location: 195 (remaining gas: 1039135.630 units remaining) [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 182 (remaining gas: 1039135.635 units remaining) + - location: 182 (remaining gas: 1039135.600 units remaining) [ 0x050200000000 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 198 (remaining gas: 1039135.600 units remaining) + - location: 198 (remaining gas: 1039135.565 units remaining) [ 0 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 199 (remaining gas: 1039135.585 units remaining) + - location: 199 (remaining gas: 1039135.550 units remaining) [ True (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 200 (remaining gas: 1039135.575 units remaining) + - location: 200 (remaining gas: 1039135.540 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 200 (remaining gas: 1039135.560 units remaining) + - location: 200 (remaining gas: 1039135.525 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 206 (remaining gas: 1039135.550 units remaining) + - location: 206 (remaining gas: 1039135.515 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 207 (remaining gas: 1039135.540 units remaining) + - location: 207 (remaining gas: 1039135.505 units remaining) [ (Pair 40 -10) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 208 (remaining gas: 1039135.525 units remaining) + - location: 208 (remaining gas: 1039135.490 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 210 (remaining gas: 1039135.515 units remaining) + - location: 210 (remaining gas: 1039135.480 units remaining) [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 208 (remaining gas: 1039135.485 units remaining) + - location: 208 (remaining gas: 1039135.450 units remaining) [ (Pair 40 -10) (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 211 (remaining gas: 1039134.934 units remaining) + - location: 211 (remaining gas: 1039134.899 units remaining) [ 0x0507070028004a (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 212 (remaining gas: 1039134.919 units remaining) + - location: 212 (remaining gas: 1039134.884 units remaining) [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 214 (remaining gas: 1039134.368 units remaining) + - location: 214 (remaining gas: 1039134.333 units remaining) [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 215 (remaining gas: 1039133.668 units remaining) + - location: 215 (remaining gas: 1039133.633 units remaining) [ (Some (Pair 40 -10)) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 220 (remaining gas: 1039133.658 units remaining) + - location: 220 (remaining gas: 1039133.623 units remaining) [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 220 (remaining gas: 1039133.643 units remaining) + - location: 220 (remaining gas: 1039133.608 units remaining) [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 226 (remaining gas: 1039133.092 units remaining) + - location: 226 (remaining gas: 1039133.057 units remaining) [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 212 (remaining gas: 1039133.062 units remaining) + - location: 212 (remaining gas: 1039133.027 units remaining) [ 0x0507070028004a 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 229 (remaining gas: 1039133.027 units remaining) + - location: 229 (remaining gas: 1039132.992 units remaining) [ 0 (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 230 (remaining gas: 1039133.012 units remaining) + - location: 230 (remaining gas: 1039132.977 units remaining) [ True (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 231 (remaining gas: 1039133.002 units remaining) + - location: 231 (remaining gas: 1039132.967 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 231 (remaining gas: 1039132.987 units remaining) + - location: 231 (remaining gas: 1039132.952 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 237 (remaining gas: 1039132.977 units remaining) + - location: 237 (remaining gas: 1039132.942 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 238 (remaining gas: 1039132.967 units remaining) + - location: 238 (remaining gas: 1039132.932 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 239 (remaining gas: 1039132.952 units remaining) + - location: 239 (remaining gas: 1039132.917 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 241 (remaining gas: 1039132.942 units remaining) + - location: 241 (remaining gas: 1039132.907 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 239 (remaining gas: 1039132.912 units remaining) + - location: 239 (remaining gas: 1039132.877 units remaining) [ (Right "2019-09-09T08:35:33Z") (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 242 (remaining gas: 1039132.391 units remaining) + - location: 242 (remaining gas: 1039132.356 units remaining) [ 0x0505080095bbb0d70b (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 243 (remaining gas: 1039132.376 units remaining) + - location: 243 (remaining gas: 1039132.341 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 245 (remaining gas: 1039131.855 units remaining) + - location: 245 (remaining gas: 1039131.820 units remaining) [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - - location: 246 (remaining gas: 1039131.214 units remaining) + - location: 246 (remaining gas: 1039131.179 units remaining) [ (Some (Right "2019-09-09T08:35:33Z")) (Pair {} { DUP ; DROP ; PACK }) ] - - location: 251 (remaining gas: 1039131.204 units remaining) + - location: 251 (remaining gas: 1039131.169 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 251 (remaining gas: 1039131.189 units remaining) + - location: 251 (remaining gas: 1039131.154 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 257 (remaining gas: 1039130.668 units remaining) + - location: 257 (remaining gas: 1039130.633 units remaining) [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - - location: 243 (remaining gas: 1039130.638 units remaining) + - location: 243 (remaining gas: 1039130.603 units remaining) [ 0x0505080095bbb0d70b 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - - location: 260 (remaining gas: 1039130.603 units remaining) + - location: 260 (remaining gas: 1039130.568 units remaining) [ 0 (Pair {} { DUP ; DROP ; PACK }) ] - - location: 261 (remaining gas: 1039130.588 units remaining) + - location: 261 (remaining gas: 1039130.553 units remaining) [ True (Pair {} { DUP ; DROP ; PACK }) ] - - location: 262 (remaining gas: 1039130.578 units remaining) + - location: 262 (remaining gas: 1039130.543 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) ] - - location: 262 (remaining gas: 1039130.563 units remaining) + - location: 262 (remaining gas: 1039130.528 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) ] - - location: 268 (remaining gas: 1039130.553 units remaining) + - location: 268 (remaining gas: 1039130.518 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) (Pair {} { DUP ; DROP ; PACK }) ] - - location: 269 (remaining gas: 1039130.543 units remaining) + - location: 269 (remaining gas: 1039130.508 units remaining) [ {} (Pair {} { DUP ; DROP ; PACK }) ] - - location: 270 (remaining gas: 1039130.528 units remaining) + - location: 270 (remaining gas: 1039130.493 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) ] - - location: 272 (remaining gas: 1039130.518 units remaining) + - location: 272 (remaining gas: 1039130.483 units remaining) [ {} { DUP ; DROP ; PACK } ] - - location: 270 (remaining gas: 1039130.488 units remaining) + - location: 270 (remaining gas: 1039130.453 units remaining) [ {} {} { DUP ; DROP ; PACK } ] - - location: 273 (remaining gas: 1039130.162 units remaining) + - location: 273 (remaining gas: 1039130.127 units remaining) [ 0x050200000000 {} { DUP ; DROP ; PACK } ] - - location: 274 (remaining gas: 1039130.147 units remaining) + - location: 274 (remaining gas: 1039130.112 units remaining) [ {} { DUP ; DROP ; PACK } ] - - location: 276 (remaining gas: 1039129.821 units remaining) + - location: 276 (remaining gas: 1039129.786 units remaining) [ 0x050200000000 { DUP ; DROP ; PACK } ] - - location: 277 (remaining gas: 1039129.341 units remaining) + - location: 277 (remaining gas: 1039129.306 units remaining) [ (Some {}) { DUP ; DROP ; PACK } ] - - location: 282 (remaining gas: 1039129.331 units remaining) + - location: 282 (remaining gas: 1039129.296 units remaining) [ {} { DUP ; DROP ; PACK } ] - - location: 282 (remaining gas: 1039129.316 units remaining) + - location: 282 (remaining gas: 1039129.281 units remaining) [ {} { DUP ; DROP ; PACK } ] - - location: 288 (remaining gas: 1039128.990 units remaining) + - location: 288 (remaining gas: 1039128.955 units remaining) [ 0x050200000000 { DUP ; DROP ; PACK } ] - - location: 274 (remaining gas: 1039128.960 units remaining) + - location: 274 (remaining gas: 1039128.925 units remaining) [ 0x050200000000 0x050200000000 { DUP ; DROP ; PACK } ] - - location: 291 (remaining gas: 1039128.925 units remaining) + - location: 291 (remaining gas: 1039128.890 units remaining) [ 0 { DUP ; DROP ; PACK } ] - - location: 292 (remaining gas: 1039128.910 units remaining) + - location: 292 (remaining gas: 1039128.875 units remaining) [ True { DUP ; DROP ; PACK } ] - - location: 293 (remaining gas: 1039128.900 units remaining) + - location: 293 (remaining gas: 1039128.865 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 293 (remaining gas: 1039128.885 units remaining) + - location: 293 (remaining gas: 1039128.850 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 299 (remaining gas: 1039128.875 units remaining) + - location: 299 (remaining gas: 1039128.840 units remaining) [ { DUP ; DROP ; PACK } { DUP ; DROP ; PACK } ] - - location: 300 (remaining gas: 1039127.738 units remaining) + - location: 300 (remaining gas: 1039127.703 units remaining) [ 0x05020000000603210320030c { DUP ; DROP ; PACK } ] - - location: 301 (remaining gas: 1039127.723 units remaining) + - location: 301 (remaining gas: 1039127.688 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 303 (remaining gas: 1039126.586 units remaining) + - location: 303 (remaining gas: 1039126.551 units remaining) [ 0x05020000000603210320030c ] - - location: 304 (remaining gas: 1039124.345 units remaining) + - location: 304 (remaining gas: 1039124.310 units remaining) [ (Some { DUP ; DROP ; PACK }) ] - - location: 309 (remaining gas: 1039124.335 units remaining) + - location: 309 (remaining gas: 1039124.300 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 309 (remaining gas: 1039124.320 units remaining) + - location: 309 (remaining gas: 1039124.285 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 315 (remaining gas: 1039123.183 units remaining) + - location: 315 (remaining gas: 1039123.148 units remaining) [ 0x05020000000603210320030c ] - - location: 301 (remaining gas: 1039123.153 units remaining) + - location: 301 (remaining gas: 1039123.118 units remaining) [ 0x05020000000603210320030c 0x05020000000603210320030c ] - - location: 318 (remaining gas: 1039123.118 units remaining) + - location: 318 (remaining gas: 1039123.083 units remaining) [ 0 ] - - location: 319 (remaining gas: 1039123.103 units remaining) + - location: 319 (remaining gas: 1039123.068 units remaining) [ True ] - - location: 320 (remaining gas: 1039123.093 units remaining) + - location: 320 (remaining gas: 1039123.058 units remaining) [ ] - - location: 320 (remaining gas: 1039123.078 units remaining) + - location: 320 (remaining gas: 1039123.043 units remaining) [ ] - - location: 326 (remaining gas: 1039123.068 units remaining) + - location: 326 (remaining gas: 1039123.033 units remaining) [ Unit ] - - location: 327 (remaining gas: 1039123.053 units remaining) + - location: 327 (remaining gas: 1039123.018 units remaining) [ {} Unit ] - - location: 329 (remaining gas: 1039123.038 units remaining) + - location: 329 (remaining gas: 1039123.003 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out index f5b495d10629..0dd91e57cd64 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039993.234 units remaining) + - location: 12 (remaining gas: 1039993.199 units remaining) [ (Pair (Pair False False) None) ] - - location: 12 (remaining gas: 1039993.224 units remaining) + - location: 12 (remaining gas: 1039993.189 units remaining) [ (Pair False False) ] - - location: 13 (remaining gas: 1039993.209 units remaining) + - location: 13 (remaining gas: 1039993.174 units remaining) [ (Some (Pair False False)) ] - - location: 14 (remaining gas: 1039993.194 units remaining) + - location: 14 (remaining gas: 1039993.159 units remaining) [ {} (Some (Pair False False)) ] - - location: 16 (remaining gas: 1039993.179 units remaining) + - location: 16 (remaining gas: 1039993.144 units remaining) [ (Pair {} (Some (Pair False False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out index b720033e0a4a..f2a264e6fe3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039993.234 units remaining) + - location: 12 (remaining gas: 1039993.199 units remaining) [ (Pair (Pair False True) None) ] - - location: 12 (remaining gas: 1039993.224 units remaining) + - location: 12 (remaining gas: 1039993.189 units remaining) [ (Pair False True) ] - - location: 13 (remaining gas: 1039993.209 units remaining) + - location: 13 (remaining gas: 1039993.174 units remaining) [ (Some (Pair False True)) ] - - location: 14 (remaining gas: 1039993.194 units remaining) + - location: 14 (remaining gas: 1039993.159 units remaining) [ {} (Some (Pair False True)) ] - - location: 16 (remaining gas: 1039993.179 units remaining) + - location: 16 (remaining gas: 1039993.144 units remaining) [ (Pair {} (Some (Pair False True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out index b71fe71bfa76..663c034cce5a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039993.234 units remaining) + - location: 12 (remaining gas: 1039993.199 units remaining) [ (Pair (Pair True False) None) ] - - location: 12 (remaining gas: 1039993.224 units remaining) + - location: 12 (remaining gas: 1039993.189 units remaining) [ (Pair True False) ] - - location: 13 (remaining gas: 1039993.209 units remaining) + - location: 13 (remaining gas: 1039993.174 units remaining) [ (Some (Pair True False)) ] - - location: 14 (remaining gas: 1039993.194 units remaining) + - location: 14 (remaining gas: 1039993.159 units remaining) [ {} (Some (Pair True False)) ] - - location: 16 (remaining gas: 1039993.179 units remaining) + - location: 16 (remaining gas: 1039993.144 units remaining) [ (Pair {} (Some (Pair True False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out index ae810aeb4cfb..882f34a0f304 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039993.234 units remaining) + - location: 12 (remaining gas: 1039993.199 units remaining) [ (Pair (Pair True True) None) ] - - location: 12 (remaining gas: 1039993.224 units remaining) + - location: 12 (remaining gas: 1039993.189 units remaining) [ (Pair True True) ] - - location: 13 (remaining gas: 1039993.209 units remaining) + - location: 13 (remaining gas: 1039993.174 units remaining) [ (Some (Pair True True)) ] - - location: 14 (remaining gas: 1039993.194 units remaining) + - location: 14 (remaining gas: 1039993.159 units remaining) [ {} (Some (Pair True True)) ] - - location: 16 (remaining gas: 1039993.179 units remaining) + - location: 16 (remaining gas: 1039993.144 units remaining) [ (Pair {} (Some (Pair True True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out index c1083e7a2826..9ef4d3f12b06 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out @@ -7,41 +7,41 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039989.309 units remaining) + - location: 7 (remaining gas: 1039989.274 units remaining) [ (Pair 38 14) ] - - location: 7 (remaining gas: 1039989.299 units remaining) + - location: 7 (remaining gas: 1039989.264 units remaining) [ { UNPAIR ; ADD } (Pair 38 14) ] - - location: 15 (remaining gas: 1039989.289 units remaining) + - location: 15 (remaining gas: 1039989.254 units remaining) [ (Pair 38 14) { UNPAIR ; ADD } ] - - location: 16 (remaining gas: 1039989.279 units remaining) + - location: 16 (remaining gas: 1039989.244 units remaining) [ 38 14 { UNPAIR ; ADD } ] - - location: 17 (remaining gas: 1039989.264 units remaining) + - location: 17 (remaining gas: 1039989.229 units remaining) [ 14 { UNPAIR ; ADD } ] - - location: 19 (remaining gas: 1039989.039 units remaining) + - location: 19 (remaining gas: 1039989.004 units remaining) [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - - location: 17 (remaining gas: 1039989.009 units remaining) + - location: 17 (remaining gas: 1039988.974 units remaining) [ 38 { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - - location: 12 (remaining gas: 1039988.999 units remaining) + - location: 12 (remaining gas: 1039988.964 units remaining) [ 14 38 ] - - location: 12 (remaining gas: 1039988.984 units remaining) + - location: 12 (remaining gas: 1039988.949 units remaining) [ (Pair 14 38) ] - - location: 13 (remaining gas: 1039988.974 units remaining) + - location: 13 (remaining gas: 1039988.939 units remaining) [ 14 38 ] - - location: 14 (remaining gas: 1039988.919 units remaining) + - location: 14 (remaining gas: 1039988.884 units remaining) [ 52 ] - - location: 20 (remaining gas: 1039988.889 units remaining) + - location: 20 (remaining gas: 1039988.854 units remaining) [ 52 ] - - location: 21 (remaining gas: 1039988.874 units remaining) + - location: 21 (remaining gas: 1039988.839 units remaining) [ {} 52 ] - - location: 23 (remaining gas: 1039988.859 units remaining) + - location: 23 (remaining gas: 1039988.824 units remaining) [ (Pair {} 52) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out index b34efcabf6e2..ae939906d23a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out @@ -7,53 +7,53 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039979.891 units remaining) + - location: 8 (remaining gas: 1039979.856 units remaining) [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] - - location: 8 (remaining gas: 1039979.881 units remaining) + - location: 8 (remaining gas: 1039979.846 units remaining) [ 4 { 0 ; 1 ; 2 ; 3 } ] - - location: 9 (remaining gas: 1039979.871 units remaining) + - location: 9 (remaining gas: 1039979.836 units remaining) [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } 4 { 0 ; 1 ; 2 ; 3 } ] - - location: 23 (remaining gas: 1039979.861 units remaining) + - location: 23 (remaining gas: 1039979.826 units remaining) [ 4 { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } { 0 ; 1 ; 2 ; 3 } ] - - location: 24 (remaining gas: 1039979.636 units remaining) + - location: 24 (remaining gas: 1039979.601 units remaining) [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } { 0 ; 1 ; 2 ; 3 } ] - - location: 25 (remaining gas: 1039979.626 units remaining) + - location: 25 (remaining gas: 1039979.591 units remaining) [ 3 { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } { 0 ; 1 ; 2 ; 3 } ] - - location: 28 (remaining gas: 1039979.401 units remaining) + - location: 28 (remaining gas: 1039979.366 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { 0 ; 1 ; 2 ; 3 } ] - - location: 29 (remaining gas: 1039979.391 units remaining) + - location: 29 (remaining gas: 1039979.356 units remaining) [ { 0 ; 1 ; 2 ; 3 } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039979.391 units remaining) + - location: 30 (remaining gas: 1039979.356 units remaining) [ 0 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039979.376 units remaining) + - location: 32 (remaining gas: 1039979.341 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039979.366 units remaining) + - location: 34 (remaining gas: 1039979.331 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039979.336 units remaining) + - location: 32 (remaining gas: 1039979.301 units remaining) [ 0 { PUSH int 3 ; PAIR ; @@ -61,55 +61,55 @@ trace { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 16 (remaining gas: 1039979.326 units remaining) + - location: 16 (remaining gas: 1039979.291 units remaining) [ 3 0 ] - - location: 16 (remaining gas: 1039979.311 units remaining) + - location: 16 (remaining gas: 1039979.276 units remaining) [ (Pair 3 0) ] - - location: 16 (remaining gas: 1039979.301 units remaining) + - location: 16 (remaining gas: 1039979.266 units remaining) [ 4 (Pair 3 0) ] - - location: 16 (remaining gas: 1039979.286 units remaining) + - location: 16 (remaining gas: 1039979.251 units remaining) [ (Pair 4 3 0) ] - - location: 17 (remaining gas: 1039979.276 units remaining) + - location: 17 (remaining gas: 1039979.241 units remaining) [ 4 (Pair 3 0) ] - - location: 18 (remaining gas: 1039979.261 units remaining) + - location: 18 (remaining gas: 1039979.226 units remaining) [ (Pair 3 0) ] - - location: 20 (remaining gas: 1039979.251 units remaining) + - location: 20 (remaining gas: 1039979.216 units remaining) [ 3 0 ] - - location: 18 (remaining gas: 1039979.221 units remaining) + - location: 18 (remaining gas: 1039979.186 units remaining) [ 4 3 0 ] - - location: 21 (remaining gas: 1039979.166 units remaining) + - location: 21 (remaining gas: 1039979.131 units remaining) [ 7 0 ] - - location: 22 (remaining gas: 1039979.065 units remaining) + - location: 22 (remaining gas: 1039979.030 units remaining) [ 0 ] - - location: 35 (remaining gas: 1039979.035 units remaining) + - location: 35 (remaining gas: 1039979 units remaining) [ 0 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039979.020 units remaining) + - location: 30 (remaining gas: 1039978.985 units remaining) [ 1 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039979.005 units remaining) + - location: 32 (remaining gas: 1039978.970 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039978.995 units remaining) + - location: 34 (remaining gas: 1039978.960 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039978.965 units remaining) + - location: 32 (remaining gas: 1039978.930 units remaining) [ 1 { PUSH int 3 ; PAIR ; @@ -117,55 +117,55 @@ trace { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 16 (remaining gas: 1039978.955 units remaining) + - location: 16 (remaining gas: 1039978.920 units remaining) [ 3 1 ] - - location: 16 (remaining gas: 1039978.940 units remaining) + - location: 16 (remaining gas: 1039978.905 units remaining) [ (Pair 3 1) ] - - location: 16 (remaining gas: 1039978.930 units remaining) + - location: 16 (remaining gas: 1039978.895 units remaining) [ 4 (Pair 3 1) ] - - location: 16 (remaining gas: 1039978.915 units remaining) + - location: 16 (remaining gas: 1039978.880 units remaining) [ (Pair 4 3 1) ] - - location: 17 (remaining gas: 1039978.905 units remaining) + - location: 17 (remaining gas: 1039978.870 units remaining) [ 4 (Pair 3 1) ] - - location: 18 (remaining gas: 1039978.890 units remaining) + - location: 18 (remaining gas: 1039978.855 units remaining) [ (Pair 3 1) ] - - location: 20 (remaining gas: 1039978.880 units remaining) + - location: 20 (remaining gas: 1039978.845 units remaining) [ 3 1 ] - - location: 18 (remaining gas: 1039978.850 units remaining) + - location: 18 (remaining gas: 1039978.815 units remaining) [ 4 3 1 ] - - location: 21 (remaining gas: 1039978.795 units remaining) + - location: 21 (remaining gas: 1039978.760 units remaining) [ 7 1 ] - - location: 22 (remaining gas: 1039978.691 units remaining) + - location: 22 (remaining gas: 1039978.656 units remaining) [ 7 ] - - location: 35 (remaining gas: 1039978.661 units remaining) + - location: 35 (remaining gas: 1039978.626 units remaining) [ 7 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039978.646 units remaining) + - location: 30 (remaining gas: 1039978.611 units remaining) [ 2 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039978.631 units remaining) + - location: 32 (remaining gas: 1039978.596 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039978.621 units remaining) + - location: 34 (remaining gas: 1039978.586 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039978.591 units remaining) + - location: 32 (remaining gas: 1039978.556 units remaining) [ 2 { PUSH int 3 ; PAIR ; @@ -173,55 +173,55 @@ trace { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 16 (remaining gas: 1039978.581 units remaining) + - location: 16 (remaining gas: 1039978.546 units remaining) [ 3 2 ] - - location: 16 (remaining gas: 1039978.566 units remaining) + - location: 16 (remaining gas: 1039978.531 units remaining) [ (Pair 3 2) ] - - location: 16 (remaining gas: 1039978.556 units remaining) + - location: 16 (remaining gas: 1039978.521 units remaining) [ 4 (Pair 3 2) ] - - location: 16 (remaining gas: 1039978.541 units remaining) + - location: 16 (remaining gas: 1039978.506 units remaining) [ (Pair 4 3 2) ] - - location: 17 (remaining gas: 1039978.531 units remaining) + - location: 17 (remaining gas: 1039978.496 units remaining) [ 4 (Pair 3 2) ] - - location: 18 (remaining gas: 1039978.516 units remaining) + - location: 18 (remaining gas: 1039978.481 units remaining) [ (Pair 3 2) ] - - location: 20 (remaining gas: 1039978.506 units remaining) + - location: 20 (remaining gas: 1039978.471 units remaining) [ 3 2 ] - - location: 18 (remaining gas: 1039978.476 units remaining) + - location: 18 (remaining gas: 1039978.441 units remaining) [ 4 3 2 ] - - location: 21 (remaining gas: 1039978.421 units remaining) + - location: 21 (remaining gas: 1039978.386 units remaining) [ 7 2 ] - - location: 22 (remaining gas: 1039978.317 units remaining) + - location: 22 (remaining gas: 1039978.282 units remaining) [ 14 ] - - location: 35 (remaining gas: 1039978.287 units remaining) + - location: 35 (remaining gas: 1039978.252 units remaining) [ 14 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039978.272 units remaining) + - location: 30 (remaining gas: 1039978.237 units remaining) [ 3 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039978.257 units remaining) + - location: 32 (remaining gas: 1039978.222 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039978.247 units remaining) + - location: 34 (remaining gas: 1039978.212 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 32 (remaining gas: 1039978.217 units remaining) + - location: 32 (remaining gas: 1039978.182 units remaining) [ 3 { PUSH int 3 ; PAIR ; @@ -229,54 +229,54 @@ trace { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 16 (remaining gas: 1039978.207 units remaining) + - location: 16 (remaining gas: 1039978.172 units remaining) [ 3 3 ] - - location: 16 (remaining gas: 1039978.192 units remaining) + - location: 16 (remaining gas: 1039978.157 units remaining) [ (Pair 3 3) ] - - location: 16 (remaining gas: 1039978.182 units remaining) + - location: 16 (remaining gas: 1039978.147 units remaining) [ 4 (Pair 3 3) ] - - location: 16 (remaining gas: 1039978.167 units remaining) + - location: 16 (remaining gas: 1039978.132 units remaining) [ (Pair 4 3 3) ] - - location: 17 (remaining gas: 1039978.157 units remaining) + - location: 17 (remaining gas: 1039978.122 units remaining) [ 4 (Pair 3 3) ] - - location: 18 (remaining gas: 1039978.142 units remaining) + - location: 18 (remaining gas: 1039978.107 units remaining) [ (Pair 3 3) ] - - location: 20 (remaining gas: 1039978.132 units remaining) + - location: 20 (remaining gas: 1039978.097 units remaining) [ 3 3 ] - - location: 18 (remaining gas: 1039978.102 units remaining) + - location: 18 (remaining gas: 1039978.067 units remaining) [ 4 3 3 ] - - location: 21 (remaining gas: 1039978.047 units remaining) + - location: 21 (remaining gas: 1039978.012 units remaining) [ 7 3 ] - - location: 22 (remaining gas: 1039977.943 units remaining) + - location: 22 (remaining gas: 1039977.908 units remaining) [ 21 ] - - location: 35 (remaining gas: 1039977.913 units remaining) + - location: 35 (remaining gas: 1039977.878 units remaining) [ 21 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039977.898 units remaining) + - location: 30 (remaining gas: 1039977.863 units remaining) [ { 0 ; 7 ; 14 ; 21 } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 36 (remaining gas: 1039977.883 units remaining) + - location: 36 (remaining gas: 1039977.848 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 38 (remaining gas: 1039977.873 units remaining) + - location: 38 (remaining gas: 1039977.838 units remaining) [ ] - - location: 36 (remaining gas: 1039977.843 units remaining) + - location: 36 (remaining gas: 1039977.808 units remaining) [ { 0 ; 7 ; 14 ; 21 } ] - - location: 39 (remaining gas: 1039977.828 units remaining) + - location: 39 (remaining gas: 1039977.793 units remaining) [ {} { 0 ; 7 ; 14 ; 21 } ] - - location: 41 (remaining gas: 1039977.813 units remaining) + - location: 41 (remaining gas: 1039977.778 units remaining) [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out index 5ccc4d0bc958..451110077bed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out @@ -7,17 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.541 units remaining) + - location: 8 (remaining gas: 1039993.506 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.531 units remaining) + - location: 8 (remaining gas: 1039993.496 units remaining) [ ] - - location: 9 (remaining gas: 1039993.521 units remaining) + - location: 9 (remaining gas: 1039993.486 units remaining) [ 300 ] - - location: 12 (remaining gas: 1039993.506 units remaining) + - location: 12 (remaining gas: 1039993.471 units remaining) [ (Some 300) ] - - location: 13 (remaining gas: 1039993.491 units remaining) + - location: 13 (remaining gas: 1039993.456 units remaining) [ {} (Some 300) ] - - location: 15 (remaining gas: 1039993.476 units remaining) + - location: 15 (remaining gas: 1039993.441 units remaining) [ (Pair {} (Some 300)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 055db4acc281..0ec8f200f24d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,36 +7,36 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039990.977 units remaining) + - location: 9 (remaining gas: 1039990.942 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039990.967 units remaining) + - location: 9 (remaining gas: 1039990.932 units remaining) [ { "c" ; "b" ; "a" } ] - - location: 10 (remaining gas: 1039990.952 units remaining) + - location: 10 (remaining gas: 1039990.917 units remaining) [ {} { "c" ; "b" ; "a" } ] - - location: 12 (remaining gas: 1039990.942 units remaining) + - location: 12 (remaining gas: 1039990.907 units remaining) [ { "c" ; "b" ; "a" } {} ] - - location: 13 (remaining gas: 1039990.942 units remaining) + - location: 13 (remaining gas: 1039990.907 units remaining) [ "c" {} ] - - location: 15 (remaining gas: 1039990.927 units remaining) + - location: 15 (remaining gas: 1039990.892 units remaining) [ { "c" } ] - - location: 13 (remaining gas: 1039990.912 units remaining) + - location: 13 (remaining gas: 1039990.877 units remaining) [ "b" { "c" } ] - - location: 15 (remaining gas: 1039990.897 units remaining) + - location: 15 (remaining gas: 1039990.862 units remaining) [ { "b" ; "c" } ] - - location: 13 (remaining gas: 1039990.882 units remaining) + - location: 13 (remaining gas: 1039990.847 units remaining) [ "a" { "b" ; "c" } ] - - location: 15 (remaining gas: 1039990.867 units remaining) + - location: 15 (remaining gas: 1039990.832 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 13 (remaining gas: 1039990.852 units remaining) + - location: 13 (remaining gas: 1039990.817 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 16 (remaining gas: 1039990.837 units remaining) + - location: 16 (remaining gas: 1039990.802 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 18 (remaining gas: 1039990.822 units remaining) + - location: 18 (remaining gas: 1039990.787 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" index 9ffcd7995b33..60958843c20e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.349 units remaining) + - location: 9 (remaining gas: 1039991.314 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039991.339 units remaining) + - location: 9 (remaining gas: 1039991.304 units remaining) [ {} ] - - location: 10 (remaining gas: 1039991.324 units remaining) + - location: 10 (remaining gas: 1039991.289 units remaining) [ {} {} ] - - location: 12 (remaining gas: 1039991.314 units remaining) + - location: 12 (remaining gas: 1039991.279 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039991.314 units remaining) + - location: 13 (remaining gas: 1039991.279 units remaining) [ {} ] - - location: 16 (remaining gas: 1039991.299 units remaining) + - location: 16 (remaining gas: 1039991.264 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039991.284 units remaining) + - location: 18 (remaining gas: 1039991.249 units remaining) [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 633d6da2d723..e8ee7edaff9c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,125 +7,125 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039982.192 units remaining) + - location: 9 (remaining gas: 1039982.157 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039982.182 units remaining) + - location: 9 (remaining gas: 1039982.147 units remaining) [ { "c" ; "b" ; "a" } ] - - location: 10 (remaining gas: 1039982.167 units remaining) + - location: 10 (remaining gas: 1039982.132 units remaining) [ {} { "c" ; "b" ; "a" } ] - - location: 12 (remaining gas: 1039982.157 units remaining) + - location: 12 (remaining gas: 1039982.122 units remaining) [ { "c" ; "b" ; "a" } {} ] - - location: 13 (remaining gas: 1039982.147 units remaining) + - location: 13 (remaining gas: 1039982.112 units remaining) [ True { "c" ; "b" ; "a" } {} ] - - location: 16 (remaining gas: 1039982.147 units remaining) + - location: 16 (remaining gas: 1039982.112 units remaining) [ { "c" ; "b" ; "a" } {} ] - - location: 18 (remaining gas: 1039982.137 units remaining) + - location: 18 (remaining gas: 1039982.102 units remaining) [ "c" { "b" ; "a" } {} ] - - location: 20 (remaining gas: 1039982.127 units remaining) + - location: 20 (remaining gas: 1039982.092 units remaining) [ { "b" ; "a" } "c" {} ] - - location: 21 (remaining gas: 1039982.112 units remaining) + - location: 21 (remaining gas: 1039982.077 units remaining) [ "c" {} ] - - location: 23 (remaining gas: 1039982.097 units remaining) + - location: 23 (remaining gas: 1039982.062 units remaining) [ { "c" } ] - - location: 21 (remaining gas: 1039982.067 units remaining) + - location: 21 (remaining gas: 1039982.032 units remaining) [ { "b" ; "a" } { "c" } ] - - location: 24 (remaining gas: 1039982.057 units remaining) + - location: 24 (remaining gas: 1039982.022 units remaining) [ True { "b" ; "a" } { "c" } ] - - location: 18 (remaining gas: 1039982.042 units remaining) + - location: 18 (remaining gas: 1039982.007 units remaining) [ True { "b" ; "a" } { "c" } ] - - location: 16 (remaining gas: 1039982.027 units remaining) + - location: 16 (remaining gas: 1039981.992 units remaining) [ { "b" ; "a" } { "c" } ] - - location: 18 (remaining gas: 1039982.017 units remaining) + - location: 18 (remaining gas: 1039981.982 units remaining) [ "b" { "a" } { "c" } ] - - location: 20 (remaining gas: 1039982.007 units remaining) + - location: 20 (remaining gas: 1039981.972 units remaining) [ { "a" } "b" { "c" } ] - - location: 21 (remaining gas: 1039981.992 units remaining) + - location: 21 (remaining gas: 1039981.957 units remaining) [ "b" { "c" } ] - - location: 23 (remaining gas: 1039981.977 units remaining) + - location: 23 (remaining gas: 1039981.942 units remaining) [ { "b" ; "c" } ] - - location: 21 (remaining gas: 1039981.947 units remaining) + - location: 21 (remaining gas: 1039981.912 units remaining) [ { "a" } { "b" ; "c" } ] - - location: 24 (remaining gas: 1039981.937 units remaining) + - location: 24 (remaining gas: 1039981.902 units remaining) [ True { "a" } { "b" ; "c" } ] - - location: 18 (remaining gas: 1039981.922 units remaining) + - location: 18 (remaining gas: 1039981.887 units remaining) [ True { "a" } { "b" ; "c" } ] - - location: 16 (remaining gas: 1039981.907 units remaining) + - location: 16 (remaining gas: 1039981.872 units remaining) [ { "a" } { "b" ; "c" } ] - - location: 18 (remaining gas: 1039981.897 units remaining) + - location: 18 (remaining gas: 1039981.862 units remaining) [ "a" {} { "b" ; "c" } ] - - location: 20 (remaining gas: 1039981.887 units remaining) + - location: 20 (remaining gas: 1039981.852 units remaining) [ {} "a" { "b" ; "c" } ] - - location: 21 (remaining gas: 1039981.872 units remaining) + - location: 21 (remaining gas: 1039981.837 units remaining) [ "a" { "b" ; "c" } ] - - location: 23 (remaining gas: 1039981.857 units remaining) + - location: 23 (remaining gas: 1039981.822 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 21 (remaining gas: 1039981.827 units remaining) + - location: 21 (remaining gas: 1039981.792 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 24 (remaining gas: 1039981.817 units remaining) + - location: 24 (remaining gas: 1039981.782 units remaining) [ True {} { "a" ; "b" ; "c" } ] - - location: 18 (remaining gas: 1039981.802 units remaining) + - location: 18 (remaining gas: 1039981.767 units remaining) [ True {} { "a" ; "b" ; "c" } ] - - location: 16 (remaining gas: 1039981.787 units remaining) + - location: 16 (remaining gas: 1039981.752 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 18 (remaining gas: 1039981.777 units remaining) + - location: 18 (remaining gas: 1039981.742 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 28 (remaining gas: 1039981.762 units remaining) + - location: 28 (remaining gas: 1039981.727 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 30 (remaining gas: 1039981.752 units remaining) + - location: 30 (remaining gas: 1039981.717 units remaining) [ False {} { "a" ; "b" ; "c" } ] - - location: 18 (remaining gas: 1039981.737 units remaining) + - location: 18 (remaining gas: 1039981.702 units remaining) [ False {} { "a" ; "b" ; "c" } ] - - location: 16 (remaining gas: 1039981.722 units remaining) + - location: 16 (remaining gas: 1039981.687 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 33 (remaining gas: 1039981.712 units remaining) + - location: 33 (remaining gas: 1039981.677 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 34 (remaining gas: 1039981.697 units remaining) + - location: 34 (remaining gas: 1039981.662 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 36 (remaining gas: 1039981.682 units remaining) + - location: 36 (remaining gas: 1039981.647 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" index 08e0aada69cc..e419581c5f85 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" @@ -7,44 +7,44 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039982.564 units remaining) + - location: 9 (remaining gas: 1039982.529 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039982.554 units remaining) + - location: 9 (remaining gas: 1039982.519 units remaining) [ {} ] - - location: 10 (remaining gas: 1039982.539 units remaining) + - location: 10 (remaining gas: 1039982.504 units remaining) [ {} {} ] - - location: 12 (remaining gas: 1039982.529 units remaining) + - location: 12 (remaining gas: 1039982.494 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039982.519 units remaining) + - location: 13 (remaining gas: 1039982.484 units remaining) [ True {} {} ] - - location: 16 (remaining gas: 1039982.519 units remaining) + - location: 16 (remaining gas: 1039982.484 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039982.509 units remaining) + - location: 18 (remaining gas: 1039982.474 units remaining) [ {} ] - - location: 28 (remaining gas: 1039982.494 units remaining) + - location: 28 (remaining gas: 1039982.459 units remaining) [ {} {} ] - - location: 30 (remaining gas: 1039982.484 units remaining) + - location: 30 (remaining gas: 1039982.449 units remaining) [ False {} {} ] - - location: 18 (remaining gas: 1039982.469 units remaining) + - location: 18 (remaining gas: 1039982.434 units remaining) [ False {} {} ] - - location: 16 (remaining gas: 1039982.454 units remaining) + - location: 16 (remaining gas: 1039982.419 units remaining) [ {} {} ] - - location: 33 (remaining gas: 1039982.444 units remaining) + - location: 33 (remaining gas: 1039982.409 units remaining) [ {} ] - - location: 34 (remaining gas: 1039982.429 units remaining) + - location: 34 (remaining gas: 1039982.394 units remaining) [ {} {} ] - - location: 36 (remaining gas: 1039982.414 units remaining) + - location: 36 (remaining gas: 1039982.379 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out index 65bd131c0f54..89efe9aaa882 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.857 units remaining) + - location: 8 (remaining gas: 1039994.822 units remaining) [ (Pair Unit {}) ] - - location: 8 (remaining gas: 1039994.847 units remaining) + - location: 8 (remaining gas: 1039994.812 units remaining) [ ] - - location: 9 (remaining gas: 1039994.832 units remaining) + - location: 9 (remaining gas: 1039994.797 units remaining) [ {} ] - - location: 11 (remaining gas: 1039994.817 units remaining) + - location: 11 (remaining gas: 1039994.782 units remaining) [ {} {} ] - - location: 13 (remaining gas: 1039994.802 units remaining) + - location: 13 (remaining gas: 1039994.767 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out index cd4edf2e27c5..685ff1df5ad3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out @@ -7,40 +7,40 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039984.339 units remaining) + - location: 7 (remaining gas: 1039984.269 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039984.329 units remaining) + - location: 7 (remaining gas: 1039984.259 units remaining) [ ] - - location: 8 (remaining gas: 1039984.319 units remaining) + - location: 8 (remaining gas: 1039984.249 units remaining) [ { DROP ; SELF_ADDRESS } ] - - location: 14 (remaining gas: 1039984.309 units remaining) + - location: 14 (remaining gas: 1039984.239 units remaining) [ Unit { DROP ; SELF_ADDRESS } ] - - location: 12 (remaining gas: 1039984.299 units remaining) + - location: 12 (remaining gas: 1039984.229 units remaining) [ ] - - location: 13 (remaining gas: 1039984.284 units remaining) + - location: 13 (remaining gas: 1039984.214 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 15 (remaining gas: 1039984.254 units remaining) + - location: 15 (remaining gas: 1039984.184 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 16 (remaining gas: 1039984.239 units remaining) + - location: 16 (remaining gas: 1039984.169 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 17 (remaining gas: 1039984.229 units remaining) + - location: 17 (remaining gas: 1039984.159 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 20 (remaining gas: 1039984.193 units remaining) + - location: 20 (remaining gas: 1039984.123 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039984.178 units remaining) + - location: 21 (remaining gas: 1039984.108 units remaining) [ True ] - - location: 22 (remaining gas: 1039984.168 units remaining) + - location: 22 (remaining gas: 1039984.098 units remaining) [ ] - - location: 22 (remaining gas: 1039984.153 units remaining) + - location: 22 (remaining gas: 1039984.083 units remaining) [ ] - - location: 28 (remaining gas: 1039984.143 units remaining) + - location: 28 (remaining gas: 1039984.073 units remaining) [ Unit ] - - location: 29 (remaining gas: 1039984.128 units remaining) + - location: 29 (remaining gas: 1039984.058 units remaining) [ {} Unit ] - - location: 31 (remaining gas: 1039984.113 units remaining) + - location: 31 (remaining gas: 1039984.043 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out index 4c01c8b1ebde..7f5d2164b7a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out @@ -7,41 +7,41 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039982.520 units remaining) + - location: 13 (remaining gas: 1039982.555 units remaining) [ (Pair (Right (Left Unit)) Unit) ] - - location: 13 (remaining gas: 1039982.510 units remaining) + - location: 13 (remaining gas: 1039982.545 units remaining) [ ] - - location: 14 (remaining gas: 1039982.495 units remaining) + - location: 14 (remaining gas: 1039982.530 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 15 (remaining gas: 1039982.485 units remaining) + - location: 15 (remaining gas: 1039982.520 units remaining) [ ] - - location: 16 (remaining gas: 1039982.470 units remaining) + - location: 16 (remaining gas: 1039982.505 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 17 (remaining gas: 1039982.460 units remaining) + - location: 17 (remaining gas: 1039982.495 units remaining) [ ] - - location: 18 (remaining gas: 1039982.445 units remaining) + - location: 18 (remaining gas: 1039982.480 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 19 (remaining gas: 1039971.492 units remaining) + - location: 19 (remaining gas: 1039971.527 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 20 (remaining gas: 1039971.477 units remaining) + - location: 20 (remaining gas: 1039971.512 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 21 (remaining gas: 1039960.524 units remaining) + - location: 21 (remaining gas: 1039960.559 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 24 (remaining gas: 1039960.489 units remaining) + - location: 24 (remaining gas: 1039960.524 units remaining) [ 0 ] - - location: 25 (remaining gas: 1039960.474 units remaining) + - location: 25 (remaining gas: 1039960.509 units remaining) [ True ] - - location: 26 (remaining gas: 1039960.464 units remaining) + - location: 26 (remaining gas: 1039960.499 units remaining) [ ] - - location: 26 (remaining gas: 1039960.449 units remaining) + - location: 26 (remaining gas: 1039960.484 units remaining) [ ] - - location: 32 (remaining gas: 1039960.439 units remaining) + - location: 32 (remaining gas: 1039960.474 units remaining) [ Unit ] - - location: 33 (remaining gas: 1039960.424 units remaining) + - location: 33 (remaining gas: 1039960.459 units remaining) [ {} Unit ] - - location: 35 (remaining gas: 1039960.409 units remaining) + - location: 35 (remaining gas: 1039960.444 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out index cf07bfd6c6bd..84e2f28457ba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out @@ -7,87 +7,87 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039952.881 units remaining) + - location: 13 (remaining gas: 1039952.671 units remaining) [ (Pair (Left (Left 0)) Unit) ] - - location: 13 (remaining gas: 1039952.871 units remaining) + - location: 13 (remaining gas: 1039952.661 units remaining) [ ] - - location: 14 (remaining gas: 1039952.856 units remaining) + - location: 14 (remaining gas: 1039952.646 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 15 (remaining gas: 1039941.870 units remaining) + - location: 15 (remaining gas: 1039941.660 units remaining) [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 16 (remaining gas: 1039941.855 units remaining) + - location: 16 (remaining gas: 1039941.645 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 17 (remaining gas: 1039930.902 units remaining) + - location: 17 (remaining gas: 1039930.692 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 18 (remaining gas: 1039930.892 units remaining) + - location: 18 (remaining gas: 1039930.682 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 19 (remaining gas: 1039930.877 units remaining) + - location: 19 (remaining gas: 1039930.667 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 21 (remaining gas: 1039930.867 units remaining) + - location: 21 (remaining gas: 1039930.657 units remaining) [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 19 (remaining gas: 1039930.837 units remaining) + - location: 19 (remaining gas: 1039930.627 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 24 (remaining gas: 1039930.802 units remaining) + - location: 24 (remaining gas: 1039930.592 units remaining) [ -1 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 25 (remaining gas: 1039930.787 units remaining) + - location: 25 (remaining gas: 1039930.577 units remaining) [ True 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 26 (remaining gas: 1039930.777 units remaining) + - location: 26 (remaining gas: 1039930.567 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 26 (remaining gas: 1039930.762 units remaining) + - location: 26 (remaining gas: 1039930.552 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 32 (remaining gas: 1039930.747 units remaining) + - location: 32 (remaining gas: 1039930.537 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 33 (remaining gas: 1039919.794 units remaining) + - location: 33 (remaining gas: 1039919.584 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 36 (remaining gas: 1039919.759 units remaining) + - location: 36 (remaining gas: 1039919.549 units remaining) [ 0 ] - - location: 37 (remaining gas: 1039919.744 units remaining) + - location: 37 (remaining gas: 1039919.534 units remaining) [ True ] - - location: 38 (remaining gas: 1039919.734 units remaining) + - location: 38 (remaining gas: 1039919.524 units remaining) [ ] - - location: 38 (remaining gas: 1039919.719 units remaining) + - location: 38 (remaining gas: 1039919.509 units remaining) [ ] - - location: 44 (remaining gas: 1039919.704 units remaining) + - location: 44 (remaining gas: 1039919.494 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 48 (remaining gas: 1039919.694 units remaining) + - location: 48 (remaining gas: 1039919.484 units remaining) [ ] - - location: 49 (remaining gas: 1039919.679 units remaining) + - location: 49 (remaining gas: 1039919.469 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - - location: 53 (remaining gas: 1039919.669 units remaining) + - location: 53 (remaining gas: 1039919.459 units remaining) [ ] - - location: 54 (remaining gas: 1039919.654 units remaining) + - location: 54 (remaining gas: 1039919.444 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - - location: 60 (remaining gas: 1039919.644 units remaining) + - location: 60 (remaining gas: 1039919.434 units remaining) [ ] - - location: 61 (remaining gas: 1039919.629 units remaining) + - location: 61 (remaining gas: 1039919.419 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - - location: 65 (remaining gas: 1039919.619 units remaining) + - location: 65 (remaining gas: 1039919.409 units remaining) [ ] - - location: 66 (remaining gas: 1039919.604 units remaining) + - location: 66 (remaining gas: 1039919.394 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 76 (remaining gas: 1039919.594 units remaining) + - location: 76 (remaining gas: 1039919.384 units remaining) [ ] - - location: 77 (remaining gas: 1039919.579 units remaining) + - location: 77 (remaining gas: 1039919.369 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 87 (remaining gas: 1039919.569 units remaining) + - location: 87 (remaining gas: 1039919.359 units remaining) [ ] - - location: 88 (remaining gas: 1039919.559 units remaining) + - location: 88 (remaining gas: 1039919.349 units remaining) [ Unit ] - - location: 89 (remaining gas: 1039919.544 units remaining) + - location: 89 (remaining gas: 1039919.334 units remaining) [ {} Unit ] - - location: 91 (remaining gas: 1039919.529 units remaining) + - location: 91 (remaining gas: 1039919.319 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" index b52075bceb2d..ceda319585c2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" @@ -7,43 +7,43 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039987.561 units remaining) + - location: 9 (remaining gas: 1039987.526 units remaining) [ (Pair "" "hello" 0) ] - - location: 9 (remaining gas: 1039987.551 units remaining) + - location: 9 (remaining gas: 1039987.516 units remaining) [ (Pair "" "hello" 0) (Pair "" "hello" 0) ] - - location: 10 (remaining gas: 1039987.541 units remaining) + - location: 10 (remaining gas: 1039987.506 units remaining) [ (Pair "hello" 0) (Pair "" "hello" 0) ] - - location: 11 (remaining gas: 1039987.526 units remaining) + - location: 11 (remaining gas: 1039987.491 units remaining) [ (Pair "" "hello" 0) ] - - location: 13 (remaining gas: 1039987.516 units remaining) + - location: 13 (remaining gas: 1039987.481 units remaining) [ "" ] - - location: 11 (remaining gas: 1039987.486 units remaining) + - location: 11 (remaining gas: 1039987.451 units remaining) [ (Pair "hello" 0) "" ] - - location: 15 (remaining gas: 1039987.476 units remaining) + - location: 15 (remaining gas: 1039987.441 units remaining) [ (Pair "hello" 0) (Pair "hello" 0) "" ] - - location: 16 (remaining gas: 1039987.466 units remaining) + - location: 16 (remaining gas: 1039987.431 units remaining) [ "hello" (Pair "hello" 0) "" ] - - location: 17 (remaining gas: 1039987.456 units remaining) + - location: 17 (remaining gas: 1039987.421 units remaining) [ (Pair "hello" 0) "" ] - - location: 18 (remaining gas: 1039987.446 units remaining) + - location: 18 (remaining gas: 1039987.411 units remaining) [ 0 "" ] - - location: 19 (remaining gas: 1039987.436 units remaining) + - location: 19 (remaining gas: 1039987.401 units remaining) [ "" 0 ] - - location: 20 (remaining gas: 1039987.421 units remaining) + - location: 20 (remaining gas: 1039987.386 units remaining) [ (Pair "" 0) ] - - location: 21 (remaining gas: 1039987.406 units remaining) + - location: 21 (remaining gas: 1039987.371 units remaining) [ {} (Pair "" 0) ] - - location: 23 (remaining gas: 1039987.391 units remaining) + - location: 23 (remaining gas: 1039987.356 units remaining) [ (Pair {} "" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" index 58358307a610..10141984c9bb 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" @@ -7,43 +7,43 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039987.531 units remaining) + - location: 9 (remaining gas: 1039987.496 units remaining) [ (Pair "abc" "hello" 0) ] - - location: 9 (remaining gas: 1039987.521 units remaining) + - location: 9 (remaining gas: 1039987.486 units remaining) [ (Pair "abc" "hello" 0) (Pair "abc" "hello" 0) ] - - location: 10 (remaining gas: 1039987.511 units remaining) + - location: 10 (remaining gas: 1039987.476 units remaining) [ (Pair "hello" 0) (Pair "abc" "hello" 0) ] - - location: 11 (remaining gas: 1039987.496 units remaining) + - location: 11 (remaining gas: 1039987.461 units remaining) [ (Pair "abc" "hello" 0) ] - - location: 13 (remaining gas: 1039987.486 units remaining) + - location: 13 (remaining gas: 1039987.451 units remaining) [ "abc" ] - - location: 11 (remaining gas: 1039987.456 units remaining) + - location: 11 (remaining gas: 1039987.421 units remaining) [ (Pair "hello" 0) "abc" ] - - location: 15 (remaining gas: 1039987.446 units remaining) + - location: 15 (remaining gas: 1039987.411 units remaining) [ (Pair "hello" 0) (Pair "hello" 0) "abc" ] - - location: 16 (remaining gas: 1039987.436 units remaining) + - location: 16 (remaining gas: 1039987.401 units remaining) [ "hello" (Pair "hello" 0) "abc" ] - - location: 17 (remaining gas: 1039987.426 units remaining) + - location: 17 (remaining gas: 1039987.391 units remaining) [ (Pair "hello" 0) "abc" ] - - location: 18 (remaining gas: 1039987.416 units remaining) + - location: 18 (remaining gas: 1039987.381 units remaining) [ 0 "abc" ] - - location: 19 (remaining gas: 1039987.406 units remaining) + - location: 19 (remaining gas: 1039987.371 units remaining) [ "abc" 0 ] - - location: 20 (remaining gas: 1039987.391 units remaining) + - location: 20 (remaining gas: 1039987.356 units remaining) [ (Pair "abc" 0) ] - - location: 21 (remaining gas: 1039987.376 units remaining) + - location: 21 (remaining gas: 1039987.341 units remaining) [ {} (Pair "abc" 0) ] - - location: 23 (remaining gas: 1039987.361 units remaining) + - location: 23 (remaining gas: 1039987.326 units remaining) [ (Pair {} "abc" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" index 8cea6ca5aaa0..8f34d88600fc 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" @@ -7,43 +7,43 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039987.511 units remaining) + - location: 9 (remaining gas: 1039987.476 units remaining) [ (Pair "world" "hello" 0) ] - - location: 9 (remaining gas: 1039987.501 units remaining) + - location: 9 (remaining gas: 1039987.466 units remaining) [ (Pair "world" "hello" 0) (Pair "world" "hello" 0) ] - - location: 10 (remaining gas: 1039987.491 units remaining) + - location: 10 (remaining gas: 1039987.456 units remaining) [ (Pair "hello" 0) (Pair "world" "hello" 0) ] - - location: 11 (remaining gas: 1039987.476 units remaining) + - location: 11 (remaining gas: 1039987.441 units remaining) [ (Pair "world" "hello" 0) ] - - location: 13 (remaining gas: 1039987.466 units remaining) + - location: 13 (remaining gas: 1039987.431 units remaining) [ "world" ] - - location: 11 (remaining gas: 1039987.436 units remaining) + - location: 11 (remaining gas: 1039987.401 units remaining) [ (Pair "hello" 0) "world" ] - - location: 15 (remaining gas: 1039987.426 units remaining) + - location: 15 (remaining gas: 1039987.391 units remaining) [ (Pair "hello" 0) (Pair "hello" 0) "world" ] - - location: 16 (remaining gas: 1039987.416 units remaining) + - location: 16 (remaining gas: 1039987.381 units remaining) [ "hello" (Pair "hello" 0) "world" ] - - location: 17 (remaining gas: 1039987.406 units remaining) + - location: 17 (remaining gas: 1039987.371 units remaining) [ (Pair "hello" 0) "world" ] - - location: 18 (remaining gas: 1039987.396 units remaining) + - location: 18 (remaining gas: 1039987.361 units remaining) [ 0 "world" ] - - location: 19 (remaining gas: 1039987.386 units remaining) + - location: 19 (remaining gas: 1039987.351 units remaining) [ "world" 0 ] - - location: 20 (remaining gas: 1039987.371 units remaining) + - location: 20 (remaining gas: 1039987.336 units remaining) [ (Pair "world" 0) ] - - location: 21 (remaining gas: 1039987.356 units remaining) + - location: 21 (remaining gas: 1039987.321 units remaining) [ {} (Pair "world" 0) ] - - location: 23 (remaining gas: 1039987.341 units remaining) + - location: 23 (remaining gas: 1039987.306 units remaining) [ (Pair {} "world" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" index abcb3d0f8799..073f8d7f7c82 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" @@ -7,40 +7,40 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.178 units remaining) + - location: 9 (remaining gas: 1039988.143 units remaining) [ (Pair 1 "hello" 0) ] - - location: 9 (remaining gas: 1039988.168 units remaining) + - location: 9 (remaining gas: 1039988.133 units remaining) [ (Pair 1 "hello" 0) (Pair 1 "hello" 0) ] - - location: 10 (remaining gas: 1039988.158 units remaining) + - location: 10 (remaining gas: 1039988.123 units remaining) [ (Pair "hello" 0) (Pair 1 "hello" 0) ] - - location: 11 (remaining gas: 1039988.143 units remaining) + - location: 11 (remaining gas: 1039988.108 units remaining) [ (Pair 1 "hello" 0) ] - - location: 13 (remaining gas: 1039988.133 units remaining) + - location: 13 (remaining gas: 1039988.098 units remaining) [ 1 ] - - location: 11 (remaining gas: 1039988.103 units remaining) + - location: 11 (remaining gas: 1039988.068 units remaining) [ (Pair "hello" 0) 1 ] - - location: 15 (remaining gas: 1039988.093 units remaining) + - location: 15 (remaining gas: 1039988.058 units remaining) [ (Pair "hello" 0) (Pair "hello" 0) 1 ] - - location: 16 (remaining gas: 1039988.083 units remaining) + - location: 16 (remaining gas: 1039988.048 units remaining) [ 0 (Pair "hello" 0) 1 ] - - location: 17 (remaining gas: 1039988.073 units remaining) + - location: 17 (remaining gas: 1039988.038 units remaining) [ (Pair "hello" 0) 1 ] - - location: 18 (remaining gas: 1039988.063 units remaining) + - location: 18 (remaining gas: 1039988.028 units remaining) [ "hello" 1 ] - - location: 19 (remaining gas: 1039988.048 units remaining) + - location: 19 (remaining gas: 1039988.013 units remaining) [ (Pair "hello" 1) ] - - location: 20 (remaining gas: 1039988.033 units remaining) + - location: 20 (remaining gas: 1039987.998 units remaining) [ {} (Pair "hello" 1) ] - - location: 22 (remaining gas: 1039988.018 units remaining) + - location: 22 (remaining gas: 1039987.983 units remaining) [ (Pair {} "hello" 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" index 9b0e7122fd1c..2388c06208b9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" @@ -7,40 +7,40 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.178 units remaining) + - location: 9 (remaining gas: 1039988.143 units remaining) [ (Pair 3 "hello" 500) ] - - location: 9 (remaining gas: 1039988.168 units remaining) + - location: 9 (remaining gas: 1039988.133 units remaining) [ (Pair 3 "hello" 500) (Pair 3 "hello" 500) ] - - location: 10 (remaining gas: 1039988.158 units remaining) + - location: 10 (remaining gas: 1039988.123 units remaining) [ (Pair "hello" 500) (Pair 3 "hello" 500) ] - - location: 11 (remaining gas: 1039988.143 units remaining) + - location: 11 (remaining gas: 1039988.108 units remaining) [ (Pair 3 "hello" 500) ] - - location: 13 (remaining gas: 1039988.133 units remaining) + - location: 13 (remaining gas: 1039988.098 units remaining) [ 3 ] - - location: 11 (remaining gas: 1039988.103 units remaining) + - location: 11 (remaining gas: 1039988.068 units remaining) [ (Pair "hello" 500) 3 ] - - location: 15 (remaining gas: 1039988.093 units remaining) + - location: 15 (remaining gas: 1039988.058 units remaining) [ (Pair "hello" 500) (Pair "hello" 500) 3 ] - - location: 16 (remaining gas: 1039988.083 units remaining) + - location: 16 (remaining gas: 1039988.048 units remaining) [ 500 (Pair "hello" 500) 3 ] - - location: 17 (remaining gas: 1039988.073 units remaining) + - location: 17 (remaining gas: 1039988.038 units remaining) [ (Pair "hello" 500) 3 ] - - location: 18 (remaining gas: 1039988.063 units remaining) + - location: 18 (remaining gas: 1039988.028 units remaining) [ "hello" 3 ] - - location: 19 (remaining gas: 1039988.048 units remaining) + - location: 19 (remaining gas: 1039988.013 units remaining) [ (Pair "hello" 3) ] - - location: 20 (remaining gas: 1039988.033 units remaining) + - location: 20 (remaining gas: 1039987.998 units remaining) [ {} (Pair "hello" 3) ] - - location: 22 (remaining gas: 1039988.018 units remaining) + - location: 22 (remaining gas: 1039987.983 units remaining) [ (Pair {} "hello" 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" index 34dda4f6de29..4450ab560b89 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" @@ -7,40 +7,40 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.178 units remaining) + - location: 9 (remaining gas: 1039988.143 units remaining) [ (Pair 100 "hello" 7) ] - - location: 9 (remaining gas: 1039988.168 units remaining) + - location: 9 (remaining gas: 1039988.133 units remaining) [ (Pair 100 "hello" 7) (Pair 100 "hello" 7) ] - - location: 10 (remaining gas: 1039988.158 units remaining) + - location: 10 (remaining gas: 1039988.123 units remaining) [ (Pair "hello" 7) (Pair 100 "hello" 7) ] - - location: 11 (remaining gas: 1039988.143 units remaining) + - location: 11 (remaining gas: 1039988.108 units remaining) [ (Pair 100 "hello" 7) ] - - location: 13 (remaining gas: 1039988.133 units remaining) + - location: 13 (remaining gas: 1039988.098 units remaining) [ 100 ] - - location: 11 (remaining gas: 1039988.103 units remaining) + - location: 11 (remaining gas: 1039988.068 units remaining) [ (Pair "hello" 7) 100 ] - - location: 15 (remaining gas: 1039988.093 units remaining) + - location: 15 (remaining gas: 1039988.058 units remaining) [ (Pair "hello" 7) (Pair "hello" 7) 100 ] - - location: 16 (remaining gas: 1039988.083 units remaining) + - location: 16 (remaining gas: 1039988.048 units remaining) [ 7 (Pair "hello" 7) 100 ] - - location: 17 (remaining gas: 1039988.073 units remaining) + - location: 17 (remaining gas: 1039988.038 units remaining) [ (Pair "hello" 7) 100 ] - - location: 18 (remaining gas: 1039988.063 units remaining) + - location: 18 (remaining gas: 1039988.028 units remaining) [ "hello" 100 ] - - location: 19 (remaining gas: 1039988.048 units remaining) + - location: 19 (remaining gas: 1039988.013 units remaining) [ (Pair "hello" 100) ] - - location: 20 (remaining gas: 1039988.033 units remaining) + - location: 20 (remaining gas: 1039987.998 units remaining) [ {} (Pair "hello" 100) ] - - location: 22 (remaining gas: 1039988.018 units remaining) + - location: 22 (remaining gas: 1039987.983 units remaining) [ (Pair {} "hello" 100) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 5cc952222acc..26c38fd236ad 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039993.773 units remaining) + - location: 9 (remaining gas: 1039993.738 units remaining) [ (Pair { "a" ; "b" ; "c" } {}) ] - - location: 9 (remaining gas: 1039993.763 units remaining) + - location: 9 (remaining gas: 1039993.728 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 10 (remaining gas: 1039993.748 units remaining) + - location: 10 (remaining gas: 1039993.713 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 12 (remaining gas: 1039993.733 units remaining) + - location: 12 (remaining gas: 1039993.698 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" index 98b4125d002a..ac203fb227a9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039994.212 units remaining) + - location: 9 (remaining gas: 1039994.177 units remaining) [ (Pair { "asdf" ; "bcde" } {}) ] - - location: 9 (remaining gas: 1039994.202 units remaining) + - location: 9 (remaining gas: 1039994.167 units remaining) [ { "asdf" ; "bcde" } ] - - location: 10 (remaining gas: 1039994.187 units remaining) + - location: 10 (remaining gas: 1039994.152 units remaining) [ {} { "asdf" ; "bcde" } ] - - location: 12 (remaining gas: 1039994.172 units remaining) + - location: 12 (remaining gas: 1039994.137 units remaining) [ (Pair {} { "asdf" ; "bcde" }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out index 184f982b586e..9ff27af11f13 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out @@ -7,13 +7,13 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039995.025 units remaining) + - location: 9 (remaining gas: 1039994.990 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039995.015 units remaining) + - location: 9 (remaining gas: 1039994.980 units remaining) [ {} ] - - location: 10 (remaining gas: 1039995 units remaining) + - location: 10 (remaining gas: 1039994.965 units remaining) [ {} {} ] - - location: 12 (remaining gas: 1039994.985 units remaining) + - location: 12 (remaining gas: 1039994.950 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out index 2fbb3eeffb17..6d029d3ccb91 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out @@ -7,41 +7,41 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.518 units remaining) + - location: 8 (remaining gas: 1039990.483 units remaining) [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039990.508 units remaining) + - location: 8 (remaining gas: 1039990.473 units remaining) [ { -100 ; 1 ; 2 ; 3 } ] - - location: 9 (remaining gas: 1039990.498 units remaining) + - location: 9 (remaining gas: 1039990.463 units remaining) [ 0 { -100 ; 1 ; 2 ; 3 } ] - - location: 12 (remaining gas: 1039990.488 units remaining) + - location: 12 (remaining gas: 1039990.453 units remaining) [ { -100 ; 1 ; 2 ; 3 } 0 ] - - location: 13 (remaining gas: 1039990.488 units remaining) + - location: 13 (remaining gas: 1039990.453 units remaining) [ -100 0 ] - - location: 15 (remaining gas: 1039990.433 units remaining) + - location: 15 (remaining gas: 1039990.398 units remaining) [ -100 ] - - location: 13 (remaining gas: 1039990.418 units remaining) + - location: 13 (remaining gas: 1039990.383 units remaining) [ 1 -100 ] - - location: 15 (remaining gas: 1039990.363 units remaining) + - location: 15 (remaining gas: 1039990.328 units remaining) [ -99 ] - - location: 13 (remaining gas: 1039990.348 units remaining) + - location: 13 (remaining gas: 1039990.313 units remaining) [ 2 -99 ] - - location: 15 (remaining gas: 1039990.293 units remaining) + - location: 15 (remaining gas: 1039990.258 units remaining) [ -97 ] - - location: 13 (remaining gas: 1039990.278 units remaining) + - location: 13 (remaining gas: 1039990.243 units remaining) [ 3 -97 ] - - location: 15 (remaining gas: 1039990.223 units remaining) + - location: 15 (remaining gas: 1039990.188 units remaining) [ -94 ] - - location: 13 (remaining gas: 1039990.208 units remaining) + - location: 13 (remaining gas: 1039990.173 units remaining) [ -94 ] - - location: 16 (remaining gas: 1039990.193 units remaining) + - location: 16 (remaining gas: 1039990.158 units remaining) [ {} -94 ] - - location: 18 (remaining gas: 1039990.178 units remaining) + - location: 18 (remaining gas: 1039990.143 units remaining) [ (Pair {} -94) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out index 1dc128f3c849..543bbe586304 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.873 units remaining) + - location: 8 (remaining gas: 1039991.838 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039991.863 units remaining) + - location: 8 (remaining gas: 1039991.828 units remaining) [ { 1 } ] - - location: 9 (remaining gas: 1039991.853 units remaining) + - location: 9 (remaining gas: 1039991.818 units remaining) [ 0 { 1 } ] - - location: 12 (remaining gas: 1039991.843 units remaining) + - location: 12 (remaining gas: 1039991.808 units remaining) [ { 1 } 0 ] - - location: 13 (remaining gas: 1039991.843 units remaining) + - location: 13 (remaining gas: 1039991.808 units remaining) [ 1 0 ] - - location: 15 (remaining gas: 1039991.788 units remaining) + - location: 15 (remaining gas: 1039991.753 units remaining) [ 1 ] - - location: 13 (remaining gas: 1039991.773 units remaining) + - location: 13 (remaining gas: 1039991.738 units remaining) [ 1 ] - - location: 16 (remaining gas: 1039991.758 units remaining) + - location: 16 (remaining gas: 1039991.723 units remaining) [ {} 1 ] - - location: 18 (remaining gas: 1039991.743 units remaining) + - location: 18 (remaining gas: 1039991.708 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out index 8aa528cfa8b0..24742b6625b5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.173 units remaining) + - location: 8 (remaining gas: 1039992.138 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039992.163 units remaining) + - location: 8 (remaining gas: 1039992.128 units remaining) [ {} ] - - location: 9 (remaining gas: 1039992.153 units remaining) + - location: 9 (remaining gas: 1039992.118 units remaining) [ 0 {} ] - - location: 12 (remaining gas: 1039992.143 units remaining) + - location: 12 (remaining gas: 1039992.108 units remaining) [ {} 0 ] - - location: 13 (remaining gas: 1039992.143 units remaining) + - location: 13 (remaining gas: 1039992.108 units remaining) [ 0 ] - - location: 16 (remaining gas: 1039992.128 units remaining) + - location: 16 (remaining gas: 1039992.093 units remaining) [ {} 0 ] - - location: 18 (remaining gas: 1039992.113 units remaining) + - location: 18 (remaining gas: 1039992.078 units remaining) [ (Pair {} 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" index e562ab59814f..3866fd9d3510 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" @@ -7,55 +7,55 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039983.293 units remaining) + - location: 11 (remaining gas: 1039983.258 units remaining) [ (Pair "" { "Hello" ; "World" } None) ] - - location: 11 (remaining gas: 1039983.283 units remaining) + - location: 11 (remaining gas: 1039983.248 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 12 (remaining gas: 1039983.273 units remaining) + - location: 12 (remaining gas: 1039983.238 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 13 (remaining gas: 1039983.263 units remaining) + - location: 13 (remaining gas: 1039983.228 units remaining) [ "" (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 14 (remaining gas: 1039983.248 units remaining) + - location: 14 (remaining gas: 1039983.213 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 17 (remaining gas: 1039983.238 units remaining) + - location: 17 (remaining gas: 1039983.203 units remaining) [ (Pair { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 18 (remaining gas: 1039983.228 units remaining) + - location: 18 (remaining gas: 1039983.193 units remaining) [ { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - - location: 14 (remaining gas: 1039983.198 units remaining) + - location: 14 (remaining gas: 1039983.163 units remaining) [ "" { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - - location: 19 (remaining gas: 1039982.978 units remaining) + - location: 19 (remaining gas: 1039982.943 units remaining) [ False (Pair "" { "Hello" ; "World" } None) ] - - location: 20 (remaining gas: 1039982.963 units remaining) + - location: 20 (remaining gas: 1039982.928 units remaining) [ (Some False) (Pair "" { "Hello" ; "World" } None) ] - - location: 21 (remaining gas: 1039982.948 units remaining) + - location: 21 (remaining gas: 1039982.913 units remaining) [ (Pair "" { "Hello" ; "World" } None) ] - - location: 24 (remaining gas: 1039982.938 units remaining) + - location: 24 (remaining gas: 1039982.903 units remaining) [ (Pair { "Hello" ; "World" } None) ] - - location: 25 (remaining gas: 1039982.928 units remaining) + - location: 25 (remaining gas: 1039982.893 units remaining) [ { "Hello" ; "World" } ] - - location: 21 (remaining gas: 1039982.898 units remaining) + - location: 21 (remaining gas: 1039982.863 units remaining) [ (Some False) { "Hello" ; "World" } ] - - location: 26 (remaining gas: 1039982.888 units remaining) + - location: 26 (remaining gas: 1039982.853 units remaining) [ { "Hello" ; "World" } (Some False) ] - - location: 27 (remaining gas: 1039982.873 units remaining) + - location: 27 (remaining gas: 1039982.838 units remaining) [ (Pair { "Hello" ; "World" } (Some False)) ] - - location: 28 (remaining gas: 1039982.858 units remaining) + - location: 28 (remaining gas: 1039982.823 units remaining) [ {} (Pair { "Hello" ; "World" } (Some False)) ] - - location: 30 (remaining gas: 1039982.843 units remaining) + - location: 30 (remaining gas: 1039982.808 units remaining) [ (Pair {} { "Hello" ; "World" } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" index ea34b86221a8..f8152aa3b821 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" @@ -7,55 +7,55 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039983.772 units remaining) + - location: 11 (remaining gas: 1039983.737 units remaining) [ (Pair "Hi" { "Hi" } None) ] - - location: 11 (remaining gas: 1039983.762 units remaining) + - location: 11 (remaining gas: 1039983.727 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 12 (remaining gas: 1039983.752 units remaining) + - location: 12 (remaining gas: 1039983.717 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 13 (remaining gas: 1039983.742 units remaining) + - location: 13 (remaining gas: 1039983.707 units remaining) [ "Hi" (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 14 (remaining gas: 1039983.727 units remaining) + - location: 14 (remaining gas: 1039983.692 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 17 (remaining gas: 1039983.717 units remaining) + - location: 17 (remaining gas: 1039983.682 units remaining) [ (Pair { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 18 (remaining gas: 1039983.707 units remaining) + - location: 18 (remaining gas: 1039983.672 units remaining) [ { "Hi" } (Pair "Hi" { "Hi" } None) ] - - location: 14 (remaining gas: 1039983.677 units remaining) + - location: 14 (remaining gas: 1039983.642 units remaining) [ "Hi" { "Hi" } (Pair "Hi" { "Hi" } None) ] - - location: 19 (remaining gas: 1039983.492 units remaining) + - location: 19 (remaining gas: 1039983.457 units remaining) [ True (Pair "Hi" { "Hi" } None) ] - - location: 20 (remaining gas: 1039983.477 units remaining) + - location: 20 (remaining gas: 1039983.442 units remaining) [ (Some True) (Pair "Hi" { "Hi" } None) ] - - location: 21 (remaining gas: 1039983.462 units remaining) + - location: 21 (remaining gas: 1039983.427 units remaining) [ (Pair "Hi" { "Hi" } None) ] - - location: 24 (remaining gas: 1039983.452 units remaining) + - location: 24 (remaining gas: 1039983.417 units remaining) [ (Pair { "Hi" } None) ] - - location: 25 (remaining gas: 1039983.442 units remaining) + - location: 25 (remaining gas: 1039983.407 units remaining) [ { "Hi" } ] - - location: 21 (remaining gas: 1039983.412 units remaining) + - location: 21 (remaining gas: 1039983.377 units remaining) [ (Some True) { "Hi" } ] - - location: 26 (remaining gas: 1039983.402 units remaining) + - location: 26 (remaining gas: 1039983.367 units remaining) [ { "Hi" } (Some True) ] - - location: 27 (remaining gas: 1039983.387 units remaining) + - location: 27 (remaining gas: 1039983.352 units remaining) [ (Pair { "Hi" } (Some True)) ] - - location: 28 (remaining gas: 1039983.372 units remaining) + - location: 28 (remaining gas: 1039983.337 units remaining) [ {} (Pair { "Hi" } (Some True)) ] - - location: 30 (remaining gas: 1039983.357 units remaining) + - location: 30 (remaining gas: 1039983.322 units remaining) [ (Pair {} { "Hi" } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" index 37f94a047b49..8c1b569fbdec 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" @@ -7,55 +7,55 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039984.106 units remaining) + - location: 11 (remaining gas: 1039984.071 units remaining) [ (Pair "Hi" {} None) ] - - location: 11 (remaining gas: 1039984.096 units remaining) + - location: 11 (remaining gas: 1039984.061 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 12 (remaining gas: 1039984.086 units remaining) + - location: 12 (remaining gas: 1039984.051 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 13 (remaining gas: 1039984.076 units remaining) + - location: 13 (remaining gas: 1039984.041 units remaining) [ "Hi" (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 14 (remaining gas: 1039984.061 units remaining) + - location: 14 (remaining gas: 1039984.026 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 17 (remaining gas: 1039984.051 units remaining) + - location: 17 (remaining gas: 1039984.016 units remaining) [ (Pair {} None) (Pair "Hi" {} None) ] - - location: 18 (remaining gas: 1039984.041 units remaining) + - location: 18 (remaining gas: 1039984.006 units remaining) [ {} (Pair "Hi" {} None) ] - - location: 14 (remaining gas: 1039984.011 units remaining) + - location: 14 (remaining gas: 1039983.976 units remaining) [ "Hi" {} (Pair "Hi" {} None) ] - - location: 19 (remaining gas: 1039983.861 units remaining) + - location: 19 (remaining gas: 1039983.826 units remaining) [ False (Pair "Hi" {} None) ] - - location: 20 (remaining gas: 1039983.846 units remaining) + - location: 20 (remaining gas: 1039983.811 units remaining) [ (Some False) (Pair "Hi" {} None) ] - - location: 21 (remaining gas: 1039983.831 units remaining) + - location: 21 (remaining gas: 1039983.796 units remaining) [ (Pair "Hi" {} None) ] - - location: 24 (remaining gas: 1039983.821 units remaining) + - location: 24 (remaining gas: 1039983.786 units remaining) [ (Pair {} None) ] - - location: 25 (remaining gas: 1039983.811 units remaining) + - location: 25 (remaining gas: 1039983.776 units remaining) [ {} ] - - location: 21 (remaining gas: 1039983.781 units remaining) + - location: 21 (remaining gas: 1039983.746 units remaining) [ (Some False) {} ] - - location: 26 (remaining gas: 1039983.771 units remaining) + - location: 26 (remaining gas: 1039983.736 units remaining) [ {} (Some False) ] - - location: 27 (remaining gas: 1039983.756 units remaining) + - location: 27 (remaining gas: 1039983.721 units remaining) [ (Pair {} (Some False)) ] - - location: 28 (remaining gas: 1039983.741 units remaining) + - location: 28 (remaining gas: 1039983.706 units remaining) [ {} (Pair {} (Some False)) ] - - location: 30 (remaining gas: 1039983.726 units remaining) + - location: 30 (remaining gas: 1039983.691 units remaining) [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index 36242823326c..bcf272e9243a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.075 units remaining) + - location: 8 (remaining gas: 1039992.040 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - - location: 8 (remaining gas: 1039992.065 units remaining) + - location: 8 (remaining gas: 1039992.030 units remaining) [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - - location: 9 (remaining gas: 1039992.050 units remaining) + - location: 9 (remaining gas: 1039992.015 units remaining) [ 6 ] - - location: 10 (remaining gas: 1039992.035 units remaining) + - location: 10 (remaining gas: 1039992 units remaining) [ {} 6 ] - - location: 12 (remaining gas: 1039992.020 units remaining) + - location: 12 (remaining gas: 1039991.985 units remaining) [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out index 3465eb3fe178..f50badb4460e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.640 units remaining) + - location: 8 (remaining gas: 1039993.605 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039993.630 units remaining) + - location: 8 (remaining gas: 1039993.595 units remaining) [ { 1 ; 2 ; 3 } ] - - location: 9 (remaining gas: 1039993.615 units remaining) + - location: 9 (remaining gas: 1039993.580 units remaining) [ 3 ] - - location: 10 (remaining gas: 1039993.600 units remaining) + - location: 10 (remaining gas: 1039993.565 units remaining) [ {} 3 ] - - location: 12 (remaining gas: 1039993.585 units remaining) + - location: 12 (remaining gas: 1039993.550 units remaining) [ (Pair {} 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out index 3fcf0ff652bf..245d45fbb635 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.520 units remaining) + - location: 8 (remaining gas: 1039994.485 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039994.510 units remaining) + - location: 8 (remaining gas: 1039994.475 units remaining) [ { 1 } ] - - location: 9 (remaining gas: 1039994.495 units remaining) + - location: 9 (remaining gas: 1039994.460 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039994.480 units remaining) + - location: 10 (remaining gas: 1039994.445 units remaining) [ {} 1 ] - - location: 12 (remaining gas: 1039994.465 units remaining) + - location: 12 (remaining gas: 1039994.430 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out index 86b65bd3f9b5..6ec6da4ab1ca 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.820 units remaining) + - location: 8 (remaining gas: 1039994.785 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039994.810 units remaining) + - location: 8 (remaining gas: 1039994.775 units remaining) [ {} ] - - location: 9 (remaining gas: 1039994.795 units remaining) + - location: 9 (remaining gas: 1039994.760 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039994.780 units remaining) + - location: 10 (remaining gas: 1039994.745 units remaining) [ {} 0 ] - - location: 12 (remaining gas: 1039994.765 units remaining) + - location: 12 (remaining gas: 1039994.730 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out index 037cba14881e..9cd744f70b5a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out @@ -7,18 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.957 units remaining) + - location: 8 (remaining gas: 1039993.922 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - - location: 8 (remaining gas: 1039993.947 units remaining) + - location: 8 (remaining gas: 1039993.912 units remaining) [ 0x48656c6c6f2c20776f726c6421 ] - - location: 9 (remaining gas: 1039992.490 units remaining) + - location: 9 (remaining gas: 1039992.455 units remaining) [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] - - location: 10 (remaining gas: 1039992.475 units remaining) + - location: 10 (remaining gas: 1039992.440 units remaining) [ (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - - location: 11 (remaining gas: 1039992.460 units remaining) + - location: 11 (remaining gas: 1039992.425 units remaining) [ {} (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - - location: 13 (remaining gas: 1039992.445 units remaining) + - location: 13 (remaining gas: 1039992.410 units remaining) [ (Pair {} (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out index 346287d1cb2f..e7a4346becfe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Left (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Left (Pair 0 0)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 0 0) ] - - location: 17 (remaining gas: 1039989.604 units remaining) + - location: 17 (remaining gas: 1039989.569 units remaining) [ 0 0 ] - - location: 18 (remaining gas: 1039989.604 units remaining) + - location: 18 (remaining gas: 1039989.569 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out index 70fcfadef416..37dbf58e1fdb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Left (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Left (Pair 0 1)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 0 1) ] - - location: 17 (remaining gas: 1039989.604 units remaining) + - location: 17 (remaining gas: 1039989.569 units remaining) [ 0 1 ] - - location: 18 (remaining gas: 1039989.604 units remaining) + - location: 18 (remaining gas: 1039989.569 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out index 27e590726daa..fd7829d40c88 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Left (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Left (Pair 1 2)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 1 2) ] - - location: 17 (remaining gas: 1039989.604 units remaining) + - location: 17 (remaining gas: 1039989.569 units remaining) [ 1 2 ] - - location: 18 (remaining gas: 1039989.604 units remaining) + - location: 18 (remaining gas: 1039989.569 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 4 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 4)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out index d01afd55fe1e..f136ea85e331 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Left (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Left (Pair 15 2)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 15 2) ] - - location: 17 (remaining gas: 1039989.604 units remaining) + - location: 17 (remaining gas: 1039989.569 units remaining) [ 15 2 ] - - location: 18 (remaining gas: 1039989.604 units remaining) + - location: 18 (remaining gas: 1039989.569 units remaining) [ 60 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 60 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 60) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 60) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 60)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out index 5403c2ae5f7a..b71e3dc35360 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Left (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Left (Pair 8 1)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 8 1) ] - - location: 17 (remaining gas: 1039989.604 units remaining) + - location: 17 (remaining gas: 1039989.569 units remaining) [ 8 1 ] - - location: 18 (remaining gas: 1039989.604 units remaining) + - location: 18 (remaining gas: 1039989.569 units remaining) [ 16 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 16 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 16) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 16) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 16)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out index 0d0f3ce5ee4a..5440b65ca6ff 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Right (Pair 0 0)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 0 0) ] - - location: 20 (remaining gas: 1039989.604 units remaining) + - location: 20 (remaining gas: 1039989.569 units remaining) [ 0 0 ] - - location: 21 (remaining gas: 1039989.604 units remaining) + - location: 21 (remaining gas: 1039989.569 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out index 986561eb8b8e..7e4c0ddc7ff4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Right (Pair 0 1)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 0 1) ] - - location: 20 (remaining gas: 1039989.604 units remaining) + - location: 20 (remaining gas: 1039989.569 units remaining) [ 0 1 ] - - location: 21 (remaining gas: 1039989.604 units remaining) + - location: 21 (remaining gas: 1039989.569 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out index a0e686b1f337..de3e873ffd3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Right (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Right (Pair 1 2)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 1 2) ] - - location: 20 (remaining gas: 1039989.604 units remaining) + - location: 20 (remaining gas: 1039989.569 units remaining) [ 1 2 ] - - location: 21 (remaining gas: 1039989.604 units remaining) + - location: 21 (remaining gas: 1039989.569 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out index d7eda8b0632e..699db2f3a280 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Right (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Right (Pair 15 2)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 15 2) ] - - location: 20 (remaining gas: 1039989.604 units remaining) + - location: 20 (remaining gas: 1039989.569 units remaining) [ 15 2 ] - - location: 21 (remaining gas: 1039989.604 units remaining) + - location: 21 (remaining gas: 1039989.569 units remaining) [ 3 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 3 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 3) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 3) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 3)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out index 1b3a0c740978..e78f5d136785 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.634 units remaining) + - location: 14 (remaining gas: 1039989.599 units remaining) [ (Pair (Right (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039989.624 units remaining) + - location: 14 (remaining gas: 1039989.589 units remaining) [ (Right (Pair 8 1)) ] - - location: 15 (remaining gas: 1039989.614 units remaining) + - location: 15 (remaining gas: 1039989.579 units remaining) [ (Pair 8 1) ] - - location: 20 (remaining gas: 1039989.604 units remaining) + - location: 20 (remaining gas: 1039989.569 units remaining) [ 8 1 ] - - location: 21 (remaining gas: 1039989.604 units remaining) + - location: 21 (remaining gas: 1039989.569 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039989.589 units remaining) + - location: 15 (remaining gas: 1039989.554 units remaining) [ 4 ] - - location: 22 (remaining gas: 1039989.574 units remaining) + - location: 22 (remaining gas: 1039989.539 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039989.559 units remaining) + - location: 23 (remaining gas: 1039989.524 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039989.544 units remaining) + - location: 25 (remaining gas: 1039989.509 units remaining) [ (Pair {} (Some 4)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out index 4144b7dc1289..40ec2d375d37 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039989.042 units remaining) + - location: 10 (remaining gas: 1039989.007 units remaining) [ (Pair (Pair 0 0) None) ] - - location: 10 (remaining gas: 1039989.032 units remaining) + - location: 10 (remaining gas: 1039988.997 units remaining) [ (Pair 0 0) None ] - - location: 11 (remaining gas: 1039989.022 units remaining) + - location: 11 (remaining gas: 1039988.987 units remaining) [ None (Pair 0 0) ] - - location: 13 (remaining gas: 1039989.012 units remaining) + - location: 13 (remaining gas: 1039988.977 units remaining) [ (Pair 0 0) ] - - location: 15 (remaining gas: 1039989.002 units remaining) + - location: 15 (remaining gas: 1039988.967 units remaining) [ ] - - location: 16 (remaining gas: 1039988.987 units remaining) + - location: 16 (remaining gas: 1039988.952 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.972 units remaining) + - location: 13 (remaining gas: 1039988.937 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.957 units remaining) + - location: 22 (remaining gas: 1039988.922 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.942 units remaining) + - location: 24 (remaining gas: 1039988.907 units remaining) [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" index 349e29eba10c..7f9967fe0f15 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 0 0) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 0 0) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 0 0) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 0 0) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 0 0) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 0 0 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ (Some "") ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ (Some "") ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} (Some "") ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} (Some "")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" index 3533558a483b..b80d6797a4de 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 0 10) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 0 10) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 0 10) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 0 10) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 0 10) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 0 10 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" index ba50cb0230d7..2bc3a487f1a4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 0 2) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 0 2) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 0 2) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 0 2) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 0 2) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 0 2 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ (Some "Fo") ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ (Some "Fo") ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} (Some "Fo") ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} (Some "Fo")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" index 1c443085a5ae..8c312d489c7a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 1 1) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 1 1) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 1 1) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 1 1) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 1 1) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 1 1 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ (Some "o") ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ (Some "o") ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} (Some "o") ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} (Some "o")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" index 2dafeff84582..2b9d2ca98a12 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 1 3) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 1 3) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 1 3) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 1 3) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 1 3) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 1 3 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" index 61141f784a6a..e9d9c6a014f6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.898 units remaining) + - location: 10 (remaining gas: 1039988.863 units remaining) [ (Pair (Pair 10 5) (Some "Foo")) ] - - location: 10 (remaining gas: 1039988.888 units remaining) + - location: 10 (remaining gas: 1039988.853 units remaining) [ (Pair 10 5) (Some "Foo") ] - - location: 11 (remaining gas: 1039988.878 units remaining) + - location: 11 (remaining gas: 1039988.843 units remaining) [ (Some "Foo") (Pair 10 5) ] - - location: 13 (remaining gas: 1039988.868 units remaining) + - location: 13 (remaining gas: 1039988.833 units remaining) [ "Foo" (Pair 10 5) ] - - location: 19 (remaining gas: 1039988.858 units remaining) + - location: 19 (remaining gas: 1039988.823 units remaining) [ (Pair 10 5) "Foo" ] - - location: 20 (remaining gas: 1039988.848 units remaining) + - location: 20 (remaining gas: 1039988.813 units remaining) [ 10 5 "Foo" ] - - location: 21 (remaining gas: 1039988.808 units remaining) + - location: 21 (remaining gas: 1039988.773 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.793 units remaining) + - location: 13 (remaining gas: 1039988.758 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.778 units remaining) + - location: 22 (remaining gas: 1039988.743 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.763 units remaining) + - location: 24 (remaining gas: 1039988.728 units remaining) [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" index 3ca363b4ab5f..d3ddab1b2f7d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039928.928 units remaining) + - location: 10 (remaining gas: 1039928.893 units remaining) [ (Pair (Pair 1 10000) (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] - - location: 10 (remaining gas: 1039928.918 units remaining) + - location: 10 (remaining gas: 1039928.883 units remaining) [ (Pair 1 10000) (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ] - - location: 11 (remaining gas: 1039928.908 units remaining) + - location: 11 (remaining gas: 1039928.873 units remaining) [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") (Pair 1 10000) ] - - location: 13 (remaining gas: 1039928.898 units remaining) + - location: 13 (remaining gas: 1039928.863 units remaining) [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" (Pair 1 10000) ] - - location: 19 (remaining gas: 1039928.888 units remaining) + - location: 19 (remaining gas: 1039928.853 units remaining) [ (Pair 1 10000) "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - - location: 20 (remaining gas: 1039928.878 units remaining) + - location: 20 (remaining gas: 1039928.843 units remaining) [ 1 10000 "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - - location: 21 (remaining gas: 1039928.463 units remaining) + - location: 21 (remaining gas: 1039928.428 units remaining) [ None ] - - location: 13 (remaining gas: 1039928.448 units remaining) + - location: 13 (remaining gas: 1039928.413 units remaining) [ None ] - - location: 22 (remaining gas: 1039928.433 units remaining) + - location: 22 (remaining gas: 1039928.398 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039928.418 units remaining) + - location: 24 (remaining gas: 1039928.383 units remaining) [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out index a2407a1ea7af..c924e667ef58 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out @@ -7,25 +7,25 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039989.042 units remaining) + - location: 10 (remaining gas: 1039989.007 units remaining) [ (Pair (Pair 0 1) None) ] - - location: 10 (remaining gas: 1039989.032 units remaining) + - location: 10 (remaining gas: 1039988.997 units remaining) [ (Pair 0 1) None ] - - location: 11 (remaining gas: 1039989.022 units remaining) + - location: 11 (remaining gas: 1039988.987 units remaining) [ None (Pair 0 1) ] - - location: 13 (remaining gas: 1039989.012 units remaining) + - location: 13 (remaining gas: 1039988.977 units remaining) [ (Pair 0 1) ] - - location: 15 (remaining gas: 1039989.002 units remaining) + - location: 15 (remaining gas: 1039988.967 units remaining) [ ] - - location: 16 (remaining gas: 1039988.987 units remaining) + - location: 16 (remaining gas: 1039988.952 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.972 units remaining) + - location: 13 (remaining gas: 1039988.937 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.957 units remaining) + - location: 22 (remaining gas: 1039988.922 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.942 units remaining) + - location: 24 (remaining gas: 1039988.907 units remaining) [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out index 11b6fa358851..1f55772b9114 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 0 0) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 0 0) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 0 0) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 0 0) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 0 0 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ (Some 0x) ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ (Some 0x) ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} (Some 0x) ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} (Some 0x)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out index fa51f068f742..c9e7d460c406 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 0 1) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 0 1) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 0 1) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 0 1) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 0 1 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ (Some 0xaa) ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ (Some 0xaa) ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} (Some 0xaa) ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} (Some 0xaa)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out index c09e671c1fc5..4b50bdf186ef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 1 1) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 1 1) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 1 1) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 1 1) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 1 1 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ (Some 0xbb) ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ (Some 0xbb) ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} (Some 0xbb) ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} (Some 0xbb)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out index cf4a9254cb30..b7e374387559 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 1 1) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 1 1) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 1 1) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 1 1) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 1 1 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ (Some 0xbb) ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ (Some 0xbb) ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} (Some 0xbb) ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} (Some 0xbb)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out index eda8d397d836..e27dbc3efc5d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 1 2) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 1 2) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 1 2) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 1 2) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 1 2 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ (Some 0xbbcc) ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ (Some 0xbbcc) ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} (Some 0xbbcc) ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} (Some 0xbbcc)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out index e94bee51a0f3..e399a6508f66 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out @@ -7,31 +7,31 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 1 3) (Some 0xaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbcc) (Pair 1 3) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbcc (Pair 1 3) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 1 3) 0xaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 1 3 0xaabbcc ] - - location: 21 (remaining gas: 1039988.852 units remaining) + - location: 21 (remaining gas: 1039988.817 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.837 units remaining) + - location: 13 (remaining gas: 1039988.802 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.822 units remaining) + - location: 22 (remaining gas: 1039988.787 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.807 units remaining) + - location: 24 (remaining gas: 1039988.772 units remaining) [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out index 9d0eb6d2803d..3b95b93f5171 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out @@ -7,32 +7,32 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.942 units remaining) + - location: 10 (remaining gas: 1039988.907 units remaining) [ (Pair (Pair 1 10000) (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] - - location: 10 (remaining gas: 1039988.932 units remaining) + - location: 10 (remaining gas: 1039988.897 units remaining) [ (Pair 1 10000) (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ] - - location: 11 (remaining gas: 1039988.922 units remaining) + - location: 11 (remaining gas: 1039988.887 units remaining) [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) (Pair 1 10000) ] - - location: 13 (remaining gas: 1039988.912 units remaining) + - location: 13 (remaining gas: 1039988.877 units remaining) [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc (Pair 1 10000) ] - - location: 19 (remaining gas: 1039988.902 units remaining) + - location: 19 (remaining gas: 1039988.867 units remaining) [ (Pair 1 10000) 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - - location: 20 (remaining gas: 1039988.892 units remaining) + - location: 20 (remaining gas: 1039988.857 units remaining) [ 1 10000 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - - location: 21 (remaining gas: 1039988.477 units remaining) + - location: 21 (remaining gas: 1039988.442 units remaining) [ None ] - - location: 13 (remaining gas: 1039988.462 units remaining) + - location: 13 (remaining gas: 1039988.427 units remaining) [ None ] - - location: 22 (remaining gas: 1039988.447 units remaining) + - location: 22 (remaining gas: 1039988.412 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039988.432 units remaining) + - location: 24 (remaining gas: 1039988.397 units remaining) [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" index 7770e20a35a8..292f6abd502e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.491 units remaining) + - location: 8 (remaining gas: 1039994.456 units remaining) [ (Pair "Hello" None) ] - - location: 8 (remaining gas: 1039994.481 units remaining) + - location: 8 (remaining gas: 1039994.446 units remaining) [ "Hello" ] - - location: 9 (remaining gas: 1039994.466 units remaining) + - location: 9 (remaining gas: 1039994.431 units remaining) [ (Some "Hello") ] - - location: 10 (remaining gas: 1039994.451 units remaining) + - location: 10 (remaining gas: 1039994.416 units remaining) [ {} (Some "Hello") ] - - location: 12 (remaining gas: 1039994.436 units remaining) + - location: 12 (remaining gas: 1039994.401 units remaining) [ (Pair {} (Some "Hello")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" index 591b98a95ae6..1b3003f262a7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.501 units remaining) + - location: 8 (remaining gas: 1039994.466 units remaining) [ (Pair "abcd" None) ] - - location: 8 (remaining gas: 1039994.491 units remaining) + - location: 8 (remaining gas: 1039994.456 units remaining) [ "abcd" ] - - location: 9 (remaining gas: 1039994.476 units remaining) + - location: 9 (remaining gas: 1039994.441 units remaining) [ (Some "abcd") ] - - location: 10 (remaining gas: 1039994.461 units remaining) + - location: 10 (remaining gas: 1039994.426 units remaining) [ {} (Some "abcd") ] - - location: 12 (remaining gas: 1039994.446 units remaining) + - location: 12 (remaining gas: 1039994.411 units remaining) [ (Pair {} (Some "abcd")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" index 59843cd76048..2f5bb7e4657e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ -100 ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:01:40Z" -100 ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} "1970-01-01T00:03:20Z" ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} "1970-01-01T00:03:20Z") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" index c8215f251d84..294fb0a04254 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ 100 ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:01:40Z" 100 ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} "1970-01-01T00:00:00Z" ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} "1970-01-01T00:00:00Z") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out index a2958aad9fa6..08ab30c7399a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out @@ -7,28 +7,28 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.553 units remaining) + - location: 9 (remaining gas: 1039991.518 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039991.543 units remaining) + - location: 9 (remaining gas: 1039991.508 units remaining) [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - - location: 10 (remaining gas: 1039991.533 units remaining) + - location: 10 (remaining gas: 1039991.498 units remaining) [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - - location: 11 (remaining gas: 1039991.523 units remaining) + - location: 11 (remaining gas: 1039991.488 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - - location: 12 (remaining gas: 1039991.508 units remaining) + - location: 12 (remaining gas: 1039991.473 units remaining) [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - - location: 14 (remaining gas: 1039991.498 units remaining) + - location: 14 (remaining gas: 1039991.463 units remaining) [ 2000000000000000000 ] - - location: 12 (remaining gas: 1039991.468 units remaining) + - location: 12 (remaining gas: 1039991.433 units remaining) [ "1970-01-01T00:01:40Z" 2000000000000000000 ] - - location: 15 (remaining gas: 1039991.413 units remaining) + - location: 15 (remaining gas: 1039991.378 units remaining) [ -1999999999999999900 ] - - location: 16 (remaining gas: 1039991.398 units remaining) + - location: 16 (remaining gas: 1039991.363 units remaining) [ {} -1999999999999999900 ] - - location: 18 (remaining gas: 1039991.383 units remaining) + - location: 18 (remaining gas: 1039991.348 units remaining) [ (Pair {} -1999999999999999900) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out index c9b235f844cc..123df2ba920c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out @@ -7,65 +7,65 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039980.750 units remaining) + - location: 12 (remaining gas: 1039980.715 units remaining) [ (Pair (Pair 2000000 1000000) None) ] - - location: 12 (remaining gas: 1039980.740 units remaining) + - location: 12 (remaining gas: 1039980.705 units remaining) [ (Pair 2000000 1000000) ] - - location: 13 (remaining gas: 1039980.730 units remaining) + - location: 13 (remaining gas: 1039980.695 units remaining) [ (Pair 2000000 1000000) (Pair 2000000 1000000) ] - - location: 14 (remaining gas: 1039980.720 units remaining) + - location: 14 (remaining gas: 1039980.685 units remaining) [ (Pair 2000000 1000000) (Pair 2000000 1000000) (Pair 2000000 1000000) ] - - location: 15 (remaining gas: 1039980.710 units remaining) + - location: 15 (remaining gas: 1039980.675 units remaining) [ 2000000 (Pair 2000000 1000000) (Pair 2000000 1000000) ] - - location: 16 (remaining gas: 1039980.695 units remaining) + - location: 16 (remaining gas: 1039980.660 units remaining) [ (Pair 2000000 1000000) (Pair 2000000 1000000) ] - - location: 18 (remaining gas: 1039980.685 units remaining) + - location: 18 (remaining gas: 1039980.650 units remaining) [ 1000000 (Pair 2000000 1000000) ] - - location: 16 (remaining gas: 1039980.655 units remaining) + - location: 16 (remaining gas: 1039980.620 units remaining) [ 2000000 1000000 (Pair 2000000 1000000) ] - - location: 19 (remaining gas: 1039980.635 units remaining) + - location: 19 (remaining gas: 1039980.600 units remaining) [ 3000000 (Pair 2000000 1000000) ] - - location: 20 (remaining gas: 1039980.620 units remaining) + - location: 20 (remaining gas: 1039980.585 units remaining) [ (Pair 2000000 1000000) ] - - location: 22 (remaining gas: 1039980.610 units remaining) + - location: 22 (remaining gas: 1039980.575 units remaining) [ (Pair 2000000 1000000) (Pair 2000000 1000000) ] - - location: 23 (remaining gas: 1039980.600 units remaining) + - location: 23 (remaining gas: 1039980.565 units remaining) [ 2000000 (Pair 2000000 1000000) ] - - location: 24 (remaining gas: 1039980.585 units remaining) + - location: 24 (remaining gas: 1039980.550 units remaining) [ (Pair 2000000 1000000) ] - - location: 26 (remaining gas: 1039980.575 units remaining) + - location: 26 (remaining gas: 1039980.540 units remaining) [ 1000000 ] - - location: 24 (remaining gas: 1039980.545 units remaining) + - location: 24 (remaining gas: 1039980.510 units remaining) [ 2000000 1000000 ] - - location: 27 (remaining gas: 1039980.525 units remaining) + - location: 27 (remaining gas: 1039980.490 units remaining) [ (Some 1000000) ] - - location: 29 (remaining gas: 1039980.515 units remaining) + - location: 29 (remaining gas: 1039980.480 units remaining) [ 1000000 ] - - location: 29 (remaining gas: 1039980.500 units remaining) + - location: 29 (remaining gas: 1039980.465 units remaining) [ 1000000 ] - - location: 20 (remaining gas: 1039980.470 units remaining) + - location: 20 (remaining gas: 1039980.435 units remaining) [ 3000000 1000000 ] - - location: 35 (remaining gas: 1039980.455 units remaining) + - location: 35 (remaining gas: 1039980.420 units remaining) [ (Pair 3000000 1000000) ] - - location: 36 (remaining gas: 1039980.440 units remaining) + - location: 36 (remaining gas: 1039980.405 units remaining) [ (Some (Pair 3000000 1000000)) ] - - location: 37 (remaining gas: 1039980.425 units remaining) + - location: 37 (remaining gas: 1039980.390 units remaining) [ {} (Some (Pair 3000000 1000000)) ] - - location: 39 (remaining gas: 1039980.410 units remaining) + - location: 39 (remaining gas: 1039980.375 units remaining) [ (Pair {} (Some (Pair 3000000 1000000))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out index d7f3fdda633c..92bcfc8ad36f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out @@ -7,65 +7,65 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039980.750 units remaining) + - location: 12 (remaining gas: 1039980.715 units remaining) [ (Pair (Pair 2310000 1010000) None) ] - - location: 12 (remaining gas: 1039980.740 units remaining) + - location: 12 (remaining gas: 1039980.705 units remaining) [ (Pair 2310000 1010000) ] - - location: 13 (remaining gas: 1039980.730 units remaining) + - location: 13 (remaining gas: 1039980.695 units remaining) [ (Pair 2310000 1010000) (Pair 2310000 1010000) ] - - location: 14 (remaining gas: 1039980.720 units remaining) + - location: 14 (remaining gas: 1039980.685 units remaining) [ (Pair 2310000 1010000) (Pair 2310000 1010000) (Pair 2310000 1010000) ] - - location: 15 (remaining gas: 1039980.710 units remaining) + - location: 15 (remaining gas: 1039980.675 units remaining) [ 2310000 (Pair 2310000 1010000) (Pair 2310000 1010000) ] - - location: 16 (remaining gas: 1039980.695 units remaining) + - location: 16 (remaining gas: 1039980.660 units remaining) [ (Pair 2310000 1010000) (Pair 2310000 1010000) ] - - location: 18 (remaining gas: 1039980.685 units remaining) + - location: 18 (remaining gas: 1039980.650 units remaining) [ 1010000 (Pair 2310000 1010000) ] - - location: 16 (remaining gas: 1039980.655 units remaining) + - location: 16 (remaining gas: 1039980.620 units remaining) [ 2310000 1010000 (Pair 2310000 1010000) ] - - location: 19 (remaining gas: 1039980.635 units remaining) + - location: 19 (remaining gas: 1039980.600 units remaining) [ 3320000 (Pair 2310000 1010000) ] - - location: 20 (remaining gas: 1039980.620 units remaining) + - location: 20 (remaining gas: 1039980.585 units remaining) [ (Pair 2310000 1010000) ] - - location: 22 (remaining gas: 1039980.610 units remaining) + - location: 22 (remaining gas: 1039980.575 units remaining) [ (Pair 2310000 1010000) (Pair 2310000 1010000) ] - - location: 23 (remaining gas: 1039980.600 units remaining) + - location: 23 (remaining gas: 1039980.565 units remaining) [ 2310000 (Pair 2310000 1010000) ] - - location: 24 (remaining gas: 1039980.585 units remaining) + - location: 24 (remaining gas: 1039980.550 units remaining) [ (Pair 2310000 1010000) ] - - location: 26 (remaining gas: 1039980.575 units remaining) + - location: 26 (remaining gas: 1039980.540 units remaining) [ 1010000 ] - - location: 24 (remaining gas: 1039980.545 units remaining) + - location: 24 (remaining gas: 1039980.510 units remaining) [ 2310000 1010000 ] - - location: 27 (remaining gas: 1039980.525 units remaining) + - location: 27 (remaining gas: 1039980.490 units remaining) [ (Some 1300000) ] - - location: 29 (remaining gas: 1039980.515 units remaining) + - location: 29 (remaining gas: 1039980.480 units remaining) [ 1300000 ] - - location: 29 (remaining gas: 1039980.500 units remaining) + - location: 29 (remaining gas: 1039980.465 units remaining) [ 1300000 ] - - location: 20 (remaining gas: 1039980.470 units remaining) + - location: 20 (remaining gas: 1039980.435 units remaining) [ 3320000 1300000 ] - - location: 35 (remaining gas: 1039980.455 units remaining) + - location: 35 (remaining gas: 1039980.420 units remaining) [ (Pair 3320000 1300000) ] - - location: 36 (remaining gas: 1039980.440 units remaining) + - location: 36 (remaining gas: 1039980.405 units remaining) [ (Some (Pair 3320000 1300000)) ] - - location: 37 (remaining gas: 1039980.425 units remaining) + - location: 37 (remaining gas: 1039980.390 units remaining) [ {} (Some (Pair 3320000 1300000)) ] - - location: 39 (remaining gas: 1039980.410 units remaining) + - location: 39 (remaining gas: 1039980.375 units remaining) [ (Pair {} (Some (Pair 3320000 1300000))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out index 606e4002ada9..8cdabbee9cfd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out @@ -7,44 +7,44 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039988.846 units remaining) + - location: 10 (remaining gas: 1039988.811 units remaining) [ (Pair (Pair 1 4 2) 0) ] - - location: 10 (remaining gas: 1039988.836 units remaining) + - location: 10 (remaining gas: 1039988.801 units remaining) [ (Pair 1 4 2) ] - - location: 11 (remaining gas: 1039988.799 units remaining) + - location: 11 (remaining gas: 1039988.764 units remaining) [ 1 4 2 ] - - location: 13 (remaining gas: 1039988.789 units remaining) + - location: 13 (remaining gas: 1039988.754 units remaining) [ 100 1 4 2 ] - - location: 16 (remaining gas: 1039988.685 units remaining) + - location: 16 (remaining gas: 1039988.650 units remaining) [ 100 4 2 ] - - location: 17 (remaining gas: 1039988.675 units remaining) + - location: 17 (remaining gas: 1039988.640 units remaining) [ 4 100 2 ] - - location: 18 (remaining gas: 1039988.665 units remaining) + - location: 18 (remaining gas: 1039988.630 units remaining) [ 10 4 100 2 ] - - location: 21 (remaining gas: 1039988.561 units remaining) + - location: 21 (remaining gas: 1039988.526 units remaining) [ 40 100 2 ] - - location: 22 (remaining gas: 1039988.506 units remaining) + - location: 22 (remaining gas: 1039988.471 units remaining) [ 140 2 ] - - location: 23 (remaining gas: 1039988.451 units remaining) + - location: 23 (remaining gas: 1039988.416 units remaining) [ 142 ] - - location: 24 (remaining gas: 1039988.436 units remaining) + - location: 24 (remaining gas: 1039988.401 units remaining) [ {} 142 ] - - location: 26 (remaining gas: 1039988.421 units remaining) + - location: 26 (remaining gas: 1039988.386 units remaining) [ (Pair {} 142) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out index d04559f22087..ea4954b2e765 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out @@ -7,456 +7,456 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039873.089 units remaining) + - location: 7 (remaining gas: 1039873.054 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039873.079 units remaining) + - location: 7 (remaining gas: 1039873.044 units remaining) [ ] - - location: 8 (remaining gas: 1039873.069 units remaining) + - location: 8 (remaining gas: 1039873.034 units remaining) [ Unit ] - - location: 9 (remaining gas: 1039873.059 units remaining) + - location: 9 (remaining gas: 1039873.024 units remaining) [ Unit Unit ] - - location: 10 (remaining gas: 1039873.044 units remaining) + - location: 10 (remaining gas: 1039873.009 units remaining) [ (Pair Unit Unit) ] - - location: 11 (remaining gas: 1039873.034 units remaining) + - location: 11 (remaining gas: 1039872.999 units remaining) [ Unit Unit ] - - location: 12 (remaining gas: 1039872.969 units remaining) + - location: 12 (remaining gas: 1039872.934 units remaining) [ ] - - location: 14 (remaining gas: 1039872.959 units remaining) + - location: 14 (remaining gas: 1039872.924 units remaining) [ Unit ] - - location: 15 (remaining gas: 1039872.949 units remaining) + - location: 15 (remaining gas: 1039872.914 units remaining) [ Unit Unit ] - - location: 16 (remaining gas: 1039872.934 units remaining) + - location: 16 (remaining gas: 1039872.899 units remaining) [ (Pair Unit Unit) ] - - location: 17 (remaining gas: 1039872.924 units remaining) + - location: 17 (remaining gas: 1039872.889 units remaining) [ Unit Unit ] - - location: 18 (remaining gas: 1039872.859 units remaining) + - location: 18 (remaining gas: 1039872.824 units remaining) [ ] - - location: 20 (remaining gas: 1039872.849 units remaining) + - location: 20 (remaining gas: 1039872.814 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039872.839 units remaining) + - location: 21 (remaining gas: 1039872.804 units remaining) [ Unit Unit ] - - location: 22 (remaining gas: 1039872.824 units remaining) + - location: 22 (remaining gas: 1039872.789 units remaining) [ (Pair Unit Unit) ] - - location: 23 (remaining gas: 1039872.814 units remaining) + - location: 23 (remaining gas: 1039872.779 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 24 (remaining gas: 1039872.804 units remaining) + - location: 24 (remaining gas: 1039872.769 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 25 (remaining gas: 1039872.739 units remaining) + - location: 25 (remaining gas: 1039872.704 units remaining) [ (Pair Unit Unit) ] - - location: 27 (remaining gas: 1039872.729 units remaining) + - location: 27 (remaining gas: 1039872.694 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 28 (remaining gas: 1039872.719 units remaining) + - location: 28 (remaining gas: 1039872.684 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 29 (remaining gas: 1039872.654 units remaining) + - location: 29 (remaining gas: 1039872.619 units remaining) [ (Pair Unit Unit) ] - - location: 31 (remaining gas: 1039872.644 units remaining) + - location: 31 (remaining gas: 1039872.609 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 32 (remaining gas: 1039872.634 units remaining) + - location: 32 (remaining gas: 1039872.599 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 33 (remaining gas: 1039872.569 units remaining) + - location: 33 (remaining gas: 1039872.534 units remaining) [ (Pair Unit Unit) ] - - location: 35 (remaining gas: 1039872.559 units remaining) + - location: 35 (remaining gas: 1039872.524 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 36 (remaining gas: 1039872.549 units remaining) + - location: 36 (remaining gas: 1039872.514 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 37 (remaining gas: 1039872.484 units remaining) + - location: 37 (remaining gas: 1039872.449 units remaining) [ (Pair Unit Unit) ] - - location: 39 (remaining gas: 1039872.474 units remaining) + - location: 39 (remaining gas: 1039872.439 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 40 (remaining gas: 1039872.464 units remaining) + - location: 40 (remaining gas: 1039872.429 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 41 (remaining gas: 1039872.399 units remaining) + - location: 41 (remaining gas: 1039872.364 units remaining) [ (Pair Unit Unit) ] - - location: 43 (remaining gas: 1039872.389 units remaining) + - location: 43 (remaining gas: 1039872.354 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 44 (remaining gas: 1039872.379 units remaining) + - location: 44 (remaining gas: 1039872.344 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 45 (remaining gas: 1039872.314 units remaining) + - location: 45 (remaining gas: 1039872.279 units remaining) [ (Pair Unit Unit) ] - - location: 47 (remaining gas: 1039872.304 units remaining) + - location: 47 (remaining gas: 1039872.269 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 48 (remaining gas: 1039872.294 units remaining) + - location: 48 (remaining gas: 1039872.259 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 49 (remaining gas: 1039872.229 units remaining) + - location: 49 (remaining gas: 1039872.194 units remaining) [ (Pair Unit Unit) ] - - location: 51 (remaining gas: 1039872.219 units remaining) + - location: 51 (remaining gas: 1039872.184 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 52 (remaining gas: 1039872.209 units remaining) + - location: 52 (remaining gas: 1039872.174 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 53 (remaining gas: 1039872.144 units remaining) + - location: 53 (remaining gas: 1039872.109 units remaining) [ (Pair Unit Unit) ] - - location: 55 (remaining gas: 1039872.134 units remaining) + - location: 55 (remaining gas: 1039872.099 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 56 (remaining gas: 1039872.124 units remaining) + - location: 56 (remaining gas: 1039872.089 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 57 (remaining gas: 1039872.059 units remaining) + - location: 57 (remaining gas: 1039872.024 units remaining) [ (Pair Unit Unit) ] - - location: 59 (remaining gas: 1039872.049 units remaining) + - location: 59 (remaining gas: 1039872.014 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 60 (remaining gas: 1039872.039 units remaining) + - location: 60 (remaining gas: 1039872.004 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 61 (remaining gas: 1039871.974 units remaining) + - location: 61 (remaining gas: 1039871.939 units remaining) [ (Pair Unit Unit) ] - - location: 63 (remaining gas: 1039871.964 units remaining) + - location: 63 (remaining gas: 1039871.929 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 64 (remaining gas: 1039871.954 units remaining) + - location: 64 (remaining gas: 1039871.919 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 65 (remaining gas: 1039871.889 units remaining) + - location: 65 (remaining gas: 1039871.854 units remaining) [ (Pair Unit Unit) ] - - location: 67 (remaining gas: 1039871.879 units remaining) + - location: 67 (remaining gas: 1039871.844 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 68 (remaining gas: 1039871.869 units remaining) + - location: 68 (remaining gas: 1039871.834 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 69 (remaining gas: 1039871.804 units remaining) + - location: 69 (remaining gas: 1039871.769 units remaining) [ (Pair Unit Unit) ] - - location: 71 (remaining gas: 1039871.794 units remaining) + - location: 71 (remaining gas: 1039871.759 units remaining) [ ] - - location: 72 (remaining gas: 1039871.784 units remaining) + - location: 72 (remaining gas: 1039871.749 units remaining) [ Unit ] - - location: 73 (remaining gas: 1039871.774 units remaining) + - location: 73 (remaining gas: 1039871.739 units remaining) [ Unit Unit ] - - location: 74 (remaining gas: 1039871.759 units remaining) + - location: 74 (remaining gas: 1039871.724 units remaining) [ (Pair Unit Unit) ] - - location: 75 (remaining gas: 1039871.749 units remaining) + - location: 75 (remaining gas: 1039871.714 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 76 (remaining gas: 1039871.739 units remaining) + - location: 76 (remaining gas: 1039871.704 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 77 (remaining gas: 1039871.674 units remaining) + - location: 77 (remaining gas: 1039871.639 units remaining) [ (Pair Unit Unit) ] - - location: 79 (remaining gas: 1039871.664 units remaining) + - location: 79 (remaining gas: 1039871.629 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 80 (remaining gas: 1039871.654 units remaining) + - location: 80 (remaining gas: 1039871.619 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 81 (remaining gas: 1039871.589 units remaining) + - location: 81 (remaining gas: 1039871.554 units remaining) [ (Pair Unit Unit) ] - - location: 83 (remaining gas: 1039871.579 units remaining) + - location: 83 (remaining gas: 1039871.544 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 84 (remaining gas: 1039871.569 units remaining) + - location: 84 (remaining gas: 1039871.534 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 85 (remaining gas: 1039871.504 units remaining) + - location: 85 (remaining gas: 1039871.469 units remaining) [ (Pair Unit Unit) ] - - location: 87 (remaining gas: 1039871.494 units remaining) + - location: 87 (remaining gas: 1039871.459 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 88 (remaining gas: 1039871.484 units remaining) + - location: 88 (remaining gas: 1039871.449 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 89 (remaining gas: 1039871.419 units remaining) + - location: 89 (remaining gas: 1039871.384 units remaining) [ (Pair Unit Unit) ] - - location: 91 (remaining gas: 1039871.409 units remaining) + - location: 91 (remaining gas: 1039871.374 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 92 (remaining gas: 1039871.399 units remaining) + - location: 92 (remaining gas: 1039871.364 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 93 (remaining gas: 1039871.334 units remaining) + - location: 93 (remaining gas: 1039871.299 units remaining) [ (Pair Unit Unit) ] - - location: 95 (remaining gas: 1039871.324 units remaining) + - location: 95 (remaining gas: 1039871.289 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 96 (remaining gas: 1039871.314 units remaining) + - location: 96 (remaining gas: 1039871.279 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 97 (remaining gas: 1039871.249 units remaining) + - location: 97 (remaining gas: 1039871.214 units remaining) [ (Pair Unit Unit) ] - - location: 99 (remaining gas: 1039871.239 units remaining) + - location: 99 (remaining gas: 1039871.204 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 100 (remaining gas: 1039871.229 units remaining) + - location: 100 (remaining gas: 1039871.194 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 101 (remaining gas: 1039871.164 units remaining) + - location: 101 (remaining gas: 1039871.129 units remaining) [ (Pair Unit Unit) ] - - location: 103 (remaining gas: 1039871.154 units remaining) + - location: 103 (remaining gas: 1039871.119 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 104 (remaining gas: 1039871.144 units remaining) + - location: 104 (remaining gas: 1039871.109 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 105 (remaining gas: 1039871.079 units remaining) + - location: 105 (remaining gas: 1039871.044 units remaining) [ (Pair Unit Unit) ] - - location: 107 (remaining gas: 1039871.069 units remaining) + - location: 107 (remaining gas: 1039871.034 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 108 (remaining gas: 1039871.059 units remaining) + - location: 108 (remaining gas: 1039871.024 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 109 (remaining gas: 1039870.994 units remaining) + - location: 109 (remaining gas: 1039870.959 units remaining) [ (Pair Unit Unit) ] - - location: 111 (remaining gas: 1039870.984 units remaining) + - location: 111 (remaining gas: 1039870.949 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 112 (remaining gas: 1039870.974 units remaining) + - location: 112 (remaining gas: 1039870.939 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 113 (remaining gas: 1039870.909 units remaining) + - location: 113 (remaining gas: 1039870.874 units remaining) [ (Pair Unit Unit) ] - - location: 115 (remaining gas: 1039870.899 units remaining) + - location: 115 (remaining gas: 1039870.864 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 116 (remaining gas: 1039870.889 units remaining) + - location: 116 (remaining gas: 1039870.854 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 117 (remaining gas: 1039870.824 units remaining) + - location: 117 (remaining gas: 1039870.789 units remaining) [ (Pair Unit Unit) ] - - location: 119 (remaining gas: 1039870.814 units remaining) + - location: 119 (remaining gas: 1039870.779 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 120 (remaining gas: 1039870.804 units remaining) + - location: 120 (remaining gas: 1039870.769 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 121 (remaining gas: 1039870.739 units remaining) + - location: 121 (remaining gas: 1039870.704 units remaining) [ (Pair Unit Unit) ] - - location: 123 (remaining gas: 1039870.729 units remaining) + - location: 123 (remaining gas: 1039870.694 units remaining) [ ] - - location: 124 (remaining gas: 1039870.719 units remaining) + - location: 124 (remaining gas: 1039870.684 units remaining) [ Unit ] - - location: 125 (remaining gas: 1039870.709 units remaining) + - location: 125 (remaining gas: 1039870.674 units remaining) [ Unit Unit ] - - location: 126 (remaining gas: 1039870.694 units remaining) + - location: 126 (remaining gas: 1039870.659 units remaining) [ (Pair Unit Unit) ] - - location: 127 (remaining gas: 1039870.684 units remaining) + - location: 127 (remaining gas: 1039870.649 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 128 (remaining gas: 1039870.674 units remaining) + - location: 128 (remaining gas: 1039870.639 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 129 (remaining gas: 1039870.609 units remaining) + - location: 129 (remaining gas: 1039870.574 units remaining) [ (Pair Unit Unit) ] - - location: 131 (remaining gas: 1039870.599 units remaining) + - location: 131 (remaining gas: 1039870.564 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 132 (remaining gas: 1039870.589 units remaining) + - location: 132 (remaining gas: 1039870.554 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 133 (remaining gas: 1039870.524 units remaining) + - location: 133 (remaining gas: 1039870.489 units remaining) [ (Pair Unit Unit) ] - - location: 135 (remaining gas: 1039870.514 units remaining) + - location: 135 (remaining gas: 1039870.479 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 136 (remaining gas: 1039870.504 units remaining) + - location: 136 (remaining gas: 1039870.469 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 137 (remaining gas: 1039870.439 units remaining) + - location: 137 (remaining gas: 1039870.404 units remaining) [ (Pair Unit Unit) ] - - location: 139 (remaining gas: 1039870.429 units remaining) + - location: 139 (remaining gas: 1039870.394 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 140 (remaining gas: 1039870.419 units remaining) + - location: 140 (remaining gas: 1039870.384 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 141 (remaining gas: 1039870.354 units remaining) + - location: 141 (remaining gas: 1039870.319 units remaining) [ (Pair Unit Unit) ] - - location: 143 (remaining gas: 1039870.344 units remaining) + - location: 143 (remaining gas: 1039870.309 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 144 (remaining gas: 1039870.334 units remaining) + - location: 144 (remaining gas: 1039870.299 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 145 (remaining gas: 1039870.269 units remaining) + - location: 145 (remaining gas: 1039870.234 units remaining) [ (Pair Unit Unit) ] - - location: 147 (remaining gas: 1039870.259 units remaining) + - location: 147 (remaining gas: 1039870.224 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 148 (remaining gas: 1039870.249 units remaining) + - location: 148 (remaining gas: 1039870.214 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 149 (remaining gas: 1039870.184 units remaining) + - location: 149 (remaining gas: 1039870.149 units remaining) [ (Pair Unit Unit) ] - - location: 151 (remaining gas: 1039870.174 units remaining) + - location: 151 (remaining gas: 1039870.139 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 152 (remaining gas: 1039870.164 units remaining) + - location: 152 (remaining gas: 1039870.129 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 153 (remaining gas: 1039870.099 units remaining) + - location: 153 (remaining gas: 1039870.064 units remaining) [ (Pair Unit Unit) ] - - location: 155 (remaining gas: 1039870.089 units remaining) + - location: 155 (remaining gas: 1039870.054 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 156 (remaining gas: 1039870.079 units remaining) + - location: 156 (remaining gas: 1039870.044 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 157 (remaining gas: 1039870.014 units remaining) + - location: 157 (remaining gas: 1039869.979 units remaining) [ (Pair Unit Unit) ] - - location: 159 (remaining gas: 1039870.004 units remaining) + - location: 159 (remaining gas: 1039869.969 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 160 (remaining gas: 1039869.994 units remaining) + - location: 160 (remaining gas: 1039869.959 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 161 (remaining gas: 1039869.929 units remaining) + - location: 161 (remaining gas: 1039869.894 units remaining) [ (Pair Unit Unit) ] - - location: 163 (remaining gas: 1039869.919 units remaining) + - location: 163 (remaining gas: 1039869.884 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 164 (remaining gas: 1039869.909 units remaining) + - location: 164 (remaining gas: 1039869.874 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 165 (remaining gas: 1039869.844 units remaining) + - location: 165 (remaining gas: 1039869.809 units remaining) [ (Pair Unit Unit) ] - - location: 167 (remaining gas: 1039869.834 units remaining) + - location: 167 (remaining gas: 1039869.799 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 168 (remaining gas: 1039869.824 units remaining) + - location: 168 (remaining gas: 1039869.789 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 169 (remaining gas: 1039869.759 units remaining) + - location: 169 (remaining gas: 1039869.724 units remaining) [ (Pair Unit Unit) ] - - location: 171 (remaining gas: 1039869.749 units remaining) + - location: 171 (remaining gas: 1039869.714 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 172 (remaining gas: 1039869.739 units remaining) + - location: 172 (remaining gas: 1039869.704 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 173 (remaining gas: 1039869.674 units remaining) + - location: 173 (remaining gas: 1039869.639 units remaining) [ (Pair Unit Unit) ] - - location: 175 (remaining gas: 1039869.664 units remaining) + - location: 175 (remaining gas: 1039869.629 units remaining) [ ] - - location: 176 (remaining gas: 1039869.654 units remaining) + - location: 176 (remaining gas: 1039869.619 units remaining) [ Unit ] - - location: 177 (remaining gas: 1039869.644 units remaining) + - location: 177 (remaining gas: 1039869.609 units remaining) [ Unit Unit ] - - location: 178 (remaining gas: 1039869.629 units remaining) + - location: 178 (remaining gas: 1039869.594 units remaining) [ (Pair Unit Unit) ] - - location: 179 (remaining gas: 1039869.619 units remaining) + - location: 179 (remaining gas: 1039869.584 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 180 (remaining gas: 1039869.609 units remaining) + - location: 180 (remaining gas: 1039869.574 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 181 (remaining gas: 1039869.544 units remaining) + - location: 181 (remaining gas: 1039869.509 units remaining) [ (Pair Unit Unit) ] - - location: 183 (remaining gas: 1039869.534 units remaining) + - location: 183 (remaining gas: 1039869.499 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 184 (remaining gas: 1039869.524 units remaining) + - location: 184 (remaining gas: 1039869.489 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 185 (remaining gas: 1039869.459 units remaining) + - location: 185 (remaining gas: 1039869.424 units remaining) [ (Pair Unit Unit) ] - - location: 187 (remaining gas: 1039869.449 units remaining) + - location: 187 (remaining gas: 1039869.414 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 188 (remaining gas: 1039869.439 units remaining) + - location: 188 (remaining gas: 1039869.404 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 189 (remaining gas: 1039869.374 units remaining) + - location: 189 (remaining gas: 1039869.339 units remaining) [ (Pair Unit Unit) ] - - location: 191 (remaining gas: 1039869.364 units remaining) + - location: 191 (remaining gas: 1039869.329 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 192 (remaining gas: 1039869.354 units remaining) + - location: 192 (remaining gas: 1039869.319 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 193 (remaining gas: 1039869.289 units remaining) + - location: 193 (remaining gas: 1039869.254 units remaining) [ (Pair Unit Unit) ] - - location: 195 (remaining gas: 1039869.279 units remaining) + - location: 195 (remaining gas: 1039869.244 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 196 (remaining gas: 1039869.269 units remaining) + - location: 196 (remaining gas: 1039869.234 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 197 (remaining gas: 1039869.204 units remaining) + - location: 197 (remaining gas: 1039869.169 units remaining) [ (Pair Unit Unit) ] - - location: 199 (remaining gas: 1039869.194 units remaining) + - location: 199 (remaining gas: 1039869.159 units remaining) [ ] - - location: 200 (remaining gas: 1039869.184 units remaining) + - location: 200 (remaining gas: 1039869.149 units remaining) [ Unit ] - - location: 201 (remaining gas: 1039869.174 units remaining) + - location: 201 (remaining gas: 1039869.139 units remaining) [ Unit Unit ] - - location: 202 (remaining gas: 1039869.159 units remaining) + - location: 202 (remaining gas: 1039869.124 units remaining) [ (Pair Unit Unit) ] - - location: 203 (remaining gas: 1039869.149 units remaining) + - location: 203 (remaining gas: 1039869.114 units remaining) [ Unit Unit ] - - location: 204 (remaining gas: 1039869.084 units remaining) + - location: 204 (remaining gas: 1039869.049 units remaining) [ ] - - location: 206 (remaining gas: 1039869.074 units remaining) + - location: 206 (remaining gas: 1039869.039 units remaining) [ Unit ] - - location: 207 (remaining gas: 1039869.059 units remaining) + - location: 207 (remaining gas: 1039869.024 units remaining) [ {} Unit ] - - location: 209 (remaining gas: 1039869.044 units remaining) + - location: 209 (remaining gas: 1039869.009 units remaining) [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" index ddfbfad02764..b5f773a1e73b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039666.323 units remaining) + - location: 9 (remaining gas: 1039666.288 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] - - location: 9 (remaining gas: 1039666.313 units remaining) + - location: 9 (remaining gas: 1039666.278 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - - location: 10 (remaining gas: 1039665.658 units remaining) + - location: 10 (remaining gas: 1039665.623 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 11 (remaining gas: 1039445.120 units remaining) + - location: 11 (remaining gas: 1039445.085 units remaining) [ 666 ] - - location: 12 (remaining gas: 1039445.105 units remaining) + - location: 12 (remaining gas: 1039445.070 units remaining) [ ] - - location: 14 (remaining gas: 1039234.727 units remaining) + - location: 14 (remaining gas: 1039234.692 units remaining) [ 3330 ] - - location: 12 (remaining gas: 1039234.697 units remaining) + - location: 12 (remaining gas: 1039234.662 units remaining) [ 666 3330 ] - - location: 15 (remaining gas: 1039234.682 units remaining) + - location: 15 (remaining gas: 1039234.647 units remaining) [ (Pair 666 3330) ] - - location: 16 (remaining gas: 1039234.667 units remaining) + - location: 16 (remaining gas: 1039234.632 units remaining) [ {} (Pair 666 3330) ] - - location: 18 (remaining gas: 1039234.652 units remaining) + - location: 18 (remaining gas: 1039234.617 units remaining) [ (Pair {} 666 3330) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out index abafaa029466..96078718f215 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Left (Pair False False)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Left (Pair False False)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair False False) ] - - location: 19 (remaining gas: 1039986.659 units remaining) + - location: 19 (remaining gas: 1039986.624 units remaining) [ False False ] - - location: 20 (remaining gas: 1039986.639 units remaining) + - location: 20 (remaining gas: 1039986.604 units remaining) [ False ] - - location: 21 (remaining gas: 1039986.624 units remaining) + - location: 21 (remaining gas: 1039986.589 units remaining) [ (Left False) ] - - location: 17 (remaining gas: 1039986.609 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Left False) ] - - location: 28 (remaining gas: 1039986.594 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039986.579 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039986.564 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out index a02a72773a68..ca766c394b42 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Left (Pair False True)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Left (Pair False True)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair False True) ] - - location: 19 (remaining gas: 1039986.659 units remaining) + - location: 19 (remaining gas: 1039986.624 units remaining) [ False True ] - - location: 20 (remaining gas: 1039986.639 units remaining) + - location: 20 (remaining gas: 1039986.604 units remaining) [ True ] - - location: 21 (remaining gas: 1039986.624 units remaining) + - location: 21 (remaining gas: 1039986.589 units remaining) [ (Left True) ] - - location: 17 (remaining gas: 1039986.609 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Left True) ] - - location: 28 (remaining gas: 1039986.594 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039986.579 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039986.564 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out index e878bd774190..af86977e3e05 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Left (Pair True False)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Left (Pair True False)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair True False) ] - - location: 19 (remaining gas: 1039986.659 units remaining) + - location: 19 (remaining gas: 1039986.624 units remaining) [ True False ] - - location: 20 (remaining gas: 1039986.639 units remaining) + - location: 20 (remaining gas: 1039986.604 units remaining) [ True ] - - location: 21 (remaining gas: 1039986.624 units remaining) + - location: 21 (remaining gas: 1039986.589 units remaining) [ (Left True) ] - - location: 17 (remaining gas: 1039986.609 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Left True) ] - - location: 28 (remaining gas: 1039986.594 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039986.579 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039986.564 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out index 948a669aff12..8ab2a4dde1a8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Left (Pair True True)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Left (Pair True True)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair True True) ] - - location: 19 (remaining gas: 1039986.659 units remaining) + - location: 19 (remaining gas: 1039986.624 units remaining) [ True True ] - - location: 20 (remaining gas: 1039986.639 units remaining) + - location: 20 (remaining gas: 1039986.604 units remaining) [ False ] - - location: 21 (remaining gas: 1039986.624 units remaining) + - location: 21 (remaining gas: 1039986.589 units remaining) [ (Left False) ] - - location: 17 (remaining gas: 1039986.609 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Left False) ] - - location: 28 (remaining gas: 1039986.594 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039986.579 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039986.564 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out index e6dccefbc5b2..6cc7e703cb3f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 0 0)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 0 0) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 0 0 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 0) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 0) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out index 39d8ba3152a1..7223e4611837 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 0 1)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 0 1) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 0 1 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 1) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 1) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out index c6dcc478e5d7..e3752d43f89f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 1 0)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 1 0)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 1 0) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 1) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 1) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out index af35611b6063..d77c4c03e3f4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 1 1)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 1 1)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 1 1) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 0) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 0) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out index 02ae54ad53b0..ee41c4c0716c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 42 21)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 42 21)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 42 21) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 42 21 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 63 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 63) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 63) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 63)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 63)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 63))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out index 76049d0cec98..7a92e2056534 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.689 units remaining) + - location: 16 (remaining gas: 1039986.654 units remaining) [ (Pair (Right (Pair 42 63)) None) ] - - location: 16 (remaining gas: 1039986.679 units remaining) + - location: 16 (remaining gas: 1039986.644 units remaining) [ (Right (Pair 42 63)) ] - - location: 17 (remaining gas: 1039986.669 units remaining) + - location: 17 (remaining gas: 1039986.634 units remaining) [ (Pair 42 63) ] - - location: 24 (remaining gas: 1039986.659 units remaining) + - location: 24 (remaining gas: 1039986.624 units remaining) [ 42 63 ] - - location: 25 (remaining gas: 1039986.604 units remaining) + - location: 25 (remaining gas: 1039986.569 units remaining) [ 21 ] - - location: 26 (remaining gas: 1039986.589 units remaining) + - location: 26 (remaining gas: 1039986.554 units remaining) [ (Right 21) ] - - location: 17 (remaining gas: 1039986.574 units remaining) + - location: 17 (remaining gas: 1039986.539 units remaining) [ (Right 21) ] - - location: 28 (remaining gas: 1039986.559 units remaining) + - location: 28 (remaining gas: 1039986.524 units remaining) [ (Some (Right 21)) ] - - location: 29 (remaining gas: 1039986.544 units remaining) + - location: 29 (remaining gas: 1039986.509 units remaining) [ {} (Some (Right 21)) ] - - location: 31 (remaining gas: 1039986.529 units remaining) + - location: 31 (remaining gas: 1039986.494 units remaining) [ (Pair {} (Some (Right 21))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out index ef4cb7517e1d..f505a3c29a84 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.948 units remaining) + - location: 7 (remaining gas: 1039994.913 units remaining) [ (Pair Unit 9999999) ] - - location: 7 (remaining gas: 1039994.938 units remaining) + - location: 7 (remaining gas: 1039994.903 units remaining) [ ] - - location: 8 (remaining gas: 1039994.923 units remaining) + - location: 8 (remaining gas: 1039994.888 units remaining) [ 10 ] - - location: 9 (remaining gas: 1039994.908 units remaining) + - location: 9 (remaining gas: 1039994.873 units remaining) [ {} 10 ] - - location: 11 (remaining gas: 1039994.893 units remaining) + - location: 11 (remaining gas: 1039994.858 units remaining) [ (Pair {} 10) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out index db0aa4080290..92143a5a9cc1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out @@ -7,15 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.848 units remaining) + - location: 7 (remaining gas: 1039994.813 units remaining) [ (Pair Unit "2017-07-13T09:19:01Z") ] - - location: 7 (remaining gas: 1039994.838 units remaining) + - location: 7 (remaining gas: 1039994.803 units remaining) [ ] - - location: 8 (remaining gas: 1039994.823 units remaining) + - location: 8 (remaining gas: 1039994.788 units remaining) [ "2021-10-13T10:16:52Z" ] - - location: 9 (remaining gas: 1039994.808 units remaining) + - location: 9 (remaining gas: 1039994.773 units remaining) [ {} "2021-10-13T10:16:52Z" ] - - location: 11 (remaining gas: 1039994.793 units remaining) + - location: 11 (remaining gas: 1039994.758 units remaining) [ (Pair {} "2021-10-13T10:16:52Z") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out index 80e4ad43907f..34aa73ef04ad 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out @@ -7,53 +7,53 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039977.531 units remaining) + - location: 15 (remaining gas: 1039977.496 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) Unit) ] - - location: 15 (remaining gas: 1039977.521 units remaining) + - location: 15 (remaining gas: 1039977.486 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ] - - location: 16 (remaining gas: 1039977.511 units remaining) + - location: 16 (remaining gas: 1039977.476 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 17 (remaining gas: 1039977.496 units remaining) + - location: 17 (remaining gas: 1039977.461 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 19 (remaining gas: 1039977.486 units remaining) + - location: 19 (remaining gas: 1039977.451 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 17 (remaining gas: 1039977.456 units remaining) + - location: 17 (remaining gas: 1039977.421 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 20 (remaining gas: 1039975.016 units remaining) + - location: 20 (remaining gas: 1039974.981 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 23 (remaining gas: 1039974.981 units remaining) + - location: 23 (remaining gas: 1039974.946 units remaining) [ 0 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 24 (remaining gas: 1039974.966 units remaining) + - location: 24 (remaining gas: 1039974.931 units remaining) [ True 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 25 (remaining gas: 1039974.956 units remaining) + - location: 25 (remaining gas: 1039974.921 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 25 (remaining gas: 1039974.941 units remaining) + - location: 25 (remaining gas: 1039974.906 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 31 (remaining gas: 1039971.783 units remaining) + - location: 31 (remaining gas: 1039971.748 units remaining) [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ] - - location: 40 (remaining gas: 1039971.773 units remaining) + - location: 40 (remaining gas: 1039971.738 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - - location: 40 (remaining gas: 1039971.758 units remaining) + - location: 40 (remaining gas: 1039971.723 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - - location: 46 (remaining gas: 1039971.748 units remaining) + - location: 46 (remaining gas: 1039971.713 units remaining) [ ] - - location: 47 (remaining gas: 1039971.738 units remaining) + - location: 47 (remaining gas: 1039971.703 units remaining) [ Unit ] - - location: 48 (remaining gas: 1039971.723 units remaining) + - location: 48 (remaining gas: 1039971.688 units remaining) [ {} Unit ] - - location: 50 (remaining gas: 1039971.708 units remaining) + - location: 50 (remaining gas: 1039971.673 units remaining) [ (Pair {} Unit) ] Runtime error in contract [CONTRACT_HASH]: @@ -68,38 +68,38 @@ At line 4 characters 14 to 26, script reached FAILWITH instruction with Unit trace - - location: 15 (remaining gas: 1039977.531 units remaining) + - location: 15 (remaining gas: 1039977.496 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) Unit) ] - - location: 15 (remaining gas: 1039977.521 units remaining) + - location: 15 (remaining gas: 1039977.486 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ] - - location: 16 (remaining gas: 1039977.511 units remaining) + - location: 16 (remaining gas: 1039977.476 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 17 (remaining gas: 1039977.496 units remaining) + - location: 17 (remaining gas: 1039977.461 units remaining) [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 19 (remaining gas: 1039977.486 units remaining) + - location: 19 (remaining gas: 1039977.451 units remaining) [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 17 (remaining gas: 1039977.456 units remaining) + - location: 17 (remaining gas: 1039977.421 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 20 (remaining gas: 1039975.016 units remaining) + - location: 20 (remaining gas: 1039974.981 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 23 (remaining gas: 1039974.981 units remaining) + - location: 23 (remaining gas: 1039974.946 units remaining) [ -1 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 24 (remaining gas: 1039974.966 units remaining) + - location: 24 (remaining gas: 1039974.931 units remaining) [ False 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 25 (remaining gas: 1039974.956 units remaining) + - location: 25 (remaining gas: 1039974.921 units remaining) [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 29 (remaining gas: 1039974.946 units remaining) + - location: 29 (remaining gas: 1039974.911 units remaining) [ Unit 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] Fatal error: diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out index 4c36966e17f8..841f95e249b3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes Paid storage size diff: 3 bytes - Consumed gas: 2912.681 + Consumed gas: 2912.646 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00075 storage fees ........................... +ꜩ0.00075 @@ -58,7 +58,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 Storage size: 2263 bytes Paid storage size diff: 68 bytes - Consumed gas: 4394.801 + Consumed gas: 4394.836 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out index 5a06774b6fb5..a50c449f1d77 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approval Node is bootstrapped. -Estimated gas: 2375.598 units (will add 100 for safety) +Estimated gas: 2375.528 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000 Storage size: 2116 bytes Paid storage size diff: 68 bytes - Consumed gas: 2375.598 + Consumed gas: 2375.528 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out index 3c3b1bc9f966..44357cc9964b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approved_transfer Node is bootstrapped. -Estimated gas: 4366.545 units (will add 100 for safety) +Estimated gas: 4366.580 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -36,6 +36,6 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 71007 Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000 Storage size: 2116 bytes - Consumed gas: 4366.545 + Consumed gas: 4366.580 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out index 976901b030bb..86737b8135f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve1 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out index a61c409fffca..e9beef5b4753 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve2 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out index 2d7ad66b2f75..93f5d74ad68d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve3 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out index 936b795b5065..9c736aaec8de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_remove_liquidity Node is bootstrapped. -Estimated gas: 10535.516 units (will add 100 for safety) +Estimated gas: 10535.551 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 '[BLOCK_HASH]' @@ -63,7 +63,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10 Storage size: 2330 bytes Paid storage size diff: 67 bytes - Consumed gas: 3677.556 + Consumed gas: 3677.591 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out index 88b126d08f3b..0dcbf961fbd6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes Paid storage size diff: 3 bytes - Consumed gas: 2912.681 + Consumed gas: 2912.646 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00075 storage fees ........................... +ꜩ0.00075 @@ -58,7 +58,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 Storage size: 2263 bytes Paid storage size diff: 68 bytes - Consumed gas: 4394.801 + Consumed gas: 4394.836 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out index 6fa19c7dcde8..c272e7202084 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_buy_tok Node is bootstrapped. -Estimated gas: 7500.718 units (will add 100 for safety) +Estimated gas: 7500.823 units (will add 100 for safety) Estimated storage: 326 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4634 bytes Paid storage size diff: 1 bytes - Consumed gas: 2403.158 + Consumed gas: 2403.228 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00025 storage fees ........................... +ꜩ0.00025 @@ -56,7 +56,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 360 Storage size: 2331 bytes Paid storage size diff: 68 bytes - Consumed gas: 3677.560 + Consumed gas: 3677.595 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out index 44735c8293af..c48698af256e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve1 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out index b5c58e8855cb..181b0bda40ba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve2 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out index efaf4c64e9b4..92f64e86f50d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve3 Node is bootstrapped. -Estimated gas: 2375.674 units (will add 100 for safety) +Estimated gas: 2375.604 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 '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.674 + Consumed gas: 2375.604 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out index b458e7b11713..dec69e87bf86 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_sell_tok Node is bootstrapped. -Estimated gas: 9819.149 units (will add 100 for safety) +Estimated gas: 9819.219 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes - Consumed gas: 2404.312 + Consumed gas: 2404.347 Internal operations: Transaction: Amount: ꜩ0 @@ -51,7 +51,7 @@ This sequence of operations was run: Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6] Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 461 Storage size: 2331 bytes - Consumed gas: 4574.837 + Consumed gas: 4574.872 Transaction: Amount: ꜩ3891.966034 From: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out index eb4057843f4e..43e15550a9c2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_transfer Node is bootstrapped. -Estimated gas: 3679.460 units (will add 100 for safety) +Estimated gas: 3679.495 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 '[BLOCK_HASH]' @@ -35,7 +35,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 260 Storage size: 2399 bytes Paid storage size diff: 68 bytes - Consumed gas: 3679.460 + Consumed gas: 3679.495 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 -- GitLab From 913ca112b6221245e0be9e80a9251f9bbc199d1a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 7 Feb 2022 10:56:36 +0100 Subject: [PATCH 30/30] Tezt: adapt gas in regtests outputs --- tezt/_regressions/run_views.out | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tezt/_regressions/run_views.out b/tezt/_regressions/run_views.out index 2f1c0b721fe6..c38420630754 100644 --- a/tezt/_regressions/run_views.out +++ b/tezt/_regressions/run_views.out @@ -146,20 +146,20 @@ Contract memorized as check_caller. ./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1EYwqeAzgkynYXJnHJ7ZxuXk5bNBBy6R6L --burn-cap 1 --arg '"KT19P9vLfrXCEwUMpiURQ5vY8Ncp5idkyKTD"' Node is bootstrapped. -Estimated gas: 4888.980 units (will add 100 for safety) +Estimated gas: 4889.015 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. -Operation hash is 'op4wu7aQT9ofgup46yvygx2td15DfJ2o8CLgamEkaZkRnqyPMvL' +Operation hash is 'oohMaoywQLKnsdyLt67hkYXvvx76vQS6ATaFok7C46t5FNTFDH7' NOT waiting for the operation to be included. Use command - tezos-client wait for op4wu7aQT9ofgup46yvygx2td15DfJ2o8CLgamEkaZkRnqyPMvL to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for oohMaoywQLKnsdyLt67hkYXvvx76vQS6ATaFok7C46t5FNTFDH7 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.000795 Expected counter: 3 - Gas limit: 4989 + Gas limit: 4990 Storage limit: 0 bytes Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000795 @@ -172,7 +172,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: None Storage size: 208 bytes - Consumed gas: 4889.778 + Consumed gas: 4889.813 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1 KT1EYwqeAzgkynYXJnHJ7ZxuXk5bNBBy6R6L ... +ꜩ1 @@ -180,7 +180,7 @@ This sequence of operations was run: ./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT19P9vLfrXCEwUMpiURQ5vY8Ncp5idkyKTD --burn-cap 1 Node is bootstrapped. -Estimated gas: 2067.348 units (will add 100 for safety) +Estimated gas: 2067.383 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 'ooqdCJ1FcbQQtnEg3bJA2CWxvv1To8aVBGgnBT7nYpU7zFM33pW' @@ -206,7 +206,7 @@ This sequence of operations was run: Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 } Storage size: 179 bytes Paid storage size diff: 27 bytes - Consumed gas: 2068.260 + Consumed gas: 2068.295 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 @@ -216,20 +216,20 @@ This sequence of operations was run: ./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1EYwqeAzgkynYXJnHJ7ZxuXk5bNBBy6R6L --burn-cap 1 --arg '"KT19P9vLfrXCEwUMpiURQ5vY8Ncp5idkyKTD"' Node is bootstrapped. -Estimated gas: 6201.987 units (will add 100 for safety) +Estimated gas: 6202.022 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 'oo6wNGAK8aSyy6XkpBd1Eij4DvdV6te4V91uYzSdtZCPcRNPnAG' +Operation hash is 'onewwsuKZYot2Vhg3tZAUGhRzCaYPeFpoBGJiUCLVzrpFg6GrdR' NOT waiting for the operation to be included. Use command - tezos-client wait for oo6wNGAK8aSyy6XkpBd1Eij4DvdV6te4V91uYzSdtZCPcRNPnAG to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for onewwsuKZYot2Vhg3tZAUGhRzCaYPeFpoBGJiUCLVzrpFg6GrdR 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.000927 Expected counter: 5 - Gas limit: 6302 + Gas limit: 6303 Storage limit: 47 bytes Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000927 @@ -243,7 +243,7 @@ This sequence of operations was run: Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) Storage size: 235 bytes Paid storage size diff: 27 bytes - Consumed gas: 6202.785 + Consumed gas: 6202.820 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 -- GitLab