diff --git a/src/proto_alpha/lib_protocol/alpha_context.ml b/src/proto_alpha/lib_protocol/alpha_context.ml index 1af30548dae16c8d67147b2030880753aadbd6a1..fb1a929c792fd46bb890847586bbe1a7acf9161b 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.ml +++ b/src/proto_alpha/lib_protocol/alpha_context.ml @@ -139,6 +139,12 @@ module Gas = struct let consume = Raw_context.consume_gas + let gas_counter = Raw_context.gas_counter + + let update_gas_counter = Raw_context.update_gas_counter + + let gas_exhausted_error = Raw_context.gas_exhausted_error + let check_enough = Raw_context.check_enough_gas let level = Raw_context.gas_level @@ -190,7 +196,7 @@ module Big_map = struct let get_opt c m k = Storage.Big_map.Contents.get_option (c, m) k let exists c id = - Raw_context.consume_gas c (Gas_limit_repr.read_bytes_cost Z.zero) + Raw_context.consume_gas c (Gas_limit_repr.read_bytes_cost 0) >>?= fun c -> Storage.Big_map.Key_type.get_option c id >>=? fun kt -> diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index d288b1286f1095c98b123fbe68a9402c00dfd754..5f8f405086bb14281aa663dedc7f7c8dbde7417a 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -167,7 +167,9 @@ module Cycle : sig end module Gas : sig - module Arith : Fixed_point_repr.Safe + module Arith : + Fixed_point_repr.Safe + with type 'a t = Saturation_repr.may_saturate Saturation_repr.t type t = private Unaccounted | Limited of {remaining : Arith.fp} @@ -175,7 +177,7 @@ module Gas : sig val pp : Format.formatter -> t -> unit - type cost + type cost = Saturation_repr.may_saturate Saturation_repr.t val cost_encoding : cost Data_encoding.encoding @@ -189,21 +191,21 @@ module Gas : sig val free : cost - val atomic_step_cost : Z.t -> cost + val atomic_step_cost : 'a Saturation_repr.t -> cost - val step_cost : Z.t -> cost + val step_cost : 'a Saturation_repr.t -> cost - val alloc_cost : Z.t -> cost + val alloc_cost : 'a Saturation_repr.t -> cost val alloc_bytes_cost : int -> cost val alloc_mbytes_cost : int -> cost - val read_bytes_cost : Z.t -> cost + val read_bytes_cost : int -> cost - val write_bytes_cost : Z.t -> cost + val write_bytes_cost : int -> cost - val ( *@ ) : Z.t -> cost -> cost + val ( *@ ) : 'a Saturation_repr.t -> cost -> cost val ( +@ ) : cost -> cost -> cost @@ -215,6 +217,12 @@ module Gas : sig val consume : context -> cost -> context tzresult + val gas_counter : context -> Arith.fp + + val update_gas_counter : context -> Arith.fp -> context + + val gas_exhausted_error : context -> 'a tzresult + val check_enough : context -> cost -> unit tzresult val level : context -> t diff --git a/src/proto_alpha/lib_protocol/gas_limit_repr.ml b/src/proto_alpha/lib_protocol/gas_limit_repr.ml index 64afdae25821a1ccbf6a829b0bc855bc8c3f6de8..764fb97c55caf6f5de35ac1ebfbd578165e3c4ad 100644 --- a/src/proto_alpha/lib_protocol/gas_limit_repr.ml +++ b/src/proto_alpha/lib_protocol/gas_limit_repr.ml @@ -29,51 +29,76 @@ type fp_tag type integral_tag -let scaling_factor = 1000 +module S = Saturation_repr + +(* + + When a saturated integer is sufficiently small (i.e. strictly less + than 2147483648), we can assign it the type [mul_safe S.t] to use + it within fast multiplications, named [S.scale_fast] and + [S.mul_fast]. + + The following function allows such type assignment but may raise an + exception if the assumption is wrong. Therefore, [assert_mul_safe] + should only be used to define toplevel values, so that these + exceptions can only occur during startup. + +*) +let assert_mul_safe_exn x = + match S.mul_safe x with None -> assert false | Some x -> x + +(* + + Similarly as [assert_mul_safe_exn], [safe_const_exn] must only be applied + to integer literals that are small enough for fast multiplications. + +*) +let safe_const_exn x = + match S.of_int_opt x with + | None -> + (* Since [safe_const_exn] is only applied to small integers: *) + assert false + | Some x -> + assert_mul_safe_exn x + +let scaling_factor = safe_const_exn 1000 module Arith = struct - type 'a t = Saturation_repr.may_saturate Saturation_repr.t + type 'a t = S.may_saturate S.t type fp = fp_tag t type integral = integral_tag t - let scaling_factor = - match - Saturation_repr.(Option.bind (of_int_opt scaling_factor) mul_safe) - with - | None -> - (* since 1000 is not saturated and mul_safe. *) assert false - | Some x -> - x + let scaling_factor = scaling_factor - let sub = Saturation_repr.sub + let sub = S.sub - let add = Saturation_repr.add + let add = S.add - let zero = Saturation_repr.(may_saturate zero) + let zero = S.(may_saturate zero) - let min = Saturation_repr.min + let min = S.min - let max = Saturation_repr.max + let max = S.max - let compare = Saturation_repr.compare + let compare = S.compare - let ( < ) = Saturation_repr.( < ) + let ( < ) = S.( < ) - let ( <> ) = Saturation_repr.( <> ) + let ( <> ) = S.( <> ) - let ( > ) = Saturation_repr.( > ) + let ( > ) = S.( > ) - let ( <= ) = Saturation_repr.( <= ) + let ( <= ) = S.( <= ) - let ( >= ) = Saturation_repr.( >= ) + let ( >= ) = S.( >= ) - let ( = ) = Saturation_repr.( = ) + let ( = ) = S.( = ) - let equal = Saturation_repr.equal + let equal = S.equal - let of_int_opt = Saturation_repr.of_int_opt + let of_int_opt = S.of_int_opt let fatally_saturated_int i = failwith (string_of_int i ^ " should not be saturated.") @@ -82,7 +107,7 @@ module Arith = struct failwith (Z.to_string z ^ " should not be saturated.") let integral_of_int_exn i = - Saturation_repr.( + S.( match of_int_opt i with | None -> fatally_saturated_int i @@ -97,28 +122,27 @@ module Arith = struct | exception Z.Overflow -> fatally_saturated_z z - let integral_to_z (i : integral) : Z.t = - Saturation_repr.(to_z (ediv i scaling_factor)) + let integral_to_z (i : integral) : Z.t = S.(to_z (ediv i scaling_factor)) let ceil x = - let r = Saturation_repr.erem x scaling_factor in + let r = S.erem x scaling_factor in if r = zero then x else add x (sub scaling_factor r) - let floor x = sub x (Saturation_repr.erem x scaling_factor) + let floor x = sub x (S.erem x scaling_factor) let fp x = x let pp fmtr fp = - let q = Saturation_repr.(ediv fp scaling_factor |> to_int) in - let r = Saturation_repr.(erem fp scaling_factor |> to_int) in + let q = S.(ediv fp scaling_factor |> to_int) in + let r = S.(erem fp scaling_factor |> to_int) in if Compare.Int.(r = 0) then Format.fprintf fmtr "%d" q else Format.fprintf fmtr "%d.%0*d" q decimals r let pp_integral = pp - let n_fp_encoding : fp Data_encoding.t = Saturation_repr.n_encoding + let n_fp_encoding : fp Data_encoding.t = S.n_encoding - let z_fp_encoding : fp Data_encoding.t = Saturation_repr.z_encoding + let z_fp_encoding : fp Data_encoding.t = S.z_encoding let n_integral_encoding : integral Data_encoding.t = Data_encoding.conv integral_to_z integral_exn Data_encoding.n @@ -133,19 +157,12 @@ module Arith = struct | None -> fatally_saturated_z x - let safe_fp x = - match of_int_opt (Z.to_int x) with - | Some int -> - int - | None -> - Saturation_repr.saturated - - let sub_opt = Saturation_repr.sub_opt + let sub_opt = S.sub_opt end type t = Unaccounted | Limited of {remaining : Arith.fp} -type cost = Z.t +type cost = S.may_saturate S.t let encoding = let open Data_encoding in @@ -169,44 +186,51 @@ let pp ppf = function | Limited {remaining} -> Format.fprintf ppf "%a units remaining" Arith.pp remaining -let cost_encoding = Data_encoding.z +let cost_encoding = S.z_encoding -let pp_cost fmt z = Z.pp_print fmt z +let pp_cost fmt z = S.pp fmt z -let allocation_weight = Z.of_int (scaling_factor * 2) +let allocation_weight = + S.(mul_fast scaling_factor (safe_const_exn 2)) |> assert_mul_safe_exn -let step_weight = Z.of_int scaling_factor +let step_weight = scaling_factor -let read_base_weight = Z.of_int (scaling_factor * 100) +let read_base_weight = + S.(mul_fast scaling_factor (safe_const_exn 100)) |> assert_mul_safe_exn -let write_base_weight = Z.of_int (scaling_factor * 160) +let write_base_weight = + S.(mul_fast scaling_factor (safe_const_exn 160)) |> assert_mul_safe_exn -let byte_read_weight = Z.of_int (scaling_factor * 10) +let byte_read_weight = + S.(mul_fast scaling_factor (safe_const_exn 10)) |> assert_mul_safe_exn -let byte_written_weight = Z.of_int (scaling_factor * 15) +let byte_written_weight = + S.(mul_fast scaling_factor (safe_const_exn 15)) |> assert_mul_safe_exn -let cost_to_milligas (cost : cost) : Arith.fp = Arith.safe_fp cost +let cost_to_milligas (cost : cost) : Arith.fp = cost let raw_consume gas_counter cost = let gas = cost_to_milligas cost in Arith.sub_opt gas_counter gas -let alloc_cost n = Z.mul allocation_weight (Z.succ n) +let alloc_cost n = S.scale_fast allocation_weight S.(add n (safe_const_exn 1)) -let alloc_bytes_cost n = alloc_cost (Z.of_int ((n + 7) / 8)) +let alloc_bytes_cost n = alloc_cost (S.safe_int ((n + 7) / 8)) -let atomic_step_cost n = n +let atomic_step_cost : 'a S.t -> cost = S.may_saturate -let step_cost n = Z.mul step_weight n +let step_cost n = S.scale_fast step_weight n -let free = Z.zero +let free = S.zero -let read_bytes_cost n = Z.add read_base_weight (Z.mul byte_read_weight n) +let read_bytes_cost n = + S.add read_base_weight (S.scale_fast byte_read_weight (S.safe_int n)) -let write_bytes_cost n = Z.add write_base_weight (Z.mul byte_written_weight n) +let write_bytes_cost n = + S.add write_base_weight (S.scale_fast byte_written_weight (S.safe_int n)) -let ( +@ ) x y = Z.add x y +let ( +@ ) x y = S.add x y -let ( *@ ) x y = Z.mul x y +let ( *@ ) x y = S.mul x y -let alloc_mbytes_cost n = alloc_cost (Z.of_int 12) +@ alloc_bytes_cost n +let alloc_mbytes_cost n = alloc_cost (safe_const_exn 12) +@ alloc_bytes_cost n diff --git a/src/proto_alpha/lib_protocol/gas_limit_repr.mli b/src/proto_alpha/lib_protocol/gas_limit_repr.mli index a990ac58726585064217ff796ea8a24fa57448a1..a9e26c3de1be934bc4161e900c8856a62fa4b6a6 100644 --- a/src/proto_alpha/lib_protocol/gas_limit_repr.mli +++ b/src/proto_alpha/lib_protocol/gas_limit_repr.mli @@ -23,7 +23,9 @@ (* *) (*****************************************************************************) -module Arith : Fixed_point_repr.Full +module Arith : + Fixed_point_repr.Full + with type 'a t = Saturation_repr.may_saturate Saturation_repr.t type t = Unaccounted | Limited of {remaining : Arith.fp} @@ -31,7 +33,7 @@ val encoding : t Data_encoding.encoding val pp : Format.formatter -> t -> unit -type cost = Z.t +type cost = Saturation_repr.may_saturate Saturation_repr.t val cost_encoding : cost Data_encoding.encoding @@ -41,20 +43,20 @@ val raw_consume : Arith.fp -> cost -> Arith.fp option val free : cost -val atomic_step_cost : Z.t -> cost +val atomic_step_cost : _ Saturation_repr.t -> cost -val step_cost : Z.t -> cost +val step_cost : _ Saturation_repr.t -> cost -val alloc_cost : Z.t -> cost +val alloc_cost : _ Saturation_repr.t -> cost val alloc_bytes_cost : int -> cost val alloc_mbytes_cost : int -> cost -val read_bytes_cost : Z.t -> cost +val read_bytes_cost : int -> cost -val write_bytes_cost : Z.t -> cost +val write_bytes_cost : int -> cost -val ( *@ ) : Z.t -> cost -> cost +val ( *@ ) : _ Saturation_repr.t -> cost -> cost val ( +@ ) : cost -> cost -> cost diff --git a/src/proto_alpha/lib_protocol/helpers_services.ml b/src/proto_alpha/lib_protocol/helpers_services.ml index ce2e41ce585778382f468e2602d5344509f52707..5b0ee1a5d7cdf97c6cba60c3d67bb1cde6ccc9dc 100644 --- a/src/proto_alpha/lib_protocol/helpers_services.ml +++ b/src/proto_alpha/lib_protocol/helpers_services.ml @@ -237,17 +237,20 @@ module Scripts = struct type log_element = | Log : - context * Script.location * 'a * 'a Script_typed_ir.stack_ty + context + * Script.location + * ('a * 's) + * ('a, 's) Script_typed_ir.stack_ty -> log_element let unparse_stack ctxt (stack, stack_ty) = (* We drop the gas limit as this function is only used for debugging/errors. *) let ctxt = Gas.set_unlimited ctxt in let rec unparse_stack : - type a. - a Script_typed_ir.stack_ty * a -> + type a s. + (a, s) Script_typed_ir.stack_ty * (a * s) -> (Script.expr * string option) list tzresult Lwt.t = function - | (Empty_t, ()) -> + | (Bot_t, ((), ())) -> return_nil | (Item_t (ty, rest_ty, annot), (v, rest)) -> Script_ir_translator.unparse_data ctxt Readable ty v @@ -271,13 +274,16 @@ module Scripts = struct module Trace_logger () : Script_interpreter.STEP_LOGGER = struct let log : log_element list ref = ref [] - let log_interp ctxt (descr : (_, _) Script_typed_ir.descr) stack = - log := Log (ctxt, descr.loc, stack, descr.bef) :: !log + let save _ ctxt loc stack_ty stack = + log := Log (ctxt, loc, stack, stack_ty) :: !log - let log_entry _ctxt _descr _stack = () + let log_interp = save - let log_exit ctxt (descr : (_, _) Script_typed_ir.descr) stack = - log := Log (ctxt, descr.loc, stack, descr.aft) :: !log + let log_entry _ _ctxt _loc _stack_ty _stack = () + + let log_control _ = () + + let log_exit = save let get_log () = map_s diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index d3240e7401ccc4e9126c3720f4ef314827537eec..cba1de2bf49f26514d1bca63f8c1feec66b88b43 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -27,17 +27,18 @@ open Alpha_context open Gas +module S = Saturation_repr module Cost_of = struct - module Z_syntax = struct - (* This is a good enough approximation. Z.numbits 0 = 0 *) - let log2 x = Z.of_int (1 + Z.numbits x) + module S_syntax = struct + (* This is a good enough approximation. S.numbits 0 = 0 *) + let log2 x = S.safe_int (1 + S.numbits x) - let ( + ) = Z.add + let ( + ) = S.add - let ( * ) = Z.mul + let ( * ) = S.mul - let ( lsr ) = Z.shift_right + let ( lsr ) = S.shift_right end let z_bytes (z : Z.t) = @@ -53,49 +54,49 @@ module Cost_of = struct (* Upper-bound on the time to compare the given value. For now, returns size in bytes, but this could get more complicated... *) let rec size_of_comparable : - type a. a Script_typed_ir.comparable_ty -> a -> Z.t = + type a. a Script_typed_ir.comparable_ty -> a -> S.may_saturate S.t = fun wit v -> match (wit, v) with | (Unit_key _, _) -> - Z.of_int 1 + S.safe_int 1 | (Never_key _, _) -> . | (Int_key _, _) -> - Z.of_int (int_bytes v) + S.safe_int @@ int_bytes v | (Nat_key _, _) -> - Z.of_int (int_bytes v) + S.safe_int @@ int_bytes v | (Signature_key _, _) -> - Z.of_int Signature.size + S.safe_int Signature.size | (String_key _, _) -> - Z.of_int (String.length v) + S.safe_int @@ String.length v | (Bytes_key _, _) -> - Z.of_int (Bytes.length v) + S.safe_int @@ Bytes.length v | (Bool_key _, _) -> - Z.of_int 8 + S.safe_int 8 | (Key_hash_key _, _) -> - Z.of_int Signature.Public_key_hash.size + S.safe_int Signature.Public_key_hash.size | (Key_key _, k) -> - Z.of_int (Signature.Public_key.size k) + S.safe_int @@ Signature.Public_key.size k | (Timestamp_key _, _) -> - Z.of_int (timestamp_bytes v) + S.safe_int @@ timestamp_bytes v | (Address_key _, _) -> - Z.of_int Signature.Public_key_hash.size + S.safe_int Signature.Public_key_hash.size | (Mutez_key _, _) -> - Z.of_int 8 + S.safe_int 8 | (Chain_id_key _, _) -> - Z.of_int Chain_id.size + S.safe_int Chain_id.size | (Pair_key ((l, _), (r, _), _), (lval, rval)) -> - Z.add (size_of_comparable l lval) (size_of_comparable r rval) + S.add (size_of_comparable l lval) (size_of_comparable r rval) | (Union_key ((t, _), _, _), L x) -> - Z.add (Z.of_int 1) (size_of_comparable t x) + S.add (S.safe_int 1) (size_of_comparable t x) | (Union_key (_, (t, _), _), R x) -> - Z.add (Z.of_int 1) (size_of_comparable t x) + S.add (S.safe_int 1) (size_of_comparable t x) | (Option_key _, None) -> - Z.of_int 1 + S.safe_int 1 | (Option_key (t, _), Some x) -> - Z.add (Z.of_int 1) (size_of_comparable t x) + S.add (S.safe_int 1) (size_of_comparable t x) - let manager_operation = step_cost @@ Z.of_int 1_000 + let manager_operation = step_cost @@ S.safe_int 1_000 (* FIXME: hardcoded constant, available in next environment version. Set to a reasonable upper bound. *) @@ -106,636 +107,638 @@ module Cost_of = struct (* model N_Abs_int *) (* Approximating 0.068306 x term *) - let cost_N_Abs_int size = Z.of_int @@ (80 + (size lsr 4)) + let cost_N_Abs_int size = S.safe_int @@ (80 + (size lsr 4)) (* model N_Add_bls12_381_fr *) - let cost_N_Add_bls12_381_fr = Z.of_int 230 + let cost_N_Add_bls12_381_fr = S.safe_int 230 (* model N_Add_bls12_381_g1 *) - let cost_N_Add_bls12_381_g1 = Z.of_int 9_300 + let cost_N_Add_bls12_381_g1 = S.safe_int 9_300 (* model N_Add_bls12_381_g2 *) - let cost_N_Add_bls12_381_g2 = Z.of_int 13_000 + let cost_N_Add_bls12_381_g2 = S.safe_int 13_000 (* model N_Add_intint *) (* Approximating 0.082158 x term *) let cost_N_Add_intint size1 size2 = let v0 = Compare.Int.max size1 size2 in - Z.of_int (80 + ((v0 lsr 4) + (v0 lsr 6))) + S.safe_int (80 + ((v0 lsr 4) + (v0 lsr 6))) (* model N_Add_tez *) - let cost_N_Add_tez = Z.of_int 100 + let cost_N_Add_tez = S.safe_int 100 (* model N_And *) - let cost_N_And = Z.of_int 100 + let cost_N_And = S.safe_int 100 (* model N_And_nat *) (* Approximating 0.079325 x term *) let cost_N_And_nat size1 size2 = let v0 = Compare.Int.min size1 size2 in - Z.of_int (80 + ((v0 lsr 4) + (v0 lsr 6))) + S.safe_int (80 + ((v0 lsr 4) + (v0 lsr 6))) (* model N_Blake2b *) (* Approximating 1.366428 x term *) let cost_N_Blake2b size = - let open Z_syntax in - let size = Z.of_int size in - Z.of_int 500 + (size + (size lsr 2)) + let open S_syntax in + let size = S.safe_int size in + S.safe_int 500 + (size + (size lsr 2)) (* model N_Car *) - let cost_N_Car = Z.of_int 80 + let cost_N_Car = S.safe_int 80 (* model N_Cdr *) - let cost_N_Cdr = Z.of_int 80 + let cost_N_Cdr = S.safe_int 80 (* model N_Check_signature_ed25519 *) (* Approximating 1.372685 x term *) let cost_N_Check_signature_ed25519 size = - let open Z_syntax in - let size = Z.of_int size in - Z.of_int 270_000 + (size + (size lsr 2)) + let open S_syntax in + let size = S.safe_int size in + S.safe_int 270_000 + (size + (size lsr 2)) (* model N_Check_signature_p256 *) (* Approximating 1.385771 x term *) let cost_N_Check_signature_p256 size = - let open Z_syntax in - let size = Z.of_int size in - Z.of_int 600_000 + (size + (size lsr 2) + (size lsr 3)) + let open S_syntax in + let size = S.safe_int size in + S.safe_int 600_000 + (size + (size lsr 2) + (size lsr 3)) (* model N_Check_signature_secp256k1 *) (* Approximating 1.372411 x term *) let cost_N_Check_signature_secp256k1 size = - let open Z_syntax in - let size = Z.of_int size in - Z.of_int 60_000 + (size + (size lsr 2)) + let open S_syntax in + let size = S.safe_int size in + S.safe_int 60_000 + (size + (size lsr 2)) (* model N_Comb *) (* Approximating 3.275337 x term *) - let cost_N_Comb size = Z.of_int (80 + ((3 * size) + (size lsr 2))) + let cost_N_Comb size = S.safe_int (80 + ((3 * size) + (size lsr 2))) (* model N_Comb_get *) (* Approximating 0.553178 x term *) - let cost_N_Comb_get size = Z.of_int (80 + ((size lsr 1) + (size lsr 4))) + let cost_N_Comb_get size = S.safe_int (80 + ((size lsr 1) + (size lsr 4))) (* model N_Comb_set *) (* Approximating 1.282976 x term *) - let cost_N_Comb_set size = Z.of_int (80 + (size + (size lsr 2))) + let cost_N_Comb_set size = S.safe_int (80 + (size + (size lsr 2))) (* model N_Compare_address *) let cost_N_Compare_address size1 size2 = - Z.of_int (80 + (2 * Compare.Int.min size1 size2)) + S.safe_int (80 + (2 * Compare.Int.min size1 size2)) (* model N_Compare_bool *) let cost_N_Compare_bool size1 size2 = - Z.of_int (80 + (128 * Compare.Int.min size1 size2)) + S.safe_int (80 + (128 * Compare.Int.min size1 size2)) (* model N_Compare_int *) (* Approximating 0.073657 x term *) let cost_N_Compare_int size1 size2 = let v0 = Compare.Int.min size1 size2 in - Z.of_int (150 + ((v0 lsr 4) + (v0 lsr 7))) + S.safe_int (150 + ((v0 lsr 4) + (v0 lsr 7))) (* model N_Compare_key_hash *) let cost_N_Compare_key_hash size1 size2 = - Z.of_int (80 + (2 * Compare.Int.min size1 size2)) + S.safe_int (80 + (2 * Compare.Int.min size1 size2)) (* model N_Compare_mutez *) let cost_N_Compare_mutez size1 size2 = - Z.of_int (13 * Compare.Int.min size1 size2) + S.safe_int (13 * Compare.Int.min size1 size2) (* model N_Compare_string *) (* Approximating 0.039389 x term *) let cost_N_Compare_string size1 size2 = let v0 = Compare.Int.min size1 size2 in - Z.of_int (120 + ((v0 lsr 5) + (v0 lsr 7))) + S.safe_int (120 + ((v0 lsr 5) + (v0 lsr 7))) (* model N_Compare_timestamp *) (* Approximating 0.072483 x term *) let cost_N_Compare_timestamp size1 size2 = let v0 = Compare.Int.min size1 size2 in - Z.of_int (140 + ((v0 lsr 4) + (v0 lsr 7))) + S.safe_int (140 + ((v0 lsr 4) + (v0 lsr 7))) (* model N_Concat_string_pair *) (* Approximating 0.068808 x term *) let cost_N_Concat_string_pair size1 size2 = - let open Z_syntax in - let v0 = Z.of_int size1 + Z.of_int size2 in - Z.of_int 80 + (v0 lsr 4) + let open S_syntax in + let v0 = S.safe_int size1 + S.safe_int size2 in + S.safe_int 80 + (v0 lsr 4) (* model N_Cons_list *) - let cost_N_Cons_list = Z.of_int 80 + let cost_N_Cons_list = S.safe_int 80 (* model N_Cons_none *) - let cost_N_Cons_none = Z.of_int 80 + let cost_N_Cons_none = S.safe_int 80 (* model N_Cons_pair *) - let cost_N_Cons_pair = Z.of_int 80 + let cost_N_Cons_pair = S.safe_int 80 (* model N_Cons_some *) - let cost_N_Cons_some = Z.of_int 80 + let cost_N_Cons_some = S.safe_int 80 (* model N_Const *) - let cost_N_Const = Z.of_int 80 + let cost_N_Const = S.safe_int 80 (* model N_Dig *) - let cost_N_Dig size = Z.of_int (100 + (4 * size)) + let cost_N_Dig size = S.safe_int (100 + (4 * size)) (* model N_Dip *) - let cost_N_Dip = Z.of_int 100 + let cost_N_Dip = S.safe_int 100 (* model N_DipN *) - let cost_N_DipN size = Z.of_int (100 + (4 * size)) + let cost_N_DipN size = S.safe_int (100 + (4 * size)) (* model N_Drop *) - let cost_N_Drop = Z.of_int 80 + let cost_N_Drop = S.safe_int 80 (* model N_DropN *) - let cost_N_DropN size = Z.of_int (100 + (4 * size)) + let cost_N_DropN size = S.safe_int (100 + (4 * size)) (* model N_Dug *) - let cost_N_Dug size = Z.of_int (100 + (4 * size)) + let cost_N_Dug size = S.safe_int (100 + (4 * size)) (* model N_Dup *) - let cost_N_Dup = Z.of_int 80 + let cost_N_Dup = S.safe_int 80 (* model N_DupN *) (* Approximating 1.299969 x term *) - let cost_N_DupN size = Z.of_int (60 + size + (size lsr 2)) + let cost_N_DupN size = S.safe_int (60 + size + (size lsr 2)) (* model N_Ediv_natnat *) (* Approximating 0.001599 x term *) let cost_N_Ediv_natnat size1 size2 = let q = size1 - size2 in - if Compare.Int.(q < 0) then Z.of_int 300 + if Compare.Int.(q < 0) then S.safe_int 300 else - let open Z_syntax in - let v0 = Z.of_int q * Z.of_int size2 in - Z.of_int 300 + (v0 lsr 10) + (v0 lsr 11) + (v0 lsr 13) + let open S_syntax in + let v0 = S.safe_int q * S.safe_int size2 in + S.safe_int 300 + (v0 lsr 10) + (v0 lsr 11) + (v0 lsr 13) (* model N_Ediv_tez *) - let cost_N_Ediv_tez = Z.of_int 200 + let cost_N_Ediv_tez = S.safe_int 200 (* model N_Ediv_teznat *) (* Extracted by hand from the empirical data *) - let cost_N_Ediv_teznat = Z.of_int 300 + let cost_N_Ediv_teznat = S.safe_int 300 (* model N_Empty_map *) - let cost_N_Empty_map = Z.of_int 240 + let cost_N_Empty_map = S.safe_int 240 (* model N_Empty_set *) - let cost_N_Empty_set = Z.of_int 240 + let cost_N_Empty_set = S.safe_int 240 (* model N_Eq *) - let cost_N_Eq = Z.of_int 80 + let cost_N_Eq = S.safe_int 80 (* model N_If *) - let cost_N_If = Z.of_int 60 + let cost_N_If = S.safe_int 60 (* model N_If_cons *) - let cost_N_If_cons = Z.of_int 110 + let cost_N_If_cons = S.safe_int 110 (* model N_If_left *) - let cost_N_If_left = Z.of_int 90 + let cost_N_If_left = S.safe_int 90 (* model N_If_none *) - let cost_N_If_none = Z.of_int 80 + let cost_N_If_none = S.safe_int 80 (* model N_Int_nat *) - let cost_N_Int_nat = Z.of_int 80 + let cost_N_Int_nat = S.safe_int 80 (* model N_Is_nat *) - let cost_N_Is_nat = Z.of_int 80 + let cost_N_Is_nat = S.safe_int 80 (* model N_Keccak *) let cost_N_Keccak size = - let open Z_syntax in - Z.of_int 1_400 + (Z.of_int 30 * Z.of_int size) + let open S_syntax in + S.safe_int 1_400 + (S.safe_int 30 * S.safe_int size) (* model N_Left *) - let cost_N_Left = Z.of_int 80 + let cost_N_Left = S.safe_int 80 (* model N_List_iter *) let cost_N_List_iter size = - let open Z_syntax in - Z.of_int 500 + (Z.of_int 7 * Z.of_int size) + let open S_syntax in + S.safe_int 500 + (S.safe_int 7 * S.safe_int size) (* model N_List_map *) let cost_N_List_map size = - let open Z_syntax in - Z.of_int 500 + (Z.of_int 12 * Z.of_int size) + let open S_syntax in + S.safe_int 500 + (S.safe_int 12 * S.safe_int size) (* model N_List_size *) - let cost_N_List_size = Z.of_int 80 + let cost_N_List_size = S.safe_int 80 (* model N_Loop *) - let cost_N_Loop = Z.of_int 70 + let cost_N_Loop = S.safe_int 70 (* model N_Loop_left *) - let cost_N_Loop_left = Z.of_int 80 + let cost_N_Loop_left = S.safe_int 80 (* model N_Lsl_nat *) (* Approximating 0.129443 x term *) - let cost_N_Lsl_nat size = Z.of_int (150 + (size lsr 3)) + let cost_N_Lsl_nat size = S.safe_int (150 + (size lsr 3)) (* model N_Lsr_nat *) (* Approximating 0.129435 x term *) - let cost_N_Lsr_nat size = Z.of_int (150 + (size lsr 3)) + let cost_N_Lsr_nat size = S.safe_int (150 + (size lsr 3)) (* model N_Map_get *) (* Approximating 0.057548 x term *) let cost_N_Map_get size1 size2 = - let open Z_syntax in - let v0 = size1 * log2 (Z.of_int size2) in - Z.of_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + let open S_syntax in + let v0 = size1 * log2 size2 in + S.safe_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) (* model N_Map_iter *) let cost_N_Map_iter size = - let open Z_syntax in - Z.of_int 80 + (Z.of_int 40 * Z.of_int size) + let open S_syntax in + S.safe_int 80 + (S.safe_int 40 * S.safe_int size) (* model N_Map_map *) let cost_N_Map_map size = - let open Z_syntax in - Z.of_int 80 + (Z.of_int 761 * Z.of_int size) + let open S_syntax in + S.safe_int 80 + (S.safe_int 761 * S.safe_int size) (* model N_Map_mem *) (* Approximating 0.058563 x term *) let cost_N_Map_mem size1 size2 = - let open Z_syntax in - let v0 = size1 * log2 (Z.of_int size2) in - Z.of_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + let open S_syntax in + let v0 = size1 * log2 size2 in + S.safe_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) (* model N_Map_size *) - let cost_N_Map_size = Z.of_int 90 + let cost_N_Map_size = S.safe_int 90 (* model N_Map_update *) (* Approximating 0.119968 x term *) let cost_N_Map_update size1 size2 = - let open Z_syntax in - let v0 = size1 * log2 (Z.of_int size2) in - Z.of_int 80 + (v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + let open S_syntax in + let v0 = size1 * log2 size2 in + S.safe_int 80 + (v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) (* model N_Mul_bls12_381_fr *) - let cost_N_Mul_bls12_381_fr = Z.of_int 260 + let cost_N_Mul_bls12_381_fr = S.safe_int 260 (* model N_Mul_bls12_381_g1 *) - let cost_N_Mul_bls12_381_g1 = Z.of_int 265_000 + let cost_N_Mul_bls12_381_g1 = S.safe_int 265_000 (* model N_Mul_bls12_381_g2 *) - let cost_N_Mul_bls12_381_g2 = Z.of_int 850_000 + let cost_N_Mul_bls12_381_g2 = S.safe_int 850_000 - (* Converting fr from/to Z.t *) - let cost_bls12_381_fr_of_z = Z.of_int 130 + (* Converting fr from/to S.t *) + let cost_bls12_381_fr_of_z = S.safe_int 130 - let cost_bls12_381_fr_to_z = Z.of_int 30 + let cost_bls12_381_fr_to_z = S.safe_int 30 let cost_N_Mul_bls12_381_fr_z = - Z.add cost_bls12_381_fr_of_z cost_N_Mul_bls12_381_fr + S.add cost_bls12_381_fr_of_z cost_N_Mul_bls12_381_fr let cost_N_Int_bls12_381_fr = cost_bls12_381_fr_to_z (* model N_Mul_intint *) let cost_N_Mul_intint size1 size2 = - let open Z_syntax in - let a = Z.of_int size1 + Z.of_int size2 in - Z.of_int 80 + (a * log2 a) + let open S_syntax in + let a = S.add (S.safe_int size1) (S.safe_int size2) in + S.safe_int 80 + (a * log2 a) (* model N_Mul_teznat *) let cost_N_Mul_teznat size = - let open Z_syntax in - Z.of_int 200 + (Z.of_int 133 * Z.of_int size) + let open S_syntax in + S.safe_int 200 + (S.safe_int 133 * S.safe_int size) (* model N_Neg_bls12_381_fr *) - let cost_N_Neg_bls12_381_fr = Z.of_int 180 + let cost_N_Neg_bls12_381_fr = S.safe_int 180 (* model N_Neg_bls12_381_g1 *) - let cost_N_Neg_bls12_381_g1 = Z.of_int 410 + let cost_N_Neg_bls12_381_g1 = S.safe_int 410 (* model N_Neg_bls12_381_g2 *) - let cost_N_Neg_bls12_381_g2 = Z.of_int 715 + let cost_N_Neg_bls12_381_g2 = S.safe_int 715 (* model N_Neg_int *) (* Approximating 0.068419 x term *) - let cost_N_Neg_int size = Z.of_int (80 + (size lsr 4)) + let cost_N_Neg_int size = S.safe_int (80 + (size lsr 4)) (* model N_Neq *) - let cost_N_Neq = Z.of_int 80 + let cost_N_Neq = S.safe_int 80 (* model N_Nil *) - let cost_N_Nil = Z.of_int 80 + let cost_N_Nil = S.safe_int 80 (* model N_Nop *) - let cost_N_Nop = Z.of_int 70 + let cost_N_Nop = S.safe_int 70 (* model N_Not *) - let cost_N_Not = Z.of_int 90 + let cost_N_Not = S.safe_int 90 (* model N_Not_int *) (* Approximating 0.076564 x term *) - let cost_N_Not_int size = Z.of_int (55 + ((size lsr 4) + (size lsr 7))) + let cost_N_Not_int size = S.safe_int (55 + ((size lsr 4) + (size lsr 7))) (* model N_Or *) - let cost_N_Or = Z.of_int 90 + let cost_N_Or = S.safe_int 90 (* model N_Or_nat *) (* Approximating 0.078718 x term *) let cost_N_Or_nat size1 size2 = let v0 = Compare.Int.max size1 size2 in - Z.of_int (80 + ((v0 lsr 4) + (v0 lsr 6))) + S.safe_int (80 + ((v0 lsr 4) + (v0 lsr 6))) (* model N_Pairing_check_bls12_381 *) let cost_N_Pairing_check_bls12_381 size = - Z.add (Z.of_int 1_550_000) (Z.mul (Z.of_int 510_000) (Z.of_int size)) + S.add + (S.safe_int 1_550_000) + (S.mul (S.safe_int 510_000) (S.safe_int size)) (* model N_Right *) - let cost_N_Right = Z.of_int 80 + let cost_N_Right = S.safe_int 80 (* model N_Seq *) - let cost_N_Seq = Z.of_int 60 + let cost_N_Seq = S.safe_int 60 (* model N_Set_iter *) let cost_N_Set_iter size = - let open Z_syntax in - Z.of_int 80 + (Z.of_int 36 * Z.of_int size) + let open S_syntax in + S.safe_int 80 + (S.safe_int 36 * S.safe_int size) (* model N_Set_mem *) (* Approximating 0.059410 x term *) let cost_N_Set_mem size1 size2 = - let open Z_syntax in - let v0 = size1 * log2 (Z.of_int size2) in - Z.of_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + (v0 lsr 8) + let open S_syntax in + let v0 = size1 * log2 (S.safe_int size2) in + S.safe_int 80 + (v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + (v0 lsr 8) (* model N_Set_size *) - let cost_N_Set_size = Z.of_int 80 + let cost_N_Set_size = S.safe_int 80 (* model N_Set_update *) (* Approximating 0.126260 x term *) let cost_N_Set_update size1 size2 = - let open Z_syntax in - let v0 = size1 * log2 (Z.of_int size2) in - Z.of_int 80 + (v0 lsr 3) + let open S_syntax in + let v0 = size1 * log2 (S.safe_int size2) in + S.safe_int 80 + (v0 lsr 3) (* model N_Sha256 *) let cost_N_Sha256 size = - let open Z_syntax in - Z.of_int 500 + (Z.of_int 5 * Z.of_int size) + let open S_syntax in + S.safe_int 500 + (S.safe_int 5 * S.safe_int size) (* model N_Sha3 *) let cost_N_Sha3 size = - let open Z_syntax in - Z.of_int 1_400 + (Z.of_int 32 * Z.of_int size) + let open S_syntax in + S.safe_int 1_400 + (S.safe_int 32 * S.safe_int size) (* model N_Sha512 *) let cost_N_Sha512 size = - let open Z_syntax in - Z.of_int 500 + (Z.of_int 3 * Z.of_int size) + let open S_syntax in + S.safe_int 500 + (S.safe_int 3 * S.safe_int size) (* model N_Slice_string *) (* Approximating 0.067048 x term *) - let cost_N_Slice_string size = Z.of_int (80 + (size lsr 4)) + let cost_N_Slice_string size = S.safe_int (80 + (size lsr 4)) (* model N_String_size *) - let cost_N_String_size = Z.of_int 80 + let cost_N_String_size = S.safe_int 80 (* model N_Sub_int *) (* Approximating 0.082399 x term *) let cost_N_Sub_int size1 size2 = let v0 = Compare.Int.max size1 size2 in - Z.of_int (80 + ((v0 lsr 4) + (v0 lsr 6))) + S.safe_int (80 + ((v0 lsr 4) + (v0 lsr 6))) (* model N_Sub_tez *) - let cost_N_Sub_tez = Z.of_int 80 + let cost_N_Sub_tez = S.safe_int 80 (* model N_Swap *) - let cost_N_Swap = Z.of_int 70 + let cost_N_Swap = S.safe_int 70 (* model N_Total_voting_power *) - let cost_N_Total_voting_power = Z.of_int 400 + let cost_N_Total_voting_power = S.safe_int 400 (* model N_Uncomb *) (* Approximating 3.666332 x term *) let cost_N_Uncomb size = - Z.of_int (80 + ((3 * size) + (size lsr 1) + (size lsr 3))) + S.safe_int (80 + ((3 * size) + (size lsr 1) + (size lsr 3))) (* model N_Unpair *) - let cost_N_Unpair = Z.of_int 80 + let cost_N_Unpair = S.safe_int 80 (* model N_Voting_power *) - let cost_N_Voting_power = Z.of_int 400 + let cost_N_Voting_power = S.safe_int 400 (* model N_Xor *) - let cost_N_Xor = Z.of_int 100 + let cost_N_Xor = S.safe_int 100 (* model N_Xor_nat *) (* Approximating 0.078258 x term *) let cost_N_Xor_nat size1 size2 = let v0 = Compare.Int.max size1 size2 in - Z.of_int (80 + ((v0 lsr 4) + (v0 lsr 6))) + S.safe_int (80 + ((v0 lsr 4) + (v0 lsr 6))) (* model DECODING_BLS_FR *) - let cost_DECODING_BLS_FR = Z.of_int 50 + let cost_DECODING_BLS_FR = S.safe_int 50 (* model DECODING_BLS_G1 *) - let cost_DECODING_BLS_G1 = Z.of_int 230_000 + let cost_DECODING_BLS_G1 = S.safe_int 230_000 (* model DECODING_BLS_G2 *) - let cost_DECODING_BLS_G2 = Z.of_int 740_000 + let cost_DECODING_BLS_G2 = S.safe_int 740_000 (* model B58CHECK_DECODING_CHAIN_ID *) - let cost_B58CHECK_DECODING_CHAIN_ID = Z.of_int 1_500 + let cost_B58CHECK_DECODING_CHAIN_ID = S.safe_int 1_500 (* model B58CHECK_DECODING_PUBLIC_KEY_HASH_ed25519 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_ed25519 = Z.of_int 3_300 + let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_ed25519 = S.safe_int 3_300 (* model B58CHECK_DECODING_PUBLIC_KEY_HASH_p256 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_p256 = Z.of_int 3_300 + let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_p256 = S.safe_int 3_300 (* model B58CHECK_DECODING_PUBLIC_KEY_HASH_secp256k1 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_secp256k1 = Z.of_int 3_300 + let cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_secp256k1 = S.safe_int 3_300 (* model B58CHECK_DECODING_PUBLIC_KEY_ed25519 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_ed25519 = Z.of_int 4_300 + let cost_B58CHECK_DECODING_PUBLIC_KEY_ed25519 = S.safe_int 4_300 (* model B58CHECK_DECODING_PUBLIC_KEY_p256 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_p256 = Z.of_int 29_000 + let cost_B58CHECK_DECODING_PUBLIC_KEY_p256 = S.safe_int 29_000 (* model B58CHECK_DECODING_PUBLIC_KEY_secp256k1 *) - let cost_B58CHECK_DECODING_PUBLIC_KEY_secp256k1 = Z.of_int 9_400 + let cost_B58CHECK_DECODING_PUBLIC_KEY_secp256k1 = S.safe_int 9_400 (* model B58CHECK_DECODING_SIGNATURE_ed25519 *) - let cost_B58CHECK_DECODING_SIGNATURE_ed25519 = Z.of_int 6_600 + let cost_B58CHECK_DECODING_SIGNATURE_ed25519 = S.safe_int 6_600 (* model B58CHECK_DECODING_SIGNATURE_p256 *) - let cost_B58CHECK_DECODING_SIGNATURE_p256 = Z.of_int 6_600 + let cost_B58CHECK_DECODING_SIGNATURE_p256 = S.safe_int 6_600 (* model B58CHECK_DECODING_SIGNATURE_secp256k1 *) - let cost_B58CHECK_DECODING_SIGNATURE_secp256k1 = Z.of_int 6_600 + let cost_B58CHECK_DECODING_SIGNATURE_secp256k1 = S.safe_int 6_600 (* model ENCODING_BLS_FR *) - let cost_ENCODING_BLS_FR = Z.of_int 30 + let cost_ENCODING_BLS_FR = S.safe_int 30 (* model ENCODING_BLS_G1 *) - let cost_ENCODING_BLS_G1 = Z.of_int 30 + let cost_ENCODING_BLS_G1 = S.safe_int 30 (* model ENCODING_BLS_G2 *) - let cost_ENCODING_BLS_G2 = Z.of_int 30 + let cost_ENCODING_BLS_G2 = S.safe_int 30 (* model B58CHECK_ENCODING_CHAIN_ID *) - let cost_B58CHECK_ENCODING_CHAIN_ID = Z.of_int 1_600 + let cost_B58CHECK_ENCODING_CHAIN_ID = S.safe_int 1_600 (* model B58CHECK_ENCODING_PUBLIC_KEY_HASH_ed25519 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_ed25519 = Z.of_int 3_300 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_ed25519 = S.safe_int 3_300 (* model B58CHECK_ENCODING_PUBLIC_KEY_HASH_p256 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_p256 = Z.of_int 3_750 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_p256 = S.safe_int 3_750 (* model B58CHECK_ENCODING_PUBLIC_KEY_HASH_secp256k1 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_secp256k1 = Z.of_int 3_300 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_secp256k1 = S.safe_int 3_300 (* model B58CHECK_ENCODING_PUBLIC_KEY_ed25519 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_ed25519 = Z.of_int 4_500 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_ed25519 = S.safe_int 4_500 (* model B58CHECK_ENCODING_PUBLIC_KEY_p256 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_p256 = Z.of_int 5_300 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_p256 = S.safe_int 5_300 (* model B58CHECK_ENCODING_PUBLIC_KEY_secp256k1 *) - let cost_B58CHECK_ENCODING_PUBLIC_KEY_secp256k1 = Z.of_int 5_000 + let cost_B58CHECK_ENCODING_PUBLIC_KEY_secp256k1 = S.safe_int 5_000 (* model B58CHECK_ENCODING_SIGNATURE_ed25519 *) - let cost_B58CHECK_ENCODING_SIGNATURE_ed25519 = Z.of_int 8_700 + let cost_B58CHECK_ENCODING_SIGNATURE_ed25519 = S.safe_int 8_700 (* model B58CHECK_ENCODING_SIGNATURE_p256 *) - let cost_B58CHECK_ENCODING_SIGNATURE_p256 = Z.of_int 8_700 + let cost_B58CHECK_ENCODING_SIGNATURE_p256 = S.safe_int 8_700 (* model B58CHECK_ENCODING_SIGNATURE_secp256k1 *) - let cost_B58CHECK_ENCODING_SIGNATURE_secp256k1 = Z.of_int 8_700 + let cost_B58CHECK_ENCODING_SIGNATURE_secp256k1 = S.safe_int 8_700 (* model DECODING_CHAIN_ID *) - let cost_DECODING_CHAIN_ID = Z.of_int 50 + let cost_DECODING_CHAIN_ID = S.safe_int 50 (* model DECODING_PUBLIC_KEY_HASH_ed25519 *) - let cost_DECODING_PUBLIC_KEY_HASH_ed25519 = Z.of_int 50 + let cost_DECODING_PUBLIC_KEY_HASH_ed25519 = S.safe_int 50 (* model DECODING_PUBLIC_KEY_HASH_p256 *) - let cost_DECODING_PUBLIC_KEY_HASH_p256 = Z.of_int 60 + let cost_DECODING_PUBLIC_KEY_HASH_p256 = S.safe_int 60 (* model DECODING_PUBLIC_KEY_HASH_secp256k1 *) - let cost_DECODING_PUBLIC_KEY_HASH_secp256k1 = Z.of_int 60 + let cost_DECODING_PUBLIC_KEY_HASH_secp256k1 = S.safe_int 60 (* model DECODING_PUBLIC_KEY_ed25519 *) - let cost_DECODING_PUBLIC_KEY_ed25519 = Z.of_int 60 + let cost_DECODING_PUBLIC_KEY_ed25519 = S.safe_int 60 (* model DECODING_PUBLIC_KEY_p256 *) - let cost_DECODING_PUBLIC_KEY_p256 = Z.of_int 25_000 + let cost_DECODING_PUBLIC_KEY_p256 = S.safe_int 25_000 (* model DECODING_PUBLIC_KEY_secp256k1 *) - let cost_DECODING_PUBLIC_KEY_secp256k1 = Z.of_int 5_300 + let cost_DECODING_PUBLIC_KEY_secp256k1 = S.safe_int 5_300 (* model DECODING_SIGNATURE_ed25519 *) - let cost_DECODING_SIGNATURE_ed25519 = Z.of_int 30 + let cost_DECODING_SIGNATURE_ed25519 = S.safe_int 30 (* model DECODING_SIGNATURE_p256 *) - let cost_DECODING_SIGNATURE_p256 = Z.of_int 30 + let cost_DECODING_SIGNATURE_p256 = S.safe_int 30 (* model DECODING_SIGNATURE_secp256k1 *) - let cost_DECODING_SIGNATURE_secp256k1 = Z.of_int 30 + let cost_DECODING_SIGNATURE_secp256k1 = S.safe_int 30 (* model ENCODING_CHAIN_ID *) - let cost_ENCODING_CHAIN_ID = Z.of_int 50 + let cost_ENCODING_CHAIN_ID = S.safe_int 50 (* model ENCODING_PUBLIC_KEY_HASH_ed25519 *) - let cost_ENCODING_PUBLIC_KEY_HASH_ed25519 = Z.of_int 70 + let cost_ENCODING_PUBLIC_KEY_HASH_ed25519 = S.safe_int 70 (* model ENCODING_PUBLIC_KEY_HASH_p256 *) - let cost_ENCODING_PUBLIC_KEY_HASH_p256 = Z.of_int 80 + let cost_ENCODING_PUBLIC_KEY_HASH_p256 = S.safe_int 80 (* model ENCODING_PUBLIC_KEY_HASH_secp256k1 *) - let cost_ENCODING_PUBLIC_KEY_HASH_secp256k1 = Z.of_int 70 + let cost_ENCODING_PUBLIC_KEY_HASH_secp256k1 = S.safe_int 70 (* model ENCODING_PUBLIC_KEY_ed25519 *) - let cost_ENCODING_PUBLIC_KEY_ed25519 = Z.of_int 80 + let cost_ENCODING_PUBLIC_KEY_ed25519 = S.safe_int 80 (* model ENCODING_PUBLIC_KEY_p256 *) - let cost_ENCODING_PUBLIC_KEY_p256 = Z.of_int 450 + let cost_ENCODING_PUBLIC_KEY_p256 = S.safe_int 450 (* model ENCODING_PUBLIC_KEY_secp256k1 *) - let cost_ENCODING_PUBLIC_KEY_secp256k1 = Z.of_int 490 + let cost_ENCODING_PUBLIC_KEY_secp256k1 = S.safe_int 490 (* model ENCODING_SIGNATURE_ed25519 *) - let cost_ENCODING_SIGNATURE_ed25519 = Z.of_int 40 + let cost_ENCODING_SIGNATURE_ed25519 = S.safe_int 40 (* model ENCODING_SIGNATURE_p256 *) - let cost_ENCODING_SIGNATURE_p256 = Z.of_int 40 + let cost_ENCODING_SIGNATURE_p256 = S.safe_int 40 (* model ENCODING_SIGNATURE_secp256k1 *) - let cost_ENCODING_SIGNATURE_secp256k1 = Z.of_int 40 + let cost_ENCODING_SIGNATURE_secp256k1 = S.safe_int 40 (* model TIMESTAMP_READABLE_DECODING *) - let cost_TIMESTAMP_READABLE_DECODING = Z.of_int 130 + let cost_TIMESTAMP_READABLE_DECODING = S.safe_int 130 (* model TIMESTAMP_READABLE_ENCODING *) - let cost_TIMESTAMP_READABLE_ENCODING = Z.of_int 900 + let cost_TIMESTAMP_READABLE_ENCODING = S.safe_int 900 (* model CHECK_PRINTABLE *) let cost_CHECK_PRINTABLE size = - let open Z_syntax in - Z.of_int 14 + (Z.of_int 10 * Z.of_int size) + let open S_syntax in + S.safe_int 14 + (S.safe_int 10 * S.safe_int size) (* model MERGE_TYPES This is the estimated cost of one iteration of merge_types, extracted and copied manually from the parameter fit for the MERGE_TYPES benchmark (the model is parametric on the size of the type, which we don't have access to in O(1)). *) - let cost_MERGE_TYPES = Z.of_int 130 + let cost_MERGE_TYPES = S.safe_int 130 (* model TYPECHECKING_CODE This is the cost of one iteration of parse_instr, extracted by hand from the parameter fit for the TYPECHECKING_CODE benchmark. *) - let cost_TYPECHECKING_CODE = Z.of_int 375 + let cost_TYPECHECKING_CODE = S.safe_int 375 (* model UNPARSING_CODE This is the cost of one iteration of unparse_instr, extracted by hand from the parameter fit for the UNPARSING_CODE benchmark. *) - let cost_UNPARSING_CODE = Z.of_int 200 + let cost_UNPARSING_CODE = S.safe_int 200 (* model TYPECHECKING_DATA This is the cost of one iteration of parse_data, extracted by hand from the parameter fit for the TYPECHECKING_DATA benchmark. *) - let cost_TYPECHECKING_DATA = Z.of_int 240 + let cost_TYPECHECKING_DATA = S.safe_int 240 (* model UNPARSING_DATA This is the cost of one iteration of unparse_data, extracted by hand from the parameter fit for the UNPARSING_DATA benchmark. *) - let cost_UNPARSING_DATA = Z.of_int 140 + let cost_UNPARSING_DATA = S.safe_int 140 (* model PARSE_TYPE This is the cost of one iteration of parse_ty, extracted by hand from the parameter fit for the PARSE_TYPE benchmark. *) - let cost_PARSE_TYPE = Z.of_int 170 + let cost_PARSE_TYPE = S.safe_int 170 (* model UNPARSE_TYPE This is the cost of one iteration of unparse_ty, extracted by hand from the parameter fit for the UNPARSE_TYPE benchmark. *) - let cost_UNPARSE_TYPE = Z.of_int 185 + let cost_UNPARSE_TYPE = S.safe_int 185 (* TODO: benchmark *) - let cost_COMPARABLE_TY_OF_TY = Z.of_int 120 + let cost_COMPARABLE_TY_OF_TY = S.safe_int 120 end module Interpreter = struct @@ -809,17 +812,18 @@ module Cost_of = struct let map_mem (type k v) (elt : k) ((module Box) : (k, v) Script_typed_ir.map) = let elt_size = size_of_comparable Box.key_ty elt in - atomic_step_cost (cost_N_Map_mem elt_size (snd Box.boxed)) + atomic_step_cost (cost_N_Map_mem elt_size (S.safe_int (snd Box.boxed))) let map_get (type k v) (elt : k) ((module Box) : (k, v) Script_typed_ir.map) = let elt_size = size_of_comparable Box.key_ty elt in - atomic_step_cost (cost_N_Map_get elt_size (snd Box.boxed)) + atomic_step_cost (cost_N_Map_get elt_size (S.safe_int (snd Box.boxed))) let map_update (type k v) (elt : k) ((module Box) : (k, v) Script_typed_ir.map) = let elt_size = size_of_comparable Box.key_ty elt in - atomic_step_cost (cost_N_Map_update elt_size (snd Box.boxed)) + atomic_step_cost + (cost_N_Map_update elt_size (S.safe_int (snd Box.boxed))) let map_get_and_update (type k v) (elt : k) (m : (k, v) Script_typed_ir.map) = @@ -1006,23 +1010,23 @@ module Cost_of = struct let dupn n = atomic_step_cost (cost_N_DupN n) let sapling_verify_update ~inputs ~outputs = - let open Z_syntax in + let open S_syntax in atomic_step_cost - ( Z.of_int 85_000 - + (Z.of_int inputs * Z.of_int 4) - + (Z.of_int outputs * Z.of_int 30) ) + ( S.safe_int 85_000 + + (S.safe_int inputs * S.safe_int 4) + + (S.safe_int outputs * S.safe_int 30) ) (* --------------------------------------------------------------------- *) (* Semi-hand-crafted models *) - let compare_unit = atomic_step_cost (Z.of_int 10) + let compare_unit = atomic_step_cost (S.safe_int 10) - let compare_union_tag = atomic_step_cost (Z.of_int 10) + let compare_union_tag = atomic_step_cost (S.safe_int 10) - let compare_option_tag = atomic_step_cost (Z.of_int 10) + let compare_option_tag = atomic_step_cost (S.safe_int 10) let compare_bool = atomic_step_cost (cost_N_Compare_bool 1 1) - let compare_signature = atomic_step_cost (Z.of_int 92) + let compare_signature = atomic_step_cost (S.safe_int 92) let compare_string s1 s2 = atomic_step_cost @@ -1044,7 +1048,7 @@ module Cost_of = struct let sz = Signature.Public_key_hash.size in atomic_step_cost (cost_N_Compare_key_hash sz sz) - let compare_key = atomic_step_cost (Z.of_int 92) + let compare_key = atomic_step_cost (S.safe_int 92) let compare_timestamp t1 t2 = atomic_step_cost @@ -1056,7 +1060,7 @@ module Cost_of = struct let sz = Signature.Public_key_hash.size + Chain_id.size in atomic_step_cost (cost_N_Compare_address sz sz) - let compare_chain_id = atomic_step_cost (Z.of_int 30) + let compare_chain_id = atomic_step_cost (S.safe_int 30) let rec compare : type a. a Script_typed_ir.comparable_ty -> a -> a -> cost = @@ -1136,25 +1140,25 @@ module Cost_of = struct *) let concat_string_precheck (l : 'a Script_typed_ir.boxed_list) = (* we set the precheck to be slightly more expensive than cost_N_List_iter *) - atomic_step_cost (Z.mul (Z.of_int l.length) (Z.of_int 10)) + atomic_step_cost (S.mul (S.safe_int l.length) (S.safe_int 10)) (* This is the cost of allocating a string and blitting existing ones into it. *) let concat_string total_bytes = atomic_step_cost - Z.(add (of_int 100) (fst (ediv_rem total_bytes (of_int 10)))) + S.(add (S.safe_int 100) (S.ediv total_bytes (S.safe_int 10))) (* Same story as Concat_string. *) let concat_bytes total_bytes = atomic_step_cost - Z.(add (of_int 100) (fst (ediv_rem total_bytes (of_int 10)))) + S.(add (S.safe_int 100) (S.ediv total_bytes (S.safe_int 10))) (* Cost of additional call to logger + overhead of setting up call to [interp]. *) - let exec = atomic_step_cost (Z.of_int 100) + let exec = atomic_step_cost (S.safe_int 100) (* Heavy computation happens in the [unparse_data], [unparse_ty] functions which are carbonated. We must account for allocating the Micheline lambda wrapper. *) - let apply = atomic_step_cost (Z.of_int 1000) + let apply = atomic_step_cost (S.safe_int 1000) (* Pushing a pointer on the stack. *) let lambda = push @@ -1186,7 +1190,7 @@ module Cost_of = struct let balance = Gas.free (* Accessing the raw_context, Small arithmetic & pushing on the stack. *) - let level = atomic_step_cost (Z.mul (Z.of_int 2) cost_N_Const) + let level = atomic_step_cost (S.mul (S.safe_int 2) cost_N_Const) (* Same as [cost_level] *) let now = level @@ -1217,15 +1221,17 @@ module Cost_of = struct let unpack_failed bytes = (* We cannot instrument failed deserialization, so we take worst case fees: a set of size 1 bytes values. *) - let len = Z.of_int (Bytes.length bytes) in + let blen = Bytes.length bytes in + let len = S.safe_int blen in + let d = Z.numbits (Z.of_int blen) in (len *@ alloc_mbytes_cost 1) +@ len - *@ ( Z.of_int (Z.numbits len) - *@ (alloc_cost (Z.of_int 3) +@ step_cost Z.one) ) + *@ ( S.safe_int d + *@ (alloc_cost (S.safe_int 3) +@ step_cost (S.safe_int 1)) ) - let ticket = atomic_step_cost (Z.of_int 80) + let ticket = atomic_step_cost (S.safe_int 80) - let read_ticket = atomic_step_cost (Z.of_int 80) + let read_ticket = atomic_step_cost (S.safe_int 80) let split_ticket ticket_amount amount_a amount_b = ticket @@ -1248,7 +1254,7 @@ module Cost_of = struct let public_key_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_DECODING_PUBLIC_KEY_ed25519 (max @@ -1257,7 +1263,7 @@ module Cost_of = struct let public_key_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_DECODING_PUBLIC_KEY_ed25519 (max @@ -1266,7 +1272,7 @@ module Cost_of = struct let key_hash_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_DECODING_PUBLIC_KEY_HASH_ed25519 (max @@ -1275,7 +1281,7 @@ module Cost_of = struct let key_hash_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_DECODING_PUBLIC_KEY_HASH_ed25519 (max @@ -1284,7 +1290,7 @@ module Cost_of = struct let signature_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_DECODING_SIGNATURE_ed25519 (max @@ -1293,7 +1299,7 @@ module Cost_of = struct let signature_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_DECODING_SIGNATURE_ed25519 (max @@ -1343,7 +1349,7 @@ module Cost_of = struct let timestamp_readable = atomic_step_cost cost_TIMESTAMP_READABLE_DECODING (* Reasonable estimate. *) - let contract = Gas.(Z.of_int 2 *@ public_key_readable) + let contract = Gas.(S.safe_int 2 *@ public_key_readable) (* Assuming unflattened storage: /contracts/hash1/.../hash6/key/balance, balance stored on 64 bits *) @@ -1353,7 +1359,8 @@ module Cost_of = struct (* Constructing proof arguments consists in a decreasing loop in the result monad, allocating at each step. We charge a reasonable overapproximation. *) - let proof_argument n = atomic_step_cost (Z.mul (Z.of_int n) (Z.of_int 50)) + let proof_argument n = + atomic_step_cost (S.mul (S.safe_int n) (S.safe_int 50)) end module Unparsing = struct @@ -1361,7 +1368,7 @@ module Cost_of = struct let public_key_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_ENCODING_PUBLIC_KEY_ed25519 (max @@ -1370,7 +1377,7 @@ module Cost_of = struct let public_key_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_ENCODING_PUBLIC_KEY_ed25519 (max @@ -1379,7 +1386,7 @@ module Cost_of = struct let key_hash_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_ENCODING_PUBLIC_KEY_HASH_ed25519 (max @@ -1388,7 +1395,7 @@ module Cost_of = struct let key_hash_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_ENCODING_PUBLIC_KEY_HASH_ed25519 (max @@ -1397,7 +1404,7 @@ module Cost_of = struct let signature_optimized = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_ENCODING_SIGNATURE_ed25519 (max @@ -1406,7 +1413,7 @@ module Cost_of = struct let signature_readable = atomic_step_cost - @@ Compare.Z.( + @@ S.( max cost_B58CHECK_ENCODING_SIGNATURE_ed25519 (max @@ -1443,7 +1450,7 @@ module Cost_of = struct let unit = Gas.free (* Reasonable estimate. *) - let contract = Gas.(Z.of_int 2 *@ public_key_readable) + let contract = Gas.(S.safe_int 2 *@ public_key_readable) (* Reuse 006 costs. *) let operation bytes = Script.bytes_node_cost bytes diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli index 1ed46de6eed6156518493d2d924c0c115a3d1f1f..5944a5ba983a9fd0a07e6d927da2da5c0a141204 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli @@ -243,9 +243,11 @@ module Cost_of : sig val concat_string_precheck : 'a Script_typed_ir.boxed_list -> Gas.cost - val concat_string : Z.t -> Gas.cost + val concat_string : + Saturation_repr.may_saturate Saturation_repr.t -> Gas.cost - val concat_bytes : Z.t -> Gas.cost + val concat_bytes : + Saturation_repr.may_saturate Saturation_repr.t -> Gas.cost val exec : Gas.cost diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index b7d87629fbe14e6df33b49773cdd6fa80555bbcc..0cefa0c3450108435b28088206da48879520fc35 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -435,6 +435,10 @@ let is_gas_unlimited ctxt = let is_counting_block_gas ctxt = match gas_counter_status ctxt with Count_block_gas _ -> true | _ -> false +let gas_exhausted_error ctxt = + if is_counting_block_gas ctxt then error Block_quota_exceeded + else error Operation_quota_exceeded + let consume_gas ctxt cost = if is_gas_unlimited ctxt then ok ctxt else @@ -442,8 +446,7 @@ let consume_gas ctxt cost = | Some gas_counter -> Ok (update_gas_counter ctxt gas_counter) | None -> - if is_counting_block_gas ctxt then error Block_quota_exceeded - else error Operation_quota_exceeded + gas_exhausted_error ctxt let check_enough_gas ctxt cost = consume_gas ctxt cost >>? fun _ -> ok_unit diff --git a/src/proto_alpha/lib_protocol/raw_context.mli b/src/proto_alpha/lib_protocol/raw_context.mli index de829aba5d4baf1184bcfb8d0d278281a37ac31a..4d3dc9caf65b24791a550d001d392d5744ce0cca 100644 --- a/src/proto_alpha/lib_protocol/raw_context.mli +++ b/src/proto_alpha/lib_protocol/raw_context.mli @@ -133,6 +133,12 @@ val gas_level : t -> Gas_limit_repr.t val gas_consumed : since:t -> until:t -> Gas_limit_repr.Arith.fp +val gas_counter : t -> Gas_limit_repr.Arith.fp + +val update_gas_counter : t -> Gas_limit_repr.Arith.fp -> t + +val gas_exhausted_error : t -> 'a tzresult + val block_gas_level : t -> Gas_limit_repr.Arith.fp val init_storage_space_to_pay : t -> t diff --git a/src/proto_alpha/lib_protocol/sapling_storage.ml b/src/proto_alpha/lib_protocol/sapling_storage.ml index 41b9d4a39f32c6265e9c3722cb38e67b8840af30..1b94856fb3c0857289ef1e9068742d6bcff6eec7 100644 --- a/src/proto_alpha/lib_protocol/sapling_storage.ml +++ b/src/proto_alpha/lib_protocol/sapling_storage.ml @@ -397,11 +397,21 @@ let init ctx id ~memo_size = (* Gas costs for apply_diff. *) let sapling_apply_diff_cost ~inputs ~outputs = - Z.add - (Z.of_int 1_300_000) - (Z.add - (Z.mul (Z.of_int inputs) (Z.of_int 5_000)) - (Z.mul (Z.of_int outputs) (Z.of_int 55_000))) + let open Saturation_repr in + let mul_safe_int x = + Option.bind (of_int_opt x) mul_safe + |> function + | None -> + (* Since you can read below that x is always less than 2147483648. *) + assert false + | Some x -> + x + in + add + (safe_int 1_300_000) + (add + (scale_fast (mul_safe_int 5_000) (safe_int inputs)) + (scale_fast (mul_safe_int 55_000) (safe_int outputs))) (** Applies a diff to a state id stored in the context. Updates Commitments, Ciphertexts and Nullifiers using the diff and updates the Roots using the @@ -410,9 +420,10 @@ let apply_diff ctx id diff = let open Sapling_repr in let nb_commitments = List.length diff.commitments_and_ciphertexts in let nb_nullifiers = List.length diff.nullifiers in - Raw_context.consume_gas - ctx - (sapling_apply_diff_cost ~inputs:nb_nullifiers ~outputs:nb_commitments) + let sapling_cost = + sapling_apply_diff_cost ~inputs:nb_nullifiers ~outputs:nb_commitments + in + Raw_context.consume_gas ctx sapling_cost >>?= fun ctx -> Storage.Sapling.Commitments_size.get (ctx, id) >>=? fun cm_start_pos -> diff --git a/src/proto_alpha/lib_protocol/saturation_repr.ml b/src/proto_alpha/lib_protocol/saturation_repr.ml index 824fabbeb589a5b92c2e120a91ca9a2e4023b069..57343c616f9f5d2268bb4d3bcc44b337d65022cf 100644 --- a/src/proto_alpha/lib_protocol/saturation_repr.ml +++ b/src/proto_alpha/lib_protocol/saturation_repr.ml @@ -64,6 +64,34 @@ let of_z_opt z = let to_z x = Z.of_int x +let saturate_if_undef = function None -> saturated | Some x -> x + +let safe_int x = of_int_opt x |> saturate_if_undef + +let numbits x = + let x = ref x and n = ref 0 in + (let y = !x lsr 32 in + if y <> 0 then ( + n := !n + 32 ; + x := y )) ; + (let y = !x lsr 16 in + if y <> 0 then ( + n := !n + 16 ; + x := y )) ; + (let y = !x lsr 8 in + if y <> 0 then ( + n := !n + 8 ; + x := y )) ; + (let y = !x lsr 4 in + if y <> 0 then ( + n := !n + 4 ; + x := y )) ; + (let y = !x lsr 2 in + if y <> 0 then ( + n := !n + 2 ; + x := y )) ; + if !x lsr 1 <> 0 then !n + 2 else !n + !x + let zero = 0 let small_enough z = @@ -74,6 +102,10 @@ let small_enough z = let mul_safe x = if small_enough x then Some x else None +(* If [x] is positive, shifting to the right will produce a number + which is positive and is less than [x]. *) +let shift_right x y = (x :> int) lsr y + let mul x y = (* assert (x >= 0 && y >= 0); *) match x with @@ -94,7 +126,7 @@ let scale_fast x y = let add x y = let z = x + y in - if z >= 0 then z else saturated + if Compare.Int.(z >= 0) then z else saturated let sub x y = Compare.Int.max (x - y) 0 diff --git a/src/proto_alpha/lib_protocol/saturation_repr.mli b/src/proto_alpha/lib_protocol/saturation_repr.mli index d7ce4484590d103c413f4059df28995b1a1a9b68..dbe0f8a2825d8f9ab49655efec75f549005dff77 100644 --- a/src/proto_alpha/lib_protocol/saturation_repr.mli +++ b/src/proto_alpha/lib_protocol/saturation_repr.mli @@ -70,7 +70,7 @@ val may_saturate : _ t -> may_saturate t val to_int : 'a t -> int (** 0 *) -val zero : mul_safe t +val zero : _ t (** 2^62 - 1 *) val saturated : may_saturate t @@ -96,13 +96,22 @@ val max : 'a t -> 'a t -> 'a t val compare : 'a t -> 'b t -> int +(** [numbits x] returns the number of bits used in the binary representation + of [x]. *) +val numbits : 'a t -> int + +(** [shift_right x y] behaves like a logical shift of [x] by [y] bits + to the right. [y] must be between 0 and 63. *) +val shift_right : 'a t -> int -> 'a t + (** [mul x y] behaves like multiplication between native integers as long as its result stay below [saturated]. Otherwise, [mul] returns [saturated]. *) val mul : _ t -> _ t -> may_saturate t (** [mul_safe x] returns a [mul_safe t] only if [x] does not trigger - overflows when multiplied with another [mul_safe t]. *) + overflows when multiplied with another [mul_safe t]. More precisely, + [x] is safe for fast multiplications if [x < 2147483648]. *) val mul_safe : _ t -> mul_safe t option (** [mul_fast x y] exploits the fact that [x] and [y] are known not to @@ -150,6 +159,13 @@ val of_int_opt : int -> may_saturate t option and [None] otherwise. *) val of_z_opt : Z.t -> may_saturate t option +(** [saturate_if_undef o] is [saturated] if [o] is [None] and [x] if [o = Some + x]. *) +val saturate_if_undef : may_saturate t option -> may_saturate t + +(** [safe_int x] is [of_int_opt x |> saturate_if_undef]. *) +val safe_int : int -> may_saturate t + (** [to_z z] is [Z.of_int]. *) val to_z : _ t -> Z.t diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index 95916b1367bd00cfba5bc2bdfc8c6584d0ea41f8..6349fcff75290c1008d80966ee6da33bd3790dc7 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -1,7 +1,7 @@ (*****************************************************************************) (* *) (* Open Source License *) -(* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) +(* Copyright (c) 2020 Dynamic Ledger Solutions, Inc. *) (* Copyright (c) 2020 Metastate AG *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) @@ -24,10 +24,79 @@ (* *) (*****************************************************************************) +(* + + This module implements an interpreter for Michelson. It takes the + form of a [step] function that interprets script instructions in a + dedicated abstract machine. + + The interpreter is written in a small-step style: an execution + [step] only interprets a single instruction by updating the + configuration of a dedicated abstract machine. + + This abstract machine has two components: + + - a stack to control which instructions must be executed ; and + + - a stack of values where instructions get their inputs and put + their outputs. + + In addition, the machine has access to effectful primitives to interact + with the execution environment (e.g. the tezos node). These primitives + live in the [Lwt+State+Error] monad. Hence, this interpreter produces + a computation in the [Lwt+State+Error] monad. + + This interpreter enjoys the following properties: + + - The interpreter is tail-recursive, hence it is robust to stack + overflow. This property is checked by the compiler thanks to the + [@ocaml.tailcall] annotation of each recursive calls. + + - The interpreter is type-preserving. Thanks to GADTs, the + typing rules of Michelson are statically checked by the OCaml + typechecker: a Michelson program cannot go wrong. + + - The interpreter is tagless. Thanks to GADTs, the exact shape + of the stack is known statically so the interpreter does not + have to check that the input stack has the shape expected by + the instruction to be executed. + + Outline + ======= + + This file is organized as follows: + + 1. Runtime errors: + The standard incantations to register the errors + that can be produced by this module's functions. + + 2. Gas accounting: + The function [cost_of_instr] assigns a gas consumption + to an instruction and a stack of values according to + the cost model. This function is used in the interpretation + loop. Several auxiliary functions are given to deal with + gas accounting. + + 3. Logging: + One can instrument the interpreter with logging functions. + + 4. Interpretation loop: + This is the main functionality of this module, aka the + [step] function. + + 5. Interface functions: + This part of the module builds high-level functions + on top the more basic [step] function. + + Implementation details are explained along the file. + +*) + open Alpha_context open Script open Script_typed_ir open Script_ir_translator +module S = Saturation_repr (* ---- Run-time errors -----------------------------------------------------*) @@ -130,428 +199,2049 @@ let () = "The returned storage was too big to be serialized with the provided gas" Data_encoding.empty (function Cannot_serialize_storage -> Some () | _ -> None) - (fun () -> Cannot_serialize_storage) ; - (* Michelson Stack Overflow *) - register_error_kind - `Permanent - ~id:"michelson_v1.interp_too_many_recursive_calls" - ~title:"Too many recursive calls during interpretation" - ~description: - "Too many recursive calls were needed for interpretation of a Michelson \ - script" - Data_encoding.empty - (function Michelson_too_many_recursive_calls -> Some () | _ -> None) - (fun () -> Michelson_too_many_recursive_calls) + (fun () -> Cannot_serialize_storage) -(* ---- interpreter ---------------------------------------------------------*) +(* -module Interp_costs = Michelson_v1_gas.Cost_of.Interpreter + Control stack + ============= -let rec interp_stack_prefix_preserving_operation : - type fbef bef faft aft result. - (fbef -> (faft * result) tzresult Lwt.t) -> - (fbef, faft, bef, aft) stack_prefix_preservation_witness -> - bef -> - (aft * result) tzresult Lwt.t = - fun f n stk -> - match (n, stk) with - | ( Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix - (Prefix (Prefix (Prefix (Prefix (Prefix n))))))))))))))), - ( v0, - ( v1, - ( v2, - ( v3, - ( v4, - ( v5, - ( v6, - (v7, (v8, (v9, (va, (vb, (vc, (vd, (ve, (vf, rest))))))))) - ) ) ) ) ) ) ) ) -> - interp_stack_prefix_preserving_operation f n rest - >|=? fun (rest', result) -> - ( ( v0, - ( v1, - ( v2, - ( v3, - ( v4, - ( v5, - ( v6, - ( v7, - (v8, (v9, (va, (vb, (vc, (vd, (ve, (vf, rest')))))))) - ) ) ) ) ) ) ) ), - result ) - | (Prefix (Prefix (Prefix (Prefix n))), (v0, (v1, (v2, (v3, rest))))) -> - interp_stack_prefix_preserving_operation f n rest - >|=? fun (rest', result) -> ((v0, (v1, (v2, (v3, rest')))), result) - | (Prefix n, (v, rest)) -> - interp_stack_prefix_preserving_operation f n rest - >|=? fun (rest', result) -> ((v, rest'), result) - | (Rest, v) -> - f v + The stack of control is a list of [kinstr]. This type is documented + in the module [Script_typed_ir]. -type step_constants = { - source : Contract.t; - payer : Contract.t; - self : Contract.t; - amount : Tez.t; - chain_id : Chain_id.t; -} + Since [kinstr] denotes a list of instructions, the stack of control + can be seen as a list of instruction sequences, each representing a + form of delimited continuation (i.e. a control stack fragment). The + [continuation] GADT ensures that the input and output stack types of the + continuations are consistent. -module type STEP_LOGGER = sig - val log_interp : - context -> ('bef, 'aft) Script_typed_ir.descr -> 'bef -> unit + Loops have a special treatment because their control stack is reused + as is during the next iteration. This avoids the reallocation of a + control stack cell at each iteration. - val log_entry : context -> ('bef, 'aft) Script_typed_ir.descr -> 'bef -> unit + Higher-order iterators (i.e. MAPs and ITERs) need internal instructions + to implement [step] as a tail-recursive function. Roughly speaking, + these instructions help in decomposing the execution of [I f c] + (where [I] is an higher-order iterator over a container [c]) into + three phases: to start the iteration, to execute [f] if there are + elements to be processed in [c], and to loop. - val log_exit : context -> ('bef, 'aft) Script_typed_ir.descr -> 'aft -> unit + Dip also has a dedicated constructor in the control stack. This + allows the stack prefix to be restored after the execution of the + [Dip]'s body. - val get_log : unit -> execution_trace option tzresult Lwt.t -end + Following the same style as in [kinstr], [continuation] has four + arguments, two for each stack types. More precisely, with -type logger = (module STEP_LOGGER) + [('bef_top, 'bef, 'aft_top, 'aft) continuation] -module No_trace : STEP_LOGGER = struct - let log_interp _ctxt _descr _stack = () + we encode the fact that the stack before executing the continuation + has type [('bef_top * 'bef)] and that the stack after this execution + has type [('aft_top * 'aft)]. - let log_entry _ctxt _descr _stack = () +*) +type (_, _, _, _) continuation = + | KNil : ('r, 'f, 'r, 'f) continuation + | KCons : + ('a, 's, 'b, 't) kinstr * ('b, 't, 'r, 'f) continuation + -> ('a, 's, 'r, 'f) continuation + | KReturn : + 's * ('a, 's, 'r, 'f) continuation + -> ('a, end_of_stack, 'r, 'f) continuation + | KUndip : + 'b * ('b, 'a * 's, 'r, 'f) continuation + -> ('a, 's, 'r, 'f) continuation + | KLoop_in : + ('a, 's, bool, 'a * 's) kinstr * ('a, 's, 'r, 'f) continuation + -> (bool, 'a * 's, 'r, 'f) continuation + | KLoop_in_left : + ('a, 's, ('a, 'b) union, 's) kinstr * ('b, 's, 'r, 'f) continuation + -> (('a, 'b) union, 's, 'r, 'f) continuation + | KIter : + ('a, 'b * 's, 'b, 's) kinstr * 'a list * ('b, 's, 'r, 'f) continuation + -> ('b, 's, 'r, 'f) continuation + | KList_mapping : + ('a, 'c * 's, 'b, 'c * 's) kinstr + * 'a list + * 'b list + * int + * ('b boxed_list, 'c * 's, 'r, 'f) continuation + -> ('c, 's, 'r, 'f) continuation + | KList_mapped : + ('a, 'c * 's, 'b, 'c * 's) kinstr + * 'a list + * 'b list + * int + * ('b boxed_list, 'c * 's, 'r, 'f) continuation + -> ('b, 'c * 's, 'r, 'f) continuation + | KMap_mapping : + ('a * 'b, 'd * 's, 'c, 'd * 's) kinstr + * ('a * 'b) list + * ('a, 'c) map + * (('a, 'c) map, 'd * 's, 'r, 'f) continuation + -> ('d, 's, 'r, 'f) continuation + | KMap_mapped : + ('a * 'b, 'd * 's, 'c, 'd * 's) kinstr + * ('a * 'b) list + * ('a, 'c) map + * 'a + * (('a, 'c) map, 'd * 's, 'r, 'f) continuation + -> ('c, 'd * 's, 'r, 'f) continuation - let log_exit _ctxt _descr _stack = () +(* - let get_log () = return_none -end + Computing the cost of Michelson instructions + ============================================ -let cost_of_instr : type b a. (b, a) descr -> b -> Gas.cost = - fun descr stack -> - match (descr.instr, stack) with - | (Drop, _) -> - Interp_costs.drop - | (Dup, _) -> - Interp_costs.dup - | (Swap, _) -> - Interp_costs.swap - | (Const _, _) -> - Interp_costs.push - | (Cons_some, _) -> - Interp_costs.cons_some - | (Cons_none _, _) -> - Interp_costs.cons_none - | (If_none _, _) -> - Interp_costs.if_none - | (Cons_pair, _) -> - Interp_costs.cons_pair - | (Unpair, _) -> - Interp_costs.unpair - | (Car, _) -> - Interp_costs.car - | (Cdr, _) -> - Interp_costs.cdr - | (Cons_left, _) -> - Interp_costs.cons_left - | (Cons_right, _) -> - Interp_costs.cons_right - | (If_left _, _) -> - Interp_costs.if_left - | (Cons_list, _) -> - Interp_costs.cons_list - | (Nil, _) -> - Interp_costs.nil - | (If_cons _, _) -> - Interp_costs.if_cons - | (List_map _, (list, _)) -> + The function [cost_of_instr] provides a cost model for Michelson + instructions. It is used by the interpreter to track the + consumption of gas. This consumption may depend on the values + on the stack. + + *) + +module Interp_costs = Michelson_v1_gas.Cost_of.Interpreter + +let cost_of_instr : type a s r f. (a, s, r, f) kinstr -> a -> s -> Gas.cost = + fun i accu stack -> + match i with + | IList_map _ -> + let list = accu in Interp_costs.list_map list - | (List_size, _) -> - Interp_costs.list_size - | (List_iter _, (l, _)) -> - Interp_costs.list_iter l - | (Empty_set _, _) -> - Interp_costs.empty_set - | (Set_iter _, (set, _)) -> + | IList_iter _ -> + let list = accu in + Interp_costs.list_iter list + | ISet_iter _ -> + let set = accu in Interp_costs.set_iter set - | (Set_mem, (v, (set, _))) -> + | ISet_mem _ -> + let v = accu and (set, _) = stack in Interp_costs.set_mem v set - | (Set_update, (v, (_, (set, _)))) -> + | ISet_update _ -> + let v = accu and (_, (set, _)) = stack in Interp_costs.set_update v set - | (Set_size, _) -> - Interp_costs.set_size - | (Empty_map _, _) -> - Interp_costs.empty_map - | (Map_map _, (map, _)) -> + | IMap_map _ -> + let map = accu in Interp_costs.map_map map - | (Map_iter _, (map, _)) -> + | IMap_iter _ -> + let map = accu in Interp_costs.map_iter map - | (Map_mem, (v, (map, _rest))) -> + | IMap_mem _ -> + let v = accu and (map, _) = stack in Interp_costs.map_mem v map - | (Map_get, (v, (map, _rest))) -> + | IMap_get _ -> + let v = accu and (map, _) = stack in Interp_costs.map_get v map - | (Map_update, (k, (_, (map, _)))) -> + | IMap_update _ -> + let k = accu and (_, (map, _)) = stack in Interp_costs.map_update k map - | (Map_get_and_update, (k, (_, (map, _)))) -> + | IMap_get_and_update _ -> + let k = accu and (_, (map, _)) = stack in Interp_costs.map_get_and_update k map - | (Map_size, _) -> - Interp_costs.map_size - | (Empty_big_map _, _) -> - Interp_costs.empty_map - | (Big_map_mem, (key, (map, _))) -> + | IBig_map_mem _ -> + let key = accu and (map, _) = stack in Interp_costs.map_mem key map.diff - | (Big_map_get, (key, (map, _))) -> + | IBig_map_get _ -> + let key = accu and (map, _) = stack in Interp_costs.map_get key map.diff - | (Big_map_update, (key, (_, (map, _)))) -> + | IBig_map_update _ -> + let key = accu and (_, (map, _)) = stack in Interp_costs.map_update key map.diff - | (Big_map_get_and_update, (key, (_, (map, _)))) -> + | IBig_map_get_and_update _ -> + let key = accu and (_, (map, _)) = stack in Interp_costs.map_get_and_update key map.diff - | (Add_seconds_to_timestamp, (n, (t, _))) -> + | IAdd_seconds_to_timestamp _ -> + let n = accu and (t, _) = stack in Interp_costs.add_seconds_timestamp n t - | (Add_timestamp_to_seconds, (t, (n, _))) -> + | IAdd_timestamp_to_seconds _ -> + let t = accu and (n, _) = stack in Interp_costs.add_seconds_timestamp n t - | (Sub_timestamp_seconds, (t, (n, _))) -> + | ISub_timestamp_seconds _ -> + let t = accu and (n, _) = stack in Interp_costs.sub_seconds_timestamp n t - | (Diff_timestamps, (t1, (t2, _))) -> + | IDiff_timestamps _ -> + let t1 = accu and (t2, _) = stack in Interp_costs.diff_timestamps t1 t2 - | (Concat_string_pair, (x, (y, _))) -> + | IConcat_string_pair _ -> + let x = accu and (y, _) = stack in Interp_costs.concat_string_pair x y - | (Concat_string, (ss, _)) -> + | IConcat_string _ -> + let ss = accu in Interp_costs.concat_string_precheck ss - | (Slice_string, (_offset, (_length, (s, _)))) -> + | ISlice_string _ -> + let (_, (s, _)) = stack in Interp_costs.slice_string s - | (String_size, _) -> - Interp_costs.string_size - | (Concat_bytes_pair, (x, (y, _))) -> + | IConcat_bytes_pair _ -> + let x = accu and (y, _) = stack in Interp_costs.concat_bytes_pair x y - | (Concat_bytes, (ss, _)) -> + | IConcat_bytes _ -> + let ss = accu in Interp_costs.concat_string_precheck ss - | (Slice_bytes, (_offset, (_length, (s, _)))) -> + | ISlice_bytes _ -> + let (_, (s, _)) = stack in Interp_costs.slice_bytes s - | (Bytes_size, _) -> - Interp_costs.bytes_size - | (Add_tez, _) -> - Interp_costs.add_tez - | (Sub_tez, _) -> - Interp_costs.sub_tez - | (Mul_teznat, (_, (n, _))) -> + | IMul_teznat _ -> + let (n, _) = stack in Interp_costs.mul_teznat n - | (Mul_nattez, (n, (_, _))) -> + | IMul_nattez _ -> + let n = accu in Interp_costs.mul_teznat n - | (Or, _) -> - Interp_costs.bool_or - | (And, _) -> - Interp_costs.bool_and - | (Xor, _) -> - Interp_costs.bool_xor - | (Not, _) -> - Interp_costs.bool_not - | (Is_nat, _) -> - Interp_costs.is_nat - | (Abs_int, (x, _)) -> + | IAbs_int _ -> + let x = accu in Interp_costs.abs_int x - | (Int_nat, _) -> - Interp_costs.int_nat - | (Neg_int, (x, _)) -> + | INeg_int _ -> + let x = accu in Interp_costs.neg_int x - | (Neg_nat, (x, _)) -> + | INeg_nat _ -> + let x = accu in Interp_costs.neg_nat x - | (Add_intint, (x, (y, _))) -> + | IAdd_intint _ -> + let x = accu and (y, _) = stack in Interp_costs.add_bigint x y - | (Add_intnat, (x, (y, _))) -> + | IAdd_intnat _ -> + let x = accu and (y, _) = stack in Interp_costs.add_bigint x y - | (Add_natint, (x, (y, _))) -> + | IAdd_natint _ -> + let x = accu and (y, _) = stack in Interp_costs.add_bigint x y - | (Add_natnat, (x, (y, _))) -> + | IAdd_natnat _ -> + let x = accu and (y, _) = stack in Interp_costs.add_bigint x y - | (Sub_int, (x, (y, _))) -> + | ISub_int _ -> + let x = accu and (y, _) = stack in Interp_costs.sub_bigint x y - | (Mul_intint, (x, (y, _))) -> + | IMul_intint _ -> + let x = accu and (y, _) = stack in Interp_costs.mul_bigint x y - | (Mul_intnat, (x, (y, _))) -> + | IMul_intnat _ -> + let x = accu and (y, _) = stack in Interp_costs.mul_bigint x y - | (Mul_natint, (x, (y, _))) -> + | IMul_natint _ -> + let x = accu and (y, _) = stack in Interp_costs.mul_bigint x y - | (Mul_natnat, (x, (y, _))) -> + | IMul_natnat _ -> + let x = accu and (y, _) = stack in Interp_costs.mul_bigint x y - | (Ediv_teznat, (x, (y, _))) -> + | IEdiv_teznat _ -> + let x = accu and (y, _) = stack in Interp_costs.ediv_teznat x y - | (Ediv_tez, _) -> - Interp_costs.ediv_tez - | (Ediv_intint, (x, (y, _))) -> + | IEdiv_intint _ -> + let x = accu and (y, _) = stack in Interp_costs.ediv_bigint x y - | (Ediv_intnat, (x, (y, _))) -> + | IEdiv_intnat _ -> + let x = accu and (y, _) = stack in Interp_costs.ediv_bigint x y - | (Ediv_natint, (x, (y, _))) -> + | IEdiv_natint _ -> + let x = accu and (y, _) = stack in Interp_costs.ediv_bigint x y - | (Ediv_natnat, (x, (y, _))) -> + | IEdiv_natnat _ -> + let x = accu and (y, _) = stack in Interp_costs.ediv_bigint x y - | (Lsl_nat, (x, _)) -> + | ILsl_nat _ -> + let x = accu in Interp_costs.lsl_nat x - | (Lsr_nat, (x, _)) -> + | ILsr_nat _ -> + let x = accu in Interp_costs.lsr_nat x - | (Or_nat, (x, (y, _))) -> + | IOr_nat _ -> + let x = accu and (y, _) = stack in Interp_costs.or_nat x y - | (And_nat, (x, (y, _))) -> + | IAnd_nat _ -> + let x = accu and (y, _) = stack in Interp_costs.and_nat x y - | (And_int_nat, (x, (y, _))) -> + | IAnd_int_nat _ -> + let x = accu and (y, _) = stack in Interp_costs.and_nat x y - | (Xor_nat, (x, (y, _))) -> + | IXor_nat _ -> + let x = accu and (y, _) = stack in Interp_costs.xor_nat x y - | (Not_int, (x, _)) -> + | INot_int _ -> + let x = accu in Interp_costs.not_nat x - | (Not_nat, (x, _)) -> + | INot_nat _ -> + let x = accu in Interp_costs.not_nat x - | (Seq _, _) -> - Interp_costs.seq - | (If _, _) -> + | ICompare (_, ty, _) -> + let a = accu and (b, _) = stack in + Interp_costs.compare ty a b + | ICheck_signature _ -> + let key = accu and (_, (message, _)) = stack in + Interp_costs.check_signature key message + | IHash_key _ -> + let pk = accu in + Interp_costs.hash_key pk + | IBlake2b _ -> + let bytes = accu in + Interp_costs.blake2b bytes + | ISha256 _ -> + let bytes = accu in + Interp_costs.sha256 bytes + | ISha512 _ -> + let bytes = accu in + Interp_costs.sha512 bytes + | IKeccak _ -> + let bytes = accu in + Interp_costs.keccak bytes + | ISha3 _ -> + let bytes = accu in + Interp_costs.sha3 bytes + | IPairing_check_bls12_381 _ -> + let pairs = accu in + Interp_costs.pairing_check_bls12_381 pairs + | ISapling_verify_update _ -> + let tx = accu in + let inputs = List.length tx.inputs in + let outputs = List.length tx.outputs in + Interp_costs.sapling_verify_update ~inputs ~outputs + | ISplit_ticket _ -> + let ticket = accu and ((amount_a, amount_b), _) = stack in + Interp_costs.split_ticket ticket.amount amount_a amount_b + | IJoin_tickets (_, ty, _) -> + let (ticket_a, ticket_b) = accu in + Interp_costs.join_tickets ty ticket_a ticket_b + | IHalt _ -> + (* FIXME *) + Gas.free + | IDrop _ -> + Interp_costs.drop + | IDup _ -> + Interp_costs.dup + | ISwap _ -> + Interp_costs.swap + | IConst _ -> + Interp_costs.push + | ICons_some _ -> + Interp_costs.cons_some + | ICons_none _ -> + Interp_costs.cons_none + | IIf_none _ -> + Interp_costs.if_none + | ICons_pair _ -> + Interp_costs.cons_pair + | IUnpair _ -> + Interp_costs.unpair + | ICar _ -> + Interp_costs.car + | ICdr _ -> + Interp_costs.cdr + | ICons_left _ -> + Interp_costs.cons_left + | ICons_right _ -> + Interp_costs.cons_right + | IIf_left _ -> + Interp_costs.if_left + | ICons_list _ -> + Interp_costs.cons_list + | INil _ -> + Interp_costs.nil + | IIf_cons _ -> + Interp_costs.if_cons + | IList_size _ -> + Interp_costs.list_size + | IEmpty_set _ -> + Interp_costs.empty_set + | ISet_size _ -> + Interp_costs.set_size + | IEmpty_map _ -> + Interp_costs.empty_map + | IMap_size _ -> + Interp_costs.map_size + | IEmpty_big_map _ -> + Interp_costs.empty_map + | IString_size _ -> + Interp_costs.string_size + | IBytes_size _ -> + Interp_costs.bytes_size + | IAdd_tez _ -> + Interp_costs.add_tez + | ISub_tez _ -> + Interp_costs.sub_tez + | IOr _ -> + Interp_costs.bool_or + | IAnd _ -> + Interp_costs.bool_and + | IXor _ -> + Interp_costs.bool_xor + | INot _ -> + Interp_costs.bool_not + | IIs_nat _ -> + Interp_costs.is_nat + | IInt_nat _ -> + Interp_costs.int_nat + | IInt_bls12_381_fr _ -> + Interp_costs.int_bls12_381_fr + | IEdiv_tez _ -> + Interp_costs.ediv_tez + | IIf _ -> Interp_costs.if_ - | (Loop _, _) -> + | ILoop _ -> Interp_costs.loop - | (Loop_left _, _) -> + | ILoop_left _ -> Interp_costs.loop_left - | (Dip _, _) -> + | IDip _ -> Interp_costs.dip - | (Exec, _) -> + | IExec _ -> Interp_costs.exec - | (Apply _, _) -> + | IApply _ -> Interp_costs.apply - | (Lambda _, _) -> + | ILambda _ -> Interp_costs.push - | (Failwith _, _) -> + | IFailwith _ -> Gas.free - | (Nop, _) -> + | INop _ -> Interp_costs.nop - | (Compare ty, (a, (b, _))) -> - Interp_costs.compare ty a b - | (Eq, _) -> + | IEq _ -> Interp_costs.neq - | (Neq, _) -> + | INeq _ -> Interp_costs.neq - | (Lt, _) -> + | ILt _ -> Interp_costs.neq - | (Le, _) -> + | ILe _ -> Interp_costs.neq - | (Gt, _) -> + | IGt _ -> Interp_costs.neq - | (Ge, _) -> + | IGe _ -> Interp_costs.neq - | (Pack _, _) -> + | IPack _ -> Gas.free - | (Unpack _, _) -> + | IUnpack _ -> Gas.free - | (Address, _) -> + | IAddress _ -> Interp_costs.address - | (Contract _, _) -> + | IContract _ -> Interp_costs.contract - | (Transfer_tokens, _) -> + | ITransfer_tokens _ -> Interp_costs.transfer_tokens - | (Implicit_account, _) -> + | IImplicit_account _ -> Interp_costs.implicit_account - | (Set_delegate, _) -> + | ISet_delegate _ -> Interp_costs.set_delegate - | (Balance, _) -> + | IBalance _ -> Interp_costs.balance - | (Level, _) -> + | ILevel _ -> Interp_costs.level - | (Now, _) -> + | INow _ -> Interp_costs.now - | (Check_signature, (key, (_, (message, _)))) -> - Interp_costs.check_signature key message - | (Hash_key, (pk, _)) -> - Interp_costs.hash_key pk - | (Blake2b, (bytes, _)) -> - Interp_costs.blake2b bytes - | (Sha256, (bytes, _)) -> - Interp_costs.sha256 bytes - | (Sha512, (bytes, _)) -> - Interp_costs.sha512 bytes - | (Source, _) -> + | ISapling_empty_state _ -> + Interp_costs.sapling_empty_state + | ISource _ -> Interp_costs.source - | (Sender, _) -> + | ISender _ -> Interp_costs.source - | (Self _, _) -> + | ISelf _ -> Interp_costs.self - | (Self_address, _) -> + | ISelf_address _ -> Interp_costs.self - | (Amount, _) -> + | IAmount _ -> Interp_costs.amount - | (Dig (n, _), _) -> + | IDig (_, n, _, _) -> Interp_costs.dign n - | (Dug (n, _), _) -> + | IDug (_, n, _, _) -> Interp_costs.dugn n - | (Dipn (n, _, _), _) -> + | IDipn (_, n, _, _, _) -> Interp_costs.dipn n - | (Dropn (n, _), _) -> + | IDropn (_, n, _, _) -> Interp_costs.dropn n - | (ChainId, _) -> + | IChainId _ -> Interp_costs.chain_id - | (Create_contract _, _) -> + | ICreate_contract _ -> Interp_costs.create_contract - | (Never, (_, _)) -> - . - | (Voting_power, _) -> + | INever _ -> + Gas.free + | IVoting_power _ -> Interp_costs.voting_power - | (Total_voting_power, _) -> + | ITotal_voting_power _ -> Interp_costs.total_voting_power - | (Keccak, (bytes, _)) -> - Interp_costs.keccak bytes - | (Sha3, (bytes, _)) -> - Interp_costs.sha3 bytes - | (Add_bls12_381_g1, _) -> + | IAdd_bls12_381_g1 _ -> Interp_costs.add_bls12_381_g1 - | (Add_bls12_381_g2, _) -> + | IAdd_bls12_381_g2 _ -> Interp_costs.add_bls12_381_g2 - | (Add_bls12_381_fr, _) -> + | IAdd_bls12_381_fr _ -> Interp_costs.add_bls12_381_fr - | (Mul_bls12_381_g1, _) -> + | IMul_bls12_381_g1 _ -> Interp_costs.mul_bls12_381_g1 - | (Mul_bls12_381_g2, _) -> + | IMul_bls12_381_g2 _ -> Interp_costs.mul_bls12_381_g2 - | (Mul_bls12_381_fr, _) -> + | IMul_bls12_381_fr _ -> Interp_costs.mul_bls12_381_fr - | (Mul_bls12_381_fr_z, _) -> - Interp_costs.mul_bls12_381_fr_z - | (Mul_bls12_381_z_fr, _) -> - Interp_costs.mul_bls12_381_fr_z - | (Int_bls12_381_fr, _) -> - Interp_costs.int_bls12_381_fr - | (Neg_bls12_381_g1, _) -> + | INeg_bls12_381_g1 _ -> Interp_costs.neg_bls12_381_g1 - | (Neg_bls12_381_g2, _) -> + | INeg_bls12_381_g2 _ -> Interp_costs.neg_bls12_381_g2 - | (Neg_bls12_381_fr, _) -> + | INeg_bls12_381_fr _ -> Interp_costs.neg_bls12_381_fr - | (Pairing_check_bls12_381, (pairs, _)) -> - Interp_costs.pairing_check_bls12_381 pairs - | (Comb (n, _), _) -> + | IMul_bls12_381_fr_z _ -> + Interp_costs.mul_bls12_381_fr_z + | IMul_bls12_381_z_fr _ -> + Interp_costs.mul_bls12_381_fr_z + | IDup_n (_, n, _, _) -> + Interp_costs.dupn n + | IComb (_, n, _, _) -> Interp_costs.comb n - | (Uncomb (n, _), _) -> + | IUncomb (_, n, _, _) -> Interp_costs.uncomb n - | (Comb_get (n, _), _) -> + | IComb_get (_, n, _, _) -> Interp_costs.comb_get n - | (Comb_set (n, _), _) -> + | IComb_set (_, n, _, _) -> Interp_costs.comb_set n - | (Dup_n (n, _), _) -> - Interp_costs.dupn n - | (Sapling_empty_state _, _) -> - Interp_costs.sapling_empty_state - | (Sapling_verify_update, (tx, _)) -> - let inputs = List.length tx.inputs in - let outputs = List.length tx.outputs in - Interp_costs.sapling_verify_update ~inputs ~outputs - | (Ticket, _) -> + | ITicket _ -> Interp_costs.ticket - | (Read_ticket, _) -> + | IRead_ticket _ -> Interp_costs.read_ticket - | (Split_ticket, (ticket, ((amount_a, amount_b), _))) -> - Interp_costs.split_ticket ticket.amount amount_a amount_b - | (Join_tickets ty, ((ticket_a, ticket_b), _)) -> - Interp_costs.join_tickets ty ticket_a ticket_b + [@@ocaml.inline always] + +let cost_of_control : type a s r f. (a, s, r, f) continuation -> Gas.cost = + fun ks -> + match ks with + | KNil -> + Gas.free + | KCons (_, _) -> + Gas.free + | KReturn _ -> + Gas.free + | KUndip (_, _) -> + Gas.free + | KLoop_in (_, _) -> + Gas.free + | KLoop_in_left (_, _) -> + Gas.free + | KIter (_, _, _) -> + Gas.free + | KList_mapping (_, _, _, _, _) -> + Gas.free + | KList_mapped (_, _, _, _, _) -> + Gas.free + | KMap_mapping (_, _, _, _) -> + Gas.free + | KMap_mapped (_, _, _, _, _) -> + Gas.free + +(* + + Gas update and check for gas exhaustion + ======================================= + + Each instruction has a cost. The runtime subtracts this cost + to an amount of gas made available for the script execution. + + Updating the gas counter is a critical aspect to Michelson + execution because it is done at each execution step. + + For this reason, the interpreter must read and update the + gas counter as quickly as possible. Hence, the gas counter + should be stored in a machine register. To motivate the + OCaml compiler to make that choice, we represent the gas + counter as a local parameter of the execution [step] + function. + +*) + +type local_gas_counter = int + +(* + + The gas counter stored in the context is desynchronized with the + [local_gas_counter] used in the interpretation loop. When we have + to call a gas-consuming function which lives outside the + interpreter, we must update the context so that it carries an + up-to-date gas counter. Similarly, when we return from such a + function, the [local_gas_counter] must be updated as well. + + To statically track these points where the context's gas counter + must be updated, we introduce a type for outdated contexts. The + [step] function carries an [outdated_context]. When an external + function needs a [context], the typechecker points out the need for + a conversion: this forces us to either call [update_context], or + better, when this is possible, the function + [use_gas_counter_in_ctxt]. + +*) +type outdated_context = OutDatedContext of context [@@unboxed] + +let update_context local_gas_counter = function + | OutDatedContext ctxt -> + Gas.update_gas_counter ctxt (Saturation_repr.safe_int local_gas_counter) + [@@ocaml.inline always] + +let update_local_gas_counter ctxt = + (Gas.gas_counter ctxt :> int) + [@@ocaml.inline always] + +let outdated ctxt = OutDatedContext ctxt [@@ocaml.inline always] + +let outdated_context (OutDatedContext ctxt) = ctxt [@@ocaml.inline always] + +let use_gas_counter_in_ctxt ctxt local_gas_counter f = + let ctxt = update_context local_gas_counter ctxt in + f ctxt + >>=? fun (y, ctxt) -> return (y, outdated ctxt, update_local_gas_counter ctxt) + [@@ocaml.inline always] -let unpack ctxt ~ty ~bytes = +(* + + [step] calls [consume] at the beginning of each execution step. + + [consume'] is used in the implementation of [IConcat_string] + and [IConcat_bytes] because in that special cases, the cost + is expressed with respec to the final result of the concatenation. + +*) + +let update_and_check gas_counter cost = + let gas_counter = gas_counter - cost in + if Compare.Int.(gas_counter < 0) then None else Some gas_counter + [@@ocaml.inline always] + +let consume local_gas_counter k accu stack = + let cost = cost_of_instr k accu stack in + update_and_check local_gas_counter (cost :> int) + [@@ocaml.inline always] + +let consume' ctxt local_gas_counter cost = + match update_and_check local_gas_counter cost with + | None -> + Gas.gas_exhausted_error (update_context local_gas_counter ctxt) + | Some local_gas_counter -> + Ok local_gas_counter + [@@ocaml.inline always] + +let consume_control local_gas_counter ks = + let cost = cost_of_control ks in + update_and_check local_gas_counter (cost :> int) + [@@ocaml.inline always] + +(* + + Execution instrumentation + ========================= + + One can observe the context and the stack at some specific + points of an execution step. This feature is implemented by + calling back some [logging_function]s defined in a first + class module [STEP_LOGGER] passed as argument to the step + function. The interface documentation describes the points + where these functions are called. + +*) +type ('a, 's, 'b, 'f, 'c, 'u) logging_function = + ('a, 's, 'b, 'f) kinstr -> + context -> + Script.location -> + ('c, 'u) stack_ty -> + 'c * 'u -> + unit + +module type STEP_LOGGER = sig + val log_interp : ('a, 's, 'b, 'f, 'c, 'u) logging_function + + val log_entry : ('a, 's, 'b, 'f, 'a, 's) logging_function + + val log_control : ('a, 's, 'b, 'f) continuation -> unit + + val log_exit : ('a, 's, 'b, 'f, 'c, 'u) logging_function + + val get_log : unit -> execution_trace option tzresult Lwt.t +end + +type logger = (module STEP_LOGGER) + +let log_entry (logger : logger) ctxt gas k accu stack = + let module Log = (val logger) in + let kinfo = kinfo_of_kinstr k in + let ctxt = update_context gas ctxt in + Log.log_entry k ctxt kinfo.iloc kinfo.kstack_ty (accu, stack) + +let log_exit (logger : logger) ctxt gas kprev k accu stack = + let module Log = (val logger) in + let ctxt = update_context gas ctxt in + let kinfo_prev = kinfo_of_kinstr kprev and kinfo = kinfo_of_kinstr k in + Log.log_exit k ctxt kinfo_prev.iloc kinfo.kstack_ty (accu, stack) + +let log_control (logger : logger) ks = + let module Log = (val logger) in + Log.log_control ks + +let get_log (logger : logger option) = + match logger with + | None -> + Lwt.return (Ok None) + | Some logger -> + let module Log = (val logger) in + Log.get_log () + [@@ocaml.inline always] + +(* + + Interpretation loop + =================== + +*) + +(* + + The interpreter is parameterized by a small set of values. + +*) +type step_constants = { + source : Contract.t; + payer : Contract.t; + self : Contract.t; + amount : Tez.t; + chain_id : Chain_id.t; +} + +let rec interp_stack_prefix_preserving_operation : + type a s b t c u d w result. + (a -> s -> (b * t) * result) -> + (a, s, b, t, c, u, d, w) stack_prefix_preservation_witness -> + c -> + u -> + (d * w) * result = + fun f n accu stk -> + match (n, stk) with + | (KPrefix (_, n), rest) -> + interp_stack_prefix_preserving_operation f n (fst rest) (snd rest) + |> fun ((v, rest'), result) -> ((accu, (v, rest')), result) + | (KRest, v) -> + f accu v + +(* + + As announced earlier, the step function produces a computation in + the [Lwt+State+Error] monad. The [State] monad is implemented by + having the [context] passed as input and returned updated as + output. The [Error] monad is represented by the [tzresult] type + constructor. + + The [step] function is actually defined as an internal + tail-recursive routine of the toplevel [step]. It monitors the gas + level before executing the instruction under focus, once this is + done, it recursively calls itself on the continuation held by the + current instruction. + + For each pure instruction (i.e. that is not monadic), the + interpretation simply updates the input arguments of the [step] + function. Since these arguments are (most likely) stored in + hardware registers and since the tail-recursive calls are compiled + into direct jumps, this interpretation technique offers good + performances while saving safety thanks to a rich typing. + + For each impure instruction, the interpreter makes use of monadic + bindings to compose monadic primitives with the [step] function. + Again, we make sure that the recursive calls to [step] are tail + calls by annotating them with [@ocaml.tailcall]. + +*) +let rec run_descr : + type a s r f. + logger option -> + context * step_constants -> + (a, s, r, f) kdescr -> + a -> + s -> + (r * f * context) tzresult Lwt.t = + fun logger (ctxt, sc) descr accu stack -> + let gas = (Gas.gas_counter ctxt :> int) in + step logger (outdated ctxt, sc) gas descr.kinstr KNil accu stack + >>=? fun (accu, stack, ctxt, gas) -> + return (accu, stack, update_context gas ctxt) + +and run : + type a a' s s' b t b' t' r f. + logger option -> + outdated_context * step_constants -> + local_gas_counter -> + (a', s', b', t') kinstr -> + (a, s, b, t) kinstr -> + (b, t, r, f) continuation -> + a -> + s -> + (r * f * outdated_context * local_gas_counter) tzresult Lwt.t = + fun logger g gas k k' ks accu stack -> + ( match logger with + | None -> + () + | Some logger -> + let (ctxt, _) = g in + log_exit logger ctxt gas k k' accu stack ) ; + (step [@ocaml.tailcall]) logger g gas k' ks accu stack + [@@inline.always] + +and next : + type a s r f. + logger option -> + outdated_context * step_constants -> + local_gas_counter -> + (a, s, r, f) continuation -> + a -> + s -> + (r * f * outdated_context * local_gas_counter) tzresult Lwt.t = + fun logger ((ctxt, _) as g) gas ks0 accu stack -> + (match logger with None -> () | Some logger -> log_control logger ks0) ; + match ks0 with + | KNil -> + Lwt.return (Ok (accu, stack, ctxt, gas)) + | KCons (k, ks) -> + (step [@ocaml.tailcall]) logger g gas k ks accu stack + | KLoop_in (ki, ks') -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> + let (accu', stack') = stack in + if accu then (step [@ocaml.tailcall]) logger g gas ki ks0 accu' stack' + else (next [@ocaml.tailcall]) logger g gas ks' accu' stack' ) + | KReturn (stack', ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> + next logger g gas ks accu stack' ) + | KLoop_in_left (ki, ks') -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> ( + match accu with + | L v -> + (step [@ocaml.tailcall]) logger g gas ki ks0 v stack + | R v -> + (next [@ocaml.tailcall]) logger g gas ks' v stack ) ) + | KUndip (x, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> + next logger g gas ks x (accu, stack) ) + | KIter (body, xs, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> ( + match xs with + | [] -> + next logger g gas ks accu stack + | x :: xs -> + let ks = KIter (body, xs, ks) in + (step [@ocaml.tailcall]) logger g gas body ks x (accu, stack) ) ) + | KList_mapping (body, xs, ys, len, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> ( + match xs with + | [] -> + let ys = {elements = List.rev ys; length = len} in + next logger g gas ks ys (accu, stack) + | x :: xs -> + let ks = KList_mapped (body, xs, ys, len, ks) in + (step [@ocaml.tailcall]) logger g gas body ks x (accu, stack) ) ) + | KList_mapped (body, xs, ys, len, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> + let ks = KList_mapping (body, xs, accu :: ys, len, ks) in + let (accu, stack) = stack in + next logger g gas ks accu stack ) + | KMap_mapping (body, xs, ys, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> ( + match xs with + | [] -> + next logger g gas ks ys (accu, stack) + | (xk, xv) :: xs -> + let ks = KMap_mapped (body, xs, ys, xk, ks) in + let res = (xk, xv) in + let stack = (accu, stack) in + (step [@ocaml.tailcall]) logger g gas body ks res stack ) ) + | KMap_mapped (body, xs, ys, yk, ks) -> ( + match consume_control gas ks0 with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> + let ys = map_update yk (Some accu) ys in + let ks = KMap_mapping (body, xs, ys, ks) in + let (accu, stack) = stack in + next logger g gas ks accu stack ) + +and step : + type a s b t r f. + logger option -> + outdated_context * step_constants -> + local_gas_counter -> + (a, s, b, t) kinstr -> + (b, t, r, f) continuation -> + a -> + s -> + (r * f * outdated_context * local_gas_counter) tzresult Lwt.t = + fun logger ((ctxt, sc) as g) gas i ks accu stack -> + match consume gas i accu stack with + | None -> + Lwt.return (Gas.gas_exhausted_error (update_context gas ctxt)) + | Some gas -> ( + ( match logger with + | None -> + () + | Some logger -> + log_entry logger ctxt gas i accu stack ) ; + match i with + | IHalt _ -> + next logger g gas ks accu stack + (* stack ops *) + | IDrop (_, k) -> + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IDup (_, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks accu (accu, stack) + | ISwap (_, k) -> + let (top, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks top (accu, stack) + | IConst (_, v, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks v (accu, stack) + (* options *) + | ICons_some (_, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks (Some accu) stack + | ICons_none (_, _, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks None (accu, stack) + | IIf_none (_, bt, bf) -> ( + match accu with + | None -> + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i bt ks accu stack + | Some v -> + (run [@ocaml.tailcall]) logger g gas i bf ks v stack ) + (* pairs *) + | ICons_pair (_, k) -> + let (b, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks (accu, b) stack + | IUnpair (_, k) -> + let (a, b) = accu in + (run [@ocaml.tailcall]) logger g gas i k ks a (b, stack) + | ICar (_, k) -> + let (a, _) = accu in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | ICdr (_, k) -> + let (_, b) = accu in + (run [@ocaml.tailcall]) logger g gas i k ks b stack + (* unions *) + | ICons_left (_, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks (L accu) stack + | ICons_right (_, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks (R accu) stack + | IIf_left (_, bl, br) -> ( + match accu with + | L v -> + (run [@ocaml.tailcall]) logger g gas i bl ks v stack + | R v -> + (run [@ocaml.tailcall]) logger g gas i br ks v stack ) + (* lists *) + | ICons_list (_, k) -> + let (tl, stack) = stack in + let accu = list_cons accu tl in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | INil (_, k) -> + let stack = (accu, stack) in + let accu = list_empty in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IIf_cons (_, bc, bn) -> ( + match accu.elements with + | [] -> + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i bn ks accu stack + | hd :: tl -> + let tl = {elements = tl; length = accu.length - 1} in + (run [@ocaml.tailcall]) logger g gas i bc ks hd (tl, stack) ) + | IList_map (_, body, k) -> + let xs = accu.elements in + let ys = [] in + let len = accu.length in + let ks = KList_mapping (body, xs, ys, len, KCons (k, ks)) in + let (accu, stack) = stack in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | IList_size (_, k) -> + let list = accu in + let len = Script_int.(abs (of_int list.length)) in + (run [@ocaml.tailcall]) logger g gas i k ks len stack + | IList_iter (_, body, k) -> + let xs = accu.elements in + let ks = KIter (body, xs, KCons (k, ks)) in + let (accu, stack) = stack in + (next [@ocaml.tailcall]) logger g gas ks accu stack + (* sets *) + | IEmpty_set (_, ty, k) -> + let res = empty_set ty in + let stack = (accu, stack) in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ISet_iter (_, body, k) -> + let set = accu in + let l = List.rev (set_fold (fun e acc -> e :: acc) set []) in + let ks = KIter (body, l, KCons (k, ks)) in + let (accu, stack) = stack in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | ISet_mem (_, k) -> + let (set, stack) = stack in + let res = set_mem accu set in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ISet_update (_, k) -> + let (presence, (set, stack)) = stack in + let res = set_update accu presence set in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ISet_size (_, k) -> + let res = set_size accu in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + (* maps *) + | IEmpty_map (_, ty, _, k) -> + let res = empty_map ty and stack = (accu, stack) in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMap_map (_, body, k) -> + let map = accu in + let xs = List.rev (map_fold (fun k v a -> (k, v) :: a) map []) in + let ys = empty_map (map_key_ty map) in + let ks = KMap_mapping (body, xs, ys, KCons (k, ks)) in + let (accu, stack) = stack in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | IMap_iter (_, body, k) -> + let map = accu in + let l = List.rev (map_fold (fun k v a -> (k, v) :: a) map []) in + let ks = KIter (body, l, KCons (k, ks)) in + let (accu, stack) = stack in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | IMap_mem (_, k) -> + let (map, stack) = stack in + let res = map_mem accu map in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMap_get (_, k) -> + let (map, stack) = stack in + let res = map_get accu map in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMap_update (_, k) -> + let (v, (map, stack)) = stack in + let key = accu in + let res = map_update key v map in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMap_get_and_update (_, k) -> + let key = accu in + let (v, (map, rest)) = stack in + let map' = map_update key v map in + let v' = map_get key map in + (run [@ocaml.tailcall]) logger g gas i k ks v' (map', rest) + | IMap_size (_, k) -> + let res = map_size accu in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + (* Big map operations *) + | IEmpty_big_map (_, tk, tv, k) -> + let ebm = Script_ir_translator.empty_big_map tk tv in + (run [@ocaml.tailcall]) logger g gas i k ks ebm (accu, stack) + | IBig_map_mem (_, k) -> + let (map, stack) = stack in + let key = accu in + ( use_gas_counter_in_ctxt ctxt gas + @@ fun ctxt -> Script_ir_translator.big_map_mem ctxt key map ) + >>=? fun (res, ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks res stack + | IBig_map_get (_, k) -> + let (map, stack) = stack in + let key = accu in + ( use_gas_counter_in_ctxt ctxt gas + @@ fun ctxt -> Script_ir_translator.big_map_get ctxt key map ) + >>=? fun (res, ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks res stack + | IBig_map_update (_, k) -> + let key = accu in + let (maybe_value, (map, stack)) = stack in + let big_map = + Script_ir_translator.big_map_update key maybe_value map + in + (run [@ocaml.tailcall]) logger g gas i k ks big_map stack + | IBig_map_get_and_update (_, k) -> + let key = accu in + let (v, (map, stack)) = stack in + let map' = Script_ir_translator.big_map_update key v map in + ( use_gas_counter_in_ctxt ctxt gas + @@ fun ctxt -> Script_ir_translator.big_map_get ctxt key map ) + >>=? fun (v', ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks v' (map', stack) + (* timestamp operations *) + | IAdd_seconds_to_timestamp (_, k) -> + let n = accu in + let (t, stack) = stack in + let result = Script_timestamp.add_delta t n in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | IAdd_timestamp_to_seconds (_, k) -> + let t = accu in + let (n, stack) = stack in + let result = Script_timestamp.add_delta t n in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | ISub_timestamp_seconds (_, k) -> + let t = accu in + let (s, stack) = stack in + let result = Script_timestamp.sub_delta t s in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | IDiff_timestamps (_, k) -> + let t1 = accu in + let (t2, stack) = stack in + let result = Script_timestamp.diff t1 t2 in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + (* string operations *) + | IConcat_string_pair (_, k) -> + let x = accu in + let (y, stack) = stack in + let s = String.concat "" [x; y] in + (run [@ocaml.tailcall]) logger g gas i k ks s stack + | IConcat_string (_, k) -> + let ss = accu in + (* The cost for this fold_left has been paid upfront *) + let total_length = + List.fold_left + (fun acc s -> S.add acc (S.safe_int (String.length s))) + (S.zero |> S.may_saturate) + accu.elements + in + consume' ctxt gas (Interp_costs.concat_string total_length :> int) + >>?= fun gas -> + let s = String.concat "" ss.elements in + (run [@ocaml.tailcall]) logger g gas i k ks s stack + | ISlice_string (_, k) -> + let offset = accu and (length, (s, stack)) = stack in + let s_length = Z.of_int (String.length s) in + let offset = Script_int.to_zint offset in + let length = Script_int.to_zint length in + if Compare.Z.(offset < s_length && Z.add offset length <= s_length) + then + let s = String.sub s (Z.to_int offset) (Z.to_int length) in + (run [@ocaml.tailcall]) logger g gas i k ks (Some s) stack + else (run [@ocaml.tailcall]) logger g gas i k ks None stack + | IString_size (_, k) -> + let s = accu in + let result = Script_int.(abs (of_int (String.length s))) in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + (* bytes operations *) + | IConcat_bytes_pair (_, k) -> + let x = accu in + let (y, stack) = stack in + let s = Bytes.cat x y in + (run [@ocaml.tailcall]) logger g gas i k ks s stack + | IConcat_bytes (_, k) -> + let ss = accu in + (* The cost for this fold_left has been paid upfront *) + let total_length = + List.fold_left + (fun acc s -> S.add acc (S.safe_int (Bytes.length s))) + (S.zero |> S.may_saturate) + accu.elements + in + consume' ctxt gas (Interp_costs.concat_string total_length :> int) + >>?= fun gas -> + let s = Bytes.concat Bytes.empty ss.elements in + (run [@ocaml.tailcall]) logger g gas i k ks s stack + | ISlice_bytes (_, k) -> + let offset = accu and (length, (s, stack)) = stack in + let s_length = Z.of_int (Bytes.length s) in + let offset = Script_int.to_zint offset in + let length = Script_int.to_zint length in + if Compare.Z.(offset < s_length && Z.add offset length <= s_length) + then + let s = Bytes.sub s (Z.to_int offset) (Z.to_int length) in + (run [@ocaml.tailcall]) logger g gas i k ks (Some s) stack + else (run [@ocaml.tailcall]) logger g gas i k ks None stack + | IBytes_size (_, k) -> + let s = accu in + let result = Script_int.(abs (of_int (Bytes.length s))) in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + (* currency operations *) + | IAdd_tez (_, k) -> + let x = accu in + let (y, stack) = stack in + Tez.(x +? y) + >>?= fun res -> (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ISub_tez (_, k) -> + let x = accu in + let (y, stack) = stack in + Tez.(x -? y) + >>?= fun res -> (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_teznat (kinfo, k) -> ( + let x = accu in + let (y, stack) = stack in + match Script_int.to_int64 y with + | None -> + get_log logger >>=? fun log -> fail (Overflow (kinfo.iloc, log)) + | Some y -> + Tez.(x *? y) + >>?= fun res -> + (run [@ocaml.tailcall]) logger g gas i k ks res stack ) + | IMul_nattez (kinfo, k) -> ( + let y = accu in + let (x, stack) = stack in + match Script_int.to_int64 y with + | None -> + get_log logger >>=? fun log -> fail (Overflow (kinfo.iloc, log)) + | Some y -> + Tez.(x *? y) + >>?= fun res -> + (run [@ocaml.tailcall]) logger g gas i k ks res stack ) + (* boolean operations *) + | IOr (_, k) -> + let x = accu in + let (y, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks (x || y) stack + | IAnd (_, k) -> + let x = accu in + let (y, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks (x && y) stack + | IXor (_, k) -> + let x = accu in + let (y, stack) = stack in + let res = Compare.Bool.(x <> y) in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INot (_, k) -> + let x = accu in + (run [@ocaml.tailcall]) logger g gas i k ks (not x) stack + (* integer operations *) + | IIs_nat (_, k) -> + let x = accu in + let res = Script_int.is_nat x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAbs_int (_, k) -> + let x = accu in + let res = Script_int.abs x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IInt_nat (_, k) -> + let x = accu in + let res = Script_int.int x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INeg_int (_, k) -> + let x = accu in + let res = Script_int.neg x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INeg_nat (_, k) -> + let x = accu in + let res = Script_int.neg x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAdd_intint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAdd_intnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAdd_natint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAdd_natnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.add_n x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ISub_int (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.sub x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_intint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_intnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_natint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_natnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.mul_n x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IEdiv_teznat (_, k) -> + let x = accu and (y, stack) = stack in + let x = Script_int.of_int64 (Tez.to_mutez x) in + let result = + match Script_int.ediv x y with + | None -> + None + | Some (q, r) -> ( + match (Script_int.to_int64 q, Script_int.to_int64 r) with + | (Some q, Some r) -> ( + match (Tez.of_mutez q, Tez.of_mutez r) with + | (Some q, Some r) -> + Some (q, r) + (* Cannot overflow *) + | _ -> + assert false ) + (* Cannot overflow *) + | _ -> + assert false ) + in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | IEdiv_tez (_, k) -> + let x = accu and (y, stack) = stack in + let x = Script_int.abs (Script_int.of_int64 (Tez.to_mutez x)) in + let y = Script_int.abs (Script_int.of_int64 (Tez.to_mutez y)) in + let result = + match Script_int.ediv_n x y with + | None -> + None + | Some (q, r) -> ( + match Script_int.to_int64 r with + | None -> + assert false (* Cannot overflow *) + | Some r -> ( + match Tez.of_mutez r with + | None -> + assert false (* Cannot overflow *) + | Some r -> + Some (q, r) ) ) + in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | IEdiv_intint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.ediv x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IEdiv_intnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.ediv x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IEdiv_natint (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.ediv x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IEdiv_natnat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.ediv_n x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ILsl_nat (kinfo, k) -> ( + let x = accu and (y, stack) = stack in + match Script_int.shift_left_n x y with + | None -> + get_log logger >>=? fun log -> fail (Overflow (kinfo.iloc, log)) + | Some x -> + (run [@ocaml.tailcall]) logger g gas i k ks x stack ) + | ILsr_nat (kinfo, k) -> ( + let x = accu and (y, stack) = stack in + match Script_int.shift_right_n x y with + | None -> + get_log logger >>=? fun log -> fail (Overflow (kinfo.iloc, log)) + | Some r -> + (run [@ocaml.tailcall]) logger g gas i k ks r stack ) + | IOr_nat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.logor x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAnd_nat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.logand x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IAnd_int_nat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.logand x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IXor_nat (_, k) -> + let x = accu and (y, stack) = stack in + let res = Script_int.logxor x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INot_int (_, k) -> + let x = accu in + let res = Script_int.lognot x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INot_nat (_, k) -> + let x = accu in + let res = Script_int.lognot x in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + (* control *) + | IIf (_, bt, bf) -> + let (res, stack) = stack in + if accu then (run [@ocaml.tailcall]) logger g gas i bt ks res stack + else (run [@ocaml.tailcall]) logger g gas i bf ks res stack + | ILoop (_, body, k) -> + let ks = KLoop_in (body, KCons (k, ks)) in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | ILoop_left (_, bl, br) -> + let ks = KLoop_in_left (bl, KCons (br, ks)) in + (next [@ocaml.tailcall]) logger g gas ks accu stack + | IDip (_, _, b, k) -> + let ign = accu in + let ks = KUndip (ign, KCons (k, ks)) in + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i b ks accu stack + | IExec (_, k) -> + let arg = accu and (code, stack) = stack in + let (Lam (code, _)) = code in + let code = code.kinstr in + let ks = KReturn (stack, KCons (k, ks)) in + (run [@ocaml.tailcall]) logger g gas i code ks arg ((), ()) + | IApply (_, capture_ty, k) -> + let capture = accu in + let (lam, stack) = stack in + apply ctxt gas capture_ty capture lam + >>=? fun (lam', ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks lam' stack + | ILambda (_, lam, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks lam (accu, stack) + | IFailwith (_, kloc, tv, _) -> + let v = accu in + let ctxt = update_context gas ctxt in + trace Cannot_serialize_failure (unparse_data ctxt Optimized tv v) + >>=? fun (v, _ctxt) -> + let v = Micheline.strip_locations v in + get_log logger >>=? fun log -> fail (Reject (kloc, v, log)) + | INop (_, k) -> + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + (* comparison *) + | ICompare (_, ty, k) -> + let a = accu in + let (b, stack) = stack in + let r = + Script_int.of_int @@ Script_ir_translator.compare_comparable ty a b + in + (run [@ocaml.tailcall]) logger g gas i k ks r stack + (* comparators *) + | IEq (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a = 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | INeq (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a <> 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | ILt (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a < 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | ILe (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a <= 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | IGt (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a > 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + | IGe (_, k) -> + let a = accu in + let a = Script_int.compare a Script_int.zero in + let a = Compare.Int.(a >= 0) in + (run [@ocaml.tailcall]) logger g gas i k ks a stack + (* packing *) + | IPack (_, ty, k) -> + let value = accu in + ( use_gas_counter_in_ctxt ctxt gas + @@ fun ctxt -> Script_ir_translator.pack_data ctxt ty value ) + >>=? fun (bytes, ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks bytes stack + | IUnpack (_, ty, k) -> + let bytes = accu in + ( use_gas_counter_in_ctxt ctxt gas + @@ fun ctxt -> unpack ctxt ~ty ~bytes ) + >>=? fun (opt, ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks opt stack + | IAddress (_, k) -> + let (_, address) = accu in + (run [@ocaml.tailcall]) logger g gas i k ks address stack + | IContract (kinfo, t, entrypoint, k) -> ( + let contract = accu in + match (contract, entrypoint) with + | ((contract, "default"), entrypoint) + | ((contract, entrypoint), "default") -> + let ctxt = update_context gas ctxt in + Script_ir_translator.parse_contract_for_script + ~legacy:false + ctxt + kinfo.iloc + t + contract + ~entrypoint + >>=? fun (ctxt, maybe_contract) -> + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + let accu = maybe_contract in + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks accu stack + | _ -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks None stack ) + | ITransfer_tokens (_, k) -> + let p = accu in + let (amount, ((tp, (destination, entrypoint)), stack)) = stack in + transfer (ctxt, sc) gas amount tp p destination entrypoint + >>=? fun (accu, ctxt, gas) -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks accu stack + | IImplicit_account (_, k) -> + let key = accu in + let contract = Contract.implicit_contract key in + let res = (Unit_t None, (contract, "default")) in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | ICreate_contract + (_, storage_type, param_type, Lam (_, code), root_name, k) -> + (* Removed the instruction's arguments manager, spendable and delegatable *) + let delegate = accu in + let (credit, (init, stack)) = stack in + create_contract + g + gas + storage_type + param_type + code + root_name + delegate + credit + init + >>=? fun (res, contract, ctxt, gas) -> + let stack = ((contract, "default"), stack) in + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks res stack + | ISet_delegate (_, k) -> + let delegate = accu in + let operation = Delegation delegate in + let ctxt = update_context gas ctxt in + fresh_internal_nonce ctxt + >>?= fun (ctxt, nonce) -> + let res = + (Internal_operation {source = sc.self; operation; nonce}, None) + in + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks res stack + | IBalance (_, k) -> + let ctxt = update_context gas ctxt in + Contract.get_balance_carbonated ctxt sc.self + >>=? fun (ctxt, balance) -> + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + let g = (ctxt, sc) in + (run [@ocaml.tailcall]) logger g gas i k ks balance (accu, stack) + | ILevel (_, k) -> + let level = + (Level.current (outdated_context ctxt)).level |> Raw_level.to_int32 + |> Script_int.of_int32 |> Script_int.abs + in + (run [@ocaml.tailcall]) logger g gas i k ks level (accu, stack) + | INow (_, k) -> + let now = Script_timestamp.now (outdated_context ctxt) in + (run [@ocaml.tailcall]) logger g gas i k ks now (accu, stack) + | ICheck_signature (_, k) -> + let key = accu and (signature, (message, stack)) = stack in + let res = Signature.check key signature message in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IHash_key (_, k) -> + let key = accu in + let res = Signature.Public_key.hash key in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IBlake2b (_, k) -> + let bytes = accu in + let hash = Raw_hashes.blake2b bytes in + (run [@ocaml.tailcall]) logger g gas i k ks hash stack + | ISha256 (_, k) -> + let bytes = accu in + let hash = Raw_hashes.sha256 bytes in + (run [@ocaml.tailcall]) logger g gas i k ks hash stack + | ISha512 (_, k) -> + let bytes = accu in + let hash = Raw_hashes.sha512 bytes in + (run [@ocaml.tailcall]) logger g gas i k ks hash stack + | ISource (_, k) -> + let res = (sc.payer, "default") in + (run [@ocaml.tailcall]) logger g gas i k ks res (accu, stack) + | ISender (_, k) -> + let res = (sc.source, "default") in + (run [@ocaml.tailcall]) logger g gas i k ks res (accu, stack) + | ISelf (_, ty, entrypoint, k) -> + let res = (ty, (sc.self, entrypoint)) in + (run [@ocaml.tailcall]) logger g gas i k ks res (accu, stack) + | ISelf_address (_, k) -> + let res = (sc.self, "default") in + (run [@ocaml.tailcall]) logger g gas i k ks res (accu, stack) + | IAmount (_, k) -> + let accu = sc.amount and stack = (accu, stack) in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IDig (_, _n, n', k) -> + let ((accu, stack), x) = + interp_stack_prefix_preserving_operation + (fun v stack -> (stack, v)) + n' + accu + stack + in + let accu = x and stack = (accu, stack) in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IDug (_, _n, n', k) -> + let v = accu in + let (accu, stack) = stack in + let ((accu, stack), ()) = + interp_stack_prefix_preserving_operation + (fun accu stack -> ((v, (accu, stack)), ())) + n' + accu + stack + in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IDipn (_, _n, n', b, k) -> + let (accu, stack, restore_prefix) = kundip n' accu stack k in + let ks = KCons (restore_prefix, ks) in + (run [@ocaml.tailcall]) logger g gas i b ks accu stack + | IDropn (_, _n, n', k) -> + let stack = + let rec aux : + type a s b t. + (b, t, b, t, a, s, a, s) stack_prefix_preservation_witness -> + a -> + s -> + b * t = + fun w accu stack -> + match w with + | KRest -> + (accu, stack) + | KPrefix (_, w) -> + let (accu, stack) = stack in + aux w accu stack + in + aux n' accu stack + in + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | ISapling_empty_state (_, memo_size, k) -> + let state = Sapling.empty_state ~memo_size () in + (run [@ocaml.tailcall]) logger g gas i k ks state (accu, stack) + | ISapling_verify_update (_, k) -> ( + let transaction = accu in + let (state, stack) = stack in + let address = Contract.to_b58check sc.self in + let chain_id = Chain_id.to_b58check sc.chain_id in + let anti_replay = address ^ chain_id in + let ctxt = update_context gas ctxt in + Sapling.verify_update ctxt state transaction anti_replay + >>=? fun (ctxt, balance_state_opt) -> + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + match balance_state_opt with + | Some (balance, state) -> + let state = Some (Script_int.of_int64 balance, state) in + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks state stack + | None -> + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks None stack ) + | IChainId (_, k) -> + let accu = sc.chain_id and stack = (accu, stack) in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | INever _ -> ( + match accu with _ -> . ) + | IVoting_power (_, k) -> + let key_hash = accu in + let ctxt = update_context gas ctxt in + Vote.get_voting_power ctxt key_hash + >>=? fun (ctxt, rolls) -> + let power = Script_int.(abs (of_int32 rolls)) in + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + (run [@ocaml.tailcall]) logger (ctxt, sc) gas i k ks power stack + | ITotal_voting_power (_, k) -> + let ctxt = update_context gas ctxt in + Vote.get_total_voting_power ctxt + >>=? fun (ctxt, rolls) -> + let power = Script_int.(abs (of_int32 rolls)) in + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + let g = (ctxt, sc) in + (run [@ocaml.tailcall]) logger g gas i k ks power (accu, stack) + | IKeccak (_, k) -> + let bytes = accu in + let hash = Raw_hashes.keccak256 bytes in + (run [@ocaml.tailcall]) logger g gas i k ks hash stack + | ISha3 (_, k) -> + let bytes = accu in + let hash = Raw_hashes.sha3_256 bytes in + (run [@ocaml.tailcall]) logger g gas i k ks hash stack + | IAdd_bls12_381_g1 (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.G1.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IAdd_bls12_381_g2 (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.G2.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IAdd_bls12_381_fr (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.Fr.add x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IMul_bls12_381_g1 (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.G1.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IMul_bls12_381_g2 (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.G2.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IMul_bls12_381_fr (_, k) -> + let x = accu and (y, stack) = stack in + let accu = Bls12_381.Fr.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IMul_bls12_381_fr_z (_, k) -> + let x = accu and (y, stack) = stack in + let x = Bls12_381.Fr.of_z (Script_int.to_zint x) in + let res = Bls12_381.Fr.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IMul_bls12_381_z_fr (_, k) -> + let y = accu and (x, stack) = stack in + let x = Bls12_381.Fr.of_z (Script_int.to_zint x) in + let res = Bls12_381.Fr.mul x y in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | IInt_bls12_381_fr (_, k) -> + let x = accu in + let res = Script_int.of_zint (Bls12_381.Fr.to_z x) in + (run [@ocaml.tailcall]) logger g gas i k ks res stack + | INeg_bls12_381_g1 (_, k) -> + let x = accu in + let accu = Bls12_381.G1.negate x in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | INeg_bls12_381_g2 (_, k) -> + let x = accu in + let accu = Bls12_381.G2.negate x in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | INeg_bls12_381_fr (_, k) -> + let x = accu in + let accu = Bls12_381.Fr.negate x in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IPairing_check_bls12_381 (_, k) -> + let pairs = accu in + let check = + match pairs.elements with + | [] -> + true + | pairs -> + Bls12_381.( + miller_loop pairs |> final_exponentiation_opt + |> Option.map Gt.(eq one)) + |> Option.value ~default:false + in + (run [@ocaml.tailcall]) logger g gas i k ks check stack + | IComb (_, _, witness, k) -> + let rec aux : + type before after. + (before, after) comb_gadt_witness -> before -> after = + fun witness stack -> + match (witness, stack) with + | (Comb_one, stack) -> + stack + | (Comb_succ witness', (a, tl)) -> + let (b, tl') = aux witness' tl in + ((a, b), tl') + in + let stack = aux witness (accu, stack) in + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IUncomb (_, _, witness, k) -> + let rec aux : + type before after. + (before, after) uncomb_gadt_witness -> before -> after = + fun witness stack -> + match (witness, stack) with + | (Uncomb_one, stack) -> + stack + | (Uncomb_succ witness', ((a, b), tl)) -> + (a, aux witness' (b, tl)) + in + let stack = aux witness (accu, stack) in + let (accu, stack) = stack in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IComb_get (_, _, witness, k) -> + let comb = accu in + let rec aux : + type before after. + (before, after) comb_get_gadt_witness -> before -> after = + fun witness comb -> + match (witness, comb) with + | (Comb_get_zero, v) -> + v + | (Comb_get_one, (a, _)) -> + a + | (Comb_get_plus_two witness', (_, b)) -> + aux witness' b + in + let accu = aux witness comb in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IComb_set (_, _, witness, k) -> + let value = accu and (comb, stack) = stack in + let rec aux : + type value before after. + (value, before, after) comb_set_gadt_witness -> + value -> + before -> + after = + fun witness value item -> + match (witness, item) with + | (Comb_set_zero, _) -> + value + | (Comb_set_one, (_hd, tl)) -> + (value, tl) + | (Comb_set_plus_two witness', (hd, tl)) -> + (hd, aux witness' value tl) + in + let accu = aux witness value comb in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IDup_n (_, _, witness, k) -> + let rec aux : + type before after. + (before, after) dup_n_gadt_witness -> before -> after = + fun witness stack -> + match (witness, stack) with + | (Dup_n_zero, (a, _)) -> + a + | (Dup_n_succ witness', (_, tl)) -> + aux witness' tl + in + let stack = (accu, stack) in + let accu = aux witness stack in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + (* Tickets *) + | ITicket (_, k) -> + let contents = accu and (amount, stack) = stack in + let ticketer = (sc.self, "default") in + let accu = {ticketer; contents; amount} in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | IRead_ticket (_, k) -> + let {ticketer; contents; amount} = accu in + let stack = (accu, stack) in + let accu = (ticketer, (contents, amount)) in + (run [@ocaml.tailcall]) logger g gas i k ks accu stack + | ISplit_ticket (_, k) -> + let ticket = accu and ((amount_a, amount_b), stack) = stack in + let result = + if + Compare.Int.( + Script_int.(compare (add_n amount_a amount_b) ticket.amount) + = 0) + then + Some + ( {ticket with amount = amount_a}, + {ticket with amount = amount_b} ) + else None + in + (run [@ocaml.tailcall]) logger g gas i k ks result stack + | IJoin_tickets (_, contents_ty, k) -> + let (ticket_a, ticket_b) = accu in + let result = + if + Compare.Int.( + compare_address ticket_a.ticketer ticket_b.ticketer = 0 + && compare_comparable + contents_ty + ticket_a.contents + ticket_b.contents + = 0) + then + Some + { + ticketer = ticket_a.ticketer; + contents = ticket_a.contents; + amount = Script_int.add_n ticket_a.amount ticket_b.amount; + } + else None + in + (run [@ocaml.tailcall]) logger g gas i k ks result stack ) + +(* + + The following function pops n elements from the stack + and push their reintroduction in the continuations stack. + + *) +and kundip : + type a s e z c u d w b t. + (a, s, e, z, c, u, d, w) stack_prefix_preservation_witness -> + c -> + u -> + (d, w, b, t) kinstr -> + a * s * (e, z, b, t) kinstr = + fun w accu stack k -> + match w with + | KPrefix (kinfo, w) -> + let k = IConst (kinfo, accu, k) in + let (accu, stack) = stack in + kundip w accu stack k + | KRest -> + (accu, stack, k) + +(** [apply ctxt gas ty v lam] specializes [lam] by fixing its first + formal argument to [v]. The type of [v] is represented by [ty]. *) +and apply : + type a b c. + outdated_context -> + local_gas_counter -> + a ty -> + a -> + (a * b, c) lambda -> + ((b, c) lambda * outdated_context * local_gas_counter) tzresult Lwt.t = + fun ctxt gas capture_ty capture lam -> + let (Lam (descr, expr)) = lam in + let (Item_t (full_arg_ty, _, _)) = descr.kbef in + let ctxt = update_context gas ctxt in + unparse_data ctxt Optimized capture_ty capture + >>=? fun (const_expr, ctxt) -> + unparse_ty ctxt capture_ty + >>?= fun (ty_expr, ctxt) -> + match full_arg_ty with + | Pair_t ((capture_ty, _, _), (arg_ty, _, _), _) -> + let arg_stack_ty = Item_t (arg_ty, Bot_t, None) in + let full_descr = + { + kloc = descr.kloc; + kbef = arg_stack_ty; + kaft = descr.kaft; + kinstr = + (let kinfo_const = {iloc = descr.kloc; kstack_ty = arg_stack_ty} in + let kinfo_pair = + { + iloc = descr.kloc; + kstack_ty = Item_t (capture_ty, arg_stack_ty, None); + } + in + IConst + (kinfo_const, capture, ICons_pair (kinfo_pair, descr.kinstr))); + } + in + let full_expr = + Micheline.Seq + ( 0, + [ Prim (0, I_PUSH, [ty_expr; const_expr], []); + Prim (0, I_PAIR, [], []); + expr ] ) + in + let lam' = Lam (full_descr, full_expr) in + let gas = update_local_gas_counter ctxt in + return (lam', outdated ctxt, gas) + | _ -> + assert false + +(** [transfer (ctxt, sc) gas tez tp p destination entrypoint] + creates an operation that transfers an amount of [tez] to + a contract determined by [(destination, entrypoint)] + instantiated with argument [p] of type [tp]. *) +and transfer : + type a. + outdated_context * step_constants -> + local_gas_counter -> + Tez.t -> + a ty -> + a -> + Contract.t -> + string -> + (operation * outdated_context * local_gas_counter) tzresult Lwt.t = + fun (ctxt, sc) gas amount tp p destination entrypoint -> + let ctxt = update_context gas ctxt in + collect_lazy_storage ctxt tp p + >>?= fun (to_duplicate, ctxt) -> + let to_update = no_lazy_storage_id in + extract_lazy_storage_diff + ctxt + Optimized + tp + p + ~to_duplicate + ~to_update + ~temporary:true + >>=? fun (p, lazy_storage_diff, ctxt) -> + unparse_data ctxt Optimized tp p + >>=? fun (p, ctxt) -> + Gas.consume ctxt (Script.strip_locations_cost p) + >>?= fun ctxt -> + let operation = + Transaction + { + amount; + destination; + entrypoint; + parameters = Script.lazy_expr (Micheline.strip_locations p); + } + in + fresh_internal_nonce ctxt + >>?= fun (ctxt, nonce) -> + let iop = {source = sc.self; operation; nonce} in + let res = (Internal_operation iop, lazy_storage_diff) in + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + return (res, ctxt, gas) + +(** [create_contract (ctxt, sc) gas storage_ty param_ty code root_name + delegate credit init] creates an origination operation for a + contract represented by [code], with some [root_name], 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]. *) +and create_contract : + type a b. + outdated_context * step_constants -> + local_gas_counter -> + a ty -> + b ty -> + node -> + field_annot option -> + public_key_hash option -> + Tez.t -> + a -> + (operation * Contract.t * outdated_context * local_gas_counter) tzresult + Lwt.t = + fun (ctxt, sc) gas storage_type param_type code root_name delegate credit init -> + let ctxt = update_context gas ctxt in + unparse_ty ctxt param_type + >>?= fun (unparsed_param_type, ctxt) -> + let unparsed_param_type = + Script_ir_translator.add_field_annot root_name None unparsed_param_type + in + unparse_ty ctxt storage_type + >>?= fun (unparsed_storage_type, ctxt) -> + let code = + Micheline.strip_locations + (Seq + ( 0, + [ Prim (0, K_parameter, [unparsed_param_type], []); + Prim (0, K_storage, [unparsed_storage_type], []); + Prim (0, K_code, [code], []) ] )) + in + collect_lazy_storage ctxt storage_type init + >>?= fun (to_duplicate, ctxt) -> + let to_update = no_lazy_storage_id in + extract_lazy_storage_diff + ctxt + Optimized + storage_type + init + ~to_duplicate + ~to_update + ~temporary:true + >>=? fun (init, lazy_storage_diff, ctxt) -> + unparse_data ctxt Optimized storage_type init + >>=? fun (storage, ctxt) -> + Gas.consume ctxt (Script.strip_locations_cost storage) + >>?= fun ctxt -> + let storage = Micheline.strip_locations storage in + Contract.fresh_contract_from_current_nonce ctxt + >>?= fun (ctxt, contract) -> + let operation = + Origination + { + credit; + delegate; + preorigination = Some contract; + script = + {code = Script.lazy_expr code; storage = Script.lazy_expr storage}; + } + in + fresh_internal_nonce ctxt + >>?= fun (ctxt, nonce) -> + let res = + (Internal_operation {source = sc.self; operation; nonce}, lazy_storage_diff) + in + let gas = update_local_gas_counter ctxt in + let ctxt = outdated ctxt in + return (res, contract, ctxt, gas) + +and unpack : + type a. + context -> ty:a ty -> bytes:bytes -> (a option * context) tzresult Lwt.t = + fun ctxt ~ty ~bytes -> Gas.check_enough ctxt (Script.serialized_cost bytes) >>?= fun () -> if @@ -581,899 +2271,53 @@ let unpack ctxt ~ty ~bytes = >|? fun ctxt -> (None, ctxt) ) else return (None, ctxt) -let rec step_bounded : - type b a. - logger -> - stack_depth:int -> - context -> - step_constants -> - (b, a) descr -> - b -> - (a * context) tzresult Lwt.t = - fun logger ~stack_depth ctxt step_constants ({instr; loc; _} as descr) stack -> - let gas = cost_of_instr descr stack in - Gas.consume ctxt gas - >>?= fun ctxt -> - let module Log = (val logger) in - Log.log_entry ctxt descr stack ; - let logged_return : a * context -> (a * context) tzresult Lwt.t = - fun (ret, ctxt) -> - Log.log_exit ctxt descr ret ; - return (ret, ctxt) - in - let non_terminal_recursion ~ctxt ?(stack_depth = stack_depth + 1) descr stack - = - if Compare.Int.(stack_depth >= 10_000) then - fail Michelson_too_many_recursive_calls - else step_bounded logger ~stack_depth ctxt step_constants descr stack - in - match (instr, stack) with - (* stack ops *) - | (Drop, (_, rest)) -> - logged_return (rest, ctxt) - | (Dup, (v, rest)) -> - logged_return ((v, (v, rest)), ctxt) - | (Swap, (vi, (vo, rest))) -> - logged_return ((vo, (vi, rest)), ctxt) - | (Const v, rest) -> - logged_return ((v, rest), ctxt) - (* options *) - | (Cons_some, (v, rest)) -> - logged_return ((Some v, rest), ctxt) - | (Cons_none _, rest) -> - logged_return ((None, rest), ctxt) - | (If_none (bt, _), (None, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bt rest - | (If_none (_, bf), (Some v, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bf (v, rest) - (* pairs *) - | (Cons_pair, (a, (b, rest))) -> - logged_return (((a, b), rest), ctxt) - | (Unpair, ((a, b), rest)) -> - logged_return ((a, (b, rest)), ctxt) - | (Car, ((a, _), rest)) -> - logged_return ((a, rest), ctxt) - | (Cdr, ((_, b), rest)) -> - logged_return ((b, rest), ctxt) - (* unions *) - | (Cons_left, (v, rest)) -> - logged_return ((L v, rest), ctxt) - | (Cons_right, (v, rest)) -> - logged_return ((R v, rest), ctxt) - | (If_left (bt, _), (L v, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bt (v, rest) - | (If_left (_, bf), (R v, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bf (v, rest) - (* lists *) - | (Cons_list, (hd, (tl, rest))) -> - logged_return ((list_cons hd tl, rest), ctxt) - | (Nil, rest) -> - logged_return ((list_empty, rest), ctxt) - | (If_cons (_, bf), ({elements = []; _}, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bf rest - | (If_cons (bt, _), ({elements = hd :: tl; length}, rest)) -> - let tl = {elements = tl; length = length - 1} in - step_bounded logger ~stack_depth ctxt step_constants bt (hd, (tl, rest)) - | (List_map body, (list, rest)) -> - let rec loop rest ctxt l acc = - match l with - | [] -> - let result = {elements = List.rev acc; length = list.length} in - return ((result, rest), ctxt) - | hd :: tl -> - non_terminal_recursion ~ctxt body (hd, rest) - >>=? fun ((hd, rest), ctxt) -> loop rest ctxt tl (hd :: acc) - in - loop rest ctxt list.elements [] - >>=? fun (res, ctxt) -> logged_return (res, ctxt) - | (List_size, (list, rest)) -> - logged_return ((Script_int.(abs (of_int list.length)), rest), ctxt) - | (List_iter body, (l, init)) -> - let rec loop ctxt l stack = - match l with - | [] -> - return (stack, ctxt) - | hd :: tl -> - non_terminal_recursion ~ctxt body (hd, stack) - >>=? fun (stack, ctxt) -> loop ctxt tl stack - in - loop ctxt l.elements init - >>=? fun (res, ctxt) -> logged_return (res, ctxt) - (* sets *) - | (Empty_set t, rest) -> - logged_return ((empty_set t, rest), ctxt) - | (Set_iter body, (set, init)) -> - let l = List.rev (set_fold (fun e acc -> e :: acc) set []) in - let rec loop ctxt l stack = - match l with - | [] -> - return (stack, ctxt) - | hd :: tl -> - non_terminal_recursion ~ctxt body (hd, stack) - >>=? fun (stack, ctxt) -> loop ctxt tl stack - in - loop ctxt l init >>=? fun (res, ctxt) -> logged_return (res, ctxt) - | (Set_mem, (v, (set, rest))) -> - logged_return ((set_mem v set, rest), ctxt) - | (Set_update, (v, (presence, (set, rest)))) -> - logged_return ((set_update v presence set, rest), ctxt) - | (Set_size, (set, rest)) -> - logged_return ((set_size set, rest), ctxt) - (* maps *) - | (Empty_map (t, _), rest) -> - logged_return ((empty_map t, rest), ctxt) - | (Map_map body, (map, rest)) -> - let l = List.rev (map_fold (fun k v acc -> (k, v) :: acc) map []) in - let rec loop rest ctxt l acc = - match l with - | [] -> - return ((acc, rest), ctxt) - | ((k, _) as hd) :: tl -> - non_terminal_recursion ~ctxt body (hd, rest) - >>=? fun ((hd, rest), ctxt) -> - loop rest ctxt tl (map_update k (Some hd) acc) - in - loop rest ctxt l (empty_map (map_key_ty map)) - >>=? fun (res, ctxt) -> logged_return (res, ctxt) - | (Map_iter body, (map, init)) -> - let l = List.rev (map_fold (fun k v acc -> (k, v) :: acc) map []) in - let rec loop ctxt l stack = - match l with - | [] -> - return (stack, ctxt) - | hd :: tl -> - non_terminal_recursion ~ctxt body (hd, stack) - >>=? fun (stack, ctxt) -> loop ctxt tl stack - in - loop ctxt l init >>=? fun (res, ctxt) -> logged_return (res, ctxt) - | (Map_mem, (v, (map, rest))) -> - logged_return ((map_mem v map, rest), ctxt) - | (Map_get, (v, (map, rest))) -> - logged_return ((map_get v map, rest), ctxt) - | (Map_update, (k, (v, (map, rest)))) -> - logged_return ((map_update k v map, rest), ctxt) - | (Map_get_and_update, (k, (v, (map, rest)))) -> - let map' = map_update k v map in - let v' = map_get k map in - logged_return ((v', (map', rest)), ctxt) - | (Map_size, (map, rest)) -> - logged_return ((map_size map, rest), ctxt) - (* Big map operations *) - | (Empty_big_map (tk, tv), rest) -> - logged_return ((Script_ir_translator.empty_big_map tk tv, rest), ctxt) - | (Big_map_mem, (key, (map, rest))) -> - Script_ir_translator.big_map_mem ctxt key map - >>=? fun (res, ctxt) -> logged_return ((res, rest), ctxt) - | (Big_map_get, (key, (map, rest))) -> - Script_ir_translator.big_map_get ctxt key map - >>=? fun (res, ctxt) -> logged_return ((res, rest), ctxt) - | (Big_map_update, (key, (maybe_value, (map, rest)))) -> - let big_map = Script_ir_translator.big_map_update key maybe_value map in - logged_return ((big_map, rest), ctxt) - | (Big_map_get_and_update, (k, (v, (map, rest)))) -> - let map' = Script_ir_translator.big_map_update k v map in - Script_ir_translator.big_map_get ctxt k map - >>=? fun (v', ctxt) -> logged_return ((v', (map', rest)), ctxt) - (* timestamp operations *) - | (Add_seconds_to_timestamp, (n, (t, rest))) -> - let result = Script_timestamp.add_delta t n in - logged_return ((result, rest), ctxt) - | (Add_timestamp_to_seconds, (t, (n, rest))) -> - let result = Script_timestamp.add_delta t n in - logged_return ((result, rest), ctxt) - | (Sub_timestamp_seconds, (t, (s, rest))) -> - let result = Script_timestamp.sub_delta t s in - logged_return ((result, rest), ctxt) - | (Diff_timestamps, (t1, (t2, rest))) -> - let result = Script_timestamp.diff t1 t2 in - logged_return ((result, rest), ctxt) - (* string operations *) - | (Concat_string_pair, (x, (y, rest))) -> - let s = String.concat "" [x; y] in - logged_return ((s, rest), ctxt) - | (Concat_string, (ss, rest)) -> - (* The cost for this fold_left has been paid upfront *) - let total_length = - List.fold_left - (fun acc s -> Z.add acc (Z.of_int (String.length s))) - Z.zero - ss.elements - in - Gas.consume ctxt (Interp_costs.concat_string total_length) - >>?= fun ctxt -> - let s = String.concat "" ss.elements in - logged_return ((s, rest), ctxt) - | (Slice_string, (offset, (length, (s, rest)))) -> - let s_length = Z.of_int (String.length s) in - let offset = Script_int.to_zint offset in - let length = Script_int.to_zint length in - if Compare.Z.(offset < s_length && Z.add offset length <= s_length) then - logged_return - ( (Some (String.sub s (Z.to_int offset) (Z.to_int length)), rest), - ctxt ) - else logged_return ((None, rest), ctxt) - | (String_size, (s, rest)) -> - logged_return ((Script_int.(abs (of_int (String.length s))), rest), ctxt) - (* bytes operations *) - | (Concat_bytes_pair, (x, (y, rest))) -> - let s = Bytes.cat x y in - logged_return ((s, rest), ctxt) - | (Concat_bytes, (ss, rest)) -> - (* The cost for this fold_left has been paid upfront *) - let total_length = - List.fold_left - (fun acc s -> Z.add acc (Z.of_int (Bytes.length s))) - Z.zero - ss.elements - in - Gas.consume ctxt (Interp_costs.concat_string total_length) - >>?= fun ctxt -> - let s = Bytes.concat Bytes.empty ss.elements in - logged_return ((s, rest), ctxt) - | (Slice_bytes, (offset, (length, (s, rest)))) -> - let s_length = Z.of_int (Bytes.length s) in - let offset = Script_int.to_zint offset in - let length = Script_int.to_zint length in - if Compare.Z.(offset < s_length && Z.add offset length <= s_length) then - logged_return - ((Some (Bytes.sub s (Z.to_int offset) (Z.to_int length)), rest), ctxt) - else logged_return ((None, rest), ctxt) - | (Bytes_size, (s, rest)) -> - logged_return ((Script_int.(abs (of_int (Bytes.length s))), rest), ctxt) - (* currency operations *) - | (Add_tez, (x, (y, rest))) -> - Tez.(x +? y) >>?= fun res -> logged_return ((res, rest), ctxt) - | (Sub_tez, (x, (y, rest))) -> - Tez.(x -? y) >>?= fun res -> logged_return ((res, rest), ctxt) - | (Mul_teznat, (x, (y, rest))) -> ( - match Script_int.to_int64 y with - | None -> - Log.get_log () >>=? fun log -> fail (Overflow (loc, log)) - | Some y -> - Tez.(x *? y) >>?= fun res -> logged_return ((res, rest), ctxt) ) - | (Mul_nattez, (y, (x, rest))) -> ( - match Script_int.to_int64 y with - | None -> - Log.get_log () >>=? fun log -> fail (Overflow (loc, log)) - | Some y -> - Tez.(x *? y) >>?= fun res -> logged_return ((res, rest), ctxt) ) - (* boolean operations *) - | (Or, (x, (y, rest))) -> - logged_return ((x || y, rest), ctxt) - | (And, (x, (y, rest))) -> - logged_return ((x && y, rest), ctxt) - | (Xor, (x, (y, rest))) -> - logged_return ((Compare.Bool.(x <> y), rest), ctxt) - | (Not, (x, rest)) -> - logged_return ((not x, rest), ctxt) - (* integer operations *) - | (Is_nat, (x, rest)) -> - logged_return ((Script_int.is_nat x, rest), ctxt) - | (Abs_int, (x, rest)) -> - logged_return ((Script_int.abs x, rest), ctxt) - | (Int_nat, (x, rest)) -> - logged_return ((Script_int.int x, rest), ctxt) - | (Neg_int, (x, rest)) -> - logged_return ((Script_int.neg x, rest), ctxt) - | (Neg_nat, (x, rest)) -> - logged_return ((Script_int.neg x, rest), ctxt) - | (Add_intint, (x, (y, rest))) -> - logged_return ((Script_int.add x y, rest), ctxt) - | (Add_intnat, (x, (y, rest))) -> - logged_return ((Script_int.add x y, rest), ctxt) - | (Add_natint, (x, (y, rest))) -> - logged_return ((Script_int.add x y, rest), ctxt) - | (Add_natnat, (x, (y, rest))) -> - logged_return ((Script_int.add_n x y, rest), ctxt) - | (Sub_int, (x, (y, rest))) -> - logged_return ((Script_int.sub x y, rest), ctxt) - | (Mul_intint, (x, (y, rest))) -> - logged_return ((Script_int.mul x y, rest), ctxt) - | (Mul_intnat, (x, (y, rest))) -> - logged_return ((Script_int.mul x y, rest), ctxt) - | (Mul_natint, (x, (y, rest))) -> - logged_return ((Script_int.mul x y, rest), ctxt) - | (Mul_natnat, (x, (y, rest))) -> - logged_return ((Script_int.mul_n x y, rest), ctxt) - | (Ediv_teznat, (x, (y, rest))) -> - let x = Script_int.of_int64 (Tez.to_mutez x) in - let result = - match Script_int.ediv x y with - | None -> - None - | Some (q, r) -> ( - match (Script_int.to_int64 q, Script_int.to_int64 r) with - | (Some q, Some r) -> ( - match (Tez.of_mutez q, Tez.of_mutez r) with - | (Some q, Some r) -> - Some (q, r) - (* Cannot overflow *) - | _ -> - assert false ) - (* Cannot overflow *) - | _ -> - assert false ) - in - logged_return ((result, rest), ctxt) - | (Ediv_tez, (x, (y, rest))) -> - let x = Script_int.abs (Script_int.of_int64 (Tez.to_mutez x)) in - let y = Script_int.abs (Script_int.of_int64 (Tez.to_mutez y)) in - let result = - match Script_int.ediv_n x y with - | None -> - None - | Some (q, r) -> ( - match Script_int.to_int64 r with - | None -> - assert false (* Cannot overflow *) - | Some r -> ( - match Tez.of_mutez r with - | None -> - assert false (* Cannot overflow *) - | Some r -> - Some (q, r) ) ) - in - logged_return ((result, rest), ctxt) - | (Ediv_intint, (x, (y, rest))) -> - logged_return ((Script_int.ediv x y, rest), ctxt) - | (Ediv_intnat, (x, (y, rest))) -> - logged_return ((Script_int.ediv x y, rest), ctxt) - | (Ediv_natint, (x, (y, rest))) -> - logged_return ((Script_int.ediv x y, rest), ctxt) - | (Ediv_natnat, (x, (y, rest))) -> - logged_return ((Script_int.ediv_n x y, rest), ctxt) - | (Lsl_nat, (x, (y, rest))) -> ( - match Script_int.shift_left_n x y with +and step_descr : + type a s r f. + bool -> + logger option -> + context * step_constants -> + (a, s, r, f) kdescr -> + a -> + s -> + (r * f * context) tzresult Lwt.t = + fun log_now logger g descr accu stack -> + ( if log_now then + match logger with | None -> - Log.get_log () >>=? fun log -> fail (Overflow (loc, log)) - | Some x -> - logged_return ((x, rest), ctxt) ) - | (Lsr_nat, (x, (y, rest))) -> ( - match Script_int.shift_right_n x y with - | None -> - Log.get_log () >>=? fun log -> fail (Overflow (loc, log)) - | Some r -> - logged_return ((r, rest), ctxt) ) - | (Or_nat, (x, (y, rest))) -> - logged_return ((Script_int.logor x y, rest), ctxt) - | (And_nat, (x, (y, rest))) -> - logged_return ((Script_int.logand x y, rest), ctxt) - | (And_int_nat, (x, (y, rest))) -> - logged_return ((Script_int.logand x y, rest), ctxt) - | (Xor_nat, (x, (y, rest))) -> - logged_return ((Script_int.logxor x y, rest), ctxt) - | (Not_int, (x, rest)) -> - logged_return ((Script_int.lognot x, rest), ctxt) - | (Not_nat, (x, rest)) -> - logged_return ((Script_int.lognot x, rest), ctxt) - (* control *) - | (Seq (hd, tl), stack) -> - non_terminal_recursion ~ctxt hd stack - >>=? fun (trans, ctxt) -> - step_bounded logger ~stack_depth ctxt step_constants tl trans - | (If (bt, _), (true, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bt rest - | (If (_, bf), (false, rest)) -> - step_bounded logger ~stack_depth ctxt step_constants bf rest - | (Loop body, (true, rest)) -> - non_terminal_recursion ~ctxt body rest - >>=? fun (trans, ctxt) -> - step_bounded logger ~stack_depth ctxt step_constants descr trans - | (Loop _, (false, rest)) -> - logged_return (rest, ctxt) - | (Loop_left body, (L v, rest)) -> - non_terminal_recursion ~ctxt body (v, rest) - >>=? fun (trans, ctxt) -> - step_bounded logger ~stack_depth ctxt step_constants descr trans - | (Loop_left _, (R v, rest)) -> - logged_return ((v, rest), ctxt) - | (Dip b, (ign, rest)) -> - non_terminal_recursion ~ctxt b rest - >>=? fun (res, ctxt) -> logged_return ((ign, res), ctxt) - | (Exec, (arg, (Lam (code, _), rest))) -> - Log.log_interp ctxt code (arg, ()) ; - non_terminal_recursion ~ctxt code (arg, ()) - >>=? fun ((res, ()), ctxt) -> logged_return ((res, rest), ctxt) - | (Apply capture_ty, (capture, (lam, rest))) -> ( - let (Lam (descr, expr)) = lam in - let (Item_t (full_arg_ty, _, _)) = descr.bef in - unparse_data ctxt Optimized capture_ty capture - >>=? fun (const_expr, ctxt) -> - unparse_ty ctxt capture_ty - >>?= fun (ty_expr, ctxt) -> - match full_arg_ty with - | Pair_t ((capture_ty, _, _), (arg_ty, _, _), _) -> - let arg_stack_ty = Item_t (arg_ty, Empty_t, None) in - let const_descr = - ( { - loc = descr.loc; - bef = arg_stack_ty; - aft = Item_t (capture_ty, arg_stack_ty, None); - instr = Const capture; - } - : (_, _) descr ) - in - let pair_descr = - ( { - loc = descr.loc; - bef = Item_t (capture_ty, arg_stack_ty, None); - aft = Item_t (full_arg_ty, Empty_t, None); - instr = Cons_pair; - } - : (_, _) descr ) - in - let seq_descr = - ( { - loc = descr.loc; - bef = arg_stack_ty; - aft = Item_t (full_arg_ty, Empty_t, None); - instr = Seq (const_descr, pair_descr); - } - : (_, _) descr ) - in - let full_descr = - ( { - loc = descr.loc; - bef = arg_stack_ty; - aft = descr.aft; - instr = Seq (seq_descr, descr); - } - : (_, _) descr ) - in - let full_expr = - Micheline.Seq - ( 0, - [ Prim (0, I_PUSH, [ty_expr; const_expr], []); - Prim (0, I_PAIR, [], []); - expr ] ) - in - let lam' = Lam (full_descr, full_expr) in - logged_return ((lam', rest), ctxt) - | _ -> - assert false ) - | (Lambda lam, rest) -> - logged_return ((lam, rest), ctxt) - | (Failwith tv, (v, _)) -> - trace Cannot_serialize_failure (unparse_data ctxt Optimized tv v) - >>=? fun (v, _ctxt) -> - let v = Micheline.strip_locations v in - Log.get_log () >>=? fun log -> fail (Reject (loc, v, log)) - | (Nop, stack) -> - logged_return (stack, ctxt) - (* comparison *) - | (Compare ty, (a, (b, rest))) -> - logged_return - ( ( Script_int.of_int @@ Script_ir_translator.compare_comparable ty a b, - rest ), - ctxt ) - (* comparators *) - | (Eq, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres = 0) in - logged_return ((cmpres, rest), ctxt) - | (Neq, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres <> 0) in - logged_return ((cmpres, rest), ctxt) - | (Lt, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres < 0) in - logged_return ((cmpres, rest), ctxt) - | (Le, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres <= 0) in - logged_return ((cmpres, rest), ctxt) - | (Gt, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres > 0) in - logged_return ((cmpres, rest), ctxt) - | (Ge, (cmpres, rest)) -> - let cmpres = Script_int.compare cmpres Script_int.zero in - let cmpres = Compare.Int.(cmpres >= 0) in - logged_return ((cmpres, rest), ctxt) - (* packing *) - | (Pack t, (value, rest)) -> - Script_ir_translator.pack_data ctxt t value - >>=? fun (bytes, ctxt) -> logged_return ((bytes, rest), ctxt) - | (Unpack ty, (bytes, rest)) -> - unpack ctxt ~ty ~bytes - >>=? fun (opt, ctxt) -> logged_return ((opt, rest), ctxt) - (* protocol *) - | (Address, ((_, address), rest)) -> - logged_return ((address, rest), ctxt) - | (Contract (t, entrypoint), (contract, rest)) -> ( - match (contract, entrypoint) with - | ((contract, "default"), entrypoint) | ((contract, entrypoint), "default") - -> - Script_ir_translator.parse_contract_for_script - ~legacy:false - ctxt - loc - t - contract - ~entrypoint - >>=? fun (ctxt, maybe_contract) -> - logged_return ((maybe_contract, rest), ctxt) - | _ -> - logged_return ((None, rest), ctxt) ) - | (Transfer_tokens, (p, (amount, ((tp, (destination, entrypoint)), rest)))) - -> - collect_lazy_storage ctxt tp p - >>?= fun (to_duplicate, ctxt) -> - let to_update = no_lazy_storage_id in - extract_lazy_storage_diff - ctxt - Optimized - tp - p - ~to_duplicate - ~to_update - ~temporary:true - >>=? fun (p, lazy_storage_diff, ctxt) -> - unparse_data ctxt Optimized tp p - >>=? fun (p, ctxt) -> - Gas.consume ctxt (Script.strip_locations_cost p) - >>?= fun ctxt -> - let operation = - Transaction - { - amount; - destination; - entrypoint; - parameters = Script.lazy_expr (Micheline.strip_locations p); - } - in - fresh_internal_nonce ctxt - >>?= fun (ctxt, nonce) -> - logged_return - ( ( ( Internal_operation - {source = step_constants.self; operation; nonce}, - lazy_storage_diff ), - rest ), - ctxt ) - | (Implicit_account, (key, rest)) -> - let contract = Contract.implicit_contract key in - logged_return (((Unit_t None, (contract, "default")), rest), ctxt) - | ( Create_contract (storage_type, param_type, Lam (_, code), root_name), - (* Removed the instruction's arguments manager, spendable and delegatable *) - (delegate, (credit, (init, rest))) ) -> - unparse_ty ctxt param_type - >>?= fun (unparsed_param_type, ctxt) -> - let unparsed_param_type = - Script_ir_translator.add_field_annot root_name None unparsed_param_type - in - unparse_ty ctxt storage_type - >>?= fun (unparsed_storage_type, ctxt) -> - let code = - Micheline.strip_locations - (Seq - ( 0, - [ Prim (0, K_parameter, [unparsed_param_type], []); - Prim (0, K_storage, [unparsed_storage_type], []); - Prim (0, K_code, [code], []) ] )) - in - collect_lazy_storage ctxt storage_type init - >>?= fun (to_duplicate, ctxt) -> - let to_update = no_lazy_storage_id in - extract_lazy_storage_diff - ctxt - Optimized - storage_type - init - ~to_duplicate - ~to_update - ~temporary:true - >>=? fun (init, lazy_storage_diff, ctxt) -> - unparse_data ctxt Optimized storage_type init - >>=? fun (storage, ctxt) -> - Gas.consume ctxt (Script.strip_locations_cost storage) - >>?= fun ctxt -> - let storage = Micheline.strip_locations storage in - Contract.fresh_contract_from_current_nonce ctxt - >>?= fun (ctxt, contract) -> - let operation = - Origination - { - credit; - delegate; - preorigination = Some contract; - script = - { - code = Script.lazy_expr code; - storage = Script.lazy_expr storage; - }; - } - in - fresh_internal_nonce ctxt - >>?= fun (ctxt, nonce) -> - logged_return - ( ( ( Internal_operation - {source = step_constants.self; operation; nonce}, - lazy_storage_diff ), - ((contract, "default"), rest) ), - ctxt ) - | (Set_delegate, (delegate, rest)) -> - let operation = Delegation delegate in - fresh_internal_nonce ctxt - >>?= fun (ctxt, nonce) -> - logged_return - ( ( ( Internal_operation - {source = step_constants.self; operation; nonce}, - None ), - rest ), - ctxt ) - | (Balance, rest) -> - Contract.get_balance_carbonated ctxt step_constants.self - >>=? fun (ctxt, balance) -> logged_return ((balance, rest), ctxt) - | (Level, rest) -> - let level = - (Level.current ctxt).level |> Raw_level.to_int32 |> Script_int.of_int32 - |> Script_int.abs - in - logged_return ((level, rest), ctxt) - | (Now, rest) -> - let now = Script_timestamp.now ctxt in - logged_return ((now, rest), ctxt) - | (Check_signature, (key, (signature, (message, rest)))) -> - let res = Signature.check key signature message in - logged_return ((res, rest), ctxt) - | (Hash_key, (key, rest)) -> - logged_return ((Signature.Public_key.hash key, rest), ctxt) - | (Blake2b, (bytes, rest)) -> - let hash = Raw_hashes.blake2b bytes in - logged_return ((hash, rest), ctxt) - | (Sha256, (bytes, rest)) -> - let hash = Raw_hashes.sha256 bytes in - logged_return ((hash, rest), ctxt) - | (Sha512, (bytes, rest)) -> - let hash = Raw_hashes.sha512 bytes in - logged_return ((hash, rest), ctxt) - | (Source, rest) -> - logged_return (((step_constants.payer, "default"), rest), ctxt) - | (Sender, rest) -> - logged_return (((step_constants.source, "default"), rest), ctxt) - | (Self (t, entrypoint), rest) -> - logged_return (((t, (step_constants.self, entrypoint)), rest), ctxt) - | (Self_address, rest) -> - logged_return (((step_constants.self, "default"), rest), ctxt) - | (Amount, rest) -> - logged_return ((step_constants.amount, rest), ctxt) - | (Dig (_n, n'), stack) -> - interp_stack_prefix_preserving_operation - (fun (v, rest) -> return (rest, v)) - n' - stack - >>=? fun (aft, x) -> logged_return ((x, aft), ctxt) - | (Dug (_n, n'), (v, rest)) -> - interp_stack_prefix_preserving_operation - (fun stk -> return ((v, stk), ())) - n' - rest - >>=? fun (aft, ()) -> logged_return (aft, ctxt) - | (Dipn (n, n', b), stack) -> - interp_stack_prefix_preserving_operation - (fun stk -> - non_terminal_recursion - ~ctxt - b - stk - (* This is a cheap upper bound of the number recursive calls to - `interp_stack_prefix_preserving_operation`, which does - ((n / 16) + log2 (n % 16)) iterations *) - ~stack_depth:(stack_depth + 4 + (n / 16))) - n' - stack - >>=? fun (aft, ctxt') -> logged_return (aft, ctxt') - | (Dropn (_n, n'), stack) -> - interp_stack_prefix_preserving_operation - (fun stk -> return (stk, stk)) - n' - stack - >>=? fun (_, rest) -> logged_return (rest, ctxt) - | (Sapling_empty_state {memo_size}, stack) -> - logged_return ((Sapling.empty_state ~memo_size (), stack), ctxt) - | (Sapling_verify_update, (transaction, (state, rest))) -> ( - let address = Contract.to_b58check step_constants.self in - let chain_id = Chain_id.to_b58check step_constants.chain_id in - let anti_replay = address ^ chain_id in - Sapling.verify_update ctxt state transaction anti_replay - >>=? fun (ctxt, balance_state_opt) -> - match balance_state_opt with - | Some (balance, state) -> - logged_return - ((Some (Script_int.of_int64 balance, state), rest), ctxt) - | None -> - logged_return ((None, rest), ctxt) ) - | (ChainId, rest) -> - logged_return ((step_constants.chain_id, rest), ctxt) - | (Never, (_, _)) -> - . - | (Voting_power, (key_hash, rest)) -> - Vote.get_voting_power ctxt key_hash - >>=? fun (ctxt, rolls) -> - logged_return ((Script_int.(abs (of_int32 rolls)), rest), ctxt) - | (Total_voting_power, rest) -> - Vote.get_total_voting_power ctxt - >>=? fun (ctxt, rolls) -> - logged_return ((Script_int.(abs (of_int32 rolls)), rest), ctxt) - | (Keccak, (bytes, rest)) -> - let hash = Raw_hashes.keccak256 bytes in - logged_return ((hash, rest), ctxt) - | (Sha3, (bytes, rest)) -> - let hash = Raw_hashes.sha3_256 bytes in - logged_return ((hash, rest), ctxt) - | (Add_bls12_381_g1, (x, (y, rest))) -> - logged_return ((Bls12_381.G1.add x y, rest), ctxt) - | (Add_bls12_381_g2, (x, (y, rest))) -> - logged_return ((Bls12_381.G2.add x y, rest), ctxt) - | (Add_bls12_381_fr, (x, (y, rest))) -> - logged_return ((Bls12_381.Fr.add x y, rest), ctxt) - | (Mul_bls12_381_g1, (x, (y, rest))) -> - logged_return ((Bls12_381.G1.mul x y, rest), ctxt) - | (Mul_bls12_381_g2, (x, (y, rest))) -> - logged_return ((Bls12_381.G2.mul x y, rest), ctxt) - | (Mul_bls12_381_fr, (x, (y, rest))) -> - logged_return ((Bls12_381.Fr.mul x y, rest), ctxt) - | (Mul_bls12_381_fr_z, (x, (y, rest))) -> - let x = Bls12_381.Fr.of_z (Script_int.to_zint x) in - let res = (Bls12_381.Fr.mul x y, rest) in - logged_return (res, ctxt) - | (Mul_bls12_381_z_fr, (y, (x, rest))) -> - let x = Bls12_381.Fr.of_z (Script_int.to_zint x) in - let res = (Bls12_381.Fr.mul x y, rest) in - logged_return (res, ctxt) - | (Int_bls12_381_fr, (x, rest)) -> - logged_return ((Script_int.of_zint (Bls12_381.Fr.to_z x), rest), ctxt) - | (Neg_bls12_381_g1, (x, rest)) -> - logged_return ((Bls12_381.G1.negate x, rest), ctxt) - | (Neg_bls12_381_g2, (x, rest)) -> - logged_return ((Bls12_381.G2.negate x, rest), ctxt) - | (Neg_bls12_381_fr, (x, rest)) -> - logged_return ((Bls12_381.Fr.negate x, rest), ctxt) - | (Pairing_check_bls12_381, (pairs, rest)) -> - let check = - match pairs.elements with - | [] -> - true - | pairs -> - Bls12_381.( - miller_loop pairs |> final_exponentiation_opt - |> Option.map Gt.(eq one)) - |> Option.value ~default:false - in - logged_return ((check, rest), ctxt) - | (Comb (_, witness), stack) -> - let rec aux : - type before after. - (before, after) comb_gadt_witness -> before -> after = - fun witness stack -> - match (witness, stack) with - | (Comb_one, stack) -> - stack - | (Comb_succ witness', (a, tl)) -> - let (b, tl') = aux witness' tl in - ((a, b), tl') - in - logged_return (aux witness stack, ctxt) - | (Uncomb (_, witness), stack) -> - let rec aux : - type before after. - (before, after) uncomb_gadt_witness -> before -> after = - fun witness stack -> - match (witness, stack) with - | (Uncomb_one, stack) -> - stack - | (Uncomb_succ witness', ((a, b), tl)) -> - (a, aux witness' (b, tl)) - in - logged_return (aux witness stack, ctxt) - | (Comb_get (_, witness), (comb, stack)) -> - let rec aux : - type before after. - (before, after) comb_get_gadt_witness -> before -> after = - fun witness comb -> - match (witness, comb) with - | (Comb_get_zero, v) -> - v - | (Comb_get_one, (a, _)) -> - a - | (Comb_get_plus_two witness', (_, b)) -> - aux witness' b - in - logged_return ((aux witness comb, stack), ctxt) - | (Comb_set (_, witness), (value, (comb, stack))) -> - let rec aux : - type value before after. - (value, before, after) comb_set_gadt_witness -> - value -> - before -> - after = - fun witness value item -> - match (witness, item) with - | (Comb_set_zero, _) -> - value - | (Comb_set_one, (_hd, tl)) -> - (value, tl) - | (Comb_set_plus_two witness', (hd, tl)) -> - (hd, aux witness' value tl) - in - logged_return ((aux witness value comb, stack), ctxt) - | (Dup_n (_, witness), stack) -> - let rec aux : - type before after. - (before, after) dup_n_gadt_witness -> before -> after = - fun witness stack -> - match (witness, stack) with - | (Dup_n_zero, (a, _)) -> - a - | (Dup_n_succ witness', (_, tl)) -> - aux witness' tl - in - logged_return ((aux witness stack, stack), ctxt) - (* Tickets *) - | (Ticket, (contents, (amount, rest))) -> - let ticketer = (step_constants.self, "default") in - logged_return (({ticketer; contents; amount}, rest), ctxt) - | (Read_ticket, (({ticketer; contents; amount}, _) as stack)) -> - logged_return (((ticketer, (contents, amount)), stack), ctxt) - | (Split_ticket, (ticket, ((amount_a, amount_b), rest))) -> - let result = - if - Compare.Int.( - Script_int.(compare (add_n amount_a amount_b) ticket.amount) = 0) - then - Some - ({ticket with amount = amount_a}, {ticket with amount = amount_b}) - else None - in - logged_return ((result, rest), ctxt) - | (Join_tickets contents_ty, ((ticket_a, ticket_b), rest)) -> - let result = - if - Compare.Int.( - compare_address ticket_a.ticketer ticket_b.ticketer = 0 - && compare_comparable - contents_ty - ticket_a.contents - ticket_b.contents - = 0) - then - Some - { - ticketer = ticket_a.ticketer; - contents = ticket_a.contents; - amount = Script_int.add_n ticket_a.amount ticket_b.amount; - } - else None - in - logged_return ((result, rest), ctxt) - -let step : - type b a. - logger -> - context -> - step_constants -> - (b, a) descr -> - b -> - (a * context) tzresult Lwt.t = - step_bounded ~stack_depth:0 - -let interp : + () + | Some logger -> + let module Log = (val logger) in + let kinfo = kinfo_of_kinstr descr.kinstr in + let ctxt = fst g in + Log.log_interp descr.kinstr ctxt kinfo.iloc descr.kbef (accu, stack) ) ; + run_descr logger g descr accu stack + +and interp : type p r. - logger -> - context -> - step_constants -> + logger option -> + context * step_constants -> (p, r) lambda -> p -> (r * context) tzresult Lwt.t = - fun logger ctxt step_constants (Lam (code, _)) arg -> - let stack = (arg, ()) in - let module Log = (val logger) in - Log.log_interp ctxt code stack ; - step logger ctxt step_constants code stack - >|=? fun ((ret, ()), ctxt) -> (ret, ctxt) + fun logger g (Lam (code, _)) arg -> + step_descr true logger g code arg ((), ()) + >|=? fun (ret, _, ctxt) -> (ret, ctxt) + +let kstep logger ctxt step_constants kinstr accu stack = + let gas = (Gas.gas_counter ctxt :> int) in + step logger (outdated ctxt, step_constants) gas kinstr KNil accu stack + >>=? fun (accu, stack, ctxt, gas) -> + return (accu, stack, update_context gas ctxt) + +let step logger ctxt step_constants descr stack = + step_descr false logger (ctxt, step_constants) descr stack + +(* + + High-level functions + ==================== -(* ---- contract handling ---------------------------------------------------*) +*) let execute logger ctxt mode step_constants ~entrypoint ~internal unparsed_script arg : ( Script.expr @@ -1500,7 +2344,7 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal >>?= fun (to_update, ctxt) -> trace (Runtime_contract_error (step_constants.self, script_code)) - (interp logger ctxt step_constants code (arg, storage)) + (interp logger (ctxt, step_constants) code (arg, storage)) >>=? fun ((ops, storage), ctxt) -> Script_ir_translator.extract_lazy_storage_diff ctxt @@ -1539,8 +2383,8 @@ type execution_result = { operations : packed_internal_operation list; } -let execute ?(logger = (module No_trace : STEP_LOGGER)) ctxt mode - step_constants ~script ~entrypoint ~parameter ~internal = +let execute ?logger ctxt mode step_constants ~script ~entrypoint ~parameter + ~internal = execute logger ctxt diff --git a/src/proto_alpha/lib_protocol/script_interpreter.mli b/src/proto_alpha/lib_protocol/script_interpreter.mli index 9d2f9147da7e837984e5d971f7f898eb0772c6f5..e0e84f02c467ada5927d7338aead787dc145777e 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.mli +++ b/src/proto_alpha/lib_protocol/script_interpreter.mli @@ -23,7 +23,17 @@ (* *) (*****************************************************************************) +(** This is the Michelson interpreter. + + This module offers a way to execute either a Michelson script or a + Michelson instruction. + + Implementation details are documented in the .ml file. + +*) + open Alpha_context +open Script_typed_ir type execution_trace = (Script.location * Gas.t * (Script.expr * string option) list) list @@ -58,6 +68,65 @@ type step_constants = { chain_id : Chain_id.t; } +(** The interpreter uses a control stack with specific cases for loops + and DIP. See the details in the implementation file. *) +type (_, _, _, _) continuation = + | KNil : ('r, 'f, 'r, 'f) continuation + | KCons : + ('a, 's, 'b, 't) kinstr * ('b, 't, 'r, 'f) continuation + -> ('a, 's, 'r, 'f) continuation + | KReturn : + 's * ('a, 's, 'r, 'f) continuation + -> ('a, end_of_stack, 'r, 'f) continuation + | KUndip : + 'b * ('b, 'a * 's, 'r, 'f) continuation + -> ('a, 's, 'r, 'f) continuation + | KLoop_in : + ('a, 's, bool, 'a * 's) kinstr * ('a, 's, 'r, 'f) continuation + -> (bool, 'a * 's, 'r, 'f) continuation + | KLoop_in_left : + ('a, 's, ('a, 'b) Script_typed_ir.union, 's) kinstr + * ('b, 's, 'r, 'f) continuation + -> (('a, 'b) Script_typed_ir.union, 's, 'r, 'f) continuation + | KIter : + ('a, 'b * 's, 'b, 's) kinstr * 'a list * ('b, 's, 'r, 'f) continuation + -> ('b, 's, 'r, 'f) continuation + | KList_mapping : + ('a, 'c * 's, 'b, 'c * 's) kinstr + * 'a list + * 'b list + * int + * ('b Script_typed_ir.boxed_list, 'c * 's, 'r, 'f) continuation + -> ('c, 's, 'r, 'f) continuation + | KList_mapped : + ('a, 'c * 's, 'b, 'c * 's) kinstr + * 'a list + * 'b list + * int + * ('b Script_typed_ir.boxed_list, 'c * 's, 'r, 'f) continuation + -> ('b, 'c * 's, 'r, 'f) continuation + | KMap_mapping : + ('a * 'b, 'd * 's, 'c, 'd * 's) kinstr + * ('a * 'b) list + * ('a, 'c) Script_typed_ir.map + * (('a, 'c) Script_typed_ir.map, 'd * 's, 'r, 'f) continuation + -> ('d, 's, 'r, 'f) continuation + | KMap_mapped : + ('a * 'b, 'd * 's, 'c, 'd * 's) kinstr + * ('a * 'b) list + * ('a, 'c) Script_typed_ir.map + * 'a + * (('a, 'c) Script_typed_ir.map, 'd * 's, 'r, 'f) continuation + -> ('c, 'd * 's, 'r, 'f) continuation + +type ('a, 's, 'b, 'f, 'c, 'u) logging_function = + ('a, 's, 'b, 'f) Script_typed_ir.kinstr -> + context -> + Script.location -> + ('c, 'u) Script_typed_ir.stack_ty -> + 'c * 'u -> + unit + (** [STEP_LOGGER] is the module type of logging modules as passed to the Michelson interpreter. Note that logging must be performed by side-effects @@ -67,17 +136,18 @@ module type STEP_LOGGER = sig function [interp]. [interp] is called when starting the interpretation of a script and subsequently at each [Exec] instruction. *) - val log_interp : - context -> ('bef, 'aft) Script_typed_ir.descr -> 'bef -> unit + val log_interp : ('a, 's, 'b, 'f, 'c, 'u) logging_function (** [log_entry] is called {i before} executing each instruction but {i after} gas for this instruction has been successfully consumed. *) - val log_entry : context -> ('bef, 'aft) Script_typed_ir.descr -> 'bef -> unit + val log_entry : ('a, 's, 'b, 'f, 'a, 's) logging_function + + val log_control : ('a, 's, 'b, 'f) continuation -> unit (** [log_exit] is called {i after} executing each instruction. *) - val log_exit : context -> ('bef, 'aft) Script_typed_ir.descr -> 'aft -> unit + val log_exit : ('a, 's, 'b, 'f, 'c, 'u) logging_function (** [get_log] allows to obtain an execution trace, if any was produced. *) @@ -87,12 +157,13 @@ end type logger = (module STEP_LOGGER) val step : - logger -> + logger option -> context -> step_constants -> - ('bef, 'aft) Script_typed_ir.descr -> - 'bef -> - ('aft * context) tzresult Lwt.t + ('a, 's, 'r, 'f) Script_typed_ir.kdescr -> + 'a -> + 's -> + ('r * 'f * context) tzresult Lwt.t val execute : ?logger:logger -> @@ -104,3 +175,61 @@ val execute : parameter:Script.expr -> internal:bool -> execution_result tzresult Lwt.t + +(** [kstep logger ctxt step_constants kinstr accu stack] interprets the + script represented by [kinstr] under the context [ctxt]. This will + turn a stack whose topmost element is [accu] and remaining elements + [stack] into a new accumulator and a new stack. This function also + returns an updated context. If [logger] is given, [kstep] calls back + its functions at specific points of the execution. The execution is + parameterized by some [step_constants]. *) +val kstep : + logger option -> + context -> + step_constants -> + ('a, 's, 'r, 'f) Script_typed_ir.kinstr -> + 'a -> + 's -> + ('r * 'f * context) tzresult Lwt.t + +(** Internal interpretation loop + ============================ + + The following types and the following function are exposed + in the interface to allow the inference of a gas model in + snoop. + + Strictly speaking, they should not be considered as part of + the interface since they expose implementation details that + may change in the future. + +*) + +(** Internally, the interpretation loop uses a local gas counter. *) +type local_gas_counter = int + +(** During the evaluation, the gas level in the context is outdated. *) +type outdated_context = OutDatedContext of context [@@unboxed] + +(** [run logger ctxt step_constants local_gas_counter i k ks accu stack] + evaluates [k] (having [i] as predecessor) under the control flow + stack [ks] and the A-stack represented by [accu] and [stack]. *) +val run : + logger option -> + outdated_context * step_constants -> + local_gas_counter -> + ('c, 'u, 'd, 'v) kinstr -> + ('a, 's, 'b, 't) kinstr -> + ('b, 't, 'r, 'f) continuation -> + 'a -> + 's -> + ('r * 'f * outdated_context * local_gas_counter) tzresult Lwt.t + +val next : + logger option -> + outdated_context * step_constants -> + local_gas_counter -> + ('a, 's, 'r, 'f) continuation -> + 'a -> + 's -> + ('r * 'f * outdated_context * local_gas_counter) tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index fca7d2661cf3007e5302242bf947c45878720be1..b8aaeb7d9ee5e91e6c6c983238bca8abb9995baa 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -27,9 +27,9 @@ open Alpha_context open Micheline open Script -open Script_typed_ir open Script_tc_errors open Script_ir_annot +open Script_typed_ir module Typecheck_costs = Michelson_v1_gas.Cost_of.Typechecking module Unparse_costs = Michelson_v1_gas.Cost_of.Unparsing @@ -38,11 +38,11 @@ type ex_comparable_ty = type ex_ty = Ex_ty : 'a ty -> ex_ty -type ex_stack_ty = Ex_stack_ty : 'a stack_ty -> ex_stack_ty +type ex_stack_ty = Ex_stack_ty : ('a, 's) stack_ty -> ex_stack_ty type tc_context = | Lambda : tc_context - | Dip : 'a stack_ty * tc_context -> tc_context + | Dip : ('a, 's) stack_ty * tc_context -> tc_context | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; @@ -62,7 +62,7 @@ type type_logger = let add_dip ty annot prev = match prev with | Lambda | Toplevel _ -> - Dip (Item_t (ty, Empty_t, annot), prev) + Dip (Item_t (ty, Item_t (Unit_t None, Bot_t, None), annot), prev) | Dip (stack, _) -> Dip (Item_t (ty, stack, annot), prev) @@ -171,10 +171,11 @@ let rec type_size : type t. t ty -> int = | Contract_t (arg, _) -> 1 + type_size arg -let rec type_size_of_stack_head : type st. st stack_ty -> up_to:int -> int = +let rec type_size_of_stack_head : type a s. (a, s) stack_ty -> up_to:int -> int + = fun stack ~up_to -> match stack with - | Empty_t -> + | Bot_t -> 0 | Item_t (head, tail, _annot) -> if Compare.Int.(up_to > 0) then @@ -194,335 +195,9 @@ let rec type_size_of_stack_head : type st. st stack_ty -> up_to:int -> int = If the instr is parameterized by [(b', a') descr] then you may assume that types in [a'] don't exceed the limit. *) -let number_of_generated_growing_types : type b a. (b, a) instr -> int = - function - (* Constructors *) - | Const _ -> - 1 - | Cons_pair -> - 1 - | Cons_some -> - 1 - | Cons_none _ -> - 1 - | Cons_left -> - 1 - | Cons_right -> - 1 - | Nil -> - 1 - | Empty_set _ -> - 1 - | Empty_map _ -> - 1 - | Empty_big_map _ -> - 1 - | Lambda _ -> - 1 - | Self _ -> - 1 - | Contract _ -> - 1 - | Ticket -> - 1 - | Read_ticket -> - (* `pair address (pair T nat)` is bigger than `ticket T` *) - 1 - | Split_ticket -> - 1 - (* Magic constructor *) - | Unpack _ -> - 1 - (* Mappings *) - | List_map _ -> - 1 - | Map_map _ -> - 1 - (* Others: - - don't add types - - don't change types - - decrease type sizes - - produce only constants - - have types bounded by parameters - - etc. *) - | Drop -> - 0 - | Dup -> - 0 - | Swap -> - 0 - | Unpair -> - 0 - | Car -> - 0 - | Cdr -> - 0 - | If_none _ -> - 0 - | If_left _ -> - 0 - | Cons_list -> - 0 - | If_cons _ -> - 0 - | List_size -> - 0 - | List_iter _ -> - 0 - | Set_iter _ -> - 0 - | Set_mem -> - 0 - | Set_update -> - 0 - | Set_size -> - 0 - | Map_iter _ -> - 0 - | Map_mem -> - 0 - | Map_get -> - 0 - | Map_update -> - 0 - | Map_get_and_update -> - 0 - | Map_size -> - 0 - | Big_map_get -> - 0 - | Big_map_update -> - 0 - | Big_map_get_and_update -> - 0 - | Big_map_mem -> - 0 - | Concat_string -> - 0 - | Concat_string_pair -> - 0 - | Slice_string -> - 0 - | String_size -> - 0 - | Concat_bytes -> - 0 - | Concat_bytes_pair -> - 0 - | Slice_bytes -> - 0 - | Bytes_size -> - 0 - | Add_seconds_to_timestamp -> - 0 - | Add_timestamp_to_seconds -> - 0 - | Sub_timestamp_seconds -> - 0 - | Diff_timestamps -> - 0 - | Add_tez -> - 0 - | Sub_tez -> - 0 - | Mul_teznat -> - 0 - | Mul_nattez -> - 0 - | Ediv_teznat -> - 0 - | Ediv_tez -> - 0 - | Or -> - 0 - | And -> - 0 - | Xor -> - 0 - | Not -> - 0 - | Is_nat -> - 0 - | Neg_nat -> - 0 - | Neg_int -> - 0 - | Abs_int -> - 0 - | Int_nat -> - 0 - | Add_intint -> - 0 - | Add_intnat -> - 0 - | Add_natint -> - 0 - | Add_natnat -> - 0 - | Sub_int -> - 0 - | Mul_intint -> - 0 - | Mul_intnat -> - 0 - | Mul_natint -> - 0 - | Mul_natnat -> - 0 - | Ediv_intint -> - 0 - | Ediv_intnat -> - 0 - | Ediv_natint -> - 0 - | Ediv_natnat -> - 0 - | Lsl_nat -> - 0 - | Lsr_nat -> - 0 - | Or_nat -> - 0 - | And_nat -> - 0 - | And_int_nat -> - 0 - | Xor_nat -> - 0 - | Not_nat -> - 0 - | Not_int -> - 0 - | Seq _ -> - 0 - | If _ -> - 0 - | Loop _ -> - 0 - | Loop_left _ -> - 0 - | Dip _ -> - 0 - | Exec -> - 0 - | Apply _ -> - 0 - | Failwith _ -> - 0 - | Nop -> - 0 - | Compare _ -> - 0 - | Eq -> - 0 - | Neq -> - 0 - | Lt -> - 0 - | Gt -> - 0 - | Le -> - 0 - | Ge -> - 0 - | Address -> - 0 - | Transfer_tokens -> - 0 - | Implicit_account -> - 0 - | Create_contract _ -> - 0 - | Now -> - 0 - | Level -> - 0 - | Balance -> - 0 - | Check_signature -> - 0 - | Hash_key -> - 0 - | Blake2b -> - 0 - | Sha256 -> - 0 - | Sha512 -> - 0 - | Source -> - 0 - | Sender -> - 0 - | Amount -> - 0 - | Self_address -> - 0 - | Sapling_empty_state _ -> - 0 - | Sapling_verify_update -> - 0 - | Set_delegate -> - 0 - | Pack _ -> - 0 - | Dig _ -> - 0 - | Dug _ -> - 0 - | Dipn _ -> - 0 - | Dropn _ -> - 0 - | ChainId -> - 0 - | Never -> - 0 - | Voting_power -> - 0 - | Total_voting_power -> - 0 - | Keccak -> - 0 - | Sha3 -> - 0 - | Add_bls12_381_g1 -> - 0 - | Add_bls12_381_g2 -> - 0 - | Add_bls12_381_fr -> - 0 - | Mul_bls12_381_g1 -> - 0 - | Mul_bls12_381_g2 -> - 0 - | Mul_bls12_381_fr -> - 0 - | Mul_bls12_381_fr_z -> - 0 - | Mul_bls12_381_z_fr -> - 0 - | Int_bls12_381_fr -> - 0 - | Neg_bls12_381_g1 -> - 0 - | Neg_bls12_381_g2 -> - 0 - | Neg_bls12_381_fr -> - 0 - | Pairing_check_bls12_381 -> - 0 - | Uncomb _ -> - 0 - | Comb_get _ -> - 0 - | Comb _ -> - 1 - | Comb_set _ -> - 1 - | Dup_n _ -> - 0 - | Join_tickets _ -> - 0 +let number_of_generated_growing_types : + type a s r f. (a, s, r, f) cinstr -> int = + fun c -> c.size (* ---- Error helpers -------------------------------------------------------*) @@ -1088,12 +763,12 @@ let rec comparable_ty_of_ty : >>? fun (t, _ctxt) -> error (Comparable_type_expected (loc, t)) let rec unparse_stack : - type a. + type a s. context -> - a stack_ty -> + (a, s) stack_ty -> ((Script.expr * Script.annot) list * context) tzresult = fun ctxt -> function - | Empty_t -> + | Bot_t -> ok ([], ctxt) | Item_t (ty, rest, annot) -> unparse_ty ctxt ty @@ -1594,26 +1269,28 @@ let ty_eq : merge_types ~legacy:true ctxt loc ta tb >|? fun (eq, _ty, ctxt) -> (eq, ctxt) let merge_stacks : - type ta tb. + type ta tb ts tu. legacy:bool -> Script.location -> context -> int -> - ta stack_ty -> - tb stack_ty -> - ((ta stack_ty, tb stack_ty) eq * ta stack_ty * context) tzresult = + (ta, ts) stack_ty -> + (tb, tu) stack_ty -> + (((ta, ts) stack_ty, (tb, tu) stack_ty) eq * (ta, ts) stack_ty * context) + tzresult = fun ~legacy loc -> let rec help : - type a b. + type ta tb ts tu. context -> int -> - a stack_ty -> - b stack_ty -> - ((a stack_ty, b stack_ty) eq * a stack_ty * context) tzresult = + (ta, ts) stack_ty -> + (tb, tu) stack_ty -> + (((ta, ts) stack_ty, (tb, tu) stack_ty) eq * (ta, ts) stack_ty * context) + tzresult = fun ctxt lvl stack1 stack2 -> match (stack1, stack2) with - | (Empty_t, Empty_t) -> - ok (Eq, Empty_t, ctxt) + | (Bot_t, Bot_t) -> + ok (Eq, Bot_t, ctxt) | (Item_t (ty1, rest1, annot1), Item_t (ty2, rest2, annot2)) -> merge_types ~legacy ctxt loc ty1 ty2 |> record_trace (Bad_stack_item lvl) @@ -1621,7 +1298,9 @@ let merge_stacks : help ctxt (lvl + 1) rest1 rest2 >|? fun (Eq, rest, ctxt) -> let annot = merge_var_annot annot1 annot2 in - ((Eq : (a stack_ty, b stack_ty) eq), Item_t (ty, rest, annot), ctxt) + ( (Eq : ((ta, ts) stack_ty, (tb, tu) stack_ty) eq), + Item_t (ty, rest, annot), + ctxt ) | (_, _) -> error Bad_stack_length in @@ -1629,29 +1308,31 @@ let merge_stacks : (* ---- Type checker results -------------------------------------------------*) -type 'bef judgement = - | Typed : ('bef, 'aft) descr -> 'bef judgement +type ('a, 's) judgement = + | Typed : ('a, 's, 'b, 'u) descr -> ('a, 's) judgement | Failed : { - descr : 'aft. 'aft stack_ty -> ('bef, 'aft) descr; + descr : 'b 'u. ('b, 'u) stack_ty -> ('a, 's, 'b, 'u) descr; } - -> 'bef judgement + -> ('a, 's) judgement (* ---- Type checker (Untyped expressions -> Typed IR) ----------------------*) -type ('t, 'f, 'b) branch = { - branch : 'r. ('t, 'r) descr -> ('f, 'r) descr -> ('b, 'r) descr; +type ('a, 's, 'b, 'u, 'c, 'v) branch = { + branch : + 'r 'f. ('a, 's, 'r, 'f) descr -> ('b, 'u, 'r, 'f) descr -> + ('c, 'v, 'r, 'f) descr; } [@@unboxed] let merge_branches : - type bef a b. + type a s b u c v. legacy:bool -> context -> int -> - a judgement -> - b judgement -> - (a, b, bef) branch -> - (bef judgement * context) tzresult = + (a, s) judgement -> + (b, u) judgement -> + (a, s, b, u, c, v) branch -> + ((c, v) judgement * context) tzresult = fun ~legacy ctxt loc btr bfr {branch} -> match (btr, bfr) with | (Typed ({aft = aftbt; _} as dbt), Typed ({aft = aftbf; _} as dbf)) -> @@ -2303,43 +1984,44 @@ type ex_script = Ex_script : ('a, 'c) script -> ex_script type ex_code = Ex_code : ('a, 'c) code -> ex_code -type _ dig_proof_argument = +type (_, _) dig_proof_argument = | Dig_proof_argument : - ( ('x * 'rest, 'rest, 'bef, 'aft) stack_prefix_preservation_witness - * ('x ty * var_annot option) - * 'aft stack_ty ) - -> 'bef dig_proof_argument + ('x, 'a * 's, 'a, 's, 'b, 't, 'c, 'u) stack_prefix_preservation_witness + * 'x ty + * var_annot option + * ('c, 'u) stack_ty + -> ('b, 't) dig_proof_argument -type (_, _) dug_proof_argument = +type (_, _, _) dug_proof_argument = | Dug_proof_argument : - ( ('rest, 'x * 'rest, 'bef, 'aft) stack_prefix_preservation_witness + ( ('a, 's, 'x, 'a * 's, 'b, 't, 'c, 'u) stack_prefix_preservation_witness * unit - * 'aft stack_ty ) - -> ('bef, 'x) dug_proof_argument + * ('c, 'u) stack_ty ) + -> ('b, 't, 'x) dug_proof_argument -type _ dipn_proof_argument = +type (_, _) dipn_proof_argument = | Dipn_proof_argument : - ( ('fbef, 'faft, 'bef, 'aft) stack_prefix_preservation_witness - * (context * ('fbef, 'faft) descr) - * 'aft stack_ty ) - -> 'bef dipn_proof_argument + ('fa, 'fs, 'fb, 'fu, 'a, 's, 'b, 'u) stack_prefix_preservation_witness + * context + * ('fa, 'fs, 'fb, 'fu) descr + * ('b, 'u) stack_ty + -> ('a, 's) dipn_proof_argument -type _ dropn_proof_argument = +type (_, _) dropn_proof_argument = | Dropn_proof_argument : - ( ('rest, 'rest, 'bef, 'aft) stack_prefix_preservation_witness - * 'rest stack_ty - * 'aft stack_ty ) - -> 'bef dropn_proof_argument + ('fa, 'fs, 'fa, 'fs, 'a, 's, 'a, 's) stack_prefix_preservation_witness + * ('fa, 'fs) stack_ty + -> ('a, 's) dropn_proof_argument type 'before comb_proof_argument = | Comb_proof_argument : - ('before, 'after) comb_gadt_witness * 'after stack_ty - -> 'before comb_proof_argument + ('a * 's, 'b * 'u) comb_gadt_witness * ('b, 'u) stack_ty + -> ('a * 's) comb_proof_argument type 'before uncomb_proof_argument = | Uncomb_proof_argument : - ('before, 'after) uncomb_gadt_witness * 'after stack_ty - -> 'before uncomb_proof_argument + ('a * 's, 'b * 'u) uncomb_gadt_witness * ('b, 'u) stack_ty + -> ('a * 's) uncomb_proof_argument type 'before comb_get_proof_argument = | Comb_get_proof_argument : @@ -3322,9 +3004,9 @@ and parse_returning : ~legacy ~stack_depth:(stack_depth + 1) script_instr - (Item_t (arg, Empty_t, arg_annot)) + (Item_t (arg, Bot_t, arg_annot)) >>=? function - | (Typed ({loc; aft = Item_t (ty, Empty_t, _) as stack_ty; _} as descr), ctxt) + | (Typed ({loc; aft = Item_t (ty, Bot_t, _) as stack_ty; _} as descr), ctxt) -> Lwt.return @@ record_trace_eval @@ -3335,7 +3017,8 @@ and parse_returning : >|? fun (stack_ty, _ctxt) -> Bad_return (loc, stack_ty, ret)) ( merge_types ~legacy ctxt loc ty ret >|? fun (Eq, _ret, ctxt) -> - ((Lam (descr, script_instr) : (arg, ret) lambda), ctxt) ) + ((Lam (close_descr descr, script_instr) : (arg, ret) lambda), ctxt) + ) | (Typed {loc; aft = stack_ty; _}, ctxt) -> Lwt.return ( serialize_ty_for_error ctxt ret @@ -3344,20 +3027,20 @@ and parse_returning : >>? fun (stack_ty, _ctxt) -> error (Bad_return (loc, stack_ty, ret)) ) | (Failed {descr}, ctxt) -> return - ( ( Lam (descr (Item_t (ret, Empty_t, None)), script_instr) + ( ( Lam (close_descr (descr (Item_t (ret, Bot_t, None))), script_instr) : (arg, ret) lambda ), ctxt ) and parse_instr : - type bef. + type a s. ?type_logger:type_logger -> stack_depth:int -> tc_context -> context -> legacy:bool -> Script.node -> - bef stack_ty -> - (bef judgement * context) tzresult Lwt.t = + (a, s) stack_ty -> + ((a, s) judgement * context) tzresult Lwt.t = fun ?type_logger ~stack_depth tc_context ctxt ~legacy script_instr stack_ty -> let check_item_ty (type a b) ctxt (exp : a ty) (got : b ty) loc name n m : ((a, b) eq * a ty * context) tzresult = @@ -3375,15 +3058,15 @@ and parse_instr : ok_unit | (Some log, (Prim _ | Seq _)) -> (* Unparsing for logging done in an unlimited context as this - is used only by the client and not the protocol *) + is used only by the client and not the protocol *) let ctxt = Gas.set_unlimited ctxt in unparse_stack ctxt stack_ty >>? fun (stack_ty, _) -> unparse_stack ctxt aft >|? fun (aft, _) -> log loc stack_ty aft ; () in let return_no_lwt : - type bef. context -> bef judgement -> (bef judgement * context) tzresult - = + type a s. + context -> (a, s) judgement -> ((a, s) judgement * context) tzresult = fun ctxt judgement -> match judgement with | Typed {instr; loc; aft; _} -> @@ -3400,8 +3083,10 @@ and parse_instr : ok (judgement, ctxt) in let return : - type bef. - context -> bef judgement -> (bef judgement * context) tzresult Lwt.t = + type a s. + context -> + (a, s) judgement -> + ((a, s) judgement * context) tzresult Lwt.t = fun ctxt judgement -> Lwt.return @@ return_no_lwt ctxt judgement in let typed_no_lwt ctxt loc instr aft = @@ -3430,25 +3115,31 @@ and parse_instr : match (script_instr, stack_ty) with (* stack ops *) | (Prim (loc, I_DROP, [], annot), Item_t (_, rest, _)) -> - ( error_unexpected_annot loc annot >>?= fun () -> typed ctxt loc Drop rest - : (bef judgement * context) tzresult Lwt.t ) + ( error_unexpected_annot loc annot + >>?= fun () -> + typed + ctxt + loc + {size = 0; apply = (fun kinfo k -> IDrop (kinfo, k))} + rest + : ((a, s) judgement * context) tzresult Lwt.t ) | (Prim (loc, I_DROP, [n], result_annot), whole_stack) -> parse_uint10 n >>?= fun whole_n -> Gas.consume ctxt (Typecheck_costs.proof_argument whole_n) >>?= fun ctxt -> let rec make_proof_argument : - type tstk. int -> tstk stack_ty -> tstk dropn_proof_argument tzresult - = + type a s. + int -> (a, s) stack_ty -> (a, s) dropn_proof_argument tzresult = fun n stk -> match (Compare.Int.(n = 0), stk) with | (true, rest) -> - ok @@ Dropn_proof_argument (Rest, rest, rest) - | (false, Item_t (v, rest, annot)) -> + ok @@ Dropn_proof_argument (KRest, rest) + | (false, Item_t (_, rest, _)) -> make_proof_argument (n - 1) rest - >|? fun (Dropn_proof_argument (n', stack_after_drops, aft')) -> - Dropn_proof_argument - (Prefix n', stack_after_drops, Item_t (v, aft', annot)) + >|? fun (Dropn_proof_argument (n', stack_after_drops)) -> + let kinfo = {iloc = loc; kstack_ty = rest} in + Dropn_proof_argument (KPrefix (kinfo, n'), stack_after_drops) | (_, _) -> serialize_stack_for_error ctxt whole_stack >>? fun (whole_stack, _ctxt) -> @@ -3457,11 +3148,12 @@ and parse_instr : error_unexpected_annot loc result_annot >>?= fun () -> make_proof_argument whole_n whole_stack - >>?= fun (Dropn_proof_argument (n', stack_after_drops, _aft)) -> - typed ctxt loc (Dropn (whole_n, n')) stack_after_drops + >>?= fun (Dropn_proof_argument (n', stack_after_drops)) -> + let kdropn kinfo k = IDropn (kinfo, whole_n, n', k) in + typed ctxt loc {size = 0; apply = kdropn} stack_after_drops | (Prim (loc, I_DROP, (_ :: _ :: _ as l), _), _) -> (* Technically, the arities 0 and 1 are allowed but the error only mentions 1. - However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) + However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) fail (Invalid_arity (loc, I_DROP, 1, List.length l)) | (Prim (loc, I_DUP, [], annot), Item_t (v, rest, stack_annot)) -> parse_var_annot loc annot ~default:stack_annot @@ -3472,14 +3164,15 @@ and parse_instr : >|? fun (t, _ctxt) -> Non_dupable_type (loc, t)) (check_dupable_ty ctxt loc v) >>?= fun ctxt -> - typed ctxt loc Dup (Item_t (v, Item_t (v, rest, stack_annot), annot)) + let dup = {size = 0; apply = (fun kinfo k -> IDup (kinfo, k))} in + typed ctxt loc dup (Item_t (v, Item_t (v, rest, stack_annot), annot)) | (Prim (loc, I_DUP, [n], v_annot), stack_ty) -> parse_var_annot loc v_annot >>?= fun annot -> let rec make_proof_argument : - type before. - int -> before stack_ty -> before dup_n_proof_argument tzresult = - fun n (stack_ty : before stack_ty) -> + type a s. + int -> (a, s) stack_ty -> (a * s) dup_n_proof_argument tzresult = + fun n (stack_ty : (a, s) stack_ty) -> match (n, stack_ty) with | (1, Item_t (hd_ty, _, _)) -> ok @@ Dup_n_proof_argument (Dup_n_zero, hd_ty) @@ -3506,22 +3199,28 @@ and parse_instr : >|? fun (t, _ctxt) -> Non_dupable_type (loc, t)) (check_dupable_ty ctxt loc after_ty) >>?= fun ctxt -> - typed ctxt loc (Dup_n (n, witness)) (Item_t (after_ty, stack_ty, annot)) + let dupn = + {size = 0; apply = (fun kinfo k -> IDup_n (kinfo, n, witness, k))} + in + typed ctxt loc dupn (Item_t (after_ty, stack_ty, annot)) | (Prim (loc, I_DIG, [n], result_annot), stack) -> let rec make_proof_argument : - type tstk. int -> tstk stack_ty -> tstk dig_proof_argument tzresult = + type a s. + int -> (a, s) stack_ty -> (a, s) dig_proof_argument tzresult = fun n stk -> match (Compare.Int.(n = 0), stk) with | (true, Item_t (v, rest, annot)) -> - ok @@ Dig_proof_argument (Rest, (v, annot), rest) + ok @@ Dig_proof_argument (KRest, v, annot, rest) | (false, Item_t (v, rest, annot)) -> make_proof_argument (n - 1) rest - >|? fun (Dig_proof_argument (n', (x, xv), aft')) -> - Dig_proof_argument (Prefix n', (x, xv), Item_t (v, aft', annot)) + >|? fun (Dig_proof_argument (n', x, xv, aft')) -> + let kinfo = {iloc = loc; kstack_ty = aft'} in + Dig_proof_argument + (KPrefix (kinfo, n'), x, xv, Item_t (v, aft', annot)) | (_, _) -> serialize_stack_for_error ctxt stack >>? fun (whole_stack, _ctxt) -> - error (Bad_stack (loc, I_DIG, 1, whole_stack)) + error (Bad_stack (loc, I_DIG, 3, whole_stack)) in parse_uint10 n >>?= fun n -> @@ -3530,8 +3229,9 @@ and parse_instr : error_unexpected_annot loc result_annot >>?= fun () -> make_proof_argument n stack - >>?= fun (Dig_proof_argument (n', (x, stack_annot), aft)) -> - typed ctxt loc (Dig (n, n')) (Item_t (x, aft, stack_annot)) + >>?= fun (Dig_proof_argument (n', x, stack_annot, aft)) -> + let dig = {size = 0; apply = (fun kinfo k -> IDig (kinfo, n, n', k))} in + typed ctxt loc dig (Item_t (x, aft, stack_annot)) | (Prim (loc, I_DIG, (([] | _ :: _ :: _) as l), _), _) -> fail (Invalid_arity (loc, I_DIG, 1, List.length l)) | (Prim (loc, I_DUG, [n], result_annot), Item_t (x, whole_stack, stack_annot)) @@ -3541,20 +3241,22 @@ and parse_instr : Gas.consume ctxt (Typecheck_costs.proof_argument whole_n) >>?= fun ctxt -> let rec make_proof_argument : - type tstk x. + type a s x. int -> x ty -> var_annot option -> - tstk stack_ty -> - (tstk, x) dug_proof_argument tzresult = + (a, s) stack_ty -> + (a, s, x) dug_proof_argument tzresult = fun n x stack_annot stk -> match (Compare.Int.(n = 0), stk) with | (true, rest) -> - ok @@ Dug_proof_argument (Rest, (), Item_t (x, rest, stack_annot)) + ok @@ Dug_proof_argument (KRest, (), Item_t (x, rest, stack_annot)) | (false, Item_t (v, rest, annot)) -> make_proof_argument (n - 1) x stack_annot rest >|? fun (Dug_proof_argument (n', (), aft')) -> - Dug_proof_argument (Prefix n', (), Item_t (v, aft', annot)) + let kinfo = {iloc = loc; kstack_ty = aft'} in + Dug_proof_argument + (KPrefix (kinfo, n'), (), Item_t (v, aft', annot)) | (_, _) -> serialize_stack_for_error ctxt whole_stack >>? fun (whole_stack, _ctxt) -> @@ -3564,8 +3266,11 @@ and parse_instr : >>?= fun () -> make_proof_argument whole_n x stack_annot whole_stack >>?= fun (Dug_proof_argument (n', (), aft)) -> - typed ctxt loc (Dug (whole_n, n')) aft - | (Prim (loc, I_DUG, [_], result_annot), (Empty_t as stack)) -> + let dug = + {size = 0; apply = (fun kinfo k -> IDug (kinfo, whole_n, n', k))} + in + typed ctxt loc dug aft + | (Prim (loc, I_DUG, [_], result_annot), stack) -> Lwt.return ( error_unexpected_annot loc result_annot >>? fun () -> @@ -3577,11 +3282,11 @@ and parse_instr : Item_t (v, Item_t (w, rest, stack_annot), cur_top_annot) ) -> error_unexpected_annot loc annot >>?= fun () -> - typed - ctxt - loc - Swap - (Item_t (w, Item_t (v, rest, cur_top_annot), stack_annot)) + let swap = {size = 0; apply = (fun kinfo k -> ISwap (kinfo, k))} in + let stack_ty = + Item_t (w, Item_t (v, rest, cur_top_annot), stack_annot) + in + typed ctxt loc swap stack_ty | (Prim (loc, I_PUSH, [t; d], annot), stack) -> parse_var_annot loc annot >>?= fun annot -> @@ -3595,26 +3300,32 @@ and parse_instr : ~allow_forged:false t d - >>=? fun (v, ctxt) -> typed ctxt loc (Const v) (Item_t (t, stack, annot)) + >>=? fun (v, ctxt) -> + let const = {size = 1; apply = (fun kinfo k -> IConst (kinfo, v, k))} in + typed ctxt loc const (Item_t (t, stack, annot)) | (Prim (loc, I_UNIT, [], annot), stack) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed ctxt loc (Const ()) (Item_t (Unit_t ty_name, stack, annot)) + let const = {size = 1; apply = (fun kinfo k -> IConst (kinfo, (), k))} in + typed ctxt loc const (Item_t (Unit_t ty_name, stack, annot)) (* options *) | (Prim (loc, I_SOME, [], annot), Item_t (t, rest, _)) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed ctxt loc Cons_some (Item_t (Option_t (t, ty_name), rest, annot)) + let cons_some = + {size = 1; apply = (fun kinfo k -> ICons_some (kinfo, k))} + in + typed ctxt loc cons_some (Item_t (Option_t (t, ty_name), rest, annot)) | (Prim (loc, I_NONE, [t], annot), stack) -> parse_any_ty ctxt ~legacy t >>?= fun (Ex_ty t, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed - ctxt - loc - (Cons_none t) - (Item_t (Option_t (t, ty_name), stack, annot)) + let cons_none = + {size = 1; apply = (fun kinfo k -> ICons_none (kinfo, t, k))} + in + let stack_ty = Item_t (Option_t (t, ty_name), stack, annot) in + typed ctxt loc cons_none stack_ty | ( Prim (loc, I_IF_NONE, [bt; bf], annot), (Item_t (Option_t (t, _), rest, option_annot) as bef) ) -> check_kind [Seq_kind] bt @@ -3626,16 +3337,22 @@ and parse_instr : let annot = gen_access_annot option_annot default_some_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt rest >>=? fun (btr, ctxt) -> - non_terminal_recursion - ?type_logger - tc_context - ctxt - ~legacy - bf - (Item_t (t, rest, annot)) + let stack_ty = Item_t (t, rest, annot) in + non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf stack_ty >>=? fun (bfr, ctxt) -> let branch ibt ibf = - {loc; instr = If_none (ibt, ibf); bef; aft = ibt.aft} + let ifnone = + { + size = 0; + apply = + (fun kinfo k -> + let btinfo = kinfo_of_descr ibt + and bfinfo = kinfo_of_descr ibf in + IIf_none + (kinfo, ibt.instr.apply btinfo k, ibf.instr.apply bfinfo k)); + } + in + {loc; instr = ifnone; bef; aft = ibt.aft} in merge_branches ~legacy ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement @@ -3648,22 +3365,24 @@ and parse_instr : ~if_special_first:(var_to_field_annot fst_annot) ~if_special_second:(var_to_field_annot snd_annot) >>?= fun (annot, ty_name, l_field, r_field) -> - typed - ctxt - loc - Cons_pair - (Item_t - ( Pair_t ((a, l_field, fst_annot), (b, r_field, snd_annot), ty_name), - rest, - annot )) + let stack_ty = + Item_t + ( Pair_t ((a, l_field, fst_annot), (b, r_field, snd_annot), ty_name), + rest, + annot ) + in + let cons_pair = + {size = 1; apply = (fun kinfo k -> ICons_pair (kinfo, k))} + in + typed ctxt loc cons_pair stack_ty | (Prim (loc, I_PAIR, [n], annot), stack_ty) -> parse_var_annot loc annot >>?= fun annot -> let rec make_proof_argument : - type before. + type a s. int -> - before stack_ty -> - (before comb_proof_argument * var_annot option) tzresult = + (a, s) stack_ty -> + ((a * s) comb_proof_argument * var_annot option) tzresult = fun n stack_ty -> match (n, stack_ty) with | (1, Item_t (a_ty, tl_ty, a_annot_opt)) -> @@ -3699,13 +3418,16 @@ and parse_instr : >>?= fun () -> make_proof_argument n stack_ty >>?= fun (Comb_proof_argument (witness, after_ty), _none) -> - typed ctxt loc (Comb (n, witness)) after_ty + let comb = + {size = 0; apply = (fun kinfo k -> IComb (kinfo, n, witness, k))} + in + typed ctxt loc comb after_ty | (Prim (loc, I_UNPAIR, [n], annot), stack_ty) -> error_unexpected_annot loc annot >>?= fun () -> let rec make_proof_argument : - type before. - int -> before stack_ty -> before uncomb_proof_argument tzresult = + type a s. + int -> (a, s) stack_ty -> (a * s) uncomb_proof_argument tzresult = fun n stack_ty -> match (n, stack_ty) with | (1, Item_t (a_ty, tl_ty, annot)) -> @@ -3737,13 +3459,15 @@ and parse_instr : >>?= fun () -> make_proof_argument n stack_ty >>?= fun (Uncomb_proof_argument (witness, after_ty)) -> - typed ctxt loc (Uncomb (n, witness)) after_ty + let uncomb = + {size = 0; apply = (fun kinfo k -> IUncomb (kinfo, n, witness, k))} + in + typed ctxt loc uncomb after_ty | (Prim (loc, I_GET, [n], annot), Item_t (comb_ty, rest_ty, _)) -> parse_var_annot loc annot >>?= fun annot -> let rec make_proof_argument : - type before. - int -> before ty -> before comb_get_proof_argument tzresult = + type b. int -> b ty -> b comb_get_proof_argument tzresult = fun n ty -> match (n, ty) with | (0, value_ty) -> @@ -3767,7 +3491,10 @@ and parse_instr : make_proof_argument n comb_ty >>?= fun (Comb_get_proof_argument (witness, ty')) -> let after_stack_ty = Item_t (ty', rest_ty, annot) in - typed ctxt loc (Comb_get (n, witness)) after_stack_ty + let comb_get = + {size = 0; apply = (fun kinfo k -> IComb_get (kinfo, n, witness, k))} + in + typed ctxt loc comb_get after_stack_ty | ( Prim (loc, I_UPDATE, [n], annot), Item_t (value_ty, Item_t (comb_ty, rest_ty, _), _) ) -> parse_var_annot loc annot @@ -3807,7 +3534,10 @@ and parse_instr : make_proof_argument n value_ty comb_ty >>?= fun (Comb_set_proof_argument (witness, after_ty)) -> let after_stack_ty = Item_t (after_ty, rest_ty, annot) in - typed ctxt loc (Comb_set (n, witness)) after_stack_ty + let comb_set = + {size = 0; apply = (fun kinfo k -> IComb_set (kinfo, n, witness, k))} + in + typed ctxt loc comb_set after_stack_ty | ( Prim (loc, I_UNPAIR, [], annot), Item_t ( Pair_t @@ -3829,7 +3559,8 @@ and parse_instr : >>?= fun () -> check_correct_field field_b expected_field_annot_b >>?= fun () -> - typed ctxt loc Unpair (Item_t (a, Item_t (b, rest, annot_b), annot_a)) + let unpair = {size = 0; apply = (fun kinfo k -> IUnpair (kinfo, k))} in + typed ctxt loc unpair (Item_t (a, Item_t (b, rest, annot_b), annot_a)) | ( Prim (loc, I_CAR, [], annot), Item_t (Pair_t ((a, expected_field_annot, a_annot), _, _), rest, pair_annot) @@ -3843,7 +3574,9 @@ and parse_instr : ~default_accessor:default_car_annot >>?= fun (annot, field_annot) -> check_correct_field field_annot expected_field_annot - >>?= fun () -> typed ctxt loc Car (Item_t (a, rest, annot)) + >>?= fun () -> + let car = {size = 0; apply = (fun kinfo k -> ICar (kinfo, k))} in + typed ctxt loc car (Item_t (a, rest, annot)) | ( Prim (loc, I_CDR, [], annot), Item_t (Pair_t (_, (b, expected_field_annot, b_annot), _), rest, pair_annot) @@ -3857,7 +3590,9 @@ and parse_instr : ~default_accessor:default_cdr_annot >>?= fun (annot, field_annot) -> check_correct_field field_annot expected_field_annot - >>?= fun () -> typed ctxt loc Cdr (Item_t (b, rest, annot)) + >>?= fun () -> + let cdr = {size = 0; apply = (fun kinfo k -> ICdr (kinfo, k))} in + typed ctxt loc cdr (Item_t (b, rest, annot)) (* unions *) | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest, stack_annot)) -> parse_any_ty ctxt ~legacy tr @@ -3867,11 +3602,13 @@ and parse_instr : annot ~if_special_first:(var_to_field_annot stack_annot) >>?= fun (annot, tname, l_field, r_field) -> - typed - ctxt - loc - Cons_left - (Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot)) + let cons_left = + {size = 1; apply = (fun kinfo k -> ICons_left (kinfo, k))} + in + let stack_ty = + Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot) + in + typed ctxt loc cons_left stack_ty | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest, stack_annot)) -> parse_any_ty ctxt ~legacy tl >>?= fun (Ex_ty tl, ctxt) -> @@ -3880,11 +3617,13 @@ and parse_instr : annot ~if_special_second:(var_to_field_annot stack_annot) >>?= fun (annot, tname, l_field, r_field) -> - typed - ctxt - loc - Cons_right - (Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot)) + let cons_right = + {size = 1; apply = (fun kinfo k -> ICons_right (kinfo, k))} + in + let stack_ty = + Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot) + in + typed ctxt loc cons_right stack_ty | ( Prim (loc, I_IF_LEFT, [bt; bf], annot), ( Item_t (Union_t ((tl, l_field), (tr, r_field), _), rest, union_annot) as bef ) ) -> @@ -3917,7 +3656,17 @@ and parse_instr : (Item_t (tr, rest, right_annot)) >>=? fun (bfr, ctxt) -> let branch ibt ibf = - {loc; instr = If_left (ibt, ibf); bef; aft = ibt.aft} + let infobt = kinfo_of_descr ibt and infobf = kinfo_of_descr ibf in + let instr = + { + size = 0; + apply = + (fun kinfo k -> + IIf_left + (kinfo, ibt.instr.apply infobt k, ibf.instr.apply infobf k)); + } + in + {loc; instr; bef; aft = ibt.aft} in merge_branches ~legacy ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement @@ -3927,14 +3676,19 @@ and parse_instr : >>?= fun (Ex_ty t, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed ctxt loc Nil (Item_t (List_t (t, ty_name), stack, annot)) + let nil = {size = 1; apply = (fun kinfo k -> INil (kinfo, k))} in + typed ctxt loc nil (Item_t (List_t (t, ty_name), stack, annot)) | ( Prim (loc, I_CONS, [], annot), Item_t (tv, Item_t (List_t (t, ty_name), rest, _), _) ) -> check_item_ty ctxt tv t loc I_CONS 1 2 >>?= fun (Eq, t, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Cons_list (Item_t (List_t (t, ty_name), rest, annot)) + let cons_list = + {size = 0; apply = (fun kinfo k -> ICons_list (kinfo, k))} + in + ( typed ctxt loc cons_list (Item_t (List_t (t, ty_name), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_IF_CONS, [bt; bf], annot), (Item_t (List_t (t, ty_name), rest, list_annot) as bef) ) -> check_kind [Seq_kind] bt @@ -3956,14 +3710,27 @@ and parse_instr : non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf rest >>=? fun (bfr, ctxt) -> let branch ibt ibf = - {loc; instr = If_cons (ibt, ibf); bef; aft = ibt.aft} + let infobt = kinfo_of_descr ibt and infobf = kinfo_of_descr ibf in + let instr = + { + size = 0; + apply = + (fun kinfo k -> + IIf_cons + (kinfo, ibt.instr.apply infobt k, ibf.instr.apply infobf k)); + } + in + {loc; instr; bef; aft = ibt.aft} in merge_branches ~legacy ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement | (Prim (loc, I_SIZE, [], annot), Item_t (List_t _, rest, _)) -> parse_var_type_annot loc annot >>?= fun (annot, tname) -> - typed ctxt loc List_size (Item_t (Nat_t tname, rest, annot)) + let list_size = + {size = 0; apply = (fun kinfo k -> IList_size (kinfo, k))} + in + typed ctxt loc list_size (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_MAP, [body], annot), Item_t (List_t (elt, _), starting_rest, list_annot) ) -> ( check_kind [Seq_kind] body @@ -3990,10 +3757,26 @@ and parse_instr : invalid_map_body ( merge_stacks ~legacy loc ctxt 1 rest starting_rest >>? fun (Eq, rest, ctxt) -> + let list_map = + { + size = 1; + apply = + (fun kinfo k -> + let binfo = kinfo_of_descr ibody in + let hinfo = + { + iloc = loc; + kstack_ty = Item_t (ret, rest, ret_annot); + } + in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IList_map (kinfo, ibody, k)); + } + in typed_no_lwt ctxt loc - (List_map ibody) + list_map (Item_t (List_t (ret, list_ty_name), rest, ret_annot)) ) | Typed {aft; _} -> Lwt.return @@ -4029,16 +3812,43 @@ and parse_instr : invalid_iter_body ( merge_stacks ~legacy loc ctxt 1 aft rest >>? fun (Eq, rest, ctxt) -> - typed_no_lwt ctxt loc (List_iter ibody) rest ) + let list_iter = + { + size = 0; + apply = + (fun kinfo k -> + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IList_iter (kinfo, ibody, k)); + } + in + ( typed_no_lwt ctxt loc list_iter rest + : ((a, s) judgement * context) tzresult ) ) | Failed {descr} -> - typed ctxt loc (List_iter (descr rest)) rest ) + let list_iter = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = descr rest in + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IList_iter (kinfo, ibody, k)); + } + in + typed ctxt loc list_iter rest ) (* sets *) | (Prim (loc, I_EMPTY_SET, [t], annot), rest) -> parse_comparable_ty ctxt t >>?= fun (Ex_comparable_ty t, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, tname) -> - typed ctxt loc (Empty_set t) (Item_t (Set_t (t, tname), rest, annot)) + let instr = + {size = 1; apply = (fun kinfo k -> IEmpty_set (kinfo, t, k))} + in + typed ctxt loc instr (Item_t (Set_t (t, tname), rest, annot)) | ( Prim (loc, I_ITER, [body], annot), Item_t (Set_t (comp_elt, _), rest, set_annot) ) -> ( check_kind [Seq_kind] body @@ -4068,9 +3878,33 @@ and parse_instr : invalid_iter_body ( merge_stacks ~legacy loc ctxt 1 aft rest >>? fun (Eq, rest, ctxt) -> - typed_no_lwt ctxt loc (Set_iter ibody) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + ISet_iter (kinfo, ibody, k)); + } + in + ( typed_no_lwt ctxt loc instr rest + : ((a, s) judgement * context) tzresult ) ) | Failed {descr} -> - typed ctxt loc (Set_iter (descr rest)) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = descr rest in + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + ISet_iter (kinfo, ibody, k)); + } + in + typed ctxt loc instr rest ) | ( Prim (loc, I_MEM, [], annot), Item_t (v, Item_t (Set_t (elt, _), rest, _), _) ) -> let elt = ty_of_comparable_ty elt in @@ -4078,7 +3912,9 @@ and parse_instr : >>?= fun (annot, tname) -> check_item_ty ctxt elt v loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - typed ctxt loc Set_mem (Item_t (Bool_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISet_mem (kinfo, k))} in + ( typed ctxt loc instr (Item_t (Bool_t tname, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_UPDATE, [], annot), Item_t ( v, @@ -4088,11 +3924,16 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot ~default:set_annot >>?= fun annot -> - typed ctxt loc Set_update (Item_t (Set_t (elt, tname), rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ISet_update (kinfo, k))} + in + ( typed ctxt loc instr (Item_t (Set_t (elt, tname), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Set_size (Item_t (Nat_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISet_size (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) (* maps *) | (Prim (loc, I_EMPTY_MAP, [tk; tv], annot), stack) -> parse_comparable_ty ctxt tk @@ -4101,11 +3942,10 @@ and parse_instr : >>?= fun (Ex_ty tv, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed - ctxt - loc - (Empty_map (tk, tv)) - (Item_t (Map_t (tk, tv, ty_name), stack, annot)) + let instr = + {size = 1; apply = (fun kinfo k -> IEmpty_map (kinfo, tk, tv, k))} + in + typed ctxt loc instr (Item_t (Map_t (tk, tv, ty_name), stack, annot)) | ( Prim (loc, I_MAP, [body], annot), Item_t (Map_t (ck, elt, _), starting_rest, _map_annot) ) -> ( let k = ty_of_comparable_ty ck in @@ -4137,10 +3977,26 @@ and parse_instr : invalid_map_body ( merge_stacks ~legacy loc ctxt 1 rest starting_rest >>? fun (Eq, rest, ctxt) -> + let instr = + { + size = 1; + apply = + (fun kinfo k -> + let binfo = kinfo_of_descr ibody in + let hinfo = + { + iloc = loc; + kstack_ty = Item_t (ret, rest, ret_annot); + } + in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IMap_map (kinfo, ibody, k)); + } + in typed_no_lwt ctxt loc - (Map_map ibody) + instr (Item_t (Map_t (ck, ret, ty_name), rest, ret_annot)) ) | Typed {aft; _} -> Lwt.return @@ -4181,9 +4037,33 @@ and parse_instr : invalid_iter_body ( merge_stacks ~legacy loc ctxt 1 aft rest >>? fun (Eq, rest, ctxt) -> - typed_no_lwt ctxt loc (Map_iter ibody) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IMap_iter (kinfo, ibody, k)); + } + in + ( typed_no_lwt ctxt loc instr rest + : ((a, s) judgement * context) tzresult ) ) | Failed {descr} -> - typed ctxt loc (Map_iter (descr rest)) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = descr rest in + let hinfo = {iloc = loc; kstack_ty = rest} in + let binfo = kinfo_of_descr ibody in + let ibody = ibody.instr.apply binfo (IHalt hinfo) in + IMap_iter (kinfo, ibody, k)); + } + in + typed ctxt loc instr rest ) | ( Prim (loc, I_MEM, [], annot), Item_t (vk, Item_t (Map_t (ck, _, _), rest, _), _) ) -> let k = ty_of_comparable_ty ck in @@ -4191,7 +4071,9 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Map_mem (Item_t (Bool_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IMap_mem (kinfo, k))} in + ( typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_GET, [], annot), Item_t (vk, Item_t (Map_t (ck, elt, _), rest, _), _) ) -> let k = ty_of_comparable_ty ck in @@ -4199,7 +4081,9 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Map_get (Item_t (Option_t (elt, None), rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IMap_get (kinfo, k))} in + ( typed ctxt loc instr (Item_t (Option_t (elt, None), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_UPDATE, [], annot), Item_t ( vk, @@ -4215,7 +4099,11 @@ and parse_instr : >>?= fun (Eq, v, ctxt) -> parse_var_annot loc annot ~default:map_annot >>?= fun annot -> - typed ctxt loc Map_update (Item_t (Map_t (ck, v, map_name), rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMap_update (kinfo, k))} + in + ( typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_GET_AND_UPDATE, [], annot), Item_t ( vk, @@ -4231,18 +4119,23 @@ and parse_instr : >>?= fun (Eq, v, ctxt) -> parse_var_annot loc annot ~default:map_annot >>?= fun annot -> - typed - ctxt - loc - Map_get_and_update - (Item_t - ( Option_t (vv, vname), - Item_t (Map_t (ck, v, map_name), rest, annot), - v_annot )) + let instr = + {size = 0; apply = (fun kinfo k -> IMap_get_and_update (kinfo, k))} + in + ( typed + ctxt + loc + instr + (Item_t + ( Option_t (vv, vname), + Item_t (Map_t (ck, v, map_name), rest, annot), + v_annot )) + : ((a, s) judgement * context) tzresult Lwt.t ) | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Map_size (Item_t (Nat_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IMap_size (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) (* big_map *) | (Prim (loc, I_EMPTY_BIG_MAP, [tk; tv], annot), stack) -> parse_comparable_ty ctxt tk @@ -4251,11 +4144,10 @@ and parse_instr : >>?= fun (Ex_ty tv, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> - typed - ctxt - loc - (Empty_big_map (tk, tv)) - (Item_t (Big_map_t (tk, tv, ty_name), stack, annot)) + let instr = + {size = 1; apply = (fun kinfo k -> IEmpty_big_map (kinfo, tk, tv, k))} + in + typed ctxt loc instr (Item_t (Big_map_t (tk, tv, ty_name), stack, annot)) | ( Prim (loc, I_MEM, [], annot), Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest, _), _) ) -> let k = ty_of_comparable_ty map_key in @@ -4263,7 +4155,11 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Big_map_mem (Item_t (Bool_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IBig_map_mem (kinfo, k))} + in + ( typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_GET, [], annot), Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest, _), _) ) -> let k = ty_of_comparable_ty ck in @@ -4271,7 +4167,11 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Big_map_get (Item_t (Option_t (elt, None), rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IBig_map_get (kinfo, k))} + in + ( typed ctxt loc instr (Item_t (Option_t (elt, None), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_UPDATE, [], annot), Item_t ( set_key, @@ -4287,11 +4187,15 @@ and parse_instr : >>?= fun (Eq, map_value, ctxt) -> parse_var_annot loc annot ~default:map_annot >>?= fun annot -> - typed - ctxt - loc - Big_map_update - (Item_t (Big_map_t (map_key, map_value, map_name), rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IBig_map_update (kinfo, k))} + in + ( typed + ctxt + loc + instr + (Item_t (Big_map_t (map_key, map_value, map_name), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_GET_AND_UPDATE, [], annot), Item_t ( vk, @@ -4307,24 +4211,34 @@ and parse_instr : >>?= fun (Eq, v, ctxt) -> parse_var_annot loc annot ~default:map_annot >>?= fun annot -> - typed - ctxt - loc - Big_map_get_and_update - (Item_t - ( Option_t (vv, vname), - Item_t (Big_map_t (ck, v, map_name), rest, annot), - v_annot )) + let instr = + {size = 0; apply = (fun kinfo k -> IBig_map_get_and_update (kinfo, k))} + in + ( typed + ctxt + loc + instr + (Item_t + ( Option_t (vv, vname), + Item_t (Big_map_t (ck, v, map_name), rest, annot), + v_annot )) + : ((a, s) judgement * context) tzresult Lwt.t ) (* Sapling *) | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> parse_memo_size memo_size >>?= fun memo_size -> parse_var_annot loc annot ~default:default_sapling_state_annot >>?= fun annot -> + let instr = + { + size = 0; + apply = (fun kinfo k -> ISapling_empty_state (kinfo, memo_size, k)); + } + in typed ctxt loc - (Sapling_empty_state {memo_size}) + instr (Item_t (Sapling_state_t (memo_size, None), rest, annot)) | ( Prim (loc, I_SAPLING_VERIFY_UPDATE, [], _), Item_t @@ -4336,10 +4250,13 @@ and parse_instr : _ ) ) -> merge_memo_sizes state_memo_size transaction_memo_size >>?= fun _memo_size -> + let instr = + {size = 0; apply = (fun kinfo k -> ISapling_verify_update (kinfo, k))} + in typed ctxt loc - Sapling_verify_update + instr (Item_t ( Option_t ( Pair_t @@ -4351,21 +4268,10 @@ and parse_instr : stack_annot )) (* control *) | (Seq (loc, []), stack) -> - typed ctxt loc Nop stack - | (Seq (loc, [single]), stack) -> ( + let instr = {size = 0; apply = (fun kinfo k -> INop (kinfo, k))} in + typed ctxt loc instr stack + | (Seq (_, [single]), stack) -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy single stack - >>=? fun (judgement, ctxt) -> - match judgement with - | Typed ({aft; _} as instr) -> - let nop = {bef = aft; loc; aft; instr = Nop} in - typed ctxt loc (Seq (instr, nop)) aft - | Failed {descr; _} -> - let descr aft = - let nop = {bef = aft; loc; aft; instr = Nop} in - let descr = descr aft in - {descr with instr = Seq (descr, nop)} - in - return ctxt (Failed {descr}) ) | (Seq (loc, hd :: tl), stack) -> ( non_terminal_recursion ?type_logger tc_context ctxt ~legacy hd stack >>=? fun (judgement, ctxt) -> @@ -4383,12 +4289,11 @@ and parse_instr : >>=? fun (judgement, ctxt) -> match judgement with | Failed {descr} -> - let descr ret = - {loc; instr = Seq (ihd, descr ret); bef = stack; aft = ret} - in + let descr ret = compose_descr loc ihd (descr ret) in return ctxt (Failed {descr}) | Typed itl -> - typed ctxt loc (Seq (ihd, itl)) itl.aft ) ) + ( Lwt.return (Ok (Typed (compose_descr loc ihd itl), ctxt)) + : ((a, s) judgement * context) tzresult Lwt.t ) ) ) | (Prim (loc, I_IF, [bt; bf], annot), (Item_t (Bool_t _, rest, _) as bef)) -> check_kind [Seq_kind] bt >>?= fun () -> @@ -4400,7 +4305,18 @@ and parse_instr : >>=? fun (btr, ctxt) -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf rest >>=? fun (bfr, ctxt) -> - let branch ibt ibf = {loc; instr = If (ibt, ibf); bef; aft = ibt.aft} in + let branch ibt ibf = + let infobt = kinfo_of_descr ibt and infobf = kinfo_of_descr ibf in + let instr = + { + size = 0; + apply = + (fun kinfo k -> + IIf (kinfo, ibt.instr.apply infobt k, ibf.instr.apply infobf k)); + } + in + {loc; instr; bef; aft = ibt.aft} + in merge_branches ~legacy ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement | ( Prim (loc, I_LOOP, [body], annot), @@ -4424,10 +4340,32 @@ and parse_instr : unmatched_branches ( merge_stacks ~legacy loc ctxt 1 ibody.aft stack >>? fun (Eq, _stack, ctxt) -> - typed_no_lwt ctxt loc (Loop ibody) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = + ibody.instr.apply (kinfo_of_descr ibody) (IHalt kinfo) + in + ILoop (kinfo, ibody, k)); + } + in + typed_no_lwt ctxt loc instr rest ) | Failed {descr} -> - let ibody = descr stack in - typed ctxt loc (Loop ibody) rest ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = descr stack in + let ibody = + ibody.instr.apply (kinfo_of_descr ibody) (IHalt kinfo) + in + ILoop (kinfo, ibody, k)); + } + in + typed ctxt loc instr rest ) | ( Prim (loc, I_LOOP_LEFT, [body], annot), (Item_t (Union_t ((tl, l_field), (tr, _), _), rest, union_annot) as stack) ) -> ( @@ -4459,14 +4397,32 @@ and parse_instr : unmatched_branches ( merge_stacks ~legacy loc ctxt 1 ibody.aft stack >>? fun (Eq, _stack, ctxt) -> - typed_no_lwt - ctxt - loc - (Loop_left ibody) - (Item_t (tr, rest, annot)) ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = + ibody.instr.apply (kinfo_of_descr ibody) (IHalt kinfo) + in + ILoop_left (kinfo, ibody, k)); + } + in + typed_no_lwt ctxt loc instr (Item_t (tr, rest, annot)) ) | Failed {descr} -> - let ibody = descr stack in - typed ctxt loc (Loop_left ibody) (Item_t (tr, rest, annot)) ) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let ibody = descr stack in + let ibody = + ibody.instr.apply (kinfo_of_descr ibody) (IHalt kinfo) + in + ILoop_left (kinfo, ibody, k)); + } + in + typed ctxt loc instr (Item_t (tr, rest, annot)) ) | (Prim (loc, I_LAMBDA, [arg; ret; code], annot), stack) -> parse_any_ty ctxt ~legacy arg >>?= fun (Ex_ty arg, ctxt) -> @@ -4486,17 +4442,19 @@ and parse_instr : ret code >>=? fun (lambda, ctxt) -> - typed - ctxt - loc - (Lambda lambda) - (Item_t (Lambda_t (arg, ret, None), stack, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ILambda (kinfo, lambda, k))} + in + typed ctxt loc instr (Item_t (Lambda_t (arg, ret, None), stack, annot)) | ( Prim (loc, I_EXEC, [], annot), Item_t (arg, Item_t (Lambda_t (param, ret, _), rest, _), _) ) -> check_item_ty ctxt arg param loc I_EXEC 1 2 >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Exec (Item_t (ret, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> IExec (kinfo, k))} in + ( typed ctxt loc instr (Item_t (ret, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_APPLY, [], annot), Item_t ( capture, @@ -4512,11 +4470,15 @@ and parse_instr : >>?= fun (Eq, capture_ty, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - (Apply capture_ty) - (Item_t (Lambda_t (arg_ty, ret, lam_annot), rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IApply (kinfo, capture_ty, k))} + in + ( typed + ctxt + loc + instr + (Item_t (Lambda_t (arg_ty, ret, lam_annot), rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | (Prim (loc, I_DIP, [code], annot), Item_t (v, rest, stack_annot)) -> ( error_unexpected_annot loc annot >>?= fun () -> @@ -4532,7 +4494,18 @@ and parse_instr : >>=? fun (judgement, ctxt) -> match judgement with | Typed descr -> - typed ctxt loc (Dip descr) (Item_t (v, descr.aft, stack_annot)) + let instr = + { + size = 0; + apply = + (fun kinfo k -> + let binfo = {iloc = descr.loc; kstack_ty = descr.bef} in + let kinfoh = {iloc = descr.loc; kstack_ty = descr.aft} in + let b = descr.instr.apply binfo (IHalt kinfoh) in + IDip (kinfo, kinfoh, b, k)); + } + in + typed ctxt loc instr (Item_t (v, descr.aft, stack_annot)) | Failed _ -> fail (Fail_not_in_tail_position loc) ) | (Prim (loc, I_DIP, [n; code], result_annot), stack) -> @@ -4541,12 +4514,11 @@ and parse_instr : Gas.consume ctxt (Typecheck_costs.proof_argument n) >>?= fun ctxt -> let rec make_proof_argument : - type tstk. - int - (* -> (fbef stack_ty -> (fbef judgement * context) tzresult Lwt.t) *) -> + type a s. + int -> tc_context -> - tstk stack_ty -> - tstk dipn_proof_argument tzresult Lwt.t = + (a, s) stack_ty -> + (a, s) dipn_proof_argument tzresult Lwt.t = fun n inner_tc_context stk -> match (Compare.Int.(n = 0), stk) with | (true, rest) -> ( @@ -4558,17 +4530,20 @@ and parse_instr : code rest >>=? fun (judgement, ctxt) -> - Lwt.return - @@ match judgement with | Typed descr -> - ok @@ Dipn_proof_argument (Rest, (ctxt, descr), descr.aft) + Lwt.return + (ok + ( Dipn_proof_argument (KRest, ctxt, descr, descr.aft) + : (a, s) dipn_proof_argument )) | Failed _ -> - error (Fail_not_in_tail_position loc) ) + Lwt.return (error (Fail_not_in_tail_position loc)) ) | (false, Item_t (v, rest, annot)) -> make_proof_argument (n - 1) (add_dip v annot tc_context) rest - >|=? fun (Dipn_proof_argument (n', descr, aft')) -> - Dipn_proof_argument (Prefix n', descr, Item_t (v, aft', annot)) + >|=? fun (Dipn_proof_argument (n', ctxt, descr, aft')) -> + let kinfo' = {iloc = loc; kstack_ty = aft'} in + let w = KPrefix (kinfo', n') in + Dipn_proof_argument (w, ctxt, descr, Item_t (v, aft', annot)) | (_, _) -> Lwt.return ( serialize_stack_for_error ctxt stack @@ -4578,62 +4553,78 @@ and parse_instr : error_unexpected_annot loc result_annot >>?= fun () -> make_proof_argument n tc_context stack - >>=? fun (Dipn_proof_argument (n', (new_ctxt, descr), aft)) -> + >>=? fun (Dipn_proof_argument (n', new_ctxt, descr, aft)) -> (* TODO: which context should be used in the next line? new_ctxt or the old ctxt? *) - typed new_ctxt loc (Dipn (n, n', descr)) aft + let kinfo = {iloc = descr.loc; kstack_ty = descr.bef} in + let kinfoh = {iloc = descr.loc; kstack_ty = descr.aft} in + let b = descr.instr.apply kinfo (IHalt kinfoh) in + let res = + {size = 0; apply = (fun kinfo k -> IDipn (kinfo, n, n', b, k))} + in + typed new_ctxt loc res aft | (Prim (loc, I_DIP, (([] | _ :: _ :: _ :: _) as l), _), _) -> (* Technically, the arities 1 and 2 are allowed but the error only mentions 2. - However, DIP {code} is equivalent to DIP 1 {code} so hinting at an arity of 2 makes sense. *) + However, DIP {code} is equivalent to DIP 1 {code} so hinting at an arity of 2 makes sense. *) fail (Invalid_arity (loc, I_DIP, 2, List.length l)) | (Prim (loc, I_FAILWITH, [], annot), Item_t (v, _rest, _)) -> error_unexpected_annot loc annot >>?= fun () -> (if legacy then ok_unit else check_packable ~legacy:false loc v) >>?= fun () -> - let descr aft = {loc; instr = Failwith v; bef = stack_ty; aft} in - log_stack ctxt loc stack_ty Empty_t + let instr = + {size = 0; apply = (fun kinfo k -> IFailwith (kinfo, loc, v, k))} + in + let descr aft = {loc; instr; bef = stack_ty; aft} in + log_stack ctxt loc stack_ty Bot_t >>?= fun () -> return ctxt (Failed {descr}) | (Prim (loc, I_NEVER, [], annot), Item_t (Never_t _, _rest, _)) -> error_unexpected_annot loc annot >>?= fun () -> - let descr aft = {loc; instr = Never; bef = stack_ty; aft} in - log_stack ctxt loc stack_ty Empty_t + let instr = {size = 0; apply = (fun kinfo k -> INever (kinfo, k))} in + let descr aft = {loc; instr; bef = stack_ty; aft} in + log_stack ctxt loc stack_ty Bot_t >>?= fun () -> return ctxt (Failed {descr}) (* timestamp operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Add_timestamp_to_seconds - (Item_t (Timestamp_t tname, rest, annot)) + let instr = + { + size = 0; + apply = (fun kinfo k -> IAdd_timestamp_to_seconds (kinfo, k)); + } + in + typed ctxt loc instr (Item_t (Timestamp_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Int_t _, Item_t (Timestamp_t tname, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Add_seconds_to_timestamp - (Item_t (Timestamp_t tname, rest, annot)) + let instr = + { + size = 0; + apply = (fun kinfo k -> IAdd_seconds_to_timestamp (kinfo, k)); + } + in + typed ctxt loc instr (Item_t (Timestamp_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Sub_timestamp_seconds - (Item_t (Timestamp_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ISub_timestamp_seconds (kinfo, k))} + in + typed ctxt loc instr (Item_t (Timestamp_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Timestamp_t tn1, Item_t (Timestamp_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Diff_timestamps (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IDiff_timestamps (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) (* string operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (String_t tn1, Item_t (String_t tn2, rest, _), _) ) -> @@ -4641,12 +4632,18 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Concat_string_pair (Item_t (String_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IConcat_string_pair (kinfo, k))} + in + typed ctxt loc instr (Item_t (String_t tname, rest, annot)) | ( Prim (loc, I_CONCAT, [], annot), Item_t (List_t (String_t tname, _), rest, list_annot) ) -> parse_var_annot ~default:list_annot loc annot >>?= fun annot -> - typed ctxt loc Concat_string (Item_t (String_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IConcat_string (kinfo, k))} + in + typed ctxt loc instr (Item_t (String_t tname, rest, annot)) | ( Prim (loc, I_SLICE, [], annot), Item_t ( Nat_t _, @@ -4657,15 +4654,21 @@ and parse_instr : loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> ISlice_string (kinfo, k))} + in typed ctxt loc - Slice_string + instr (Item_t (Option_t (String_t tname, None), rest, annot)) | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc String_size (Item_t (Nat_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IString_size (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) (* bytes operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (Bytes_t tn1, Item_t (Bytes_t tn2, rest, _), _) ) -> @@ -4673,12 +4676,18 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Concat_bytes_pair (Item_t (Bytes_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IConcat_bytes_pair (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bytes_t tname, rest, annot)) | ( Prim (loc, I_CONCAT, [], annot), Item_t (List_t (Bytes_t tname, _), rest, list_annot) ) -> parse_var_annot ~default:list_annot loc annot >>?= fun annot -> - typed ctxt loc Concat_bytes (Item_t (Bytes_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IConcat_bytes (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bytes_t tname, rest, annot)) | ( Prim (loc, I_SLICE, [], annot), Item_t ( Nat_t _, @@ -4689,15 +4698,21 @@ and parse_instr : loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} + in typed ctxt loc - Slice_bytes + instr (Item_t (Option_t (Bytes_t tname, None), rest, annot)) | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Bytes_size (Item_t (Nat_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IBytes_size (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) (* currency operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> @@ -4705,149 +4720,201 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Add_tez (Item_t (Mutez_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IAdd_tez (kinfo, k))} in + typed ctxt loc instr (Item_t (Mutez_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Sub_tez (Item_t (Mutez_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISub_tez (kinfo, k))} in + typed ctxt loc instr (Item_t (Mutez_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> (* no type name check *) parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Mul_teznat (Item_t (Mutez_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_teznat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Mutez_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Mutez_t tname, rest, _), _) ) -> (* no type name check *) parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Mul_nattez (Item_t (Mutez_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_nattez (kinfo, k))} + in + typed ctxt loc instr (Item_t (Mutez_t tname, rest, annot)) (* boolean operations *) | ( Prim (loc, I_OR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc Or (Item_t (Bool_t tname, rest, annot)) + >>?= fun tname -> + let instr = {size = 0; apply = (fun kinfo k -> IOr (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t tname, rest, annot)) | ( Prim (loc, I_AND, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc And (Item_t (Bool_t tname, rest, annot)) + >>?= fun tname -> + let instr = {size = 0; apply = (fun kinfo k -> IAnd (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t tname, rest, annot)) | ( Prim (loc, I_XOR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc Xor (Item_t (Bool_t tname, rest, annot)) + >>?= fun tname -> + let instr = {size = 0; apply = (fun kinfo k -> IXor (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t tname, rest, annot)) | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Not (Item_t (Bool_t tname, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> INot (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t tname, rest, annot)) (* integer operations *) | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Abs_int (Item_t (Nat_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IAbs_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest, int_annot)) -> parse_var_annot loc annot ~default:int_annot >>?= fun annot -> - typed ctxt loc Is_nat (Item_t (Option_t (Nat_t None, None), rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IIs_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Option_t (Nat_t None, None), rest, annot)) | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Int_nat (Item_t (Int_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IInt_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t None, rest, annot)) | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Neg_int (Item_t (Int_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INeg_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Neg_nat (Item_t (Int_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INeg_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t None, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Add_intint (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_intint (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Add_intnat (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_intnat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Add_natint (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_natint (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Add_natnat (Item_t (Nat_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_natnat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISub_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISub_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISub_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_SUB, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun _tname -> - typed ctxt loc Sub_int (Item_t (Int_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISub_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t None, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Mul_intint (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_intint (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Mul_intnat (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_intnat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Mul_natint (Item_t (Int_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_natint (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Mul_natnat (Item_t (Nat_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_natnat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_EDIV, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> IEdiv_teznat (kinfo, k))} + in typed ctxt loc - Ediv_teznat + instr (Item_t ( Option_t ( Pair_t @@ -4863,10 +4930,11 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> + let instr = {size = 0; apply = (fun kinfo k -> IEdiv_tez (kinfo, k))} in typed ctxt loc - Ediv_tez + instr (Item_t ( Option_t ( Pair_t @@ -4880,10 +4948,13 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> + let instr = + {size = 0; apply = (fun kinfo k -> IEdiv_intint (kinfo, k))} + in typed ctxt loc - Ediv_intint + instr (Item_t ( Option_t ( Pair_t @@ -4895,10 +4966,13 @@ and parse_instr : Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> IEdiv_intnat (kinfo, k))} + in typed ctxt loc - Ediv_intnat + instr (Item_t ( Option_t ( Pair_t @@ -4910,10 +4984,13 @@ and parse_instr : Item_t (Nat_t tname, Item_t (Int_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> IEdiv_natint (kinfo, k))} + in typed ctxt loc - Ediv_natint + instr (Item_t ( Option_t ( Pair_t @@ -4927,10 +5004,13 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> + let instr = + {size = 0; apply = (fun kinfo k -> IEdiv_natnat (kinfo, k))} + in typed ctxt loc - Ediv_natnat + instr (Item_t ( Option_t ( Pair_t @@ -4944,48 +5024,58 @@ and parse_instr : >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Lsl_nat (Item_t (Nat_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ILsl_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_LSR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Lsr_nat (Item_t (Nat_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ILsr_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_OR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Or_nat (Item_t (Nat_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IOr_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_AND, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc And_nat (Item_t (Nat_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IAnd_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_AND, [], annot), Item_t (Int_t _, Item_t (Nat_t tname, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc And_int_nat (Item_t (Nat_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAnd_int_nat (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | ( Prim (loc, I_XOR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed ctxt loc Xor_nat (Item_t (Nat_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IXor_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t tname, rest, annot)) | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Not_int (Item_t (Int_t tname, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INot_int (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t tname, rest, annot)) | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Not_nat (Item_t (Int_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INot_nat (kinfo, k))} in + typed ctxt loc instr (Item_t (Int_t None, rest, annot)) (* comparison *) | (Prim (loc, I_COMPARE, [], annot), Item_t (t1, Item_t (t2, rest, _), _)) -> parse_var_annot loc annot @@ -4994,26 +5084,42 @@ and parse_instr : >>?= fun (Eq, t, ctxt) -> comparable_ty_of_ty ctxt loc t >>?= fun (key, ctxt) -> - typed ctxt loc (Compare key) (Item_t (Int_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ICompare (kinfo, key, k))} + in + ( typed ctxt loc instr (Item_t (Int_t None, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) (* comparators *) | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Eq (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> IEq (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Neq (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> INeq (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Lt (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> ILt (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Gt (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> IGt (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Le (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> ILe (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest, _)) -> parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Ge (Item_t (Bool_t None, rest, annot)) + >>?= fun annot -> + let instr = {size = 0; apply = (fun kinfo k -> IGe (kinfo, k))} in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) (* annotations *) | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack, item_annot)) -> parse_var_annot loc annot ~default:item_annot @@ -5022,12 +5128,15 @@ and parse_instr : >>?= fun (Ex_ty cast_t, ctxt) -> merge_types ~legacy ctxt loc cast_t t >>?= fun (Eq, _, ctxt) -> - typed ctxt loc Nop (Item_t (cast_t, stack, annot)) - | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack, _)) -> + let instr = {size = 0; apply = (fun kinfo k -> INop (kinfo, k))} in + ( typed ctxt loc instr (Item_t (cast_t, stack, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) + | (Prim (loc, I_RENAME, [], annot), Item_t (t, (Item_t _ as stack), _)) -> parse_var_annot loc annot >>?= fun annot -> (* can erase annot *) - typed ctxt loc Nop (Item_t (t, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INop (kinfo, k))} in + typed ctxt loc instr (Item_t (t, stack, annot)) (* packing *) | (Prim (loc, I_PACK, [], annot), Item_t (t, rest, unpacked_annot)) -> check_packable @@ -5040,7 +5149,8 @@ and parse_instr : annot ~default:(gen_access_annot unpacked_annot default_pack_annot) >>?= fun annot -> - typed ctxt loc (Pack t) (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IPack (kinfo, t, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest, packed_annot)) -> parse_packable_ty ctxt ~legacy ty @@ -5052,7 +5162,8 @@ and parse_instr : annot ~default:(gen_access_annot packed_annot default_unpack_annot) in - typed ctxt loc (Unpack t) (Item_t (Option_t (t, ty_name), rest, annot)) + let instr = {size = 1; apply = (fun kinfo k -> IUnpack (kinfo, t, k))} in + typed ctxt loc instr (Item_t (Option_t (t, ty_name), rest, annot)) (* protocol *) | ( Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest, contract_annot) ) -> @@ -5061,7 +5172,8 @@ and parse_instr : annot ~default:(gen_access_annot contract_annot default_addr_annot) >>?= fun annot -> - typed ctxt loc Address (Item_t (Address_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IAddress (kinfo, k))} in + typed ctxt loc instr (Item_t (Address_t None, rest, annot)) | ( Prim (loc, I_CONTRACT, [ty], annot), Item_t (Address_t _, rest, addr_annot) ) -> parse_parameter_ty ctxt ~legacy ty @@ -5081,10 +5193,16 @@ and parse_instr : error (Entrypoint_name_too_long entrypoint) else Ok entrypoint ) >>?= fun entrypoint -> + let instr = + { + size = 1; + apply = (fun kinfo k -> IContract (kinfo, t, entrypoint, k)); + } + in typed ctxt loc - (Contract (t, entrypoint)) + instr (Item_t (Option_t (Contract_t (t, None), None), rest, annot)) | ( Prim (loc, I_TRANSFER_TOKENS, [], annot), Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest, _), _), _) @@ -5093,22 +5211,32 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Transfer_tokens (Item_t (Operation_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ITransfer_tokens (kinfo, k))} + in + ( typed ctxt loc instr (Item_t (Operation_t None, rest, annot)) + : ((a, s) judgement * context) tzresult Lwt.t ) | ( Prim (loc, I_SET_DELEGATE, [], annot), Item_t (Option_t (Key_hash_t _, _), rest, _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Set_delegate (Item_t (Operation_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ISet_delegate (kinfo, k))} + in + typed ctxt loc instr (Item_t (Operation_t None, rest, annot)) | (Prim (_, I_CREATE_ACCOUNT, _, _), _) -> fail (Deprecated_instruction I_CREATE_ACCOUNT) | (Prim (loc, I_IMPLICIT_ACCOUNT, [], annot), Item_t (Key_hash_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> + let instr = + {size = 0; apply = (fun kinfo k -> IImplicit_account (kinfo, k))} + in typed ctxt loc - Implicit_account + instr (Item_t (Contract_t (Unit_t None, None), rest, annot)) | ( Prim (loc, I_CREATE_CONTRACT, [(Seq _ as code)], annot), Item_t @@ -5170,8 +5298,8 @@ and parse_instr : ret_type_full code_field) >>=? fun ( ( Lam - ( { bef = Item_t (arg, Empty_t, _); - aft = Item_t (ret, Empty_t, _); + ( { kbef = Item_t (arg, Bot_t, _); + kaft = Item_t (ret, Bot_t, _); _ }, _ ) as lambda ), ctxt ) -> @@ -5181,10 +5309,19 @@ and parse_instr : >>?= fun (Eq, _, ctxt) -> merge_types ~legacy ctxt loc storage_type ginit >>?= fun (Eq, _, ctxt) -> + let instr = + { + size = 0; + apply = + (fun kinfo k -> + ICreate_contract + (kinfo, storage_type, arg_type, lambda, root_name, k)); + } + in typed ctxt loc - (Create_contract (storage_type, arg_type, lambda, root_name)) + instr (Item_t ( Operation_t None, Item_t (Address_t None, rest, addr_annot), @@ -5192,41 +5329,54 @@ and parse_instr : | (Prim (loc, I_NOW, [], annot), stack) -> parse_var_annot loc annot ~default:default_now_annot >>?= fun annot -> - typed ctxt loc Now (Item_t (Timestamp_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> INow (kinfo, k))} in + typed ctxt loc instr (Item_t (Timestamp_t None, stack, annot)) | (Prim (loc, I_AMOUNT, [], annot), stack) -> parse_var_annot loc annot ~default:default_amount_annot >>?= fun annot -> - typed ctxt loc Amount (Item_t (Mutez_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IAmount (kinfo, k))} in + typed ctxt loc instr (Item_t (Mutez_t None, stack, annot)) | (Prim (loc, I_CHAIN_ID, [], annot), stack) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc ChainId (Item_t (Chain_id_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IChainId (kinfo, k))} in + typed ctxt loc instr (Item_t (Chain_id_t None, stack, annot)) | (Prim (loc, I_BALANCE, [], annot), stack) -> parse_var_annot loc annot ~default:default_balance_annot >>?= fun annot -> - typed ctxt loc Balance (Item_t (Mutez_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IBalance (kinfo, k))} in + typed ctxt loc instr (Item_t (Mutez_t None, stack, annot)) | (Prim (loc, I_LEVEL, [], annot), stack) -> parse_var_annot loc annot ~default:default_level_annot >>?= fun annot -> - typed ctxt loc Level (Item_t (Nat_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ILevel (kinfo, k))} in + typed ctxt loc instr (Item_t (Nat_t None, stack, annot)) | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Voting_power (Item_t (Nat_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IVoting_power (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t None, rest, annot)) | (Prim (loc, I_TOTAL_VOTING_POWER, [], annot), stack) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Total_voting_power (Item_t (Nat_t None, stack, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ITotal_voting_power (kinfo, k))} + in + typed ctxt loc instr (Item_t (Nat_t None, stack, annot)) | (Prim (_, I_STEPS_TO_QUOTA, _, _), _) -> fail (Deprecated_instruction I_STEPS_TO_QUOTA) | (Prim (loc, I_SOURCE, [], annot), stack) -> parse_var_annot loc annot ~default:default_source_annot >>?= fun annot -> - typed ctxt loc Source (Item_t (Address_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISource (kinfo, k))} in + typed ctxt loc instr (Item_t (Address_t None, stack, annot)) | (Prim (loc, I_SENDER, [], annot), stack) -> parse_var_annot loc annot ~default:default_sender_annot >>?= fun annot -> - typed ctxt loc Sender (Item_t (Address_t None, stack, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISender (kinfo, k))} in + typed ctxt loc instr (Item_t (Address_t None, stack, annot)) | (Prim (loc, I_SELF, [], annot), stack) -> Lwt.return ( parse_entrypoint_annot loc annot ~default:default_self_annot @@ -5238,7 +5388,7 @@ and parse_instr : entrypoint in let rec get_toplevel_type : - tc_context -> (bef judgement * context) tzresult = function + tc_context -> ((a, s) judgement * context) tzresult = function | Lambda -> error (Self_in_lambda loc) | Dip (_, prev) -> @@ -5248,181 +5398,197 @@ and parse_instr : -> find_entrypoint param_type ~root_name entrypoint >>? fun (_, Ex_ty param_type) -> + let instr = + { + size = 1; + apply = + (fun kinfo k -> ISelf (kinfo, param_type, entrypoint, k)); + } + in typed_no_lwt ctxt loc - (Self (param_type, entrypoint)) + instr (Item_t (Contract_t (param_type, None), stack, annot)) | Toplevel {param_type; root_name = _; legacy_create_contract_literal = true} -> + let instr = + { + size = 1; + apply = + (fun kinfo k -> ISelf (kinfo, param_type, "default", k)); + } + in typed_no_lwt ctxt loc - (Self (param_type, "default")) + instr (Item_t (Contract_t (param_type, None), stack, annot)) in get_toplevel_type tc_context ) | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> parse_var_annot loc annot ~default:default_self_annot >>?= fun annot -> - typed ctxt loc Self_address (Item_t (Address_t None, stack, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ISelf_address (kinfo, k))} + in + typed ctxt loc instr (Item_t (Address_t None, stack, annot)) (* cryptography *) | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Hash_key (Item_t (Key_hash_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IHash_key (kinfo, k))} in + typed ctxt loc instr (Item_t (Key_hash_t None, rest, annot)) | ( Prim (loc, I_CHECK_SIGNATURE, [], annot), Item_t (Key_t _, Item_t (Signature_t _, Item_t (Bytes_t _, rest, _), _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Check_signature (Item_t (Bool_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> ICheck_signature (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Blake2b (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IBlake2b (kinfo, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Sha256 (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISha256 (kinfo, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Sha512 (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISha512 (kinfo, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Keccak (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> IKeccak (kinfo, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Sha3 (Item_t (Bytes_t None, rest, annot)) + let instr = {size = 0; apply = (fun kinfo k -> ISha3 (kinfo, k))} in + typed ctxt loc instr (Item_t (Bytes_t None, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g1_t tn1, Item_t (Bls12_381_g1_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_bls12_381_g1 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g1_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g2_t tn1, Item_t (Bls12_381_g2_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_bls12_381_g2 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g2_t tname, rest, annot)) | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_fr_t tn1, Item_t (Bls12_381_fr_t tn2, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> merge_type_annot ~legacy tn1 tn2 >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IAdd_bls12_381_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g1_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_g1 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g1_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g2_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_g2 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g2_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_fr_z - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Int_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_fr_z - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_z_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest, _), _) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_z_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed ctxt loc Int_bls12_381_fr (Item_t (Int_t None, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> IInt_bls12_381_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Int_t None, rest, annot)) | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> INeg_bls12_381_g1 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g1_t tname, rest, annot)) | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> INeg_bls12_381_g2 (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_g2_t tname, rest, annot)) | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest, _)) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) + let instr = + {size = 0; apply = (fun kinfo k -> INeg_bls12_381_fr (kinfo, k))} + in + typed ctxt loc instr (Item_t (Bls12_381_fr_t tname, rest, annot)) | ( Prim (loc, I_PAIRING_CHECK, [], annot), Item_t ( List_t @@ -5431,11 +5597,13 @@ and parse_instr : _ ) ) -> parse_var_annot loc annot >>?= fun annot -> - typed - ctxt - loc - Pairing_check_bls12_381 - (Item_t (Bool_t None, rest, annot)) + let instr = + { + size = 0; + apply = (fun kinfo k -> IPairing_check_bls12_381 (kinfo, k)); + } + in + typed ctxt loc instr (Item_t (Bool_t None, rest, annot)) (* Tickets *) | (Prim (loc, I_TICKET, [], annot), Item_t (t, Item_t (Nat_t _, rest, _), _)) -> @@ -5443,14 +5611,18 @@ and parse_instr : >>?= fun annot -> comparable_ty_of_ty ctxt loc t >>?= fun (ty, ctxt) -> - typed ctxt loc Ticket (Item_t (Ticket_t (ty, None), rest, annot)) + let instr = {size = 1; apply = (fun kinfo k -> ITicket (kinfo, k))} in + typed ctxt loc instr (Item_t (Ticket_t (ty, None), rest, annot)) | ( Prim (loc, I_READ_TICKET, [], annot), (Item_t (Ticket_t (t, _), _, _) as full_stack) ) -> parse_var_annot loc annot >>?= fun annot -> let () = check_dupable_comparable_ty t in let result = ty_of_comparable_ty @@ opened_ticket_type t in - typed ctxt loc Read_ticket (Item_t (result, full_stack, annot)) + let instr = + {size = 1; apply = (fun kinfo k -> IRead_ticket (kinfo, k))} + in + typed ctxt loc instr (Item_t (result, full_stack, annot)) | ( Prim (loc, I_SPLIT_TICKET, [], annot), Item_t ( (Ticket_t (t, _) as ticket_t), @@ -5464,7 +5636,10 @@ and parse_instr : Option_t (Pair_t ((ticket_t, fa_a, a_a), (ticket_t, fa_b, a_b), None), None) in - typed ctxt loc Split_ticket (Item_t (result, rest, annot)) + let instr = + {size = 1; apply = (fun kinfo k -> ISplit_ticket (kinfo, k))} + in + typed ctxt loc instr (Item_t (result, rest, annot)) | ( Prim (loc, I_JOIN_TICKETS, [], annot), Item_t ( Pair_t (((Ticket_t _ as ty_a), _, _), ((Ticket_t _ as ty_b), _, _), _), @@ -5476,11 +5651,13 @@ and parse_instr : >>?= fun (Eq, ty, ctxt) -> match ty with | Ticket_t (contents_ty, _) -> - typed - ctxt - loc - (Join_tickets contents_ty) - (Item_t (Option_t (ty, None), rest, annot)) + let instr = + { + size = 0; + apply = (fun kinfo k -> IJoin_tickets (kinfo, contents_ty, k)); + } + in + typed ctxt loc instr (Item_t (Option_t (ty, None), rest, annot)) | _ -> (* TODO: fix injectivity of types *) assert false ) (* Primitive parsing errors *) @@ -5627,7 +5804,7 @@ and parse_instr : | I_LE | I_GE (* CONCAT is both unary and binary; this case can only be triggered - on a singleton stack *) + on a singleton stack *) | I_CONCAT ) as name ), [], _ ), @@ -7306,7 +7483,24 @@ let list_of_big_map_ids ids = let parse_data = parse_data ~stack_depth:0 -let parse_instr = parse_instr ~stack_depth:0 +let parse_instr : + type a s. + ?type_logger:type_logger -> + tc_context -> + context -> + legacy:bool -> + Script.node -> + (a, s) stack_ty -> + ((a, s) judgement * context) tzresult Lwt.t = + fun ?type_logger tc_context ctxt ~legacy script_instr stack_ty -> + parse_instr + ~stack_depth:0 + ?type_logger + tc_context + ctxt + ~legacy + script_instr + stack_ty let unparse_data = unparse_data ~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 09aa2b3403aaa8d4c1c382bffc9584c1a1cbbbf9..e411d20dcdcbe69029befa7244a165fdea42c229 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -33,7 +33,8 @@ type ex_comparable_ty = type ex_ty = Ex_ty : 'a Script_typed_ir.ty -> ex_ty -type ex_stack_ty = Ex_stack_ty : 'a Script_typed_ir.stack_ty -> ex_stack_ty +type ex_stack_ty = + | Ex_stack_ty : ('a, 's) Script_typed_ir.stack_ty -> ex_stack_ty type ex_script = Ex_script : ('a, 'b) Script_typed_ir.script -> ex_script @@ -53,7 +54,7 @@ type ex_code = Ex_code : ('a, 'c) code -> ex_code type tc_context = | Lambda : tc_context - | Dip : 'a Script_typed_ir.stack_ty * tc_context -> tc_context + | Dip : ('a, 's) Script_typed_ir.stack_ty * tc_context -> tc_context | Toplevel : { storage_type : 'sto Script_typed_ir.ty; param_type : 'param Script_typed_ir.ty; @@ -62,14 +63,14 @@ type tc_context = } -> tc_context -type 'bef judgement = - | Typed : ('bef, 'aft) Script_typed_ir.descr -> 'bef judgement +type ('a, 's) judgement = + | Typed : ('a, 's, 'b, 'u) Script_typed_ir.descr -> ('a, 's) judgement | Failed : { descr : - 'aft. 'aft Script_typed_ir.stack_ty -> - ('bef, 'aft) Script_typed_ir.descr; + 'b 'u. ('b, 'u) Script_typed_ir.stack_ty -> + ('a, 's, 'b, 'u) Script_typed_ir.descr; } - -> 'bef judgement + -> ('a, 's) judgement type unparsing_mode = Optimized | Readable | Optimized_legacy @@ -190,8 +191,8 @@ val parse_instr : context -> legacy:bool -> Script.node -> - 'bef Script_typed_ir.stack_ty -> - ('bef judgement * context) tzresult Lwt.t + ('a, 's) Script_typed_ir.stack_ty -> + (('a, 's) judgement * context) tzresult Lwt.t (** [parse_ty] specialized for the right-hand side part of a big map type, i.e. diff --git a/src/proto_alpha/lib_protocol/script_repr.ml b/src/proto_alpha/lib_protocol/script_repr.ml index c9c74ede84691e7db71045f4455b9ee6fed99095..d7fefc5a5483ab6a90cded0c9baebe805dbbe046 100644 --- a/src/proto_alpha/lib_protocol/script_repr.ml +++ b/src/proto_alpha/lib_protocol/script_repr.ml @@ -98,7 +98,9 @@ let seq_node_size_nonrec args = let n_args = List.length args in seq_node_size_nonrec_of_length n_args -let convert_pair (i1, i2) = (Z.of_int i1, Z.of_int i2) +module S = Saturation_repr + +let convert_pair (i1, i2) = (S.safe_int i1, S.safe_int i2) let rec node_size node = let open Micheline in @@ -113,14 +115,14 @@ let rec node_size node = List.fold_left (fun (blocks, words) node -> let (nblocks, nwords) = node_size node in - (Z.add blocks nblocks, Z.add words nwords)) + (S.add blocks nblocks, S.add words nwords)) (convert_pair (prim_node_size_nonrec args annot)) args | Seq (_, args) -> List.fold_left (fun (blocks, words) node -> let (nblocks, nwords) = node_size node in - (Z.add blocks nblocks, Z.add words nwords)) + (S.add blocks nblocks, S.add words nwords)) (convert_pair (seq_node_size_nonrec args)) args @@ -132,7 +134,7 @@ let traversal_cost node = let cost_of_size (blocks, words) = let open Gas_limit_repr in - (Compare.Z.max Z.zero (Z.sub blocks Z.one) *@ alloc_cost Z.zero) + (S.sub blocks (S.safe_int 1) *@ alloc_cost S.zero) +@ alloc_cost words +@ step_cost blocks let cost_of_size_int pair = cost_of_size (convert_pair pair) @@ -255,7 +257,8 @@ and micheline_nodes_list subterms acc k = let micheline_nodes node = micheline_nodes node 0 (fun x -> x) -let cost_MICHELINE_STRIP_LOCATIONS size = Z.mul (Z.of_int size) (Z.of_int 100) +let cost_MICHELINE_STRIP_LOCATIONS size = + S.mul (S.safe_int size) (S.safe_int 100) let strip_locations_cost node = let nodes = micheline_nodes node in diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index 13388c9f8e5c4d44634ce1dd2b120f9f636ec70c..8f5b5e698dc174ade3294d11bc221c7d399a3c61 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -1,7 +1,7 @@ (*****************************************************************************) (* *) (* Open Source License *) -(* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) +(* Copyright (c) 2020 Dynamic Ledger Solutions, Inc. *) (* Copyright (c) 2020 Metastate AG *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) @@ -27,7 +27,7 @@ open Alpha_context open Script_int -(* ---- Auxiliary types -----------------------------------------------------*) +(* Preliminary definitions. *) type var_annot = Var_annot of string @@ -35,13 +35,19 @@ type type_annot = Type_annot of string type field_annot = Field_annot of string +type never = | + type address = Contract.t * string type ('a, 'b) pair = 'a * 'b type ('a, 'b) union = L of 'a | R of 'b -type never = | +type operation = packed_internal_operation * Lazy_storage.diffs option + +type 'a ticket = {ticketer : address; contents : 'a; amount : n num} + +type end_of_stack = unit * unit type _ comparable_ty = | Unit_key : type_annot option -> unit comparable_ty @@ -101,28 +107,758 @@ end type ('key, 'value) map = (module Boxed_map with type key = 'key and type value = 'value) -type operation = packed_internal_operation * Lazy_storage.diffs option +(* ---- Instructions --------------------------------------------------------*) -type 'a ticket = {ticketer : address; contents : 'a; amount : n num} +(* -type ('arg, 'storage) script = { - code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; - arg_type : 'arg ty; - storage : 'storage; - storage_type : 'storage ty; - root_name : field_annot option; -} + The instructions of Michelson are represented in the following + Generalized Algebraic Datatypes. + + There are three important aspects in that type declaration. + + First, we follow a tagless approach for values: they are directly + represented as OCaml values. This reduces the computational cost of + interpretation because there is no need to check the shape of a + value before applying an operation to it. To achieve that, the GADT + encodes the typing rules of the Michelson programming + language. This static information is sufficient for the typechecker + to justify the absence of runtime checks. As a bonus, it also + ensures that well-typed Michelson programs cannot go wrong: if the + interpreter typechecks then we have the static guarantee that no + stack underflow or type error can occur at runtime. + + Second, we maintain the invariant that the stack type always has a + distinguished topmost element. This invariant is important to + implement the stack as an accumulator followed by a linked list of + cells. This representation is considered in the literature as an + efficient representation of the stack for a stack-based abstract + machine, mainly because this opens the opportunity for the + accumulator to be stored in a hardware register. In the GADT, this + invariant is encoded by representing the stack type using two + parameters instead of one: the first one is the type of the + accumulator while the second is the type of the rest of the stack. + + Third, in this representation, each instruction embeds its + potential successor instructions in the control flow. This design + choice permits an efficient implementation of the continuation + stack in the interpreter. Assigning a precise type to this kind of + instruction which is a cell in a linked list of instructions is + similar to the typing of delimited continuations: we need to give a + type [`bef] to the stack before the execution of the instruction, a + type [`aft] to the stack after the execution of the instruction and + before the execution of the next, and a type [`res] for the resulting + stack type after the execution of the whole chain of instructions. + + Combining these three aspects, the type [kinstr] needs four parameters: + + ('bef_top, 'bef, 'res_top, `res) kinstr + + Notice that we could have chosen to only give two parameters to [kinstr] + by manually enforcing each argument to be a pair but this is + error-prone: with four parameters, this constraint is enforced by the arity of + the type constructor itself. + + Hence, an instruction which has a successor instruction enjoys a + type of the form: + + ('aft_top, 'aft, 'res_top, 'res) kinstr -> + ('bef_top, 'bef, 'res_top, 'res) kinstr + + where [bef_top] and [bef] are the types of the stack top and rest + before the instruction chain, and [res_top] and [res] are the types + of the stack top and rest after the instruction chain + + Notations: + ---------- + + In the following declaration, we use 'a, 'b, 'c, 'd, ... + to assign types to stack cell contents while we use 's, 't, + 'u, 'v, ... to assign types to stacks. + + The types for the final result and stack rest of a whole + sequence of instructions are written 'r and 'f + (standing for "result" and "final stack rest", respectively). + + Instructions for internal execution steps + ========================================= + + Some instructions of the following list are not present in the + source language. They only appear during evaluation to account + for intermediate execution steps. Indeed, since the interpreter + follows a small-step style, it is sometimes necessary to decompose + a source-level instruction (e.g. List_map) into several instructions + with smaller steps. This technique seems required to get an efficient + tail-recursive interpreter. + +*) -and end_of_stack = unit +type ('bef_top, 'bef, 'res_top, 'res) kinstr = + (* + Stack + ----- + *) + | IDrop : + ('a, 'b * 's) kinfo * ('b, 's, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | IDup : + ('a, 's) kinfo * ('a, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISwap : + ('a, 'b * 's) kinfo * ('b, 'a * 's, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | IConst : + ('a, 's) kinfo * 'ty * ('ty, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + (* + Pairs + ----- + *) + | ICons_pair : + ('a, 'b * 's) kinfo * ('a * 'b, 's, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | ICar : + ('a * 'b, 's) kinfo * ('a, 's, 'r, 'f) kinstr + -> ('a * 'b, 's, 'r, 'f) kinstr + | ICdr : + ('a * 'b, 's) kinfo * ('b, 's, 'r, 'f) kinstr + -> ('a * 'b, 's, 'r, 'f) kinstr + | IUnpair : + ('a * 'b, 's) kinfo * ('a, 'b * 's, 'r, 'f) kinstr + -> ('a * 'b, 's, 'r, 'f) kinstr + (* + Options + ------- + *) + | ICons_some : + ('v, 's) kinfo * ('v option, 's, 'r, 'f) kinstr + -> ('v, 's, 'r, 'f) kinstr + | ICons_none : + ('a, 's) kinfo * 'b ty * ('b option, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IIf_none : + ('a option, 'b * 's) kinfo + (* Notice that the continuations of the following two + instructions should have a shared suffix to avoid code + duplication. *) + * ('b, 's, 'r, 'f) kinstr + * ('a, 'b * 's, 'r, 'f) kinstr + -> ('a option, 'b * 's, 'r, 'f) kinstr + (* + Unions + ------ + *) + | ICons_left : + ('a, 's) kinfo * (('a, 'b) union, 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ICons_right : + ('b, 's) kinfo * (('a, 'b) union, 's, 'r, 'f) kinstr + -> ('b, 's, 'r, 'f) kinstr + | IIf_left : + (('a, 'b) union, 's) kinfo + (* Notice that the continuations of the following two + instructions should have a shared suffix to avoid code + duplication. *) + * ('a, 's, 'r, 'f) kinstr + * ('b, 's, 'r, 'f) kinstr + -> (('a, 'b) union, 's, 'r, 'f) kinstr + (* + Lists + ----- + *) + | ICons_list : + ('a, 'a boxed_list * 's) kinfo * ('a boxed_list, 's, 'r, 'f) kinstr + -> ('a, 'a boxed_list * 's, 'r, 'f) kinstr + | INil : + ('a, 's) kinfo * ('b boxed_list, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IIf_cons : + ('a boxed_list, 'b * 's) kinfo + (* Notice that the continuations of the following two + instructions should have a shared suffix to avoid code + duplication. *) + * ('a, 'a boxed_list * ('b * 's), 'r, 'f) kinstr + * ('b, 's, 'r, 'f) kinstr + -> ('a boxed_list, 'b * 's, 'r, 'f) kinstr + | IList_map : + ('a boxed_list, 'c * 's) kinfo + * ('a, 'c * 's, 'b, 'c * 's) kinstr + * ('b boxed_list, 'c * 's, 'r, 'f) kinstr + -> ('a boxed_list, 'c * 's, 'r, 'f) kinstr + | IList_iter : + ('a boxed_list, 'b * 's) kinfo + * ('a, 'b * 's, 'b, 's) kinstr + * ('b, 's, 'r, 'f) kinstr + -> ('a boxed_list, 'b * 's, 'r, 'f) kinstr + | IList_size : + ('a boxed_list, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> ('a boxed_list, 's, 'r, 'f) kinstr + (* + Sets + ---- + *) + | IEmpty_set : + ('a, 's) kinfo * 'b comparable_ty * ('b set, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISet_iter : + ('a set, 'b * 's) kinfo + * ('a, 'b * 's, 'b, 's) kinstr + * ('b, 's, 'r, 'f) kinstr + -> ('a set, 'b * 's, 'r, 'f) kinstr + | ISet_mem : + ('a, 'a set * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> ('a, 'a set * 's, 'r, 'f) kinstr + | ISet_update : + ('a, bool * ('a set * 's)) kinfo * ('a set, 's, 'r, 'f) kinstr + -> ('a, bool * ('a set * 's), 'r, 'f) kinstr + | ISet_size : + ('a set, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> ('a set, 's, 'r, 'f) kinstr + (* + Maps + ---- + *) + | IEmpty_map : + ('a, 's) kinfo + * 'b comparable_ty + * 'c ty + * (('b, 'c) map, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IMap_map : + (('a, 'b) map, 'd * 's) kinfo + * ('a * 'b, 'd * 's, 'c, 'd * 's) kinstr + * (('a, 'c) map, 'd * 's, 'r, 'f) kinstr + -> (('a, 'b) map, 'd * 's, 'r, 'f) kinstr + | IMap_iter : + (('a, 'b) map, 'c * 's) kinfo + * ('a * 'b, 'c * 's, 'c, 's) kinstr + * ('c, 's, 'r, 'f) kinstr + -> (('a, 'b) map, 'c * 's, 'r, 'f) kinstr + | IMap_mem : + ('a, ('a, 'b) map * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> ('a, ('a, 'b) map * 's, 'r, 'f) kinstr + | IMap_get : + ('a, ('a, 'b) map * 's) kinfo * ('b option, 's, 'r, 'f) kinstr + -> ('a, ('a, 'b) map * 's, 'r, 'f) kinstr + | IMap_update : + ('a, 'b option * (('a, 'b) map * 's)) kinfo + * (('a, 'b) map, 's, 'r, 'f) kinstr + -> ('a, 'b option * (('a, 'b) map * 's), 'r, 'f) kinstr + | IMap_get_and_update : + ('a, 'v option * (('a, 'v) map * 'rest)) kinfo + * ('v option, ('a, 'v) map * 'rest, 'r, 'f) kinstr + -> ('a, 'v option * (('a, 'v) map * 'rest), 'r, 'f) kinstr + | IMap_size : + (('a, 'b) map, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (('a, 'b) map, 's, 'r, 'f) kinstr + (* + Big maps + -------- + *) + | IEmpty_big_map : + ('a, 's) kinfo + * 'b comparable_ty + * 'c ty + * (('b, 'c) big_map, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IBig_map_mem : + ('a, ('a, 'b) big_map * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> ('a, ('a, 'b) big_map * 's, 'r, 'f) kinstr + | IBig_map_get : + ('a, ('a, 'b) big_map * 's) kinfo * ('b option, 's, 'r, 'f) kinstr + -> ('a, ('a, 'b) big_map * 's, 'r, 'f) kinstr + | IBig_map_update : + ('a, 'b option * (('a, 'b) big_map * 's)) kinfo + * (('a, 'b) big_map, 's, 'r, 'f) kinstr + -> ('a, 'b option * (('a, 'b) big_map * 's), 'r, 'f) kinstr + | IBig_map_get_and_update : + ('a, 'v option * (('a, 'v) big_map * 'rest)) kinfo + * ('v option, ('a, 'v) big_map * 'rest, 'r, 'f) kinstr + -> ('a, 'v option * (('a, 'v) big_map * 'rest), 'r, 'f) kinstr + (* + Strings + ------- + *) + | IConcat_string : + (string boxed_list, 's) kinfo * (string, 's, 'r, 'f) kinstr + -> (string boxed_list, 's, 'r, 'f) kinstr + | IConcat_string_pair : + (string, string * 's) kinfo * (string, 's, 'r, 'f) kinstr + -> (string, string * 's, 'r, 'f) kinstr + | ISlice_string : + (n num, n num * (string * 's)) kinfo * (string option, 's, 'r, 'f) kinstr + -> (n num, n num * (string * 's), 'r, 'f) kinstr + | IString_size : + (string, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (string, 's, 'r, 'f) kinstr + (* + Bytes + ----- + *) + | IConcat_bytes : + (bytes boxed_list, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes boxed_list, 's, 'r, 'f) kinstr + | IConcat_bytes_pair : + (bytes, bytes * 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, bytes * 's, 'r, 'f) kinstr + | ISlice_bytes : + (n num, n num * (bytes * 's)) kinfo * (bytes option, 's, 'r, 'f) kinstr + -> (n num, n num * (bytes * 's), 'r, 'f) kinstr + | IBytes_size : + (bytes, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + (* + Timestamps + ---------- + *) + | IAdd_seconds_to_timestamp : + (z num, Script_timestamp.t * 's) kinfo + * (Script_timestamp.t, 's, 'r, 'f) kinstr + -> (z num, Script_timestamp.t * 's, 'r, 'f) kinstr + | IAdd_timestamp_to_seconds : + (Script_timestamp.t, z num * 's) kinfo + * (Script_timestamp.t, 's, 'r, 'f) kinstr + -> (Script_timestamp.t, z num * 's, 'r, 'f) kinstr + | ISub_timestamp_seconds : + (Script_timestamp.t, z num * 's) kinfo + * (Script_timestamp.t, 's, 'r, 'f) kinstr + -> (Script_timestamp.t, z num * 's, 'r, 'f) kinstr + | IDiff_timestamps : + (Script_timestamp.t, Script_timestamp.t * 's) kinfo + * (z num, 's, 'r, 'f) kinstr + -> (Script_timestamp.t, Script_timestamp.t * 's, 'r, 'f) kinstr + (* + Tez + --- + *) + | IAdd_tez : + (Tez.t, Tez.t * 's) kinfo * (Tez.t, 's, 'r, 'f) kinstr + -> (Tez.t, Tez.t * 's, 'r, 'f) kinstr + | ISub_tez : + (Tez.t, Tez.t * 's) kinfo * (Tez.t, 's, 'r, 'f) kinstr + -> (Tez.t, Tez.t * 's, 'r, 'f) kinstr + | IMul_teznat : + (Tez.t, n num * 's) kinfo * (Tez.t, 's, 'r, 'f) kinstr + -> (Tez.t, n num * 's, 'r, 'f) kinstr + | IMul_nattez : + (n num, Tez.t * 's) kinfo * (Tez.t, 's, 'r, 'f) kinstr + -> (n num, Tez.t * 's, 'r, 'f) kinstr + | IEdiv_teznat : + (Tez.t, n num * 's) kinfo + * ((Tez.t, Tez.t) pair option, 's, 'r, 'f) kinstr + -> (Tez.t, n num * 's, 'r, 'f) kinstr + | IEdiv_tez : + (Tez.t, Tez.t * 's) kinfo + * ((n num, Tez.t) pair option, 's, 'r, 'f) kinstr + -> (Tez.t, Tez.t * 's, 'r, 'f) kinstr + (* + Booleans + -------- + *) + | IOr : + (bool, bool * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (bool, bool * 's, 'r, 'f) kinstr + | IAnd : + (bool, bool * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (bool, bool * 's, 'r, 'f) kinstr + | IXor : + (bool, bool * 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (bool, bool * 's, 'r, 'f) kinstr + | INot : + (bool, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (bool, 's, 'r, 'f) kinstr + (* + Integers + -------- + *) + | IIs_nat : + (z num, 's) kinfo * (n num option, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | INeg_nat : + (n num, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (n num, 's, 'r, 'f) kinstr + | INeg_int : + (z num, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | IAbs_int : + (z num, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | IInt_nat : + (n num, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (n num, 's, 'r, 'f) kinstr + | IAdd_intint : + (z num, z num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, z num * 's, 'r, 'f) kinstr + | IAdd_intnat : + (z num, n num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, n num * 's, 'r, 'f) kinstr + | IAdd_natint : + (n num, z num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (n num, z num * 's, 'r, 'f) kinstr + | IAdd_natnat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | ISub_int : + ('a num, 'b num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> ('a num, 'b num * 's, 'r, 'f) kinstr + | IMul_intint : + (z num, z num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, z num * 's, 'r, 'f) kinstr + | IMul_intnat : + (z num, n num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, n num * 's, 'r, 'f) kinstr + | IMul_natint : + (n num, z num * 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (n num, z num * 's, 'r, 'f) kinstr + | IMul_natnat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | IEdiv_intint : + (z num, z num * 's) kinfo + * ((z num, n num) pair option, 's, 'r, 'f) kinstr + -> (z num, z num * 's, 'r, 'f) kinstr + | IEdiv_intnat : + (z num, n num * 's) kinfo + * ((z num, n num) pair option, 's, 'r, 'f) kinstr + -> (z num, n num * 's, 'r, 'f) kinstr + | IEdiv_natint : + (n num, z num * 's) kinfo + * ((z num, n num) pair option, 's, 'r, 'f) kinstr + -> (n num, z num * 's, 'r, 'f) kinstr + | IEdiv_natnat : + (n num, n num * 's) kinfo + * ((n num, n num) pair option, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | ILsl_nat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | ILsr_nat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | IOr_nat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | IAnd_nat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | IAnd_int_nat : + (z num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (z num, n num * 's, 'r, 'f) kinstr + | IXor_nat : + (n num, n num * 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (n num, n num * 's, 'r, 'f) kinstr + | INot_nat : + (n num, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (n num, 's, 'r, 'f) kinstr + | INot_int : + (z num, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + (* + Control + ------- + *) + | IIf : + (bool, 'a * 's) kinfo + (* Notice that the continuations of the following two + instructions should have a shared suffix to avoid code + duplication. *) + * ('a, 's, 'r, 'f) kinstr + * ('a, 's, 'r, 'f) kinstr + -> (bool, 'a * 's, 'r, 'f) kinstr + | ILoop : + (bool, 'a * 's) kinfo + * ('a, 's, bool, 'a * 's) kinstr + * ('a, 's, 'r, 'f) kinstr + -> (bool, 'a * 's, 'r, 'f) kinstr + | ILoop_left : + (('a, 'b) union, 's) kinfo + * ('a, 's, ('a, 'b) union, 's) kinstr + * ('b, 's, 'r, 'f) kinstr + -> (('a, 'b) union, 's, 'r, 'f) kinstr + | IDip : + ('a, 'b * 's) kinfo + * ('c, 't) kinfo + * ('b, 's, 'c, 't) kinstr + * ('a, 'c * 't, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | IExec : + ('a, ('a, 'b) lambda * 's) kinfo * ('b, 's, 'r, 'f) kinstr + -> ('a, ('a, 'b) lambda * 's, 'r, 'f) kinstr + | IApply : + ('a, ('a * 't, 'b) lambda * 's) kinfo + * 'a ty + * (('t, 'b) lambda, 's, 'r, 'f) kinstr + -> ('a, ('a * 't, 'b) lambda * 's, 'r, 'f) kinstr + | ILambda : + ('a, 's) kinfo + * ('b, 'c) lambda + * (('b, 'c) lambda, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IFailwith : + ('a, 's) kinfo * Script.location * 'a ty * ('b, 't, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | INop : ('a, 's) kinfo * ('a, 's, 'r, 'f) kinstr -> ('a, 's, 'r, 'f) kinstr + (* + Comparison + ---------- + *) + | ICompare : + ('a, 'a * 's) kinfo * 'a comparable_ty * (z num, 's, 'r, 'f) kinstr + -> ('a, 'a * 's, 'r, 'f) kinstr + (* + Comparators + ----------- + *) + | IEq : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | INeq : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | ILt : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | IGt : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | ILe : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + | IGe : + (z num, 's) kinfo * (bool, 's, 'r, 'f) kinstr + -> (z num, 's, 'r, 'f) kinstr + (* + Protocol + -------- + *) + | IAddress : + ('a typed_contract, 's) kinfo * (address, 's, 'r, 'f) kinstr + -> ('a typed_contract, 's, 'r, 'f) kinstr + | IContract : + (address, 's) kinfo + * 'a ty + * string + * ('a typed_contract option, 's, 'r, 'f) kinstr + -> (address, 's, 'r, 'f) kinstr + | ITransfer_tokens : + ('a, Tez.t * ('a typed_contract * 's)) kinfo + * (operation, 's, 'r, 'f) kinstr + -> ('a, Tez.t * ('a typed_contract * 's), 'r, 'f) kinstr + | IImplicit_account : + (public_key_hash, 's) kinfo * (unit typed_contract, 's, 'r, 'f) kinstr + -> (public_key_hash, 's, 'r, 'f) kinstr + | ICreate_contract : + (public_key_hash option, Tez.t * ('a * 's)) kinfo + * 'a ty + * 'b ty + * ('b * 'a, operation boxed_list * 'a) lambda + * field_annot option + * (operation, address * 's, 'r, 'f) kinstr + -> (public_key_hash option, Tez.t * ('a * 's), 'r, 'f) kinstr + | ISet_delegate : + (public_key_hash option, 's) kinfo * (operation, 's, 'r, 'f) kinstr + -> (public_key_hash option, 's, 'r, 'f) kinstr + | INow : + ('a, 's) kinfo * (Script_timestamp.t, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IBalance : + ('a, 's) kinfo * (Tez.t, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ILevel : + ('a, 's) kinfo * (n num, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ICheck_signature : + (public_key, signature * (bytes * 's)) kinfo * (bool, 's, 'r, 'f) kinstr + -> (public_key, signature * (bytes * 's), 'r, 'f) kinstr + | IHash_key : + (public_key, 's) kinfo * (public_key_hash, 's, 'r, 'f) kinstr + -> (public_key, 's, 'r, 'f) kinstr + | IPack : + ('a, 's) kinfo * 'a ty * (bytes, 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IUnpack : + (bytes, 's) kinfo * 'a ty * ('a option, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | IBlake2b : + (bytes, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | ISha256 : + (bytes, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | ISha512 : + (bytes, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | ISource : + ('a, 's) kinfo * (address, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISender : + ('a, 's) kinfo * (address, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISelf : + ('a, 's) kinfo + * 'b ty + * string + * ('b typed_contract, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISelf_address : + ('a, 's) kinfo * (address, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IAmount : + ('a, 's) kinfo * (Tez.t, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ISapling_empty_state : + ('a, 's) kinfo + * Sapling.Memo_size.t + * (Sapling.state, 'a * 's, 'b, 'f) kinstr + -> ('a, 's, 'b, 'f) kinstr + | ISapling_verify_update : + (Sapling.transaction, Sapling.state * 's) kinfo + * ((z num, Sapling.state) pair option, 's, 'r, 'f) kinstr + -> (Sapling.transaction, Sapling.state * 's, 'r, 'f) kinstr + | IDig : + ('a, 's) kinfo + * int + * ('b, 'c * 't, 'c, 't, 'a, 's, 'd, 'u) stack_prefix_preservation_witness + * ('b, 'd * 'u, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IDug : + ('a, 'b * 's) kinfo + * int + * ('c, 't, 'a, 'c * 't, 'b, 's, 'd, 'u) stack_prefix_preservation_witness + * ('d, 'u, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | IDipn : + ('a, 's) kinfo + * int + * ('c, 't, 'd, 'v, 'a, 's, 'b, 'u) stack_prefix_preservation_witness + * ('c, 't, 'd, 'v) kinstr + * ('b, 'u, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IDropn : + ('a, 's) kinfo + * int + * ('b, 'u, 'b, 'u, 'a, 's, 'a, 's) stack_prefix_preservation_witness + * ('b, 'u, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IChainId : + ('a, 's) kinfo * (Chain_id.t, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | INever : + (never, 's) kinfo * ('b, 'u, 'r, 'f) kinstr + -> (never, 's, 'r, 'f) kinstr + | IVoting_power : + (public_key_hash, 's) kinfo * (n num, 's, 'r, 'f) kinstr + -> (public_key_hash, 's, 'r, 'f) kinstr + | ITotal_voting_power : + ('a, 's) kinfo * (n num, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IKeccak : + (bytes, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | ISha3 : + (bytes, 's) kinfo * (bytes, 's, 'r, 'f) kinstr + -> (bytes, 's, 'r, 'f) kinstr + | IAdd_bls12_381_g1 : + (Bls12_381.G1.t, Bls12_381.G1.t * 's) kinfo + * (Bls12_381.G1.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G1.t, Bls12_381.G1.t * 's, 'r, 'f) kinstr + | IAdd_bls12_381_g2 : + (Bls12_381.G2.t, Bls12_381.G2.t * 's) kinfo + * (Bls12_381.G2.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G2.t, Bls12_381.G2.t * 's, 'r, 'f) kinstr + | IAdd_bls12_381_fr : + (Bls12_381.Fr.t, Bls12_381.Fr.t * 's) kinfo + * (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + -> (Bls12_381.Fr.t, Bls12_381.Fr.t * 's, 'r, 'f) kinstr + | IMul_bls12_381_g1 : + (Bls12_381.G1.t, Bls12_381.Fr.t * 's) kinfo + * (Bls12_381.G1.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G1.t, Bls12_381.Fr.t * 's, 'r, 'f) kinstr + | IMul_bls12_381_g2 : + (Bls12_381.G2.t, Bls12_381.Fr.t * 's) kinfo + * (Bls12_381.G2.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G2.t, Bls12_381.Fr.t * 's, 'r, 'f) kinstr + | IMul_bls12_381_fr : + (Bls12_381.Fr.t, Bls12_381.Fr.t * 's) kinfo + * (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + -> (Bls12_381.Fr.t, Bls12_381.Fr.t * 's, 'r, 'f) kinstr + | IMul_bls12_381_z_fr : + (Bls12_381.Fr.t, 'a num * 's) kinfo * (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + -> (Bls12_381.Fr.t, 'a num * 's, 'r, 'f) kinstr + | IMul_bls12_381_fr_z : + ('a num, Bls12_381.Fr.t * 's) kinfo * (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + -> ('a num, Bls12_381.Fr.t * 's, 'r, 'f) kinstr + | IInt_bls12_381_fr : + (Bls12_381.Fr.t, 's) kinfo * (z num, 's, 'r, 'f) kinstr + -> (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + | INeg_bls12_381_g1 : + (Bls12_381.G1.t, 's) kinfo * (Bls12_381.G1.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G1.t, 's, 'r, 'f) kinstr + | INeg_bls12_381_g2 : + (Bls12_381.G2.t, 's) kinfo * (Bls12_381.G2.t, 's, 'r, 'f) kinstr + -> (Bls12_381.G2.t, 's, 'r, 'f) kinstr + | INeg_bls12_381_fr : + (Bls12_381.Fr.t, 's) kinfo * (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + -> (Bls12_381.Fr.t, 's, 'r, 'f) kinstr + | IPairing_check_bls12_381 : + ((Bls12_381.G1.t, Bls12_381.G2.t) pair boxed_list, 's) kinfo + * (bool, 's, 'r, 'f) kinstr + -> ((Bls12_381.G1.t, Bls12_381.G2.t) pair boxed_list, 's, 'r, 'f) kinstr + | IComb : + ('a, 's) kinfo + * int + * ('a * 's, 'b * 'u) comb_gadt_witness + * ('b, 'u, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IUncomb : + ('a, 's) kinfo + * int + * ('a * 's, 'b * 'u) uncomb_gadt_witness + * ('b, 'u, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | IComb_get : + ('t, 's) kinfo + * int + * ('t, 'v) comb_get_gadt_witness + * ('v, 's, 'r, 'f) kinstr + -> ('t, 's, 'r, 'f) kinstr + | IComb_set : + ('a, 'b * 's) kinfo + * int + * ('a, 'b, 'c) comb_set_gadt_witness + * ('c, 's, 'r, 'f) kinstr + -> ('a, 'b * 's, 'r, 'f) kinstr + | IDup_n : + ('a, 's) kinfo + * int + * ('a * 's, 't) dup_n_gadt_witness + * ('t, 'a * 's, 'r, 'f) kinstr + -> ('a, 's, 'r, 'f) kinstr + | ITicket : + ('a, n num * 's) kinfo * ('a ticket, 's, 'r, 'f) kinstr + -> ('a, n num * 's, 'r, 'f) kinstr + | IRead_ticket : + ('a ticket, 's) kinfo + * (address * ('a * n num), 'a ticket * 's, 'r, 'f) kinstr + -> ('a ticket, 's, 'r, 'f) kinstr + | ISplit_ticket : + ('a ticket, (n num * n num) * 's) kinfo + * (('a ticket * 'a ticket) option, 's, 'r, 'f) kinstr + -> ('a ticket, (n num * n num) * 's, 'r, 'f) kinstr + | IJoin_tickets : + ('a ticket * 'a ticket, 's) kinfo + * 'a comparable_ty + * ('a ticket option, 's, 'r, 'f) kinstr + -> ('a ticket * 'a ticket, 's, 'r, 'f) kinstr + | IHalt : ('a, 's) kinfo -> ('a, 's, 'a, 's) kinstr and ('arg, 'ret) lambda = | Lam : - ('arg * end_of_stack, 'ret * end_of_stack) descr * Script.node + ('arg, end_of_stack, 'ret, end_of_stack) kdescr * Script.node -> ('arg, 'ret) lambda -[@@coq_force_gadt] and 'arg typed_contract = 'arg ty * address +(* ---- Auxiliary types -----------------------------------------------------*) and 'ty ty = | Unit_t : type_annot option -> unit ty | Int_t : type_annot option -> z num ty @@ -169,11 +905,11 @@ and 'ty ty = | Bls12_381_fr_t : type_annot option -> Bls12_381.Fr.t ty | Ticket_t : 'a comparable_ty * type_annot option -> 'a ticket ty -and 'ty stack_ty = +and ('top_ty, 'resty) stack_ty = | Item_t : - 'ty ty * 'rest stack_ty * var_annot option - -> ('ty * 'rest) stack_ty - | Empty_t : end_of_stack stack_ty + 'ty ty * ('ty2, 'rest) stack_ty * var_annot option + -> ('ty, 'ty2 * 'rest) stack_ty + | Bot_t : (unit, unit) stack_ty and ('key, 'value) big_map = { id : Big_map.Id.t option; @@ -184,324 +920,53 @@ and ('key, 'value) big_map = { and 'elt boxed_list = {elements : 'elt list; length : int} -(* ---- Instructions --------------------------------------------------------*) +and ('arg, 'storage) script = { + code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; + arg_type : 'arg ty; + storage : 'storage; + storage_type : 'storage ty; + root_name : field_annot option; +} + +and ('a, 's, 'r, 'f) kdescr = { + kloc : Script.location; + kbef : ('a, 's) stack_ty; + kaft : ('r, 'f) stack_ty; + kinstr : ('a, 's, 'r, 'f) kinstr; +} -(* The low-level, typed instructions, as a GADT whose parameters - encode the typing rules. +and ('a, 's, 'b, 'u) descr = { + loc : Script.location; + bef : ('a, 's) stack_ty; + aft : ('b, 'u) stack_ty; + instr : ('a, 's, 'b, 'u) cinstr; +} - The left parameter is the typed shape of the stack before the - instruction, the right one the shape after. Any program whose - construction is accepted by OCaml's type-checker is guaranteed to - be type-safe. Overloadings of the concrete syntax are already - resolved in this representation, either by using different - constructors or type witness parameters. +and ('a, 's, 'b, 'u) cinstr = { + size : int; + apply : + 'r 'f. ('a, 's) kinfo -> ('b, 'u, 'r, 'f) kinstr -> ('a, 's, 'r, 'f) kinstr; +} - When adding a new instruction, please check whether it is duplicating a data - (rule of thumb: the type variable appears twice in the after stack, beware - it might be hidden in a witness). - If it is, please protect it with [check_dupable_ty]. -*) -and ('bef, 'aft) instr = - (* stack ops *) - | Drop : (_ * 'rest, 'rest) instr - | Dup : ('top * 'rest, 'top * ('top * 'rest)) instr - | Swap : ('tip * ('top * 'rest), 'top * ('tip * 'rest)) instr - | Const : 'ty -> ('rest, 'ty * 'rest) instr - (* pairs *) - | Cons_pair : ('car * ('cdr * 'rest), ('car, 'cdr) pair * 'rest) instr - | Car : (('car, _) pair * 'rest, 'car * 'rest) instr - | Cdr : ((_, 'cdr) pair * 'rest, 'cdr * 'rest) instr - | Unpair : (('car, 'cdr) pair * 'rest, 'car * ('cdr * 'rest)) instr - (* options *) - | Cons_some : ('v * 'rest, 'v option * 'rest) instr - | Cons_none : 'a ty -> ('rest, 'a option * 'rest) instr - | If_none : - ('bef, 'aft) descr * ('a * 'bef, 'aft) descr - -> ('a option * 'bef, 'aft) instr - (* unions *) - | Cons_left : ('l * 'rest, ('l, 'r) union * 'rest) instr - | Cons_right : ('r * 'rest, ('l, 'r) union * 'rest) instr - | If_left : - ('l * 'bef, 'aft) descr * ('r * 'bef, 'aft) descr - -> (('l, 'r) union * 'bef, 'aft) instr - (* lists *) - | Cons_list : ('a * ('a boxed_list * 'rest), 'a boxed_list * 'rest) instr - | Nil : ('rest, 'a boxed_list * 'rest) instr - | If_cons : - ('a * ('a boxed_list * 'bef), 'aft) descr * ('bef, 'aft) descr - -> ('a boxed_list * 'bef, 'aft) instr - | List_map : - ('a * 'rest, 'b * 'rest) descr - -> ('a boxed_list * 'rest, 'b boxed_list * 'rest) instr - | List_iter : - ('a * 'rest, 'rest) descr - -> ('a boxed_list * 'rest, 'rest) instr - | List_size : ('a boxed_list * 'rest, n num * 'rest) instr - (* sets *) - | Empty_set : 'a comparable_ty -> ('rest, 'a set * 'rest) instr - | Set_iter : ('a * 'rest, 'rest) descr -> ('a set * 'rest, 'rest) instr - | Set_mem : ('elt * ('elt set * 'rest), bool * 'rest) instr - | Set_update : ('elt * (bool * ('elt set * 'rest)), 'elt set * 'rest) instr - | Set_size : ('a set * 'rest, n num * 'rest) instr - (* maps *) - | Empty_map : 'a comparable_ty * 'v ty -> ('rest, ('a, 'v) map * 'rest) instr - | Map_map : - (('a * 'v) * 'rest, 'r * 'rest) descr - -> (('a, 'v) map * 'rest, ('a, 'r) map * 'rest) instr - | Map_iter : - (('a * 'v) * 'rest, 'rest) descr - -> (('a, 'v) map * 'rest, 'rest) instr - | Map_mem : ('a * (('a, 'v) map * 'rest), bool * 'rest) instr - | Map_get : ('a * (('a, 'v) map * 'rest), 'v option * 'rest) instr - | Map_update - : ('a * ('v option * (('a, 'v) map * 'rest)), ('a, 'v) map * 'rest) instr - | Map_get_and_update - : ( 'a * ('v option * (('a, 'v) map * 'rest)), - 'v option * (('a, 'v) map * 'rest) ) - instr - | Map_size : (('a, 'b) map * 'rest, n num * 'rest) instr - (* big maps *) - | Empty_big_map : - 'a comparable_ty * 'v ty - -> ('rest, ('a, 'v) big_map * 'rest) instr - | Big_map_mem : ('a * (('a, 'v) big_map * 'rest), bool * 'rest) instr - | Big_map_get : ('a * (('a, 'v) big_map * 'rest), 'v option * 'rest) instr - | Big_map_update - : ( 'key * ('value option * (('key, 'value) big_map * 'rest)), - ('key, 'value) big_map * 'rest ) - instr - | Big_map_get_and_update - : ( 'a * ('v option * (('a, 'v) big_map * 'rest)), - 'v option * (('a, 'v) big_map * 'rest) ) - instr - (* string operations *) - | Concat_string : (string boxed_list * 'rest, string * 'rest) instr - | Concat_string_pair : (string * (string * 'rest), string * 'rest) instr - | Slice_string - : (n num * (n num * (string * 'rest)), string option * 'rest) instr - | String_size : (string * 'rest, n num * 'rest) instr - (* bytes operations *) - | Concat_bytes : (bytes boxed_list * 'rest, bytes * 'rest) instr - | Concat_bytes_pair : (bytes * (bytes * 'rest), bytes * 'rest) instr - | Slice_bytes - : (n num * (n num * (bytes * 'rest)), bytes option * 'rest) instr - | Bytes_size : (bytes * 'rest, n num * 'rest) instr - (* timestamp operations *) - | Add_seconds_to_timestamp - : ( z num * (Script_timestamp.t * 'rest), - Script_timestamp.t * 'rest ) - instr - | Add_timestamp_to_seconds - : ( Script_timestamp.t * (z num * 'rest), - Script_timestamp.t * 'rest ) - instr - | Sub_timestamp_seconds - : ( Script_timestamp.t * (z num * 'rest), - Script_timestamp.t * 'rest ) - instr - | Diff_timestamps - : ( Script_timestamp.t * (Script_timestamp.t * 'rest), - z num * 'rest ) - instr - (* tez operations *) - | Add_tez : (Tez.t * (Tez.t * 'rest), Tez.t * 'rest) instr - | Sub_tez : (Tez.t * (Tez.t * 'rest), Tez.t * 'rest) instr - | Mul_teznat : (Tez.t * (n num * 'rest), Tez.t * 'rest) instr - | Mul_nattez : (n num * (Tez.t * 'rest), Tez.t * 'rest) instr - | Ediv_teznat - : (Tez.t * (n num * 'rest), (Tez.t, Tez.t) pair option * 'rest) instr - | Ediv_tez - : (Tez.t * (Tez.t * 'rest), (n num, Tez.t) pair option * 'rest) instr - (* boolean operations *) - | Or : (bool * (bool * 'rest), bool * 'rest) instr - | And : (bool * (bool * 'rest), bool * 'rest) instr - | Xor : (bool * (bool * 'rest), bool * 'rest) instr - | Not : (bool * 'rest, bool * 'rest) instr - (* integer operations *) - | Is_nat : (z num * 'rest, n num option * 'rest) instr - | Neg_nat : (n num * 'rest, z num * 'rest) instr - | Neg_int : (z num * 'rest, z num * 'rest) instr - | Abs_int : (z num * 'rest, n num * 'rest) instr - | Int_nat : (n num * 'rest, z num * 'rest) instr - | Add_intint : (z num * (z num * 'rest), z num * 'rest) instr - | Add_intnat : (z num * (n num * 'rest), z num * 'rest) instr - | Add_natint : (n num * (z num * 'rest), z num * 'rest) instr - | Add_natnat : (n num * (n num * 'rest), n num * 'rest) instr - | Sub_int : ('s num * ('t num * 'rest), z num * 'rest) instr - | Mul_intint : (z num * (z num * 'rest), z num * 'rest) instr - | Mul_intnat : (z num * (n num * 'rest), z num * 'rest) instr - | Mul_natint : (n num * (z num * 'rest), z num * 'rest) instr - | Mul_natnat : (n num * (n num * 'rest), n num * 'rest) instr - | Ediv_intint - : (z num * (z num * 'rest), (z num, n num) pair option * 'rest) instr - | Ediv_intnat - : (z num * (n num * 'rest), (z num, n num) pair option * 'rest) instr - | Ediv_natint - : (n num * (z num * 'rest), (z num, n num) pair option * 'rest) instr - | Ediv_natnat - : (n num * (n num * 'rest), (n num, n num) pair option * 'rest) instr - | Lsl_nat : (n num * (n num * 'rest), n num * 'rest) instr - | Lsr_nat : (n num * (n num * 'rest), n num * 'rest) instr - | Or_nat : (n num * (n num * 'rest), n num * 'rest) instr - | And_nat : (n num * (n num * 'rest), n num * 'rest) instr - | And_int_nat : (z num * (n num * 'rest), n num * 'rest) instr - | Xor_nat : (n num * (n num * 'rest), n num * 'rest) instr - | Not_nat : (n num * 'rest, z num * 'rest) instr - | Not_int : (z num * 'rest, z num * 'rest) instr - (* control *) - | Seq : ('bef, 'trans) descr * ('trans, 'aft) descr -> ('bef, 'aft) instr - | If : ('bef, 'aft) descr * ('bef, 'aft) descr -> (bool * 'bef, 'aft) instr - | Loop : ('rest, bool * 'rest) descr -> (bool * 'rest, 'rest) instr - | Loop_left : - ('a * 'rest, ('a, 'b) union * 'rest) descr - -> (('a, 'b) union * 'rest, 'b * 'rest) instr - | Dip : ('bef, 'aft) descr -> ('top * 'bef, 'top * 'aft) instr - | Exec : ('arg * (('arg, 'ret) lambda * 'rest), 'ret * 'rest) instr - | Apply : - 'arg ty - -> ( 'arg * (('arg * 'remaining, 'ret) lambda * 'rest), - ('remaining, 'ret) lambda * 'rest ) - instr - | Lambda : ('arg, 'ret) lambda -> ('rest, ('arg, 'ret) lambda * 'rest) instr - | Failwith : 'a ty -> ('a * 'rest, 'aft) instr - | Nop : ('rest, 'rest) instr - (* comparison *) - | Compare : 'a comparable_ty -> ('a * ('a * 'rest), z num * 'rest) instr - (* comparators *) - | Eq : (z num * 'rest, bool * 'rest) instr - | Neq : (z num * 'rest, bool * 'rest) instr - | Lt : (z num * 'rest, bool * 'rest) instr - | Gt : (z num * 'rest, bool * 'rest) instr - | Le : (z num * 'rest, bool * 'rest) instr - | Ge : (z num * 'rest, bool * 'rest) instr - (* protocol *) - | Address : (_ typed_contract * 'rest, address * 'rest) instr - | Contract : - 'p ty * string - -> (address * 'rest, 'p typed_contract option * 'rest) instr - | Transfer_tokens - : ( 'arg * (Tez.t * ('arg typed_contract * 'rest)), - operation * 'rest ) - instr - | Implicit_account - : (public_key_hash * 'rest, unit typed_contract * 'rest) instr - | Create_contract : - 'g ty - * 'p ty - * ('p * 'g, operation boxed_list * 'g) lambda - * field_annot option - -> ( public_key_hash option * (Tez.t * ('g * 'rest)), - operation * (address * 'rest) ) - instr - | Set_delegate : (public_key_hash option * 'rest, operation * 'rest) instr - | Now : ('rest, Script_timestamp.t * 'rest) instr - | Balance : ('rest, Tez.t * 'rest) instr - | Level : ('rest, n num * 'rest) instr - | Check_signature - : (public_key * (signature * (bytes * 'rest)), bool * 'rest) instr - | Hash_key : (public_key * 'rest, public_key_hash * 'rest) instr - | Pack : 'a ty -> ('a * 'rest, bytes * 'rest) instr - | Unpack : 'a ty -> (bytes * 'rest, 'a option * 'rest) instr - | Blake2b : (bytes * 'rest, bytes * 'rest) instr - | Sha256 : (bytes * 'rest, bytes * 'rest) instr - | Sha512 : (bytes * 'rest, bytes * 'rest) instr - | Source : ('rest, address * 'rest) instr - | Sender : ('rest, address * 'rest) instr - | Self : 'p ty * string -> ('rest, 'p typed_contract * 'rest) instr - | Self_address : ('rest, address * 'rest) instr - | Amount : ('rest, Tez.t * 'rest) instr - | Sapling_empty_state : { - memo_size : Sapling.Memo_size.t; - } - -> ('rest, Sapling.state * 'rest) instr - | Sapling_verify_update - : ( Sapling.transaction * (Sapling.state * 'rest), - (z num, Sapling.state) pair option * 'rest ) - instr - | Dig : - int * ('x * 'rest, 'rest, 'bef, 'aft) stack_prefix_preservation_witness - -> ('bef, 'x * 'aft) instr - | Dug : - int * ('rest, 'x * 'rest, 'bef, 'aft) stack_prefix_preservation_witness - -> ('x * 'bef, 'aft) instr - | Dipn : - int - * ('fbef, 'faft, 'bef, 'aft) stack_prefix_preservation_witness - * ('fbef, 'faft) descr - -> ('bef, 'aft) instr - | Dropn : - int * ('rest, 'rest, 'bef, _) stack_prefix_preservation_witness - -> ('bef, 'rest) instr - | ChainId : ('rest, Chain_id.t * 'rest) instr - | Never : (never * 'rest, 'aft) instr - | Voting_power : (public_key_hash * 'rest, n num * 'rest) instr - | Total_voting_power : ('rest, n num * 'rest) instr - | Keccak : (bytes * 'rest, bytes * 'rest) instr - | Sha3 : (bytes * 'rest, bytes * 'rest) instr - | Add_bls12_381_g1 - : ( Bls12_381.G1.t * (Bls12_381.G1.t * 'rest), - Bls12_381.G1.t * 'rest ) - instr - | Add_bls12_381_g2 - : ( Bls12_381.G2.t * (Bls12_381.G2.t * 'rest), - Bls12_381.G2.t * 'rest ) - instr - | Add_bls12_381_fr - : ( Bls12_381.Fr.t * (Bls12_381.Fr.t * 'rest), - Bls12_381.Fr.t * 'rest ) - instr - | Mul_bls12_381_g1 - : ( Bls12_381.G1.t * (Bls12_381.Fr.t * 'rest), - Bls12_381.G1.t * 'rest ) - instr - | Mul_bls12_381_g2 - : ( Bls12_381.G2.t * (Bls12_381.Fr.t * 'rest), - Bls12_381.G2.t * 'rest ) - instr - | Mul_bls12_381_fr - : ( Bls12_381.Fr.t * (Bls12_381.Fr.t * 'rest), - Bls12_381.Fr.t * 'rest ) - instr - | Mul_bls12_381_z_fr - : (Bls12_381.Fr.t * (_ num * 'rest), Bls12_381.Fr.t * 'rest) instr - | Mul_bls12_381_fr_z - : (_ num * (Bls12_381.Fr.t * 'rest), Bls12_381.Fr.t * 'rest) instr - | Int_bls12_381_fr : (Bls12_381.Fr.t * 'rest, z num * 'rest) instr - | Neg_bls12_381_g1 : (Bls12_381.G1.t * 'rest, Bls12_381.G1.t * 'rest) instr - | Neg_bls12_381_g2 : (Bls12_381.G2.t * 'rest, Bls12_381.G2.t * 'rest) instr - | Neg_bls12_381_fr : (Bls12_381.Fr.t * 'rest, Bls12_381.Fr.t * 'rest) instr - | Pairing_check_bls12_381 - : ( (Bls12_381.G1.t, Bls12_381.G2.t) pair boxed_list * 'rest, - bool * 'rest ) - instr - | Comb : int * ('before, 'after) comb_gadt_witness -> ('before, 'after) instr - | Uncomb : - int * ('before, 'after) uncomb_gadt_witness - -> ('before, 'after) instr - | Comb_get : - int * ('before, 'after) comb_get_gadt_witness - -> ('before * 'rest, 'after * 'rest) instr - | Comb_set : - int * ('value, 'before, 'after) comb_set_gadt_witness - -> ('value * ('before * 'rest), 'after * 'rest) instr - | Dup_n : - int * ('before, 'after) dup_n_gadt_witness - -> ('before, 'after * 'before) instr - | Ticket : ('a * (n num * 'rest), 'a ticket * 'rest) instr - | Read_ticket - : ( 'a ticket * 'rest, - (address * ('a * n num)) * ('a ticket * 'rest) ) - instr - | Split_ticket - : ( 'a ticket * ((n num * n num) * 'rest), - ('a ticket * 'a ticket) option * 'rest ) - instr - | Join_tickets : - 'a comparable_ty - -> (('a ticket * 'a ticket) * 'rest, 'a ticket option * 'rest) instr +and ('a, 's) kinfo = {iloc : Script.location; kstack_ty : ('a, 's) stack_ty} + +and (_, _, _, _, _, _, _, _) stack_prefix_preservation_witness = + | KPrefix : + ('y, 'u) kinfo + * ('c, 'v, 'd, 'w, 'x, 's, 'y, 'u) stack_prefix_preservation_witness + -> ( 'c, + 'v, + 'd, + 'w, + 'a, + 'x * 's, + 'a, + 'y * 'u ) + stack_prefix_preservation_witness + | KRest : ('a, 's, 'b, 'u, 'a, 's, 'b, 'u) stack_prefix_preservation_witness and ('before, 'after) comb_gadt_witness = - | Comb_one : ('a * 'before, 'a * 'before) comb_gadt_witness + | Comb_one : ('a * ('x * 'before), 'a * ('x * 'before)) comb_gadt_witness | Comb_succ : ('before, 'b * 'after) comb_gadt_witness -> ('a * 'before, ('a * 'b) * 'after) comb_gadt_witness @@ -526,28 +991,439 @@ and ('value, 'before, 'after) comb_set_gadt_witness = ('value, 'before, 'after) comb_set_gadt_witness -> ('value, 'a * 'before, 'a * 'after) comb_set_gadt_witness -and ('before, 'after) dup_n_gadt_witness = +(* + + [dup_n_gadt_witness ('s, 't)] ensures that the n-th element of ['s] + is of type ['t]. + + This relational predicate is defined by induction on [n]. + +*) +and (_, _) dup_n_gadt_witness = | Dup_n_zero : ('a * 'rest, 'a) dup_n_gadt_witness | Dup_n_succ : - ('before, 'b) dup_n_gadt_witness - -> ('a * 'before, 'b) dup_n_gadt_witness - -(* Type witness for operations that work deep in the stack ignoring - (and preserving) a prefix. - - The two right parameters are the shape of the stack with the (same) - prefix before and after the transformation. The two left - parameters are the shape of the stack without the prefix before and - after. The inductive definition makes it so by construction. *) -and ('bef, 'aft, 'bef_suffix, 'aft_suffix) stack_prefix_preservation_witness = - | Prefix : - ('fbef, 'faft, 'bef, 'aft) stack_prefix_preservation_witness - -> ('fbef, 'faft, 'x * 'bef, 'x * 'aft) stack_prefix_preservation_witness - | Rest : ('bef, 'aft, 'bef, 'aft) stack_prefix_preservation_witness - -and ('bef, 'aft) descr = { - loc : Script.location; - bef : 'bef stack_ty; - aft : 'aft stack_ty; - instr : ('bef, 'aft) instr; -} + ('stack, 'b) dup_n_gadt_witness + -> ('a * 'stack, 'b) dup_n_gadt_witness + +and (_, _, _) exkinstr = + | ExKInstr : ('x, 'z, 'b, 'u) kinstr -> ('x * 'z, 'b, 'u) exkinstr +[@@unboxed] + +let kinfo_of_kinstr : type a s b f. (a, s, b, f) kinstr -> (a, s) kinfo = + fun i -> + match i with + | IDrop (kinfo, _) -> + kinfo + | IDup (kinfo, _) -> + kinfo + | ISwap (kinfo, _) -> + kinfo + | IConst (kinfo, _, _) -> + kinfo + | ICons_pair (kinfo, _) -> + kinfo + | ICar (kinfo, _) -> + kinfo + | ICdr (kinfo, _) -> + kinfo + | IUnpair (kinfo, _) -> + kinfo + | ICons_some (kinfo, _) -> + kinfo + | ICons_none (kinfo, _, _) -> + kinfo + | IIf_none (kinfo, _, _) -> + kinfo + | ICons_left (kinfo, _) -> + kinfo + | ICons_right (kinfo, _) -> + kinfo + | IIf_left (kinfo, _, _) -> + kinfo + | ICons_list (kinfo, _) -> + kinfo + | INil (kinfo, _) -> + kinfo + | IIf_cons (kinfo, _, _) -> + kinfo + | IList_map (kinfo, _, _) -> + kinfo + | IList_iter (kinfo, _, _) -> + kinfo + | IList_size (kinfo, _) -> + kinfo + | IEmpty_set (kinfo, _, _) -> + kinfo + | ISet_iter (kinfo, _, _) -> + kinfo + | ISet_mem (kinfo, _) -> + kinfo + | ISet_update (kinfo, _) -> + kinfo + | ISet_size (kinfo, _) -> + kinfo + | IEmpty_map (kinfo, _, _, _) -> + kinfo + | IMap_map (kinfo, _, _) -> + kinfo + | IMap_iter (kinfo, _, _) -> + kinfo + | IMap_mem (kinfo, _) -> + kinfo + | IMap_get (kinfo, _) -> + kinfo + | IMap_update (kinfo, _) -> + kinfo + | IMap_get_and_update (kinfo, _) -> + kinfo + | IMap_size (kinfo, _) -> + kinfo + | IEmpty_big_map (kinfo, _, _, _) -> + kinfo + | IBig_map_mem (kinfo, _) -> + kinfo + | IBig_map_get (kinfo, _) -> + kinfo + | IBig_map_update (kinfo, _) -> + kinfo + | IBig_map_get_and_update (kinfo, _) -> + kinfo + | IConcat_string (kinfo, _) -> + kinfo + | IConcat_string_pair (kinfo, _) -> + kinfo + | ISlice_string (kinfo, _) -> + kinfo + | IString_size (kinfo, _) -> + kinfo + | IConcat_bytes (kinfo, _) -> + kinfo + | IConcat_bytes_pair (kinfo, _) -> + kinfo + | ISlice_bytes (kinfo, _) -> + kinfo + | IBytes_size (kinfo, _) -> + kinfo + | IAdd_seconds_to_timestamp (kinfo, _) -> + kinfo + | IAdd_timestamp_to_seconds (kinfo, _) -> + kinfo + | ISub_timestamp_seconds (kinfo, _) -> + kinfo + | IDiff_timestamps (kinfo, _) -> + kinfo + | IAdd_tez (kinfo, _) -> + kinfo + | ISub_tez (kinfo, _) -> + kinfo + | IMul_teznat (kinfo, _) -> + kinfo + | IMul_nattez (kinfo, _) -> + kinfo + | IEdiv_teznat (kinfo, _) -> + kinfo + | IEdiv_tez (kinfo, _) -> + kinfo + | IOr (kinfo, _) -> + kinfo + | IAnd (kinfo, _) -> + kinfo + | IXor (kinfo, _) -> + kinfo + | INot (kinfo, _) -> + kinfo + | IIs_nat (kinfo, _) -> + kinfo + | INeg_nat (kinfo, _) -> + kinfo + | INeg_int (kinfo, _) -> + kinfo + | IAbs_int (kinfo, _) -> + kinfo + | IInt_nat (kinfo, _) -> + kinfo + | IAdd_intint (kinfo, _) -> + kinfo + | IAdd_intnat (kinfo, _) -> + kinfo + | IAdd_natint (kinfo, _) -> + kinfo + | IAdd_natnat (kinfo, _) -> + kinfo + | ISub_int (kinfo, _) -> + kinfo + | IMul_intint (kinfo, _) -> + kinfo + | IMul_intnat (kinfo, _) -> + kinfo + | IMul_natint (kinfo, _) -> + kinfo + | IMul_natnat (kinfo, _) -> + kinfo + | IEdiv_intint (kinfo, _) -> + kinfo + | IEdiv_intnat (kinfo, _) -> + kinfo + | IEdiv_natint (kinfo, _) -> + kinfo + | IEdiv_natnat (kinfo, _) -> + kinfo + | ILsl_nat (kinfo, _) -> + kinfo + | ILsr_nat (kinfo, _) -> + kinfo + | IOr_nat (kinfo, _) -> + kinfo + | IAnd_nat (kinfo, _) -> + kinfo + | IAnd_int_nat (kinfo, _) -> + kinfo + | IXor_nat (kinfo, _) -> + kinfo + | INot_nat (kinfo, _) -> + kinfo + | INot_int (kinfo, _) -> + kinfo + | IIf (kinfo, _, _) -> + kinfo + | ILoop (kinfo, _, _) -> + kinfo + | ILoop_left (kinfo, _, _) -> + kinfo + | IDip (kinfo, _, _, _) -> + kinfo + | IExec (kinfo, _) -> + kinfo + | IApply (kinfo, _, _) -> + kinfo + | ILambda (kinfo, _, _) -> + kinfo + | IFailwith (kinfo, _, _, _) -> + kinfo + | INop (kinfo, _) -> + kinfo + | ICompare (kinfo, _, _) -> + kinfo + | IEq (kinfo, _) -> + kinfo + | INeq (kinfo, _) -> + kinfo + | ILt (kinfo, _) -> + kinfo + | IGt (kinfo, _) -> + kinfo + | ILe (kinfo, _) -> + kinfo + | IGe (kinfo, _) -> + kinfo + | IAddress (kinfo, _) -> + kinfo + | IContract (kinfo, _, _, _) -> + kinfo + | ITransfer_tokens (kinfo, _) -> + kinfo + | IImplicit_account (kinfo, _) -> + kinfo + | ICreate_contract (kinfo, _, _, _, _, _) -> + kinfo + | ISet_delegate (kinfo, _) -> + kinfo + | INow (kinfo, _) -> + kinfo + | IBalance (kinfo, _) -> + kinfo + | ILevel (kinfo, _) -> + kinfo + | ICheck_signature (kinfo, _) -> + kinfo + | IHash_key (kinfo, _) -> + kinfo + | IPack (kinfo, _, _) -> + kinfo + | IUnpack (kinfo, _, _) -> + kinfo + | IBlake2b (kinfo, _) -> + kinfo + | ISha256 (kinfo, _) -> + kinfo + | ISha512 (kinfo, _) -> + kinfo + | ISource (kinfo, _) -> + kinfo + | ISender (kinfo, _) -> + kinfo + | ISelf (kinfo, _, _, _) -> + kinfo + | ISelf_address (kinfo, _) -> + kinfo + | IAmount (kinfo, _) -> + kinfo + | ISapling_empty_state (kinfo, _, _) -> + kinfo + | ISapling_verify_update (kinfo, _) -> + kinfo + | IDig (kinfo, _, _, _) -> + kinfo + | IDug (kinfo, _, _, _) -> + kinfo + | IDipn (kinfo, _, _, _, _) -> + kinfo + | IDropn (kinfo, _, _, _) -> + kinfo + | IChainId (kinfo, _) -> + kinfo + | INever (kinfo, _) -> + kinfo + | IVoting_power (kinfo, _) -> + kinfo + | ITotal_voting_power (kinfo, _) -> + kinfo + | IKeccak (kinfo, _) -> + kinfo + | ISha3 (kinfo, _) -> + kinfo + | IAdd_bls12_381_g1 (kinfo, _) -> + kinfo + | IAdd_bls12_381_g2 (kinfo, _) -> + kinfo + | IAdd_bls12_381_fr (kinfo, _) -> + kinfo + | IMul_bls12_381_g1 (kinfo, _) -> + kinfo + | IMul_bls12_381_g2 (kinfo, _) -> + kinfo + | IMul_bls12_381_fr (kinfo, _) -> + kinfo + | IMul_bls12_381_z_fr (kinfo, _) -> + kinfo + | IMul_bls12_381_fr_z (kinfo, _) -> + kinfo + | IInt_bls12_381_fr (kinfo, _) -> + kinfo + | INeg_bls12_381_g1 (kinfo, _) -> + kinfo + | INeg_bls12_381_g2 (kinfo, _) -> + kinfo + | INeg_bls12_381_fr (kinfo, _) -> + kinfo + | IPairing_check_bls12_381 (kinfo, _) -> + kinfo + | IComb (kinfo, _, _, _) -> + kinfo + | IUncomb (kinfo, _, _, _) -> + kinfo + | IComb_get (kinfo, _, _, _) -> + kinfo + | IComb_set (kinfo, _, _, _) -> + kinfo + | IDup_n (kinfo, _, _, _) -> + kinfo + | ITicket (kinfo, _) -> + kinfo + | IRead_ticket (kinfo, _) -> + kinfo + | ISplit_ticket (kinfo, _) -> + kinfo + | IJoin_tickets (kinfo, _, _) -> + kinfo + | IHalt kinfo -> + kinfo + +let rec ty_of_comparable_ty : type a. a comparable_ty -> a ty = + fun s -> + match s with + | Unit_key _ -> + Unit_t None + | Never_key _ -> + Never_t None + | Int_key _ -> + Int_t None + | Nat_key _ -> + Nat_t None + | Signature_key _ -> + Signature_t None + | String_key _ -> + String_t None + | Bytes_key _ -> + Bytes_t None + | Mutez_key _ -> + Mutez_t None + | Bool_key _ -> + Bool_t None + | Key_hash_key _ -> + Key_hash_t None + | Key_key _ -> + Key_t None + | Timestamp_key _ -> + Timestamp_t None + | Chain_id_key _ -> + Chain_id_t None + | Address_key _ -> + Address_t None + | Pair_key ((a, _), (b, _), _) -> + Pair_t + ( (ty_of_comparable_ty a, None, None), + (ty_of_comparable_ty b, None, None), + None ) + | Union_key ((a, _), (b, _), _) -> + Union_t + ((ty_of_comparable_ty a, None), (ty_of_comparable_ty b, None), None) + | Option_key (t, _) -> + Option_t (ty_of_comparable_ty t, None) + +let unlist_ty : type a. a boxed_list ty -> a ty = function + | List_t (a, _) -> + a + | _ -> + (* FIXME: This is not robust to evolutions. *) + (* because of the concrete implementations of the type + constructors occurring in the definition of [ty]: *) + assert false + +let unset_ty : type a. a set ty -> a ty = function + | Set_t (a, _) -> + ty_of_comparable_ty a + | _ -> + (* FIXME: This is not robust to evolutions. *) + (* because of the concrete implementations of the type + constructors occurring in the definition of [ty]: *) + assert false + +let unmap_ty : type k v. (k, v) map ty -> k ty * v ty = function + | Map_t (k, v, _) -> + (ty_of_comparable_ty k, v) + | _ -> + (* FIXME: This is not robust to evolutions. *) + (* because of the concrete implementations of the type + constructors occurring in the definition of [ty]: *) + assert false + +let close_descr {loc; bef; aft; instr} = + let kinfo = {iloc = loc; kstack_ty = aft} in + let kinfo' = {iloc = loc; kstack_ty = bef} in + let kinstr = instr.apply kinfo' (IHalt kinfo) in + {kloc = loc; kbef = bef; kaft = aft; kinstr} + +let kinfo_of_descr {loc; bef; _} = {iloc = loc; kstack_ty = bef} + +let compose_descr : + type a s b u c v. + Script.location -> + (a, s, b, u) descr -> + (b, u, c, v) descr -> + (a, s, c, v) descr = + fun loc d1 d2 -> + { + loc; + bef = d1.bef; + aft = d2.aft; + instr = + { + size = d1.instr.size + d2.instr.size; + apply = + (fun _ k -> + d1.instr.apply + (kinfo_of_descr d1) + (d2.instr.apply (kinfo_of_descr d2) k)); + }; + } diff --git a/src/proto_alpha/lib_protocol/storage_costs.ml b/src/proto_alpha/lib_protocol/storage_costs.ml index f2d14564babedb727707c6e16575de5151d96ed5..dae9e12456fec9eb0f2278b2a320fb05f93863ce 100644 --- a/src/proto_alpha/lib_protocol/storage_costs.ml +++ b/src/proto_alpha/lib_protocol/storage_costs.ml @@ -28,14 +28,16 @@ cost(path_length, read_bytes) = 200_000 + 5000 * path_length + 2 * read_bytes *) let read_access ~path_length ~read_bytes = - let base_cost = Z.of_int (200_000 + (5000 * path_length)) in + let open Saturation_repr in + let base_cost = safe_int (200_000 + (5000 * path_length)) in Gas_limit_repr.atomic_step_cost - (Z.add base_cost (Z.mul (Z.of_int 2) (Z.of_int read_bytes))) + (add base_cost (mul (safe_int 2) (safe_int read_bytes))) (* The model for write accesses is the following: cost(written_bytes) = 200_000 + 4 * written_bytes *) let write_access ~written_bytes = + let open Saturation_repr in Gas_limit_repr.atomic_step_cost - (Z.add (Z.of_int 200_000) (Z.mul (Z.of_int 4) (Z.of_int written_bytes))) + (add (safe_int 200_000) (mul (safe_int 4) (safe_int written_bytes))) diff --git a/src/proto_alpha/lib_protocol/test/dune b/src/proto_alpha/lib_protocol/test/dune index 1f9ca1646a79ca4ca19c0bbafed8fd23d957b196..87b7e95ceff7fb0a23cccd5ff949fdb5a0020ed8 100644 --- a/src/proto_alpha/lib_protocol/test/dune +++ b/src/proto_alpha/lib_protocol/test/dune @@ -1,9 +1,10 @@ -(executable - (name main) +(executables + (names main saturation_fuzzing) (libraries tezos-base tezos-micheline tezos-protocol-environment alcotest-lwt + crowbar tezos-alpha-test-helpers tezos-stdlib-unix tezos-client-base @@ -43,10 +44,15 @@ (package tezos-protocol-alpha-tests) (action (run %{exe:main.exe} -v))) +(rule + (alias runtest_saturation_fuzzing) + (package tezos-protocol-alpha-tests) + (action (run %{exe:saturation_fuzzing.exe}))) + (rule (alias runtest) (package tezos-protocol-alpha-tests) - (deps (alias runtest_proto_alpha)) + (deps (alias runtest_proto_alpha) (alias runtest_saturation_fuzzing)) (action (progn))) (rule diff --git a/src/proto_alpha/lib_protocol/test/saturation_fuzzing.ml b/src/proto_alpha/lib_protocol/test/saturation_fuzzing.ml new file mode 100644 index 0000000000000000000000000000000000000000..1447e5ebfb2eee640c00abd19497909097eaac37 --- /dev/null +++ b/src/proto_alpha/lib_protocol/test/saturation_fuzzing.ml @@ -0,0 +1,92 @@ +(*****************************************************************************) +(* *) +(* Open Source License *) +(* Copyright (c) 2021 Nomadic Labs, *) +(* *) +(* Permission is hereby granted, free of charge, to any person obtaining a *) +(* copy of this software and associated documentation files (the "Software"),*) +(* to deal in the Software without restriction, including without limitation *) +(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) +(* and/or sell copies of the Software, and to permit persons to whom the *) +(* Software is furnished to do so, subject to the following conditions: *) +(* *) +(* The above copyright notice and this permission notice shall be included *) +(* in all copies or substantial portions of the Software. *) +(* *) +(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) +(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) +(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) +(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) +(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) +(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) +(* DEALINGS IN THE SOFTWARE. *) +(* *) +(*****************************************************************************) + +(** Testing + ------- + Component: Protocol Library + Invocation: dune build @src/proto_alpha/lib_protocol/runtest_saturation_fuzzing + Subject: Operations in Saturation_repr +*) + +open Protocol.Saturation_repr + +let gen_unsaturated = + let open Crowbar in + map [int] safe_int + +let gen_t = + let open Crowbar in + choose + [ const saturated; + gen_unsaturated; + gen_unsaturated; + gen_unsaturated; + gen_unsaturated ] + +(* Test. + * Tests that [f] commutes. + *) +let test_commutes f t1 t2 = + let fapp = f t1 t2 in + let fapp' = f t2 t1 in + Crowbar.check_eq ~pp fapp fapp' + +(* Test. + * Tests that [e] is neutral for [f]. + *) +let test_neutral f e t = + let fapp = f e t in + let fapp' = f t e in + Crowbar.check_eq ~pp fapp fapp' + +(* Test. + * Tests that [t] times [1] equals [t]. + *) +let test_mul_one t = Crowbar.check_eq ~pp (mul t @@ safe_int 1) t + +(* Test. + * Tests that [t] times [0] equals [0]. + *) +let test_mul_zero t = Crowbar.check_eq ~pp (mul t zero) (zero |> may_saturate) + +(* Test. + * Tests that [t] minus [zero] equals [t]. + *) +let test_sub_zero t = Crowbar.check_eq ~pp (sub t zero) t + +let tests = + Crowbar.add_test ~name:"add commutes" [gen_t; gen_t] (test_commutes add) ; + Crowbar.add_test ~name:"mul commutes" [gen_t; gen_t] (test_commutes mul) ; + Crowbar.add_test + ~name:"0 is neutral for add" + [gen_t] + (test_neutral add (zero |> may_saturate)) ; + Crowbar.add_test + ~name:"1 is neutral for mul" + [gen_t] + (test_neutral mul (safe_int 1)) ; + Crowbar.add_test ~name:"t * 0 = 0" [gen_t] test_mul_zero ; + Crowbar.add_test ~name:"t * 1 = t" [gen_t] test_mul_one ; + Crowbar.add_test ~name:"t - 0 = t" [gen_t] test_sub_zero diff --git a/src/proto_alpha/lib_protocol/test/test_gas_costs.ml b/src/proto_alpha/lib_protocol/test/test_gas_costs.ml index 3b14562a32e006092f3e2e1b37016d465cd062a9..c0c46af4e7a066939d01713eeae55672f9985047 100644 --- a/src/proto_alpha/lib_protocol/test/test_gas_costs.ml +++ b/src/proto_alpha/lib_protocol/test/test_gas_costs.ml @@ -34,6 +34,7 @@ open Protocol open Script_ir_translator +module S = Saturation_repr let dummy_list = list_cons 42 list_empty @@ -145,8 +146,8 @@ let all_interpreter_costs = ("compare", compare Script_typed_ir.(Int_key None) forty_two forty_two); ( "concat_string_precheck", concat_string_precheck (list_cons "42" list_empty) ); - ("concat_string", concat_string (Z.of_int 42)); - ("concat_bytes", concat_bytes (Z.of_int 42)); + ("concat_string", concat_string (S.safe_int 42)); + ("concat_bytes", concat_bytes (S.safe_int 42)); ("exec", exec); ("apply", apply); ("lambda", lambda); @@ -228,17 +229,17 @@ let all_io_costs = ("write_access 1", write_access ~written_bytes:1) ] (* Here we're using knowledge of the internal representation of costs to - cast them to Z ... *) -let cast_cost_to_z (c : Alpha_context.Gas.cost) : Z.t = + cast them to S ... *) +let cast_cost_to_s (c : Alpha_context.Gas.cost) : _ S.t = Data_encoding.Binary.to_bytes_exn Alpha_context.Gas.cost_encoding c - |> Data_encoding.Binary.of_bytes_exn Data_encoding.z + |> Data_encoding.Binary.of_bytes_exn S.n_encoding (** Checks that all costs are positive values. *) let test_cost_reprs_are_all_positive list () = List.iter_es (fun (cost_name, cost) -> - if Z.gt cost Z.zero then return_unit - else if Z.equal cost Z.zero && List.mem cost_name free then return_unit + if S.(cost > S.zero) then return_unit + else if S.equal cost S.zero && List.mem cost_name free then return_unit else fail (Exn @@ -248,7 +249,7 @@ let test_cost_reprs_are_all_positive list () = (** Checks that all costs are positive values. *) let test_costs_are_all_positive list () = let list = - List.map (fun (cost_name, cost) -> (cost_name, cast_cost_to_z cost)) list + List.map (fun (cost_name, cost) -> (cost_name, cast_cost_to_s cost)) list in test_cost_reprs_are_all_positive list () diff --git a/src/proto_alpha/lib_protocol/test/test_gas_levels.ml b/src/proto_alpha/lib_protocol/test/test_gas_levels.ml index 586aa2b02293ba9f6bc93803cbbc74b18a2d5572..2170ffdd50bf4bbd777693e6037f4ee22f661a30 100644 --- a/src/proto_alpha/lib_protocol/test/test_gas_levels.ml +++ b/src/proto_alpha/lib_protocol/test/test_gas_levels.ml @@ -32,6 +32,7 @@ open Protocol open Raw_context +module S = Saturation_repr (* This value is supposed to be larger than the block gas level limit but not saturated. *) @@ -60,7 +61,7 @@ let test_detect_gas_exhaustion_in_fresh_context () = dummy_context () >>=? fun context -> fail_unless - (consume_gas context (Z.of_int opg) |> succeed) + (consume_gas context (S.safe_int opg) |> succeed) (err "In a fresh context, gas consumption is unlimited.") let make_context initial_operation_gas = @@ -74,14 +75,14 @@ let test_detect_gas_exhaustion_when_operation_gas_hits_zero () = make_context 10 >>=? fun context -> fail_unless - (consume_gas context (Z.of_int opg) |> failed) + (consume_gas context (S.safe_int opg) |> failed) (err "Fail when consuming more than the remaining operation gas.") let test_detect_gas_exhaustion_when_block_gas_hits_zero () = make_context opg >>=? fun context -> fail_unless - (consume_gas context (Z.of_int opg) |> failed) + (consume_gas context (S.safe_int opg) |> failed) (err "Fail when consuming more than the remaining block gas.") let monitor initial_operation_level gas_level expectation () = @@ -89,7 +90,7 @@ let monitor initial_operation_level gas_level expectation () = make_context initial_operation_level >>=? fun context -> fail_unless - ( match consume_gas context (Z.of_int 10000) (* in milligas. *) with + ( match consume_gas context (S.safe_int 10000) (* in milligas. *) with | Ok context -> let remaining = gas_level context in remaining = integral_of_int_exn expectation diff --git a/src/proto_alpha/lib_protocol/test/test_gas_properties.ml b/src/proto_alpha/lib_protocol/test/test_gas_properties.ml index 66ee2b10e2b781e339e1b831f22968550f6554b9..ae72c19d4d6703086d48badfdf5a85b59026ff6f 100644 --- a/src/proto_alpha/lib_protocol/test/test_gas_properties.ml +++ b/src/proto_alpha/lib_protocol/test/test_gas_properties.ml @@ -31,6 +31,7 @@ *) open Protocol +module S = Saturation_repr type cost_kind = | Atomic_step @@ -66,19 +67,19 @@ let random_cost_of_kind (cost_kind : cost_kind) = let rand = Random.int 1000 in match cost_kind with | Atomic_step -> - atomic_step_cost (Z.of_int rand) + atomic_step_cost (S.safe_int rand) | Step -> - step_cost (Z.of_int rand) + step_cost (S.safe_int rand) | Alloc -> - alloc_cost (Z.of_int rand) + alloc_cost (S.safe_int rand) | Alloc_bytes -> alloc_bytes_cost rand | Alloc_mbytes -> alloc_mbytes_cost rand | Read_bytes -> - read_bytes_cost (Z.of_int rand) + read_bytes_cost rand | Write_bytes -> - write_bytes_cost (Z.of_int rand) + write_bytes_cost rand let random_cost () = random_cost_of_kind (random_cost_kind ()) diff --git a/src/proto_alpha/lib_protocol/test/test_interpretation.ml b/src/proto_alpha/lib_protocol/test/test_interpretation.ml index c5a53933cebeae8779a603801d7dad306ced3a6f..bf99a105839f4042d5b45f3fcf53ee4b5b22491a 100644 --- a/src/proto_alpha/lib_protocol/test/test_interpretation.ml +++ b/src/proto_alpha/lib_protocol/test/test_interpretation.ml @@ -53,23 +53,8 @@ let run_script ctx ?(step_constants = default_step_constants) contract ~internal:false >>=?? fun res -> return res -module Logger : STEP_LOGGER = struct - let log_interp _ctxt _descr _stack = () - - let log_entry _ctxt _descr _stack = () - - let log_exit _ctxt _descr _stack = () - - let get_log () = Lwt.return (Ok None) -end - -let run_step ctxt code param = - Script_interpreter.step - (module Logger) - ctxt - default_step_constants - code - param +let run_step ctxt code accu stack = + Script_interpreter.step None ctxt default_step_constants code accu stack (** Runs a script with an ill-typed parameter and verifies that a Bad_contract_parameter error is returned. *) @@ -100,20 +85,23 @@ let read_file filename = let s = really_input_string ch (in_channel_length ch) in close_in ch ; s -(* Check that too many recursive calls of the Michelson interpreter result in an error *) +(* Confront the Michelson interpreter to deep recursions. *) let test_stack_overflow () = + let open Script_typed_ir in test_context () >>=? fun ctxt -> - let descr instr = - Script_typed_ir.{loc = 0; bef = Empty_t; aft = Empty_t; instr} + let stack = Script_typed_ir.Bot_t in + let descr kinstr = + Script_typed_ir.{kloc = 0; kbef = stack; kaft = stack; kinstr} in + let kinfo = {iloc = -1; kstack_ty = stack} in let enorme_et_seq n = let rec aux n acc = - if n = 0 then acc else aux (n - 1) (descr (Seq (acc, descr Nop))) + if n = 0 then acc else aux (n - 1) (INop (kinfo, acc)) in - aux n (descr Nop) + aux n (IHalt kinfo) in - run_step ctxt (enorme_et_seq 10_001) () + run_step ctxt (descr (enorme_et_seq 100_000)) () () >>= function | Ok _ -> Alcotest.fail "expected an error" diff --git a/src/proto_alpha/lib_protocol/test/test_script_gas.ml b/src/proto_alpha/lib_protocol/test/test_script_gas.ml index 52504e4231b454d38189a5bdce6931d9eea152a6..c0c46933e73ff46cf92d153fda87126e58dbae88 100644 --- a/src/proto_alpha/lib_protocol/test/test_script_gas.ml +++ b/src/proto_alpha/lib_protocol/test/test_script_gas.ml @@ -32,6 +32,7 @@ *) open Protocol +module S = Saturation_repr module Tested_terms () = struct open Micheline @@ -106,14 +107,14 @@ module Tested_terms () = struct List.iter2_e ~when_different_lengths: (TzTrace.make @@ Exn (Failure "differently sized cost lists")) - (fun min full -> - if Z.leq min full then ok_unit + (fun smin full -> + if S.(smin <= full) then ok_unit else generic_error "Script_repr: inconsistent costs %a vs %a@." - Z.pp_print - min - Z.pp_print + S.pp + smin + S.pp full) minimal_costs full_costs diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undig2able.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undig2able.tz new file mode 100644 index 0000000000000000000000000000000000000000..6f7061e004a05f959c9621794c3cab0e2348c695 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undig2able.tz @@ -0,0 +1,5 @@ +parameter unit; +storage unit; +code { + DIG 2; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undigable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undigable.tz new file mode 100644 index 0000000000000000000000000000000000000000..9468f302459878a022d01931df359265bb67289b --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undigable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + DIG; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undip2able.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undip2able.tz new file mode 100644 index 0000000000000000000000000000000000000000..e048a24f74b8980279d4e10b7456412a3efb71a9 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undip2able.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DUP; + DIP 2 { DUP }; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undipable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undipable.tz new file mode 100644 index 0000000000000000000000000000000000000000..09f94b133e50bb90429a4fea5cee84f90e5867c8 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undipable.tz @@ -0,0 +1,5 @@ +parameter unit; +storage unit; +code { + DIP { DUP }; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undropable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undropable.tz new file mode 100644 index 0000000000000000000000000000000000000000..d33142cdb82b778e016a1e7955a3be8205d3b941 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undropable.tz @@ -0,0 +1,5 @@ +parameter unit; +storage unit; +code { + DROP 2; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undug2able.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undug2able.tz new file mode 100644 index 0000000000000000000000000000000000000000..5eef1da706f21850e7e9e69fa1f449f6bb580f06 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undug2able.tz @@ -0,0 +1,5 @@ +parameter unit; +storage unit; +code { + DUG 2; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undugable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undugable.tz new file mode 100644 index 0000000000000000000000000000000000000000..aec909e5844a9ab1e6c47baae8fd205c7eb679f1 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undugable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + DUG; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_undup2able.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_undup2able.tz new file mode 100644 index 0000000000000000000000000000000000000000..c760764fd5b281d5697ccb3e5f5d51b7b7f2b4b8 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_undup2able.tz @@ -0,0 +1,5 @@ +parameter unit; +storage unit; +code { + DUP 2; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unfailwithable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unfailwithable.tz new file mode 100644 index 0000000000000000000000000000000000000000..c8cf263e5dcc5f0a51e953848df3ece46e410e6a --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unfailwithable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + FAILWITH; + } \ No newline at end of file diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_ungetable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_ungetable.tz new file mode 100644 index 0000000000000000000000000000000000000000..79242f72c16c354a065016825bc09653ad8b8f92 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_ungetable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + GET 1; + } \ No newline at end of file diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unleftable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unleftable.tz new file mode 100644 index 0000000000000000000000000000000000000000..0bc846effa3b3b44c4f2c26ef24d96d99eb6e362 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unleftable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + LEFT unit; + } \ No newline at end of file diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unpairable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpairable.tz new file mode 100644 index 0000000000000000000000000000000000000000..70f7e3a40c1040d560ca1b133fe783f9847b188a --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpairable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + UNPAIR; + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable.tz new file mode 100644 index 0000000000000000000000000000000000000000..0f1d8ea456a225c7fe3b43c146d97309b2b9ef40 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable.tz @@ -0,0 +1,10 @@ +parameter unit; +storage unit; +code { + DROP ; + DUP ; + DROP ; + PUSH unit Unit ; + NIL operation ; + PAIR + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable_in_lambda.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable_in_lambda.tz new file mode 100644 index 0000000000000000000000000000000000000000..4299b8bef474c2a167b9302a4102fa5b5237b323 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unpopable_in_lambda.tz @@ -0,0 +1,10 @@ +parameter unit; +storage unit; +code { + DROP ; + LAMBDA int unit { DROP ; DUP }; + DROP ; + PUSH unit Unit ; + NIL operation ; + PAIR + } diff --git a/tests_python/contracts_alpha/ill_typed/stack_bottom_unrightable.tz b/tests_python/contracts_alpha/ill_typed/stack_bottom_unrightable.tz new file mode 100644 index 0000000000000000000000000000000000000000..a7cf3d06a4700a81752e2ccc80bc95e22a89c850 --- /dev/null +++ b/tests_python/contracts_alpha/ill_typed/stack_bottom_unrightable.tz @@ -0,0 +1,6 @@ +parameter unit; +storage unit; +code { + DROP; + RIGHT unit; + } \ No newline at end of file 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 85e0903f06efea1557a1e98ecd18d385a397a001..8e693a81947225ee939a78bcf8cf9cd83ada604a 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: 6617.422 units (will add 100 for safety) +Estimated gas: 6615.682 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.000966 Expected counter: [EXPECTED_COUNTER] - Gas limit: 6718 + Gas limit: 6716 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ................ -ꜩ0.000966 @@ -27,7 +27,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 82 bytes - Consumed gas: 3946.109 + Consumed gas: 3945.429 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: 2671.313 + Consumed gas: 2670.253 Injected block [BLOCK_HASH] 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 6276b225285cc0361de3cecf1ceb7527a82c4877..a40be19f903740e8fe4347298079b30129b17cec 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 @@ -45,7 +45,7 @@ Contract memorized as level. Injected block [BLOCK_HASH] Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 2226.695 units (will add 100 for safety) +Estimated gas: 2226.385 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -70,7 +70,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 4 Storage size: 40 bytes - Consumed gas: 2226.695 + Consumed gas: 2226.385 Balance updates: [CONTRACT_HASH] ... -ꜩ500 [CONTRACT_HASH] ... +ꜩ500 @@ -87,7 +87,7 @@ Injected block [BLOCK_HASH] Injected block [BLOCK_HASH] 4 Node is bootstrapped. -Estimated gas: 2226.689 units (will add 100 for safety) +Estimated gas: 2226.379 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -112,7 +112,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 7 Storage size: 40 bytes - Consumed gas: 2226.689 + Consumed gas: 2226.379 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 04006014af9575a845312e263b6a987e05ecd96a..388db519e394c7675b124b2d5097c0e50a45f32c 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 @@ -46,7 +46,7 @@ Injected block [BLOCK_HASH] Injected block [BLOCK_HASH] none Node is bootstrapped. -Estimated gas: 3520.421 units (will add 100 for safety) +Estimated gas: 3519.921 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -57,13 +57,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000659 + Fee to the baker: ꜩ0.000658 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3621 + Gas limit: 3620 Storage limit: 0 bytes Balance updates: - [CONTRACT_HASH] ................ -ꜩ0.000659 - fees(the baker who will include this operation,4) ... +ꜩ0.000659 + [CONTRACT_HASH] ................ -ꜩ0.000658 + fees(the baker who will include this operation,4) ... +ꜩ0.000658 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -72,7 +72,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 2520.421 + Consumed gas: 2519.921 Internal operations: Delegation: Contract: [CONTRACT_HASH] @@ -83,7 +83,7 @@ This sequence of operations was run: Injected block [BLOCK_HASH] [CONTRACT_HASH] (known as bootstrap5) Node is bootstrapped. -Estimated gas: 3494.881 units (will add 100 for safety) +Estimated gas: 3494.381 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -109,7 +109,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 51 bytes - Consumed gas: 2494.881 + Consumed gas: 2494.381 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 d074074118ba912357303c64010b97b9684111a2..5a1e7f6e4fa292541d9317eb523349736a1474ac 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: 6730.436 units (will add 100 for safety) +Estimated gas: 6722.846 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]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.001191 + Fee to the baker: ꜩ0.00119 Expected counter: [EXPECTED_COUNTER] - Gas limit: 6831 + Gas limit: 6823 Storage limit: 277 bytes Balance updates: - [CONTRACT_HASH] ................ -ꜩ0.001191 - fees(the baker who will include this operation,3) ... +ꜩ0.001191 + [CONTRACT_HASH] ................ -ꜩ0.00119 + fees(the baker who will include this operation,3) ... +ꜩ0.00119 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -29,7 +29,7 @@ This sequence of operations was run: Updated storage: [OPERATION_HASH]48f709699019725ba Storage size: 578 bytes - Consumed gas: 5303.436 + Consumed gas: 5295.846 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 2dda8ec65b51fab987e385d17bc5a190ff973af1..52d9654309b4b5a5e3b7b2f39b857d57362d785e 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 @@ -44,7 +44,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as source. Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 2543.359 units (will add 100 for safety) +Estimated gas: 2543.049 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -69,14 +69,14 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 2543.359 + Consumed gas: 2543.049 Injected block [BLOCK_HASH] "[CONTRACT_HASH]" [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 5961.532 units (will add 100 for safety) +Estimated gas: 5960.602 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -89,7 +89,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000901 Expected counter: [EXPECTED_COUNTER] - Gas limit: 6062 + Gas limit: 6061 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ................ -ꜩ0.000901 @@ -102,7 +102,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 3418.173 + Consumed gas: 3417.553 Internal operations: Transaction: Amount: ꜩ0 @@ -111,7 +111,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c Storage size: 65 bytes - Consumed gas: 2543.359 + Consumed gas: 2543.049 Injected block [BLOCK_HASH] "[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 e8ad1d9d67138dce7d92ca7adae897fbc89364b4..d454a7b796f0543c2db03eb522e1997acc3cce58 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 @@ -66,7 +66,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as split_bytes. Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 3492.787 units (will add 100 for safety) +Estimated gas: 3485.037 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]' @@ -77,13 +77,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000621 + Fee to the baker: ꜩ0.00062 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3593 + Gas limit: 3586 Storage limit: 38 bytes Balance updates: - [CONTRACT_HASH] ................ -ꜩ0.000621 - fees(the baker who will include this operation,4) ... +ꜩ0.000621 + [CONTRACT_HASH] ................ -ꜩ0.00062 + fees(the baker who will include this operation,4) ... +ꜩ0.00062 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -93,14 +93,14 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 3492.787 + Consumed gas: 3485.037 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 Injected block [BLOCK_HASH] { 0xaa ; 0xbb ; 0xcc } Node is bootstrapped. -Estimated gas: 3633.637 units (will add 100 for safety) +Estimated gas: 3625.107 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]' @@ -111,13 +111,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000635 + Fee to the baker: ꜩ0.000634 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3734 + Gas limit: 3726 Storage limit: 38 bytes Balance updates: - [CONTRACT_HASH] ................ -ꜩ0.000635 - fees(the baker who will include this operation,4) ... +ꜩ0.000635 + [CONTRACT_HASH] ................ -ꜩ0.000634 + fees(the baker who will include this operation,4) ... +ꜩ0.000634 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -127,7 +127,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: 3633.637 + Consumed gas: 3625.107 Balance updates: [CONTRACT_HASH] ... -ꜩ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 3fd417f6d925edb87bdeb3d9b2c5863853bcdced..8542c501c7195e91cdbe5a339eb085e5fca63e3f 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 @@ -66,7 +66,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as split_string. Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 3462.831 units (will add 100 for safety) +Estimated gas: 3455.081 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]' @@ -77,13 +77,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000618 + Fee to the baker: ꜩ0.000617 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3563 + Gas limit: 3556 Storage limit: 38 bytes Balance updates: - [CONTRACT_HASH] ................ -ꜩ0.000618 - fees(the baker who will include this operation,3) ... +ꜩ0.000618 + [CONTRACT_HASH] ................ -ꜩ0.000617 + fees(the baker who will include this operation,3) ... +ꜩ0.000617 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -93,14 +93,14 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 3462.831 + Consumed gas: 3455.081 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0045 Injected block [BLOCK_HASH] { "a" ; "b" ; "c" } Node is bootstrapped. -Estimated gas: 3519.753 units (will add 100 for safety) +Estimated gas: 3511.223 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]' @@ -113,7 +113,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000623 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3620 + Gas limit: 3612 Storage limit: 38 bytes Balance updates: [CONTRACT_HASH] ................ -ꜩ0.000623 @@ -127,7 +127,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: 3519.753 + Consumed gas: 3511.223 Balance updates: [CONTRACT_HASH] ... -ꜩ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 6cc58900d7aa1c34a9c5bf5bcf3caebe32965cac..f318d1b43c12a8c2129520cda9b63910f0b6c72e 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 @@ -108,7 +108,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as store_input. Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 2211.859 units (will add 100 for safety) +Estimated gas: 2211.609 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]' @@ -135,7 +135,7 @@ This sequence of operations was run: Updated storage: "abcdefg" Storage size: 48 bytes Paid storage size diff: 7 bytes - Consumed gas: 2211.859 + Consumed gas: 2211.609 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00175 [CONTRACT_HASH] ... -ꜩ100 @@ -145,7 +145,7 @@ Injected block [BLOCK_HASH] 200 ꜩ "abcdefg" Node is bootstrapped. -Estimated gas: 2211.887 units (will add 100 for safety) +Estimated gas: 2211.637 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -171,7 +171,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: "xyz" Storage size: 44 bytes - Consumed gas: 2211.887 + Consumed gas: 2211.637 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 e7c183a823997a2533d868d25b4a9b89909e819e..c82b81ee10b79311aa4488686f70c23884ebc655 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 @@ -44,7 +44,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as transfer_amount. Injected block [BLOCK_HASH] Node is bootstrapped. -Estimated gas: 2224.625 units (will add 100 for safety) +Estimated gas: 2224.315 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]' @@ -70,7 +70,7 @@ This sequence of operations was run: Updated storage: 500000000 Storage size: 44 bytes Paid storage size diff: 4 bytes - Consumed gas: 2224.625 + Consumed gas: 2224.315 Balance updates: [CONTRACT_HASH] ... -ꜩ0.001 [CONTRACT_HASH] ... -ꜩ500 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 cac0e7ca87ff385c120a0f21b53abbd3fbd889df..b0e438cd1b71ce907c1ce005cdff347f2bc2c00b 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 @@ -137,7 +137,7 @@ Injected block [BLOCK_HASH] [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 5464.086 units (will add 100 for safety) +Estimated gas: 5463.096 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -150,7 +150,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000854 Expected counter: [EXPECTED_COUNTER] - Gas limit: 5565 + Gas limit: 5564 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ................ -ꜩ0.000854 @@ -163,7 +163,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 3252.371 + Consumed gas: 3251.631 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -175,7 +175,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 2211.715 + Consumed gas: 2211.465 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -185,7 +185,7 @@ Injected block [BLOCK_HASH] [CONTRACT_HASH] Node is bootstrapped. -Estimated gas: 5464.086 units (will add 100 for safety) +Estimated gas: 5463.096 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -198,7 +198,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000854 Expected counter: [EXPECTED_COUNTER] - Gas limit: 5565 + Gas limit: 5564 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ................ -ꜩ0.000854 @@ -211,7 +211,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 3252.371 + Consumed gas: 3251.631 Balance updates: [CONTRACT_HASH] ... -ꜩ100 [CONTRACT_HASH] ... +ꜩ100 @@ -223,7 +223,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 38 bytes - Consumed gas: 2211.715 + Consumed gas: 2211.465 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.ed8a8c90dc.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.ed8a8c90dc.out" index cc735b855129abb95c86bef43d63d68bf10f3384..23b8252ff6b229db557dd6e20dc41617f70fed91 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.ed8a8c90dc.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.ed8a8c90dc.out" @@ -8,35 +8,24 @@ big_map diff New map(0) of type (big_map string nat) Set map(0)["hello"] to 4 trace - - location: 11 (remaining gas: 1039988.651 units remaining) + - location: 13 (remaining gas: 1039988.651 units remaining) [ (Pair "hello" (Some 4) {}) ] - - location: 13 (remaining gas: 1039988.451 units remaining) + - location: 13 (remaining gas: 1039988.571 units remaining) [ "hello" @parameter (Pair (Some 4) {}) @storage ] - - location: 16 (remaining gas: 1039988.151 units remaining) + - location: 14 (remaining gas: 1039988.471 units remaining) + [ (Pair (Some 4) {}) @storage ] + - location: 16 (remaining gas: 1039988.391 units remaining) [ (Some 4) {} ] - - location: 15 (remaining gas: 1039988.081 units remaining) - [ (Some 4) - {} ] - - location: 14 (remaining gas: 1039988.081 units remaining) - [ "hello" @parameter - (Some 4) - {} ] - - location: -1 (remaining gas: 1039988.011 units remaining) - [ "hello" @parameter - (Some 4) - {} ] - - location: 17 (remaining gas: 1039987.791 units remaining) + - location: 17 (remaining gas: 1039988.231 units remaining) [ None { Elt "hello" 4 } ] - - location: 18 (remaining gas: 1039987.651 units remaining) + - location: 18 (remaining gas: 1039988.151 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 19 (remaining gas: 1039987.511 units remaining) + - location: 19 (remaining gas: 1039988.071 units remaining) [ {} (Pair None { Elt "hello" 4 }) ] - - location: 21 (remaining gas: 1039987.371 units remaining) - [ (Pair {} None { Elt "hello" 4 }) ] - - location: -1 (remaining gas: 1039987.301 units remaining) + - location: 21 (remaining gas: 1039987.991 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.4ba77dda56.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.4ba77dda56.out" index 13b8f03d3d0cef028d3bafbc4768276232a30ed4..e21c5a3868c1bcda7f6454df785cb00c72f03307 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.4ba77dda56.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.4ba77dda56.out" @@ -9,35 +9,24 @@ big_map diff Set map(0)["hello"] to 4 Set map(0)["hi"] to 5 trace - - location: 11 (remaining gas: 1039988.057 units remaining) + - location: 13 (remaining gas: 1039988.057 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039987.857 units remaining) + - location: 13 (remaining gas: 1039987.977 units remaining) [ "hi" @parameter (Pair (Some 5) { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039987.557 units remaining) + - location: 14 (remaining gas: 1039987.877 units remaining) + [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039987.797 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039987.487 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.487 units remaining) - [ "hi" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039987.417 units remaining) - [ "hi" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039987.197 units remaining) + - location: 17 (remaining gas: 1039987.637 units remaining) [ None { Elt "hello" 4 ; Elt "hi" 5 } ] - - location: 18 (remaining gas: 1039987.057 units remaining) + - location: 18 (remaining gas: 1039987.557 units remaining) [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 19 (remaining gas: 1039986.917 units remaining) + - location: 19 (remaining gas: 1039987.477 units remaining) [ {} (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 21 (remaining gas: 1039986.777 units remaining) - [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: -1 (remaining gas: 1039986.707 units remaining) + - location: 21 (remaining gas: 1039987.397 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 (Some 5) { Elt \"hello\" 4.662e6b84f7.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.662e6b84f7.out" index e7514617ee193a1130faaeeda2e3e231f7e7e78f..4f1d59144582b2cd7d8d7ac083e43cc33e67788c 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.662e6b84f7.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.662e6b84f7.out" @@ -8,35 +8,24 @@ big_map diff New map(0) of type (big_map string nat) Set map(0)["hello"] to 5 trace - - location: 11 (remaining gas: 1039988.027 units remaining) + - location: 13 (remaining gas: 1039988.027 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039987.827 units remaining) + - location: 13 (remaining gas: 1039987.947 units remaining) [ "hello" @parameter (Pair (Some 5) { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039987.527 units remaining) + - location: 14 (remaining gas: 1039987.847 units remaining) + [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039987.767 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039987.457 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.457 units remaining) - [ "hello" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039987.387 units remaining) - [ "hello" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039987.167 units remaining) + - location: 17 (remaining gas: 1039987.607 units remaining) [ (Some 4) { Elt "hello" 5 } ] - - location: 18 (remaining gas: 1039987.027 units remaining) + - location: 18 (remaining gas: 1039987.527 units remaining) [ (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 19 (remaining gas: 1039986.887 units remaining) + - location: 19 (remaining gas: 1039987.447 units remaining) [ {} (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 21 (remaining gas: 1039986.747 units remaining) - [ (Pair {} (Some 4) { Elt "hello" 5 }) ] - - location: -1 (remaining gas: 1039986.677 units remaining) + - location: 21 (remaining gas: 1039987.367 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 None { Elt \"1\" 1 ; .7806be875b.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 ; .7806be875b.out" index 038d7695c568dbad0a8f39f2cdb705c63c7bf3d5..7310e27baf4722d1296fc3fe467b8b5500ffa9a6 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 ; .7806be875b.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 ; .7806be875b.out" @@ -9,35 +9,24 @@ big_map diff Unset map(0)["1"] Set map(0)["2"] to 2 trace - - location: 11 (remaining gas: 1039987.643 units remaining) + - location: 13 (remaining gas: 1039987.643 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039987.443 units remaining) + - location: 13 (remaining gas: 1039987.563 units remaining) [ "1" @parameter (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] - - location: 16 (remaining gas: 1039987.143 units remaining) + - location: 14 (remaining gas: 1039987.463 units remaining) + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + - location: 16 (remaining gas: 1039987.383 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 15 (remaining gas: 1039987.073 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039987.073 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: -1 (remaining gas: 1039987.003 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039986.783 units remaining) + - location: 17 (remaining gas: 1039987.223 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039986.643 units remaining) + - location: 18 (remaining gas: 1039987.143 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039986.503 units remaining) + - location: 19 (remaining gas: 1039987.063 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039986.363 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] - - location: -1 (remaining gas: 1039986.293 units remaining) + - location: 21 (remaining gas: 1039986.983 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 ; .7beec6cc30.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 ; .7beec6cc30.out" index d2186acbb7482ba067c28456639f6818a905aef4..9b4a6bd56602bb2006a6716e6672dd02eb51d3bf 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 ; .7beec6cc30.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 ; .7beec6cc30.out" @@ -9,35 +9,24 @@ big_map diff Unset map(0)["1"] Set map(0)["2"] to 2 trace - - location: 11 (remaining gas: 1039987.643 units remaining) + - location: 13 (remaining gas: 1039987.643 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039987.443 units remaining) + - location: 13 (remaining gas: 1039987.563 units remaining) [ "1" @parameter (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] - - location: 16 (remaining gas: 1039987.143 units remaining) + - location: 14 (remaining gas: 1039987.463 units remaining) + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + - location: 16 (remaining gas: 1039987.383 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 15 (remaining gas: 1039987.073 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039987.073 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: -1 (remaining gas: 1039987.003 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039986.783 units remaining) + - location: 17 (remaining gas: 1039987.223 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039986.643 units remaining) + - location: 18 (remaining gas: 1039987.143 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039986.503 units remaining) + - location: 19 (remaining gas: 1039987.063 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039986.363 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] - - location: -1 (remaining gas: 1039986.293 units remaining) + - location: 21 (remaining gas: 1039986.983 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 })-.2e17580138.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 })-.2e17580138.out" index 1643aec70fb66bee6ad76a8fb47ce2931d315a97..feac8e7398134e1be17207d055b6da140a0a3071 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 })-.2e17580138.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 })-.2e17580138.out" @@ -8,35 +8,24 @@ big_map diff New map(0) of type (big_map string nat) Unset map(0)["hello"] trace - - location: 11 (remaining gas: 1039988.267 units remaining) + - location: 13 (remaining gas: 1039988.267 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039988.067 units remaining) + - location: 13 (remaining gas: 1039988.187 units remaining) [ "hello" @parameter (Pair None { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039987.767 units remaining) + - location: 14 (remaining gas: 1039988.087 units remaining) + [ (Pair None { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039988.007 units remaining) [ None { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039987.697 units remaining) - [ None - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039987.697 units remaining) - [ "hello" @parameter - None - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039987.627 units remaining) - [ "hello" @parameter - None - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039987.407 units remaining) + - location: 17 (remaining gas: 1039987.847 units remaining) [ (Some 4) {} ] - - location: 18 (remaining gas: 1039987.267 units remaining) + - location: 18 (remaining gas: 1039987.767 units remaining) [ (Pair (Some 4) {}) ] - - location: 19 (remaining gas: 1039987.127 units remaining) + - location: 19 (remaining gas: 1039987.687 units remaining) [ {} (Pair (Some 4) {}) ] - - location: 21 (remaining gas: 1039986.987 units remaining) - [ (Pair {} (Some 4) {}) ] - - location: -1 (remaining gas: 1039986.917 units remaining) + - location: 21 (remaining gas: 1039987.607 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.ae2570aa95.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.ae2570aa95.out" index b18f28c849bc62730e7e5250b9b17fc18bf8dded..d4d945a6ad43c63047579aefb2ea4eb8eefc40b9 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.ae2570aa95.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.ae2570aa95.out" @@ -8,35 +8,24 @@ big_map diff New map(0) of type (big_map string nat) Unset map(0)["hello"] trace - - location: 11 (remaining gas: 1039988.891 units remaining) + - location: 13 (remaining gas: 1039988.891 units remaining) [ (Pair "hello" None {}) ] - - location: 13 (remaining gas: 1039988.691 units remaining) + - location: 13 (remaining gas: 1039988.811 units remaining) [ "hello" @parameter (Pair None {}) @storage ] - - location: 16 (remaining gas: 1039988.391 units remaining) + - location: 14 (remaining gas: 1039988.711 units remaining) + [ (Pair None {}) @storage ] + - location: 16 (remaining gas: 1039988.631 units remaining) [ None {} ] - - location: 15 (remaining gas: 1039988.321 units remaining) + - location: 17 (remaining gas: 1039988.471 units remaining) [ None {} ] - - location: 14 (remaining gas: 1039988.321 units remaining) - [ "hello" @parameter - None - {} ] - - location: -1 (remaining gas: 1039988.251 units remaining) - [ "hello" @parameter - None - {} ] - - location: 17 (remaining gas: 1039988.031 units remaining) - [ None - {} ] - - location: 18 (remaining gas: 1039987.891 units remaining) + - location: 18 (remaining gas: 1039988.391 units remaining) [ (Pair None {}) ] - - location: 19 (remaining gas: 1039987.751 units remaining) + - location: 19 (remaining gas: 1039988.311 units remaining) [ {} (Pair None {}) ] - - location: 21 (remaining gas: 1039987.611 units remaining) - [ (Pair {} None {}) ] - - location: -1 (remaining gas: 1039987.541 units remaining) + - location: 21 (remaining gas: 1039988.231 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.7085ccc339.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.7085ccc339.out" index 244eca17f903ad9268b54558224b2fa3db845a54..31ff37efa40a240c7552daef124c4c0f8f331692 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.7085ccc339.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.7085ccc339.out" @@ -9,43 +9,34 @@ big_map diff Set map(0)["1"] to "one" Set map(0)["2"] to "two" trace - - location: 11 (remaining gas: 1039982.525 units remaining) + - location: 12 (remaining gas: 1039982.525 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 12 (remaining gas: 1039982.385 units remaining) + - location: 12 (remaining gas: 1039982.445 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 13 (remaining gas: 1039982.245 units remaining) + - location: 13 (remaining gas: 1039982.365 units remaining) [ "1" @parameter (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - - location: 17 (remaining gas: 1039981.885 units remaining) + - location: 14 (remaining gas: 1039982.265 units remaining) + [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] + - location: 17 (remaining gas: 1039982.185 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) @storage ] - - location: 18 (remaining gas: 1039981.745 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: -1 (remaining gas: 1039981.675 units remaining) + - location: 18 (remaining gas: 1039982.105 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: 19 (remaining gas: 1039981.535 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] - - location: -1 (remaining gas: 1039981.465 units remaining) + - location: 19 (remaining gas: 1039982.025 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 14 (remaining gas: 1039981.465 units remaining) - [ "1" @parameter - { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] - - location: 20 (remaining gas: 1039981.325 units remaining) + - location: 20 (remaining gas: 1039981.945 units remaining) [ (Some "one") { Elt "1" "one" ; Elt "2" "two" } ] - - location: 21 (remaining gas: 1039981.195 units remaining) + - location: 21 (remaining gas: 1039981.875 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } (Some "one") ] - - location: 22 (remaining gas: 1039981.055 units remaining) + - location: 22 (remaining gas: 1039981.795 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - - location: 23 (remaining gas: 1039980.915 units remaining) + - location: 23 (remaining gas: 1039981.715 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - - location: 25 (remaining gas: 1039980.775 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - - location: -1 (remaining gas: 1039980.705 units remaining) + - location: 25 (remaining gas: 1039981.635 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)-\"\".75aa05c5ef.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)-\"\".75aa05c5ef.out" index b234724e1ace316633ea85703560bbdafb1ea8ac..0200014b2f69bf45060bfdc6623e4e36d18ac06c 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)-\"\".75aa05c5ef.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)-\"\".75aa05c5ef.out" @@ -8,43 +8,34 @@ big_map diff New map(0) of type (big_map string string) Set map(0)["hello"] to "hi" trace - - location: 11 (remaining gas: 1039983.253 units remaining) + - location: 12 (remaining gas: 1039983.253 units remaining) [ (Pair "" { Elt "hello" "hi" } None) ] - - location: 12 (remaining gas: 1039983.113 units remaining) + - location: 12 (remaining gas: 1039983.173 units remaining) [ (Pair "" { Elt "hello" "hi" } None) (Pair "" { Elt "hello" "hi" } None) ] - - location: 13 (remaining gas: 1039982.973 units remaining) + - location: 13 (remaining gas: 1039983.093 units remaining) [ "" @parameter (Pair "" { Elt "hello" "hi" } None) ] - - location: 17 (remaining gas: 1039982.613 units remaining) + - location: 14 (remaining gas: 1039982.993 units remaining) + [ (Pair "" { Elt "hello" "hi" } None) ] + - location: 17 (remaining gas: 1039982.913 units remaining) [ (Pair { Elt "hello" "hi" } None) @storage ] - - location: 18 (remaining gas: 1039982.473 units remaining) - [ { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039982.403 units remaining) + - location: 18 (remaining gas: 1039982.833 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039982.263 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039982.193 units remaining) + - location: 19 (remaining gas: 1039982.753 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039982.193 units remaining) - [ "" @parameter - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039982.053 units remaining) + - location: 20 (remaining gas: 1039982.673 units remaining) [ None { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039981.923 units remaining) + - location: 21 (remaining gas: 1039982.603 units remaining) [ { Elt "hello" "hi" } None ] - - location: 22 (remaining gas: 1039981.783 units remaining) + - location: 22 (remaining gas: 1039982.523 units remaining) [ (Pair { Elt "hello" "hi" } None) ] - - location: 23 (remaining gas: 1039981.643 units remaining) + - location: 23 (remaining gas: 1039982.443 units remaining) [ {} (Pair { Elt "hello" "hi" } None) ] - - location: 25 (remaining gas: 1039981.503 units remaining) - [ (Pair {} { Elt "hello" "hi" } None) ] - - location: -1 (remaining gas: 1039981.433 units remaining) + - location: 25 (remaining gas: 1039982.363 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.ce376412b0.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.ce376412b0.out" index ced903564247588311ef64f0b562083ebbc180b1..8c4751056bd16ad62e2fb70008f347970cf6e4cb 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.ce376412b0.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.ce376412b0.out" @@ -8,43 +8,34 @@ big_map diff New map(0) of type (big_map string string) Set map(0)["hello"] to "hi" trace - - location: 11 (remaining gas: 1039983.203 units remaining) + - location: 12 (remaining gas: 1039983.203 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 12 (remaining gas: 1039983.063 units remaining) + - location: 12 (remaining gas: 1039983.123 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 13 (remaining gas: 1039982.923 units remaining) + - location: 13 (remaining gas: 1039983.043 units remaining) [ "hello" @parameter (Pair "hello" { Elt "hello" "hi" } None) ] - - location: 17 (remaining gas: 1039982.563 units remaining) + - location: 14 (remaining gas: 1039982.943 units remaining) + [ (Pair "hello" { Elt "hello" "hi" } None) ] + - location: 17 (remaining gas: 1039982.863 units remaining) [ (Pair { Elt "hello" "hi" } None) @storage ] - - location: 18 (remaining gas: 1039982.423 units remaining) - [ { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039982.353 units remaining) + - location: 18 (remaining gas: 1039982.783 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039982.213 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039982.143 units remaining) + - location: 19 (remaining gas: 1039982.703 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039982.143 units remaining) - [ "hello" @parameter - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039982.003 units remaining) + - location: 20 (remaining gas: 1039982.623 units remaining) [ (Some "hi") { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039981.873 units remaining) + - location: 21 (remaining gas: 1039982.553 units remaining) [ { Elt "hello" "hi" } (Some "hi") ] - - location: 22 (remaining gas: 1039981.733 units remaining) + - location: 22 (remaining gas: 1039982.473 units remaining) [ (Pair { Elt "hello" "hi" } (Some "hi")) ] - - location: 23 (remaining gas: 1039981.593 units remaining) + - location: 23 (remaining gas: 1039982.393 units remaining) [ {} (Pair { Elt "hello" "hi" } (Some "hi")) ] - - location: 25 (remaining gas: 1039981.453 units remaining) - [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ] - - location: -1 (remaining gas: 1039981.383 units remaining) + - location: 25 (remaining gas: 1039982.313 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\" .0689a9f5c7.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\" .0689a9f5c7.out" index cbf36dd206254947076361be6310769b94b78ca6..c451db0880c5f071d675ae8b21a43ff19d543692 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\" .0689a9f5c7.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\" .0689a9f5c7.out" @@ -9,46 +9,29 @@ big_map diff Set map(0)["1"] to "one" Unset map(0)["2"] trace - - location: 13 (remaining gas: 1039984.765 units remaining) + - location: 15 (remaining gas: 1039984.765 units remaining) [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.565 units remaining) + - location: 15 (remaining gas: 1039984.685 units remaining) [ { Elt "2" None } @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039984.265 units remaining) + - location: 16 (remaining gas: 1039984.585 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039984.505 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039984.195 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039984.195 units remaining) - [ { Elt "2" None } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039984.125 units remaining) - [ { Elt "2" None } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 21 (remaining gas: 1039983.805 units remaining) + - location: 21 (remaining gas: 1039984.305 units remaining) [ "2" @key None @elt { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.665 units remaining) - [ { Elt "1" "one" } - Unit ] - - location: -1 (remaining gas: 1039983.595 units remaining) + - location: 22 (remaining gas: 1039984.225 units remaining) [ { Elt "1" "one" } Unit ] - - location: 19 (remaining gas: 1039983.595 units remaining) - [ { Elt "1" "one" } - Unit ] - - location: 23 (remaining gas: 1039983.455 units remaining) + - location: 23 (remaining gas: 1039984.145 units remaining) [ (Pair { Elt "1" "one" } Unit) ] - - location: 24 (remaining gas: 1039983.315 units remaining) + - location: 24 (remaining gas: 1039984.065 units remaining) [ {} (Pair { Elt "1" "one" } Unit) ] - - location: 26 (remaining gas: 1039983.175 units remaining) - [ (Pair {} { Elt "1" "one" } Unit) ] - - location: -1 (remaining gas: 1039983.105 units remaining) + - location: 26 (remaining gas: 1039983.985 units remaining) [ (Pair {} { Elt "1" "one" } 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\" .28027e7c51.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\" .28027e7c51.out" index aa6fd21b9a886f042620f8cb544221975bad5fbc..ba1c0ef4332e30493fcff30e2c38febe9445e7bd 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\" .28027e7c51.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\" .28027e7c51.out" @@ -9,35 +9,21 @@ big_map diff Set map(0)["1"] to "one" Set map(0)["2"] to "two" trace - - location: 13 (remaining gas: 1039985.349 units remaining) + - location: 15 (remaining gas: 1039985.349 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039985.149 units remaining) + - location: 15 (remaining gas: 1039985.269 units remaining) [ {} @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039984.849 units remaining) + - location: 16 (remaining gas: 1039985.169 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039985.089 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039984.779 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039984.779 units remaining) - [ {} @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039984.709 units remaining) - [ {} @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 19 (remaining gas: 1039984.569 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 23 (remaining gas: 1039984.429 units remaining) + - location: 23 (remaining gas: 1039984.929 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039984.289 units remaining) + - location: 24 (remaining gas: 1039984.849 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039984.149 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: -1 (remaining gas: 1039984.079 units remaining) + - location: 26 (remaining gas: 1039984.769 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\" .5b9b4f4add.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\" .5b9b4f4add.out" index 3f91418ad4bec3161f0a711be44b5b90a2d8bb18..cf919b385bf41b7843e0dfe49b41b197f57beaac 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\" .5b9b4f4add.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\" .5b9b4f4add.out" @@ -9,46 +9,29 @@ big_map diff Set map(0)["1"] to "two" Set map(0)["2"] to "two" trace - - location: 13 (remaining gas: 1039984.481 units remaining) + - location: 15 (remaining gas: 1039984.481 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.281 units remaining) + - location: 15 (remaining gas: 1039984.401 units remaining) [ { Elt "1" (Some "two") } @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039983.981 units remaining) + - location: 16 (remaining gas: 1039984.301 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039984.221 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" (Some "two") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.841 units remaining) - [ { Elt "1" (Some "two") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 21 (remaining gas: 1039983.521 units remaining) + - location: 21 (remaining gas: 1039984.021 units remaining) [ "1" @key (Some "two") @elt { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.381 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.311 units remaining) + - location: 22 (remaining gas: 1039983.941 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.311 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] - - location: 23 (remaining gas: 1039983.171 units remaining) + - location: 23 (remaining gas: 1039983.861 units remaining) [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.031 units remaining) + - location: 24 (remaining gas: 1039983.781 units remaining) [ {} (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039982.891 units remaining) - [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: -1 (remaining gas: 1039982.821 units remaining) + - location: 26 (remaining gas: 1039983.701 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\" .923a9b1a0c.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\" .923a9b1a0c.out" index 03a7e8fa90ebc7d9f286c716b6107d27a6a5b6b3..29a6e4104620b9fe49ad0190df812ee55e957719 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\" .923a9b1a0c.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\" .923a9b1a0c.out" @@ -9,46 +9,29 @@ big_map diff Set map(0)["1"] to "two" Set map(0)["2"] to "two" trace - - location: 13 (remaining gas: 1039984.481 units remaining) + - location: 15 (remaining gas: 1039984.481 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.281 units remaining) + - location: 15 (remaining gas: 1039984.401 units remaining) [ { Elt "1" (Some "two") } @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039983.981 units remaining) + - location: 16 (remaining gas: 1039984.301 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039984.221 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" (Some "two") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.841 units remaining) - [ { Elt "1" (Some "two") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 21 (remaining gas: 1039983.521 units remaining) + - location: 21 (remaining gas: 1039984.021 units remaining) [ "1" @key (Some "two") @elt { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.381 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.311 units remaining) + - location: 22 (remaining gas: 1039983.941 units remaining) [ { Elt "1" "two" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.311 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] - - location: 23 (remaining gas: 1039983.171 units remaining) + - location: 23 (remaining gas: 1039983.861 units remaining) [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.031 units remaining) + - location: 24 (remaining gas: 1039983.781 units remaining) [ {} (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039982.891 units remaining) - [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] - - location: -1 (remaining gas: 1039982.821 units remaining) + - location: 26 (remaining gas: 1039983.701 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\" .e075542e26.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\" .e075542e26.out" index caf39e8096fa6ac5191f8cd161a5878fb50a9e98..795c81a94320757c3e26aa35dc1b5f1110e4fcfc 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\" .e075542e26.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\" .e075542e26.out" @@ -10,46 +10,29 @@ big_map diff Set map(0)["2"] to "two" Set map(0)["3"] to "three" trace - - location: 13 (remaining gas: 1039984.461 units remaining) + - location: 15 (remaining gas: 1039984.461 units remaining) [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.261 units remaining) + - location: 15 (remaining gas: 1039984.381 units remaining) [ { Elt "3" (Some "three") } @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039983.961 units remaining) + - location: 16 (remaining gas: 1039984.281 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039984.201 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039983.891 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039983.891 units remaining) - [ { Elt "3" (Some "three") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.821 units remaining) - [ { Elt "3" (Some "three") } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 21 (remaining gas: 1039983.501 units remaining) + - location: 21 (remaining gas: 1039984.001 units remaining) [ "3" @key (Some "three") @elt { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.361 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } - Unit ] - - location: -1 (remaining gas: 1039983.291 units remaining) + - location: 22 (remaining gas: 1039983.921 units remaining) [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit ] - - location: 19 (remaining gas: 1039983.291 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } - Unit ] - - location: 23 (remaining gas: 1039983.151 units remaining) + - location: 23 (remaining gas: 1039983.841 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - - location: 24 (remaining gas: 1039983.011 units remaining) + - location: 24 (remaining gas: 1039983.761 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - - location: 26 (remaining gas: 1039982.871 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - - location: -1 (remaining gas: 1039982.801 units remaining) + - location: 26 (remaining gas: 1039983.681 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\" .f2ff59db97.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\" .f2ff59db97.out" index c2f150a379d2b4472f7b903d7c2e9b2bb11706ef..7560443d7863893fd1e1d6ec9502570564ea6d9e 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\" .f2ff59db97.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\" .f2ff59db97.out" @@ -10,46 +10,29 @@ big_map diff Set map(0)["2"] to "two" Unset map(0)["3"] trace - - location: 13 (remaining gas: 1039984.765 units remaining) + - location: 15 (remaining gas: 1039984.765 units remaining) [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 15 (remaining gas: 1039984.565 units remaining) + - location: 15 (remaining gas: 1039984.685 units remaining) [ { Elt "3" None } @parameter (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] - - location: 18 (remaining gas: 1039984.265 units remaining) + - location: 16 (remaining gas: 1039984.585 units remaining) + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + - location: 18 (remaining gas: 1039984.505 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 17 (remaining gas: 1039984.195 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 16 (remaining gas: 1039984.195 units remaining) - [ { Elt "3" None } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039984.125 units remaining) - [ { Elt "3" None } @parameter - { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 21 (remaining gas: 1039983.805 units remaining) + - location: 21 (remaining gas: 1039984.305 units remaining) [ "3" @key None @elt { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 22 (remaining gas: 1039983.665 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: -1 (remaining gas: 1039983.595 units remaining) + - location: 22 (remaining gas: 1039984.225 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - - location: 19 (remaining gas: 1039983.595 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] - - location: 23 (remaining gas: 1039983.455 units remaining) + - location: 23 (remaining gas: 1039984.145 units remaining) [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 24 (remaining gas: 1039983.315 units remaining) + - location: 24 (remaining gas: 1039984.065 units remaining) [ {} (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: 26 (remaining gas: 1039983.175 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - - location: -1 (remaining gas: 1039983.105 units remaining) + - location: 26 (remaining gas: 1039983.985 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } 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 44b41e708e68bfa445d368b74afdc30fb59582c7..8a9dbf321fc15b9e0008bdbe5f3c51f0e445c543 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 500000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 500000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 500000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 b1201f24905c5fdb74042b42935df6ef87fc475f..81d70798c8d0238de6f3377c79f7e635394a5518 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 0 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 0 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 a11df17172e93e40e4644436a58cc50735917624..6cd9e201ce4aa696476d295b5dfb8ee4688da371 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 1000000000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 1000000000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 1000000000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 b47d865640ebb65eff96881ea3161b87f1bad061..e85414a15c5419ba7597822f2dbaf5b5b37f6c9d 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 1000000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 1000000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 1000000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 3b29d757f6408a59f88b3cde2c97b3320d251d8c..77f1960621a87494af5b721f28edddf9ad455efe 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 1 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 1 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 3a58f08a7fda14aab64465dc1d34d674802fe441..fe2757b4c778651a69e025d7fadb33fcac92f602 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 5000000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 5000000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 5000000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 ef052fe6a6dbc10de83ca97dba0fc0b8caafff6d..e2225909075f76ffafbba0577a714b9144c51362 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 0) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 8000000000000000000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 8000000000000000000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 8000000000000000000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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.4c10105111.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.4c10105111.out" index 0fd60fff89a167a49db54148b89bdd88dda174e4..29d898c9dc0a4b02edbf29271b3bc6718692fd1c 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.4c10105111.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.4c10105111.out" @@ -11,70 +11,56 @@ big_map diff Set map(0)["1"] to "one" Set map(0)["3"] to "three" trace - - location: 42 (remaining gas: 1039921.281 units remaining) + - location: 43 (remaining gas: 1039921.281 units remaining) [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039921.141 units remaining) + - location: 43 (remaining gas: 1039921.201 units remaining) [ (Right (Right (Right (Left { Pair "3" "three" })))) @parameter (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 114 (remaining gas: 1039920.101 units remaining) + - location: 44 (remaining gas: 1039921.111 units remaining) + [ (Right (Right (Left { Pair "3" "three" }))) @parameter.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 60 (remaining gas: 1039921.021 units remaining) + [ (Right (Left { Pair "3" "three" })) @parameter.right.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 65 (remaining gas: 1039920.931 units remaining) + [ (Left { Pair "3" "three" }) @parameter.right.right.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 108 (remaining gas: 1039920.841 units remaining) + [ { Pair "3" "three" } @parameter.right.right.right.add + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 110 (remaining gas: 1039920.741 units remaining) + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 113 (remaining gas: 1039920.651 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 112 (remaining gas: 1039920.031 units remaining) + - location: 114 (remaining gas: 1039920.581 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 119 (remaining gas: 1039919.891 units remaining) - [ { Elt "1" "one" } - { Elt "2" "two" } ] - - location: -1 (remaining gas: 1039919.821 units remaining) + - location: 119 (remaining gas: 1039920.501 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 110 (remaining gas: 1039919.821 units remaining) - [ { Pair "3" "three" } @parameter.right.right.right.add - { Elt "1" "one" } - { Elt "2" "two" } ] - - location: 122 (remaining gas: 1039919.114 units remaining) + - location: 122 (remaining gas: 1039919.914 units remaining) [ "3" "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 125 (remaining gas: 1039918.814 units remaining) - [ (Some "three") + - location: 123 (remaining gas: 1039919.814 units remaining) + [ "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 124 (remaining gas: 1039918.744 units remaining) + - location: 125 (remaining gas: 1039919.734 units remaining) [ (Some "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 123 (remaining gas: 1039918.744 units remaining) - [ "3" - (Some "three") - { Elt "1" "one" } - { Elt "2" "two" } ] - - location: 126 (remaining gas: 1039918.604 units remaining) - [ { Elt "1" "one" ; Elt "3" "three" } - { Elt "2" "two" } ] - - location: -1 (remaining gas: 1039918.534 units remaining) - [ { Elt "1" "one" ; Elt "3" "three" } - { Elt "2" "two" } ] - - location: 120 (remaining gas: 1039918.534 units remaining) + - location: 126 (remaining gas: 1039919.654 units remaining) [ { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" } ] - - location: 127 (remaining gas: 1039918.394 units remaining) + - location: 127 (remaining gas: 1039919.574 units remaining) [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ] - - location: 128 (remaining gas: 1039918.254 units remaining) + - location: 128 (remaining gas: 1039919.494 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: -1 (remaining gas: 1039918.184 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 107 (remaining gas: 1039918.114 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 64 (remaining gas: 1039918.044 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 59 (remaining gas: 1039917.974 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039917.834 units remaining) + - location: 151 (remaining gas: 1039919.414 units remaining) [ {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039917.694 units remaining) - [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ] - - location: -1 (remaining gas: 1039917.624 units remaining) + - location: 153 (remaining gas: 1039919.334 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)-(.00a32294a4.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)-(.00a32294a4.out" index 4067f13e09fcb46723e42f755f8c577cd16141c7..8f125d58ec5bdb2b6c5642133a9bfcc4e18dd8bc 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)-(.00a32294a4.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)-(.00a32294a4.out" @@ -10,34 +10,33 @@ big_map diff New map(0) of type (big_map string string) Set map(0)["2"] to "two" trace - - location: 42 (remaining gas: 1039923.184 units remaining) + - location: 43 (remaining gas: 1039923.184 units remaining) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039923.044 units remaining) + - location: 43 (remaining gas: 1039923.104 units remaining) [ (Left Unit) @parameter (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 46 (remaining gas: 1039922.754 units remaining) + - location: 44 (remaining gas: 1039923.014 units remaining) + [ Unit @parameter.swap + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 46 (remaining gas: 1039922.934 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 49 (remaining gas: 1039922.474 units remaining) + - location: 48 (remaining gas: 1039922.844 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 47 (remaining gas: 1039922.404 units remaining) + - location: 49 (remaining gas: 1039922.774 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 54 (remaining gas: 1039922.264 units remaining) + - location: 54 (remaining gas: 1039922.694 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 55 (remaining gas: 1039922.134 units remaining) + - location: 55 (remaining gas: 1039922.624 units remaining) [ { Elt "2" "two" } { Elt "1" "one" } ] - - location: 56 (remaining gas: 1039921.994 units remaining) + - location: 56 (remaining gas: 1039922.544 units remaining) [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ] - - location: 57 (remaining gas: 1039921.854 units remaining) - [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: -1 (remaining gas: 1039921.784 units remaining) + - location: 57 (remaining gas: 1039922.464 units remaining) [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 151 (remaining gas: 1039921.644 units remaining) + - location: 151 (remaining gas: 1039922.384 units remaining) [ {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 153 (remaining gas: 1039921.504 units remaining) - [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ] - - location: -1 (remaining gas: 1039921.434 units remaining) + - location: 153 (remaining gas: 1039922.304 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 .47f32b8f4c.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 .47f32b8f4c.out" index 7108e1a50838d65c1c538eb919d06c3febe534c6..ff35f1b7a381404865c35e6ed0ef04bbed9f65a1 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 .47f32b8f4c.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 .47f32b8f4c.out" @@ -10,26 +10,26 @@ big_map diff New map(0) of type (big_map string string) Set map(0)["3"] to "three" trace - - location: 42 (remaining gas: 1039919.438 units remaining) + - location: 43 (remaining gas: 1039919.438 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: 1039919.298 units remaining) + - location: 43 (remaining gas: 1039919.358 units remaining) [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) @parameter (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 62 (remaining gas: 1039918.868 units remaining) + - location: 44 (remaining gas: 1039919.268 units remaining) + [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) @parameter.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 60 (remaining gas: 1039919.178 units remaining) + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 62 (remaining gas: 1039919.108 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] - - location: 63 (remaining gas: 1039918.728 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] - - location: -1 (remaining gas: 1039918.658 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] - - location: 59 (remaining gas: 1039918.588 units remaining) + - location: 63 (remaining gas: 1039919.028 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 151 (remaining gas: 1039918.448 units remaining) + - location: 151 (remaining gas: 1039918.948 units remaining) [ {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 153 (remaining gas: 1039918.308 units remaining) - [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ] - - location: -1 (remaining gas: 1039918.238 units remaining) + - location: 153 (remaining gas: 1039918.868 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 8bdfe34037274aa09008873cb3ef52b919f2fa23..3f87234f60d0ce2da5e2b7932aaa175a1850699e 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,25 +7,25 @@ emitted operations big_map diff trace - - location: 42 (remaining gas: 1039921.954 units remaining) + - location: 43 (remaining gas: 1039921.954 units remaining) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039921.814 units remaining) + - location: 43 (remaining gas: 1039921.874 units remaining) [ (Right (Left (Right Unit))) @parameter (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 62 (remaining gas: 1039921.384 units remaining) + - location: 44 (remaining gas: 1039921.784 units remaining) + [ (Left (Right Unit)) @parameter.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 60 (remaining gas: 1039921.694 units remaining) + [ (Right Unit) @parameter.right.reset + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 62 (remaining gas: 1039921.624 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage (Right Unit) @parameter.right.reset ] - - location: 63 (remaining gas: 1039921.244 units remaining) - [ (Right Unit) @parameter.right.reset ] - - location: -1 (remaining gas: 1039921.174 units remaining) - [ (Right Unit) @parameter.right.reset ] - - location: 59 (remaining gas: 1039921.104 units remaining) + - location: 63 (remaining gas: 1039921.544 units remaining) [ (Right Unit) ] - - location: 151 (remaining gas: 1039920.964 units remaining) + - location: 151 (remaining gas: 1039921.464 units remaining) [ {} (Right Unit) ] - - location: 153 (remaining gas: 1039920.824 units remaining) - [ (Pair {} (Right Unit)) ] - - location: -1 (remaining gas: 1039920.754 units remaining) + - location: 153 (remaining gas: 1039921.384 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.db0e6941b3.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.db0e6941b3.out" index 6a10960c117f0d7b44f5f650a47924be2ca99961..e53c90bbaad35782bf9c558d19032b660cc67e9f 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.db0e6941b3.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.db0e6941b3.out" @@ -10,65 +10,50 @@ big_map diff New map(0) of type (big_map string string) Unset map(0)["1"] trace - - location: 42 (remaining gas: 1039921.825 units remaining) + - location: 43 (remaining gas: 1039921.825 units remaining) [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039921.685 units remaining) + - location: 43 (remaining gas: 1039921.745 units remaining) [ (Right (Right (Right (Right { "1" })))) @parameter (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] - - location: 135 (remaining gas: 1039920.645 units remaining) + - location: 44 (remaining gas: 1039921.655 units remaining) + [ (Right (Right (Right { "1" }))) @parameter.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 60 (remaining gas: 1039921.565 units remaining) + [ (Right (Right { "1" })) @parameter.right.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 65 (remaining gas: 1039921.475 units remaining) + [ (Right { "1" }) @parameter.right.right.right + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 108 (remaining gas: 1039921.385 units remaining) + [ { "1" } @parameter.right.right.right.rem + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 131 (remaining gas: 1039921.285 units remaining) + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + - location: 134 (remaining gas: 1039921.195 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 133 (remaining gas: 1039920.575 units remaining) + - location: 135 (remaining gas: 1039921.125 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] - - location: 140 (remaining gas: 1039920.435 units remaining) + - location: 140 (remaining gas: 1039921.045 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: -1 (remaining gas: 1039920.365 units remaining) + - location: 143 (remaining gas: 1039920.438 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 131 (remaining gas: 1039920.365 units remaining) - [ { "1" } @parameter.right.right.right.rem - { Elt "1" "one" } - { Elt "2" "two" } ] - - location: 145 (remaining gas: 1039919.498 units remaining) - [ None - { Elt "1" "one" } - { Elt "2" "two" } ] - - location: 144 (remaining gas: 1039919.428 units remaining) + - location: 145 (remaining gas: 1039920.358 units remaining) [ None { Elt "1" "one" } { Elt "2" "two" } ] - - location: 143 (remaining gas: 1039919.428 units remaining) - [ "1" @parameter.right.right.right.rem.elt - None - { Elt "1" "one" } - { Elt "2" "two" } ] - - location: 147 (remaining gas: 1039919.288 units remaining) - [ {} - { Elt "2" "two" } ] - - location: -1 (remaining gas: 1039919.218 units remaining) - [ {} - { Elt "2" "two" } ] - - location: 141 (remaining gas: 1039919.218 units remaining) + - location: 147 (remaining gas: 1039920.278 units remaining) [ {} { Elt "2" "two" } ] - - location: 148 (remaining gas: 1039919.078 units remaining) + - location: 148 (remaining gas: 1039920.198 units remaining) [ (Pair {} { Elt "2" "two" }) ] - - location: 149 (remaining gas: 1039918.938 units remaining) + - location: 149 (remaining gas: 1039920.118 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: -1 (remaining gas: 1039918.868 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 107 (remaining gas: 1039918.798 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 64 (remaining gas: 1039918.728 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 59 (remaining gas: 1039918.658 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039918.518 units remaining) + - location: 151 (remaining gas: 1039920.038 units remaining) [ {} (Left (Pair {} { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039918.378 units remaining) - [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ] - - location: -1 (remaining gas: 1039918.308 units remaining) + - location: 153 (remaining gas: 1039919.958 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.79a01c2ffd.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.79a01c2ffd.out" index 47bdfac695bb6a191cb688f3acb6d8150dcb55a5..df9fba39d85d0e1c6bc57e22c9a9754bc619bf84 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.79a01c2ffd.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.79a01c2ffd.out" @@ -10,119 +10,86 @@ big_map diff New map(0) of type (big_map string string) Set map(0)["foo"] to "bar" trace - - location: 42 (remaining gas: 1039922.719 units remaining) + - location: 43 (remaining gas: 1039922.719 units remaining) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - - location: 43 (remaining gas: 1039922.579 units remaining) + - location: 43 (remaining gas: 1039922.639 units remaining) [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) @parameter (Right Unit) @storage ] - - location: 75 (remaining gas: 1039921.689 units remaining) + - location: 44 (remaining gas: 1039922.549 units remaining) + [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) @parameter.right + (Right Unit) @storage ] + - location: 60 (remaining gas: 1039922.459 units remaining) + [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) @parameter.right.right + (Right Unit) @storage ] + - location: 65 (remaining gas: 1039922.369 units remaining) + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) @parameter.right.right.import + (Right Unit) @storage ] + - location: 67 (remaining gas: 1039922.269 units remaining) + [ (Right Unit) @storage ] + - location: 70 (remaining gas: 1039922.179 units remaining) [ Unit @storage.right ] - - location: 69 (remaining gas: 1039921.619 units remaining) + - location: 75 (remaining gas: 1039922.109 units remaining) [ Unit @storage.right ] - - location: 76 (remaining gas: 1039921.479 units remaining) + - location: 76 (remaining gas: 1039922.029 units remaining) [ ] - - location: -1 (remaining gas: 1039921.409 units remaining) - [ ] - - location: 67 (remaining gas: 1039921.409 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) @parameter.right.right.import ] - - location: 77 (remaining gas: 1039921.269 units remaining) + - location: 77 (remaining gas: 1039921.949 units remaining) [ { Pair "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 80 (remaining gas: 1039920.809 units remaining) + - location: 78 (remaining gas: 1039921.849 units remaining) + [ { Pair "gaz" "baz" } ] + - location: 80 (remaining gas: 1039921.609 units remaining) [ {} { Pair "gaz" "baz" } ] - - location: 79 (remaining gas: 1039920.739 units remaining) - [ {} - { Pair "gaz" "baz" } ] - - location: 78 (remaining gas: 1039920.739 units remaining) - [ { Pair "foo" "bar" } - {} - { Pair "gaz" "baz" } ] - - location: 85 (remaining gas: 1039920.032 units remaining) + - location: 85 (remaining gas: 1039921.022 units remaining) [ "foo" "bar" {} { Pair "gaz" "baz" } ] - - location: 88 (remaining gas: 1039919.732 units remaining) - [ (Some "bar") + - location: 86 (remaining gas: 1039920.922 units remaining) + [ "bar" {} { Pair "gaz" "baz" } ] - - location: 87 (remaining gas: 1039919.662 units remaining) + - location: 88 (remaining gas: 1039920.842 units remaining) [ (Some "bar") {} { Pair "gaz" "baz" } ] - - location: 86 (remaining gas: 1039919.662 units remaining) - [ "foo" - (Some "bar") - {} - { Pair "gaz" "baz" } ] - - location: 89 (remaining gas: 1039919.522 units remaining) - [ { Elt "foo" "bar" } - { Pair "gaz" "baz" } ] - - location: -1 (remaining gas: 1039919.452 units remaining) - [ { Elt "foo" "bar" } - { Pair "gaz" "baz" } ] - - location: 83 (remaining gas: 1039919.452 units remaining) + - location: 89 (remaining gas: 1039920.762 units remaining) [ { Elt "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 90 (remaining gas: 1039919.322 units remaining) + - location: 90 (remaining gas: 1039920.692 units remaining) [ { Pair "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 93 (remaining gas: 1039918.862 units remaining) + - location: 91 (remaining gas: 1039920.592 units remaining) + [ { Elt "foo" "bar" } ] + - location: 93 (remaining gas: 1039920.352 units remaining) [ {} { Elt "foo" "bar" } ] - - location: 92 (remaining gas: 1039918.792 units remaining) - [ {} - { Elt "foo" "bar" } ] - - location: 91 (remaining gas: 1039918.792 units remaining) - [ { Pair "gaz" "baz" } - {} - { Elt "foo" "bar" } ] - - location: 98 (remaining gas: 1039918.085 units remaining) + - location: 98 (remaining gas: 1039919.765 units remaining) [ "gaz" "baz" {} { Elt "foo" "bar" } ] - - location: 101 (remaining gas: 1039917.785 units remaining) - [ (Some "baz") + - location: 99 (remaining gas: 1039919.665 units remaining) + [ "baz" {} { Elt "foo" "bar" } ] - - location: 100 (remaining gas: 1039917.715 units remaining) + - location: 101 (remaining gas: 1039919.585 units remaining) [ (Some "baz") {} { Elt "foo" "bar" } ] - - location: 99 (remaining gas: 1039917.715 units remaining) - [ "gaz" - (Some "baz") - {} - { Elt "foo" "bar" } ] - - location: 102 (remaining gas: 1039917.575 units remaining) + - location: 102 (remaining gas: 1039919.505 units remaining) [ { Elt "gaz" "baz" } { Elt "foo" "bar" } ] - - location: -1 (remaining gas: 1039917.505 units remaining) - [ { Elt "gaz" "baz" } - { Elt "foo" "bar" } ] - - location: 96 (remaining gas: 1039917.505 units remaining) - [ { Elt "gaz" "baz" } - { Elt "foo" "bar" } ] - - location: 103 (remaining gas: 1039917.375 units remaining) + - location: 103 (remaining gas: 1039919.435 units remaining) [ { Elt "foo" "bar" } { Elt "gaz" "baz" } ] - - location: 104 (remaining gas: 1039917.235 units remaining) + - location: 104 (remaining gas: 1039919.355 units remaining) [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ] - - location: 105 (remaining gas: 1039917.095 units remaining) + - location: 105 (remaining gas: 1039919.275 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: -1 (remaining gas: 1039917.025 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 64 (remaining gas: 1039916.955 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 59 (remaining gas: 1039916.885 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 151 (remaining gas: 1039916.745 units remaining) + - location: 151 (remaining gas: 1039919.195 units remaining) [ {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 153 (remaining gas: 1039916.605 units remaining) - [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ] - - location: -1 (remaining gas: 1039916.535 units remaining) + - location: 153 (remaining gas: 1039919.115 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 225cf14f973dd1ea4f6ab8ebabd1a0cfcef140f1..0b06fa76b590e82997eb7dc7e231277399d23f9e 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: 8 (remaining gas: 1039944.376 units remaining) + - location: 9 (remaining gas: 1039944.376 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 9 (remaining gas: 1039944.236 units remaining) + - location: 9 (remaining gas: 1039944.296 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 10 (remaining gas: 1039944.096 units remaining) + - location: 10 (remaining gas: 1039944.216 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @@ -29,13 +29,20 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 13 (remaining gas: 1039943.796 units remaining) + - location: 11 (remaining gas: 1039944.116 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "hello") + (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "hello") ] + - location: 13 (remaining gas: 1039944.036 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 14 (remaining gas: 1039943.656 units remaining) + - location: 14 (remaining gas: 1039943.956 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @storage (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -43,77 +50,57 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 15 (remaining gas: 1039943.516 units remaining) + - location: 15 (remaining gas: 1039943.876 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 18 (remaining gas: 1039943.216 units remaining) - [ "hello" + - location: 16 (remaining gas: 1039943.776 units remaining) + [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "hello") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 19 (remaining gas: 1039930.916 units remaining) - [ 0x05010000000568656c6c6f @packed + - location: 18 (remaining gas: 1039943.696 units remaining) + [ "hello" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: -1 (remaining gas: 1039930.846 units remaining) + - location: 19 (remaining gas: 1039931.456 units remaining) [ 0x05010000000568656c6c6f @packed (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 16 (remaining gas: 1039930.846 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] - - location: -1 (remaining gas: 1039930.776 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] - - location: 11 (remaining gas: 1039930.776 units remaining) - [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] - - location: 20 (remaining gas: 1039930.636 units remaining) + - location: 20 (remaining gas: 1039931.376 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000568656c6c6f @packed (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 21 (remaining gas: 1039660.563 units remaining) + - location: 21 (remaining gas: 1039661.363 units remaining) [ True (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 23 (remaining gas: 1039660.373 units remaining) + - location: 22 (remaining gas: 1039661.303 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "hello") ] + - location: 23 (remaining gas: 1039661.233 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - - location: 28 (remaining gas: 1039660.233 units remaining) + - location: 28 (remaining gas: 1039661.153 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @storage ] - - location: 29 (remaining gas: 1039660.093 units remaining) + - location: 29 (remaining gas: 1039661.073 units remaining) [ {} (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") @storage ] - - location: 31 (remaining gas: 1039659.953 units remaining) - [ (Pair {} - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] - - location: -1 (remaining gas: 1039659.883 units remaining) + - location: 31 (remaining gas: 1039660.993 units remaining) [ (Pair {} "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -134,18 +121,18 @@ At line 8 characters 14 to 18, script reached FAILWITH instruction with Unit trace - - location: 8 (remaining gas: 1039944.386 units remaining) + - location: 9 (remaining gas: 1039944.386 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 9 (remaining gas: 1039944.246 units remaining) + - location: 9 (remaining gas: 1039944.306 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 10 (remaining gas: 1039944.106 units remaining) + - location: 10 (remaining gas: 1039944.226 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @@ -155,13 +142,20 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 13 (remaining gas: 1039943.806 units remaining) + - location: 11 (remaining gas: 1039944.126 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "abcd") + (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "abcd") ] + - location: 13 (remaining gas: 1039944.046 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 14 (remaining gas: 1039943.666 units remaining) + - location: 14 (remaining gas: 1039943.966 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @storage (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -169,62 +163,46 @@ trace (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 15 (remaining gas: 1039943.526 units remaining) + - location: 15 (remaining gas: 1039943.886 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 18 (remaining gas: 1039943.226 units remaining) - [ "abcd" + - location: 16 (remaining gas: 1039943.786 units remaining) + [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "abcd") @storage (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 19 (remaining gas: 1039930.926 units remaining) - [ 0x05010000000461626364 @packed + - location: 18 (remaining gas: 1039943.706 units remaining) + [ "abcd" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: -1 (remaining gas: 1039930.856 units remaining) + - location: 19 (remaining gas: 1039931.466 units remaining) [ 0x05010000000461626364 @packed (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 16 (remaining gas: 1039930.856 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] - - location: -1 (remaining gas: 1039930.786 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] - - location: 11 (remaining gas: 1039930.786 units remaining) - [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed - (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] - - location: 20 (remaining gas: 1039930.646 units remaining) + - location: 20 (remaining gas: 1039931.386 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" 0x05010000000461626364 @packed (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 21 (remaining gas: 1039660.574 units remaining) + - location: 21 (remaining gas: 1039661.374 units remaining) [ False (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - - location: 26 (remaining gas: 1039660.254 units remaining) + - location: 22 (remaining gas: 1039661.314 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + "abcd") ] + - location: 26 (remaining gas: 1039661.234 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 9db1391fc6dfd81ff48cf8b0e40b3f3591a224de..353afd422d8762ac928e9fc0c75f0cf980aa008b 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,34 +7,32 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039987.125 units remaining) + - location: 7 (remaining gas: 1039987.125 units remaining) [ (Pair 0 Unit) ] - - location: 7 (remaining gas: 1039986.985 units remaining) + - location: 7 (remaining gas: 1039987.045 units remaining) [ 0 @parameter ] - - location: 8 (remaining gas: 1039986.845 units remaining) + - location: 8 (remaining gas: 1039986.965 units remaining) [ 0 @parameter 0 @parameter ] - - location: 9 (remaining gas: 1039986.705 units remaining) + - location: 9 (remaining gas: 1039986.885 units remaining) [ 0 0 @parameter ] - - location: 10 (remaining gas: 1039986.565 units remaining) + - location: 10 (remaining gas: 1039986.805 units remaining) [ 0 0 @parameter ] - - location: 11 (remaining gas: 1039986.355 units remaining) + - location: 11 (remaining gas: 1039986.655 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039986.155 units remaining) + - location: 13 (remaining gas: 1039986.575 units remaining) [ True ] - - location: 15 (remaining gas: 1039985.965 units remaining) + - location: 14 (remaining gas: 1039986.515 units remaining) [ ] - - location: -1 (remaining gas: 1039985.895 units remaining) + - location: 15 (remaining gas: 1039986.445 units remaining) [ ] - - location: 20 (remaining gas: 1039985.755 units remaining) + - location: 20 (remaining gas: 1039986.365 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039985.615 units remaining) + - location: 21 (remaining gas: 1039986.285 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039985.475 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039985.405 units remaining) + - location: 23 (remaining gas: 1039986.205 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 2c9ac54b36fe68d0e6c1a9cc4401a86ef9927a6a..577951c15ace6afc14002a28e40a7818463fa6c0 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,34 +7,32 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039987.125 units remaining) + - location: 7 (remaining gas: 1039987.125 units remaining) [ (Pair 12039123919239192312931 Unit) ] - - location: 7 (remaining gas: 1039986.985 units remaining) + - location: 7 (remaining gas: 1039987.045 units remaining) [ 12039123919239192312931 @parameter ] - - location: 8 (remaining gas: 1039986.845 units remaining) + - location: 8 (remaining gas: 1039986.965 units remaining) [ 12039123919239192312931 @parameter 12039123919239192312931 @parameter ] - - location: 9 (remaining gas: 1039986.705 units remaining) + - location: 9 (remaining gas: 1039986.885 units remaining) [ -12039123919239192312931 12039123919239192312931 @parameter ] - - location: 10 (remaining gas: 1039986.565 units remaining) + - location: 10 (remaining gas: 1039986.805 units remaining) [ 12039123919239192312931 12039123919239192312931 @parameter ] - - location: 11 (remaining gas: 1039986.355 units remaining) + - location: 11 (remaining gas: 1039986.655 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039986.155 units remaining) + - location: 13 (remaining gas: 1039986.575 units remaining) [ True ] - - location: 15 (remaining gas: 1039985.965 units remaining) + - location: 14 (remaining gas: 1039986.515 units remaining) [ ] - - location: -1 (remaining gas: 1039985.895 units remaining) + - location: 15 (remaining gas: 1039986.445 units remaining) [ ] - - location: 20 (remaining gas: 1039985.755 units remaining) + - location: 20 (remaining gas: 1039986.365 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039985.615 units remaining) + - location: 21 (remaining gas: 1039986.285 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039985.475 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039985.405 units remaining) + - location: 23 (remaining gas: 1039986.205 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 bcaa38d0a40affc23f66dc7717ab47e97bba28c5..bb326e0a48d919b449f69584cd708ee01f37b3fe 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,34 +7,32 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039987.125 units remaining) + - location: 7 (remaining gas: 1039987.125 units remaining) [ (Pair 948 Unit) ] - - location: 7 (remaining gas: 1039986.985 units remaining) + - location: 7 (remaining gas: 1039987.045 units remaining) [ 948 @parameter ] - - location: 8 (remaining gas: 1039986.845 units remaining) + - location: 8 (remaining gas: 1039986.965 units remaining) [ 948 @parameter 948 @parameter ] - - location: 9 (remaining gas: 1039986.705 units remaining) + - location: 9 (remaining gas: 1039986.885 units remaining) [ -948 948 @parameter ] - - location: 10 (remaining gas: 1039986.565 units remaining) + - location: 10 (remaining gas: 1039986.805 units remaining) [ 948 948 @parameter ] - - location: 11 (remaining gas: 1039986.355 units remaining) + - location: 11 (remaining gas: 1039986.655 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039986.155 units remaining) + - location: 13 (remaining gas: 1039986.575 units remaining) [ True ] - - location: 15 (remaining gas: 1039985.965 units remaining) + - location: 14 (remaining gas: 1039986.515 units remaining) [ ] - - location: -1 (remaining gas: 1039985.895 units remaining) + - location: 15 (remaining gas: 1039986.445 units remaining) [ ] - - location: 20 (remaining gas: 1039985.755 units remaining) + - location: 20 (remaining gas: 1039986.365 units remaining) [ Unit ] - - location: 21 (remaining gas: 1039985.615 units remaining) + - location: 21 (remaining gas: 1039986.285 units remaining) [ {} Unit ] - - location: 23 (remaining gas: 1039985.475 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039985.405 units remaining) + - location: 23 (remaining gas: 1039986.205 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 9000cd940b8fa968560e57a9652b82f47f047ee6..bc0c455efee20afa4ecd5950598b7aca7f1186be 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,231 +7,205 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039917.130 units remaining) + - location: 7 (remaining gas: 1039917.130 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039916.990 units remaining) + - location: 7 (remaining gas: 1039917.050 units remaining) [ Unit @parameter ] - - location: 8 (remaining gas: 1039916.850 units remaining) + - location: 8 (remaining gas: 1039916.970 units remaining) [ 2 Unit @parameter ] - - location: 11 (remaining gas: 1039916.710 units remaining) + - location: 11 (remaining gas: 1039916.890 units remaining) [ 2 2 Unit @parameter ] - - location: 14 (remaining gas: 1039916.570 units remaining) + - location: 14 (remaining gas: 1039916.810 units remaining) [ 4 Unit @parameter ] - - location: 15 (remaining gas: 1039916.430 units remaining) + - location: 15 (remaining gas: 1039916.730 units remaining) [ 4 4 Unit @parameter ] - - location: 20 (remaining gas: 1039916.100 units remaining) + - location: 20 (remaining gas: 1039916.580 units remaining) [ 0 Unit @parameter ] - - location: 21 (remaining gas: 1039915.960 units remaining) + - location: 21 (remaining gas: 1039916.500 units remaining) [ True Unit @parameter ] - - location: -1 (remaining gas: 1039915.890 units remaining) - [ True - Unit @parameter ] - - location: 23 (remaining gas: 1039915.700 units remaining) + - location: 22 (remaining gas: 1039916.440 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039915.630 units remaining) + - location: 23 (remaining gas: 1039916.370 units remaining) [ Unit @parameter ] - - location: 28 (remaining gas: 1039915.490 units remaining) + - location: 28 (remaining gas: 1039916.290 units remaining) [ 2 Unit @parameter ] - - location: 31 (remaining gas: 1039915.350 units remaining) + - location: 31 (remaining gas: 1039916.210 units remaining) [ 2 2 Unit @parameter ] - - location: 34 (remaining gas: 1039915.210 units remaining) + - location: 34 (remaining gas: 1039916.130 units remaining) [ 4 Unit @parameter ] - - location: 35 (remaining gas: 1039915.070 units remaining) + - location: 35 (remaining gas: 1039916.050 units remaining) [ 4 4 Unit @parameter ] - - location: 40 (remaining gas: 1039914.740 units remaining) + - location: 40 (remaining gas: 1039915.900 units remaining) [ 0 Unit @parameter ] - - location: 41 (remaining gas: 1039914.600 units remaining) + - location: 41 (remaining gas: 1039915.820 units remaining) [ True Unit @parameter ] - - location: -1 (remaining gas: 1039914.530 units remaining) - [ True - Unit @parameter ] - - location: 43 (remaining gas: 1039914.340 units remaining) + - location: 42 (remaining gas: 1039915.760 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039914.270 units remaining) + - location: 43 (remaining gas: 1039915.690 units remaining) [ Unit @parameter ] - - location: 48 (remaining gas: 1039914.130 units remaining) + - location: 48 (remaining gas: 1039915.610 units remaining) [ 2 Unit @parameter ] - - location: 51 (remaining gas: 1039913.990 units remaining) + - location: 51 (remaining gas: 1039915.530 units remaining) [ 2 2 Unit @parameter ] - - location: 54 (remaining gas: 1039913.850 units remaining) + - location: 54 (remaining gas: 1039915.450 units remaining) [ 4 Unit @parameter ] - - location: 55 (remaining gas: 1039913.710 units remaining) + - location: 55 (remaining gas: 1039915.370 units remaining) [ 4 4 Unit @parameter ] - - location: 60 (remaining gas: 1039913.380 units remaining) + - location: 60 (remaining gas: 1039915.220 units remaining) [ 0 Unit @parameter ] - - location: 61 (remaining gas: 1039913.240 units remaining) + - location: 61 (remaining gas: 1039915.140 units remaining) [ True Unit @parameter ] - - location: -1 (remaining gas: 1039913.170 units remaining) - [ True - Unit @parameter ] - - location: 63 (remaining gas: 1039912.980 units remaining) + - location: 62 (remaining gas: 1039915.080 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039912.910 units remaining) + - location: 63 (remaining gas: 1039915.010 units remaining) [ Unit @parameter ] - - location: 68 (remaining gas: 1039912.770 units remaining) + - location: 68 (remaining gas: 1039914.930 units remaining) [ 2 Unit @parameter ] - - location: 71 (remaining gas: 1039912.630 units remaining) + - location: 71 (remaining gas: 1039914.850 units remaining) [ 2 2 Unit @parameter ] - - location: 74 (remaining gas: 1039912.490 units remaining) + - location: 74 (remaining gas: 1039914.770 units remaining) [ 4 Unit @parameter ] - - location: 75 (remaining gas: 1039912.350 units remaining) + - location: 75 (remaining gas: 1039914.690 units remaining) [ 4 4 Unit @parameter ] - - location: 80 (remaining gas: 1039912.020 units remaining) + - location: 80 (remaining gas: 1039914.540 units remaining) [ 0 Unit @parameter ] - - location: 81 (remaining gas: 1039911.880 units remaining) - [ True - Unit @parameter ] - - location: -1 (remaining gas: 1039911.810 units remaining) + - location: 81 (remaining gas: 1039914.460 units remaining) [ True Unit @parameter ] - - location: 83 (remaining gas: 1039911.620 units remaining) + - location: 82 (remaining gas: 1039914.400 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039911.550 units remaining) + - location: 83 (remaining gas: 1039914.330 units remaining) [ Unit @parameter ] - - location: 88 (remaining gas: 1039911.410 units remaining) + - location: 88 (remaining gas: 1039914.250 units remaining) [ 2 Unit @parameter ] - - location: 91 (remaining gas: 1039911.270 units remaining) + - location: 91 (remaining gas: 1039914.170 units remaining) [ 2 2 Unit @parameter ] - - location: 94 (remaining gas: 1039911.130 units remaining) + - location: 94 (remaining gas: 1039914.090 units remaining) [ 4 Unit @parameter ] - - location: 95 (remaining gas: 1039910.990 units remaining) + - location: 95 (remaining gas: 1039914.010 units remaining) [ 4 4 Unit @parameter ] - - location: 100 (remaining gas: 1039910.660 units remaining) + - location: 100 (remaining gas: 1039913.860 units remaining) [ 0 Unit @parameter ] - - location: 101 (remaining gas: 1039910.520 units remaining) + - location: 101 (remaining gas: 1039913.780 units remaining) [ True Unit @parameter ] - - location: -1 (remaining gas: 1039910.450 units remaining) - [ True - Unit @parameter ] - - location: 103 (remaining gas: 1039910.260 units remaining) + - location: 102 (remaining gas: 1039913.720 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039910.190 units remaining) + - location: 103 (remaining gas: 1039913.650 units remaining) [ Unit @parameter ] - - location: 108 (remaining gas: 1039910.050 units remaining) + - location: 108 (remaining gas: 1039913.570 units remaining) [ 60 Unit @parameter ] - - location: 111 (remaining gas: 1039909.910 units remaining) + - location: 111 (remaining gas: 1039913.490 units remaining) [ "2019-09-09T12:08:37Z" 60 Unit @parameter ] - - location: 114 (remaining gas: 1039909.770 units remaining) + - location: 114 (remaining gas: 1039913.410 units remaining) [ "2019-09-09T12:09:37Z" Unit @parameter ] - - location: 115 (remaining gas: 1039909.630 units remaining) + - location: 115 (remaining gas: 1039913.330 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" Unit @parameter ] - - location: 120 (remaining gas: 1039909.310 units remaining) + - location: 120 (remaining gas: 1039913.190 units remaining) [ 0 Unit @parameter ] - - location: 121 (remaining gas: 1039909.170 units remaining) - [ True - Unit @parameter ] - - location: -1 (remaining gas: 1039909.100 units remaining) + - location: 121 (remaining gas: 1039913.110 units remaining) [ True Unit @parameter ] - - location: 123 (remaining gas: 1039908.910 units remaining) + - location: 122 (remaining gas: 1039913.050 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039908.840 units remaining) + - location: 123 (remaining gas: 1039912.980 units remaining) [ Unit @parameter ] - - location: 128 (remaining gas: 1039908.700 units remaining) + - location: 128 (remaining gas: 1039912.900 units remaining) [ "2019-09-09T12:08:37Z" Unit @parameter ] - - location: 131 (remaining gas: 1039908.560 units remaining) + - location: 131 (remaining gas: 1039912.820 units remaining) [ 60 "2019-09-09T12:08:37Z" Unit @parameter ] - - location: 134 (remaining gas: 1039908.420 units remaining) + - location: 134 (remaining gas: 1039912.740 units remaining) [ "2019-09-09T12:09:37Z" Unit @parameter ] - - location: 135 (remaining gas: 1039908.280 units remaining) + - location: 135 (remaining gas: 1039912.660 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" Unit @parameter ] - - location: 140 (remaining gas: 1039907.960 units remaining) + - location: 140 (remaining gas: 1039912.520 units remaining) [ 0 Unit @parameter ] - - location: 141 (remaining gas: 1039907.820 units remaining) - [ True - Unit @parameter ] - - location: -1 (remaining gas: 1039907.750 units remaining) + - location: 141 (remaining gas: 1039912.440 units remaining) [ True Unit @parameter ] - - location: 143 (remaining gas: 1039907.560 units remaining) + - location: 142 (remaining gas: 1039912.380 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039907.490 units remaining) + - location: 143 (remaining gas: 1039912.310 units remaining) [ Unit @parameter ] - - location: 148 (remaining gas: 1039907.350 units remaining) + - location: 148 (remaining gas: 1039912.230 units remaining) [ 1000 Unit @parameter ] - - location: 151 (remaining gas: 1039907.210 units remaining) + - location: 151 (remaining gas: 1039912.150 units remaining) [ 1000 1000 Unit @parameter ] - - location: 154 (remaining gas: 1039907.050 units remaining) + - location: 154 (remaining gas: 1039912.050 units remaining) [ 2000 Unit @parameter ] - - location: 155 (remaining gas: 1039906.910 units remaining) + - location: 155 (remaining gas: 1039911.970 units remaining) [ 2000 2000 Unit @parameter ] - - location: 160 (remaining gas: 1039906.626 units remaining) + - location: 160 (remaining gas: 1039911.866 units remaining) [ 0 Unit @parameter ] - - location: 161 (remaining gas: 1039906.486 units remaining) - [ True - Unit @parameter ] - - location: -1 (remaining gas: 1039906.416 units remaining) + - location: 161 (remaining gas: 1039911.786 units remaining) [ True Unit @parameter ] - - location: 163 (remaining gas: 1039906.226 units remaining) + - location: 162 (remaining gas: 1039911.726 units remaining) [ Unit @parameter ] - - location: -1 (remaining gas: 1039906.156 units remaining) + - location: 163 (remaining gas: 1039911.656 units remaining) [ Unit @parameter ] - - location: 168 (remaining gas: 1039906.016 units remaining) + - location: 168 (remaining gas: 1039911.576 units remaining) [ {} Unit @parameter ] - - location: 170 (remaining gas: 1039905.876 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039905.806 units remaining) + - location: 170 (remaining gas: 1039911.496 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 e16553e90fc0c0ca08a9673c0cdd92b860958423..42936492ad68118284a7e5398eaaaf29a8d7d3ee 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,27 +7,24 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.020 units remaining) + - location: 10 (remaining gas: 1039992.020 units remaining) [ (Pair (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039991.880 units remaining) + - location: 10 (remaining gas: 1039991.940 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] - - location: 11 (remaining gas: 1039991.740 units remaining) + - location: 11 (remaining gas: 1039991.860 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039991.450 units remaining) + - location: 12 (remaining gas: 1039991.630 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039991.310 units remaining) + - location: 13 (remaining gas: 1039991.550 units remaining) [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039991.170 units remaining) + - location: 14 (remaining gas: 1039991.470 units remaining) [ {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039991.030 units remaining) - [ (Pair {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039990.960 units remaining) + - location: 16 (remaining gas: 1039991.390 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 cbbe7b1efa6d94b968a47826f788e8b8fc8ce3ac..1e7daa6fd301185e2267ca9b270f5e3a79626b6f 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,27 +7,24 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.020 units remaining) + - location: 10 (remaining gas: 1039992.020 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039991.880 units remaining) + - location: 10 (remaining gas: 1039991.940 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] - - location: 11 (remaining gas: 1039991.740 units remaining) + - location: 11 (remaining gas: 1039991.860 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039991.450 units remaining) + - location: 12 (remaining gas: 1039991.630 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039991.310 units remaining) + - location: 13 (remaining gas: 1039991.550 units remaining) [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039991.170 units remaining) + - location: 14 (remaining gas: 1039991.470 units remaining) [ {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039991.030 units remaining) - [ (Pair {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039990.960 units remaining) + - location: 16 (remaining gas: 1039991.390 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 20aa8d97f9a9bec541cf5ecb79e3fe102628c129..dce09495337f00329e7e939db2944a8d7b81b490 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,27 +7,24 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.020 units remaining) + - location: 10 (remaining gas: 1039992.020 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039991.880 units remaining) + - location: 10 (remaining gas: 1039991.940 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] - - location: 11 (remaining gas: 1039991.740 units remaining) + - location: 11 (remaining gas: 1039991.860 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039991.450 units remaining) + - location: 12 (remaining gas: 1039991.630 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039991.310 units remaining) + - location: 13 (remaining gas: 1039991.550 units remaining) [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039991.170 units remaining) + - location: 14 (remaining gas: 1039991.470 units remaining) [ {} (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039991.030 units remaining) - [ (Pair {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039990.960 units remaining) + - location: 16 (remaining gas: 1039991.390 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 0310556975936019405025bf75633a15441cc87a..ba938830be22c15d26a2cf71095fb01feb38a553 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,27 +7,24 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.020 units remaining) + - location: 10 (remaining gas: 1039992.020 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000) None) ] - - location: 10 (remaining gas: 1039991.880 units remaining) + - location: 10 (remaining gas: 1039991.940 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000) @parameter ] - - location: 11 (remaining gas: 1039991.740 units remaining) + - location: 11 (remaining gas: 1039991.860 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039991.450 units remaining) + - location: 12 (remaining gas: 1039991.630 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 13 (remaining gas: 1039991.310 units remaining) + - location: 13 (remaining gas: 1039991.550 units remaining) [ (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 14 (remaining gas: 1039991.170 units remaining) + - location: 14 (remaining gas: 1039991.470 units remaining) [ {} (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 16 (remaining gas: 1039991.030 units remaining) - [ (Pair {} - (Some 0x0200000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039990.960 units remaining) + - location: 16 (remaining gas: 1039991.390 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 84420a52d2bc204712688ad4feda2eaaebf9e606..542de55bb4479d022ab426c5a0fee68348acf803 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair -100 "1970-01-01T00:01:40Z") @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair -100 "1970-01-01T00:01:40Z") @parameter (Pair -100 "1970-01-01T00:01:40Z") @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ -100 (Pair -100 "1970-01-01T00:01:40Z") @parameter ] - - location: 15 (remaining gas: 1039988.430 units remaining) - [ "1970-01-01T00:01:40Z" ] - - location: 14 (remaining gas: 1039988.360 units remaining) + - location: 13 (remaining gas: 1039988.810 units remaining) + [ (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + - location: 15 (remaining gas: 1039988.730 units remaining) [ "1970-01-01T00:01:40Z" ] - - location: 13 (remaining gas: 1039988.360 units remaining) - [ -100 - "1970-01-01T00:01:40Z" ] - - location: 16 (remaining gas: 1039988.220 units remaining) + - location: 16 (remaining gas: 1039988.650 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039988.080 units remaining) + - location: 17 (remaining gas: 1039988.570 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039987.940 units remaining) + - location: 18 (remaining gas: 1039988.490 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039987.800 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] - - location: -1 (remaining gas: 1039987.730 units remaining) + - location: 20 (remaining gas: 1039988.410 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 0e5aa0f7ffe8145f490fa8b4b4c192e1183da732..62774e42755b2d1729764145d9cd0be4c906c144 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.020 units remaining) + - location: 10 (remaining gas: 1039989.020 units remaining) [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] - - location: 10 (remaining gas: 1039988.880 units remaining) + - location: 10 (remaining gas: 1039988.940 units remaining) [ (Pair 0 "1970-01-01T00:00:00Z") @parameter ] - - location: 11 (remaining gas: 1039988.740 units remaining) + - location: 11 (remaining gas: 1039988.860 units remaining) [ (Pair 0 "1970-01-01T00:00:00Z") @parameter (Pair 0 "1970-01-01T00:00:00Z") @parameter ] - - location: 12 (remaining gas: 1039988.600 units remaining) + - location: 12 (remaining gas: 1039988.780 units remaining) [ 0 (Pair 0 "1970-01-01T00:00:00Z") @parameter ] - - location: 15 (remaining gas: 1039988.300 units remaining) - [ "1970-01-01T00:00:00Z" ] - - location: 14 (remaining gas: 1039988.230 units remaining) + - location: 13 (remaining gas: 1039988.680 units remaining) + [ (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + - location: 15 (remaining gas: 1039988.600 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 13 (remaining gas: 1039988.230 units remaining) - [ 0 - "1970-01-01T00:00:00Z" ] - - location: 16 (remaining gas: 1039988.090 units remaining) + - location: 16 (remaining gas: 1039988.520 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039987.950 units remaining) + - location: 17 (remaining gas: 1039988.440 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039987.810 units remaining) + - location: 18 (remaining gas: 1039988.360 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039987.670 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] - - location: -1 (remaining gas: 1039987.600 units remaining) + - location: 20 (remaining gas: 1039988.280 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 4b25b4cddfe8b6737e0892a678d1d35fdb3b029a..a5343593bc1bbc8bac40905927733fb41838274a 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair 100 "1970-01-01T00:01:40Z") @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair 100 "1970-01-01T00:01:40Z") @parameter (Pair 100 "1970-01-01T00:01:40Z") @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ 100 (Pair 100 "1970-01-01T00:01:40Z") @parameter ] - - location: 15 (remaining gas: 1039988.430 units remaining) - [ "1970-01-01T00:01:40Z" ] - - location: 14 (remaining gas: 1039988.360 units remaining) + - location: 13 (remaining gas: 1039988.810 units remaining) + [ (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + - location: 15 (remaining gas: 1039988.730 units remaining) [ "1970-01-01T00:01:40Z" ] - - location: 13 (remaining gas: 1039988.360 units remaining) - [ 100 - "1970-01-01T00:01:40Z" ] - - location: 16 (remaining gas: 1039988.220 units remaining) + - location: 16 (remaining gas: 1039988.650 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 17 (remaining gas: 1039988.080 units remaining) + - location: 17 (remaining gas: 1039988.570 units remaining) [ (Some "1970-01-01T00:03:20Z") ] - - location: 18 (remaining gas: 1039987.940 units remaining) + - location: 18 (remaining gas: 1039988.490 units remaining) [ {} (Some "1970-01-01T00:03:20Z") ] - - location: 20 (remaining gas: 1039987.800 units remaining) - [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] - - location: -1 (remaining gas: 1039987.730 units remaining) + - location: 20 (remaining gas: 1039988.410 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 d06320bd9e6892ca7828974c51892749ecb73cf9..d1b71958f1e4822984799e5f2244197fb32ce936 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.020 units remaining) + - location: 10 (remaining gas: 1039989.020 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] - - location: 10 (remaining gas: 1039988.880 units remaining) + - location: 10 (remaining gas: 1039988.940 units remaining) [ (Pair "1970-01-01T00:00:00Z" 0) @parameter ] - - location: 11 (remaining gas: 1039988.740 units remaining) + - location: 11 (remaining gas: 1039988.860 units remaining) [ (Pair "1970-01-01T00:00:00Z" 0) @parameter (Pair "1970-01-01T00:00:00Z" 0) @parameter ] - - location: 12 (remaining gas: 1039988.600 units remaining) + - location: 12 (remaining gas: 1039988.780 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" 0) @parameter ] - - location: 15 (remaining gas: 1039988.300 units remaining) - [ 0 ] - - location: 14 (remaining gas: 1039988.230 units remaining) + - location: 13 (remaining gas: 1039988.680 units remaining) + [ (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + - location: 15 (remaining gas: 1039988.600 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039988.230 units remaining) - [ "1970-01-01T00:00:00Z" - 0 ] - - location: 16 (remaining gas: 1039988.090 units remaining) + - location: 16 (remaining gas: 1039988.520 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039987.950 units remaining) + - location: 17 (remaining gas: 1039988.440 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039987.810 units remaining) + - location: 18 (remaining gas: 1039988.360 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039987.670 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] - - location: -1 (remaining gas: 1039987.600 units remaining) + - location: 20 (remaining gas: 1039988.280 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 72d25b3e996e2595f98e92c561e4c0e446f82d21..318e901f6d530b62236c20d631c64ae144669c9f 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) @parameter (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 15 (remaining gas: 1039988.430 units remaining) - [ -100 ] - - location: 14 (remaining gas: 1039988.360 units remaining) + - location: 13 (remaining gas: 1039988.810 units remaining) + [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + - location: 15 (remaining gas: 1039988.730 units remaining) [ -100 ] - - location: 13 (remaining gas: 1039988.360 units remaining) - [ "1970-01-01T00:01:40Z" - -100 ] - - location: 16 (remaining gas: 1039988.220 units remaining) + - location: 16 (remaining gas: 1039988.650 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 17 (remaining gas: 1039988.080 units remaining) + - location: 17 (remaining gas: 1039988.570 units remaining) [ (Some "1970-01-01T00:00:00Z") ] - - location: 18 (remaining gas: 1039987.940 units remaining) + - location: 18 (remaining gas: 1039988.490 units remaining) [ {} (Some "1970-01-01T00:00:00Z") ] - - location: 20 (remaining gas: 1039987.800 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] - - location: -1 (remaining gas: 1039987.730 units remaining) + - location: 20 (remaining gas: 1039988.410 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 d8abf6dc9c6f1f3ffe72b935c75a7d9e8d941236..d55605f867d0c9ec8d5ad12ecfb9fe48785e7626 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,32 +7,27 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) @parameter (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 15 (remaining gas: 1039988.430 units remaining) - [ 100 ] - - location: 14 (remaining gas: 1039988.360 units remaining) + - location: 13 (remaining gas: 1039988.810 units remaining) + [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + - location: 15 (remaining gas: 1039988.730 units remaining) [ 100 ] - - location: 13 (remaining gas: 1039988.360 units remaining) - [ "1970-01-01T00:01:40Z" - 100 ] - - location: 16 (remaining gas: 1039988.220 units remaining) + - location: 16 (remaining gas: 1039988.650 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 17 (remaining gas: 1039988.080 units remaining) + - location: 17 (remaining gas: 1039988.570 units remaining) [ (Some "1970-01-01T00:03:20Z") ] - - location: 18 (remaining gas: 1039987.940 units remaining) + - location: 18 (remaining gas: 1039988.490 units remaining) [ {} (Some "1970-01-01T00:03:20Z") ] - - location: 20 (remaining gas: 1039987.800 units remaining) - [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] - - location: -1 (remaining gas: 1039987.730 units remaining) + - location: 20 (remaining gas: 1039988.410 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 257551a41d86a2f5ef63f95fbf91b39656dd68a9..d5d876109843983d23b0e1ea41dc57f159b490bb 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039480.374 units remaining) + - location: 9 (remaining gas: 1039480.374 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] - - location: 9 (remaining gas: 1039480.234 units remaining) + - location: 9 (remaining gas: 1039480.294 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] - - location: 10 (remaining gas: 1039480.094 units remaining) + - location: 10 (remaining gas: 1039480.214 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.address ] - - location: 11 (remaining gas: 1039479.954 units remaining) + - location: 11 (remaining gas: 1039480.134 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 12 (remaining gas: 1039479.814 units remaining) + - location: 12 (remaining gas: 1039480.054 units remaining) [ {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 14 (remaining gas: 1039479.674 units remaining) - [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ] - - location: -1 (remaining gas: 1039479.604 units remaining) + - location: 14 (remaining gas: 1039479.974 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 d544ed225c0ad932eafc9dbba6420453c16eb91a..7f7077efa9f81f16c54053f1033f1dcd7dad0a8f 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,27 +7,25 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039990.620 units remaining) + - location: 10 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair False False) None) ] - - location: 10 (remaining gas: 1039990.480 units remaining) + - location: 10 (remaining gas: 1039990.540 units remaining) [ (Pair False False) @param ] - - location: 11 (remaining gas: 1039990.340 units remaining) + - location: 11 (remaining gas: 1039990.460 units remaining) [ False False ] - - location: 12 (remaining gas: 1039990.180 units remaining) + - location: 12 (remaining gas: 1039990.360 units remaining) [ False @and ] - - location: 13 (remaining gas: 1039990.040 units remaining) + - location: 13 (remaining gas: 1039990.280 units remaining) [ (Some False) @res ] - - location: 14 (remaining gas: 1039989.900 units remaining) + - location: 14 (remaining gas: 1039990.200 units remaining) [ {} @noop (Some False) @res ] - - location: 16 (remaining gas: 1039989.760 units remaining) + - location: 16 (remaining gas: 1039990.120 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039989.620 units remaining) + - location: 17 (remaining gas: 1039990.040 units remaining) [ {} @x (Some False) @y ] - - location: 18 (remaining gas: 1039989.480 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039989.410 units remaining) + - location: 18 (remaining gas: 1039989.960 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 9c191fe79d40913a46703564aa4d7aee701a76c9..47165e2321b58cddfc6d15dcd55095d92e650c17 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,27 +7,25 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039990.620 units remaining) + - location: 10 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair False True) None) ] - - location: 10 (remaining gas: 1039990.480 units remaining) + - location: 10 (remaining gas: 1039990.540 units remaining) [ (Pair False True) @param ] - - location: 11 (remaining gas: 1039990.340 units remaining) + - location: 11 (remaining gas: 1039990.460 units remaining) [ False True ] - - location: 12 (remaining gas: 1039990.180 units remaining) + - location: 12 (remaining gas: 1039990.360 units remaining) [ False @and ] - - location: 13 (remaining gas: 1039990.040 units remaining) + - location: 13 (remaining gas: 1039990.280 units remaining) [ (Some False) @res ] - - location: 14 (remaining gas: 1039989.900 units remaining) + - location: 14 (remaining gas: 1039990.200 units remaining) [ {} @noop (Some False) @res ] - - location: 16 (remaining gas: 1039989.760 units remaining) + - location: 16 (remaining gas: 1039990.120 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039989.620 units remaining) + - location: 17 (remaining gas: 1039990.040 units remaining) [ {} @x (Some False) @y ] - - location: 18 (remaining gas: 1039989.480 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039989.410 units remaining) + - location: 18 (remaining gas: 1039989.960 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 8721c98c898651f9f25683daa34935ae763e1397..a413996d0aa14795933f102bc5c1e624468f6c5c 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,27 +7,25 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039990.620 units remaining) + - location: 10 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair True False) None) ] - - location: 10 (remaining gas: 1039990.480 units remaining) + - location: 10 (remaining gas: 1039990.540 units remaining) [ (Pair True False) @param ] - - location: 11 (remaining gas: 1039990.340 units remaining) + - location: 11 (remaining gas: 1039990.460 units remaining) [ True False ] - - location: 12 (remaining gas: 1039990.180 units remaining) + - location: 12 (remaining gas: 1039990.360 units remaining) [ False @and ] - - location: 13 (remaining gas: 1039990.040 units remaining) + - location: 13 (remaining gas: 1039990.280 units remaining) [ (Some False) @res ] - - location: 14 (remaining gas: 1039989.900 units remaining) + - location: 14 (remaining gas: 1039990.200 units remaining) [ {} @noop (Some False) @res ] - - location: 16 (remaining gas: 1039989.760 units remaining) + - location: 16 (remaining gas: 1039990.120 units remaining) [ (Pair {} (Some False)) ] - - location: 17 (remaining gas: 1039989.620 units remaining) + - location: 17 (remaining gas: 1039990.040 units remaining) [ {} @x (Some False) @y ] - - location: 18 (remaining gas: 1039989.480 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039989.410 units remaining) + - location: 18 (remaining gas: 1039989.960 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 36559c2fa360c3986c31ad3629f012610b666392..82eed85cbf74738b62cbb51072c4a53880c82438 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,27 +7,25 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039990.620 units remaining) + - location: 10 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair True True) None) ] - - location: 10 (remaining gas: 1039990.480 units remaining) + - location: 10 (remaining gas: 1039990.540 units remaining) [ (Pair True True) @param ] - - location: 11 (remaining gas: 1039990.340 units remaining) + - location: 11 (remaining gas: 1039990.460 units remaining) [ True True ] - - location: 12 (remaining gas: 1039990.180 units remaining) + - location: 12 (remaining gas: 1039990.360 units remaining) [ True @and ] - - location: 13 (remaining gas: 1039990.040 units remaining) + - location: 13 (remaining gas: 1039990.280 units remaining) [ (Some True) @res ] - - location: 14 (remaining gas: 1039989.900 units remaining) + - location: 14 (remaining gas: 1039990.200 units remaining) [ {} @noop (Some True) @res ] - - location: 16 (remaining gas: 1039989.760 units remaining) + - location: 16 (remaining gas: 1039990.120 units remaining) [ (Pair {} (Some True)) ] - - location: 17 (remaining gas: 1039989.620 units remaining) + - location: 17 (remaining gas: 1039990.040 units remaining) [ {} @x (Some True) @y ] - - location: 18 (remaining gas: 1039989.480 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039989.410 units remaining) + - location: 18 (remaining gas: 1039989.960 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 f365a7b92f4f38a0c7406a46cce49a5fd2d3e9dd..c197ee1994a3824a17f9627d2283af5ff0c87471 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,97 +7,87 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039955.820 units remaining) + - location: 7 (remaining gas: 1039955.820 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039955.680 units remaining) + - location: 7 (remaining gas: 1039955.740 units remaining) [ ] - - location: 8 (remaining gas: 1039955.540 units remaining) + - location: 8 (remaining gas: 1039955.660 units remaining) [ 5 ] - - location: 11 (remaining gas: 1039955.400 units remaining) + - location: 11 (remaining gas: 1039955.580 units remaining) [ 6 5 ] - - location: 14 (remaining gas: 1039955.260 units remaining) + - location: 14 (remaining gas: 1039955.500 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039955.120 units remaining) + - location: 15 (remaining gas: 1039955.420 units remaining) [ 4 4 ] - - location: 20 (remaining gas: 1039954.790 units remaining) + - location: 20 (remaining gas: 1039955.270 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039954.650 units remaining) + - location: 21 (remaining gas: 1039955.190 units remaining) [ True ] - - location: -1 (remaining gas: 1039954.580 units remaining) - [ True ] - - location: 23 (remaining gas: 1039954.390 units remaining) + - location: 22 (remaining gas: 1039955.130 units remaining) [ ] - - location: -1 (remaining gas: 1039954.320 units remaining) + - location: 23 (remaining gas: 1039955.060 units remaining) [ ] - - location: 28 (remaining gas: 1039954.180 units remaining) + - location: 28 (remaining gas: 1039954.980 units remaining) [ 6 ] - - location: 31 (remaining gas: 1039954.040 units remaining) + - location: 31 (remaining gas: 1039954.900 units remaining) [ 5 6 ] - - location: 34 (remaining gas: 1039953.900 units remaining) + - location: 34 (remaining gas: 1039954.820 units remaining) [ 4 ] - - location: 35 (remaining gas: 1039953.760 units remaining) + - location: 35 (remaining gas: 1039954.740 units remaining) [ 4 4 ] - - location: 40 (remaining gas: 1039953.430 units remaining) + - location: 40 (remaining gas: 1039954.590 units remaining) [ 0 ] - - location: 41 (remaining gas: 1039953.290 units remaining) - [ True ] - - location: -1 (remaining gas: 1039953.220 units remaining) + - location: 41 (remaining gas: 1039954.510 units remaining) [ True ] - - location: 43 (remaining gas: 1039953.030 units remaining) + - location: 42 (remaining gas: 1039954.450 units remaining) [ ] - - location: -1 (remaining gas: 1039952.960 units remaining) + - location: 43 (remaining gas: 1039954.380 units remaining) [ ] - - location: 48 (remaining gas: 1039952.820 units remaining) + - location: 48 (remaining gas: 1039954.300 units remaining) [ 12 ] - - location: 51 (remaining gas: 1039952.680 units remaining) + - location: 51 (remaining gas: 1039954.220 units remaining) [ -1 12 ] - - location: 54 (remaining gas: 1039952.540 units remaining) + - location: 54 (remaining gas: 1039954.140 units remaining) [ 12 ] - - location: 55 (remaining gas: 1039952.400 units remaining) + - location: 55 (remaining gas: 1039954.060 units remaining) [ 12 12 ] - - location: 60 (remaining gas: 1039952.070 units remaining) + - location: 60 (remaining gas: 1039953.910 units remaining) [ 0 ] - - location: 61 (remaining gas: 1039951.930 units remaining) - [ True ] - - location: -1 (remaining gas: 1039951.860 units remaining) + - location: 61 (remaining gas: 1039953.830 units remaining) [ True ] - - location: 63 (remaining gas: 1039951.670 units remaining) + - location: 62 (remaining gas: 1039953.770 units remaining) [ ] - - location: -1 (remaining gas: 1039951.600 units remaining) + - location: 63 (remaining gas: 1039953.700 units remaining) [ ] - - location: 68 (remaining gas: 1039951.460 units remaining) + - location: 68 (remaining gas: 1039953.620 units remaining) [ 12 ] - - location: 71 (remaining gas: 1039951.320 units remaining) + - location: 71 (remaining gas: 1039953.540 units remaining) [ -5 12 ] - - location: 74 (remaining gas: 1039951.180 units remaining) + - location: 74 (remaining gas: 1039953.460 units remaining) [ 8 ] - - location: 75 (remaining gas: 1039951.040 units remaining) + - location: 75 (remaining gas: 1039953.380 units remaining) [ 8 8 ] - - location: 80 (remaining gas: 1039950.710 units remaining) + - location: 80 (remaining gas: 1039953.230 units remaining) [ 0 ] - - location: 81 (remaining gas: 1039950.570 units remaining) + - location: 81 (remaining gas: 1039953.150 units remaining) [ True ] - - location: -1 (remaining gas: 1039950.500 units remaining) - [ True ] - - location: 83 (remaining gas: 1039950.310 units remaining) + - location: 82 (remaining gas: 1039953.090 units remaining) [ ] - - location: -1 (remaining gas: 1039950.240 units remaining) + - location: 83 (remaining gas: 1039953.020 units remaining) [ ] - - location: 88 (remaining gas: 1039950.100 units remaining) + - location: 88 (remaining gas: 1039952.940 units remaining) [ Unit ] - - location: 89 (remaining gas: 1039949.960 units remaining) + - location: 89 (remaining gas: 1039952.860 units remaining) [ {} @noop Unit ] - - location: 91 (remaining gas: 1039949.820 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039949.750 units remaining) + - location: 91 (remaining gas: 1039952.780 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 3b8fa653806c96be4adba8611ad305caa2e3dc12..3e4ce9f25a1e41a994de03f25ed1eba69d6d37c9 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,20 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.170 units remaining) + - location: 9 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair False False) False) ] - - location: 9 (remaining gas: 1039993.030 units remaining) + - location: 9 (remaining gas: 1039993.090 units remaining) [ (Pair False False) @parameter ] - - location: 10 (remaining gas: 1039992.890 units remaining) + - location: 10 (remaining gas: 1039993.010 units remaining) [ False False ] - - location: 11 (remaining gas: 1039992.730 units remaining) + - location: 11 (remaining gas: 1039992.910 units remaining) [ False @and ] - - location: 12 (remaining gas: 1039992.590 units remaining) + - location: 12 (remaining gas: 1039992.830 units remaining) [ {} @noop False @and ] - - location: 14 (remaining gas: 1039992.450 units remaining) - [ (Pair {} False) ] - - location: -1 (remaining gas: 1039992.380 units remaining) + - location: 14 (remaining gas: 1039992.750 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 73a28df403b89b2dcf68119337ac8f2fa9167ffa..e0720646dac087e964486f26589e3d92c6bad817 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,20 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.170 units remaining) + - location: 9 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair False True) False) ] - - location: 9 (remaining gas: 1039993.030 units remaining) + - location: 9 (remaining gas: 1039993.090 units remaining) [ (Pair False True) @parameter ] - - location: 10 (remaining gas: 1039992.890 units remaining) + - location: 10 (remaining gas: 1039993.010 units remaining) [ False True ] - - location: 11 (remaining gas: 1039992.730 units remaining) + - location: 11 (remaining gas: 1039992.910 units remaining) [ False @and ] - - location: 12 (remaining gas: 1039992.590 units remaining) + - location: 12 (remaining gas: 1039992.830 units remaining) [ {} @noop False @and ] - - location: 14 (remaining gas: 1039992.450 units remaining) - [ (Pair {} False) ] - - location: -1 (remaining gas: 1039992.380 units remaining) + - location: 14 (remaining gas: 1039992.750 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 1ace40329ac98654803870dae9d94b2198fe006d..feaa4927ebda3a05c9e3a1a9ed5a8fc599358d3f 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,20 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.170 units remaining) + - location: 9 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair True False) False) ] - - location: 9 (remaining gas: 1039993.030 units remaining) + - location: 9 (remaining gas: 1039993.090 units remaining) [ (Pair True False) @parameter ] - - location: 10 (remaining gas: 1039992.890 units remaining) + - location: 10 (remaining gas: 1039993.010 units remaining) [ True False ] - - location: 11 (remaining gas: 1039992.730 units remaining) + - location: 11 (remaining gas: 1039992.910 units remaining) [ False @and ] - - location: 12 (remaining gas: 1039992.590 units remaining) + - location: 12 (remaining gas: 1039992.830 units remaining) [ {} @noop False @and ] - - location: 14 (remaining gas: 1039992.450 units remaining) - [ (Pair {} False) ] - - location: -1 (remaining gas: 1039992.380 units remaining) + - location: 14 (remaining gas: 1039992.750 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 fe8c552df9480f5c888ac4f8f5f8d0af9280737d..c59c3a77fb184fe71b125a850cdcdf5f67f74260 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,20 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.170 units remaining) + - location: 9 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair True True) False) ] - - location: 9 (remaining gas: 1039993.030 units remaining) + - location: 9 (remaining gas: 1039993.090 units remaining) [ (Pair True True) @parameter ] - - location: 10 (remaining gas: 1039992.890 units remaining) + - location: 10 (remaining gas: 1039993.010 units remaining) [ True True ] - - location: 11 (remaining gas: 1039992.730 units remaining) + - location: 11 (remaining gas: 1039992.910 units remaining) [ True @and ] - - location: 12 (remaining gas: 1039992.590 units remaining) + - location: 12 (remaining gas: 1039992.830 units remaining) [ {} @noop True @and ] - - location: 14 (remaining gas: 1039992.450 units remaining) - [ (Pair {} True) ] - - location: -1 (remaining gas: 1039992.380 units remaining) + - location: 14 (remaining gas: 1039992.750 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 813d5404ed6a2f3cb46b9822fa0ae2e5ee86edf8..ad82d447370474bbf6d4aadb6cfa74d29f273c28 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 111) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039779.524 units remaining) + - location: 8 (remaining gas: 1039779.644 units remaining) [ 4000000000000 @balance ] - - location: 9 (remaining gas: 1039779.384 units remaining) + - location: 9 (remaining gas: 1039779.564 units remaining) [ {} 4000000000000 @balance ] - - location: 11 (remaining gas: 1039779.244 units remaining) - [ (Pair {} 4000000000000) ] - - location: -1 (remaining gas: 1039779.174 units remaining) + - location: 11 (remaining gas: 1039779.484 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 0 (S.4c96f27113.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 0 (S.4c96f27113.out index 676ae34a280a86685c18f1f6e68234e0114e735f..b222e687dd9911a3c9954a3d8457a22536126fb9 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 0 (S.4c96f27113.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 0 (S.4c96f27113.out @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map nat nat) Set map(0)[0] to 1 trace - - location: 11 (remaining gas: 1039986.170 units remaining) + - location: 12 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039986.030 units remaining) + - location: 12 (remaining gas: 1039986.090 units remaining) [ 1 @parameter (Pair { Elt 0 1 } None) @storage ] - - location: 15 (remaining gas: 1039985.730 units remaining) + - location: 13 (remaining gas: 1039985.990 units remaining) + [ (Pair { Elt 0 1 } None) @storage ] + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039985.590 units remaining) + - location: 16 (remaining gas: 1039985.830 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: -1 (remaining gas: 1039985.520 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] - - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter - { Elt 0 1 } - { Elt 0 1 } ] - - location: 17 (remaining gas: 1039985.380 units remaining) + - location: 17 (remaining gas: 1039985.750 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039985.240 units remaining) + - location: 18 (remaining gas: 1039985.670 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039985.110 units remaining) + - location: 19 (remaining gas: 1039985.600 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039984.970 units remaining) + - location: 20 (remaining gas: 1039985.520 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039984.830 units remaining) + - location: 21 (remaining gas: 1039985.440 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039984.690 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] - - location: -1 (remaining gas: 1039984.620 units remaining) + - location: 23 (remaining gas: 1039985.360 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 0 (S.7a576099dd.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 0 (S.7a576099dd.out index 4430689d9574267761fa08fd3b7ea4a06108400f..3f422b3ca4c837dad85574691b086b58a90f2234 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 0 (S.7a576099dd.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 0 (S.7a576099dd.out @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map nat nat) Set map(0)[0] to 1 trace - - location: 11 (remaining gas: 1039986.170 units remaining) + - location: 12 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039986.030 units remaining) + - location: 12 (remaining gas: 1039986.090 units remaining) [ 1 @parameter (Pair { Elt 0 1 } None) @storage ] - - location: 15 (remaining gas: 1039985.730 units remaining) + - location: 13 (remaining gas: 1039985.990 units remaining) + [ (Pair { Elt 0 1 } None) @storage ] + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039985.590 units remaining) + - location: 16 (remaining gas: 1039985.830 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: -1 (remaining gas: 1039985.520 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] - - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter - { Elt 0 1 } - { Elt 0 1 } ] - - location: 17 (remaining gas: 1039985.380 units remaining) + - location: 17 (remaining gas: 1039985.750 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039985.240 units remaining) + - location: 18 (remaining gas: 1039985.670 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039985.110 units remaining) + - location: 19 (remaining gas: 1039985.600 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039984.970 units remaining) + - location: 20 (remaining gas: 1039985.520 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039984.830 units remaining) + - location: 21 (remaining gas: 1039985.440 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039984.690 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] - - location: -1 (remaining gas: 1039984.620 units remaining) + - location: 23 (remaining gas: 1039985.360 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 0 (S.a78f9cbe43.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 0 (S.a78f9cbe43.out index 5e8203e8b096d14a0cd9afd1de1598ddeb5668ee..2b9e3af7ca17c66e1a7ec136151fafb14d7bba9b 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 0 (S.a78f9cbe43.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 0 (S.a78f9cbe43.out @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map nat nat) Set map(0)[1] to 0 trace - - location: 11 (remaining gas: 1039986.170 units remaining) + - location: 12 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039986.030 units remaining) + - location: 12 (remaining gas: 1039986.090 units remaining) [ 1 @parameter (Pair { Elt 1 0 } None) @storage ] - - location: 15 (remaining gas: 1039985.730 units remaining) + - location: 13 (remaining gas: 1039985.990 units remaining) + [ (Pair { Elt 1 0 } None) @storage ] + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039985.590 units remaining) + - location: 16 (remaining gas: 1039985.830 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: -1 (remaining gas: 1039985.520 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] - - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter - { Elt 1 0 } - { Elt 1 0 } ] - - location: 17 (remaining gas: 1039985.380 units remaining) + - location: 17 (remaining gas: 1039985.750 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039985.240 units remaining) + - location: 18 (remaining gas: 1039985.670 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039985.110 units remaining) + - location: 19 (remaining gas: 1039985.600 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039984.970 units remaining) + - location: 20 (remaining gas: 1039985.520 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039984.830 units remaining) + - location: 21 (remaining gas: 1039985.440 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039984.690 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] - - location: -1 (remaining gas: 1039984.620 units remaining) + - location: 23 (remaining gas: 1039985.360 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 0 (S.eb161b3e7b.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 0 (S.eb161b3e7b.out index 3736ed1a670f78d8f061901bc03b149e1eb14e5d..f73324805a43fea91fc75e8f51fdec40f394da46 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 0 (S.eb161b3e7b.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 0 (S.eb161b3e7b.out @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map nat nat) Set map(0)[1] to 0 trace - - location: 11 (remaining gas: 1039986.170 units remaining) + - location: 12 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039986.030 units remaining) + - location: 12 (remaining gas: 1039986.090 units remaining) [ 1 @parameter (Pair { Elt 1 0 } None) @storage ] - - location: 15 (remaining gas: 1039985.730 units remaining) + - location: 13 (remaining gas: 1039985.990 units remaining) + [ (Pair { Elt 1 0 } None) @storage ] + - location: 15 (remaining gas: 1039985.910 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039985.590 units remaining) + - location: 16 (remaining gas: 1039985.830 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: -1 (remaining gas: 1039985.520 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] - - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter - { Elt 1 0 } - { Elt 1 0 } ] - - location: 17 (remaining gas: 1039985.380 units remaining) + - location: 17 (remaining gas: 1039985.750 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039985.240 units remaining) + - location: 18 (remaining gas: 1039985.670 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039985.110 units remaining) + - location: 19 (remaining gas: 1039985.600 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039984.970 units remaining) + - location: 20 (remaining gas: 1039985.520 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039984.830 units remaining) + - location: 21 (remaining gas: 1039985.440 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039984.690 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] - - location: -1 (remaining gas: 1039984.620 units remaining) + - location: 23 (remaining gas: 1039985.360 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.09d8aca862.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.09d8aca862.out index e0f2bd6ed2229a9516e7520f792c81edcc0ec18a..0389b0fa5c466e32dda66b5ee1c58490f53bd931 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.09d8aca862.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.09d8aca862.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 1 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 1 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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.8c67185afa.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.8c67185afa.out index a6216b12435a000f23b2a3aa812c2c0889596a5f..ad661f92a9292d3833f8d25a71af863973d6e1a3 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.8c67185afa.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.8c67185afa.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 1 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 1 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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.288a17ed5b.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.288a17ed5b.out index 4b167d07a9e668c3bd3c76940552e013171caf9c..3b6efa62ce866cd78d252e0e8c31513adbf6d56d 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.288a17ed5b.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.288a17ed5b.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 2 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 2 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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.359cf3d084.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.359cf3d084.out index 9d6e27f7038af1d8182c3956c29c38774d56305f..92b534145120812ca730d667a59d770f71763bd0 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.359cf3d084.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.359cf3d084.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 2 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 2 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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.1c70ed3ee1.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.1c70ed3ee1.out index b46dd2aeae83e0e9fcebb0a321a9b3d3fdd6bcf9..154f8a975db381957aaa477f56fd93511d30cb06 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.1c70ed3ee1.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.1c70ed3ee1.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 3 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 3 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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.4df68c50c9.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.4df68c50c9.out index 04efc1e1841b820a4be2dbca7653d41b7a6eabf1..acc9879831ab742b642d361d2880b2c45bb744d2 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.4df68c50c9.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.4df68c50c9.out @@ -9,39 +9,32 @@ big_map diff Set map(0)[1] to 4 Set map(0)[2] to 11 trace - - location: 11 (remaining gas: 1039985.460 units remaining) + - location: 12 (remaining gas: 1039985.460 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039985.320 units remaining) + - location: 12 (remaining gas: 1039985.380 units remaining) [ 3 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.020 units remaining) + - location: 13 (remaining gas: 1039985.280 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.200 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039984.880 units remaining) + - location: 16 (remaining gas: 1039985.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039984.810 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039984.810 units remaining) - [ 3 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039984.670 units remaining) + - location: 17 (remaining gas: 1039985.040 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039984.530 units remaining) + - location: 18 (remaining gas: 1039984.960 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039984.400 units remaining) + - location: 19 (remaining gas: 1039984.890 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039984.260 units remaining) + - location: 20 (remaining gas: 1039984.810 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039984.120 units remaining) + - location: 21 (remaining gas: 1039984.730 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039983.980 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: -1 (remaining gas: 1039983.910 units remaining) + - location: 23 (remaining gas: 1039984.650 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 0 (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 0 (Some False))0].out index f2acaa713ddcd54e333cd49fceed987d47427be4..bf1da8185d9290fc1da9e4ba030e9cc83c9fd568 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 0 (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 0 (Some False))0].out @@ -7,39 +7,32 @@ emitted operations big_map diff New map(0) of type (big_map nat nat) trace - - location: 11 (remaining gas: 1039986.730 units remaining) + - location: 12 (remaining gas: 1039986.730 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039986.590 units remaining) + - location: 12 (remaining gas: 1039986.650 units remaining) [ 1 @parameter (Pair {} None) @storage ] - - location: 15 (remaining gas: 1039986.290 units remaining) + - location: 13 (remaining gas: 1039986.550 units remaining) + [ (Pair {} None) @storage ] + - location: 15 (remaining gas: 1039986.470 units remaining) [ {} ] - - location: 16 (remaining gas: 1039986.150 units remaining) + - location: 16 (remaining gas: 1039986.390 units remaining) [ {} {} ] - - location: -1 (remaining gas: 1039986.080 units remaining) - [ {} - {} ] - - location: 13 (remaining gas: 1039986.080 units remaining) - [ 1 @parameter - {} - {} ] - - location: 17 (remaining gas: 1039985.940 units remaining) + - location: 17 (remaining gas: 1039986.310 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039985.800 units remaining) + - location: 18 (remaining gas: 1039986.230 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039985.670 units remaining) + - location: 19 (remaining gas: 1039986.160 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039986.080 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039986 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039985.250 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039985.180 units remaining) + - location: 23 (remaining gas: 1039985.920 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 0 (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 0 (Some False))1].out index 3bfbf9673694d1262268edea1bbae6fb624e1790..b6138852ca822fc363df6738cfb5bf7268b1d4bc 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 0 (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 0 (Some False))1].out @@ -7,39 +7,32 @@ emitted operations big_map diff New map(0) of type (big_map nat nat) trace - - location: 11 (remaining gas: 1039986.730 units remaining) + - location: 12 (remaining gas: 1039986.730 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039986.590 units remaining) + - location: 12 (remaining gas: 1039986.650 units remaining) [ 1 @parameter (Pair {} None) @storage ] - - location: 15 (remaining gas: 1039986.290 units remaining) + - location: 13 (remaining gas: 1039986.550 units remaining) + [ (Pair {} None) @storage ] + - location: 15 (remaining gas: 1039986.470 units remaining) [ {} ] - - location: 16 (remaining gas: 1039986.150 units remaining) + - location: 16 (remaining gas: 1039986.390 units remaining) [ {} {} ] - - location: -1 (remaining gas: 1039986.080 units remaining) - [ {} - {} ] - - location: 13 (remaining gas: 1039986.080 units remaining) - [ 1 @parameter - {} - {} ] - - location: 17 (remaining gas: 1039985.940 units remaining) + - location: 17 (remaining gas: 1039986.310 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039985.800 units remaining) + - location: 18 (remaining gas: 1039986.230 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039985.670 units remaining) + - location: 19 (remaining gas: 1039986.160 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039986.080 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039986 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039985.250 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039985.180 units remaining) + - location: 23 (remaining gas: 1039985.920 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.712049bd7b.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.712049bd7b.out" index a78495ddd87636b020d163357215c4bf33e0ac75..97c9369737167200f6e9a1f6feffe07d920f694b 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.712049bd7b.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.712049bd7b.out" @@ -9,39 +9,32 @@ big_map diff Set map(0)["bar"] to 4 Set map(0)["foo"] to 11 trace - - location: 11 (remaining gas: 1039985.358 units remaining) + - location: 12 (remaining gas: 1039985.358 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.218 units remaining) + - location: 12 (remaining gas: 1039985.278 units remaining) [ "baz" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039984.918 units remaining) + - location: 13 (remaining gas: 1039985.178 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.098 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039984.778 units remaining) + - location: 16 (remaining gas: 1039985.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039984.708 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039984.708 units remaining) - [ "baz" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.568 units remaining) + - location: 17 (remaining gas: 1039984.938 units remaining) [ False { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.428 units remaining) + - location: 18 (remaining gas: 1039984.858 units remaining) [ (Some False) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.298 units remaining) + - location: 19 (remaining gas: 1039984.788 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some False) ] - - location: 20 (remaining gas: 1039984.158 units remaining) + - location: 20 (remaining gas: 1039984.708 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 21 (remaining gas: 1039984.018 units remaining) + - location: 21 (remaining gas: 1039984.628 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 23 (remaining gas: 1039983.878 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: -1 (remaining gas: 1039983.808 units remaining) + - location: 23 (remaining gas: 1039984.548 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.b18ef3a371.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.b18ef3a371.out" index b6430898be15999d192b2642ec4b810efa7e158d..290e6900521331d7d29506681a6922fbf358cb04 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.b18ef3a371.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.b18ef3a371.out" @@ -9,39 +9,32 @@ big_map diff Set map(0)["bar"] to 4 Set map(0)["foo"] to 11 trace - - location: 11 (remaining gas: 1039985.358 units remaining) + - location: 12 (remaining gas: 1039985.358 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.218 units remaining) + - location: 12 (remaining gas: 1039985.278 units remaining) [ "foo" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039984.918 units remaining) + - location: 13 (remaining gas: 1039985.178 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.098 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039984.778 units remaining) + - location: 16 (remaining gas: 1039985.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039984.708 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039984.708 units remaining) - [ "foo" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.568 units remaining) + - location: 17 (remaining gas: 1039984.938 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.428 units remaining) + - location: 18 (remaining gas: 1039984.858 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.298 units remaining) + - location: 19 (remaining gas: 1039984.788 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.158 units remaining) + - location: 20 (remaining gas: 1039984.708 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.018 units remaining) + - location: 21 (remaining gas: 1039984.628 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.878 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.808 units remaining) + - location: 23 (remaining gas: 1039984.548 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.d04a6af348.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.d04a6af348.out" index 4b4234dbb4e8856f583123809fff9f340255f544..4bd78b7d4bc89019a1d5b1c81c0ff6c961f14e22 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.d04a6af348.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.d04a6af348.out" @@ -9,39 +9,32 @@ big_map diff Set map(0)["bar"] to 4 Set map(0)["foo"] to 11 trace - - location: 11 (remaining gas: 1039985.358 units remaining) + - location: 12 (remaining gas: 1039985.358 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039985.218 units remaining) + - location: 12 (remaining gas: 1039985.278 units remaining) [ "bar" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039984.918 units remaining) + - location: 13 (remaining gas: 1039985.178 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039985.098 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039984.778 units remaining) + - location: 16 (remaining gas: 1039985.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039984.708 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039984.708 units remaining) - [ "bar" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039984.568 units remaining) + - location: 17 (remaining gas: 1039984.938 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039984.428 units remaining) + - location: 18 (remaining gas: 1039984.858 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039984.298 units remaining) + - location: 19 (remaining gas: 1039984.788 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039984.158 units remaining) + - location: 20 (remaining gas: 1039984.708 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.018 units remaining) + - location: 21 (remaining gas: 1039984.628 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039983.878 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: -1 (remaining gas: 1039983.808 units remaining) + - location: 23 (remaining gas: 1039984.548 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\".1ae65b36c3.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\".1ae65b36c3.out" index 71261ace75bf80253b3c782a998d7008adced621..940a835748a5d9d5045ae6f5c4bcce8335522741 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\".1ae65b36c3.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\".1ae65b36c3.out" @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map string nat) Set map(0)["foo"] to 0 trace - - location: 11 (remaining gas: 1039986.082 units remaining) + - location: 12 (remaining gas: 1039986.082 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - - location: 12 (remaining gas: 1039985.942 units remaining) + - location: 12 (remaining gas: 1039986.002 units remaining) [ "foo" @parameter (Pair { Elt "foo" 0 } None) @storage ] - - location: 15 (remaining gas: 1039985.642 units remaining) + - location: 13 (remaining gas: 1039985.902 units remaining) + [ (Pair { Elt "foo" 0 } None) @storage ] + - location: 15 (remaining gas: 1039985.822 units remaining) [ { Elt "foo" 0 } ] - - location: 16 (remaining gas: 1039985.502 units remaining) + - location: 16 (remaining gas: 1039985.742 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: -1 (remaining gas: 1039985.432 units remaining) - [ { Elt "foo" 0 } - { Elt "foo" 0 } ] - - location: 13 (remaining gas: 1039985.432 units remaining) - [ "foo" @parameter - { Elt "foo" 0 } - { Elt "foo" 0 } ] - - location: 17 (remaining gas: 1039985.292 units remaining) + - location: 17 (remaining gas: 1039985.662 units remaining) [ True { Elt "foo" 0 } ] - - location: 18 (remaining gas: 1039985.152 units remaining) + - location: 18 (remaining gas: 1039985.582 units remaining) [ (Some True) { Elt "foo" 0 } ] - - location: 19 (remaining gas: 1039985.022 units remaining) + - location: 19 (remaining gas: 1039985.512 units remaining) [ { Elt "foo" 0 } (Some True) ] - - location: 20 (remaining gas: 1039984.882 units remaining) + - location: 20 (remaining gas: 1039985.432 units remaining) [ (Pair { Elt "foo" 0 } (Some True)) ] - - location: 21 (remaining gas: 1039984.742 units remaining) + - location: 21 (remaining gas: 1039985.352 units remaining) [ {} (Pair { Elt "foo" 0 } (Some True)) ] - - location: 23 (remaining gas: 1039984.602 units remaining) - [ (Pair {} { Elt "foo" 0 } (Some True)) ] - - location: -1 (remaining gas: 1039984.532 units remaining) + - location: 23 (remaining gas: 1039985.272 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\".59ffcc6af5.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\".59ffcc6af5.out" index f62cfd898bafc2584668e2d77cc4c437e01576e5..66f420bf95e59015301fd101b801560f6fe2d517 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\".59ffcc6af5.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\".59ffcc6af5.out" @@ -8,39 +8,32 @@ big_map diff New map(0) of type (big_map string nat) Set map(0)["foo"] to 1 trace - - location: 11 (remaining gas: 1039986.082 units remaining) + - location: 12 (remaining gas: 1039986.082 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - - location: 12 (remaining gas: 1039985.942 units remaining) + - location: 12 (remaining gas: 1039986.002 units remaining) [ "bar" @parameter (Pair { Elt "foo" 1 } None) @storage ] - - location: 15 (remaining gas: 1039985.642 units remaining) + - location: 13 (remaining gas: 1039985.902 units remaining) + [ (Pair { Elt "foo" 1 } None) @storage ] + - location: 15 (remaining gas: 1039985.822 units remaining) [ { Elt "foo" 1 } ] - - location: 16 (remaining gas: 1039985.502 units remaining) + - location: 16 (remaining gas: 1039985.742 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: -1 (remaining gas: 1039985.432 units remaining) - [ { Elt "foo" 1 } - { Elt "foo" 1 } ] - - location: 13 (remaining gas: 1039985.432 units remaining) - [ "bar" @parameter - { Elt "foo" 1 } - { Elt "foo" 1 } ] - - location: 17 (remaining gas: 1039985.292 units remaining) + - location: 17 (remaining gas: 1039985.662 units remaining) [ False { Elt "foo" 1 } ] - - location: 18 (remaining gas: 1039985.152 units remaining) + - location: 18 (remaining gas: 1039985.582 units remaining) [ (Some False) { Elt "foo" 1 } ] - - location: 19 (remaining gas: 1039985.022 units remaining) + - location: 19 (remaining gas: 1039985.512 units remaining) [ { Elt "foo" 1 } (Some False) ] - - location: 20 (remaining gas: 1039984.882 units remaining) + - location: 20 (remaining gas: 1039985.432 units remaining) [ (Pair { Elt "foo" 1 } (Some False)) ] - - location: 21 (remaining gas: 1039984.742 units remaining) + - location: 21 (remaining gas: 1039985.352 units remaining) [ {} (Pair { Elt "foo" 1 } (Some False)) ] - - location: 23 (remaining gas: 1039984.602 units remaining) - [ (Pair {} { Elt "foo" 1 } (Some False)) ] - - location: -1 (remaining gas: 1039984.532 units remaining) + - location: 23 (remaining gas: 1039985.272 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 0 (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 0 (Some False))].out" index e22e5eb8081ef34f06f8f547409396fc4ef9f653..17b82250c62b4aea7e5049e8807dfdaeec22c3ef 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 0 (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 0 (Some False))].out" @@ -7,39 +7,32 @@ emitted operations big_map diff New map(0) of type (big_map string nat) trace - - location: 11 (remaining gas: 1039986.686 units remaining) + - location: 12 (remaining gas: 1039986.686 units remaining) [ (Pair "bar" {} None) ] - - location: 12 (remaining gas: 1039986.546 units remaining) + - location: 12 (remaining gas: 1039986.606 units remaining) [ "bar" @parameter (Pair {} None) @storage ] - - location: 15 (remaining gas: 1039986.246 units remaining) + - location: 13 (remaining gas: 1039986.506 units remaining) + [ (Pair {} None) @storage ] + - location: 15 (remaining gas: 1039986.426 units remaining) [ {} ] - - location: 16 (remaining gas: 1039986.106 units remaining) + - location: 16 (remaining gas: 1039986.346 units remaining) [ {} {} ] - - location: -1 (remaining gas: 1039986.036 units remaining) - [ {} - {} ] - - location: 13 (remaining gas: 1039986.036 units remaining) - [ "bar" @parameter - {} - {} ] - - location: 17 (remaining gas: 1039985.896 units remaining) + - location: 17 (remaining gas: 1039986.266 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039985.756 units remaining) + - location: 18 (remaining gas: 1039986.186 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039985.626 units remaining) + - location: 19 (remaining gas: 1039986.116 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039985.486 units remaining) + - location: 20 (remaining gas: 1039986.036 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039985.346 units remaining) + - location: 21 (remaining gas: 1039985.956 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039985.206 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039985.136 units remaining) + - location: 23 (remaining gas: 1039985.876 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 636c0c97e2f5b8be59fbfbbf30d94cb001c85f08..bb46c01b609a7cebf447aee07ce33ce1aa2648a6 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,21 +7,18 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.230 units remaining) + - location: 8 (remaining gas: 1039993.230 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.090 units remaining) + - location: 8 (remaining gas: 1039993.150 units remaining) [ ] - - location: 9 (remaining gas: 1039992.950 units remaining) + - location: 9 (remaining gas: 1039993.070 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.810 units remaining) + - location: 12 (remaining gas: 1039992.990 units remaining) [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 13 (remaining gas: 1039992.670 units remaining) + - location: 13 (remaining gas: 1039992.910 units remaining) [ {} (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 15 (remaining gas: 1039992.530 units remaining) - [ (Pair {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039992.460 units remaining) + - location: 15 (remaining gas: 1039992.830 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 1a23577cabeab159c7f5a146f5123fac78a28ac2..69a524f9666954b53536d7b37b986afd762c1e32 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,21 +7,18 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.230 units remaining) + - location: 8 (remaining gas: 1039993.230 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.090 units remaining) + - location: 8 (remaining gas: 1039993.150 units remaining) [ ] - - location: 9 (remaining gas: 1039992.950 units remaining) + - location: 9 (remaining gas: 1039993.070 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.810 units remaining) + - location: 12 (remaining gas: 1039992.990 units remaining) [ (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - - location: 13 (remaining gas: 1039992.670 units remaining) + - location: 13 (remaining gas: 1039992.910 units remaining) [ {} (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - - location: 15 (remaining gas: 1039992.530 units remaining) - [ (Pair {} - (Some 0x1000000000000000000000000000000000000000000000000000000000000000)) ] - - location: -1 (remaining gas: 1039992.460 units remaining) + - location: 15 (remaining gas: 1039992.830 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 148d8da9c6a2eb3589dda1028e922d401e6b08e2..9cd8507eba8efd2830859dfa401279f504011525 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 @parameter ] - - location: 8 (remaining gas: 1039994.460 units remaining) + - location: 8 (remaining gas: 1039994.580 units remaining) [ 0 ] - - location: 9 (remaining gas: 1039994.320 units remaining) + - location: 9 (remaining gas: 1039994.500 units remaining) [ {} 0 ] - - location: 11 (remaining gas: 1039994.180 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039994.110 units remaining) + - location: 11 (remaining gas: 1039994.420 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 f11add396420955a64cafd88abe73ee008ee2f1f..a0712f98c955cf17c89e176e0dbaa77e944508d2 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @parameter ] - - location: 8 (remaining gas: 1039994.460 units remaining) + - location: 8 (remaining gas: 1039994.580 units remaining) [ 1 ] - - location: 9 (remaining gas: 1039994.320 units remaining) + - location: 9 (remaining gas: 1039994.500 units remaining) [ {} 1 ] - - location: 11 (remaining gas: 1039994.180 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039994.110 units remaining) + - location: 11 (remaining gas: 1039994.420 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 d6bfbc1e812ea04d01c4edec84d8df2d90b8e614..e87876987a741f0d39e5d566bb7e3e921446c0da 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,19 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 @parameter ] - - location: 8 (remaining gas: 1039994.460 units remaining) + - location: 8 (remaining gas: 1039994.580 units remaining) [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - - location: 9 (remaining gas: 1039994.320 units remaining) + - location: 9 (remaining gas: 1039994.500 units remaining) [ {} 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - - location: 11 (remaining gas: 1039994.180 units remaining) - [ (Pair {} - 17832688077013577776524784494464728518213913213412866604053735695200962927400) ] - - location: -1 (remaining gas: 1039994.110 units remaining) + - location: 11 (remaining gas: 1039994.420 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 81c59ecbb86c055c4764066dc2ffc4e02f4f09da..c2e736996ea32a613ac96b5d92557d5a3dbe027d 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,19 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 @parameter ] - - location: 8 (remaining gas: 1039994.460 units remaining) + - location: 8 (remaining gas: 1039994.580 units remaining) [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - - location: 9 (remaining gas: 1039994.320 units remaining) + - location: 9 (remaining gas: 1039994.500 units remaining) [ {} 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - - location: 11 (remaining gas: 1039994.180 units remaining) - [ (Pair {} - 11320265829256585830781521966149529460476767408210445238902869222031333517497) ] - - location: -1 (remaining gas: 1039994.110 units remaining) + - location: 11 (remaining gas: 1039994.420 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 32e039284900e35098186f5963b34d0a7adbe15d..13ceb9ebd9c5f933c95a75785c0021d78576ab0c 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,28 +7,26 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039988.655 units remaining) + - location: 7 (remaining gas: 1039988.655 units remaining) [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - - location: 7 (remaining gas: 1039988.515 units remaining) + - location: 7 (remaining gas: 1039988.575 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 @parameter ] - - location: 8 (remaining gas: 1039988.425 units remaining) + - location: 8 (remaining gas: 1039988.545 units remaining) [ 16 ] - - location: 9 (remaining gas: 1039988.285 units remaining) + - location: 9 (remaining gas: 1039988.465 units remaining) [ (Some 16) ] - - location: 16 (remaining gas: 1039988.015 units remaining) + - location: 11 (remaining gas: 1039988.385 units remaining) [ 16 @some ] - - location: 10 (remaining gas: 1039987.945 units remaining) + - location: 16 (remaining gas: 1039988.315 units remaining) [ 16 @some ] - - location: 17 (remaining gas: 1039987.805 units remaining) + - location: 17 (remaining gas: 1039988.235 units remaining) [ 1 16 @some ] - - location: 20 (remaining gas: 1039987.412 units remaining) + - location: 20 (remaining gas: 1039987.902 units remaining) [ 16 ] - - location: 21 (remaining gas: 1039987.272 units remaining) + - location: 21 (remaining gas: 1039987.822 units remaining) [ {} 16 ] - - location: 23 (remaining gas: 1039987.132 units remaining) - [ (Pair {} 16) ] - - location: -1 (remaining gas: 1039987.062 units remaining) + - location: 23 (remaining gas: 1039987.742 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 89f091226a6d7f54eb4e66fd36b6b9a0b4f8fb7c..2618e502443cc4e8b09cd1970e7e100b40d2318e 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ -42 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 4ed39fd2143ce09fa89ac90fb642fcf9166c0db2..30d2089a016b6390f9ab42fefcb638e02b8ff53a 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 2 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 3fee2b75acf6777d48639f7bfe20c835b793d531..a752083d46f52cc39c3a5f421ac6bc33d422985d 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ -1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 6593af7599fee84b83473c76e10662bcf01066c8..46ba3624d976a20889a39705b279f0b9c25999bb 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 fd904dcbd52f2d17781e1593a3375da44572748c..e8027fa3a37d73d34e5745c5683fa830963441c0 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 d5f199914242cf0a26e31a3548586abf833b6993..cd75f8c0d31d0b04fc69f90eab060c0db1f4476f 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 e3bf07375293c17765375fb43b673993afdc5847..b702a499cf40fd7bf26502d14c1e95906d20d90c 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 eb76460e9d8a9e78cf7363eae8d4c6e1f023eb6a..b1a41fe8ebe901d7e2b82954c13973d1dc1f329d 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 2e090ceb7bd3323273af917927deed52f9a1fcdc..e79089299d01238b674bf2860dcf2166f836cf6d 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 b4b5cf5b432c8f219d937355e9520de5a3dfbc93..bb0ddda432d761de60fbd64baddf1657df26cf8b 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 b7a018b326eb1e87a24d89fd6ec92cfd3fa5d4bc..bb33b995e0dec7b4feeddbf092e5aac355365058 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 5a2432ead968a658cf89d6cd2ee134e65e684c15..cbbc40aa64806aa2be58bbd7f54853a22c7dd6ec 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 0 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 412a2f30e7d643c28e98a2ef17a7cd4e72b6302f..0c2e8623f85c649f8fdd84841564f88ecbda388f 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 7f0a929bfaca3a4a03b597f721ad66b1e690e561..84e394d182ef15d5cce2c11f7a947405d86626b1 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 2 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 7d5d9fd1a545f9238d9236f303deb93fb3604551..80b12feb16bdcf4dc8da04663ca5d83debd7bb54 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 bba323c3036640c22aa2c39ae3ae4940f4c3de17..7502f7f340d7488e93e936e1995bcbbf977b61e1 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 09cb2c002a787ee60bb663c4a495b67cf79d4a40..8223f41761e464673f82aba0c8ae061f4e8cc932 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 5d0250c0241f54b16f26074e917c2b6123ab1395..02e843528a3fbab36e4bd54a595b1276787599eb 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.690 units remaining) + - location: 7 (remaining gas: 1039994.690 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039994.550 units remaining) + - location: 7 (remaining gas: 1039994.610 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039994.100 units remaining) + - location: 8 (remaining gas: 1039994.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 9 (remaining gas: 1039993.960 units remaining) + - location: 9 (remaining gas: 1039994.140 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 11 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039993.750 units remaining) + - location: 11 (remaining gas: 1039994.060 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 4347e6726a862301d06a1e0ca724db07093f5444..49f0e8b18d5506577afa1b24777d09994291fbc6 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 2 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 2 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 26feee3ba38cf6940d3e3d9e6d23401557d8e79e..1e426a0ef58583eba3c643ccdea8710c93bc4036 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ -1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage -1 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 9fceef0ae3e41b7402367d42c87c3330f8fcfca0..ae287d8e33dc3b42d061aa1f776066b59db52843 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 0 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 0 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 be5155b66dcb6297472f8bc2bcffe54d9956546b..19bae04ba0cdbb62f53fb010d32854e07b97a64c 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ -42 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage -42 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 7d4d3ac50a75fd78a9ae4f215a3a16f987c2f22f..e3f6d47eee872b472110f102db6d7c0cb6982a95 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 1 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 45f07ccd565b04ceeb6337a50b602cc2ef61566a..dd4565b2bb806a7db5a2f01cf496759b75a0cca4 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 1bef36cdf080b9c3a40080c229017ffb9e9f8fc1..89a867dbe1fcf4a22f21d6f8019fca3bc7698122 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 f5449fc5e286bf2dd476469da829c0a5f4a7522e..c79ea896450f23bfe9e818778d3f369f111a358f 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 19b6ceb048afebd316658784115c6c161a4e0c4c..89b9fa6bb19a44cd3c62e235525a59e75dbcabf2 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 954995c5be292de7ad7dc5368f4c781efde39b07..f58da64716879e32f2614c6f442d1f5bd63da245 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 a70a5da7c59a61ca6cdbf3699e02bb16afd522a5..906e4504d1bcaf79c58db1d2931bbdd7a29f3c98 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 0c71091d7fa9ea534399ffca3c3544980fd9baea..3991f45526ee713fa86c0556a7c36e2124eeaace 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 0 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 0 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0000000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 e9a1a829af15e0bc29e5667ba272b8223c235455..670405a1404369d3cf1f80ffdbde1c1a476b74ce 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 1 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 1 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0100000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 f6c37e44237f668fc07292919e1c1daee6736662..0e9c9105766d9719fc2659f54268b2aadf370a40 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,21 +7,19 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 2 @parameter 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage 2 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x0200000000000000000000000000000000000000000000000000000000000000 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 7f545b837955f43bde5a6c9879635fdb364931e4..36e621365357d45f9a405b81fab1f5375740f9e9 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 d74246325d90b465f7b3d9cac3ee698a05e4222b..26b6705bf08f9a9e05538c630f1926ddd58e6e42 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 63c86e71dfc79780c1fd7b9043736b9a492d2413..8f26c2f00636850d2c5fde6ae6c0f15604239726 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 a8bf26df34fac741f5b19ef0a3587908a430d0ce..36bcdb4d4ad549467a7d1e7720ebb2fa10cdfd23 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.940 units remaining) + - location: 7 (remaining gas: 1039993.940 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - - location: 7 (remaining gas: 1039993.800 units remaining) + - location: 7 (remaining gas: 1039993.860 units remaining) [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] - - location: 8 (remaining gas: 1039993.670 units remaining) + - location: 8 (remaining gas: 1039993.790 units remaining) [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] - - location: 9 (remaining gas: 1039993.220 units remaining) + - location: 9 (remaining gas: 1039993.400 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 10 (remaining gas: 1039993.080 units remaining) + - location: 10 (remaining gas: 1039993.320 units remaining) [ {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - - location: 12 (remaining gas: 1039992.940 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] - - location: -1 (remaining gas: 1039992.870 units remaining) + - location: 12 (remaining gas: 1039993.240 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 5ea61782f04bc673da54029603cc52a223c9c7cc..ac623e5e19b147cfdb3dfb97c9fbc6ba2f0295fb 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.920 units remaining) + - location: 9 (remaining gas: 1039993.920 units remaining) [ (Pair (Pair 34 17) 0) ] - - location: 9 (remaining gas: 1039993.780 units remaining) + - location: 9 (remaining gas: 1039993.840 units remaining) [ (Pair 34 17) @parameter ] - - location: 10 (remaining gas: 1039993.640 units remaining) + - location: 10 (remaining gas: 1039993.760 units remaining) [ 34 ] - - location: 11 (remaining gas: 1039993.500 units remaining) + - location: 11 (remaining gas: 1039993.680 units remaining) [ {} 34 ] - - location: 13 (remaining gas: 1039993.360 units remaining) - [ (Pair {} 34) ] - - location: -1 (remaining gas: 1039993.290 units remaining) + - location: 13 (remaining gas: 1039993.600 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 ccbd80bd631109b2898a4915b4f3b4d931f09422..46e2c8aac4341a98d58d2a65e4e06fd5ad31a659 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.920 units remaining) + - location: 9 (remaining gas: 1039993.920 units remaining) [ (Pair (Pair 34 17) 0) ] - - location: 9 (remaining gas: 1039993.780 units remaining) + - location: 9 (remaining gas: 1039993.840 units remaining) [ (Pair 34 17) @parameter ] - - location: 10 (remaining gas: 1039993.640 units remaining) + - location: 10 (remaining gas: 1039993.760 units remaining) [ 17 ] - - location: 11 (remaining gas: 1039993.500 units remaining) + - location: 11 (remaining gas: 1039993.680 units remaining) [ {} 17 ] - - location: 13 (remaining gas: 1039993.360 units remaining) - [ (Pair {} 17) ] - - location: -1 (remaining gas: 1039993.290 units remaining) + - location: 13 (remaining gas: 1039993.600 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 a3e321ff64b8d2f80d8f99b58af9d0dfffe32a65..6b0afed3498287d48ab6bdc741f8133fdebd2d7d 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.950 units remaining) + - location: 8 (remaining gas: 1039991.950 units remaining) [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - - location: 8 (remaining gas: 1039991.810 units remaining) + - location: 8 (remaining gas: 1039991.870 units remaining) [ ] - - location: 9 (remaining gas: 1039991.670 units remaining) + - location: 9 (remaining gas: 1039991.790 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039991.530 units remaining) + - location: 10 (remaining gas: 1039991.710 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039991.390 units remaining) + - location: 11 (remaining gas: 1039991.630 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039991.250 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] - - location: -1 (remaining gas: 1039991.180 units remaining) + - location: 13 (remaining gas: 1039991.550 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 c4db07d2b817fd3c3a5d8ec32f4fc73aa4d7a965..2c138f6e8177911ebd33713b1f73273aadf00ac0 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.400 units remaining) + - location: 8 (remaining gas: 1039993.400 units remaining) [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - - location: 8 (remaining gas: 1039993.260 units remaining) + - location: 8 (remaining gas: 1039993.320 units remaining) [ ] - - location: 9 (remaining gas: 1039993.120 units remaining) + - location: 9 (remaining gas: 1039993.240 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039992.980 units remaining) + - location: 10 (remaining gas: 1039993.160 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039992.840 units remaining) + - location: 11 (remaining gas: 1039993.080 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039992.700 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] - - location: -1 (remaining gas: 1039992.630 units remaining) + - location: 13 (remaining gas: 1039993 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 4f63804a42216fd448ecbe06f7ac6decfe8dc4b9..fc91ae000d4ad78b653dd3e47244705ccf7b1544 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ ] - - location: 9 (remaining gas: 1039993.410 units remaining) + - location: 9 (remaining gas: 1039993.530 units remaining) [ "NetXdQprcVkpaWU" ] - - location: 10 (remaining gas: 1039993.270 units remaining) + - location: 10 (remaining gas: 1039993.450 units remaining) [ (Some "NetXdQprcVkpaWU") ] - - location: 11 (remaining gas: 1039993.130 units remaining) + - location: 11 (remaining gas: 1039993.370 units remaining) [ {} (Some "NetXdQprcVkpaWU") ] - - location: 13 (remaining gas: 1039992.990 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] - - location: -1 (remaining gas: 1039992.920 units remaining) + - location: 13 (remaining gas: 1039993.290 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 0f21c75af2acb0715b0b939d2fee5cd326d83911..f8079d3f638a930188b7fa31db10989453e2b1fa 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,134 +7,117 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039941.990 units remaining) + - location: 11 (remaining gas: 1039941.990 units remaining) [ (Pair (Pair 1 4 2 Unit) Unit) ] - - location: 11 (remaining gas: 1039941.850 units remaining) + - location: 11 (remaining gas: 1039941.910 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 12 (remaining gas: 1039941.710 units remaining) + - location: 12 (remaining gas: 1039941.830 units remaining) [ (Pair 1 4 2 Unit) @parameter (Pair 1 4 2 Unit) @parameter ] - - location: 13 (remaining gas: 1039941.570 units remaining) + - location: 13 (remaining gas: 1039941.750 units remaining) [ 1 (Pair 1 4 2 Unit) @parameter ] - - location: 14 (remaining gas: 1039941.430 units remaining) + - location: 14 (remaining gas: 1039941.670 units remaining) [ 1 1 (Pair 1 4 2 Unit) @parameter ] - - location: 19 (remaining gas: 1039941.100 units remaining) + - location: 19 (remaining gas: 1039941.520 units remaining) [ 0 (Pair 1 4 2 Unit) @parameter ] - - location: 20 (remaining gas: 1039940.960 units remaining) + - location: 20 (remaining gas: 1039941.440 units remaining) [ True (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039940.890 units remaining) - [ True - (Pair 1 4 2 Unit) @parameter ] - - location: 22 (remaining gas: 1039940.700 units remaining) + - location: 21 (remaining gas: 1039941.380 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039940.630 units remaining) + - location: 22 (remaining gas: 1039941.310 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 27 (remaining gas: 1039940.490 units remaining) + - location: 27 (remaining gas: 1039941.230 units remaining) [ (Pair 1 4 2 Unit) @parameter (Pair 1 4 2 Unit) @parameter ] - - location: 28 (remaining gas: 1039940.350 units remaining) + - location: 28 (remaining gas: 1039941.150 units remaining) [ 1 (Pair 1 4 2 Unit) @parameter ] - - location: 30 (remaining gas: 1039940.210 units remaining) + - location: 30 (remaining gas: 1039941.070 units remaining) [ 1 1 (Pair 1 4 2 Unit) @parameter ] - - location: 35 (remaining gas: 1039939.880 units remaining) + - location: 35 (remaining gas: 1039940.920 units remaining) [ 0 (Pair 1 4 2 Unit) @parameter ] - - location: 36 (remaining gas: 1039939.740 units remaining) - [ True - (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039939.670 units remaining) + - location: 36 (remaining gas: 1039940.840 units remaining) [ True (Pair 1 4 2 Unit) @parameter ] - - location: 38 (remaining gas: 1039939.480 units remaining) + - location: 37 (remaining gas: 1039940.780 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039939.410 units remaining) + - location: 38 (remaining gas: 1039940.710 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 43 (remaining gas: 1039939.270 units remaining) + - location: 43 (remaining gas: 1039940.630 units remaining) [ (Pair 1 4 2 Unit) @parameter (Pair 1 4 2 Unit) @parameter ] - - location: 44 (remaining gas: 1039939.129 units remaining) + - location: 44 (remaining gas: 1039940.549 units remaining) [ 4 (Pair 1 4 2 Unit) @parameter ] - - location: 46 (remaining gas: 1039938.989 units remaining) + - location: 46 (remaining gas: 1039940.469 units remaining) [ 4 4 (Pair 1 4 2 Unit) @parameter ] - - location: 51 (remaining gas: 1039938.659 units remaining) + - location: 51 (remaining gas: 1039940.319 units remaining) [ 0 (Pair 1 4 2 Unit) @parameter ] - - location: 52 (remaining gas: 1039938.519 units remaining) - [ True - (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039938.449 units remaining) + - location: 52 (remaining gas: 1039940.239 units remaining) [ True (Pair 1 4 2 Unit) @parameter ] - - location: 54 (remaining gas: 1039938.259 units remaining) + - location: 53 (remaining gas: 1039940.179 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039938.189 units remaining) + - location: 54 (remaining gas: 1039940.109 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 59 (remaining gas: 1039938.049 units remaining) + - location: 59 (remaining gas: 1039940.029 units remaining) [ (Pair 1 4 2 Unit) @parameter (Pair 1 4 2 Unit) @parameter ] - - location: 60 (remaining gas: 1039937.907 units remaining) + - location: 60 (remaining gas: 1039939.947 units remaining) [ 2 (Pair 1 4 2 Unit) @parameter ] - - location: 62 (remaining gas: 1039937.767 units remaining) + - location: 62 (remaining gas: 1039939.867 units remaining) [ 2 2 (Pair 1 4 2 Unit) @parameter ] - - location: 67 (remaining gas: 1039937.437 units remaining) + - location: 67 (remaining gas: 1039939.717 units remaining) [ 0 (Pair 1 4 2 Unit) @parameter ] - - location: 68 (remaining gas: 1039937.297 units remaining) + - location: 68 (remaining gas: 1039939.637 units remaining) [ True (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039937.227 units remaining) - [ True - (Pair 1 4 2 Unit) @parameter ] - - location: 70 (remaining gas: 1039937.037 units remaining) + - location: 69 (remaining gas: 1039939.577 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039936.967 units remaining) + - location: 70 (remaining gas: 1039939.507 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 75 (remaining gas: 1039936.827 units remaining) + - location: 75 (remaining gas: 1039939.427 units remaining) [ (Pair 1 4 2 Unit) @parameter (Pair 1 4 2 Unit) @parameter ] - - location: 76 (remaining gas: 1039936.684 units remaining) + - location: 76 (remaining gas: 1039939.344 units remaining) [ Unit (Pair 1 4 2 Unit) @parameter ] - - location: 78 (remaining gas: 1039936.544 units remaining) + - location: 78 (remaining gas: 1039939.264 units remaining) [ Unit Unit (Pair 1 4 2 Unit) @parameter ] - - location: 81 (remaining gas: 1039936.354 units remaining) + - location: 81 (remaining gas: 1039939.254 units remaining) [ 0 (Pair 1 4 2 Unit) @parameter ] - - location: 82 (remaining gas: 1039936.214 units remaining) + - location: 82 (remaining gas: 1039939.174 units remaining) [ True (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039936.144 units remaining) - [ True - (Pair 1 4 2 Unit) @parameter ] - - location: 84 (remaining gas: 1039935.954 units remaining) + - location: 83 (remaining gas: 1039939.114 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: -1 (remaining gas: 1039935.884 units remaining) + - location: 84 (remaining gas: 1039939.044 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 89 (remaining gas: 1039935.744 units remaining) + - location: 89 (remaining gas: 1039938.964 units remaining) [ ] - - location: 90 (remaining gas: 1039935.604 units remaining) + - location: 90 (remaining gas: 1039938.884 units remaining) [ Unit ] - - location: 91 (remaining gas: 1039935.464 units remaining) + - location: 91 (remaining gas: 1039938.804 units remaining) [ {} Unit ] - - location: 93 (remaining gas: 1039935.324 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039935.254 units remaining) + - location: 93 (remaining gas: 1039938.724 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 5c1d3eb46fe0a76c50a7484a2dc35ae0b1bec356..5e9d8df740528aff01b3681a6709c3284533ae65 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,32 +7,30 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039983.796 units remaining) + - location: 16 (remaining gas: 1039983.796 units remaining) [ (Pair (Pair 1 4 2 Unit) None) ] - - location: 16 (remaining gas: 1039983.656 units remaining) + - location: 16 (remaining gas: 1039983.716 units remaining) [ (Pair 1 4 2 Unit) @parameter ] - - location: 17 (remaining gas: 1039983.516 units remaining) + - location: 17 (remaining gas: 1039983.636 units remaining) [ 2 (Pair 1 4 2 Unit) @parameter ] - - location: 20 (remaining gas: 1039983.375 units remaining) + - location: 20 (remaining gas: 1039983.555 units remaining) [ (Pair 2 4 2 Unit) ] - - location: 22 (remaining gas: 1039983.235 units remaining) + - location: 22 (remaining gas: 1039983.475 units remaining) [ "toto" (Pair 2 4 2 Unit) ] - - location: 25 (remaining gas: 1039983.089 units remaining) + - location: 25 (remaining gas: 1039983.389 units remaining) [ (Pair 2 4 "toto" Unit) ] - - location: 27 (remaining gas: 1039982.949 units remaining) + - location: 27 (remaining gas: 1039983.309 units remaining) [ 0x01 (Pair 2 4 "toto" Unit) ] - - location: 30 (remaining gas: 1039982.802 units remaining) + - location: 30 (remaining gas: 1039983.222 units remaining) [ (Pair 2 4 "toto" 0x01) ] - - location: 32 (remaining gas: 1039982.662 units remaining) + - location: 32 (remaining gas: 1039983.142 units remaining) [ (Some (Pair 2 4 "toto" 0x01)) ] - - location: 33 (remaining gas: 1039982.522 units remaining) + - location: 33 (remaining gas: 1039983.062 units remaining) [ {} (Some (Pair 2 4 "toto" 0x01)) ] - - location: 35 (remaining gas: 1039982.382 units remaining) - [ (Pair {} (Some (Pair 2 4 "toto" 0x01))) ] - - location: -1 (remaining gas: 1039982.312 units remaining) + - location: 35 (remaining gas: 1039982.982 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 27afa2cb30777f3a56261002b760bbd32b8b601f..b752bdd2e5a251a358091575a08f770c36ce7ba0 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,35 +7,33 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039984.270 units remaining) + - location: 11 (remaining gas: 1039984.270 units remaining) [ (Pair Unit 1 4 2 Unit) ] - - location: 11 (remaining gas: 1039984.130 units remaining) + - location: 11 (remaining gas: 1039984.190 units remaining) [ (Pair 1 4 2 Unit) @storage ] - - location: 12 (remaining gas: 1039983.990 units remaining) + - location: 12 (remaining gas: 1039984.110 units remaining) [ 2 (Pair 1 4 2 Unit) @storage ] - - location: 15 (remaining gas: 1039983.849 units remaining) + - location: 15 (remaining gas: 1039984.029 units remaining) [ (Pair 2 4 2 Unit) ] - - location: 17 (remaining gas: 1039983.709 units remaining) + - location: 17 (remaining gas: 1039983.949 units remaining) [ 12 (Pair 2 4 2 Unit) ] - - location: 20 (remaining gas: 1039983.566 units remaining) + - location: 20 (remaining gas: 1039983.866 units remaining) [ (Pair 2 12 2 Unit) ] - - location: 22 (remaining gas: 1039983.426 units remaining) + - location: 22 (remaining gas: 1039983.786 units remaining) [ 8 (Pair 2 12 2 Unit) ] - - location: 25 (remaining gas: 1039983.280 units remaining) + - location: 25 (remaining gas: 1039983.700 units remaining) [ (Pair 2 12 8 Unit) ] - - location: 27 (remaining gas: 1039983.140 units remaining) + - location: 27 (remaining gas: 1039983.620 units remaining) [ Unit (Pair 2 12 8 Unit) ] - - location: 28 (remaining gas: 1039982.993 units remaining) + - location: 28 (remaining gas: 1039983.533 units remaining) [ (Pair 2 12 8 Unit) ] - - location: 30 (remaining gas: 1039982.853 units remaining) + - location: 30 (remaining gas: 1039983.453 units remaining) [ {} (Pair 2 12 8 Unit) ] - - location: 32 (remaining gas: 1039982.713 units remaining) - [ (Pair {} 2 12 8 Unit) ] - - location: -1 (remaining gas: 1039982.643 units remaining) + - location: 32 (remaining gas: 1039983.373 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 0eb47fe8ebef2482337c65a7c7fa3913c22c7e33..10d5599ed8bc2f09c168d2ec8dbc03b2f9e3b870 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,26 +7,24 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.650 units remaining) + - location: 10 (remaining gas: 1039989.650 units remaining) [ (Pair Unit 0 0 0) ] - - location: 10 (remaining gas: 1039989.510 units remaining) + - location: 10 (remaining gas: 1039989.570 units remaining) [ ] - - location: 11 (remaining gas: 1039989.370 units remaining) + - location: 11 (remaining gas: 1039989.490 units remaining) [ 3 ] - - location: 14 (remaining gas: 1039989.230 units remaining) + - location: 14 (remaining gas: 1039989.410 units remaining) [ 2 3 ] - - location: 17 (remaining gas: 1039989.090 units remaining) + - location: 17 (remaining gas: 1039989.330 units remaining) [ 1 2 3 ] - - location: 20 (remaining gas: 1039988.950 units remaining) + - location: 20 (remaining gas: 1039989.250 units remaining) [ {} 1 2 3 ] - - location: 22 (remaining gas: 1039988.797 units remaining) - [ (Pair {} 1 2 3) ] - - location: -1 (remaining gas: 1039988.727 units remaining) + - location: 22 (remaining gas: 1039989.157 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 e158185516d773146b8c944e2db7cad05cd3b019..180c9434b50c32eb331c930d2f07812885df5394 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,394 +7,392 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039762.979 units remaining) + - location: 7 (remaining gas: 1039762.979 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039762.839 units remaining) + - location: 7 (remaining gas: 1039762.899 units remaining) [ ] - - location: 8 (remaining gas: 1039762.699 units remaining) + - location: 8 (remaining gas: 1039762.819 units remaining) [ True ] - - location: 11 (remaining gas: 1039762.559 units remaining) + - location: 11 (remaining gas: 1039762.739 units remaining) [ True True ] - - location: 12 (remaining gas: 1039762.291 units remaining) + - location: 12 (remaining gas: 1039762.531 units remaining) [ 0 ] - - location: 14 (remaining gas: 1039762.091 units remaining) + - location: 14 (remaining gas: 1039762.451 units remaining) [ True ] - - location: 16 (remaining gas: 1039761.901 units remaining) + - location: 15 (remaining gas: 1039762.391 units remaining) [ ] - - location: -1 (remaining gas: 1039761.831 units remaining) + - location: 16 (remaining gas: 1039762.321 units remaining) [ ] - - location: 21 (remaining gas: 1039761.691 units remaining) + - location: 21 (remaining gas: 1039762.241 units remaining) [ False ] - - location: 24 (remaining gas: 1039761.551 units remaining) + - location: 24 (remaining gas: 1039762.161 units remaining) [ False False ] - - location: 25 (remaining gas: 1039761.283 units remaining) + - location: 25 (remaining gas: 1039761.953 units remaining) [ 0 ] - - location: 27 (remaining gas: 1039761.083 units remaining) + - location: 27 (remaining gas: 1039761.873 units remaining) [ True ] - - location: 29 (remaining gas: 1039760.893 units remaining) + - location: 28 (remaining gas: 1039761.813 units remaining) [ ] - - location: -1 (remaining gas: 1039760.823 units remaining) + - location: 29 (remaining gas: 1039761.743 units remaining) [ ] - - location: 34 (remaining gas: 1039760.683 units remaining) + - location: 34 (remaining gas: 1039761.663 units remaining) [ False ] - - location: 37 (remaining gas: 1039760.543 units remaining) + - location: 37 (remaining gas: 1039761.583 units remaining) [ True False ] - - location: 40 (remaining gas: 1039760.275 units remaining) + - location: 40 (remaining gas: 1039761.375 units remaining) [ 1 ] - - location: 42 (remaining gas: 1039760.075 units remaining) + - location: 42 (remaining gas: 1039761.295 units remaining) [ True ] - - location: 44 (remaining gas: 1039759.885 units remaining) + - location: 43 (remaining gas: 1039761.235 units remaining) [ ] - - location: -1 (remaining gas: 1039759.815 units remaining) + - location: 44 (remaining gas: 1039761.165 units remaining) [ ] - - location: 49 (remaining gas: 1039759.675 units remaining) + - location: 49 (remaining gas: 1039761.085 units remaining) [ True ] - - location: 52 (remaining gas: 1039759.535 units remaining) + - location: 52 (remaining gas: 1039761.005 units remaining) [ False True ] - - location: 55 (remaining gas: 1039759.267 units remaining) + - location: 55 (remaining gas: 1039760.797 units remaining) [ -1 ] - - location: 57 (remaining gas: 1039759.067 units remaining) + - location: 57 (remaining gas: 1039760.717 units remaining) [ True ] - - location: 59 (remaining gas: 1039758.877 units remaining) + - location: 58 (remaining gas: 1039760.657 units remaining) [ ] - - location: -1 (remaining gas: 1039758.807 units remaining) + - location: 59 (remaining gas: 1039760.587 units remaining) [ ] - - location: 64 (remaining gas: 1039758.667 units remaining) + - location: 64 (remaining gas: 1039760.507 units remaining) [ 0xaabbcc ] - - location: 67 (remaining gas: 1039758.527 units remaining) + - location: 67 (remaining gas: 1039760.427 units remaining) [ 0xaabbcc 0xaabbcc ] - - location: 68 (remaining gas: 1039758.347 units remaining) + - location: 68 (remaining gas: 1039760.307 units remaining) [ 0 ] - - location: 70 (remaining gas: 1039758.147 units remaining) + - location: 70 (remaining gas: 1039760.227 units remaining) [ True ] - - location: 72 (remaining gas: 1039757.957 units remaining) + - location: 71 (remaining gas: 1039760.167 units remaining) [ ] - - location: -1 (remaining gas: 1039757.887 units remaining) + - location: 72 (remaining gas: 1039760.097 units remaining) [ ] - - location: 77 (remaining gas: 1039757.747 units remaining) + - location: 77 (remaining gas: 1039760.017 units remaining) [ 0x ] - - location: 80 (remaining gas: 1039757.607 units remaining) + - location: 80 (remaining gas: 1039759.937 units remaining) [ 0x 0x ] - - location: 83 (remaining gas: 1039757.427 units remaining) + - location: 83 (remaining gas: 1039759.817 units remaining) [ 0 ] - - location: 85 (remaining gas: 1039757.227 units remaining) + - location: 85 (remaining gas: 1039759.737 units remaining) [ True ] - - location: 87 (remaining gas: 1039757.037 units remaining) + - location: 86 (remaining gas: 1039759.677 units remaining) [ ] - - location: -1 (remaining gas: 1039756.967 units remaining) + - location: 87 (remaining gas: 1039759.607 units remaining) [ ] - - location: 92 (remaining gas: 1039756.827 units remaining) + - location: 92 (remaining gas: 1039759.527 units remaining) [ 0x ] - - location: 95 (remaining gas: 1039756.687 units remaining) + - location: 95 (remaining gas: 1039759.447 units remaining) [ 0x01 0x ] - - location: 98 (remaining gas: 1039756.507 units remaining) + - location: 98 (remaining gas: 1039759.327 units remaining) [ 1 ] - - location: 100 (remaining gas: 1039756.307 units remaining) + - location: 100 (remaining gas: 1039759.247 units remaining) [ True ] - - location: 102 (remaining gas: 1039756.117 units remaining) + - location: 101 (remaining gas: 1039759.187 units remaining) [ ] - - location: -1 (remaining gas: 1039756.047 units remaining) + - location: 102 (remaining gas: 1039759.117 units remaining) [ ] - - location: 107 (remaining gas: 1039755.907 units remaining) + - location: 107 (remaining gas: 1039759.037 units remaining) [ 0x01 ] - - location: 110 (remaining gas: 1039755.767 units remaining) + - location: 110 (remaining gas: 1039758.957 units remaining) [ 0x02 0x01 ] - - location: 113 (remaining gas: 1039755.587 units remaining) + - location: 113 (remaining gas: 1039758.837 units remaining) [ 1 ] - - location: 115 (remaining gas: 1039755.387 units remaining) + - location: 115 (remaining gas: 1039758.757 units remaining) [ True ] - - location: 117 (remaining gas: 1039755.197 units remaining) + - location: 116 (remaining gas: 1039758.697 units remaining) [ ] - - location: -1 (remaining gas: 1039755.127 units remaining) + - location: 117 (remaining gas: 1039758.627 units remaining) [ ] - - location: 122 (remaining gas: 1039754.987 units remaining) + - location: 122 (remaining gas: 1039758.547 units remaining) [ 0x02 ] - - location: 125 (remaining gas: 1039754.847 units remaining) + - location: 125 (remaining gas: 1039758.467 units remaining) [ 0x01 0x02 ] - - location: 128 (remaining gas: 1039754.667 units remaining) + - location: 128 (remaining gas: 1039758.347 units remaining) [ -1 ] - - location: 130 (remaining gas: 1039754.467 units remaining) + - location: 130 (remaining gas: 1039758.267 units remaining) [ True ] - - location: 132 (remaining gas: 1039754.277 units remaining) + - location: 131 (remaining gas: 1039758.207 units remaining) [ ] - - location: -1 (remaining gas: 1039754.207 units remaining) + - location: 132 (remaining gas: 1039758.137 units remaining) [ ] - - location: 137 (remaining gas: 1039754.067 units remaining) + - location: 137 (remaining gas: 1039758.057 units remaining) [ 1 ] - - location: 140 (remaining gas: 1039753.927 units remaining) + - location: 140 (remaining gas: 1039757.977 units remaining) [ 1 1 ] - - location: 141 (remaining gas: 1039753.717 units remaining) + - location: 141 (remaining gas: 1039757.827 units remaining) [ 0 ] - - location: 143 (remaining gas: 1039753.517 units remaining) + - location: 143 (remaining gas: 1039757.747 units remaining) [ True ] - - location: 145 (remaining gas: 1039753.327 units remaining) + - location: 144 (remaining gas: 1039757.687 units remaining) [ ] - - location: -1 (remaining gas: 1039753.257 units remaining) + - location: 145 (remaining gas: 1039757.617 units remaining) [ ] - - location: 150 (remaining gas: 1039753.117 units remaining) + - location: 150 (remaining gas: 1039757.537 units remaining) [ 10 ] - - location: 153 (remaining gas: 1039752.977 units remaining) + - location: 153 (remaining gas: 1039757.457 units remaining) [ 5 10 ] - - location: 156 (remaining gas: 1039752.767 units remaining) + - location: 156 (remaining gas: 1039757.307 units remaining) [ -1 ] - - location: 158 (remaining gas: 1039752.567 units remaining) + - location: 158 (remaining gas: 1039757.227 units remaining) [ True ] - - location: 160 (remaining gas: 1039752.377 units remaining) + - location: 159 (remaining gas: 1039757.167 units remaining) [ ] - - location: -1 (remaining gas: 1039752.307 units remaining) + - location: 160 (remaining gas: 1039757.097 units remaining) [ ] - - location: 165 (remaining gas: 1039752.167 units remaining) + - location: 165 (remaining gas: 1039757.017 units remaining) [ -4 ] - - location: 168 (remaining gas: 1039752.027 units remaining) + - location: 168 (remaining gas: 1039756.937 units remaining) [ 1923 -4 ] - - location: 171 (remaining gas: 1039751.817 units remaining) + - location: 171 (remaining gas: 1039756.787 units remaining) [ 1 ] - - location: 173 (remaining gas: 1039751.617 units remaining) + - location: 173 (remaining gas: 1039756.707 units remaining) [ True ] - - location: 175 (remaining gas: 1039751.427 units remaining) + - location: 174 (remaining gas: 1039756.647 units remaining) [ ] - - location: -1 (remaining gas: 1039751.357 units remaining) + - location: 175 (remaining gas: 1039756.577 units remaining) [ ] - - location: 180 (remaining gas: 1039751.217 units remaining) + - location: 180 (remaining gas: 1039756.497 units remaining) [ 1 ] - - location: 183 (remaining gas: 1039751.077 units remaining) + - location: 183 (remaining gas: 1039756.417 units remaining) [ 1 1 ] - - location: 184 (remaining gas: 1039750.867 units remaining) + - location: 184 (remaining gas: 1039756.267 units remaining) [ 0 ] - - location: 186 (remaining gas: 1039750.667 units remaining) + - location: 186 (remaining gas: 1039756.187 units remaining) [ True ] - - location: 188 (remaining gas: 1039750.477 units remaining) + - location: 187 (remaining gas: 1039756.127 units remaining) [ ] - - location: -1 (remaining gas: 1039750.407 units remaining) + - location: 188 (remaining gas: 1039756.057 units remaining) [ ] - - location: 193 (remaining gas: 1039750.267 units remaining) + - location: 193 (remaining gas: 1039755.977 units remaining) [ 10 ] - - location: 196 (remaining gas: 1039750.127 units remaining) + - location: 196 (remaining gas: 1039755.897 units remaining) [ 5 10 ] - - location: 199 (remaining gas: 1039749.917 units remaining) + - location: 199 (remaining gas: 1039755.747 units remaining) [ -1 ] - - location: 201 (remaining gas: 1039749.717 units remaining) + - location: 201 (remaining gas: 1039755.667 units remaining) [ True ] - - location: 203 (remaining gas: 1039749.527 units remaining) + - location: 202 (remaining gas: 1039755.607 units remaining) [ ] - - location: -1 (remaining gas: 1039749.457 units remaining) + - location: 203 (remaining gas: 1039755.537 units remaining) [ ] - - location: 208 (remaining gas: 1039749.317 units remaining) + - location: 208 (remaining gas: 1039755.457 units remaining) [ 4 ] - - location: 211 (remaining gas: 1039749.177 units remaining) + - location: 211 (remaining gas: 1039755.377 units remaining) [ 1923 4 ] - - location: 214 (remaining gas: 1039748.967 units remaining) + - location: 214 (remaining gas: 1039755.227 units remaining) [ 1 ] - - location: 216 (remaining gas: 1039748.767 units remaining) + - location: 216 (remaining gas: 1039755.147 units remaining) [ True ] - - location: 218 (remaining gas: 1039748.577 units remaining) + - location: 217 (remaining gas: 1039755.087 units remaining) [ ] - - location: -1 (remaining gas: 1039748.507 units remaining) + - location: 218 (remaining gas: 1039755.017 units remaining) [ ] - - location: 223 (remaining gas: 1039748.367 units remaining) + - location: 223 (remaining gas: 1039754.937 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 226 (remaining gas: 1039748.227 units remaining) + - location: 226 (remaining gas: 1039754.857 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 227 (remaining gas: 1039747.957 units remaining) + - location: 227 (remaining gas: 1039754.647 units remaining) [ 0 ] - - location: 229 (remaining gas: 1039747.757 units remaining) + - location: 229 (remaining gas: 1039754.567 units remaining) [ True ] - - location: 231 (remaining gas: 1039747.567 units remaining) + - location: 230 (remaining gas: 1039754.507 units remaining) [ ] - - location: -1 (remaining gas: 1039747.497 units remaining) + - location: 231 (remaining gas: 1039754.437 units remaining) [ ] - - location: 236 (remaining gas: 1039747.357 units remaining) + - location: 236 (remaining gas: 1039754.357 units remaining) [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - - location: 239 (remaining gas: 1039747.217 units remaining) + - location: 239 (remaining gas: 1039754.277 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - - location: 242 (remaining gas: 1039746.947 units remaining) + - location: 242 (remaining gas: 1039754.067 units remaining) [ -1 ] - - location: 244 (remaining gas: 1039746.747 units remaining) + - location: 244 (remaining gas: 1039753.987 units remaining) [ True ] - - location: 246 (remaining gas: 1039746.557 units remaining) + - location: 245 (remaining gas: 1039753.927 units remaining) [ ] - - location: -1 (remaining gas: 1039746.487 units remaining) + - location: 246 (remaining gas: 1039753.857 units remaining) [ ] - - location: 251 (remaining gas: 1039746.347 units remaining) + - location: 251 (remaining gas: 1039753.777 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 254 (remaining gas: 1039746.207 units remaining) + - location: 254 (remaining gas: 1039753.697 units remaining) [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 257 (remaining gas: 1039745.937 units remaining) + - location: 257 (remaining gas: 1039753.487 units remaining) [ 1 ] - - location: 259 (remaining gas: 1039745.737 units remaining) + - location: 259 (remaining gas: 1039753.407 units remaining) [ True ] - - location: 261 (remaining gas: 1039745.547 units remaining) + - location: 260 (remaining gas: 1039753.347 units remaining) [ ] - - location: -1 (remaining gas: 1039745.477 units remaining) + - location: 261 (remaining gas: 1039753.277 units remaining) [ ] - - location: 266 (remaining gas: 1039745.337 units remaining) + - location: 266 (remaining gas: 1039753.197 units remaining) [ 1 ] - - location: 269 (remaining gas: 1039745.197 units remaining) + - location: 269 (remaining gas: 1039753.117 units remaining) [ 1 1 ] - - location: 270 (remaining gas: 1039745.033 units remaining) + - location: 270 (remaining gas: 1039753.013 units remaining) [ 0 ] - - location: 272 (remaining gas: 1039744.833 units remaining) + - location: 272 (remaining gas: 1039752.933 units remaining) [ True ] - - location: 274 (remaining gas: 1039744.643 units remaining) + - location: 273 (remaining gas: 1039752.873 units remaining) [ ] - - location: -1 (remaining gas: 1039744.573 units remaining) + - location: 274 (remaining gas: 1039752.803 units remaining) [ ] - - location: 279 (remaining gas: 1039744.433 units remaining) + - location: 279 (remaining gas: 1039752.723 units remaining) [ 10 ] - - location: 282 (remaining gas: 1039744.293 units remaining) + - location: 282 (remaining gas: 1039752.643 units remaining) [ 5 10 ] - - location: 285 (remaining gas: 1039744.129 units remaining) + - location: 285 (remaining gas: 1039752.539 units remaining) [ -1 ] - - location: 287 (remaining gas: 1039743.929 units remaining) + - location: 287 (remaining gas: 1039752.459 units remaining) [ True ] - - location: 289 (remaining gas: 1039743.739 units remaining) + - location: 288 (remaining gas: 1039752.399 units remaining) [ ] - - location: -1 (remaining gas: 1039743.669 units remaining) + - location: 289 (remaining gas: 1039752.329 units remaining) [ ] - - location: 294 (remaining gas: 1039743.529 units remaining) + - location: 294 (remaining gas: 1039752.249 units remaining) [ 4 ] - - location: 297 (remaining gas: 1039743.389 units remaining) + - location: 297 (remaining gas: 1039752.169 units remaining) [ 1923 4 ] - - location: 300 (remaining gas: 1039743.225 units remaining) + - location: 300 (remaining gas: 1039752.065 units remaining) [ 1 ] - - location: 302 (remaining gas: 1039743.025 units remaining) + - location: 302 (remaining gas: 1039751.985 units remaining) [ True ] - - location: 304 (remaining gas: 1039742.835 units remaining) + - location: 303 (remaining gas: 1039751.925 units remaining) [ ] - - location: -1 (remaining gas: 1039742.765 units remaining) + - location: 304 (remaining gas: 1039751.855 units remaining) [ ] - - location: 309 (remaining gas: 1039742.625 units remaining) + - location: 309 (remaining gas: 1039751.775 units remaining) [ "AABBCC" ] - - location: 312 (remaining gas: 1039742.485 units remaining) + - location: 312 (remaining gas: 1039751.695 units remaining) [ "AABBCC" "AABBCC" ] - - location: 313 (remaining gas: 1039742.305 units remaining) + - location: 313 (remaining gas: 1039751.575 units remaining) [ 0 ] - - location: 315 (remaining gas: 1039742.105 units remaining) + - location: 315 (remaining gas: 1039751.495 units remaining) [ True ] - - location: 317 (remaining gas: 1039741.915 units remaining) + - location: 316 (remaining gas: 1039751.435 units remaining) [ ] - - location: -1 (remaining gas: 1039741.845 units remaining) + - location: 317 (remaining gas: 1039751.365 units remaining) [ ] - - location: 322 (remaining gas: 1039741.705 units remaining) + - location: 322 (remaining gas: 1039751.285 units remaining) [ "" ] - - location: 325 (remaining gas: 1039741.565 units remaining) + - location: 325 (remaining gas: 1039751.205 units remaining) [ "" "" ] - - location: 328 (remaining gas: 1039741.385 units remaining) + - location: 328 (remaining gas: 1039751.085 units remaining) [ 0 ] - - location: 330 (remaining gas: 1039741.185 units remaining) + - location: 330 (remaining gas: 1039751.005 units remaining) [ True ] - - location: 332 (remaining gas: 1039740.995 units remaining) + - location: 331 (remaining gas: 1039750.945 units remaining) [ ] - - location: -1 (remaining gas: 1039740.925 units remaining) + - location: 332 (remaining gas: 1039750.875 units remaining) [ ] - - location: 337 (remaining gas: 1039740.785 units remaining) + - location: 337 (remaining gas: 1039750.795 units remaining) [ "" ] - - location: 340 (remaining gas: 1039740.645 units remaining) + - location: 340 (remaining gas: 1039750.715 units remaining) [ "a" "" ] - - location: 343 (remaining gas: 1039740.465 units remaining) + - location: 343 (remaining gas: 1039750.595 units remaining) [ 1 ] - - location: 345 (remaining gas: 1039740.265 units remaining) + - location: 345 (remaining gas: 1039750.515 units remaining) [ True ] - - location: 347 (remaining gas: 1039740.075 units remaining) + - location: 346 (remaining gas: 1039750.455 units remaining) [ ] - - location: -1 (remaining gas: 1039740.005 units remaining) + - location: 347 (remaining gas: 1039750.385 units remaining) [ ] - - location: 352 (remaining gas: 1039739.865 units remaining) + - location: 352 (remaining gas: 1039750.305 units remaining) [ "a" ] - - location: 355 (remaining gas: 1039739.725 units remaining) + - location: 355 (remaining gas: 1039750.225 units remaining) [ "b" "a" ] - - location: 358 (remaining gas: 1039739.545 units remaining) + - location: 358 (remaining gas: 1039750.105 units remaining) [ 1 ] - - location: 360 (remaining gas: 1039739.345 units remaining) + - location: 360 (remaining gas: 1039750.025 units remaining) [ True ] - - location: 362 (remaining gas: 1039739.155 units remaining) + - location: 361 (remaining gas: 1039749.965 units remaining) [ ] - - location: -1 (remaining gas: 1039739.085 units remaining) + - location: 362 (remaining gas: 1039749.895 units remaining) [ ] - - location: 367 (remaining gas: 1039738.945 units remaining) + - location: 367 (remaining gas: 1039749.815 units remaining) [ "b" ] - - location: 370 (remaining gas: 1039738.805 units remaining) + - location: 370 (remaining gas: 1039749.735 units remaining) [ "a" "b" ] - - location: 373 (remaining gas: 1039738.625 units remaining) + - location: 373 (remaining gas: 1039749.615 units remaining) [ -1 ] - - location: 375 (remaining gas: 1039738.425 units remaining) + - location: 375 (remaining gas: 1039749.535 units remaining) [ True ] - - location: 377 (remaining gas: 1039738.235 units remaining) + - location: 376 (remaining gas: 1039749.475 units remaining) [ ] - - location: -1 (remaining gas: 1039738.165 units remaining) + - location: 377 (remaining gas: 1039749.405 units remaining) [ ] - - location: 382 (remaining gas: 1039738.025 units remaining) + - location: 382 (remaining gas: 1039749.325 units remaining) [ "2019-09-16T08:38:05Z" ] - - location: 385 (remaining gas: 1039737.885 units remaining) + - location: 385 (remaining gas: 1039749.245 units remaining) [ "2019-09-16T08:38:05Z" "2019-09-16T08:38:05Z" ] - - location: 386 (remaining gas: 1039737.685 units remaining) + - location: 386 (remaining gas: 1039749.105 units remaining) [ 0 ] - - location: 388 (remaining gas: 1039737.485 units remaining) + - location: 388 (remaining gas: 1039749.025 units remaining) [ True ] - - location: 390 (remaining gas: 1039737.295 units remaining) + - location: 389 (remaining gas: 1039748.965 units remaining) [ ] - - location: -1 (remaining gas: 1039737.225 units remaining) + - location: 390 (remaining gas: 1039748.895 units remaining) [ ] - - location: 395 (remaining gas: 1039737.085 units remaining) + - location: 395 (remaining gas: 1039748.815 units remaining) [ "2017-09-16T08:38:04Z" ] - - location: 398 (remaining gas: 1039736.945 units remaining) + - location: 398 (remaining gas: 1039748.735 units remaining) [ "2019-09-16T08:38:05Z" "2017-09-16T08:38:04Z" ] - - location: 401 (remaining gas: 1039736.745 units remaining) + - location: 401 (remaining gas: 1039748.595 units remaining) [ 1 ] - - location: 403 (remaining gas: 1039736.545 units remaining) + - location: 403 (remaining gas: 1039748.515 units remaining) [ True ] - - location: 405 (remaining gas: 1039736.355 units remaining) + - location: 404 (remaining gas: 1039748.455 units remaining) [ ] - - location: -1 (remaining gas: 1039736.285 units remaining) + - location: 405 (remaining gas: 1039748.385 units remaining) [ ] - - location: 410 (remaining gas: 1039736.145 units remaining) + - location: 410 (remaining gas: 1039748.305 units remaining) [ "2019-09-16T08:38:05Z" ] - - location: 413 (remaining gas: 1039736.005 units remaining) + - location: 413 (remaining gas: 1039748.225 units remaining) [ "2019-09-16T08:38:04Z" "2019-09-16T08:38:05Z" ] - - location: 416 (remaining gas: 1039735.805 units remaining) + - location: 416 (remaining gas: 1039748.085 units remaining) [ -1 ] - - location: 418 (remaining gas: 1039735.605 units remaining) + - location: 418 (remaining gas: 1039748.005 units remaining) [ True ] - - location: 420 (remaining gas: 1039735.415 units remaining) + - location: 419 (remaining gas: 1039747.945 units remaining) [ ] - - location: -1 (remaining gas: 1039735.345 units remaining) + - location: 420 (remaining gas: 1039747.875 units remaining) [ ] - - location: 425 (remaining gas: 1039735.205 units remaining) + - location: 425 (remaining gas: 1039747.795 units remaining) [ Unit ] - - location: 426 (remaining gas: 1039735.065 units remaining) + - location: 426 (remaining gas: 1039747.715 units remaining) [ {} Unit ] - - location: 428 (remaining gas: 1039734.925 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039734.855 units remaining) + - location: 428 (remaining gas: 1039747.635 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 204a0fa5661404553dfed18705070b3fc28dedfe..aa413a2f5edbb07199228b551df659060fe5818e 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,331 +12,191 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039960.920 units remaining) + - location: 10 (remaining gas: 1039960.920 units remaining) [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] - - location: 10 (remaining gas: 1039960.780 units remaining) + - location: 10 (remaining gas: 1039960.840 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 11 (remaining gas: 1039960.640 units remaining) + - location: 11 (remaining gas: 1039960.760 units remaining) [ {} { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 16 (remaining gas: 1039960.340 units remaining) + - location: 14 (remaining gas: 1039960.660 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 16 (remaining gas: 1039960.580 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 19 (remaining gas: 1039959.580 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 18 (remaining gas: 1039959.510 units remaining) + - location: 19 (remaining gas: 1039959.940 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 19 (remaining gas: 1039959.370 units remaining) + - location: 19 (remaining gas: 1039959.860 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 18 (remaining gas: 1039959.300 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 19 (remaining gas: 1039959.160 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 18 (remaining gas: 1039959.090 units remaining) + - location: 19 (remaining gas: 1039959.780 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 19 (remaining gas: 1039958.950 units remaining) + - location: 19 (remaining gas: 1039959.700 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 18 (remaining gas: 1039958.880 units remaining) + - location: 19 (remaining gas: 1039959.620 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 19 (remaining gas: 1039958.740 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 18 (remaining gas: 1039958.670 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 17 (remaining gas: 1039958.670 units remaining) - [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: -1 (remaining gas: 1039958.600 units remaining) - [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 14 (remaining gas: 1039958.600 units remaining) - [ {} - { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 20 (remaining gas: 1039958.470 units remaining) + - location: 20 (remaining gas: 1039959.550 units remaining) [ { False ; False ; True ; False ; False } {} { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 21 (remaining gas: 1039958.330 units remaining) + - location: 21 (remaining gas: 1039959.470 units remaining) [ { { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 24 (remaining gas: 1039958.030 units remaining) + - location: 22 (remaining gas: 1039959.370 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 24 (remaining gas: 1039959.290 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 27 (remaining gas: 1039957.270 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 26 (remaining gas: 1039957.200 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 27 (remaining gas: 1039957.060 units remaining) + - location: 27 (remaining gas: 1039958.650 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 26 (remaining gas: 1039956.990 units remaining) + - location: 27 (remaining gas: 1039958.570 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 27 (remaining gas: 1039956.850 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 26 (remaining gas: 1039956.780 units remaining) + - location: 27 (remaining gas: 1039958.490 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 27 (remaining gas: 1039956.640 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 26 (remaining gas: 1039956.570 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 27 (remaining gas: 1039956.430 units remaining) + - location: 27 (remaining gas: 1039958.410 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 26 (remaining gas: 1039956.360 units remaining) + - location: 27 (remaining gas: 1039958.330 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 25 (remaining gas: 1039956.360 units remaining) - [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: -1 (remaining gas: 1039956.290 units remaining) - [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 22 (remaining gas: 1039956.290 units remaining) - [ { { False ; False ; True ; False ; False } } - { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 28 (remaining gas: 1039956.160 units remaining) + - location: 28 (remaining gas: 1039958.260 units remaining) [ { True ; True ; False ; True ; True } { { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 29 (remaining gas: 1039956.020 units remaining) + - location: 29 (remaining gas: 1039958.180 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 32 (remaining gas: 1039955.720 units remaining) + - location: 30 (remaining gas: 1039958.080 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 32 (remaining gas: 1039958 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 35 (remaining gas: 1039954.960 units remaining) + - location: 35 (remaining gas: 1039957.360 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 34 (remaining gas: 1039954.890 units remaining) + - location: 35 (remaining gas: 1039957.280 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 35 (remaining gas: 1039954.750 units remaining) + - location: 35 (remaining gas: 1039957.200 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 34 (remaining gas: 1039954.680 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 35 (remaining gas: 1039954.540 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 34 (remaining gas: 1039954.470 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 35 (remaining gas: 1039954.330 units remaining) + - location: 35 (remaining gas: 1039957.120 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 34 (remaining gas: 1039954.260 units remaining) + - location: 35 (remaining gas: 1039957.040 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 35 (remaining gas: 1039954.120 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 34 (remaining gas: 1039954.050 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 33 (remaining gas: 1039954.050 units remaining) - [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: -1 (remaining gas: 1039953.980 units remaining) - [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 30 (remaining gas: 1039953.980 units remaining) - [ { { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 36 (remaining gas: 1039953.850 units remaining) + - location: 36 (remaining gas: 1039956.970 units remaining) [ { True ; True ; True ; False ; False } { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 37 (remaining gas: 1039953.710 units remaining) + - location: 37 (remaining gas: 1039956.890 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 40 (remaining gas: 1039953.410 units remaining) + - location: 38 (remaining gas: 1039956.790 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 40 (remaining gas: 1039956.710 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 43 (remaining gas: 1039952.650 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 42 (remaining gas: 1039952.580 units remaining) + - location: 43 (remaining gas: 1039956.070 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 43 (remaining gas: 1039952.440 units remaining) + - location: 43 (remaining gas: 1039955.990 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 42 (remaining gas: 1039952.370 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 43 (remaining gas: 1039952.230 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 42 (remaining gas: 1039952.160 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 43 (remaining gas: 1039952.020 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 42 (remaining gas: 1039951.950 units remaining) + - location: 43 (remaining gas: 1039955.910 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 43 (remaining gas: 1039951.810 units remaining) + - location: 43 (remaining gas: 1039955.830 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 42 (remaining gas: 1039951.740 units remaining) + - location: 43 (remaining gas: 1039955.750 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 41 (remaining gas: 1039951.740 units remaining) - [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: -1 (remaining gas: 1039951.670 units remaining) - [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 38 (remaining gas: 1039951.670 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 } @parameter ] - - location: 44 (remaining gas: 1039951.540 units remaining) + - location: 44 (remaining gas: 1039955.680 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 } @parameter ] - - location: 45 (remaining gas: 1039951.400 units remaining) + - location: 45 (remaining gas: 1039955.600 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 } @parameter ] - - location: 48 (remaining gas: 1039951.100 units remaining) + - location: 46 (remaining gas: 1039955.500 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 48 (remaining gas: 1039955.420 units remaining) [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 51 (remaining gas: 1039950.340 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 50 (remaining gas: 1039950.270 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 51 (remaining gas: 1039950.130 units remaining) + - location: 51 (remaining gas: 1039954.780 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 50 (remaining gas: 1039950.060 units remaining) + - location: 51 (remaining gas: 1039954.700 units remaining) [ False { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 51 (remaining gas: 1039949.920 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 50 (remaining gas: 1039949.850 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 51 (remaining gas: 1039949.710 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 50 (remaining gas: 1039949.640 units remaining) + - location: 51 (remaining gas: 1039954.620 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 51 (remaining gas: 1039949.500 units remaining) + - location: 51 (remaining gas: 1039954.540 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 50 (remaining gas: 1039949.430 units remaining) + - location: 51 (remaining gas: 1039954.460 units remaining) [ True { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 49 (remaining gas: 1039949.430 units remaining) - [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: -1 (remaining gas: 1039949.360 units remaining) - [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] - - location: 46 (remaining gas: 1039949.360 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 } @parameter ] - - location: 52 (remaining gas: 1039949.230 units remaining) + - location: 52 (remaining gas: 1039954.390 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 } @parameter ] - - location: 53 (remaining gas: 1039949.090 units remaining) + - location: 53 (remaining gas: 1039954.310 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 } @parameter ] - - location: 58 (remaining gas: 1039948.170 units remaining) - [ False ] - - location: 57 (remaining gas: 1039948.100 units remaining) - [ False ] - - location: 58 (remaining gas: 1039947.960 units remaining) - [ False ] - - location: 57 (remaining gas: 1039947.890 units remaining) + - location: 54 (remaining gas: 1039954.210 units remaining) + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + - location: 58 (remaining gas: 1039953.570 units remaining) [ False ] - - location: 58 (remaining gas: 1039947.750 units remaining) + - location: 58 (remaining gas: 1039953.490 units remaining) [ False ] - - location: 57 (remaining gas: 1039947.680 units remaining) + - location: 58 (remaining gas: 1039953.410 units remaining) [ False ] - - location: 58 (remaining gas: 1039947.540 units remaining) - [ True ] - - location: 57 (remaining gas: 1039947.470 units remaining) + - location: 58 (remaining gas: 1039953.330 units remaining) [ True ] - - location: 58 (remaining gas: 1039947.330 units remaining) + - location: 58 (remaining gas: 1039953.250 units remaining) [ True ] - - location: 57 (remaining gas: 1039947.260 units remaining) - [ True ] - - location: 56 (remaining gas: 1039947.260 units remaining) - [ { False ; False ; False ; True ; True } ] - - location: 55 (remaining gas: 1039947.190 units remaining) - [ { False ; False ; False ; True ; True } ] - - location: 54 (remaining gas: 1039947.190 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: 1039947.060 units remaining) + - location: 59 (remaining gas: 1039953.180 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: 1039946.920 units remaining) + - location: 60 (remaining gas: 1039953.100 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: 1039946.780 units remaining) + - location: 61 (remaining gas: 1039953.020 units remaining) [ {} { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; @@ -344,15 +204,7 @@ trace { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } ] - - location: 63 (remaining gas: 1039946.640 units remaining) - [ (Pair {} - { { 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: -1 (remaining gas: 1039946.570 units remaining) + - location: 63 (remaining gas: 1039952.940 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 3850a148ee16148608aca710b552fd5e7ca88c50..1faec940437e6906c9d24ee33452ba9af6ff83a0 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,24 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.972 units remaining) + - location: 9 (remaining gas: 1039991.972 units remaining) [ (Pair { "World!" } {}) ] - - location: 9 (remaining gas: 1039991.832 units remaining) + - location: 9 (remaining gas: 1039991.892 units remaining) [ { "World!" } @parameter ] - - location: 12 (remaining gas: 1039991.120 units remaining) + - location: 12 (remaining gas: 1039991.300 units remaining) [ "Hello " @hello "World!" @parameter.elt ] - - location: 15 (remaining gas: 1039990.980 units remaining) + - location: 15 (remaining gas: 1039991.220 units remaining) [ "Hello World!" ] - - location: -1 (remaining gas: 1039990.910 units remaining) - [ "Hello World!" ] - - location: 10 (remaining gas: 1039990.910 units remaining) - [ { "Hello World!" } ] - - location: 16 (remaining gas: 1039990.770 units remaining) + - location: 16 (remaining gas: 1039991.140 units remaining) [ {} { "Hello World!" } ] - - location: 18 (remaining gas: 1039990.630 units remaining) - [ (Pair {} { "Hello World!" }) ] - - location: -1 (remaining gas: 1039990.560 units remaining) + - location: 18 (remaining gas: 1039991.060 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 3721695b0bf9a8629513aad59fb620f8a2570883..cc7745f49717a308ea68236977c12a3f390cb432 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,31 +7,23 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.678 units remaining) + - location: 9 (remaining gas: 1039991.678 units remaining) [ (Pair { "test1" ; "test2" } {}) ] - - location: 9 (remaining gas: 1039991.538 units remaining) + - location: 9 (remaining gas: 1039991.598 units remaining) [ { "test1" ; "test2" } @parameter ] - - location: 12 (remaining gas: 1039990.814 units remaining) + - location: 12 (remaining gas: 1039990.994 units remaining) [ "Hello " @hello "test1" @parameter.elt ] - - location: 15 (remaining gas: 1039990.674 units remaining) + - location: 15 (remaining gas: 1039990.914 units remaining) [ "Hello test1" ] - - location: -1 (remaining gas: 1039990.604 units remaining) - [ "Hello test1" ] - - location: 12 (remaining gas: 1039990.464 units remaining) + - location: 12 (remaining gas: 1039990.834 units remaining) [ "Hello " @hello "test2" @parameter.elt ] - - location: 15 (remaining gas: 1039990.324 units remaining) - [ "Hello test2" ] - - location: -1 (remaining gas: 1039990.254 units remaining) + - location: 15 (remaining gas: 1039990.754 units remaining) [ "Hello test2" ] - - location: 10 (remaining gas: 1039990.254 units remaining) - [ { "Hello test1" ; "Hello test2" } ] - - location: 16 (remaining gas: 1039990.114 units remaining) + - location: 16 (remaining gas: 1039990.674 units remaining) [ {} { "Hello test1" ; "Hello test2" } ] - - location: 18 (remaining gas: 1039989.974 units remaining) - [ (Pair {} { "Hello test1" ; "Hello test2" }) ] - - location: -1 (remaining gas: 1039989.904 units remaining) + - location: 18 (remaining gas: 1039990.594 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 384f4bea748d0912c6280a2d68ee4ab38ad8fd60..058113f68e680978d89454c94042f2d257a030d4 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,17 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.286 units remaining) + - location: 9 (remaining gas: 1039992.286 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039992.146 units remaining) + - location: 9 (remaining gas: 1039992.206 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039991.586 units remaining) - [ {} ] - - location: 16 (remaining gas: 1039991.446 units remaining) + - location: 16 (remaining gas: 1039991.626 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039991.306 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039991.236 units remaining) + - location: 18 (remaining gas: 1039991.546 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 c4746fa12bc150c2fccb37751b759ac1794405c9..d40338e2843b4656f6ca2804869a653ad06f60e1 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,31 +7,23 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.880 units remaining) + - location: 9 (remaining gas: 1039991.880 units remaining) [ (Pair { 0xab ; 0xcd } {}) ] - - location: 9 (remaining gas: 1039991.740 units remaining) + - location: 9 (remaining gas: 1039991.800 units remaining) [ { 0xab ; 0xcd } @parameter ] - - location: 12 (remaining gas: 1039991.016 units remaining) + - location: 12 (remaining gas: 1039991.196 units remaining) [ 0xff 0xab @parameter.elt ] - - location: 15 (remaining gas: 1039990.876 units remaining) + - location: 15 (remaining gas: 1039991.116 units remaining) [ 0xffab ] - - location: -1 (remaining gas: 1039990.806 units remaining) - [ 0xffab ] - - location: 12 (remaining gas: 1039990.666 units remaining) + - location: 12 (remaining gas: 1039991.036 units remaining) [ 0xff 0xcd @parameter.elt ] - - location: 15 (remaining gas: 1039990.526 units remaining) - [ 0xffcd ] - - location: -1 (remaining gas: 1039990.456 units remaining) + - location: 15 (remaining gas: 1039990.956 units remaining) [ 0xffcd ] - - location: 10 (remaining gas: 1039990.456 units remaining) - [ { 0xffab ; 0xffcd } ] - - location: 16 (remaining gas: 1039990.316 units remaining) + - location: 16 (remaining gas: 1039990.876 units remaining) [ {} { 0xffab ; 0xffcd } ] - - location: 18 (remaining gas: 1039990.176 units remaining) - [ (Pair {} { 0xffab ; 0xffcd }) ] - - location: -1 (remaining gas: 1039990.106 units remaining) + - location: 18 (remaining gas: 1039990.796 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 a0efb327ffb6281b52270b6833b2a83600539d34..7fff64b0db66d26b143b41e5cf3a8432d5078f57 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,24 +7,18 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.120 units remaining) + - location: 9 (remaining gas: 1039992.120 units remaining) [ (Pair { 0xcd } {}) ] - - location: 9 (remaining gas: 1039991.980 units remaining) + - location: 9 (remaining gas: 1039992.040 units remaining) [ { 0xcd } @parameter ] - - location: 12 (remaining gas: 1039991.268 units remaining) + - location: 12 (remaining gas: 1039991.448 units remaining) [ 0xff 0xcd @parameter.elt ] - - location: 15 (remaining gas: 1039991.128 units remaining) + - location: 15 (remaining gas: 1039991.368 units remaining) [ 0xffcd ] - - location: -1 (remaining gas: 1039991.058 units remaining) - [ 0xffcd ] - - location: 10 (remaining gas: 1039991.058 units remaining) - [ { 0xffcd } ] - - location: 16 (remaining gas: 1039990.918 units remaining) + - location: 16 (remaining gas: 1039991.288 units remaining) [ {} { 0xffcd } ] - - location: 18 (remaining gas: 1039990.778 units remaining) - [ (Pair {} { 0xffcd }) ] - - location: -1 (remaining gas: 1039990.708 units remaining) + - location: 18 (remaining gas: 1039991.208 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 4ebfbdde2057e5275e79d95530dec7cd4db17afb..beed536686e9b085a8204122d0a6f90611193f02 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,17 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.360 units remaining) + - location: 9 (remaining gas: 1039992.360 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039992.220 units remaining) + - location: 9 (remaining gas: 1039992.280 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039991.660 units remaining) - [ {} ] - - location: 16 (remaining gas: 1039991.520 units remaining) + - location: 16 (remaining gas: 1039991.700 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039991.380 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039991.310 units remaining) + - location: 18 (remaining gas: 1039991.620 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 a716263b9ea54c7f7410673269a42c4be2856778..d5fade4cd3b96335094f4b63f27ada30bd411b82 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,111 +7,87 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039985.686 units remaining) + - location: 8 (remaining gas: 1039985.686 units remaining) [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] - - location: 8 (remaining gas: 1039985.546 units remaining) + - location: 8 (remaining gas: 1039985.606 units remaining) [ { "Hello" ; " " ; "World" ; "!" } @parameter ] - - location: 9 (remaining gas: 1039985.406 units remaining) + - location: 9 (remaining gas: 1039985.526 units remaining) [ "" { "Hello" ; " " ; "World" ; "!" } @parameter ] - - location: 12 (remaining gas: 1039985.276 units remaining) + - location: 12 (remaining gas: 1039985.456 units remaining) [ { "Hello" ; " " ; "World" ; "!" } @parameter "" ] - - location: 15 (remaining gas: 1039984.558 units remaining) + - location: 15 (remaining gas: 1039984.858 units remaining) [ "" "Hello" @parameter.elt ] - - location: 18 (remaining gas: 1039984.258 units remaining) + - location: 16 (remaining gas: 1039984.758 units remaining) + [ "Hello" @parameter.elt ] + - location: 18 (remaining gas: 1039984.678 units remaining) [ {} "Hello" @parameter.elt ] - - location: 20 (remaining gas: 1039984.128 units remaining) + - location: 20 (remaining gas: 1039984.608 units remaining) [ "Hello" @parameter.elt {} ] - - location: 21 (remaining gas: 1039983.988 units remaining) + - location: 21 (remaining gas: 1039984.528 units remaining) [ { "Hello" } ] - - location: -1 (remaining gas: 1039983.918 units remaining) - [ { "Hello" } ] - - location: 16 (remaining gas: 1039983.918 units remaining) - [ "" - { "Hello" } ] - - location: 22 (remaining gas: 1039983.778 units remaining) + - location: 22 (remaining gas: 1039984.448 units remaining) [ { "" ; "Hello" } ] - - location: 23 (remaining gas: 1039983.598 units remaining) + - location: 23 (remaining gas: 1039984.328 units remaining) [ "Hello" ] - - location: -1 (remaining gas: 1039983.528 units remaining) - [ "Hello" ] - - location: 15 (remaining gas: 1039983.398 units remaining) + - location: 15 (remaining gas: 1039984.258 units remaining) [ "Hello" " " @parameter.elt ] - - location: 18 (remaining gas: 1039983.098 units remaining) + - location: 16 (remaining gas: 1039984.158 units remaining) + [ " " @parameter.elt ] + - location: 18 (remaining gas: 1039984.078 units remaining) [ {} " " @parameter.elt ] - - location: 20 (remaining gas: 1039982.968 units remaining) + - location: 20 (remaining gas: 1039984.008 units remaining) [ " " @parameter.elt {} ] - - location: 21 (remaining gas: 1039982.828 units remaining) - [ { " " } ] - - location: -1 (remaining gas: 1039982.758 units remaining) + - location: 21 (remaining gas: 1039983.928 units remaining) [ { " " } ] - - location: 16 (remaining gas: 1039982.758 units remaining) - [ "Hello" - { " " } ] - - location: 22 (remaining gas: 1039982.618 units remaining) + - location: 22 (remaining gas: 1039983.848 units remaining) [ { "Hello" ; " " } ] - - location: 23 (remaining gas: 1039982.438 units remaining) - [ "Hello " ] - - location: -1 (remaining gas: 1039982.368 units remaining) + - location: 23 (remaining gas: 1039983.728 units remaining) [ "Hello " ] - - location: 15 (remaining gas: 1039982.238 units remaining) + - location: 15 (remaining gas: 1039983.658 units remaining) [ "Hello " "World" @parameter.elt ] - - location: 18 (remaining gas: 1039981.938 units remaining) + - location: 16 (remaining gas: 1039983.558 units remaining) + [ "World" @parameter.elt ] + - location: 18 (remaining gas: 1039983.478 units remaining) [ {} "World" @parameter.elt ] - - location: 20 (remaining gas: 1039981.808 units remaining) + - location: 20 (remaining gas: 1039983.408 units remaining) [ "World" @parameter.elt {} ] - - location: 21 (remaining gas: 1039981.668 units remaining) - [ { "World" } ] - - location: -1 (remaining gas: 1039981.598 units remaining) + - location: 21 (remaining gas: 1039983.328 units remaining) [ { "World" } ] - - location: 16 (remaining gas: 1039981.598 units remaining) - [ "Hello " - { "World" } ] - - location: 22 (remaining gas: 1039981.458 units remaining) + - location: 22 (remaining gas: 1039983.248 units remaining) [ { "Hello " ; "World" } ] - - location: 23 (remaining gas: 1039981.277 units remaining) - [ "Hello World" ] - - location: -1 (remaining gas: 1039981.207 units remaining) + - location: 23 (remaining gas: 1039983.127 units remaining) [ "Hello World" ] - - location: 15 (remaining gas: 1039981.077 units remaining) + - location: 15 (remaining gas: 1039983.057 units remaining) [ "Hello World" "!" @parameter.elt ] - - location: 18 (remaining gas: 1039980.777 units remaining) + - location: 16 (remaining gas: 1039982.957 units remaining) + [ "!" @parameter.elt ] + - location: 18 (remaining gas: 1039982.877 units remaining) [ {} "!" @parameter.elt ] - - location: 20 (remaining gas: 1039980.647 units remaining) + - location: 20 (remaining gas: 1039982.807 units remaining) [ "!" @parameter.elt {} ] - - location: 21 (remaining gas: 1039980.507 units remaining) + - location: 21 (remaining gas: 1039982.727 units remaining) [ { "!" } ] - - location: -1 (remaining gas: 1039980.437 units remaining) - [ { "!" } ] - - location: 16 (remaining gas: 1039980.437 units remaining) - [ "Hello World" - { "!" } ] - - location: 22 (remaining gas: 1039980.297 units remaining) + - location: 22 (remaining gas: 1039982.647 units remaining) [ { "Hello World" ; "!" } ] - - location: 23 (remaining gas: 1039980.116 units remaining) + - location: 23 (remaining gas: 1039982.526 units remaining) [ "Hello World!" ] - - location: -1 (remaining gas: 1039980.046 units remaining) - [ "Hello World!" ] - - location: 13 (remaining gas: 1039980.046 units remaining) - [ "Hello World!" ] - - location: 24 (remaining gas: 1039979.906 units remaining) + - location: 24 (remaining gas: 1039982.446 units remaining) [ {} "Hello World!" ] - - location: 26 (remaining gas: 1039979.766 units remaining) - [ (Pair {} "Hello World!") ] - - location: -1 (remaining gas: 1039979.696 units remaining) + - location: 26 (remaining gas: 1039982.366 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 fc1a651bf85f89e0387c8985f9479a115bf08671..630ab5458dbae48b05949c9265844ef7993f874e 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,89 +7,70 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039986.030 units remaining) + - location: 8 (remaining gas: 1039986.030 units remaining) [ (Pair { "a" ; "b" ; "c" } "") ] - - location: 8 (remaining gas: 1039985.890 units remaining) + - location: 8 (remaining gas: 1039985.950 units remaining) [ { "a" ; "b" ; "c" } @parameter ] - - location: 9 (remaining gas: 1039985.750 units remaining) + - location: 9 (remaining gas: 1039985.870 units remaining) [ "" { "a" ; "b" ; "c" } @parameter ] - - location: 12 (remaining gas: 1039985.620 units remaining) + - location: 12 (remaining gas: 1039985.800 units remaining) [ { "a" ; "b" ; "c" } @parameter "" ] - - location: 15 (remaining gas: 1039984.909 units remaining) + - location: 15 (remaining gas: 1039985.209 units remaining) [ "" "a" @parameter.elt ] - - location: 18 (remaining gas: 1039984.609 units remaining) + - location: 16 (remaining gas: 1039985.109 units remaining) + [ "a" @parameter.elt ] + - location: 18 (remaining gas: 1039985.029 units remaining) [ {} "a" @parameter.elt ] - - location: 20 (remaining gas: 1039984.479 units remaining) + - location: 20 (remaining gas: 1039984.959 units remaining) [ "a" @parameter.elt {} ] - - location: 21 (remaining gas: 1039984.339 units remaining) + - location: 21 (remaining gas: 1039984.879 units remaining) [ { "a" } ] - - location: -1 (remaining gas: 1039984.269 units remaining) - [ { "a" } ] - - location: 16 (remaining gas: 1039984.269 units remaining) - [ "" - { "a" } ] - - location: 22 (remaining gas: 1039984.129 units remaining) + - location: 22 (remaining gas: 1039984.799 units remaining) [ { "" ; "a" } ] - - location: 23 (remaining gas: 1039983.949 units remaining) - [ "a" ] - - location: -1 (remaining gas: 1039983.879 units remaining) + - location: 23 (remaining gas: 1039984.679 units remaining) [ "a" ] - - location: 15 (remaining gas: 1039983.749 units remaining) + - location: 15 (remaining gas: 1039984.609 units remaining) [ "a" "b" @parameter.elt ] - - location: 18 (remaining gas: 1039983.449 units remaining) + - location: 16 (remaining gas: 1039984.509 units remaining) + [ "b" @parameter.elt ] + - location: 18 (remaining gas: 1039984.429 units remaining) [ {} "b" @parameter.elt ] - - location: 20 (remaining gas: 1039983.319 units remaining) + - location: 20 (remaining gas: 1039984.359 units remaining) [ "b" @parameter.elt {} ] - - location: 21 (remaining gas: 1039983.179 units remaining) + - location: 21 (remaining gas: 1039984.279 units remaining) [ { "b" } ] - - location: -1 (remaining gas: 1039983.109 units remaining) - [ { "b" } ] - - location: 16 (remaining gas: 1039983.109 units remaining) - [ "a" - { "b" } ] - - location: 22 (remaining gas: 1039982.969 units remaining) + - location: 22 (remaining gas: 1039984.199 units remaining) [ { "a" ; "b" } ] - - location: 23 (remaining gas: 1039982.789 units remaining) - [ "ab" ] - - location: -1 (remaining gas: 1039982.719 units remaining) + - location: 23 (remaining gas: 1039984.079 units remaining) [ "ab" ] - - location: 15 (remaining gas: 1039982.589 units remaining) + - location: 15 (remaining gas: 1039984.009 units remaining) [ "ab" "c" @parameter.elt ] - - location: 18 (remaining gas: 1039982.289 units remaining) + - location: 16 (remaining gas: 1039983.909 units remaining) + [ "c" @parameter.elt ] + - location: 18 (remaining gas: 1039983.829 units remaining) [ {} "c" @parameter.elt ] - - location: 20 (remaining gas: 1039982.159 units remaining) + - location: 20 (remaining gas: 1039983.759 units remaining) [ "c" @parameter.elt {} ] - - location: 21 (remaining gas: 1039982.019 units remaining) + - location: 21 (remaining gas: 1039983.679 units remaining) [ { "c" } ] - - location: -1 (remaining gas: 1039981.949 units remaining) - [ { "c" } ] - - location: 16 (remaining gas: 1039981.949 units remaining) - [ "ab" - { "c" } ] - - location: 22 (remaining gas: 1039981.809 units remaining) + - location: 22 (remaining gas: 1039983.599 units remaining) [ { "ab" ; "c" } ] - - location: 23 (remaining gas: 1039981.629 units remaining) - [ "abc" ] - - location: -1 (remaining gas: 1039981.559 units remaining) + - location: 23 (remaining gas: 1039983.479 units remaining) [ "abc" ] - - location: 13 (remaining gas: 1039981.559 units remaining) - [ "abc" ] - - location: 24 (remaining gas: 1039981.419 units remaining) + - location: 24 (remaining gas: 1039983.399 units remaining) [ {} "abc" ] - - location: 26 (remaining gas: 1039981.279 units remaining) - [ (Pair {} "abc") ] - - location: -1 (remaining gas: 1039981.209 units remaining) + - location: 26 (remaining gas: 1039983.319 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 d0275dfeb131d79ac650cf86ddd72ec9ec12247f..09e89302c648e60169a6a4f01f34ef599ce78328 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,23 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039986.822 units remaining) + - location: 8 (remaining gas: 1039986.822 units remaining) [ (Pair {} "") ] - - location: 8 (remaining gas: 1039986.682 units remaining) + - location: 8 (remaining gas: 1039986.742 units remaining) [ {} @parameter ] - - location: 9 (remaining gas: 1039986.542 units remaining) + - location: 9 (remaining gas: 1039986.662 units remaining) [ "" {} @parameter ] - - location: 12 (remaining gas: 1039986.412 units remaining) + - location: 12 (remaining gas: 1039986.592 units remaining) [ {} @parameter "" ] - - location: 13 (remaining gas: 1039985.852 units remaining) - [ "" ] - - location: 24 (remaining gas: 1039985.712 units remaining) + - location: 24 (remaining gas: 1039986.012 units remaining) [ {} "" ] - - location: 26 (remaining gas: 1039985.572 units remaining) - [ (Pair {} "") ] - - location: -1 (remaining gas: 1039985.502 units remaining) + - location: 26 (remaining gas: 1039985.932 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 75bd2d37bf2f0b9d599c8c11a955a14c12142c10..21003d81318d9f5c55c55177641aa49383ac9f6f 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.830 units remaining) + - location: 8 (remaining gas: 1039993.830 units remaining) [ (Pair 99 { -5 ; 10 }) ] - - location: 8 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.750 units remaining) [ 99 @parameter { -5 ; 10 } @storage ] - - location: 9 (remaining gas: 1039993.550 units remaining) + - location: 9 (remaining gas: 1039993.670 units remaining) [ { 99 ; -5 ; 10 } ] - - location: 10 (remaining gas: 1039993.410 units remaining) + - location: 10 (remaining gas: 1039993.590 units remaining) [ {} { 99 ; -5 ; 10 } ] - - location: 12 (remaining gas: 1039993.270 units remaining) - [ (Pair {} { 99 ; -5 ; 10 }) ] - - location: -1 (remaining gas: 1039993.200 units remaining) + - location: 12 (remaining gas: 1039993.510 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 286853d7c31c9b85aef20bb1c9ee224c6682cddd..22895593e2a25b168ddaf9b4dd34148892861f8d 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.070 units remaining) + - location: 8 (remaining gas: 1039994.070 units remaining) [ (Pair -5 { 10 }) ] - - location: 8 (remaining gas: 1039993.930 units remaining) + - location: 8 (remaining gas: 1039993.990 units remaining) [ -5 @parameter { 10 } @storage ] - - location: 9 (remaining gas: 1039993.790 units remaining) + - location: 9 (remaining gas: 1039993.910 units remaining) [ { -5 ; 10 } ] - - location: 10 (remaining gas: 1039993.650 units remaining) + - location: 10 (remaining gas: 1039993.830 units remaining) [ {} { -5 ; 10 } ] - - location: 12 (remaining gas: 1039993.510 units remaining) - [ (Pair {} { -5 ; 10 }) ] - - location: -1 (remaining gas: 1039993.440 units remaining) + - location: 12 (remaining gas: 1039993.750 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 81361e78b4fec1263e87254bcab1de6f4b70825e..8c12809ab2fe371217fce55b9d8fe6024d4cd31b 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,18 +7,16 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.310 units remaining) + - location: 8 (remaining gas: 1039994.310 units remaining) [ (Pair 10 {}) ] - - location: 8 (remaining gas: 1039994.170 units remaining) + - location: 8 (remaining gas: 1039994.230 units remaining) [ 10 @parameter {} @storage ] - - location: 9 (remaining gas: 1039994.030 units remaining) + - location: 9 (remaining gas: 1039994.150 units remaining) [ { 10 } ] - - location: 10 (remaining gas: 1039993.890 units remaining) + - location: 10 (remaining gas: 1039994.070 units remaining) [ {} { 10 } ] - - location: 12 (remaining gas: 1039993.750 units remaining) - [ (Pair {} { 10 }) ] - - location: -1 (remaining gas: 1039993.680 units remaining) + - location: 12 (remaining gas: 1039993.990 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 d5085a2096199261b1e39e2405efe7c7c7c4f6f8..9d0e0b5fc1974c4de779ac48b6635e89ed5c717c 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,166 +7,129 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039956.652 units remaining) + - location: 12 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "A" } { "B" }) None) ] - - location: 12 (remaining gas: 1039956.512 units remaining) + - location: 12 (remaining gas: 1039956.572 units remaining) [ (Pair { "A" } { "B" }) @parameter ] - - location: 13 (remaining gas: 1039956.372 units remaining) + - location: 13 (remaining gas: 1039956.492 units remaining) [ (Pair { "A" } { "B" }) @parameter (Pair { "A" } { "B" }) @parameter ] - - location: 14 (remaining gas: 1039956.232 units remaining) + - location: 14 (remaining gas: 1039956.412 units remaining) [ { "A" } (Pair { "A" } { "B" }) @parameter ] - - location: 17 (remaining gas: 1039955.932 units remaining) - [ { "B" } ] - - location: 16 (remaining gas: 1039955.862 units remaining) + - location: 15 (remaining gas: 1039956.312 units remaining) + [ (Pair { "A" } { "B" }) @parameter ] + - location: 17 (remaining gas: 1039956.232 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039955.862 units remaining) - [ { "A" } - { "B" } ] - - location: 18 (remaining gas: 1039955.562 units remaining) + - location: 18 (remaining gas: 1039955.992 units remaining) [ {} { "A" } { "B" } ] - - location: 20 (remaining gas: 1039955.432 units remaining) + - location: 20 (remaining gas: 1039955.922 units remaining) [ { "A" } {} { "B" } ] - - location: 23 (remaining gas: 1039954.725 units remaining) + - location: 23 (remaining gas: 1039955.335 units remaining) [ (Pair "A" {}) { "B" } ] - - location: 24 (remaining gas: 1039954.585 units remaining) + - location: 24 (remaining gas: 1039955.255 units remaining) [ (Pair "A" {}) (Pair "A" {}) { "B" } ] - - location: 25 (remaining gas: 1039954.445 units remaining) + - location: 25 (remaining gas: 1039955.175 units remaining) [ "A" @elt (Pair "A" {}) { "B" } ] - - location: 28 (remaining gas: 1039954.145 units remaining) - [ {} + - location: 26 (remaining gas: 1039955.075 units remaining) + [ (Pair "A" {}) { "B" } ] - - location: 27 (remaining gas: 1039954.075 units remaining) + - location: 28 (remaining gas: 1039954.995 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039954.075 units remaining) - [ "A" @elt - {} - { "B" } ] - - location: 29 (remaining gas: 1039953.935 units remaining) + - location: 29 (remaining gas: 1039954.915 units remaining) [ True "A" @elt {} { "B" } ] - - location: 32 (remaining gas: 1039953.805 units remaining) + - location: 32 (remaining gas: 1039954.845 units remaining) [ "A" @elt True {} { "B" } ] - - location: 33 (remaining gas: 1039953.665 units remaining) - [ { "A" } - { "B" } ] - - location: -1 (remaining gas: 1039953.595 units remaining) - [ { "A" } - { "B" } ] - - location: 21 (remaining gas: 1039953.595 units remaining) + - location: 33 (remaining gas: 1039954.765 units remaining) [ { "A" } { "B" } ] - - location: 34 (remaining gas: 1039953.455 units remaining) + - location: 34 (remaining gas: 1039954.685 units remaining) [ True { "A" } { "B" } ] - - location: 37 (remaining gas: 1039953.325 units remaining) + - location: 37 (remaining gas: 1039954.615 units remaining) [ { "A" } True { "B" } ] - - location: 38 (remaining gas: 1039953.185 units remaining) + - location: 38 (remaining gas: 1039954.535 units remaining) [ (Pair { "A" } True) { "B" } ] - - location: 39 (remaining gas: 1039953.055 units remaining) + - location: 39 (remaining gas: 1039954.465 units remaining) [ { "B" } (Pair { "A" } True) ] - - location: 42 (remaining gas: 1039952.348 units remaining) + - location: 42 (remaining gas: 1039953.878 units remaining) [ (Pair "B" { "A" } True) ] - - location: 43 (remaining gas: 1039952.208 units remaining) + - location: 43 (remaining gas: 1039953.798 units remaining) [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 44 (remaining gas: 1039952.068 units remaining) + - location: 44 (remaining gas: 1039953.718 units remaining) [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 45 (remaining gas: 1039951.928 units remaining) + - location: 45 (remaining gas: 1039953.638 units remaining) [ "B" @elt (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 49 (remaining gas: 1039951.568 units remaining) - [ (Pair { "A" } True) + - location: 46 (remaining gas: 1039953.538 units remaining) + [ (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - - location: 50 (remaining gas: 1039951.428 units remaining) - [ { "A" } + - location: 49 (remaining gas: 1039953.458 units remaining) + [ (Pair { "A" } True) (Pair "B" { "A" } True) ] - - location: -1 (remaining gas: 1039951.358 units remaining) + - location: 50 (remaining gas: 1039953.378 units remaining) [ { "A" } (Pair "B" { "A" } True) ] - - location: 54 (remaining gas: 1039950.998 units remaining) + - location: 51 (remaining gas: 1039953.278 units remaining) + [ (Pair "B" { "A" } True) ] + - location: 54 (remaining gas: 1039953.198 units remaining) [ (Pair { "A" } True) ] - - location: 55 (remaining gas: 1039950.858 units remaining) - [ True ] - - location: -1 (remaining gas: 1039950.788 units remaining) - [ True ] - - location: 52 (remaining gas: 1039950.718 units remaining) + - location: 55 (remaining gas: 1039953.118 units remaining) [ True ] - - location: 51 (remaining gas: 1039950.718 units remaining) - [ { "A" } - True ] - - location: 56 (remaining gas: 1039950.578 units remaining) - [ { "A" } - { "A" } - True ] - - location: -1 (remaining gas: 1039950.508 units remaining) + - location: 56 (remaining gas: 1039953.038 units remaining) [ { "A" } { "A" } True ] - - location: 46 (remaining gas: 1039950.508 units remaining) - [ "B" @elt - { "A" } - { "A" } - True ] - - location: 57 (remaining gas: 1039950.368 units remaining) + - location: 57 (remaining gas: 1039952.958 units remaining) [ False { "A" } True ] - - location: 60 (remaining gas: 1039950.078 units remaining) - [ True - { "A" } ] - - location: 59 (remaining gas: 1039950.008 units remaining) + - location: 58 (remaining gas: 1039952.858 units remaining) + [ { "A" } + True ] + - location: 60 (remaining gas: 1039952.788 units remaining) [ True { "A" } ] - - location: 58 (remaining gas: 1039950.008 units remaining) + - location: 61 (remaining gas: 1039952.688 units remaining) [ False - True { "A" } ] - - location: 61 (remaining gas: 1039949.848 units remaining) - [ False - { "A" } ] - - location: 62 (remaining gas: 1039949.718 units remaining) + - location: 62 (remaining gas: 1039952.618 units remaining) [ { "A" } False ] - - location: 63 (remaining gas: 1039949.578 units remaining) - [ (Pair { "A" } False) ] - - location: -1 (remaining gas: 1039949.508 units remaining) + - location: 63 (remaining gas: 1039952.538 units remaining) [ (Pair { "A" } False) ] - - location: 40 (remaining gas: 1039949.508 units remaining) - [ (Pair { "A" } False) ] - - location: 64 (remaining gas: 1039949.368 units remaining) + - location: 64 (remaining gas: 1039952.458 units remaining) [ False ] - - location: 65 (remaining gas: 1039949.228 units remaining) + - location: 65 (remaining gas: 1039952.378 units remaining) [ (Some False) ] - - location: 66 (remaining gas: 1039949.088 units remaining) + - location: 66 (remaining gas: 1039952.298 units remaining) [ {} (Some False) ] - - location: 68 (remaining gas: 1039948.948 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039948.878 units remaining) + - location: 68 (remaining gas: 1039952.218 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 311ee147dfe42c137cdcb4e71bd68feceae26eb4..e76c4c23bff82284f01eeabdfb6c92df030fa61d 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,417 +7,319 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039955.272 units remaining) + - location: 12 (remaining gas: 1039955.272 units remaining) [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] - - location: 12 (remaining gas: 1039955.132 units remaining) + - location: 12 (remaining gas: 1039955.192 units remaining) [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] - - location: 13 (remaining gas: 1039954.992 units remaining) + - location: 13 (remaining gas: 1039955.112 units remaining) [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] - - location: 14 (remaining gas: 1039954.852 units remaining) + - location: 14 (remaining gas: 1039955.032 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] - - location: 17 (remaining gas: 1039954.552 units remaining) - [ { "B" ; "C" ; "asdf" } ] - - location: 16 (remaining gas: 1039954.482 units remaining) + - location: 15 (remaining gas: 1039954.932 units remaining) + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + - location: 17 (remaining gas: 1039954.852 units remaining) [ { "B" ; "C" ; "asdf" } ] - - location: 15 (remaining gas: 1039954.482 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } - { "B" ; "C" ; "asdf" } ] - - location: 18 (remaining gas: 1039954.182 units remaining) + - location: 18 (remaining gas: 1039954.612 units remaining) [ {} { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" } ] - - location: 20 (remaining gas: 1039954.052 units remaining) + - location: 20 (remaining gas: 1039954.542 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } {} { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039953.324 units remaining) + - location: 23 (remaining gas: 1039953.934 units remaining) [ (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039953.184 units remaining) + - location: 24 (remaining gas: 1039953.854 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039953.044 units remaining) + - location: 25 (remaining gas: 1039953.774 units remaining) [ "B" @elt (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039952.744 units remaining) - [ {} + - location: 26 (remaining gas: 1039953.674 units remaining) + [ (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - - location: 27 (remaining gas: 1039952.674 units remaining) + - location: 28 (remaining gas: 1039953.594 units remaining) [ {} { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039952.674 units remaining) - [ "B" @elt - {} - { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039952.534 units remaining) + - location: 29 (remaining gas: 1039953.514 units remaining) [ True "B" @elt {} { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039952.404 units remaining) + - location: 32 (remaining gas: 1039953.444 units remaining) [ "B" @elt True {} { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039952.264 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] - - location: -1 (remaining gas: 1039952.194 units remaining) + - location: 33 (remaining gas: 1039953.364 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039952.054 units remaining) + - location: 23 (remaining gas: 1039953.284 units remaining) [ (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039951.914 units remaining) + - location: 24 (remaining gas: 1039953.204 units remaining) [ (Pair "B" { "B" }) (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039951.774 units remaining) + - location: 25 (remaining gas: 1039953.124 units remaining) [ "B" @elt (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039951.474 units remaining) - [ { "B" } + - location: 26 (remaining gas: 1039953.024 units remaining) + [ (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 27 (remaining gas: 1039951.404 units remaining) + - location: 28 (remaining gas: 1039952.944 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039951.404 units remaining) - [ "B" @elt - { "B" } - { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039951.264 units remaining) + - location: 29 (remaining gas: 1039952.864 units remaining) [ True "B" @elt { "B" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039951.134 units remaining) + - location: 32 (remaining gas: 1039952.794 units remaining) [ "B" @elt True { "B" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039950.994 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] - - location: -1 (remaining gas: 1039950.924 units remaining) + - location: 33 (remaining gas: 1039952.714 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039950.784 units remaining) + - location: 23 (remaining gas: 1039952.634 units remaining) [ (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039950.644 units remaining) + - location: 24 (remaining gas: 1039952.554 units remaining) [ (Pair "asdf" { "B" }) (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039950.504 units remaining) + - location: 25 (remaining gas: 1039952.474 units remaining) [ "asdf" @elt (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039950.204 units remaining) - [ { "B" } + - location: 26 (remaining gas: 1039952.374 units remaining) + [ (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - - location: 27 (remaining gas: 1039950.134 units remaining) + - location: 28 (remaining gas: 1039952.294 units remaining) [ { "B" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039950.134 units remaining) - [ "asdf" @elt - { "B" } - { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039949.994 units remaining) + - location: 29 (remaining gas: 1039952.214 units remaining) [ True "asdf" @elt { "B" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039949.864 units remaining) + - location: 32 (remaining gas: 1039952.144 units remaining) [ "asdf" @elt True { "B" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039949.723 units remaining) - [ { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] - - location: -1 (remaining gas: 1039949.653 units remaining) + - location: 33 (remaining gas: 1039952.063 units remaining) [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 23 (remaining gas: 1039949.513 units remaining) + - location: 23 (remaining gas: 1039951.983 units remaining) [ (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 24 (remaining gas: 1039949.373 units remaining) + - location: 24 (remaining gas: 1039951.903 units remaining) [ (Pair "C" { "B" ; "asdf" }) (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 25 (remaining gas: 1039949.233 units remaining) + - location: 25 (remaining gas: 1039951.823 units remaining) [ "C" @elt (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 28 (remaining gas: 1039948.933 units remaining) - [ { "B" ; "asdf" } + - location: 26 (remaining gas: 1039951.723 units remaining) + [ (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - - location: 27 (remaining gas: 1039948.863 units remaining) + - location: 28 (remaining gas: 1039951.643 units remaining) [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 26 (remaining gas: 1039948.863 units remaining) - [ "C" @elt - { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] - - location: 29 (remaining gas: 1039948.723 units remaining) + - location: 29 (remaining gas: 1039951.563 units remaining) [ True "C" @elt { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 32 (remaining gas: 1039948.593 units remaining) + - location: 32 (remaining gas: 1039951.493 units remaining) [ "C" @elt True { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 33 (remaining gas: 1039948.453 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } ] - - location: -1 (remaining gas: 1039948.383 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } ] - - location: 21 (remaining gas: 1039948.383 units remaining) + - location: 33 (remaining gas: 1039951.413 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 34 (remaining gas: 1039948.243 units remaining) + - location: 34 (remaining gas: 1039951.333 units remaining) [ True { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } ] - - location: 37 (remaining gas: 1039948.113 units remaining) + - location: 37 (remaining gas: 1039951.263 units remaining) [ { "B" ; "C" ; "asdf" } True { "B" ; "C" ; "asdf" } ] - - location: 38 (remaining gas: 1039947.973 units remaining) + - location: 38 (remaining gas: 1039951.183 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) { "B" ; "C" ; "asdf" } ] - - location: 39 (remaining gas: 1039947.843 units remaining) + - location: 39 (remaining gas: 1039951.113 units remaining) [ { "B" ; "C" ; "asdf" } (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039947.122 units remaining) + - location: 42 (remaining gas: 1039950.512 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039946.982 units remaining) + - location: 43 (remaining gas: 1039950.432 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039946.842 units remaining) + - location: 44 (remaining gas: 1039950.352 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039946.702 units remaining) + - location: 45 (remaining gas: 1039950.272 units remaining) [ "B" @elt (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039946.342 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039950.172 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039946.202 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039950.092 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039946.132 units remaining) + - location: 50 (remaining gas: 1039950.012 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039945.772 units remaining) + - location: 51 (remaining gas: 1039949.912 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039949.832 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039945.632 units remaining) - [ True ] - - location: -1 (remaining gas: 1039945.562 units remaining) - [ True ] - - location: 52 (remaining gas: 1039945.492 units remaining) + - location: 55 (remaining gas: 1039949.752 units remaining) [ True ] - - location: 51 (remaining gas: 1039945.492 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039945.352 units remaining) + - location: 56 (remaining gas: 1039949.672 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: -1 (remaining gas: 1039945.282 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 46 (remaining gas: 1039945.282 units remaining) - [ "B" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039945.142 units remaining) + - location: 57 (remaining gas: 1039949.592 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039944.852 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039944.782 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039944.782 units remaining) + - location: 58 (remaining gas: 1039949.492 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039949.422 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039944.622 units remaining) + - location: 61 (remaining gas: 1039949.322 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039944.492 units remaining) + - location: 62 (remaining gas: 1039949.252 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039944.352 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039944.282 units remaining) + - location: 63 (remaining gas: 1039949.172 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039944.142 units remaining) + - location: 42 (remaining gas: 1039949.092 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039944.002 units remaining) + - location: 43 (remaining gas: 1039949.012 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039943.862 units remaining) + - location: 44 (remaining gas: 1039948.932 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039943.722 units remaining) + - location: 45 (remaining gas: 1039948.852 units remaining) [ "C" @elt (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039943.362 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039948.752 units remaining) + [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039943.222 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039948.672 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039943.152 units remaining) + - location: 50 (remaining gas: 1039948.592 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039942.792 units remaining) + - location: 51 (remaining gas: 1039948.492 units remaining) + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039948.412 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039942.652 units remaining) - [ True ] - - location: -1 (remaining gas: 1039942.582 units remaining) - [ True ] - - location: 52 (remaining gas: 1039942.512 units remaining) + - location: 55 (remaining gas: 1039948.332 units remaining) [ True ] - - location: 51 (remaining gas: 1039942.512 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039942.372 units remaining) + - location: 56 (remaining gas: 1039948.252 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: -1 (remaining gas: 1039942.302 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 46 (remaining gas: 1039942.302 units remaining) - [ "C" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039942.162 units remaining) + - location: 57 (remaining gas: 1039948.172 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039941.872 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039941.802 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039941.802 units remaining) + - location: 58 (remaining gas: 1039948.072 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039948.002 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039941.642 units remaining) + - location: 61 (remaining gas: 1039947.902 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039941.512 units remaining) + - location: 62 (remaining gas: 1039947.832 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039941.372 units remaining) + - location: 63 (remaining gas: 1039947.752 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039941.302 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039941.162 units remaining) + - location: 42 (remaining gas: 1039947.672 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039941.022 units remaining) + - location: 43 (remaining gas: 1039947.592 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039940.882 units remaining) + - location: 44 (remaining gas: 1039947.512 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039940.742 units remaining) + - location: 45 (remaining gas: 1039947.432 units remaining) [ "asdf" @elt (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039940.382 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039947.332 units remaining) + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039940.242 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039947.252 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039940.172 units remaining) + - location: 50 (remaining gas: 1039947.172 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039939.812 units remaining) + - location: 51 (remaining gas: 1039947.072 units remaining) + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039946.992 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039939.672 units remaining) - [ True ] - - location: -1 (remaining gas: 1039939.602 units remaining) + - location: 55 (remaining gas: 1039946.912 units remaining) [ True ] - - location: 52 (remaining gas: 1039939.532 units remaining) - [ True ] - - location: 51 (remaining gas: 1039939.532 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039939.392 units remaining) + - location: 56 (remaining gas: 1039946.832 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: -1 (remaining gas: 1039939.322 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 46 (remaining gas: 1039939.322 units remaining) - [ "asdf" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039939.182 units remaining) + - location: 57 (remaining gas: 1039946.752 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039938.892 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039938.822 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039938.822 units remaining) + - location: 58 (remaining gas: 1039946.652 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039946.582 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039938.662 units remaining) + - location: 61 (remaining gas: 1039946.482 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039938.532 units remaining) + - location: 62 (remaining gas: 1039946.412 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039938.392 units remaining) + - location: 63 (remaining gas: 1039946.332 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039938.322 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039938.322 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 64 (remaining gas: 1039938.182 units remaining) + - location: 64 (remaining gas: 1039946.252 units remaining) [ True ] - - location: 65 (remaining gas: 1039938.042 units remaining) + - location: 65 (remaining gas: 1039946.172 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039937.902 units remaining) + - location: 66 (remaining gas: 1039946.092 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039937.762 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039937.692 units remaining) + - location: 68 (remaining gas: 1039946.012 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 e14e4235136941a647928acf273479080ebcbf0f..5c3acf6e42a4501cbbb313166dc7e724852a37d4 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,450 +7,339 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039955.272 units remaining) + - location: 12 (remaining gas: 1039955.272 units remaining) [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] - - location: 12 (remaining gas: 1039955.132 units remaining) + - location: 12 (remaining gas: 1039955.192 units remaining) [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] - - location: 13 (remaining gas: 1039954.992 units remaining) + - location: 13 (remaining gas: 1039955.112 units remaining) [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] - - location: 14 (remaining gas: 1039954.852 units remaining) + - location: 14 (remaining gas: 1039955.032 units remaining) [ { "B" ; "C" ; "asdf" } (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] - - location: 17 (remaining gas: 1039954.552 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } ] - - location: 16 (remaining gas: 1039954.482 units remaining) + - location: 15 (remaining gas: 1039954.932 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + - location: 17 (remaining gas: 1039954.852 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } ] - - location: 15 (remaining gas: 1039954.482 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 18 (remaining gas: 1039954.182 units remaining) + - location: 18 (remaining gas: 1039954.612 units remaining) [ {} { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 20 (remaining gas: 1039954.052 units remaining) + - location: 20 (remaining gas: 1039954.542 units remaining) [ { "B" ; "C" ; "asdf" } {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039953.331 units remaining) + - location: 23 (remaining gas: 1039953.941 units remaining) [ (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039953.191 units remaining) + - location: 24 (remaining gas: 1039953.861 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039953.051 units remaining) + - location: 25 (remaining gas: 1039953.781 units remaining) [ "B" @elt (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039952.751 units remaining) - [ {} + - location: 26 (remaining gas: 1039953.681 units remaining) + [ (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 27 (remaining gas: 1039952.681 units remaining) + - location: 28 (remaining gas: 1039953.601 units remaining) [ {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039952.681 units remaining) - [ "B" @elt - {} - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039952.541 units remaining) + - location: 29 (remaining gas: 1039953.521 units remaining) [ True "B" @elt {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039952.411 units remaining) + - location: 32 (remaining gas: 1039953.451 units remaining) [ "B" @elt True {} { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039952.271 units remaining) - [ { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: -1 (remaining gas: 1039952.201 units remaining) + - location: 33 (remaining gas: 1039953.371 units remaining) [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039952.061 units remaining) + - location: 23 (remaining gas: 1039953.291 units remaining) [ (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039951.921 units remaining) + - location: 24 (remaining gas: 1039953.211 units remaining) [ (Pair "C" { "B" }) (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039951.781 units remaining) + - location: 25 (remaining gas: 1039953.131 units remaining) [ "C" @elt (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039951.481 units remaining) - [ { "B" } + - location: 26 (remaining gas: 1039953.031 units remaining) + [ (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 27 (remaining gas: 1039951.411 units remaining) + - location: 28 (remaining gas: 1039952.951 units remaining) [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039951.411 units remaining) - [ "C" @elt - { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039951.271 units remaining) + - location: 29 (remaining gas: 1039952.871 units remaining) [ True "C" @elt { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039951.141 units remaining) + - location: 32 (remaining gas: 1039952.801 units remaining) [ "C" @elt True { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039951.001 units remaining) + - location: 33 (remaining gas: 1039952.721 units remaining) [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: -1 (remaining gas: 1039950.931 units remaining) - [ { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 23 (remaining gas: 1039950.791 units remaining) + - location: 23 (remaining gas: 1039952.641 units remaining) [ (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 24 (remaining gas: 1039950.651 units remaining) + - location: 24 (remaining gas: 1039952.561 units remaining) [ (Pair "asdf" { "B" ; "C" }) (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 25 (remaining gas: 1039950.511 units remaining) + - location: 25 (remaining gas: 1039952.481 units remaining) [ "asdf" @elt (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 28 (remaining gas: 1039950.211 units remaining) - [ { "B" ; "C" } + - location: 26 (remaining gas: 1039952.381 units remaining) + [ (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 27 (remaining gas: 1039950.141 units remaining) + - location: 28 (remaining gas: 1039952.301 units remaining) [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 26 (remaining gas: 1039950.141 units remaining) - [ "asdf" @elt - { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 29 (remaining gas: 1039950.001 units remaining) + - location: 29 (remaining gas: 1039952.221 units remaining) [ True "asdf" @elt { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 32 (remaining gas: 1039949.871 units remaining) + - location: 32 (remaining gas: 1039952.151 units remaining) [ "asdf" @elt True { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 33 (remaining gas: 1039949.730 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: -1 (remaining gas: 1039949.660 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] - - location: 21 (remaining gas: 1039949.660 units remaining) + - location: 33 (remaining gas: 1039952.070 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 34 (remaining gas: 1039949.520 units remaining) + - location: 34 (remaining gas: 1039951.990 units remaining) [ True { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" } ] - - location: 37 (remaining gas: 1039949.390 units remaining) + - location: 37 (remaining gas: 1039951.920 units remaining) [ { "B" ; "C" ; "asdf" } True { "B" ; "B" ; "asdf" ; "C" } ] - - location: 38 (remaining gas: 1039949.250 units remaining) + - location: 38 (remaining gas: 1039951.840 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) { "B" ; "B" ; "asdf" ; "C" } ] - - location: 39 (remaining gas: 1039949.120 units remaining) + - location: 39 (remaining gas: 1039951.770 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039948.392 units remaining) + - location: 42 (remaining gas: 1039951.162 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039948.252 units remaining) + - location: 43 (remaining gas: 1039951.082 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039948.112 units remaining) + - location: 44 (remaining gas: 1039951.002 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039947.972 units remaining) + - location: 45 (remaining gas: 1039950.922 units remaining) [ "B" @elt (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039947.612 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039950.822 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039947.472 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039950.742 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039947.402 units remaining) + - location: 50 (remaining gas: 1039950.662 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039947.042 units remaining) + - location: 51 (remaining gas: 1039950.562 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039950.482 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039946.902 units remaining) + - location: 55 (remaining gas: 1039950.402 units remaining) [ True ] - - location: -1 (remaining gas: 1039946.832 units remaining) - [ True ] - - location: 52 (remaining gas: 1039946.762 units remaining) - [ True ] - - location: 51 (remaining gas: 1039946.762 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039946.622 units remaining) + - location: 56 (remaining gas: 1039950.322 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: -1 (remaining gas: 1039946.552 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 46 (remaining gas: 1039946.552 units remaining) - [ "B" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039946.412 units remaining) + - location: 57 (remaining gas: 1039950.242 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039946.122 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039946.052 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039946.052 units remaining) + - location: 58 (remaining gas: 1039950.142 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039950.072 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039945.892 units remaining) + - location: 61 (remaining gas: 1039949.972 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039945.762 units remaining) + - location: 62 (remaining gas: 1039949.902 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039945.622 units remaining) + - location: 63 (remaining gas: 1039949.822 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039945.552 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039945.412 units remaining) + - location: 42 (remaining gas: 1039949.742 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039945.272 units remaining) + - location: 43 (remaining gas: 1039949.662 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039945.132 units remaining) + - location: 44 (remaining gas: 1039949.582 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039944.992 units remaining) + - location: 45 (remaining gas: 1039949.502 units remaining) [ "B" @elt (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039944.632 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039949.402 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039944.492 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039949.322 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039944.422 units remaining) + - location: 50 (remaining gas: 1039949.242 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "B" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039944.062 units remaining) + - location: 51 (remaining gas: 1039949.142 units remaining) + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039949.062 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039943.922 units remaining) + - location: 55 (remaining gas: 1039948.982 units remaining) [ True ] - - location: -1 (remaining gas: 1039943.852 units remaining) - [ True ] - - location: 52 (remaining gas: 1039943.782 units remaining) - [ True ] - - location: 51 (remaining gas: 1039943.782 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039943.642 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: -1 (remaining gas: 1039943.572 units remaining) + - location: 56 (remaining gas: 1039948.902 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039943.572 units remaining) - [ "B" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039943.432 units remaining) + - location: 57 (remaining gas: 1039948.822 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039943.142 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039943.072 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039943.072 units remaining) + - location: 58 (remaining gas: 1039948.722 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039948.652 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039942.912 units remaining) + - location: 61 (remaining gas: 1039948.552 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039942.782 units remaining) + - location: 62 (remaining gas: 1039948.482 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039942.642 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039942.572 units remaining) + - location: 63 (remaining gas: 1039948.402 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039942.432 units remaining) + - location: 42 (remaining gas: 1039948.322 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039942.292 units remaining) + - location: 43 (remaining gas: 1039948.242 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039942.152 units remaining) + - location: 44 (remaining gas: 1039948.162 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039942.012 units remaining) + - location: 45 (remaining gas: 1039948.082 units remaining) [ "asdf" @elt (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039941.652 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039947.982 units remaining) + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039941.512 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039947.902 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039941.442 units remaining) + - location: 50 (remaining gas: 1039947.822 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039941.082 units remaining) + - location: 51 (remaining gas: 1039947.722 units remaining) + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039947.642 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039940.942 units remaining) - [ True ] - - location: -1 (remaining gas: 1039940.872 units remaining) + - location: 55 (remaining gas: 1039947.562 units remaining) [ True ] - - location: 52 (remaining gas: 1039940.802 units remaining) - [ True ] - - location: 51 (remaining gas: 1039940.802 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039940.662 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: -1 (remaining gas: 1039940.592 units remaining) + - location: 56 (remaining gas: 1039947.482 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: 46 (remaining gas: 1039940.592 units remaining) - [ "asdf" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039940.452 units remaining) + - location: 57 (remaining gas: 1039947.402 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039940.162 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039940.092 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039940.092 units remaining) + - location: 58 (remaining gas: 1039947.302 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039947.232 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039939.932 units remaining) + - location: 61 (remaining gas: 1039947.132 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039939.802 units remaining) + - location: 62 (remaining gas: 1039947.062 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039939.662 units remaining) + - location: 63 (remaining gas: 1039946.982 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039939.592 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 42 (remaining gas: 1039939.452 units remaining) + - location: 42 (remaining gas: 1039946.902 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 43 (remaining gas: 1039939.312 units remaining) + - location: 43 (remaining gas: 1039946.822 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 44 (remaining gas: 1039939.172 units remaining) + - location: 44 (remaining gas: 1039946.742 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 45 (remaining gas: 1039939.032 units remaining) + - location: 45 (remaining gas: 1039946.662 units remaining) [ "C" @elt (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 49 (remaining gas: 1039938.672 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) + - location: 46 (remaining gas: 1039946.562 units remaining) + [ (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 50 (remaining gas: 1039938.532 units remaining) - [ { "B" ; "C" ; "asdf" } + - location: 49 (remaining gas: 1039946.482 units remaining) + [ (Pair { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039938.462 units remaining) + - location: 50 (remaining gas: 1039946.402 units remaining) [ { "B" ; "C" ; "asdf" } (Pair "C" { "B" ; "C" ; "asdf" } True) ] - - location: 54 (remaining gas: 1039938.102 units remaining) + - location: 51 (remaining gas: 1039946.302 units remaining) + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + - location: 54 (remaining gas: 1039946.222 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 55 (remaining gas: 1039937.962 units remaining) - [ True ] - - location: -1 (remaining gas: 1039937.892 units remaining) - [ True ] - - location: 52 (remaining gas: 1039937.822 units remaining) + - location: 55 (remaining gas: 1039946.142 units remaining) [ True ] - - location: 51 (remaining gas: 1039937.822 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] - - location: 56 (remaining gas: 1039937.682 units remaining) + - location: 56 (remaining gas: 1039946.062 units remaining) [ { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] - - location: -1 (remaining gas: 1039937.612 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 46 (remaining gas: 1039937.612 units remaining) - [ "C" @elt - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] - - location: 57 (remaining gas: 1039937.472 units remaining) + - location: 57 (remaining gas: 1039945.982 units remaining) [ True { "B" ; "C" ; "asdf" } True ] - - location: 60 (remaining gas: 1039937.182 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 59 (remaining gas: 1039937.112 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] - - location: 58 (remaining gas: 1039937.112 units remaining) + - location: 58 (remaining gas: 1039945.882 units remaining) + [ { "B" ; "C" ; "asdf" } + True ] + - location: 60 (remaining gas: 1039945.812 units remaining) [ True - True { "B" ; "C" ; "asdf" } ] - - location: 61 (remaining gas: 1039936.952 units remaining) + - location: 61 (remaining gas: 1039945.712 units remaining) [ True { "B" ; "C" ; "asdf" } ] - - location: 62 (remaining gas: 1039936.822 units remaining) + - location: 62 (remaining gas: 1039945.642 units remaining) [ { "B" ; "C" ; "asdf" } True ] - - location: 63 (remaining gas: 1039936.682 units remaining) + - location: 63 (remaining gas: 1039945.562 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: -1 (remaining gas: 1039936.612 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 40 (remaining gas: 1039936.612 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] - - location: 64 (remaining gas: 1039936.472 units remaining) + - location: 64 (remaining gas: 1039945.482 units remaining) [ True ] - - location: 65 (remaining gas: 1039936.332 units remaining) + - location: 65 (remaining gas: 1039945.402 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039936.192 units remaining) + - location: 66 (remaining gas: 1039945.322 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039936.052 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039935.982 units remaining) + - location: 68 (remaining gas: 1039945.242 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 22a82ff63bc5b831e4bbf1f9b3e81ffc46d27dc5..8f8a5794eb011fdba8a498e73756f5a7c33c3605 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,166 +7,129 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039956.652 units remaining) + - location: 12 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "B" } { "B" }) None) ] - - location: 12 (remaining gas: 1039956.512 units remaining) + - location: 12 (remaining gas: 1039956.572 units remaining) [ (Pair { "B" } { "B" }) @parameter ] - - location: 13 (remaining gas: 1039956.372 units remaining) + - location: 13 (remaining gas: 1039956.492 units remaining) [ (Pair { "B" } { "B" }) @parameter (Pair { "B" } { "B" }) @parameter ] - - location: 14 (remaining gas: 1039956.232 units remaining) + - location: 14 (remaining gas: 1039956.412 units remaining) [ { "B" } (Pair { "B" } { "B" }) @parameter ] - - location: 17 (remaining gas: 1039955.932 units remaining) - [ { "B" } ] - - location: 16 (remaining gas: 1039955.862 units remaining) + - location: 15 (remaining gas: 1039956.312 units remaining) + [ (Pair { "B" } { "B" }) @parameter ] + - location: 17 (remaining gas: 1039956.232 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039955.862 units remaining) - [ { "B" } - { "B" } ] - - location: 18 (remaining gas: 1039955.562 units remaining) + - location: 18 (remaining gas: 1039955.992 units remaining) [ {} { "B" } { "B" } ] - - location: 20 (remaining gas: 1039955.432 units remaining) + - location: 20 (remaining gas: 1039955.922 units remaining) [ { "B" } {} { "B" } ] - - location: 23 (remaining gas: 1039954.725 units remaining) + - location: 23 (remaining gas: 1039955.335 units remaining) [ (Pair "B" {}) { "B" } ] - - location: 24 (remaining gas: 1039954.585 units remaining) + - location: 24 (remaining gas: 1039955.255 units remaining) [ (Pair "B" {}) (Pair "B" {}) { "B" } ] - - location: 25 (remaining gas: 1039954.445 units remaining) + - location: 25 (remaining gas: 1039955.175 units remaining) [ "B" @elt (Pair "B" {}) { "B" } ] - - location: 28 (remaining gas: 1039954.145 units remaining) - [ {} + - location: 26 (remaining gas: 1039955.075 units remaining) + [ (Pair "B" {}) { "B" } ] - - location: 27 (remaining gas: 1039954.075 units remaining) + - location: 28 (remaining gas: 1039954.995 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039954.075 units remaining) - [ "B" @elt - {} - { "B" } ] - - location: 29 (remaining gas: 1039953.935 units remaining) + - location: 29 (remaining gas: 1039954.915 units remaining) [ True "B" @elt {} { "B" } ] - - location: 32 (remaining gas: 1039953.805 units remaining) + - location: 32 (remaining gas: 1039954.845 units remaining) [ "B" @elt True {} { "B" } ] - - location: 33 (remaining gas: 1039953.665 units remaining) - [ { "B" } - { "B" } ] - - location: -1 (remaining gas: 1039953.595 units remaining) - [ { "B" } - { "B" } ] - - location: 21 (remaining gas: 1039953.595 units remaining) + - location: 33 (remaining gas: 1039954.765 units remaining) [ { "B" } { "B" } ] - - location: 34 (remaining gas: 1039953.455 units remaining) + - location: 34 (remaining gas: 1039954.685 units remaining) [ True { "B" } { "B" } ] - - location: 37 (remaining gas: 1039953.325 units remaining) + - location: 37 (remaining gas: 1039954.615 units remaining) [ { "B" } True { "B" } ] - - location: 38 (remaining gas: 1039953.185 units remaining) + - location: 38 (remaining gas: 1039954.535 units remaining) [ (Pair { "B" } True) { "B" } ] - - location: 39 (remaining gas: 1039953.055 units remaining) + - location: 39 (remaining gas: 1039954.465 units remaining) [ { "B" } (Pair { "B" } True) ] - - location: 42 (remaining gas: 1039952.348 units remaining) + - location: 42 (remaining gas: 1039953.878 units remaining) [ (Pair "B" { "B" } True) ] - - location: 43 (remaining gas: 1039952.208 units remaining) + - location: 43 (remaining gas: 1039953.798 units remaining) [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 44 (remaining gas: 1039952.068 units remaining) + - location: 44 (remaining gas: 1039953.718 units remaining) [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 45 (remaining gas: 1039951.928 units remaining) + - location: 45 (remaining gas: 1039953.638 units remaining) [ "B" @elt (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 49 (remaining gas: 1039951.568 units remaining) - [ (Pair { "B" } True) + - location: 46 (remaining gas: 1039953.538 units remaining) + [ (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - - location: 50 (remaining gas: 1039951.428 units remaining) - [ { "B" } + - location: 49 (remaining gas: 1039953.458 units remaining) + [ (Pair { "B" } True) (Pair "B" { "B" } True) ] - - location: -1 (remaining gas: 1039951.358 units remaining) + - location: 50 (remaining gas: 1039953.378 units remaining) [ { "B" } (Pair "B" { "B" } True) ] - - location: 54 (remaining gas: 1039950.998 units remaining) + - location: 51 (remaining gas: 1039953.278 units remaining) + [ (Pair "B" { "B" } True) ] + - location: 54 (remaining gas: 1039953.198 units remaining) [ (Pair { "B" } True) ] - - location: 55 (remaining gas: 1039950.858 units remaining) - [ True ] - - location: -1 (remaining gas: 1039950.788 units remaining) - [ True ] - - location: 52 (remaining gas: 1039950.718 units remaining) + - location: 55 (remaining gas: 1039953.118 units remaining) [ True ] - - location: 51 (remaining gas: 1039950.718 units remaining) - [ { "B" } - True ] - - location: 56 (remaining gas: 1039950.578 units remaining) - [ { "B" } - { "B" } - True ] - - location: -1 (remaining gas: 1039950.508 units remaining) + - location: 56 (remaining gas: 1039953.038 units remaining) [ { "B" } { "B" } True ] - - location: 46 (remaining gas: 1039950.508 units remaining) - [ "B" @elt - { "B" } - { "B" } - True ] - - location: 57 (remaining gas: 1039950.368 units remaining) + - location: 57 (remaining gas: 1039952.958 units remaining) [ True { "B" } True ] - - location: 60 (remaining gas: 1039950.078 units remaining) - [ True - { "B" } ] - - location: 59 (remaining gas: 1039950.008 units remaining) + - location: 58 (remaining gas: 1039952.858 units remaining) + [ { "B" } + True ] + - location: 60 (remaining gas: 1039952.788 units remaining) [ True { "B" } ] - - location: 58 (remaining gas: 1039950.008 units remaining) + - location: 61 (remaining gas: 1039952.688 units remaining) [ True - True { "B" } ] - - location: 61 (remaining gas: 1039949.848 units remaining) - [ True - { "B" } ] - - location: 62 (remaining gas: 1039949.718 units remaining) + - location: 62 (remaining gas: 1039952.618 units remaining) [ { "B" } True ] - - location: 63 (remaining gas: 1039949.578 units remaining) - [ (Pair { "B" } True) ] - - location: -1 (remaining gas: 1039949.508 units remaining) + - location: 63 (remaining gas: 1039952.538 units remaining) [ (Pair { "B" } True) ] - - location: 40 (remaining gas: 1039949.508 units remaining) - [ (Pair { "B" } True) ] - - location: 64 (remaining gas: 1039949.368 units remaining) + - location: 64 (remaining gas: 1039952.458 units remaining) [ True ] - - location: 65 (remaining gas: 1039949.228 units remaining) + - location: 65 (remaining gas: 1039952.378 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039949.088 units remaining) + - location: 66 (remaining gas: 1039952.298 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039948.948 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039948.878 units remaining) + - location: 68 (remaining gas: 1039952.218 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 6fd056d8d37b7c44d238d229f3b107fee406069f..2f93f3bc7260cf149735b516e2b980ad51644fbe 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,166 +7,129 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039956.652 units remaining) + - location: 12 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "c" } { "B" }) None) ] - - location: 12 (remaining gas: 1039956.512 units remaining) + - location: 12 (remaining gas: 1039956.572 units remaining) [ (Pair { "c" } { "B" }) @parameter ] - - location: 13 (remaining gas: 1039956.372 units remaining) + - location: 13 (remaining gas: 1039956.492 units remaining) [ (Pair { "c" } { "B" }) @parameter (Pair { "c" } { "B" }) @parameter ] - - location: 14 (remaining gas: 1039956.232 units remaining) + - location: 14 (remaining gas: 1039956.412 units remaining) [ { "c" } (Pair { "c" } { "B" }) @parameter ] - - location: 17 (remaining gas: 1039955.932 units remaining) - [ { "B" } ] - - location: 16 (remaining gas: 1039955.862 units remaining) + - location: 15 (remaining gas: 1039956.312 units remaining) + [ (Pair { "c" } { "B" }) @parameter ] + - location: 17 (remaining gas: 1039956.232 units remaining) [ { "B" } ] - - location: 15 (remaining gas: 1039955.862 units remaining) - [ { "c" } - { "B" } ] - - location: 18 (remaining gas: 1039955.562 units remaining) + - location: 18 (remaining gas: 1039955.992 units remaining) [ {} { "c" } { "B" } ] - - location: 20 (remaining gas: 1039955.432 units remaining) + - location: 20 (remaining gas: 1039955.922 units remaining) [ { "c" } {} { "B" } ] - - location: 23 (remaining gas: 1039954.725 units remaining) + - location: 23 (remaining gas: 1039955.335 units remaining) [ (Pair "c" {}) { "B" } ] - - location: 24 (remaining gas: 1039954.585 units remaining) + - location: 24 (remaining gas: 1039955.255 units remaining) [ (Pair "c" {}) (Pair "c" {}) { "B" } ] - - location: 25 (remaining gas: 1039954.445 units remaining) + - location: 25 (remaining gas: 1039955.175 units remaining) [ "c" @elt (Pair "c" {}) { "B" } ] - - location: 28 (remaining gas: 1039954.145 units remaining) - [ {} + - location: 26 (remaining gas: 1039955.075 units remaining) + [ (Pair "c" {}) { "B" } ] - - location: 27 (remaining gas: 1039954.075 units remaining) + - location: 28 (remaining gas: 1039954.995 units remaining) [ {} { "B" } ] - - location: 26 (remaining gas: 1039954.075 units remaining) - [ "c" @elt - {} - { "B" } ] - - location: 29 (remaining gas: 1039953.935 units remaining) + - location: 29 (remaining gas: 1039954.915 units remaining) [ True "c" @elt {} { "B" } ] - - location: 32 (remaining gas: 1039953.805 units remaining) + - location: 32 (remaining gas: 1039954.845 units remaining) [ "c" @elt True {} { "B" } ] - - location: 33 (remaining gas: 1039953.665 units remaining) - [ { "c" } - { "B" } ] - - location: -1 (remaining gas: 1039953.595 units remaining) - [ { "c" } - { "B" } ] - - location: 21 (remaining gas: 1039953.595 units remaining) + - location: 33 (remaining gas: 1039954.765 units remaining) [ { "c" } { "B" } ] - - location: 34 (remaining gas: 1039953.455 units remaining) + - location: 34 (remaining gas: 1039954.685 units remaining) [ True { "c" } { "B" } ] - - location: 37 (remaining gas: 1039953.325 units remaining) + - location: 37 (remaining gas: 1039954.615 units remaining) [ { "c" } True { "B" } ] - - location: 38 (remaining gas: 1039953.185 units remaining) + - location: 38 (remaining gas: 1039954.535 units remaining) [ (Pair { "c" } True) { "B" } ] - - location: 39 (remaining gas: 1039953.055 units remaining) + - location: 39 (remaining gas: 1039954.465 units remaining) [ { "B" } (Pair { "c" } True) ] - - location: 42 (remaining gas: 1039952.348 units remaining) + - location: 42 (remaining gas: 1039953.878 units remaining) [ (Pair "B" { "c" } True) ] - - location: 43 (remaining gas: 1039952.208 units remaining) + - location: 43 (remaining gas: 1039953.798 units remaining) [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 44 (remaining gas: 1039952.068 units remaining) + - location: 44 (remaining gas: 1039953.718 units remaining) [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 45 (remaining gas: 1039951.928 units remaining) + - location: 45 (remaining gas: 1039953.638 units remaining) [ "B" @elt (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 49 (remaining gas: 1039951.568 units remaining) - [ (Pair { "c" } True) + - location: 46 (remaining gas: 1039953.538 units remaining) + [ (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - - location: 50 (remaining gas: 1039951.428 units remaining) - [ { "c" } + - location: 49 (remaining gas: 1039953.458 units remaining) + [ (Pair { "c" } True) (Pair "B" { "c" } True) ] - - location: -1 (remaining gas: 1039951.358 units remaining) + - location: 50 (remaining gas: 1039953.378 units remaining) [ { "c" } (Pair "B" { "c" } True) ] - - location: 54 (remaining gas: 1039950.998 units remaining) + - location: 51 (remaining gas: 1039953.278 units remaining) + [ (Pair "B" { "c" } True) ] + - location: 54 (remaining gas: 1039953.198 units remaining) [ (Pair { "c" } True) ] - - location: 55 (remaining gas: 1039950.858 units remaining) - [ True ] - - location: -1 (remaining gas: 1039950.788 units remaining) - [ True ] - - location: 52 (remaining gas: 1039950.718 units remaining) + - location: 55 (remaining gas: 1039953.118 units remaining) [ True ] - - location: 51 (remaining gas: 1039950.718 units remaining) - [ { "c" } - True ] - - location: 56 (remaining gas: 1039950.578 units remaining) - [ { "c" } - { "c" } - True ] - - location: -1 (remaining gas: 1039950.508 units remaining) + - location: 56 (remaining gas: 1039953.038 units remaining) [ { "c" } { "c" } True ] - - location: 46 (remaining gas: 1039950.508 units remaining) - [ "B" @elt - { "c" } - { "c" } - True ] - - location: 57 (remaining gas: 1039950.368 units remaining) + - location: 57 (remaining gas: 1039952.958 units remaining) [ False { "c" } True ] - - location: 60 (remaining gas: 1039950.078 units remaining) - [ True - { "c" } ] - - location: 59 (remaining gas: 1039950.008 units remaining) + - location: 58 (remaining gas: 1039952.858 units remaining) + [ { "c" } + True ] + - location: 60 (remaining gas: 1039952.788 units remaining) [ True { "c" } ] - - location: 58 (remaining gas: 1039950.008 units remaining) + - location: 61 (remaining gas: 1039952.688 units remaining) [ False - True { "c" } ] - - location: 61 (remaining gas: 1039949.848 units remaining) - [ False - { "c" } ] - - location: 62 (remaining gas: 1039949.718 units remaining) + - location: 62 (remaining gas: 1039952.618 units remaining) [ { "c" } False ] - - location: 63 (remaining gas: 1039949.578 units remaining) - [ (Pair { "c" } False) ] - - location: -1 (remaining gas: 1039949.508 units remaining) + - location: 63 (remaining gas: 1039952.538 units remaining) [ (Pair { "c" } False) ] - - location: 40 (remaining gas: 1039949.508 units remaining) - [ (Pair { "c" } False) ] - - location: 64 (remaining gas: 1039949.368 units remaining) + - location: 64 (remaining gas: 1039952.458 units remaining) [ False ] - - location: 65 (remaining gas: 1039949.228 units remaining) + - location: 65 (remaining gas: 1039952.378 units remaining) [ (Some False) ] - - location: 66 (remaining gas: 1039949.088 units remaining) + - location: 66 (remaining gas: 1039952.298 units remaining) [ {} (Some False) ] - - location: 68 (remaining gas: 1039948.948 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039948.878 units remaining) + - location: 68 (remaining gas: 1039952.218 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 1cb27faa2a900bff4a509b638af540d0bff0e59e..c68873f5753a1c781cd5ed1d3da732d06eaa32cc 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,59 +7,49 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039957.180 units remaining) + - location: 12 (remaining gas: 1039957.180 units remaining) [ (Pair (Pair {} {}) None) ] - - location: 12 (remaining gas: 1039957.040 units remaining) + - location: 12 (remaining gas: 1039957.100 units remaining) [ (Pair {} {}) @parameter ] - - location: 13 (remaining gas: 1039956.900 units remaining) + - location: 13 (remaining gas: 1039957.020 units remaining) [ (Pair {} {}) @parameter (Pair {} {}) @parameter ] - - location: 14 (remaining gas: 1039956.760 units remaining) + - location: 14 (remaining gas: 1039956.940 units remaining) [ {} (Pair {} {}) @parameter ] - - location: 17 (remaining gas: 1039956.460 units remaining) - [ {} ] - - location: 16 (remaining gas: 1039956.390 units remaining) + - location: 15 (remaining gas: 1039956.840 units remaining) + [ (Pair {} {}) @parameter ] + - location: 17 (remaining gas: 1039956.760 units remaining) [ {} ] - - location: 15 (remaining gas: 1039956.390 units remaining) - [ {} - {} ] - - location: 18 (remaining gas: 1039956.090 units remaining) + - location: 18 (remaining gas: 1039956.520 units remaining) [ {} {} {} ] - - location: 20 (remaining gas: 1039955.960 units remaining) + - location: 20 (remaining gas: 1039956.450 units remaining) [ {} {} {} ] - - location: 21 (remaining gas: 1039955.400 units remaining) - [ {} - {} ] - - location: 34 (remaining gas: 1039955.260 units remaining) + - location: 34 (remaining gas: 1039955.870 units remaining) [ True {} {} ] - - location: 37 (remaining gas: 1039955.130 units remaining) + - location: 37 (remaining gas: 1039955.800 units remaining) [ {} True {} ] - - location: 38 (remaining gas: 1039954.990 units remaining) + - location: 38 (remaining gas: 1039955.720 units remaining) [ (Pair {} True) {} ] - - location: 39 (remaining gas: 1039954.860 units remaining) + - location: 39 (remaining gas: 1039955.650 units remaining) [ {} (Pair {} True) ] - - location: 40 (remaining gas: 1039954.300 units remaining) - [ (Pair {} True) ] - - location: 64 (remaining gas: 1039954.160 units remaining) + - location: 64 (remaining gas: 1039955.070 units remaining) [ True ] - - location: 65 (remaining gas: 1039954.020 units remaining) + - location: 65 (remaining gas: 1039954.990 units remaining) [ (Some True) ] - - location: 66 (remaining gas: 1039953.880 units remaining) + - location: 66 (remaining gas: 1039954.910 units remaining) [ {} (Some True) ] - - location: 68 (remaining gas: 1039953.740 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039953.670 units remaining) + - location: 68 (remaining gas: 1039954.830 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 bd7be66234adeb5d41bc29f99aa41c68451fd057..763abaa3e131d815a1ff71d901f4a96a7a21df08 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,25 +7,23 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039931.695 units remaining) + - location: 7 (remaining gas: 1039931.695 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - - location: 7 (remaining gas: 1039931.555 units remaining) + - location: 7 (remaining gas: 1039931.615 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] - - location: 8 (remaining gas: 1039686.269 units remaining) + - location: 8 (remaining gas: 1039686.389 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter.contract ] - - location: 16 (remaining gas: 1039685.999 units remaining) + - location: 11 (remaining gas: 1039686.309 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] - - location: 10 (remaining gas: 1039685.929 units remaining) + - location: 16 (remaining gas: 1039686.239 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] - - location: 17 (remaining gas: 1039685.789 units remaining) + - location: 17 (remaining gas: 1039686.159 units remaining) [ ] - - location: 18 (remaining gas: 1039685.649 units remaining) + - location: 18 (remaining gas: 1039686.079 units remaining) [ Unit ] - - location: 19 (remaining gas: 1039685.509 units remaining) + - location: 19 (remaining gas: 1039685.999 units remaining) [ {} Unit ] - - location: 21 (remaining gas: 1039685.369 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039685.299 units remaining) + - location: 21 (remaining gas: 1039685.919 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 576bf80c8d0c207213ef387eddaf1f17fd87ea22..0a53fe38fa6f0c2d4d3fa705b1ffc114bb9a3336 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,41 +13,33 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039985.320 units remaining) + - location: 8 (remaining gas: 1039985.320 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039985.180 units remaining) + - location: 8 (remaining gas: 1039985.240 units remaining) [ ] - - location: 9 (remaining gas: 1039985.040 units remaining) + - location: 9 (remaining gas: 1039985.160 units remaining) [ Unit ] - - location: 10 (remaining gas: 1039984.900 units remaining) + - location: 10 (remaining gas: 1039985.080 units remaining) [ 50000 @amount Unit ] - - location: 11 (remaining gas: 1039984.760 units remaining) + - location: 11 (remaining gas: 1039985 units remaining) [ None 50000 @amount Unit ] - - location: 13 (remaining gas: 1039983.180 units remaining) + - location: 13 (remaining gas: 1039983.480 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - - location: 27 (remaining gas: 1039982.880 units remaining) + - location: 25 (remaining gas: 1039983.380 units remaining) + [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] + - location: 27 (remaining gas: 1039983.300 units remaining) [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 28 (remaining gas: 1039982.740 units remaining) + - location: 28 (remaining gas: 1039983.220 units remaining) [ {} (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: -1 (remaining gas: 1039982.670 units remaining) - [ {} - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 25 (remaining gas: 1039982.670 units remaining) - [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b - {} - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 30 (remaining gas: 1039982.530 units remaining) + - location: 30 (remaining gas: 1039983.140 units remaining) [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - - location: 31 (remaining gas: 1039982.390 units remaining) - [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ] - - location: -1 (remaining gas: 1039982.320 units remaining) + - location: 31 (remaining gas: 1039983.060 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 ca63de915fd4408f49b4acbf8ca290e7f3a73846..404c023669fa3ede5c6e7c3e4af7ad312dcc66d3 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039989.940 units remaining) + - location: 9 (remaining gas: 1039989.940 units remaining) [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039989.800 units remaining) + - location: 9 (remaining gas: 1039989.860 units remaining) [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 10 (remaining gas: 1039989.660 units remaining) + - location: 10 (remaining gas: 1039989.780 units remaining) [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 11 (remaining gas: 1039989.520 units remaining) + - location: 11 (remaining gas: 1039989.700 units remaining) [ "1970-01-01T00:03:20Z" (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 14 (remaining gas: 1039989.220 units remaining) - [ "1970-01-01T00:00:00Z" ] - - location: 13 (remaining gas: 1039989.150 units remaining) + - location: 12 (remaining gas: 1039989.600 units remaining) + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] + - location: 14 (remaining gas: 1039989.520 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039989.150 units remaining) - [ "1970-01-01T00:03:20Z" - "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039989.010 units remaining) + - location: 15 (remaining gas: 1039989.440 units remaining) [ 200 ] - - location: 16 (remaining gas: 1039988.870 units remaining) + - location: 16 (remaining gas: 1039989.360 units remaining) [ {} 200 ] - - location: 18 (remaining gas: 1039988.730 units remaining) - [ (Pair {} 200) ] - - location: -1 (remaining gas: 1039988.660 units remaining) + - location: 18 (remaining gas: 1039989.280 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 ad14692ba8ae2d85f2f55ff54d45cd3387801951..76a0da8eb04bfe57d9d6c9793dd74194956e3ee5 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ "1970-01-01T00:00:00Z" ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:00:00Z" - "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ 0 ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} 0 ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 34036824f1780f5220617535567b13d08c337afe..3b03376fb51999dd62eb7f57ecc5640d0fb3c75d 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:00:00Z" (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ "1970-01-01T00:00:01Z" ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ "1970-01-01T00:00:01Z" ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:00:00Z" - "1970-01-01T00:00:01Z" ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} -1 ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} -1) ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 961d725b18255eb1f1a8f1047f44b36eeda4e298..6ae13941a371e77628d17d74f58bb45d0c8a39a7 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:00:01Z" (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ "1970-01-01T00:00:00Z" ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:00:01Z" - "1970-01-01T00:00:00Z" ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ 1 ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} 1 ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 779764ff28b6ab69338ba61f26b3dc30ab6a7da1..e8253d210b85e1caa044019d3ff5b52f07499ff1 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,68 +7,93 @@ emitted operations big_map diff trace - - location: 23 (remaining gas: 1039861.200 units remaining) + - location: 24 (remaining gas: 1039861.200 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: 1039861.060 units remaining) + - location: 24 (remaining gas: 1039861.120 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 25 (remaining gas: 1039860.920 units remaining) + - location: 25 (remaining gas: 1039861.040 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 27 (remaining gas: 1039860.720 units remaining) + - location: 27 (remaining gas: 1039860.960 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) @parameter ] - - location: 30 (remaining gas: 1039860.420 units remaining) - [ 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 28 (remaining gas: 1039860.860 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) @parameter ] - - location: 29 (remaining gas: 1039860.350 units remaining) + - location: 30 (remaining gas: 1039860.780 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) @parameter ] - - location: 28 (remaining gas: 1039860.350 units remaining) - [ 17 - 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 31 (remaining gas: 1039860.672 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) @parameter ] - - location: 34 (remaining gas: 1039860.042 units remaining) + - location: 34 (remaining gas: 1039860.592 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) @parameter ] - - location: 33 (remaining gas: 1039859.972 units remaining) - [ 15 + - location: 31 (remaining gas: 1039860.512 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) @parameter ] - - location: 31 (remaining gas: 1039859.972 units remaining) + - location: 31 (remaining gas: 1039860.432 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) @parameter ] - - location: 38 (remaining gas: 1039859.660 units remaining) + - location: 35 (remaining gas: 1039860.320 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) @parameter ] + - location: 38 (remaining gas: 1039860.240 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) @parameter ] - - location: 37 (remaining gas: 1039859.590 units remaining) - [ 14 + - location: 35 (remaining gas: 1039860.160 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) @parameter ] + - location: 35 (remaining gas: 1039860.080 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) @parameter ] - - location: 35 (remaining gas: 1039859.590 units remaining) + - location: 35 (remaining gas: 1039860 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) @parameter ] - - location: 42 (remaining gas: 1039859.274 units remaining) + - location: 39 (remaining gas: 1039859.884 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) @parameter ] + - location: 42 (remaining gas: 1039859.804 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) @parameter ] - - location: 41 (remaining gas: 1039859.204 units remaining) - [ 13 + - location: 39 (remaining gas: 1039859.724 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) @parameter ] + - location: 39 (remaining gas: 1039859.644 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) @parameter ] + - location: 39 (remaining gas: 1039859.564 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) @parameter ] - - location: 39 (remaining gas: 1039859.204 units remaining) + - location: 39 (remaining gas: 1039859.484 units remaining) [ 17 16 15 @@ -76,15 +101,40 @@ 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) @parameter ] - - location: 46 (remaining gas: 1039858.884 units remaining) + - location: 43 (remaining gas: 1039859.364 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) @parameter ] + - location: 46 (remaining gas: 1039859.284 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) @parameter ] - - location: 45 (remaining gas: 1039858.814 units remaining) - [ 12 + - location: 43 (remaining gas: 1039859.204 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) @parameter ] + - location: 43 (remaining gas: 1039859.124 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) @parameter ] + - location: 43 (remaining gas: 1039859.044 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) @parameter ] + - location: 43 (remaining gas: 1039858.964 units remaining) + [ 16 + 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) @parameter ] - - location: 43 (remaining gas: 1039858.814 units remaining) + - location: 43 (remaining gas: 1039858.884 units remaining) [ 17 16 15 @@ -93,52 +143,49 @@ 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) @parameter ] - - location: 50 (remaining gas: 1039858.490 units remaining) + - location: 47 (remaining gas: 1039858.760 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) @parameter ] + - location: 50 (remaining gas: 1039858.680 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) @parameter ] - - location: 49 (remaining gas: 1039858.420 units remaining) - [ 11 + - location: 47 (remaining gas: 1039858.600 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) @parameter ] - - location: 47 (remaining gas: 1039858.420 units remaining) - [ 17 - 16 - 15 - 14 - 13 + - location: 47 (remaining gas: 1039858.520 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) @parameter ] - - location: 54 (remaining gas: 1039858.092 units remaining) - [ 10 - (Pair 9 8 7 6 5 4 3 2 1) + - location: 47 (remaining gas: 1039858.440 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) @parameter ] - - location: 53 (remaining gas: 1039858.022 units remaining) - [ 10 - (Pair 9 8 7 6 5 4 3 2 1) + - location: 47 (remaining gas: 1039858.360 units remaining) + [ 15 + 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) @parameter ] - - location: 51 (remaining gas: 1039858.022 units remaining) - [ 17 - 16 + - location: 47 (remaining gas: 1039858.280 units remaining) + [ 16 15 14 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) @parameter ] - - location: 58 (remaining gas: 1039857.690 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) @parameter ] - - location: 57 (remaining gas: 1039857.620 units remaining) - [ 9 - (Pair 8 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 55 (remaining gas: 1039857.620 units remaining) + - location: 47 (remaining gas: 1039858.200 units remaining) [ 17 16 15 @@ -146,85 +193,61 @@ trace 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) @parameter ] + - location: 51 (remaining gas: 1039858.072 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) @parameter ] + - location: 54 (remaining gas: 1039857.992 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) @parameter ] + - location: 51 (remaining gas: 1039857.912 units remaining) + [ 11 10 - 9 - (Pair 8 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 62 (remaining gas: 1039857.284 units remaining) - [ 8 - (Pair 7 6 5 4 3 2 1) + - location: 51 (remaining gas: 1039857.832 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) @parameter ] - - location: 61 (remaining gas: 1039857.214 units remaining) - [ 8 - (Pair 7 6 5 4 3 2 1) + - location: 51 (remaining gas: 1039857.752 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) @parameter ] - - location: 59 (remaining gas: 1039857.214 units remaining) - [ 17 - 16 - 15 - 14 + - location: 51 (remaining gas: 1039857.672 units remaining) + [ 14 13 12 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) @parameter ] - - location: 66 (remaining gas: 1039856.874 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) @parameter ] - - location: 65 (remaining gas: 1039856.804 units remaining) - [ 7 - (Pair 6 5 4 3 2 1) + (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) @parameter ] - - location: 63 (remaining gas: 1039856.804 units remaining) - [ 17 - 16 - 15 + - location: 51 (remaining gas: 1039857.592 units remaining) + [ 15 14 13 12 11 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) @parameter ] - - location: 70 (remaining gas: 1039856.460 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) @parameter ] - - location: 69 (remaining gas: 1039856.390 units remaining) - [ 6 - (Pair 5 4 3 2 1) + (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) @parameter ] - - location: 67 (remaining gas: 1039856.390 units remaining) - [ 17 - 16 + - location: 51 (remaining gas: 1039857.512 units remaining) + [ 16 15 14 13 12 11 10 - 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) @parameter ] - - location: 74 (remaining gas: 1039856.042 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) @parameter ] - - location: 73 (remaining gas: 1039855.972 units remaining) - [ 5 - (Pair 4 3 2 1) + (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) @parameter ] - - location: 71 (remaining gas: 1039855.972 units remaining) + - location: 51 (remaining gas: 1039857.432 units remaining) [ 17 16 15 @@ -233,94 +256,62 @@ trace 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) @parameter ] + - location: 55 (remaining gas: 1039857.300 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) @parameter ] + - location: 58 (remaining gas: 1039857.220 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) @parameter ] + - location: 55 (remaining gas: 1039857.140 units remaining) + [ 10 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) + (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) @parameter ] - - location: 78 (remaining gas: 1039855.620 units remaining) - [ 4 - (Pair 3 2 1) + - location: 55 (remaining gas: 1039857.060 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) @parameter ] - - location: 77 (remaining gas: 1039855.550 units remaining) - [ 4 - (Pair 3 2 1) + - location: 55 (remaining gas: 1039856.980 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) @parameter ] - - location: 75 (remaining gas: 1039855.550 units remaining) - [ 17 - 16 - 15 - 14 - 13 + - location: 55 (remaining gas: 1039856.900 units remaining) + [ 13 12 11 10 9 - 8 - 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) @parameter ] - - location: 82 (remaining gas: 1039855.194 units remaining) - [ 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 81 (remaining gas: 1039855.124 units remaining) - [ 3 - (Pair 2 1) + (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) @parameter ] - - location: 79 (remaining gas: 1039855.124 units remaining) - [ 17 - 16 - 15 - 14 + - location: 55 (remaining gas: 1039856.820 units remaining) + [ 14 13 12 11 10 9 - 8 - 7 - 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) @parameter ] - - location: 86 (remaining gas: 1039854.764 units remaining) - [ 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 85 (remaining gas: 1039854.694 units remaining) - [ 2 - 1 + (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) @parameter ] - - location: 83 (remaining gas: 1039854.694 units remaining) - [ 17 - 16 - 15 + - location: 55 (remaining gas: 1039856.740 units remaining) + [ 15 14 13 12 11 10 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: -1 (remaining gas: 1039854.624 units remaining) - [ 17 - 16 + - location: 55 (remaining gas: 1039856.660 units remaining) + [ 16 15 14 13 @@ -328,16 +319,9 @@ trace 11 10 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: 87 (remaining gas: 1039854.464 units remaining) + - location: 55 (remaining gas: 1039856.580 units remaining) [ 17 16 15 @@ -347,18 +331,73 @@ trace 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) @parameter ] + - location: 59 (remaining gas: 1039856.444 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) @parameter ] + - location: 62 (remaining gas: 1039856.364 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) @parameter ] + - location: 59 (remaining gas: 1039856.284 units remaining) + [ 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] + - location: 59 (remaining gas: 1039856.204 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) @parameter ] + - location: 59 (remaining gas: 1039856.124 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) @parameter ] + - location: 59 (remaining gas: 1039856.044 units remaining) + [ 12 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.964 units remaining) + [ 13 + 12 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.884 units remaining) + [ 14 + 13 + 12 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.804 units remaining) + [ 15 + 14 + 13 + 12 + 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) @parameter ] - - location: 89 (remaining gas: 1039854.300 units remaining) + - location: 59 (remaining gas: 1039855.724 units remaining) [ 16 - 17 15 14 13 @@ -367,38 +406,75 @@ trace 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: 91 (remaining gas: 1039854.132 units remaining) - [ 15 + - location: 59 (remaining gas: 1039855.644 units remaining) + [ 17 16 - 17 + 15 14 13 12 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) @parameter ] + - location: 63 (remaining gas: 1039855.504 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) @parameter ] + - location: 66 (remaining gas: 1039855.424 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) @parameter ] + - location: 63 (remaining gas: 1039855.344 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) @parameter ] + - location: 63 (remaining gas: 1039855.264 units remaining) + [ 9 8 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] + - location: 63 (remaining gas: 1039855.184 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) @parameter ] + - location: 63 (remaining gas: 1039855.104 units remaining) + [ 11 + 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) @parameter ] + - location: 63 (remaining gas: 1039855.024 units remaining) + [ 12 + 11 + 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) @parameter ] + - location: 63 (remaining gas: 1039854.944 units remaining) + [ 13 + 12 + 11 + 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) @parameter ] - - location: 93 (remaining gas: 1039853.960 units remaining) + - location: 63 (remaining gas: 1039854.864 units remaining) [ 14 - 15 - 16 - 17 13 12 11 @@ -406,205 +482,1090 @@ trace 9 8 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: 95 (remaining gas: 1039853.784 units remaining) - [ 13 + - location: 63 (remaining gas: 1039854.784 units remaining) + [ 15 14 - 15 - 16 - 17 + 13 12 11 10 9 8 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: 97 (remaining gas: 1039853.604 units remaining) - [ 12 - 13 - 14 + - location: 63 (remaining gas: 1039854.704 units remaining) + [ 16 15 - 16 - 17 + 14 + 13 + 12 11 10 9 8 7 - 6 - 5 - 4 - 3 - 2 - 1 + (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) @parameter ] - - location: 99 (remaining gas: 1039853.420 units remaining) - [ 11 - 12 - 13 - 14 - 15 + - location: 63 (remaining gas: 1039854.624 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 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) @parameter ] + - location: 67 (remaining gas: 1039854.480 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) @parameter ] + - location: 70 (remaining gas: 1039854.400 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) @parameter ] + - location: 67 (remaining gas: 1039854.320 units remaining) + [ 7 6 - 5 - 4 - 3 - 2 - 1 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 67 (remaining gas: 1039854.240 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) @parameter ] + - location: 67 (remaining gas: 1039854.160 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) @parameter ] - - location: 101 (remaining gas: 1039853.232 units remaining) + - location: 67 (remaining gas: 1039854.080 units remaining) [ 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 9 8 7 6 - 5 - 4 - 3 - 2 - 1 + (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 103 (remaining gas: 1039853.040 units remaining) - [ 9 + - location: 67 (remaining gas: 1039854 units remaining) + [ 11 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 + 9 8 7 6 - 5 - 4 - 3 - 2 - 1 + (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 105 (remaining gas: 1039852.844 units remaining) - [ 8 - 9 - 10 + - location: 67 (remaining gas: 1039853.920 units remaining) + [ 12 11 - 12 - 13 - 14 - 15 - 16 - 17 + 10 + 9 + 8 7 6 - 5 - 4 - 3 - 2 - 1 + (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 107 (remaining gas: 1039852.644 units remaining) - [ 7 - 8 - 9 - 10 - 11 + - location: 67 (remaining gas: 1039853.840 units remaining) + [ 13 12 - 13 - 14 - 15 - 16 - 17 + 11 + 10 + 9 + 8 + 7 6 - 5 - 4 - 3 - 2 - 1 + (Pair 5 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 109 (remaining gas: 1039852.440 units remaining) - [ 6 - 7 - 8 - 9 - 10 - 11 - 12 + - location: 67 (remaining gas: 1039853.760 units remaining) + [ 14 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.680 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.600 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.520 units remaining) + [ 17 16 - 17 - 5 - 4 - 3 - 2 - 1 + 15 + 14 + 13 + 12 + 11 + 10 + 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) @parameter ] - - location: 111 (remaining gas: 1039852.232 units remaining) + - location: 71 (remaining gas: 1039853.372 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) @parameter ] + - location: 74 (remaining gas: 1039853.292 units remaining) [ 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 4 - 3 - 2 - 1 + (Pair 4 3 2 1) (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 113 (remaining gas: 1039852.020 units remaining) - [ 4 + - location: 71 (remaining gas: 1039853.212 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) @parameter ] + - location: 71 (remaining gas: 1039853.132 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) @parameter ] + - location: 71 (remaining gas: 1039853.052 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) @parameter ] + - location: 71 (remaining gas: 1039852.972 units remaining) + [ 9 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) @parameter ] + - location: 71 (remaining gas: 1039852.892 units remaining) + [ 10 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.812 units remaining) + [ 11 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.732 units remaining) + [ 12 11 + 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.652 units remaining) + [ 13 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.572 units remaining) + [ 14 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.492 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.412 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.332 units remaining) + [ 17 16 - 17 - 3 - 2 - 1 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] - - location: 115 (remaining gas: 1039851.804 units remaining) - [ 3 + - location: 75 (remaining gas: 1039852.180 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) @parameter ] + - location: 78 (remaining gas: 1039852.100 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) @parameter ] + - location: 75 (remaining gas: 1039852.020 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) @parameter ] + - location: 75 (remaining gas: 1039851.940 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) @parameter ] + - location: 75 (remaining gas: 1039851.860 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) @parameter ] + - location: 75 (remaining gas: 1039851.780 units remaining) + [ 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.700 units remaining) + [ 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.620 units remaining) + [ 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.540 units remaining) + [ 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.460 units remaining) + [ 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.380 units remaining) + [ 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.300 units remaining) + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.220 units remaining) + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.140 units remaining) + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.060 units remaining) + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.904 units remaining) + [ (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 82 (remaining gas: 1039850.824 units remaining) + [ 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 79 (remaining gas: 1039850.744 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) @parameter ] + - location: 79 (remaining gas: 1039850.664 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) @parameter ] + - location: 79 (remaining gas: 1039850.584 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) @parameter ] + - location: 79 (remaining gas: 1039850.504 units remaining) + [ 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.424 units remaining) + [ 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.344 units remaining) + [ 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.264 units remaining) + [ 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.184 units remaining) + [ 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.104 units remaining) + [ 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.024 units remaining) + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.944 units remaining) + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.864 units remaining) + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.784 units remaining) + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.704 units remaining) + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 83 (remaining gas: 1039849.544 units remaining) + [ (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 86 (remaining gas: 1039849.464 units remaining) + [ 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 83 (remaining gas: 1039849.384 units remaining) + [ 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 83 (remaining gas: 1039849.304 units remaining) + [ 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 83 (remaining gas: 1039849.224 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) @parameter ] + - location: 83 (remaining gas: 1039849.144 units remaining) + [ 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 83 (remaining gas: 1039849.064 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.984 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.904 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.824 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.744 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.664 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.584 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.504 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.424 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.344 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.264 units remaining) + [ 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) @parameter ] + - location: 87 (remaining gas: 1039848.164 units remaining) + [ 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) @parameter ] + - location: 89 (remaining gas: 1039848.060 units remaining) + [ 16 + 17 + 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) @parameter ] + - location: 91 (remaining gas: 1039847.952 units remaining) + [ 15 + 16 + 17 + 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) @parameter ] + - location: 93 (remaining gas: 1039847.840 units remaining) + [ 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 95 (remaining gas: 1039847.724 units remaining) + [ 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 97 (remaining gas: 1039847.604 units remaining) + [ 12 + 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 99 (remaining gas: 1039847.480 units remaining) + [ 11 + 12 + 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 101 (remaining gas: 1039847.352 units remaining) + [ 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 103 (remaining gas: 1039847.220 units remaining) + [ 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 105 (remaining gas: 1039847.084 units remaining) + [ 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 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) @parameter ] + - location: 107 (remaining gas: 1039846.944 units remaining) + [ 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 109 (remaining gas: 1039846.800 units remaining) + [ 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 111 (remaining gas: 1039846.652 units remaining) + [ 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 113 (remaining gas: 1039846.500 units remaining) + [ 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 115 (remaining gas: 1039846.344 units remaining) + [ 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 117 (remaining gas: 1039846.184 units remaining) + [ 2 + 3 4 5 6 @@ -619,11 +1580,11 @@ trace 15 16 17 - 2 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 117 (remaining gas: 1039851.584 units remaining) - [ 2 + - location: 119 (remaining gas: 1039846.020 units remaining) + [ 1 + 2 3 4 5 @@ -639,9 +1600,8 @@ trace 15 16 17 - 1 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 119 (remaining gas: 1039851.360 units remaining) + - location: 121 (remaining gas: 1039845.920 units remaining) [ 1 2 3 @@ -660,9 +1620,9 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 121 (remaining gas: 1039851.200 units remaining) - [ 1 - 2 + - location: 123 (remaining gas: 1039845.816 units remaining) + [ 2 + 1 3 4 5 @@ -679,235 +1639,1028 @@ trace 16 17 (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 123 (remaining gas: 1039851.036 units remaining) + - location: 125 (remaining gas: 1039845.708 units remaining) + [ 3 + 2 + 1 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 127 (remaining gas: 1039845.596 units remaining) + [ 4 + 3 + 2 + 1 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 129 (remaining gas: 1039845.480 units remaining) + [ 5 + 4 + 3 + 2 + 1 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 131 (remaining gas: 1039845.360 units remaining) + [ 6 + 5 + 4 + 3 + 2 + 1 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 133 (remaining gas: 1039845.236 units remaining) + [ 7 + 6 + 5 + 4 + 3 + 2 + 1 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 135 (remaining gas: 1039845.108 units remaining) + [ 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 137 (remaining gas: 1039844.976 units remaining) + [ 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 139 (remaining gas: 1039844.840 units remaining) + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 141 (remaining gas: 1039844.700 units remaining) + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 143 (remaining gas: 1039844.556 units remaining) + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 145 (remaining gas: 1039844.408 units remaining) + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 147 (remaining gas: 1039844.256 units remaining) + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 149 (remaining gas: 1039844.100 units remaining) + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 151 (remaining gas: 1039843.940 units remaining) + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 153 (remaining gas: 1039843.776 units remaining) + [ 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) @parameter ] + - location: 156 (remaining gas: 1039843.616 units remaining) [ 2 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 159 (remaining gas: 1039843.536 units remaining) + [ (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 156 (remaining gas: 1039843.456 units remaining) + [ 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 156 (remaining gas: 1039843.376 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) @parameter ] + - location: 156 (remaining gas: 1039843.296 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) @parameter ] + - location: 156 (remaining gas: 1039843.216 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) @parameter ] + - location: 156 (remaining gas: 1039843.136 units remaining) + [ 7 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) @parameter ] + - location: 156 (remaining gas: 1039843.056 units remaining) + [ 8 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.976 units remaining) + [ 9 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.896 units remaining) + [ 10 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.816 units remaining) + [ 11 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.736 units remaining) + [ 12 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.656 units remaining) + [ 13 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.576 units remaining) + [ 14 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.496 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.416 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.336 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 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) @parameter ] - - location: 125 (remaining gas: 1039850.868 units remaining) + - location: 160 (remaining gas: 1039842.180 units remaining) [ 3 - 2 - 1 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 163 (remaining gas: 1039842.100 units remaining) + [ (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 160 (remaining gas: 1039842.020 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) @parameter ] + - location: 160 (remaining gas: 1039841.940 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) @parameter ] + - location: 160 (remaining gas: 1039841.860 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) @parameter ] + - location: 160 (remaining gas: 1039841.780 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) @parameter ] + - location: 160 (remaining gas: 1039841.700 units remaining) + [ 8 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) @parameter ] + - location: 160 (remaining gas: 1039841.620 units remaining) + [ 9 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.540 units remaining) + [ 10 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.460 units remaining) + [ 11 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.380 units remaining) + [ 12 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.300 units remaining) + [ 13 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.220 units remaining) + [ 14 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.140 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.060 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] + - location: 160 (remaining gas: 1039840.980 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 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) @parameter ] - - location: 127 (remaining gas: 1039850.696 units remaining) + - location: 164 (remaining gas: 1039840.828 units remaining) [ 4 - 3 - 2 - 1 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 167 (remaining gas: 1039840.748 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) @parameter ] + - location: 164 (remaining gas: 1039840.668 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) @parameter ] + - location: 164 (remaining gas: 1039840.588 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) @parameter ] + - location: 164 (remaining gas: 1039840.508 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) @parameter ] + - location: 164 (remaining gas: 1039840.428 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) @parameter ] + - location: 164 (remaining gas: 1039840.348 units remaining) + [ 9 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) @parameter ] + - location: 164 (remaining gas: 1039840.268 units remaining) + [ 10 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.188 units remaining) + [ 11 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.108 units remaining) + [ 12 11 + 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.028 units remaining) + [ 13 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.948 units remaining) + [ 14 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.868 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.788 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.708 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 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) @parameter ] - - location: 129 (remaining gas: 1039850.520 units remaining) + - location: 168 (remaining gas: 1039839.560 units remaining) [ 5 - 4 - 3 - 2 - 1 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + - location: 171 (remaining gas: 1039839.480 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) @parameter ] + - location: 168 (remaining gas: 1039839.400 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) @parameter ] + - location: 168 (remaining gas: 1039839.320 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) @parameter ] + - location: 168 (remaining gas: 1039839.240 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) @parameter ] + - location: 168 (remaining gas: 1039839.160 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) @parameter ] + - location: 168 (remaining gas: 1039839.080 units remaining) + [ 10 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) @parameter ] + - location: 168 (remaining gas: 1039839 units remaining) + [ 11 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.920 units remaining) + [ 12 11 + 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.840 units remaining) + [ 13 12 + 11 + 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.760 units remaining) + [ 14 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.680 units remaining) + [ 15 14 + 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.600 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.520 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 + 10 + 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) @parameter ] + - location: 172 (remaining gas: 1039838.376 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) @parameter ] + - location: 175 (remaining gas: 1039838.296 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) @parameter ] + - location: 172 (remaining gas: 1039838.216 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) @parameter ] - - location: 131 (remaining gas: 1039850.340 units remaining) - [ 6 - 5 - 4 - 3 - 2 - 1 + - location: 172 (remaining gas: 1039838.136 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) @parameter ] + - location: 172 (remaining gas: 1039838.056 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) @parameter ] + - location: 172 (remaining gas: 1039837.976 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) @parameter ] + - location: 172 (remaining gas: 1039837.896 units remaining) + [ 11 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) @parameter ] + - location: 172 (remaining gas: 1039837.816 units remaining) + [ 12 11 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.736 units remaining) + [ 13 12 + 11 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.656 units remaining) + [ 14 13 + 12 + 11 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.576 units remaining) + [ 15 14 + 13 + 12 + 11 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.496 units remaining) + [ 16 15 + 14 + 13 + 12 + 11 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.416 units remaining) + [ 17 16 - 17 + 15 + 14 + 13 + 12 + 11 + 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) @parameter ] - - location: 133 (remaining gas: 1039850.156 units remaining) + - location: 176 (remaining gas: 1039837.276 units remaining) [ 7 - 6 - 5 - 4 - 3 - 2 - 1 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] + - location: 179 (remaining gas: 1039837.196 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) @parameter ] - - location: 135 (remaining gas: 1039849.968 units remaining) + - location: 176 (remaining gas: 1039837.116 units remaining) [ 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 137 (remaining gas: 1039849.776 units remaining) + - location: 176 (remaining gas: 1039837.036 units remaining) [ 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 139 (remaining gas: 1039849.580 units remaining) + - location: 176 (remaining gas: 1039836.956 units remaining) [ 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 11 - 12 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 141 (remaining gas: 1039849.380 units remaining) + - location: 176 (remaining gas: 1039836.876 units remaining) [ 11 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 12 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 143 (remaining gas: 1039849.176 units remaining) + - location: 176 (remaining gas: 1039836.796 units remaining) [ 12 11 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 13 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 145 (remaining gas: 1039848.968 units remaining) + - location: 176 (remaining gas: 1039836.716 units remaining) [ 13 12 11 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 14 - 15 - 16 - 17 + (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) @parameter ] - - location: 147 (remaining gas: 1039848.756 units remaining) + - location: 176 (remaining gas: 1039836.636 units remaining) [ 14 13 12 @@ -915,18 +2668,9 @@ trace 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 15 - 16 - 17 + (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) @parameter ] - - location: 149 (remaining gas: 1039848.540 units remaining) + - location: 176 (remaining gas: 1039836.556 units remaining) [ 15 14 13 @@ -935,17 +2679,9 @@ trace 10 9 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 16 - 17 + (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) @parameter ] - - location: 151 (remaining gas: 1039848.320 units remaining) + - location: 176 (remaining gas: 1039836.476 units remaining) [ 16 15 14 @@ -954,44 +2690,80 @@ trace 11 10 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 17 + 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) @parameter ] + - location: 176 (remaining gas: 1039836.396 units remaining) + [ 17 + 16 + 15 + 14 + 13 + 12 + 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) @parameter ] + - location: 180 (remaining gas: 1039836.260 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) @parameter ] + - location: 183 (remaining gas: 1039836.180 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) @parameter ] + - location: 180 (remaining gas: 1039836.100 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) @parameter ] + - location: 180 (remaining gas: 1039836.020 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) @parameter ] + - location: 180 (remaining gas: 1039835.940 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) @parameter ] + - location: 180 (remaining gas: 1039835.860 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) @parameter ] + - location: 180 (remaining gas: 1039835.780 units remaining) + [ 13 + 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) @parameter ] + - location: 180 (remaining gas: 1039835.700 units remaining) + [ 14 + 13 + 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) @parameter ] - - location: 153 (remaining gas: 1039848.096 units remaining) - [ 17 - 16 - 15 + - location: 180 (remaining gas: 1039835.620 units remaining) + [ 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) @parameter ] - - location: 159 (remaining gas: 1039847.676 units remaining) - [ (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 158 (remaining gas: 1039847.606 units remaining) - [ (Pair 2 1) + (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) @parameter ] - - location: 156 (remaining gas: 1039847.606 units remaining) - [ 17 - 16 + - location: 180 (remaining gas: 1039835.540 units remaining) + [ 16 15 14 13 @@ -999,21 +2771,9 @@ trace 11 10 9 - 8 - 7 - 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) @parameter ] - - location: 163 (remaining gas: 1039847.250 units remaining) - [ (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] - - location: 162 (remaining gas: 1039847.180 units remaining) - [ (Pair 3 2 1) + (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) @parameter ] - - location: 160 (remaining gas: 1039847.180 units remaining) + - location: 180 (remaining gas: 1039835.460 units remaining) [ 17 16 15 @@ -1023,83 +2783,65 @@ trace 11 10 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) + (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) @parameter ] - - location: 167 (remaining gas: 1039846.828 units remaining) - [ (Pair 4 3 2 1) + - location: 184 (remaining gas: 1039835.328 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) @parameter ] - - location: 166 (remaining gas: 1039846.758 units remaining) - [ (Pair 4 3 2 1) + - location: 187 (remaining gas: 1039835.248 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) @parameter ] - - location: 164 (remaining gas: 1039846.758 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 + - location: 184 (remaining gas: 1039835.168 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) @parameter ] + - location: 184 (remaining gas: 1039835.088 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) @parameter ] + - location: 184 (remaining gas: 1039835.008 units remaining) + [ 12 11 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) + (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) @parameter ] - - location: 171 (remaining gas: 1039846.410 units remaining) - [ (Pair 5 4 3 2 1) + - location: 184 (remaining gas: 1039834.928 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) @parameter ] - - location: 170 (remaining gas: 1039846.340 units remaining) - [ (Pair 5 4 3 2 1) + - location: 184 (remaining gas: 1039834.848 units remaining) + [ 14 + 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) @parameter ] - - location: 168 (remaining gas: 1039846.340 units remaining) - [ 17 - 16 - 15 + - location: 184 (remaining gas: 1039834.768 units remaining) + [ 15 14 13 12 11 10 - 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) @parameter ] - - location: 175 (remaining gas: 1039845.996 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) @parameter ] - - location: 174 (remaining gas: 1039845.926 units remaining) - [ (Pair 6 5 4 3 2 1) + (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) @parameter ] - - location: 172 (remaining gas: 1039845.926 units remaining) - [ 17 - 16 + - location: 184 (remaining gas: 1039834.688 units remaining) + [ 16 15 14 13 12 11 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) @parameter ] - - location: 179 (remaining gas: 1039845.586 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) @parameter ] - - location: 178 (remaining gas: 1039845.516 units remaining) - [ (Pair 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 176 (remaining gas: 1039845.516 units remaining) + - location: 184 (remaining gas: 1039834.608 units remaining) [ 17 16 15 @@ -1108,52 +2850,55 @@ trace 12 11 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 183 (remaining gas: 1039845.180 units remaining) - [ (Pair 8 7 6 5 4 3 2 1) + - location: 188 (remaining gas: 1039834.480 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) @parameter ] - - location: 182 (remaining gas: 1039845.110 units remaining) - [ (Pair 8 7 6 5 4 3 2 1) + - location: 191 (remaining gas: 1039834.400 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) @parameter ] - - location: 180 (remaining gas: 1039845.110 units remaining) - [ 17 - 16 - 15 - 14 - 13 + - location: 188 (remaining gas: 1039834.320 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) @parameter ] + - location: 188 (remaining gas: 1039834.240 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) @parameter ] + - location: 188 (remaining gas: 1039834.160 units remaining) + [ 13 12 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 187 (remaining gas: 1039844.778 units remaining) - [ (Pair 9 8 7 6 5 4 3 2 1) + - location: 188 (remaining gas: 1039834.080 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) @parameter ] - - location: 186 (remaining gas: 1039844.708 units remaining) - [ (Pair 9 8 7 6 5 4 3 2 1) + - location: 188 (remaining gas: 1039834 units remaining) + [ 15 + 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) @parameter ] - - location: 184 (remaining gas: 1039844.708 units remaining) - [ 17 - 16 + - location: 188 (remaining gas: 1039833.920 units remaining) + [ 16 15 14 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) @parameter ] - - location: 191 (remaining gas: 1039844.380 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) @parameter ] - - location: 190 (remaining gas: 1039844.310 units remaining) - [ (Pair 10 9 8 7 6 5 4 3 2 1) + (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) @parameter ] - - location: 188 (remaining gas: 1039844.310 units remaining) + - location: 188 (remaining gas: 1039833.840 units remaining) [ 17 16 15 @@ -1163,13 +2908,44 @@ 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) @parameter ] - - location: 195 (remaining gas: 1039843.986 units remaining) - [ (Pair 11 10 9 8 7 6 5 4 3 2 1) + - location: 192 (remaining gas: 1039833.716 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) @parameter ] - - location: 194 (remaining gas: 1039843.916 units remaining) + - location: 195 (remaining gas: 1039833.636 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) @parameter ] - - location: 192 (remaining gas: 1039843.916 units remaining) + - location: 192 (remaining gas: 1039833.556 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) @parameter ] + - location: 192 (remaining gas: 1039833.476 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) @parameter ] + - location: 192 (remaining gas: 1039833.396 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) @parameter ] + - location: 192 (remaining gas: 1039833.316 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) @parameter ] + - location: 192 (remaining gas: 1039833.236 units remaining) + [ 16 + 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) @parameter ] + - location: 192 (remaining gas: 1039833.156 units remaining) [ 17 16 15 @@ -1178,13 +2954,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) @parameter ] - - location: 199 (remaining gas: 1039843.596 units remaining) - [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 196 (remaining gas: 1039833.036 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) @parameter ] - - location: 198 (remaining gas: 1039843.526 units remaining) + - location: 199 (remaining gas: 1039832.956 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) @parameter ] - - location: 196 (remaining gas: 1039843.526 units remaining) + - location: 196 (remaining gas: 1039832.876 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) @parameter ] + - location: 196 (remaining gas: 1039832.796 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) @parameter ] + - location: 196 (remaining gas: 1039832.716 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) @parameter ] + - location: 196 (remaining gas: 1039832.636 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) @parameter ] + - location: 196 (remaining gas: 1039832.556 units remaining) [ 17 16 15 @@ -1192,75 +2991,96 @@ 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) @parameter ] - - location: 203 (remaining gas: 1039843.210 units remaining) - [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 200 (remaining gas: 1039832.440 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) @parameter ] - - location: 202 (remaining gas: 1039843.140 units remaining) + - location: 203 (remaining gas: 1039832.360 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) @parameter ] - - location: 200 (remaining gas: 1039843.140 units remaining) + - location: 200 (remaining gas: 1039832.280 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) @parameter ] + - location: 200 (remaining gas: 1039832.200 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) @parameter ] + - location: 200 (remaining gas: 1039832.120 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) @parameter ] + - location: 200 (remaining gas: 1039832.040 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) @parameter ] - - location: 207 (remaining gas: 1039842.828 units remaining) - [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 204 (remaining gas: 1039831.928 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) @parameter ] - - location: 206 (remaining gas: 1039842.758 units remaining) + - location: 207 (remaining gas: 1039831.848 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) @parameter ] - - location: 204 (remaining gas: 1039842.758 units remaining) + - location: 204 (remaining gas: 1039831.768 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) @parameter ] + - location: 204 (remaining gas: 1039831.688 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) @parameter ] + - location: 204 (remaining gas: 1039831.608 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) @parameter ] - - location: 211 (remaining gas: 1039842.450 units remaining) - [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 208 (remaining gas: 1039831.500 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) @parameter ] - - location: 210 (remaining gas: 1039842.380 units remaining) + - location: 211 (remaining gas: 1039831.420 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) @parameter ] - - location: 208 (remaining gas: 1039842.380 units remaining) + - location: 208 (remaining gas: 1039831.340 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) @parameter ] + - location: 208 (remaining gas: 1039831.260 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) @parameter ] - - location: 214 (remaining gas: 1039842.080 units remaining) - [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + - location: 212 (remaining gas: 1039831.160 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) @parameter ] - - location: 213 (remaining gas: 1039842.010 units remaining) + - location: 214 (remaining gas: 1039831.080 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) @parameter ] - - location: 212 (remaining gas: 1039842.010 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) @parameter ] - - location: 215 (remaining gas: 1039841.870 units remaining) + - location: 215 (remaining gas: 1039831 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) @parameter ] - - location: -1 (remaining gas: 1039841.800 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) @parameter ] - - location: 218 (remaining gas: 1039839.070 units remaining) + - location: 218 (remaining gas: 1039828.450 units remaining) [ 0 ] - - location: 219 (remaining gas: 1039838.930 units remaining) + - location: 219 (remaining gas: 1039828.370 units remaining) [ True ] - - location: -1 (remaining gas: 1039838.860 units remaining) - [ True ] - - location: 221 (remaining gas: 1039838.670 units remaining) + - location: 220 (remaining gas: 1039828.310 units remaining) [ ] - - location: -1 (remaining gas: 1039838.600 units remaining) + - location: 221 (remaining gas: 1039828.240 units remaining) [ ] - - location: 226 (remaining gas: 1039838.460 units remaining) + - location: 226 (remaining gas: 1039828.160 units remaining) [ Unit ] - - location: 227 (remaining gas: 1039838.320 units remaining) + - location: 227 (remaining gas: 1039828.080 units remaining) [ {} Unit ] - - location: 229 (remaining gas: 1039838.180 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039838.110 units remaining) + - location: 229 (remaining gas: 1039828 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 c3378eb895e2a1c58d2b5d2f96380fc067c7bf6d..cde3571d3e61ed1981acd10cb90462b9aa1a1715 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,68 +7,93 @@ emitted operations big_map diff trace - - location: 23 (remaining gas: 1039861.200 units remaining) + - location: 24 (remaining gas: 1039861.200 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: 1039861.060 units remaining) + - location: 24 (remaining gas: 1039861.120 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 25 (remaining gas: 1039860.920 units remaining) + - location: 25 (remaining gas: 1039861.040 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 27 (remaining gas: 1039860.720 units remaining) + - location: 27 (remaining gas: 1039860.960 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) @parameter ] - - location: 30 (remaining gas: 1039860.420 units remaining) - [ 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 28 (remaining gas: 1039860.860 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) @parameter ] - - location: 29 (remaining gas: 1039860.350 units remaining) + - location: 30 (remaining gas: 1039860.780 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) @parameter ] - - location: 28 (remaining gas: 1039860.350 units remaining) - [ 2 - 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 31 (remaining gas: 1039860.672 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) @parameter ] - - location: 34 (remaining gas: 1039860.042 units remaining) + - location: 34 (remaining gas: 1039860.592 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) @parameter ] - - location: 33 (remaining gas: 1039859.972 units remaining) - [ 12 + - location: 31 (remaining gas: 1039860.512 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) @parameter ] - - location: 31 (remaining gas: 1039859.972 units remaining) + - location: 31 (remaining gas: 1039860.432 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) @parameter ] - - location: 38 (remaining gas: 1039859.660 units remaining) + - location: 35 (remaining gas: 1039860.320 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) @parameter ] + - location: 38 (remaining gas: 1039860.240 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) @parameter ] - - location: 37 (remaining gas: 1039859.590 units remaining) - [ 16 + - location: 35 (remaining gas: 1039860.160 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) @parameter ] + - location: 35 (remaining gas: 1039860.080 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) @parameter ] - - location: 35 (remaining gas: 1039859.590 units remaining) + - location: 35 (remaining gas: 1039860 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) @parameter ] - - location: 42 (remaining gas: 1039859.274 units remaining) + - location: 39 (remaining gas: 1039859.884 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) @parameter ] + - location: 42 (remaining gas: 1039859.804 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) @parameter ] - - location: 41 (remaining gas: 1039859.204 units remaining) - [ 10 + - location: 39 (remaining gas: 1039859.724 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) @parameter ] + - location: 39 (remaining gas: 1039859.644 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) @parameter ] + - location: 39 (remaining gas: 1039859.564 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) @parameter ] - - location: 39 (remaining gas: 1039859.204 units remaining) + - location: 39 (remaining gas: 1039859.484 units remaining) [ 2 3 12 @@ -76,15 +101,40 @@ 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) @parameter ] - - location: 46 (remaining gas: 1039858.884 units remaining) + - location: 43 (remaining gas: 1039859.364 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) @parameter ] + - location: 46 (remaining gas: 1039859.284 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) @parameter ] - - location: 45 (remaining gas: 1039858.814 units remaining) - [ 14 + - location: 43 (remaining gas: 1039859.204 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) @parameter ] + - location: 43 (remaining gas: 1039859.124 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) @parameter ] + - location: 43 (remaining gas: 1039859.044 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) @parameter ] + - location: 43 (remaining gas: 1039858.964 units remaining) + [ 3 + 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) @parameter ] - - location: 43 (remaining gas: 1039858.814 units remaining) + - location: 43 (remaining gas: 1039858.884 units remaining) [ 2 3 12 @@ -93,52 +143,49 @@ 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) @parameter ] - - location: 50 (remaining gas: 1039858.490 units remaining) + - location: 47 (remaining gas: 1039858.760 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) @parameter ] + - location: 50 (remaining gas: 1039858.680 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) @parameter ] - - location: 49 (remaining gas: 1039858.420 units remaining) - [ 19 + - location: 47 (remaining gas: 1039858.600 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) @parameter ] - - location: 47 (remaining gas: 1039858.420 units remaining) - [ 2 - 3 - 12 - 16 - 10 + - location: 47 (remaining gas: 1039858.520 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) @parameter ] - - location: 54 (remaining gas: 1039858.092 units remaining) - [ 9 - (Pair 18 6 8 11 4 13 15 5 1) + - location: 47 (remaining gas: 1039858.440 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) @parameter ] - - location: 53 (remaining gas: 1039858.022 units remaining) - [ 9 - (Pair 18 6 8 11 4 13 15 5 1) + - location: 47 (remaining gas: 1039858.360 units remaining) + [ 12 + 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) @parameter ] - - location: 51 (remaining gas: 1039858.022 units remaining) - [ 2 - 3 + - location: 47 (remaining gas: 1039858.280 units remaining) + [ 3 12 16 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) @parameter ] - - location: 58 (remaining gas: 1039857.690 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) @parameter ] - - location: 57 (remaining gas: 1039857.620 units remaining) - [ 18 - (Pair 6 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 55 (remaining gas: 1039857.620 units remaining) + - location: 47 (remaining gas: 1039858.200 units remaining) [ 2 3 12 @@ -146,85 +193,61 @@ trace 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) @parameter ] + - location: 51 (remaining gas: 1039858.072 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) @parameter ] + - location: 54 (remaining gas: 1039857.992 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) @parameter ] + - location: 51 (remaining gas: 1039857.912 units remaining) + [ 19 9 - 18 - (Pair 6 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 62 (remaining gas: 1039857.284 units remaining) - [ 6 - (Pair 8 11 4 13 15 5 1) + - location: 51 (remaining gas: 1039857.832 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) @parameter ] - - location: 61 (remaining gas: 1039857.214 units remaining) - [ 6 - (Pair 8 11 4 13 15 5 1) + - location: 51 (remaining gas: 1039857.752 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) @parameter ] - - location: 59 (remaining gas: 1039857.214 units remaining) - [ 2 - 3 - 12 - 16 + - location: 51 (remaining gas: 1039857.672 units remaining) + [ 16 10 14 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) @parameter ] - - location: 66 (remaining gas: 1039856.874 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) @parameter ] - - location: 65 (remaining gas: 1039856.804 units remaining) - [ 8 - (Pair 11 4 13 15 5 1) + (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) @parameter ] - - location: 63 (remaining gas: 1039856.804 units remaining) - [ 2 - 3 - 12 + - location: 51 (remaining gas: 1039857.592 units remaining) + [ 12 16 10 14 19 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) @parameter ] - - location: 70 (remaining gas: 1039856.460 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) @parameter ] - - location: 69 (remaining gas: 1039856.390 units remaining) - [ 11 - (Pair 4 13 15 5 1) + (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) @parameter ] - - location: 67 (remaining gas: 1039856.390 units remaining) - [ 2 - 3 + - location: 51 (remaining gas: 1039857.512 units remaining) + [ 3 12 16 10 14 19 9 - 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) @parameter ] - - location: 74 (remaining gas: 1039856.042 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) @parameter ] - - location: 73 (remaining gas: 1039855.972 units remaining) - [ 4 - (Pair 13 15 5 1) + (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) @parameter ] - - location: 71 (remaining gas: 1039855.972 units remaining) + - location: 51 (remaining gas: 1039857.432 units remaining) [ 2 3 12 @@ -233,94 +256,62 @@ trace 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) @parameter ] + - location: 55 (remaining gas: 1039857.300 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) @parameter ] + - location: 58 (remaining gas: 1039857.220 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) @parameter ] + - location: 55 (remaining gas: 1039857.140 units remaining) + [ 9 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) + (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) @parameter ] - - location: 78 (remaining gas: 1039855.620 units remaining) - [ 13 - (Pair 15 5 1) + - location: 55 (remaining gas: 1039857.060 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) @parameter ] - - location: 77 (remaining gas: 1039855.550 units remaining) - [ 13 - (Pair 15 5 1) + - location: 55 (remaining gas: 1039856.980 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) @parameter ] - - location: 75 (remaining gas: 1039855.550 units remaining) - [ 2 - 3 - 12 - 16 - 10 + - location: 55 (remaining gas: 1039856.900 units remaining) + [ 10 14 19 9 18 - 6 - 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) @parameter ] - - location: 82 (remaining gas: 1039855.194 units remaining) - [ 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 81 (remaining gas: 1039855.124 units remaining) - [ 15 - (Pair 5 1) + (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) @parameter ] - - location: 79 (remaining gas: 1039855.124 units remaining) - [ 2 - 3 - 12 - 16 + - location: 55 (remaining gas: 1039856.820 units remaining) + [ 16 10 14 19 9 18 - 6 - 8 - 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) @parameter ] - - location: 86 (remaining gas: 1039854.764 units remaining) - [ 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 85 (remaining gas: 1039854.694 units remaining) - [ 5 - 1 + (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) @parameter ] - - location: 83 (remaining gas: 1039854.694 units remaining) - [ 2 - 3 - 12 + - location: 55 (remaining gas: 1039856.740 units remaining) + [ 12 16 10 14 19 9 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: -1 (remaining gas: 1039854.624 units remaining) - [ 2 - 3 + - location: 55 (remaining gas: 1039856.660 units remaining) + [ 3 12 16 10 @@ -328,16 +319,9 @@ trace 19 9 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: 87 (remaining gas: 1039854.464 units remaining) + - location: 55 (remaining gas: 1039856.580 units remaining) [ 2 3 12 @@ -347,18 +331,73 @@ trace 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) @parameter ] + - location: 59 (remaining gas: 1039856.444 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) @parameter ] + - location: 62 (remaining gas: 1039856.364 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) @parameter ] + - location: 59 (remaining gas: 1039856.284 units remaining) + [ 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] + - location: 59 (remaining gas: 1039856.204 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) @parameter ] + - location: 59 (remaining gas: 1039856.124 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) @parameter ] + - location: 59 (remaining gas: 1039856.044 units remaining) + [ 14 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.964 units remaining) + [ 10 + 14 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.884 units remaining) + [ 16 + 10 + 14 + 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) @parameter ] + - location: 59 (remaining gas: 1039855.804 units remaining) + [ 12 + 16 + 10 + 14 + 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) @parameter ] - - location: 89 (remaining gas: 1039854.300 units remaining) + - location: 59 (remaining gas: 1039855.724 units remaining) [ 3 - 2 12 16 10 @@ -367,38 +406,75 @@ trace 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: 91 (remaining gas: 1039854.132 units remaining) - [ 12 + - location: 59 (remaining gas: 1039855.644 units remaining) + [ 2 3 - 2 + 12 16 10 14 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) @parameter ] + - location: 63 (remaining gas: 1039855.504 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) @parameter ] + - location: 66 (remaining gas: 1039855.424 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) @parameter ] + - location: 63 (remaining gas: 1039855.344 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) @parameter ] + - location: 63 (remaining gas: 1039855.264 units remaining) + [ 18 6 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] + - location: 63 (remaining gas: 1039855.184 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) @parameter ] + - location: 63 (remaining gas: 1039855.104 units remaining) + [ 19 + 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) @parameter ] + - location: 63 (remaining gas: 1039855.024 units remaining) + [ 14 + 19 + 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) @parameter ] + - location: 63 (remaining gas: 1039854.944 units remaining) + [ 10 + 14 + 19 + 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) @parameter ] - - location: 93 (remaining gas: 1039853.960 units remaining) + - location: 63 (remaining gas: 1039854.864 units remaining) [ 16 - 12 - 3 - 2 10 14 19 @@ -406,205 +482,1090 @@ trace 18 6 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: 95 (remaining gas: 1039853.784 units remaining) - [ 10 + - location: 63 (remaining gas: 1039854.784 units remaining) + [ 12 16 - 12 - 3 - 2 + 10 14 19 9 18 6 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: 97 (remaining gas: 1039853.604 units remaining) - [ 14 - 10 - 16 + - location: 63 (remaining gas: 1039854.704 units remaining) + [ 3 12 - 3 - 2 + 16 + 10 + 14 19 9 18 6 8 - 11 - 4 - 13 - 15 - 5 - 1 + (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) @parameter ] - - location: 99 (remaining gas: 1039853.420 units remaining) - [ 19 - 14 - 10 - 16 - 12 + - location: 63 (remaining gas: 1039854.624 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 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) @parameter ] + - location: 67 (remaining gas: 1039854.480 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) @parameter ] + - location: 70 (remaining gas: 1039854.400 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) @parameter ] + - location: 67 (remaining gas: 1039854.320 units remaining) + [ 8 11 - 4 - 13 - 15 - 5 - 1 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 67 (remaining gas: 1039854.240 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) @parameter ] + - location: 67 (remaining gas: 1039854.160 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) @parameter ] - - location: 101 (remaining gas: 1039853.232 units remaining) + - location: 67 (remaining gas: 1039854.080 units remaining) [ 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 18 6 8 11 - 4 - 13 - 15 - 5 - 1 + (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 103 (remaining gas: 1039853.040 units remaining) - [ 18 + - location: 67 (remaining gas: 1039854 units remaining) + [ 19 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 + 18 6 8 11 - 4 - 13 - 15 - 5 - 1 + (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 105 (remaining gas: 1039852.844 units remaining) - [ 6 - 18 - 9 + - location: 67 (remaining gas: 1039853.920 units remaining) + [ 14 19 - 14 - 10 - 16 - 12 - 3 - 2 + 9 + 18 + 6 8 11 - 4 - 13 - 15 - 5 - 1 + (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 107 (remaining gas: 1039852.644 units remaining) - [ 8 - 6 - 18 - 9 - 19 + - location: 67 (remaining gas: 1039853.840 units remaining) + [ 10 14 - 10 - 16 - 12 - 3 - 2 + 19 + 9 + 18 + 6 + 8 11 - 4 - 13 - 15 - 5 - 1 + (Pair 4 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 109 (remaining gas: 1039852.440 units remaining) - [ 11 - 8 - 6 - 18 - 9 - 19 - 14 + - location: 67 (remaining gas: 1039853.760 units remaining) + [ 16 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.680 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.600 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 67 (remaining gas: 1039853.520 units remaining) + [ 2 3 - 2 - 4 - 13 - 15 - 5 - 1 + 12 + 16 + 10 + 14 + 19 + 9 + 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) @parameter ] - - location: 111 (remaining gas: 1039852.232 units remaining) + - location: 71 (remaining gas: 1039853.372 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) @parameter ] + - location: 74 (remaining gas: 1039853.292 units remaining) [ 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 13 - 15 - 5 - 1 + (Pair 13 15 5 1) (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 113 (remaining gas: 1039852.020 units remaining) - [ 13 + - location: 71 (remaining gas: 1039853.212 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) @parameter ] + - location: 71 (remaining gas: 1039853.132 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) @parameter ] + - location: 71 (remaining gas: 1039853.052 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) @parameter ] + - location: 71 (remaining gas: 1039852.972 units remaining) + [ 18 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) @parameter ] + - location: 71 (remaining gas: 1039852.892 units remaining) + [ 9 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.812 units remaining) + [ 19 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.732 units remaining) + [ 14 19 + 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.652 units remaining) + [ 10 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.572 units remaining) + [ 16 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.492 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.412 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 71 (remaining gas: 1039852.332 units remaining) + [ 2 3 - 2 - 15 - 5 - 1 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] - - location: 115 (remaining gas: 1039851.804 units remaining) - [ 15 + - location: 75 (remaining gas: 1039852.180 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) @parameter ] + - location: 78 (remaining gas: 1039852.100 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) @parameter ] + - location: 75 (remaining gas: 1039852.020 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) @parameter ] + - location: 75 (remaining gas: 1039851.940 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) @parameter ] + - location: 75 (remaining gas: 1039851.860 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) @parameter ] + - location: 75 (remaining gas: 1039851.780 units remaining) + [ 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.700 units remaining) + [ 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.620 units remaining) + [ 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.540 units remaining) + [ 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.460 units remaining) + [ 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.380 units remaining) + [ 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.300 units remaining) + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.220 units remaining) + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.140 units remaining) + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 75 (remaining gas: 1039851.060 units remaining) + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.904 units remaining) + [ (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 82 (remaining gas: 1039850.824 units remaining) + [ 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 79 (remaining gas: 1039850.744 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) @parameter ] + - location: 79 (remaining gas: 1039850.664 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) @parameter ] + - location: 79 (remaining gas: 1039850.584 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) @parameter ] + - location: 79 (remaining gas: 1039850.504 units remaining) + [ 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.424 units remaining) + [ 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.344 units remaining) + [ 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.264 units remaining) + [ 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.184 units remaining) + [ 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.104 units remaining) + [ 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039850.024 units remaining) + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.944 units remaining) + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.864 units remaining) + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.784 units remaining) + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 79 (remaining gas: 1039849.704 units remaining) + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 83 (remaining gas: 1039849.544 units remaining) + [ (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 86 (remaining gas: 1039849.464 units remaining) + [ 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 83 (remaining gas: 1039849.384 units remaining) + [ 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 83 (remaining gas: 1039849.304 units remaining) + [ 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 83 (remaining gas: 1039849.224 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) @parameter ] + - location: 83 (remaining gas: 1039849.144 units remaining) + [ 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 83 (remaining gas: 1039849.064 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.984 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.904 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.824 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.744 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.664 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.584 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.504 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.424 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.344 units remaining) + [ 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) @parameter ] + - location: 83 (remaining gas: 1039848.264 units remaining) + [ 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) @parameter ] + - location: 87 (remaining gas: 1039848.164 units remaining) + [ 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) @parameter ] + - location: 89 (remaining gas: 1039848.060 units remaining) + [ 3 + 2 + 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) @parameter ] + - location: 91 (remaining gas: 1039847.952 units remaining) + [ 12 + 3 + 2 + 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) @parameter ] + - location: 93 (remaining gas: 1039847.840 units remaining) + [ 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 95 (remaining gas: 1039847.724 units remaining) + [ 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 97 (remaining gas: 1039847.604 units remaining) + [ 14 + 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 99 (remaining gas: 1039847.480 units remaining) + [ 19 + 14 + 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 101 (remaining gas: 1039847.352 units remaining) + [ 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 103 (remaining gas: 1039847.220 units remaining) + [ 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 105 (remaining gas: 1039847.084 units remaining) + [ 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 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) @parameter ] + - location: 107 (remaining gas: 1039846.944 units remaining) + [ 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 109 (remaining gas: 1039846.800 units remaining) + [ 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 111 (remaining gas: 1039846.652 units remaining) + [ 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 113 (remaining gas: 1039846.500 units remaining) + [ 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 115 (remaining gas: 1039846.344 units remaining) + [ 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 117 (remaining gas: 1039846.184 units remaining) + [ 5 + 15 13 4 11 @@ -619,11 +1580,11 @@ trace 12 3 2 - 5 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 117 (remaining gas: 1039851.584 units remaining) - [ 5 + - location: 119 (remaining gas: 1039846.020 units remaining) + [ 1 + 5 15 13 4 @@ -639,9 +1600,8 @@ trace 12 3 2 - 1 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 119 (remaining gas: 1039851.360 units remaining) + - location: 121 (remaining gas: 1039845.920 units remaining) [ 1 5 15 @@ -660,9 +1620,9 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 121 (remaining gas: 1039851.200 units remaining) - [ 1 - 5 + - location: 123 (remaining gas: 1039845.816 units remaining) + [ 5 + 1 15 13 4 @@ -679,235 +1639,1028 @@ trace 3 2 (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 123 (remaining gas: 1039851.036 units remaining) + - location: 125 (remaining gas: 1039845.708 units remaining) + [ 15 + 5 + 1 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 127 (remaining gas: 1039845.596 units remaining) + [ 13 + 15 + 5 + 1 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 129 (remaining gas: 1039845.480 units remaining) + [ 4 + 13 + 15 + 5 + 1 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 131 (remaining gas: 1039845.360 units remaining) + [ 11 + 4 + 13 + 15 + 5 + 1 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 133 (remaining gas: 1039845.236 units remaining) + [ 8 + 11 + 4 + 13 + 15 + 5 + 1 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 135 (remaining gas: 1039845.108 units remaining) + [ 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 137 (remaining gas: 1039844.976 units remaining) + [ 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 139 (remaining gas: 1039844.840 units remaining) + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 141 (remaining gas: 1039844.700 units remaining) + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 143 (remaining gas: 1039844.556 units remaining) + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 145 (remaining gas: 1039844.408 units remaining) + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 147 (remaining gas: 1039844.256 units remaining) + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 149 (remaining gas: 1039844.100 units remaining) + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 151 (remaining gas: 1039843.940 units remaining) + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 153 (remaining gas: 1039843.776 units remaining) + [ 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) @parameter ] + - location: 156 (remaining gas: 1039843.616 units remaining) [ 5 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 159 (remaining gas: 1039843.536 units remaining) + [ (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 156 (remaining gas: 1039843.456 units remaining) + [ 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 156 (remaining gas: 1039843.376 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) @parameter ] + - location: 156 (remaining gas: 1039843.296 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) @parameter ] + - location: 156 (remaining gas: 1039843.216 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) @parameter ] + - location: 156 (remaining gas: 1039843.136 units remaining) + [ 8 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) @parameter ] + - location: 156 (remaining gas: 1039843.056 units remaining) + [ 6 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.976 units remaining) + [ 18 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.896 units remaining) + [ 9 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.816 units remaining) + [ 19 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.736 units remaining) + [ 14 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.656 units remaining) + [ 10 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.576 units remaining) + [ 16 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.496 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.416 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] + - location: 156 (remaining gas: 1039842.336 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 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) @parameter ] - - location: 125 (remaining gas: 1039850.868 units remaining) + - location: 160 (remaining gas: 1039842.180 units remaining) [ 15 - 5 - 1 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 163 (remaining gas: 1039842.100 units remaining) + [ (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 160 (remaining gas: 1039842.020 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) @parameter ] + - location: 160 (remaining gas: 1039841.940 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) @parameter ] + - location: 160 (remaining gas: 1039841.860 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) @parameter ] + - location: 160 (remaining gas: 1039841.780 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) @parameter ] + - location: 160 (remaining gas: 1039841.700 units remaining) + [ 6 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) @parameter ] + - location: 160 (remaining gas: 1039841.620 units remaining) + [ 18 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.540 units remaining) + [ 9 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.460 units remaining) + [ 19 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.380 units remaining) + [ 14 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.300 units remaining) + [ 10 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.220 units remaining) + [ 16 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.140 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039841.060 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] + - location: 160 (remaining gas: 1039840.980 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 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) @parameter ] - - location: 127 (remaining gas: 1039850.696 units remaining) + - location: 164 (remaining gas: 1039840.828 units remaining) [ 13 - 15 - 5 - 1 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 167 (remaining gas: 1039840.748 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) @parameter ] + - location: 164 (remaining gas: 1039840.668 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) @parameter ] + - location: 164 (remaining gas: 1039840.588 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) @parameter ] + - location: 164 (remaining gas: 1039840.508 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) @parameter ] + - location: 164 (remaining gas: 1039840.428 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) @parameter ] + - location: 164 (remaining gas: 1039840.348 units remaining) + [ 18 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) @parameter ] + - location: 164 (remaining gas: 1039840.268 units remaining) + [ 9 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.188 units remaining) + [ 19 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.108 units remaining) + [ 14 19 + 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039840.028 units remaining) + [ 10 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.948 units remaining) + [ 16 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.868 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.788 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] + - location: 164 (remaining gas: 1039839.708 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 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) @parameter ] - - location: 129 (remaining gas: 1039850.520 units remaining) + - location: 168 (remaining gas: 1039839.560 units remaining) [ 4 - 13 - 15 - 5 - 1 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + - location: 171 (remaining gas: 1039839.480 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) @parameter ] + - location: 168 (remaining gas: 1039839.400 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) @parameter ] + - location: 168 (remaining gas: 1039839.320 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) @parameter ] + - location: 168 (remaining gas: 1039839.240 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) @parameter ] + - location: 168 (remaining gas: 1039839.160 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) @parameter ] + - location: 168 (remaining gas: 1039839.080 units remaining) + [ 9 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) @parameter ] + - location: 168 (remaining gas: 1039839 units remaining) + [ 19 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.920 units remaining) + [ 14 19 + 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.840 units remaining) + [ 10 14 + 19 + 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.760 units remaining) + [ 16 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.680 units remaining) + [ 12 16 + 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.600 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 168 (remaining gas: 1039838.520 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 + 9 + 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) @parameter ] + - location: 172 (remaining gas: 1039838.376 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) @parameter ] + - location: 175 (remaining gas: 1039838.296 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) @parameter ] + - location: 172 (remaining gas: 1039838.216 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) @parameter ] - - location: 131 (remaining gas: 1039850.340 units remaining) - [ 11 - 4 - 13 - 15 - 5 - 1 + - location: 172 (remaining gas: 1039838.136 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) @parameter ] + - location: 172 (remaining gas: 1039838.056 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) @parameter ] + - location: 172 (remaining gas: 1039837.976 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) @parameter ] + - location: 172 (remaining gas: 1039837.896 units remaining) + [ 19 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) @parameter ] + - location: 172 (remaining gas: 1039837.816 units remaining) + [ 14 19 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.736 units remaining) + [ 10 14 + 19 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.656 units remaining) + [ 16 10 + 14 + 19 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.576 units remaining) + [ 12 16 + 10 + 14 + 19 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.496 units remaining) + [ 3 12 + 16 + 10 + 14 + 19 + 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) @parameter ] + - location: 172 (remaining gas: 1039837.416 units remaining) + [ 2 3 - 2 + 12 + 16 + 10 + 14 + 19 + 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) @parameter ] - - location: 133 (remaining gas: 1039850.156 units remaining) + - location: 176 (remaining gas: 1039837.276 units remaining) [ 8 - 11 - 4 - 13 - 15 - 5 - 1 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] + - location: 179 (remaining gas: 1039837.196 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) @parameter ] - - location: 135 (remaining gas: 1039849.968 units remaining) + - location: 176 (remaining gas: 1039837.116 units remaining) [ 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 137 (remaining gas: 1039849.776 units remaining) + - location: 176 (remaining gas: 1039837.036 units remaining) [ 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 139 (remaining gas: 1039849.580 units remaining) + - location: 176 (remaining gas: 1039836.956 units remaining) [ 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 19 - 14 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 141 (remaining gas: 1039849.380 units remaining) + - location: 176 (remaining gas: 1039836.876 units remaining) [ 19 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 14 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 143 (remaining gas: 1039849.176 units remaining) + - location: 176 (remaining gas: 1039836.796 units remaining) [ 14 19 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 10 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 145 (remaining gas: 1039848.968 units remaining) + - location: 176 (remaining gas: 1039836.716 units remaining) [ 10 14 19 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 16 - 12 - 3 - 2 + (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) @parameter ] - - location: 147 (remaining gas: 1039848.756 units remaining) + - location: 176 (remaining gas: 1039836.636 units remaining) [ 16 10 14 @@ -915,18 +2668,9 @@ trace 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 12 - 3 - 2 + (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) @parameter ] - - location: 149 (remaining gas: 1039848.540 units remaining) + - location: 176 (remaining gas: 1039836.556 units remaining) [ 12 16 10 @@ -935,17 +2679,9 @@ trace 9 18 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 3 - 2 + (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) @parameter ] - - location: 151 (remaining gas: 1039848.320 units remaining) + - location: 176 (remaining gas: 1039836.476 units remaining) [ 3 12 16 @@ -954,44 +2690,80 @@ trace 19 9 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 2 + 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) @parameter ] + - location: 176 (remaining gas: 1039836.396 units remaining) + [ 2 + 3 + 12 + 16 + 10 + 14 + 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) @parameter ] + - location: 180 (remaining gas: 1039836.260 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) @parameter ] + - location: 183 (remaining gas: 1039836.180 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) @parameter ] + - location: 180 (remaining gas: 1039836.100 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) @parameter ] + - location: 180 (remaining gas: 1039836.020 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) @parameter ] + - location: 180 (remaining gas: 1039835.940 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) @parameter ] + - location: 180 (remaining gas: 1039835.860 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) @parameter ] + - location: 180 (remaining gas: 1039835.780 units remaining) + [ 10 + 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) @parameter ] + - location: 180 (remaining gas: 1039835.700 units remaining) + [ 16 + 10 + 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) @parameter ] - - location: 153 (remaining gas: 1039848.096 units remaining) - [ 2 - 3 - 12 + - location: 180 (remaining gas: 1039835.620 units remaining) + [ 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) @parameter ] - - location: 159 (remaining gas: 1039847.676 units remaining) - [ (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 158 (remaining gas: 1039847.606 units remaining) - [ (Pair 5 1) + (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) @parameter ] - - location: 156 (remaining gas: 1039847.606 units remaining) - [ 2 - 3 + - location: 180 (remaining gas: 1039835.540 units remaining) + [ 3 12 16 10 @@ -999,21 +2771,9 @@ trace 19 9 18 - 6 - 8 - 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) @parameter ] - - location: 163 (remaining gas: 1039847.250 units remaining) - [ (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] - - location: 162 (remaining gas: 1039847.180 units remaining) - [ (Pair 15 5 1) + (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) @parameter ] - - location: 160 (remaining gas: 1039847.180 units remaining) + - location: 180 (remaining gas: 1039835.460 units remaining) [ 2 3 12 @@ -1023,83 +2783,65 @@ trace 19 9 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) + (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) @parameter ] - - location: 167 (remaining gas: 1039846.828 units remaining) - [ (Pair 13 15 5 1) + - location: 184 (remaining gas: 1039835.328 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) @parameter ] - - location: 166 (remaining gas: 1039846.758 units remaining) - [ (Pair 13 15 5 1) + - location: 187 (remaining gas: 1039835.248 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) @parameter ] - - location: 164 (remaining gas: 1039846.758 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 + - location: 184 (remaining gas: 1039835.168 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) @parameter ] + - location: 184 (remaining gas: 1039835.088 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) @parameter ] + - location: 184 (remaining gas: 1039835.008 units remaining) + [ 14 19 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) + (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) @parameter ] - - location: 171 (remaining gas: 1039846.410 units remaining) - [ (Pair 4 13 15 5 1) + - location: 184 (remaining gas: 1039834.928 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) @parameter ] - - location: 170 (remaining gas: 1039846.340 units remaining) - [ (Pair 4 13 15 5 1) + - location: 184 (remaining gas: 1039834.848 units remaining) + [ 16 + 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) @parameter ] - - location: 168 (remaining gas: 1039846.340 units remaining) - [ 2 - 3 - 12 + - location: 184 (remaining gas: 1039834.768 units remaining) + [ 12 16 10 14 19 9 - 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) @parameter ] - - location: 175 (remaining gas: 1039845.996 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) @parameter ] - - location: 174 (remaining gas: 1039845.926 units remaining) - [ (Pair 11 4 13 15 5 1) + (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) @parameter ] - - location: 172 (remaining gas: 1039845.926 units remaining) - [ 2 - 3 + - location: 184 (remaining gas: 1039834.688 units remaining) + [ 3 12 16 10 14 19 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) @parameter ] - - location: 179 (remaining gas: 1039845.586 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) @parameter ] - - location: 178 (remaining gas: 1039845.516 units remaining) - [ (Pair 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 176 (remaining gas: 1039845.516 units remaining) + - location: 184 (remaining gas: 1039834.608 units remaining) [ 2 3 12 @@ -1108,52 +2850,55 @@ trace 14 19 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 183 (remaining gas: 1039845.180 units remaining) - [ (Pair 6 8 11 4 13 15 5 1) + - location: 188 (remaining gas: 1039834.480 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) @parameter ] - - location: 182 (remaining gas: 1039845.110 units remaining) - [ (Pair 6 8 11 4 13 15 5 1) + - location: 191 (remaining gas: 1039834.400 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) @parameter ] - - location: 180 (remaining gas: 1039845.110 units remaining) - [ 2 - 3 - 12 - 16 - 10 + - location: 188 (remaining gas: 1039834.320 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) @parameter ] + - location: 188 (remaining gas: 1039834.240 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) @parameter ] + - location: 188 (remaining gas: 1039834.160 units remaining) + [ 10 14 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 187 (remaining gas: 1039844.778 units remaining) - [ (Pair 18 6 8 11 4 13 15 5 1) + - location: 188 (remaining gas: 1039834.080 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) @parameter ] - - location: 186 (remaining gas: 1039844.708 units remaining) - [ (Pair 18 6 8 11 4 13 15 5 1) + - location: 188 (remaining gas: 1039834 units remaining) + [ 12 + 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) @parameter ] - - location: 184 (remaining gas: 1039844.708 units remaining) - [ 2 - 3 + - location: 188 (remaining gas: 1039833.920 units remaining) + [ 3 12 16 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) @parameter ] - - location: 191 (remaining gas: 1039844.380 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) @parameter ] - - location: 190 (remaining gas: 1039844.310 units remaining) - [ (Pair 9 18 6 8 11 4 13 15 5 1) + (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) @parameter ] - - location: 188 (remaining gas: 1039844.310 units remaining) + - location: 188 (remaining gas: 1039833.840 units remaining) [ 2 3 12 @@ -1163,13 +2908,44 @@ 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) @parameter ] - - location: 195 (remaining gas: 1039843.986 units remaining) - [ (Pair 19 9 18 6 8 11 4 13 15 5 1) + - location: 192 (remaining gas: 1039833.716 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) @parameter ] - - location: 194 (remaining gas: 1039843.916 units remaining) + - location: 195 (remaining gas: 1039833.636 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) @parameter ] - - location: 192 (remaining gas: 1039843.916 units remaining) + - location: 192 (remaining gas: 1039833.556 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) @parameter ] + - location: 192 (remaining gas: 1039833.476 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) @parameter ] + - location: 192 (remaining gas: 1039833.396 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) @parameter ] + - location: 192 (remaining gas: 1039833.316 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) @parameter ] + - location: 192 (remaining gas: 1039833.236 units remaining) + [ 3 + 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) @parameter ] + - location: 192 (remaining gas: 1039833.156 units remaining) [ 2 3 12 @@ -1178,13 +2954,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) @parameter ] - - location: 199 (remaining gas: 1039843.596 units remaining) - [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 196 (remaining gas: 1039833.036 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) @parameter ] - - location: 198 (remaining gas: 1039843.526 units remaining) + - location: 199 (remaining gas: 1039832.956 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) @parameter ] - - location: 196 (remaining gas: 1039843.526 units remaining) + - location: 196 (remaining gas: 1039832.876 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) @parameter ] + - location: 196 (remaining gas: 1039832.796 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) @parameter ] + - location: 196 (remaining gas: 1039832.716 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) @parameter ] + - location: 196 (remaining gas: 1039832.636 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) @parameter ] + - location: 196 (remaining gas: 1039832.556 units remaining) [ 2 3 12 @@ -1192,75 +2991,96 @@ 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) @parameter ] - - location: 203 (remaining gas: 1039843.210 units remaining) - [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 200 (remaining gas: 1039832.440 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) @parameter ] - - location: 202 (remaining gas: 1039843.140 units remaining) + - location: 203 (remaining gas: 1039832.360 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) @parameter ] - - location: 200 (remaining gas: 1039843.140 units remaining) + - location: 200 (remaining gas: 1039832.280 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) @parameter ] + - location: 200 (remaining gas: 1039832.200 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) @parameter ] + - location: 200 (remaining gas: 1039832.120 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) @parameter ] + - location: 200 (remaining gas: 1039832.040 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) @parameter ] - - location: 207 (remaining gas: 1039842.828 units remaining) - [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 204 (remaining gas: 1039831.928 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) @parameter ] - - location: 206 (remaining gas: 1039842.758 units remaining) + - location: 207 (remaining gas: 1039831.848 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) @parameter ] - - location: 204 (remaining gas: 1039842.758 units remaining) + - location: 204 (remaining gas: 1039831.768 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) @parameter ] + - location: 204 (remaining gas: 1039831.688 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) @parameter ] + - location: 204 (remaining gas: 1039831.608 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) @parameter ] - - location: 211 (remaining gas: 1039842.450 units remaining) - [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 208 (remaining gas: 1039831.500 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) @parameter ] - - location: 210 (remaining gas: 1039842.380 units remaining) + - location: 211 (remaining gas: 1039831.420 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) @parameter ] - - location: 208 (remaining gas: 1039842.380 units remaining) + - location: 208 (remaining gas: 1039831.340 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) @parameter ] + - location: 208 (remaining gas: 1039831.260 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) @parameter ] - - location: 214 (remaining gas: 1039842.080 units remaining) - [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + - location: 212 (remaining gas: 1039831.160 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) @parameter ] - - location: 213 (remaining gas: 1039842.010 units remaining) + - location: 214 (remaining gas: 1039831.080 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) @parameter ] - - location: 212 (remaining gas: 1039842.010 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) @parameter ] - - location: 215 (remaining gas: 1039841.870 units remaining) + - location: 215 (remaining gas: 1039831 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) @parameter ] - - location: -1 (remaining gas: 1039841.800 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) @parameter ] - - location: 218 (remaining gas: 1039839.070 units remaining) + - location: 218 (remaining gas: 1039828.450 units remaining) [ 0 ] - - location: 219 (remaining gas: 1039838.930 units remaining) + - location: 219 (remaining gas: 1039828.370 units remaining) [ True ] - - location: -1 (remaining gas: 1039838.860 units remaining) - [ True ] - - location: 221 (remaining gas: 1039838.670 units remaining) + - location: 220 (remaining gas: 1039828.310 units remaining) [ ] - - location: -1 (remaining gas: 1039838.600 units remaining) + - location: 221 (remaining gas: 1039828.240 units remaining) [ ] - - location: 226 (remaining gas: 1039838.460 units remaining) + - location: 226 (remaining gas: 1039828.160 units remaining) [ Unit ] - - location: 227 (remaining gas: 1039838.320 units remaining) + - location: 227 (remaining gas: 1039828.080 units remaining) [ {} Unit ] - - location: 229 (remaining gas: 1039838.180 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039838.110 units remaining) + - location: 229 (remaining gas: 1039828 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 f4cfbeb69cad19c87cba8ca307ec89eb45f56d19..d54c5cf4d23cf59091955c44b0ed7d08418f5b33 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,54 +7,53 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039984.510 units remaining) + - location: 15 (remaining gas: 1039984.510 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039984.370 units remaining) + - location: 15 (remaining gas: 1039984.430 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] - - location: 16 (remaining gas: 1039984.230 units remaining) + - location: 16 (remaining gas: 1039984.350 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039984.090 units remaining) + - location: 17 (remaining gas: 1039984.270 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039983.950 units remaining) + - location: 18 (remaining gas: 1039984.190 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039983.810 units remaining) + - location: 19 (remaining gas: 1039984.110 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039983.634 units remaining) + - location: 20 (remaining gas: 1039983.994 units remaining) [ 5 1 2 3 4 ] - - location: 24 (remaining gas: 1039983.334 units remaining) + - location: 22 (remaining gas: 1039983.894 units remaining) + [ 1 + 2 + 3 + 4 ] + - location: 24 (remaining gas: 1039983.814 units remaining) [ 2 3 4 ] - - location: 25 (remaining gas: 1039983.194 units remaining) + - location: 25 (remaining gas: 1039983.734 units remaining) [ 3 4 ] - - location: 26 (remaining gas: 1039983.054 units remaining) + - location: 26 (remaining gas: 1039983.654 units remaining) [ 4 ] - - location: 27 (remaining gas: 1039982.914 units remaining) - [ ] - - location: -1 (remaining gas: 1039982.844 units remaining) + - location: 27 (remaining gas: 1039983.574 units remaining) [ ] - - location: 22 (remaining gas: 1039982.844 units remaining) - [ 5 ] - - location: 28 (remaining gas: 1039982.704 units remaining) + - location: 28 (remaining gas: 1039983.494 units remaining) [ {} 5 ] - - location: 30 (remaining gas: 1039982.564 units remaining) - [ (Pair {} 5) ] - - location: -1 (remaining gas: 1039982.494 units remaining) + - location: 30 (remaining gas: 1039983.414 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 2349a3c47b238f491d337214715aa5050d575ce9..1c707aa59f59929addf2c85aed2c1e1aedcf6317 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,31 +7,27 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039989.600 units remaining) + - location: 11 (remaining gas: 1039989.600 units remaining) [ (Pair (Pair 1 1) 0 0) ] - - location: 11 (remaining gas: 1039989.460 units remaining) + - location: 11 (remaining gas: 1039989.520 units remaining) [ (Pair 1 1) @parameter ] - - location: 12 (remaining gas: 1039989.320 units remaining) + - location: 12 (remaining gas: 1039989.440 units remaining) [ 1 1 ] - - location: 13 (remaining gas: 1039989.180 units remaining) + - location: 13 (remaining gas: 1039989.360 units remaining) [ 1 1 1 ] - - location: 16 (remaining gas: 1039988.880 units remaining) - [ 2 ] - - location: 15 (remaining gas: 1039988.810 units remaining) - [ 2 ] - - location: 14 (remaining gas: 1039988.810 units remaining) + - location: 14 (remaining gas: 1039989.260 units remaining) [ 1 - 2 ] - - location: 17 (remaining gas: 1039988.670 units remaining) + 1 ] + - location: 16 (remaining gas: 1039989.180 units remaining) + [ 2 ] + - location: 17 (remaining gas: 1039989.100 units remaining) [ (Pair 1 2) ] - - location: 18 (remaining gas: 1039988.530 units remaining) + - location: 18 (remaining gas: 1039989.020 units remaining) [ {} (Pair 1 2) ] - - location: 20 (remaining gas: 1039988.390 units remaining) - [ (Pair {} 1 2) ] - - location: -1 (remaining gas: 1039988.320 units remaining) + - location: 20 (remaining gas: 1039988.940 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 400392671cf014be431e0b00796d8c87e5aa6cd9..bf487e6648a8c3f7e2879e5d8f12525c97c348a9 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,31 +7,27 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039989.600 units remaining) + - location: 11 (remaining gas: 1039989.600 units remaining) [ (Pair (Pair 15 9) 0 0) ] - - location: 11 (remaining gas: 1039989.460 units remaining) + - location: 11 (remaining gas: 1039989.520 units remaining) [ (Pair 15 9) @parameter ] - - location: 12 (remaining gas: 1039989.320 units remaining) + - location: 12 (remaining gas: 1039989.440 units remaining) [ 15 9 ] - - location: 13 (remaining gas: 1039989.180 units remaining) + - location: 13 (remaining gas: 1039989.360 units remaining) [ 15 15 9 ] - - location: 16 (remaining gas: 1039988.880 units remaining) - [ 24 ] - - location: 15 (remaining gas: 1039988.810 units remaining) - [ 24 ] - - location: 14 (remaining gas: 1039988.810 units remaining) + - location: 14 (remaining gas: 1039989.260 units remaining) [ 15 - 24 ] - - location: 17 (remaining gas: 1039988.670 units remaining) + 9 ] + - location: 16 (remaining gas: 1039989.180 units remaining) + [ 24 ] + - location: 17 (remaining gas: 1039989.100 units remaining) [ (Pair 15 24) ] - - location: 18 (remaining gas: 1039988.530 units remaining) + - location: 18 (remaining gas: 1039989.020 units remaining) [ {} (Pair 15 24) ] - - location: 20 (remaining gas: 1039988.390 units remaining) - [ (Pair {} 15 24) ] - - location: -1 (remaining gas: 1039988.320 units remaining) + - location: 20 (remaining gas: 1039988.940 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 8d66497b1a2210d2a22d8216770ae7ee7db6a1f8..aa8c25c545cbb24039c39d35ca5cc27a87a5fd97 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,64 +7,80 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039983.300 units remaining) + - location: 15 (remaining gas: 1039983.300 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039983.160 units remaining) + - location: 15 (remaining gas: 1039983.220 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] - - location: 16 (remaining gas: 1039983.020 units remaining) + - location: 16 (remaining gas: 1039983.140 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039982.880 units remaining) + - location: 17 (remaining gas: 1039983.060 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039982.740 units remaining) + - location: 18 (remaining gas: 1039982.980 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039982.600 units remaining) + - location: 19 (remaining gas: 1039982.900 units remaining) [ 1 2 3 4 5 ] - - location: 23 (remaining gas: 1039982.280 units remaining) + - location: 20 (remaining gas: 1039982.780 units remaining) + [ ] + - location: 23 (remaining gas: 1039982.700 units remaining) [ 6 ] - - location: 22 (remaining gas: 1039982.210 units remaining) - [ 6 ] - - location: 20 (remaining gas: 1039982.210 units remaining) + - location: 20 (remaining gas: 1039982.620 units remaining) + [ 5 + 6 ] + - location: 20 (remaining gas: 1039982.540 units remaining) + [ 4 + 5 + 6 ] + - location: 20 (remaining gas: 1039982.460 units remaining) + [ 3 + 4 + 5 + 6 ] + - location: 20 (remaining gas: 1039982.380 units remaining) + [ 2 + 3 + 4 + 5 + 6 ] + - location: 20 (remaining gas: 1039982.300 units remaining) [ 1 2 3 4 5 6 ] - - location: 26 (remaining gas: 1039982.070 units remaining) + - location: 26 (remaining gas: 1039982.220 units remaining) [ 2 3 4 5 6 ] - - location: 27 (remaining gas: 1039981.930 units remaining) + - location: 27 (remaining gas: 1039982.140 units remaining) [ 3 4 5 6 ] - - location: 28 (remaining gas: 1039981.790 units remaining) + - location: 28 (remaining gas: 1039982.060 units remaining) [ 4 5 6 ] - - location: 29 (remaining gas: 1039981.650 units remaining) + - location: 29 (remaining gas: 1039981.980 units remaining) [ 5 6 ] - - location: 30 (remaining gas: 1039981.510 units remaining) + - location: 30 (remaining gas: 1039981.900 units remaining) [ 6 ] - - location: 31 (remaining gas: 1039981.370 units remaining) + - location: 31 (remaining gas: 1039981.820 units remaining) [ {} 6 ] - - location: 33 (remaining gas: 1039981.230 units remaining) - [ (Pair {} 6) ] - - location: -1 (remaining gas: 1039981.160 units remaining) + - location: 33 (remaining gas: 1039981.740 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 896654e1c5f4b449965c69eaff74aa7bfac1b7ae..5c31385d0082c682ee2d8208940fc5d17ca9deaa 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,35 +7,33 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039988.260 units remaining) + - location: 15 (remaining gas: 1039988.260 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039988.120 units remaining) + - location: 15 (remaining gas: 1039988.180 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] - - location: 16 (remaining gas: 1039987.980 units remaining) + - location: 16 (remaining gas: 1039988.100 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039987.840 units remaining) + - location: 17 (remaining gas: 1039988.020 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039987.700 units remaining) + - location: 18 (remaining gas: 1039987.940 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039987.560 units remaining) + - location: 19 (remaining gas: 1039987.860 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039987.384 units remaining) + - location: 20 (remaining gas: 1039987.744 units remaining) [ 5 ] - - location: 22 (remaining gas: 1039987.244 units remaining) + - location: 22 (remaining gas: 1039987.664 units remaining) [ {} 5 ] - - location: 24 (remaining gas: 1039987.104 units remaining) - [ (Pair {} 5) ] - - location: -1 (remaining gas: 1039987.034 units remaining) + - location: 24 (remaining gas: 1039987.584 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 0b1ae7b25a2c439b3c00dff532ff7dcb991e31da..571116056ad87f2eef4764ca470ce51acfea8bb3 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,53 +7,51 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039985.260 units remaining) + - location: 15 (remaining gas: 1039985.260 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - - location: 15 (remaining gas: 1039985.120 units remaining) + - location: 15 (remaining gas: 1039985.180 units remaining) [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] - - location: 16 (remaining gas: 1039984.980 units remaining) + - location: 16 (remaining gas: 1039985.100 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] - - location: 17 (remaining gas: 1039984.840 units remaining) + - location: 17 (remaining gas: 1039985.020 units remaining) [ (Pair (Pair 1 2) 3) 4 5 ] - - location: 18 (remaining gas: 1039984.700 units remaining) + - location: 18 (remaining gas: 1039984.940 units remaining) [ (Pair 1 2) 3 4 5 ] - - location: 19 (remaining gas: 1039984.560 units remaining) + - location: 19 (remaining gas: 1039984.860 units remaining) [ 1 2 3 4 5 ] - - location: 20 (remaining gas: 1039984.384 units remaining) + - location: 20 (remaining gas: 1039984.744 units remaining) [ 2 3 4 5 1 ] - - location: 22 (remaining gas: 1039984.244 units remaining) + - location: 22 (remaining gas: 1039984.664 units remaining) [ 3 4 5 1 ] - - location: 23 (remaining gas: 1039984.104 units remaining) + - location: 23 (remaining gas: 1039984.584 units remaining) [ 4 5 1 ] - - location: 24 (remaining gas: 1039983.964 units remaining) + - location: 24 (remaining gas: 1039984.504 units remaining) [ 5 1 ] - - location: 25 (remaining gas: 1039983.824 units remaining) + - location: 25 (remaining gas: 1039984.424 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039983.684 units remaining) + - location: 26 (remaining gas: 1039984.344 units remaining) [ {} 1 ] - - location: 28 (remaining gas: 1039983.544 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039983.474 units remaining) + - location: 28 (remaining gas: 1039984.264 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 f0bede1233d56f3bf201303045fd5e4ad3467569..2ab4a4d0d7aabb1cd37c769c180b0465119ced78 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: 6 (remaining gas: 1039948.940 units remaining) + - location: 7 (remaining gas: 1039948.940 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039948.800 units remaining) + - location: 7 (remaining gas: 1039948.860 units remaining) [ ] - - location: 8 (remaining gas: 1039948.660 units remaining) + - location: 8 (remaining gas: 1039948.780 units remaining) [ 5 ] - - location: 11 (remaining gas: 1039948.520 units remaining) + - location: 11 (remaining gas: 1039948.700 units remaining) [ 4 5 ] - - location: 14 (remaining gas: 1039948.380 units remaining) + - location: 14 (remaining gas: 1039948.620 units remaining) [ 3 4 5 ] - - location: 17 (remaining gas: 1039948.240 units remaining) + - location: 17 (remaining gas: 1039948.540 units remaining) [ 2 3 4 5 ] - - location: 20 (remaining gas: 1039948.100 units remaining) + - location: 20 (remaining gas: 1039948.460 units remaining) [ 1 2 3 4 5 ] - - location: 23 (remaining gas: 1039947.979 units remaining) + - location: 23 (remaining gas: 1039948.399 units remaining) [ 1 1 2 3 4 5 ] - - location: 25 (remaining gas: 1039947.839 units remaining) + - location: 25 (remaining gas: 1039948.319 units remaining) [ 1 1 1 @@ -46,47 +46,40 @@ trace 3 4 5 ] - - location: 30 (remaining gas: 1039947.509 units remaining) + - location: 30 (remaining gas: 1039948.169 units remaining) [ 0 1 2 3 4 5 ] - - location: 31 (remaining gas: 1039947.369 units remaining) + - location: 31 (remaining gas: 1039948.089 units remaining) [ True 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039947.299 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] - - location: 33 (remaining gas: 1039947.109 units remaining) + - location: 32 (remaining gas: 1039948.029 units remaining) [ 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039947.039 units remaining) + - location: 33 (remaining gas: 1039947.959 units remaining) [ 1 2 3 4 5 ] - - location: 38 (remaining gas: 1039946.917 units remaining) + - location: 38 (remaining gas: 1039947.897 units remaining) [ 2 1 2 3 4 5 ] - - location: 40 (remaining gas: 1039946.777 units remaining) + - location: 40 (remaining gas: 1039947.817 units remaining) [ 2 2 1 @@ -94,47 +87,40 @@ trace 3 4 5 ] - - location: 45 (remaining gas: 1039946.447 units remaining) + - location: 45 (remaining gas: 1039947.667 units remaining) [ 0 1 2 3 4 5 ] - - location: 46 (remaining gas: 1039946.307 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] - - location: -1 (remaining gas: 1039946.237 units remaining) + - location: 46 (remaining gas: 1039947.587 units remaining) [ True 1 2 3 4 5 ] - - location: 48 (remaining gas: 1039946.047 units remaining) + - location: 47 (remaining gas: 1039947.527 units remaining) [ 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039945.977 units remaining) + - location: 48 (remaining gas: 1039947.457 units remaining) [ 1 2 3 4 5 ] - - location: 53 (remaining gas: 1039945.854 units remaining) + - location: 53 (remaining gas: 1039947.394 units remaining) [ 3 1 2 3 4 5 ] - - location: 55 (remaining gas: 1039945.714 units remaining) + - location: 55 (remaining gas: 1039947.314 units remaining) [ 3 3 1 @@ -142,47 +128,40 @@ trace 3 4 5 ] - - location: 60 (remaining gas: 1039945.384 units remaining) + - location: 60 (remaining gas: 1039947.164 units remaining) [ 0 1 2 3 4 5 ] - - location: 61 (remaining gas: 1039945.244 units remaining) + - location: 61 (remaining gas: 1039947.084 units remaining) [ True 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039945.174 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] - - location: 63 (remaining gas: 1039944.984 units remaining) + - location: 62 (remaining gas: 1039947.024 units remaining) [ 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039944.914 units remaining) + - location: 63 (remaining gas: 1039946.954 units remaining) [ 1 2 3 4 5 ] - - location: 68 (remaining gas: 1039944.789 units remaining) + - location: 68 (remaining gas: 1039946.889 units remaining) [ 4 1 2 3 4 5 ] - - location: 70 (remaining gas: 1039944.649 units remaining) + - location: 70 (remaining gas: 1039946.809 units remaining) [ 4 4 1 @@ -190,47 +169,40 @@ trace 3 4 5 ] - - location: 75 (remaining gas: 1039944.319 units remaining) + - location: 75 (remaining gas: 1039946.659 units remaining) [ 0 1 2 3 4 5 ] - - location: 76 (remaining gas: 1039944.179 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] - - location: -1 (remaining gas: 1039944.109 units remaining) + - location: 76 (remaining gas: 1039946.579 units remaining) [ True 1 2 3 4 5 ] - - location: 78 (remaining gas: 1039943.919 units remaining) + - location: 77 (remaining gas: 1039946.519 units remaining) [ 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039943.849 units remaining) + - location: 78 (remaining gas: 1039946.449 units remaining) [ 1 2 3 4 5 ] - - location: 83 (remaining gas: 1039943.723 units remaining) + - location: 83 (remaining gas: 1039946.383 units remaining) [ 5 1 2 3 4 5 ] - - location: 85 (remaining gas: 1039943.583 units remaining) + - location: 85 (remaining gas: 1039946.303 units remaining) [ 5 5 1 @@ -238,48 +210,39 @@ trace 3 4 5 ] - - location: 90 (remaining gas: 1039943.253 units remaining) + - location: 90 (remaining gas: 1039946.153 units remaining) [ 0 1 2 3 4 5 ] - - location: 91 (remaining gas: 1039943.113 units remaining) + - location: 91 (remaining gas: 1039946.073 units remaining) [ True 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039943.043 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] - - location: 93 (remaining gas: 1039942.853 units remaining) + - location: 92 (remaining gas: 1039946.013 units remaining) [ 1 2 3 4 5 ] - - location: -1 (remaining gas: 1039942.783 units remaining) + - location: 93 (remaining gas: 1039945.943 units remaining) [ 1 2 3 4 5 ] - - location: 98 (remaining gas: 1039942.603 units remaining) + - location: 98 (remaining gas: 1039945.823 units remaining) [ ] - - location: 100 (remaining gas: 1039942.463 units remaining) + - location: 100 (remaining gas: 1039945.743 units remaining) [ Unit ] - - location: 101 (remaining gas: 1039942.323 units remaining) + - location: 101 (remaining gas: 1039945.663 units remaining) [ {} Unit ] - - location: 103 (remaining gas: 1039942.183 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039942.113 units remaining) + - location: 103 (remaining gas: 1039945.583 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 133eeae947f0b1a76c6b2861f826e3e61f6a7167..9e3c45f675b6194225d9e7bfbe3a4cd4e5da2600 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,131 +7,119 @@ emitted operations big_map diff trace - - location: 24 (remaining gas: 1039966.445 units remaining) + - location: 25 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair -8 2) None None None None) ] - - location: 25 (remaining gas: 1039966.305 units remaining) + - location: 25 (remaining gas: 1039966.365 units remaining) [ (Pair -8 2) @parameter ] - - location: 26 (remaining gas: 1039966.165 units remaining) + - location: 26 (remaining gas: 1039966.285 units remaining) [ (Pair -8 2) @parameter (Pair -8 2) @parameter ] - - location: 27 (remaining gas: 1039966.025 units remaining) + - location: 27 (remaining gas: 1039966.205 units remaining) [ -8 2 (Pair -8 2) @parameter ] - - location: 28 (remaining gas: 1039965.885 units remaining) + - location: 28 (remaining gas: 1039966.125 units remaining) [ 8 2 (Pair -8 2) @parameter ] - - location: 31 (remaining gas: 1039965.585 units remaining) + - location: 29 (remaining gas: 1039966.025 units remaining) [ 2 (Pair -8 2) @parameter ] - - location: 30 (remaining gas: 1039965.515 units remaining) + - location: 31 (remaining gas: 1039965.945 units remaining) [ 2 (Pair -8 2) @parameter ] - - location: 29 (remaining gas: 1039965.515 units remaining) - [ 8 - 2 - (Pair -8 2) @parameter ] - - location: 32 (remaining gas: 1039965.155 units remaining) + - location: 32 (remaining gas: 1039965.645 units remaining) [ (Some (Pair 4 0)) (Pair -8 2) @parameter ] - - location: 33 (remaining gas: 1039965.025 units remaining) + - location: 33 (remaining gas: 1039965.575 units remaining) [ (Pair -8 2) @parameter (Some (Pair 4 0)) ] - - location: 34 (remaining gas: 1039964.885 units remaining) + - location: 34 (remaining gas: 1039965.495 units remaining) [ (Pair -8 2) @parameter (Pair -8 2) @parameter (Some (Pair 4 0)) ] - - location: 35 (remaining gas: 1039964.745 units remaining) + - location: 35 (remaining gas: 1039965.415 units remaining) [ -8 2 (Pair -8 2) @parameter (Some (Pair 4 0)) ] - - location: 36 (remaining gas: 1039964.605 units remaining) + - location: 36 (remaining gas: 1039965.335 units remaining) [ 8 2 (Pair -8 2) @parameter (Some (Pair 4 0)) ] - - location: 37 (remaining gas: 1039964.245 units remaining) + - location: 37 (remaining gas: 1039965.035 units remaining) [ (Some (Pair 4 0)) (Pair -8 2) @parameter (Some (Pair 4 0)) ] - - location: 38 (remaining gas: 1039964.115 units remaining) + - location: 38 (remaining gas: 1039964.965 units remaining) [ (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 39 (remaining gas: 1039963.975 units remaining) + - location: 39 (remaining gas: 1039964.885 units remaining) [ (Pair -8 2) @parameter (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 40 (remaining gas: 1039963.835 units remaining) + - location: 40 (remaining gas: 1039964.805 units remaining) [ -8 2 (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 43 (remaining gas: 1039963.535 units remaining) + - location: 41 (remaining gas: 1039964.705 units remaining) [ 2 (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 42 (remaining gas: 1039963.465 units remaining) + - location: 43 (remaining gas: 1039964.625 units remaining) [ 2 (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 41 (remaining gas: 1039963.465 units remaining) - [ -8 - 2 - (Pair -8 2) @parameter - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] - - location: 44 (remaining gas: 1039963.105 units remaining) + - location: 44 (remaining gas: 1039964.325 units remaining) [ (Some (Pair -4 0)) (Pair -8 2) @parameter (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 45 (remaining gas: 1039962.975 units remaining) + - location: 45 (remaining gas: 1039964.255 units remaining) [ (Pair -8 2) @parameter (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 46 (remaining gas: 1039962.835 units remaining) + - location: 46 (remaining gas: 1039964.175 units remaining) [ -8 2 (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 47 (remaining gas: 1039962.475 units remaining) + - location: 47 (remaining gas: 1039963.875 units remaining) [ (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - - location: 52 (remaining gas: 1039962.107 units remaining) - [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 51 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.767 units remaining) + [ (Some (Pair 4 0)) + (Some (Pair 4 0)) ] + - location: 52 (remaining gas: 1039963.687 units remaining) [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 49 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.607 units remaining) + [ (Some (Pair -4 0)) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + - location: 49 (remaining gas: 1039963.527 units remaining) [ (Some (Pair -4 0)) (Some (Pair -4 0)) (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 55 (remaining gas: 1039961.737 units remaining) - [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 54 (remaining gas: 1039961.667 units remaining) - [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 53 (remaining gas: 1039961.667 units remaining) + - location: 53 (remaining gas: 1039963.427 units remaining) [ (Some (Pair -4 0)) - (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 56 (remaining gas: 1039961.527 units remaining) - [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: -1 (remaining gas: 1039961.457 units remaining) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + - location: 55 (remaining gas: 1039963.347 units remaining) + [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + - location: 56 (remaining gas: 1039963.267 units remaining) [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 57 (remaining gas: 1039961.317 units remaining) + - location: 57 (remaining gas: 1039963.187 units remaining) [ {} (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: 59 (remaining gas: 1039961.177 units remaining) - [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - - location: -1 (remaining gas: 1039961.107 units remaining) + - location: 59 (remaining gas: 1039963.107 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 7a80de49116d4a5dee1d064800bf18b8fd388491..cc1c44ef88c30c5ff993d38a6e6559c85df8810f 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,131 +7,119 @@ emitted operations big_map diff trace - - location: 24 (remaining gas: 1039966.445 units remaining) + - location: 25 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair 10 -3) None None None None) ] - - location: 25 (remaining gas: 1039966.305 units remaining) + - location: 25 (remaining gas: 1039966.365 units remaining) [ (Pair 10 -3) @parameter ] - - location: 26 (remaining gas: 1039966.165 units remaining) + - location: 26 (remaining gas: 1039966.285 units remaining) [ (Pair 10 -3) @parameter (Pair 10 -3) @parameter ] - - location: 27 (remaining gas: 1039966.025 units remaining) + - location: 27 (remaining gas: 1039966.205 units remaining) [ 10 -3 (Pair 10 -3) @parameter ] - - location: 28 (remaining gas: 1039965.885 units remaining) + - location: 28 (remaining gas: 1039966.125 units remaining) [ 10 -3 (Pair 10 -3) @parameter ] - - location: 31 (remaining gas: 1039965.585 units remaining) - [ 3 + - location: 29 (remaining gas: 1039966.025 units remaining) + [ -3 (Pair 10 -3) @parameter ] - - location: 30 (remaining gas: 1039965.515 units remaining) + - location: 31 (remaining gas: 1039965.945 units remaining) [ 3 (Pair 10 -3) @parameter ] - - location: 29 (remaining gas: 1039965.515 units remaining) - [ 10 - 3 - (Pair 10 -3) @parameter ] - - location: 32 (remaining gas: 1039965.155 units remaining) + - location: 32 (remaining gas: 1039965.645 units remaining) [ (Some (Pair 3 1)) (Pair 10 -3) @parameter ] - - location: 33 (remaining gas: 1039965.025 units remaining) + - location: 33 (remaining gas: 1039965.575 units remaining) [ (Pair 10 -3) @parameter (Some (Pair 3 1)) ] - - location: 34 (remaining gas: 1039964.885 units remaining) + - location: 34 (remaining gas: 1039965.495 units remaining) [ (Pair 10 -3) @parameter (Pair 10 -3) @parameter (Some (Pair 3 1)) ] - - location: 35 (remaining gas: 1039964.745 units remaining) + - location: 35 (remaining gas: 1039965.415 units remaining) [ 10 -3 (Pair 10 -3) @parameter (Some (Pair 3 1)) ] - - location: 36 (remaining gas: 1039964.605 units remaining) + - location: 36 (remaining gas: 1039965.335 units remaining) [ 10 -3 (Pair 10 -3) @parameter (Some (Pair 3 1)) ] - - location: 37 (remaining gas: 1039964.245 units remaining) + - location: 37 (remaining gas: 1039965.035 units remaining) [ (Some (Pair -3 1)) (Pair 10 -3) @parameter (Some (Pair 3 1)) ] - - location: 38 (remaining gas: 1039964.115 units remaining) + - location: 38 (remaining gas: 1039964.965 units remaining) [ (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 39 (remaining gas: 1039963.975 units remaining) + - location: 39 (remaining gas: 1039964.885 units remaining) [ (Pair 10 -3) @parameter (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 40 (remaining gas: 1039963.835 units remaining) + - location: 40 (remaining gas: 1039964.805 units remaining) [ 10 -3 (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 43 (remaining gas: 1039963.535 units remaining) - [ 3 + - location: 41 (remaining gas: 1039964.705 units remaining) + [ -3 (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 42 (remaining gas: 1039963.465 units remaining) + - location: 43 (remaining gas: 1039964.625 units remaining) [ 3 (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 41 (remaining gas: 1039963.465 units remaining) - [ 10 - 3 - (Pair 10 -3) @parameter - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] - - location: 44 (remaining gas: 1039963.105 units remaining) + - location: 44 (remaining gas: 1039964.325 units remaining) [ (Some (Pair 3 1)) (Pair 10 -3) @parameter (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 45 (remaining gas: 1039962.975 units remaining) + - location: 45 (remaining gas: 1039964.255 units remaining) [ (Pair 10 -3) @parameter (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 46 (remaining gas: 1039962.835 units remaining) + - location: 46 (remaining gas: 1039964.175 units remaining) [ 10 -3 (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 47 (remaining gas: 1039962.475 units remaining) + - location: 47 (remaining gas: 1039963.875 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - - location: 52 (remaining gas: 1039962.107 units remaining) - [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 51 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.767 units remaining) + [ (Some (Pair -3 1)) + (Some (Pair 3 1)) ] + - location: 52 (remaining gas: 1039963.687 units remaining) [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 49 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.607 units remaining) + [ (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + - location: 49 (remaining gas: 1039963.527 units remaining) [ (Some (Pair -3 1)) (Some (Pair 3 1)) (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 55 (remaining gas: 1039961.737 units remaining) - [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 54 (remaining gas: 1039961.667 units remaining) + - location: 53 (remaining gas: 1039963.427 units remaining) + [ (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + - location: 55 (remaining gas: 1039963.347 units remaining) [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 53 (remaining gas: 1039961.667 units remaining) - [ (Some (Pair -3 1)) - (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 56 (remaining gas: 1039961.527 units remaining) + - location: 56 (remaining gas: 1039963.267 units remaining) [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: -1 (remaining gas: 1039961.457 units remaining) - [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 57 (remaining gas: 1039961.317 units remaining) + - location: 57 (remaining gas: 1039963.187 units remaining) [ {} (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: 59 (remaining gas: 1039961.177 units remaining) - [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - - location: -1 (remaining gas: 1039961.107 units remaining) + - location: 59 (remaining gas: 1039963.107 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 904a8edfd94a957b92d3136694a0c07d078fb108..02468912a8761dd45d489467ce688b014aba764a 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,131 +7,119 @@ emitted operations big_map diff trace - - location: 24 (remaining gas: 1039966.445 units remaining) + - location: 25 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair 10 0) None None None None) ] - - location: 25 (remaining gas: 1039966.305 units remaining) + - location: 25 (remaining gas: 1039966.365 units remaining) [ (Pair 10 0) @parameter ] - - location: 26 (remaining gas: 1039966.165 units remaining) + - location: 26 (remaining gas: 1039966.285 units remaining) [ (Pair 10 0) @parameter (Pair 10 0) @parameter ] - - location: 27 (remaining gas: 1039966.025 units remaining) + - location: 27 (remaining gas: 1039966.205 units remaining) [ 10 0 (Pair 10 0) @parameter ] - - location: 28 (remaining gas: 1039965.885 units remaining) + - location: 28 (remaining gas: 1039966.125 units remaining) [ 10 0 (Pair 10 0) @parameter ] - - location: 31 (remaining gas: 1039965.585 units remaining) + - location: 29 (remaining gas: 1039966.025 units remaining) [ 0 (Pair 10 0) @parameter ] - - location: 30 (remaining gas: 1039965.515 units remaining) + - location: 31 (remaining gas: 1039965.945 units remaining) [ 0 (Pair 10 0) @parameter ] - - location: 29 (remaining gas: 1039965.515 units remaining) - [ 10 - 0 - (Pair 10 0) @parameter ] - - location: 32 (remaining gas: 1039965.155 units remaining) + - location: 32 (remaining gas: 1039965.645 units remaining) [ None (Pair 10 0) @parameter ] - - location: 33 (remaining gas: 1039965.025 units remaining) + - location: 33 (remaining gas: 1039965.575 units remaining) [ (Pair 10 0) @parameter None ] - - location: 34 (remaining gas: 1039964.885 units remaining) + - location: 34 (remaining gas: 1039965.495 units remaining) [ (Pair 10 0) @parameter (Pair 10 0) @parameter None ] - - location: 35 (remaining gas: 1039964.745 units remaining) + - location: 35 (remaining gas: 1039965.415 units remaining) [ 10 0 (Pair 10 0) @parameter None ] - - location: 36 (remaining gas: 1039964.605 units remaining) + - location: 36 (remaining gas: 1039965.335 units remaining) [ 10 0 (Pair 10 0) @parameter None ] - - location: 37 (remaining gas: 1039964.245 units remaining) + - location: 37 (remaining gas: 1039965.035 units remaining) [ None (Pair 10 0) @parameter None ] - - location: 38 (remaining gas: 1039964.115 units remaining) + - location: 38 (remaining gas: 1039964.965 units remaining) [ (Pair 10 0) @parameter None None ] - - location: 39 (remaining gas: 1039963.975 units remaining) + - location: 39 (remaining gas: 1039964.885 units remaining) [ (Pair 10 0) @parameter (Pair 10 0) @parameter None None ] - - location: 40 (remaining gas: 1039963.835 units remaining) + - location: 40 (remaining gas: 1039964.805 units remaining) [ 10 0 (Pair 10 0) @parameter None None ] - - location: 43 (remaining gas: 1039963.535 units remaining) + - location: 41 (remaining gas: 1039964.705 units remaining) [ 0 (Pair 10 0) @parameter None None ] - - location: 42 (remaining gas: 1039963.465 units remaining) + - location: 43 (remaining gas: 1039964.625 units remaining) [ 0 (Pair 10 0) @parameter None None ] - - location: 41 (remaining gas: 1039963.465 units remaining) - [ 10 - 0 - (Pair 10 0) @parameter - None - None ] - - location: 44 (remaining gas: 1039963.105 units remaining) + - location: 44 (remaining gas: 1039964.325 units remaining) [ None (Pair 10 0) @parameter None None ] - - location: 45 (remaining gas: 1039962.975 units remaining) + - location: 45 (remaining gas: 1039964.255 units remaining) [ (Pair 10 0) @parameter None None None ] - - location: 46 (remaining gas: 1039962.835 units remaining) + - location: 46 (remaining gas: 1039964.175 units remaining) [ 10 0 None None None ] - - location: 47 (remaining gas: 1039962.475 units remaining) + - location: 47 (remaining gas: 1039963.875 units remaining) [ None None None None ] - - location: 52 (remaining gas: 1039962.107 units remaining) - [ (Pair None None) ] - - location: 51 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.767 units remaining) + [ None + None ] + - location: 52 (remaining gas: 1039963.687 units remaining) [ (Pair None None) ] - - location: 49 (remaining gas: 1039962.037 units remaining) + - location: 49 (remaining gas: 1039963.607 units remaining) + [ None + (Pair None None) ] + - location: 49 (remaining gas: 1039963.527 units remaining) [ None None (Pair None None) ] - - location: 55 (remaining gas: 1039961.737 units remaining) - [ (Pair None None None) ] - - location: 54 (remaining gas: 1039961.667 units remaining) - [ (Pair None None None) ] - - location: 53 (remaining gas: 1039961.667 units remaining) + - location: 53 (remaining gas: 1039963.427 units remaining) [ None - (Pair None None None) ] - - location: 56 (remaining gas: 1039961.527 units remaining) - [ (Pair None None None None) ] - - location: -1 (remaining gas: 1039961.457 units remaining) + (Pair None None) ] + - location: 55 (remaining gas: 1039963.347 units remaining) + [ (Pair None None None) ] + - location: 56 (remaining gas: 1039963.267 units remaining) [ (Pair None None None None) ] - - location: 57 (remaining gas: 1039961.317 units remaining) + - location: 57 (remaining gas: 1039963.187 units remaining) [ {} (Pair None None None None) ] - - location: 59 (remaining gas: 1039961.177 units remaining) - [ (Pair {} None None None None) ] - - location: -1 (remaining gas: 1039961.107 units remaining) + - location: 59 (remaining gas: 1039963.107 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 69f14e21e488e10149ed645305b0c5db22f8b2c3..d633e316a62db3d6fe5d1a5fe48f9906071843a5 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 0)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Left 0)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Left 0) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Left 0) 10 ] - - location: 24 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) + [ 0 + 10 ] + - location: 24 (remaining gas: 1039981.780 units remaining) [ 10 0 ] - - location: 25 (remaining gas: 1039981.220 units remaining) + - location: 25 (remaining gas: 1039981.580 units remaining) [ None ] - - location: 26 (remaining gas: 1039981.080 units remaining) - [ (Left None) ] - - location: -1 (remaining gas: 1039981.010 units remaining) + - location: 26 (remaining gas: 1039981.500 units remaining) [ (Left None) ] - - location: 39 (remaining gas: 1039980.870 units remaining) + - location: 39 (remaining gas: 1039981.420 units remaining) [ {} (Left None) ] - - location: 41 (remaining gas: 1039980.730 units remaining) - [ (Pair {} (Left None)) ] - - location: -1 (remaining gas: 1039980.660 units remaining) + - location: 41 (remaining gas: 1039981.340 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 02b77a1389aaf9aabab378a51479a243b24c32a3..3a70e8b6e09ca73e95caab5556f6da7ee79018a3 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 10)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Left 10)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Left 10) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Left 10) 10 ] - - location: 24 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) [ 10 10 ] - - location: 25 (remaining gas: 1039981.220 units remaining) + - location: 24 (remaining gas: 1039981.780 units remaining) + [ 10 + 10 ] + - location: 25 (remaining gas: 1039981.580 units remaining) [ (Some (Pair 1 0)) ] - - location: 26 (remaining gas: 1039981.080 units remaining) + - location: 26 (remaining gas: 1039981.500 units remaining) [ (Left (Some (Pair 1 0))) ] - - location: -1 (remaining gas: 1039981.010 units remaining) - [ (Left (Some (Pair 1 0))) ] - - location: 39 (remaining gas: 1039980.870 units remaining) + - location: 39 (remaining gas: 1039981.420 units remaining) [ {} (Left (Some (Pair 1 0))) ] - - location: 41 (remaining gas: 1039980.730 units remaining) - [ (Pair {} (Left (Some (Pair 1 0)))) ] - - location: -1 (remaining gas: 1039980.660 units remaining) + - location: 41 (remaining gas: 1039981.340 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 9beeef0cc4bcd075c01aa8758e1365e1713aea95..9fe7bb4336530706383b8e73adeccc7467584221 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 3)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Left 3)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Left 3) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Left 3) 10 ] - - location: 24 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) + [ 3 + 10 ] + - location: 24 (remaining gas: 1039981.780 units remaining) [ 10 3 ] - - location: 25 (remaining gas: 1039981.220 units remaining) + - location: 25 (remaining gas: 1039981.580 units remaining) [ (Some (Pair 3 1)) ] - - location: 26 (remaining gas: 1039981.080 units remaining) - [ (Left (Some (Pair 3 1))) ] - - location: -1 (remaining gas: 1039981.010 units remaining) + - location: 26 (remaining gas: 1039981.500 units remaining) [ (Left (Some (Pair 3 1))) ] - - location: 39 (remaining gas: 1039980.870 units remaining) + - location: 39 (remaining gas: 1039981.420 units remaining) [ {} (Left (Some (Pair 3 1))) ] - - location: 41 (remaining gas: 1039980.730 units remaining) - [ (Pair {} (Left (Some (Pair 3 1)))) ] - - location: -1 (remaining gas: 1039980.660 units remaining) + - location: 41 (remaining gas: 1039981.340 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 0f0a03710ef2c4d6e7d1d4e7bf0d394db26bac0f..38d411aa7dc9d490b1220ff2d86c06ddd8f526e3 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 0)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Right 0)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Right 0) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Right 0) 10 ] - - location: 32 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) + [ 0 + 10 ] + - location: 32 (remaining gas: 1039981.780 units remaining) [ 10 0 ] - - location: 33 (remaining gas: 1039981.120 units remaining) + - location: 33 (remaining gas: 1039981.480 units remaining) [ None ] - - location: 34 (remaining gas: 1039980.980 units remaining) - [ (Right None) ] - - location: -1 (remaining gas: 1039980.910 units remaining) + - location: 34 (remaining gas: 1039981.400 units remaining) [ (Right None) ] - - location: 39 (remaining gas: 1039980.770 units remaining) + - location: 39 (remaining gas: 1039981.320 units remaining) [ {} (Right None) ] - - location: 41 (remaining gas: 1039980.630 units remaining) - [ (Pair {} (Right None)) ] - - location: -1 (remaining gas: 1039980.560 units remaining) + - location: 41 (remaining gas: 1039981.240 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 58eb82c1499cab0c13ff3d4a5e70c26b0d988d72..2df02fb727a4a833a31f9a4572ec209e0438b4f0 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 10)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Right 10)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Right 10) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Right 10) 10 ] - - location: 32 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) [ 10 10 ] - - location: 33 (remaining gas: 1039981.120 units remaining) + - location: 32 (remaining gas: 1039981.780 units remaining) + [ 10 + 10 ] + - location: 33 (remaining gas: 1039981.480 units remaining) [ (Some (Pair 1 0)) ] - - location: 34 (remaining gas: 1039980.980 units remaining) + - location: 34 (remaining gas: 1039981.400 units remaining) [ (Right (Some (Pair 1 0))) ] - - location: -1 (remaining gas: 1039980.910 units remaining) - [ (Right (Some (Pair 1 0))) ] - - location: 39 (remaining gas: 1039980.770 units remaining) + - location: 39 (remaining gas: 1039981.320 units remaining) [ {} (Right (Some (Pair 1 0))) ] - - location: 41 (remaining gas: 1039980.630 units remaining) - [ (Pair {} (Right (Some (Pair 1 0)))) ] - - location: -1 (remaining gas: 1039980.560 units remaining) + - location: 41 (remaining gas: 1039981.240 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 b4c37fe7c1670cea5d8f0ef2a549d3e8901ec729..55f04d0dca7d3e2d5642ac7fd3d4b94af486c913 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 3)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 10 (Right 3)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 10 (Right 3) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Right 3) 10 ] - - location: 32 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) + [ 3 + 10 ] + - location: 32 (remaining gas: 1039981.780 units remaining) [ 10 3 ] - - location: 33 (remaining gas: 1039981.120 units remaining) + - location: 33 (remaining gas: 1039981.480 units remaining) [ (Some (Pair 3 1)) ] - - location: 34 (remaining gas: 1039980.980 units remaining) - [ (Right (Some (Pair 3 1))) ] - - location: -1 (remaining gas: 1039980.910 units remaining) + - location: 34 (remaining gas: 1039981.400 units remaining) [ (Right (Some (Pair 3 1))) ] - - location: 39 (remaining gas: 1039980.770 units remaining) + - location: 39 (remaining gas: 1039981.320 units remaining) [ {} (Right (Some (Pair 3 1))) ] - - location: 41 (remaining gas: 1039980.630 units remaining) - [ (Pair {} (Right (Some (Pair 3 1)))) ] - - location: -1 (remaining gas: 1039980.560 units remaining) + - location: 41 (remaining gas: 1039981.240 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 137dfd74adb3a610b06ab29c7a2731a2683e4727..14e511fcbaf51a1ca8d2a5eedf9c9d0e651a8bc2 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,30 +7,29 @@ emitted operations big_map diff trace - - location: 18 (remaining gas: 1039982.170 units remaining) + - location: 19 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 5 (Right 10)) (Left None)) ] - - location: 19 (remaining gas: 1039982.030 units remaining) + - location: 19 (remaining gas: 1039982.090 units remaining) [ (Pair 5 (Right 10)) @parameter ] - - location: 20 (remaining gas: 1039981.890 units remaining) + - location: 20 (remaining gas: 1039982.010 units remaining) [ 5 (Right 10) ] - - location: 21 (remaining gas: 1039981.760 units remaining) + - location: 21 (remaining gas: 1039981.940 units remaining) [ (Right 10) 5 ] - - location: 32 (remaining gas: 1039981.480 units remaining) + - location: 22 (remaining gas: 1039981.850 units remaining) + [ 10 + 5 ] + - location: 32 (remaining gas: 1039981.780 units remaining) [ 5 10 ] - - location: 33 (remaining gas: 1039981.120 units remaining) + - location: 33 (remaining gas: 1039981.480 units remaining) [ (Some (Pair 0 5)) ] - - location: 34 (remaining gas: 1039980.980 units remaining) - [ (Right (Some (Pair 0 5))) ] - - location: -1 (remaining gas: 1039980.910 units remaining) + - location: 34 (remaining gas: 1039981.400 units remaining) [ (Right (Some (Pair 0 5))) ] - - location: 39 (remaining gas: 1039980.770 units remaining) + - location: 39 (remaining gas: 1039981.320 units remaining) [ {} (Right (Some (Pair 0 5))) ] - - location: 41 (remaining gas: 1039980.630 units remaining) - [ (Pair {} (Right (Some (Pair 0 5)))) ] - - location: -1 (remaining gas: 1039980.560 units remaining) + - location: 41 (remaining gas: 1039981.240 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 0a01cf515bd29ad5bedfb8ef5e2bb7c524fb92ca..3d3a12dc9630c1a9da78dd63994e925d6007a1ec 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,29 +7,27 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039989.592 units remaining) + - location: 9 (remaining gas: 1039989.592 units remaining) [ (Pair Unit {}) ] - - location: 9 (remaining gas: 1039989.452 units remaining) + - location: 9 (remaining gas: 1039989.512 units remaining) [ ] - - location: 10 (remaining gas: 1039989.152 units remaining) + - location: 10 (remaining gas: 1039989.272 units remaining) [ {} ] - - location: 13 (remaining gas: 1039989.012 units remaining) + - location: 13 (remaining gas: 1039989.192 units remaining) [ "world" {} ] - - location: 16 (remaining gas: 1039988.872 units remaining) + - location: 16 (remaining gas: 1039989.112 units remaining) [ (Some "world") {} ] - - location: 17 (remaining gas: 1039988.732 units remaining) + - location: 17 (remaining gas: 1039989.032 units remaining) [ "hello" (Some "world") {} ] - - location: 20 (remaining gas: 1039988.592 units remaining) + - location: 20 (remaining gas: 1039988.952 units remaining) [ { Elt "hello" "world" } ] - - location: 21 (remaining gas: 1039988.452 units remaining) + - location: 21 (remaining gas: 1039988.872 units remaining) [ {} { Elt "hello" "world" } ] - - location: 23 (remaining gas: 1039988.312 units remaining) - [ (Pair {} { Elt "hello" "world" }) ] - - location: -1 (remaining gas: 1039988.242 units remaining) + - location: 23 (remaining gas: 1039988.792 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 396ad54a11d9034f370a670ac693951481947f35..a49764dc4ac0dd57ad40ee9996b8c501e3ec560c 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,48 +7,42 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039986.458 units remaining) + - location: 7 (remaining gas: 1039986.458 units remaining) [ (Pair "" "?") ] - - location: 7 (remaining gas: 1039986.318 units remaining) + - location: 7 (remaining gas: 1039986.378 units remaining) [ "" @parameter ] - - location: 8 (remaining gas: 1039986.178 units remaining) + - location: 8 (remaining gas: 1039986.298 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } "" @parameter ] - - location: 22 (remaining gas: 1039986.048 units remaining) + - location: 22 (remaining gas: 1039986.228 units remaining) [ "" @parameter { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - - location: 11 (remaining gas: 1039985.888 units remaining) + - location: 23 (remaining gas: 1039986.128 units remaining) [ "" @arg ] - - location: 12 (remaining gas: 1039985.748 units remaining) + - location: 12 (remaining gas: 1039986.048 units remaining) [ "_abc" "" @arg ] - - location: 15 (remaining gas: 1039985.608 units remaining) + - location: 15 (remaining gas: 1039985.968 units remaining) [ {} "_abc" "" @arg ] - - location: 17 (remaining gas: 1039985.478 units remaining) + - location: 17 (remaining gas: 1039985.898 units remaining) [ "_abc" {} "" @arg ] - - location: 18 (remaining gas: 1039985.338 units remaining) + - location: 18 (remaining gas: 1039985.818 units remaining) [ { "_abc" } "" @arg ] - - location: 19 (remaining gas: 1039985.208 units remaining) + - location: 19 (remaining gas: 1039985.748 units remaining) [ "" @arg { "_abc" } ] - - location: 20 (remaining gas: 1039985.068 units remaining) + - location: 20 (remaining gas: 1039985.668 units remaining) [ { "" ; "_abc" } ] - - location: 21 (remaining gas: 1039984.888 units remaining) + - location: 21 (remaining gas: 1039985.548 units remaining) [ "_abc" ] - - location: -1 (remaining gas: 1039984.818 units remaining) - [ "_abc" ] - - location: 23 (remaining gas: 1039984.818 units remaining) - [ "_abc" ] - - location: 24 (remaining gas: 1039984.678 units remaining) + - location: 24 (remaining gas: 1039985.468 units remaining) [ {} "_abc" ] - - location: 26 (remaining gas: 1039984.538 units remaining) - [ (Pair {} "_abc") ] - - location: -1 (remaining gas: 1039984.468 units remaining) + - location: 26 (remaining gas: 1039985.388 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 eaad2b786a51f40d26a8ea68f5a9ff768d595254..4b541a81a347d449805a18e1d9e1baa1e1ab5f12 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,48 +7,42 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039986.418 units remaining) + - location: 7 (remaining gas: 1039986.418 units remaining) [ (Pair "test" "?") ] - - location: 7 (remaining gas: 1039986.278 units remaining) + - location: 7 (remaining gas: 1039986.338 units remaining) [ "test" @parameter ] - - location: 8 (remaining gas: 1039986.138 units remaining) + - location: 8 (remaining gas: 1039986.258 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } "test" @parameter ] - - location: 22 (remaining gas: 1039986.008 units remaining) + - location: 22 (remaining gas: 1039986.188 units remaining) [ "test" @parameter { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - - location: 11 (remaining gas: 1039985.848 units remaining) + - location: 23 (remaining gas: 1039986.088 units remaining) [ "test" @arg ] - - location: 12 (remaining gas: 1039985.708 units remaining) + - location: 12 (remaining gas: 1039986.008 units remaining) [ "_abc" "test" @arg ] - - location: 15 (remaining gas: 1039985.568 units remaining) + - location: 15 (remaining gas: 1039985.928 units remaining) [ {} "_abc" "test" @arg ] - - location: 17 (remaining gas: 1039985.438 units remaining) + - location: 17 (remaining gas: 1039985.858 units remaining) [ "_abc" {} "test" @arg ] - - location: 18 (remaining gas: 1039985.298 units remaining) + - location: 18 (remaining gas: 1039985.778 units remaining) [ { "_abc" } "test" @arg ] - - location: 19 (remaining gas: 1039985.168 units remaining) + - location: 19 (remaining gas: 1039985.708 units remaining) [ "test" @arg { "_abc" } ] - - location: 20 (remaining gas: 1039985.028 units remaining) + - location: 20 (remaining gas: 1039985.628 units remaining) [ { "test" ; "_abc" } ] - - location: 21 (remaining gas: 1039984.848 units remaining) + - location: 21 (remaining gas: 1039985.508 units remaining) [ "test_abc" ] - - location: -1 (remaining gas: 1039984.778 units remaining) - [ "test_abc" ] - - location: 23 (remaining gas: 1039984.778 units remaining) - [ "test_abc" ] - - location: 24 (remaining gas: 1039984.638 units remaining) + - location: 24 (remaining gas: 1039985.428 units remaining) [ {} "test_abc" ] - - location: 26 (remaining gas: 1039984.498 units remaining) - [ (Pair {} "test_abc") ] - - location: -1 (remaining gas: 1039984.428 units remaining) + - location: 26 (remaining gas: 1039985.348 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 ebb65ef0e5c754bcb4c6c83d4b27466dbcada31b..c765c6368d42e55782da5731dca2963aedb86aa6 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,23 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039990.235 units remaining) + - location: 8 (remaining gas: 1039990.235 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - - location: 8 (remaining gas: 1039990.095 units remaining) + - location: 8 (remaining gas: 1039990.155 units remaining) [ { 1 ; 2 ; 3 ; 4 } @parameter ] - - location: 13 (remaining gas: 1039989.625 units remaining) + - location: 9 (remaining gas: 1039990.045 units remaining) + [ 1 @parameter.hd + { 2 ; 3 ; 4 } @parameter.tl ] + - location: 11 (remaining gas: 1039989.945 units remaining) + [ { 2 ; 3 ; 4 } @parameter.tl ] + - location: 13 (remaining gas: 1039989.865 units remaining) [ ] - - location: 12 (remaining gas: 1039989.555 units remaining) - [ ] - - location: 11 (remaining gas: 1039989.555 units remaining) - [ 1 @parameter.hd ] - - location: 10 (remaining gas: 1039989.485 units remaining) - [ 1 @parameter.hd ] - - location: 18 (remaining gas: 1039989.345 units remaining) + - location: 18 (remaining gas: 1039989.785 units remaining) [ {} 1 @parameter.hd ] - - location: 20 (remaining gas: 1039989.205 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039989.135 units remaining) + - location: 20 (remaining gas: 1039989.705 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 2194563500f97d935541bf648c64a697d4ee9a7d..c80fc417b372f8f9f0056fc4d829d41053c5f5c5 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,23 +7,20 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039990.955 units remaining) + - location: 8 (remaining gas: 1039990.955 units remaining) [ (Pair { 4 } 111) ] - - location: 8 (remaining gas: 1039990.815 units remaining) + - location: 8 (remaining gas: 1039990.875 units remaining) [ { 4 } @parameter ] - - location: 13 (remaining gas: 1039990.345 units remaining) + - location: 9 (remaining gas: 1039990.765 units remaining) + [ 4 @parameter.hd + {} @parameter.tl ] + - location: 11 (remaining gas: 1039990.665 units remaining) + [ {} @parameter.tl ] + - location: 13 (remaining gas: 1039990.585 units remaining) [ ] - - location: 12 (remaining gas: 1039990.275 units remaining) - [ ] - - location: 11 (remaining gas: 1039990.275 units remaining) - [ 4 @parameter.hd ] - - location: 10 (remaining gas: 1039990.205 units remaining) - [ 4 @parameter.hd ] - - location: 18 (remaining gas: 1039990.065 units remaining) + - location: 18 (remaining gas: 1039990.505 units remaining) [ {} 4 @parameter.hd ] - - location: 20 (remaining gas: 1039989.925 units remaining) - [ (Pair {} 4) ] - - location: -1 (remaining gas: 1039989.855 units remaining) + - location: 20 (remaining gas: 1039990.425 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 16d1157581165fd106247cfa65ab6d45e78962df..82860a40c2b0552d133cbafca42a416a0b888301 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039989.571 units remaining) + - location: 13 (remaining gas: 1039989.571 units remaining) [ (Pair "hello" (Some 4) {}) ] - - location: 13 (remaining gas: 1039989.371 units remaining) + - location: 13 (remaining gas: 1039989.491 units remaining) [ "hello" @parameter (Pair (Some 4) {}) @storage ] - - location: 16 (remaining gas: 1039989.071 units remaining) + - location: 14 (remaining gas: 1039989.391 units remaining) + [ (Pair (Some 4) {}) @storage ] + - location: 16 (remaining gas: 1039989.311 units remaining) [ (Some 4) {} ] - - location: 15 (remaining gas: 1039989.001 units remaining) - [ (Some 4) - {} ] - - location: 14 (remaining gas: 1039989.001 units remaining) - [ "hello" @parameter - (Some 4) - {} ] - - location: -1 (remaining gas: 1039988.931 units remaining) - [ "hello" @parameter - (Some 4) - {} ] - - location: 17 (remaining gas: 1039988.711 units remaining) + - location: 17 (remaining gas: 1039989.151 units remaining) [ None { Elt "hello" 4 } ] - - location: 18 (remaining gas: 1039988.571 units remaining) + - location: 18 (remaining gas: 1039989.071 units remaining) [ (Pair None { Elt "hello" 4 }) ] - - location: 19 (remaining gas: 1039988.431 units remaining) + - location: 19 (remaining gas: 1039988.991 units remaining) [ {} (Pair None { Elt "hello" 4 }) ] - - location: 21 (remaining gas: 1039988.291 units remaining) - [ (Pair {} None { Elt "hello" 4 }) ] - - location: -1 (remaining gas: 1039988.221 units remaining) + - location: 21 (remaining gas: 1039988.911 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 7492936056d490a615334e132551ab4f83730813..abab133c000a2304192cd368dee8f4ac311e02d9 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039988.977 units remaining) + - location: 13 (remaining gas: 1039988.977 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039988.777 units remaining) + - location: 13 (remaining gas: 1039988.897 units remaining) [ "hi" @parameter (Pair (Some 5) { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039988.477 units remaining) + - location: 14 (remaining gas: 1039988.797 units remaining) + [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039988.717 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039988.407 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039988.407 units remaining) - [ "hi" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039988.337 units remaining) - [ "hi" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039988.117 units remaining) + - location: 17 (remaining gas: 1039988.557 units remaining) [ None { Elt "hello" 4 ; Elt "hi" 5 } ] - - location: 18 (remaining gas: 1039987.977 units remaining) + - location: 18 (remaining gas: 1039988.477 units remaining) [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 19 (remaining gas: 1039987.837 units remaining) + - location: 19 (remaining gas: 1039988.397 units remaining) [ {} (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: 21 (remaining gas: 1039987.697 units remaining) - [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] - - location: -1 (remaining gas: 1039987.627 units remaining) + - location: 21 (remaining gas: 1039988.317 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 02e10e86b2e736124bb6bf0a00d365bcbd2c583b..55f1f1578d8b24dceea5c38569ce26e46488cde0 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039988.947 units remaining) + - location: 13 (remaining gas: 1039988.947 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039988.747 units remaining) + - location: 13 (remaining gas: 1039988.867 units remaining) [ "hello" @parameter (Pair (Some 5) { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039988.447 units remaining) + - location: 14 (remaining gas: 1039988.767 units remaining) + [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039988.687 units remaining) [ (Some 5) { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039988.377 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039988.377 units remaining) - [ "hello" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039988.307 units remaining) - [ "hello" @parameter - (Some 5) - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039988.087 units remaining) + - location: 17 (remaining gas: 1039988.527 units remaining) [ (Some 4) { Elt "hello" 5 } ] - - location: 18 (remaining gas: 1039987.947 units remaining) + - location: 18 (remaining gas: 1039988.447 units remaining) [ (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 19 (remaining gas: 1039987.807 units remaining) + - location: 19 (remaining gas: 1039988.367 units remaining) [ {} (Pair (Some 4) { Elt "hello" 5 }) ] - - location: 21 (remaining gas: 1039987.667 units remaining) - [ (Pair {} (Some 4) { Elt "hello" 5 }) ] - - location: -1 (remaining gas: 1039987.597 units remaining) + - location: 21 (remaining gas: 1039988.287 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 499670a118080389e43a9bfcba61194d64c1151c..dfd372eb30a036046c8c67b8c925ff37a4d0b46f 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039988.563 units remaining) + - location: 13 (remaining gas: 1039988.563 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039988.363 units remaining) + - location: 13 (remaining gas: 1039988.483 units remaining) [ "1" @parameter (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] - - location: 16 (remaining gas: 1039988.063 units remaining) + - location: 14 (remaining gas: 1039988.383 units remaining) + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + - location: 16 (remaining gas: 1039988.303 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 15 (remaining gas: 1039987.993 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039987.993 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: -1 (remaining gas: 1039987.923 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039987.703 units remaining) + - location: 17 (remaining gas: 1039988.143 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039987.563 units remaining) + - location: 18 (remaining gas: 1039988.063 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039987.423 units remaining) + - location: 19 (remaining gas: 1039987.983 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039987.283 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] - - location: -1 (remaining gas: 1039987.213 units remaining) + - location: 21 (remaining gas: 1039987.903 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 2290fe5c45d7313dc90f271454c68b8f4ea38cf5..41ac2a9a0500190a2cdd92732ea9f06e57e4fc95 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039988.563 units remaining) + - location: 13 (remaining gas: 1039988.563 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - - location: 13 (remaining gas: 1039988.363 units remaining) + - location: 13 (remaining gas: 1039988.483 units remaining) [ "1" @parameter (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] - - location: 16 (remaining gas: 1039988.063 units remaining) + - location: 14 (remaining gas: 1039988.383 units remaining) + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + - location: 16 (remaining gas: 1039988.303 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - - location: 15 (remaining gas: 1039987.993 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 14 (remaining gas: 1039987.993 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: -1 (remaining gas: 1039987.923 units remaining) - [ "1" @parameter - None - { Elt "1" 1 ; Elt "2" 2 } ] - - location: 17 (remaining gas: 1039987.703 units remaining) + - location: 17 (remaining gas: 1039988.143 units remaining) [ (Some 1) { Elt "2" 2 } ] - - location: 18 (remaining gas: 1039987.563 units remaining) + - location: 18 (remaining gas: 1039988.063 units remaining) [ (Pair (Some 1) { Elt "2" 2 }) ] - - location: 19 (remaining gas: 1039987.423 units remaining) + - location: 19 (remaining gas: 1039987.983 units remaining) [ {} (Pair (Some 1) { Elt "2" 2 }) ] - - location: 21 (remaining gas: 1039987.283 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] - - location: -1 (remaining gas: 1039987.213 units remaining) + - location: 21 (remaining gas: 1039987.903 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 c5fba1f2da93107d198ad3110d1c219958863076..3edcbe4d48dd4308279c479ef16f68b3b1ec7878 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039989.187 units remaining) + - location: 13 (remaining gas: 1039989.187 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - - location: 13 (remaining gas: 1039988.987 units remaining) + - location: 13 (remaining gas: 1039989.107 units remaining) [ "hello" @parameter (Pair None { Elt "hello" 4 }) @storage ] - - location: 16 (remaining gas: 1039988.687 units remaining) + - location: 14 (remaining gas: 1039989.007 units remaining) + [ (Pair None { Elt "hello" 4 }) @storage ] + - location: 16 (remaining gas: 1039988.927 units remaining) [ None { Elt "hello" 4 } ] - - location: 15 (remaining gas: 1039988.617 units remaining) - [ None - { Elt "hello" 4 } ] - - location: 14 (remaining gas: 1039988.617 units remaining) - [ "hello" @parameter - None - { Elt "hello" 4 } ] - - location: -1 (remaining gas: 1039988.547 units remaining) - [ "hello" @parameter - None - { Elt "hello" 4 } ] - - location: 17 (remaining gas: 1039988.327 units remaining) + - location: 17 (remaining gas: 1039988.767 units remaining) [ (Some 4) {} ] - - location: 18 (remaining gas: 1039988.187 units remaining) + - location: 18 (remaining gas: 1039988.687 units remaining) [ (Pair (Some 4) {}) ] - - location: 19 (remaining gas: 1039988.047 units remaining) + - location: 19 (remaining gas: 1039988.607 units remaining) [ {} (Pair (Some 4) {}) ] - - location: 21 (remaining gas: 1039987.907 units remaining) - [ (Pair {} (Some 4) {}) ] - - location: -1 (remaining gas: 1039987.837 units remaining) + - location: 21 (remaining gas: 1039988.527 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 daee8998207d9862a26b736e265ac90fe6e24df1..eead69a6cf15c1083b765822d4da97f308d7a7a7 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,35 +7,24 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039989.811 units remaining) + - location: 13 (remaining gas: 1039989.811 units remaining) [ (Pair "hello" None {}) ] - - location: 13 (remaining gas: 1039989.611 units remaining) + - location: 13 (remaining gas: 1039989.731 units remaining) [ "hello" @parameter (Pair None {}) @storage ] - - location: 16 (remaining gas: 1039989.311 units remaining) + - location: 14 (remaining gas: 1039989.631 units remaining) + [ (Pair None {}) @storage ] + - location: 16 (remaining gas: 1039989.551 units remaining) [ None {} ] - - location: 15 (remaining gas: 1039989.241 units remaining) + - location: 17 (remaining gas: 1039989.391 units remaining) [ None {} ] - - location: 14 (remaining gas: 1039989.241 units remaining) - [ "hello" @parameter - None - {} ] - - location: -1 (remaining gas: 1039989.171 units remaining) - [ "hello" @parameter - None - {} ] - - location: 17 (remaining gas: 1039988.951 units remaining) - [ None - {} ] - - location: 18 (remaining gas: 1039988.811 units remaining) + - location: 18 (remaining gas: 1039989.311 units remaining) [ (Pair None {}) ] - - location: 19 (remaining gas: 1039988.671 units remaining) + - location: 19 (remaining gas: 1039989.231 units remaining) [ {} (Pair None {}) ] - - location: 21 (remaining gas: 1039988.531 units remaining) - [ (Pair {} None {}) ] - - location: -1 (remaining gas: 1039988.461 units remaining) + - location: 21 (remaining gas: 1039989.151 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 6c1d7f1b7c9844771860ded789c3e4049ab543f2..d8067c7be467b21c6bf4d6d99f7e81e655fcae1f 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,40 +7,31 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039984.195 units remaining) + - location: 12 (remaining gas: 1039984.195 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 12 (remaining gas: 1039984.055 units remaining) + - location: 12 (remaining gas: 1039984.115 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 13 (remaining gas: 1039983.915 units remaining) + - location: 13 (remaining gas: 1039984.035 units remaining) [ "1" @parameter (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 17 (remaining gas: 1039983.555 units remaining) + - location: 14 (remaining gas: 1039983.935 units remaining) + [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] + - location: 17 (remaining gas: 1039983.855 units remaining) [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) @storage ] - - location: 18 (remaining gas: 1039983.415 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: -1 (remaining gas: 1039983.345 units remaining) + - location: 18 (remaining gas: 1039983.775 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - - location: 19 (remaining gas: 1039983.205 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] - - location: -1 (remaining gas: 1039983.135 units remaining) + - location: 19 (remaining gas: 1039983.695 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - - location: 14 (remaining gas: 1039983.135 units remaining) - [ "1" @parameter - { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] - - location: 20 (remaining gas: 1039982.995 units remaining) + - location: 20 (remaining gas: 1039983.615 units remaining) [ (Some "one") { Elt "1" "one" ; Elt "2" "two" } ] - - location: 21 (remaining gas: 1039982.855 units remaining) + - location: 21 (remaining gas: 1039983.535 units remaining) [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 22 (remaining gas: 1039982.715 units remaining) + - location: 22 (remaining gas: 1039983.455 units remaining) [ {} (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - - location: 24 (remaining gas: 1039982.575 units remaining) - [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - - location: -1 (remaining gas: 1039982.505 units remaining) + - location: 24 (remaining gas: 1039983.375 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 88dc727336c30a23c46df311be2624dbc0908ab6..729ff47174bf6712c90cbe46c2c5e2c55cb9b0b3 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,40 +7,31 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039984.923 units remaining) + - location: 12 (remaining gas: 1039984.923 units remaining) [ (Pair "" None { Elt "hello" "hi" }) ] - - location: 12 (remaining gas: 1039984.783 units remaining) + - location: 12 (remaining gas: 1039984.843 units remaining) [ (Pair "" None { Elt "hello" "hi" }) (Pair "" None { Elt "hello" "hi" }) ] - - location: 13 (remaining gas: 1039984.643 units remaining) + - location: 13 (remaining gas: 1039984.763 units remaining) [ "" @parameter (Pair "" None { Elt "hello" "hi" }) ] - - location: 17 (remaining gas: 1039984.283 units remaining) + - location: 14 (remaining gas: 1039984.663 units remaining) + [ (Pair "" None { Elt "hello" "hi" }) ] + - location: 17 (remaining gas: 1039984.583 units remaining) [ (Pair None { Elt "hello" "hi" }) @storage ] - - location: 18 (remaining gas: 1039984.143 units remaining) - [ { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039984.073 units remaining) + - location: 18 (remaining gas: 1039984.503 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039983.933 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039983.863 units remaining) + - location: 19 (remaining gas: 1039984.423 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039983.863 units remaining) - [ "" @parameter - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039983.723 units remaining) + - location: 20 (remaining gas: 1039984.343 units remaining) [ None { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039983.583 units remaining) + - location: 21 (remaining gas: 1039984.263 units remaining) [ (Pair None { Elt "hello" "hi" }) ] - - location: 22 (remaining gas: 1039983.443 units remaining) + - location: 22 (remaining gas: 1039984.183 units remaining) [ {} (Pair None { Elt "hello" "hi" }) ] - - location: 24 (remaining gas: 1039983.303 units remaining) - [ (Pair {} None { Elt "hello" "hi" }) ] - - location: -1 (remaining gas: 1039983.233 units remaining) + - location: 24 (remaining gas: 1039984.103 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 2315e1208690c6fa5092d37bcd427ef7e8cb0e7b..beb4481fc8e8e2679c4e460b809b0c60c397b65c 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,40 +7,31 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039984.873 units remaining) + - location: 12 (remaining gas: 1039984.873 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 12 (remaining gas: 1039984.733 units remaining) + - location: 12 (remaining gas: 1039984.793 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 13 (remaining gas: 1039984.593 units remaining) + - location: 13 (remaining gas: 1039984.713 units remaining) [ "hello" @parameter (Pair "hello" None { Elt "hello" "hi" }) ] - - location: 17 (remaining gas: 1039984.233 units remaining) + - location: 14 (remaining gas: 1039984.613 units remaining) + [ (Pair "hello" None { Elt "hello" "hi" }) ] + - location: 17 (remaining gas: 1039984.533 units remaining) [ (Pair None { Elt "hello" "hi" }) @storage ] - - location: 18 (remaining gas: 1039984.093 units remaining) - [ { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039984.023 units remaining) + - location: 18 (remaining gas: 1039984.453 units remaining) [ { Elt "hello" "hi" } ] - - location: 19 (remaining gas: 1039983.883 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: -1 (remaining gas: 1039983.813 units remaining) + - location: 19 (remaining gas: 1039984.373 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - - location: 14 (remaining gas: 1039983.813 units remaining) - [ "hello" @parameter - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] - - location: 20 (remaining gas: 1039983.673 units remaining) + - location: 20 (remaining gas: 1039984.293 units remaining) [ (Some "hi") { Elt "hello" "hi" } ] - - location: 21 (remaining gas: 1039983.533 units remaining) + - location: 21 (remaining gas: 1039984.213 units remaining) [ (Pair (Some "hi") { Elt "hello" "hi" }) ] - - location: 22 (remaining gas: 1039983.393 units remaining) + - location: 22 (remaining gas: 1039984.133 units remaining) [ {} (Pair (Some "hi") { Elt "hello" "hi" }) ] - - location: 24 (remaining gas: 1039983.253 units remaining) - [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ] - - location: -1 (remaining gas: 1039983.183 units remaining) + - location: 24 (remaining gas: 1039984.053 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 db69332122e71afb84ecbb1534858e6632285f74..36f5de5792404b1a0e1627c6c79fab32651ecce1 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039964.690 units remaining) + - location: 8 (remaining gas: 1039964.690 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] - - location: 8 (remaining gas: 1039964.550 units remaining) + - location: 8 (remaining gas: 1039964.610 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] - - location: 9 (remaining gas: 1039963.910 units remaining) + - location: 9 (remaining gas: 1039964.030 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 10 (remaining gas: 1039963.770 units remaining) + - location: 10 (remaining gas: 1039963.950 units remaining) [ (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - - location: 11 (remaining gas: 1039963.630 units remaining) + - location: 11 (remaining gas: 1039963.870 units remaining) [ {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - - location: 13 (remaining gas: 1039963.490 units remaining) - [ (Pair {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")) ] - - location: -1 (remaining gas: 1039963.420 units remaining) + - location: 13 (remaining gas: 1039963.790 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 31f4aefb11ea4238ee3b28785ef79b8c414eba70..a6ae41bc69b5931a6e2c1c2c4c0d4ac8e4cd5f6f 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039964.690 units remaining) + - location: 8 (remaining gas: 1039964.690 units remaining) [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] - - location: 8 (remaining gas: 1039964.550 units remaining) + - location: 8 (remaining gas: 1039964.610 units remaining) [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" @parameter ] - - location: 9 (remaining gas: 1039963.910 units remaining) + - location: 9 (remaining gas: 1039964.030 units remaining) [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] - - location: 10 (remaining gas: 1039963.770 units remaining) + - location: 10 (remaining gas: 1039963.950 units remaining) [ (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - - location: 11 (remaining gas: 1039963.630 units remaining) + - location: 11 (remaining gas: 1039963.870 units remaining) [ {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - - location: 13 (remaining gas: 1039963.490 units remaining) - [ (Pair {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")) ] - - location: -1 (remaining gas: 1039963.420 units remaining) + - location: 13 (remaining gas: 1039963.790 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 0054f1607dde17a3610b5aff491c4e99bf92fbc8..499ab73a5d3274c496315926d23c19def11f6f56 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.926 units remaining) + - location: 7 (remaining gas: 1039993.926 units remaining) [ (Pair "12345" 0x00) ] - - location: 7 (remaining gas: 1039993.786 units remaining) + - location: 7 (remaining gas: 1039993.846 units remaining) [ "12345" @parameter ] - - location: 8 (remaining gas: 1039981.486 units remaining) + - location: 8 (remaining gas: 1039981.606 units remaining) [ 0x0501000000053132333435 @parameter.packed ] - - location: 9 (remaining gas: 1039980.913 units remaining) + - location: 9 (remaining gas: 1039981.093 units remaining) [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - - location: 10 (remaining gas: 1039980.773 units remaining) + - location: 10 (remaining gas: 1039981.013 units remaining) [ {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - - location: 12 (remaining gas: 1039980.633 units remaining) - [ (Pair {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f) ] - - location: -1 (remaining gas: 1039980.563 units remaining) + - location: 12 (remaining gas: 1039980.933 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 06fa4cfdb06bebfaf3bd490151a5bffaf8c00e02..7d5f6e04e090514ee0c09b4c594acc71cb1fc082 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039993.906 units remaining) + - location: 7 (remaining gas: 1039993.906 units remaining) [ (Pair "abcdefg" 0x00) ] - - location: 7 (remaining gas: 1039993.766 units remaining) + - location: 7 (remaining gas: 1039993.826 units remaining) [ "abcdefg" @parameter ] - - location: 8 (remaining gas: 1039981.466 units remaining) + - location: 8 (remaining gas: 1039981.586 units remaining) [ 0x05010000000761626364656667 @parameter.packed ] - - location: 9 (remaining gas: 1039980.890 units remaining) + - location: 9 (remaining gas: 1039981.070 units remaining) [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - - location: 10 (remaining gas: 1039980.750 units remaining) + - location: 10 (remaining gas: 1039980.990 units remaining) [ {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - - location: 12 (remaining gas: 1039980.610 units remaining) - [ (Pair {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e) ] - - location: -1 (remaining gas: 1039980.540 units remaining) + - location: 12 (remaining gas: 1039980.910 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 01e97ef5596d862558a517a36556f6431020e9f0..153f3e9358ba365c4157ce1c26b101f268475f4b 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,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.240 units remaining) + - location: 8 (remaining gas: 1039991.240 units remaining) [ (Pair False None) ] - - location: 8 (remaining gas: 1039991.100 units remaining) + - location: 8 (remaining gas: 1039991.160 units remaining) [ False @parameter ] - - location: 15 (remaining gas: 1039990.840 units remaining) + - location: 9 (remaining gas: 1039991.100 units remaining) + [ ] + - location: 15 (remaining gas: 1039991.020 units remaining) [ False ] - - location: 14 (remaining gas: 1039990.770 units remaining) - [ False ] - - location: 18 (remaining gas: 1039990.630 units remaining) + - location: 18 (remaining gas: 1039990.940 units remaining) [ (Some False) ] - - location: 19 (remaining gas: 1039990.490 units remaining) + - location: 19 (remaining gas: 1039990.860 units remaining) [ {} (Some False) ] - - location: 21 (remaining gas: 1039990.350 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039990.280 units remaining) + - location: 21 (remaining gas: 1039990.780 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 1abd1ad123f803a879ac1cd262ff3e5648fa1e57..197e3f6041b891b8a7cb3b408870ef0b17f7ac2d 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,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.240 units remaining) + - location: 8 (remaining gas: 1039991.240 units remaining) [ (Pair True None) ] - - location: 8 (remaining gas: 1039991.100 units remaining) + - location: 8 (remaining gas: 1039991.160 units remaining) [ True @parameter ] - - location: 11 (remaining gas: 1039990.840 units remaining) + - location: 9 (remaining gas: 1039991.100 units remaining) + [ ] + - location: 11 (remaining gas: 1039991.020 units remaining) [ True ] - - location: 10 (remaining gas: 1039990.770 units remaining) - [ True ] - - location: 18 (remaining gas: 1039990.630 units remaining) + - location: 18 (remaining gas: 1039990.940 units remaining) [ (Some True) ] - - location: 19 (remaining gas: 1039990.490 units remaining) + - location: 19 (remaining gas: 1039990.860 units remaining) [ {} (Some True) ] - - location: 21 (remaining gas: 1039990.350 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039990.280 units remaining) + - location: 21 (remaining gas: 1039990.780 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 36eda6d77511325ccc35c8a12babc3552db55ebe..ba4153db2b46874e98f3e2370e6597511de1efc8 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.188 units remaining) + - location: 8 (remaining gas: 1039992.188 units remaining) [ (Pair (Some "hello") "?") ] - - location: 8 (remaining gas: 1039992.048 units remaining) + - location: 8 (remaining gas: 1039992.108 units remaining) [ (Some "hello") @parameter ] - - location: 15 (remaining gas: 1039991.778 units remaining) + - location: 10 (remaining gas: 1039992.028 units remaining) + [ "hello" @parameter.some ] + - location: 15 (remaining gas: 1039991.958 units remaining) [ "hello" ] - - location: 9 (remaining gas: 1039991.708 units remaining) - [ "hello" ] - - location: 16 (remaining gas: 1039991.568 units remaining) + - location: 16 (remaining gas: 1039991.878 units remaining) [ {} "hello" ] - - location: 18 (remaining gas: 1039991.428 units remaining) - [ (Pair {} "hello") ] - - location: -1 (remaining gas: 1039991.358 units remaining) + - location: 18 (remaining gas: 1039991.798 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 9116fd5c60dc7f7cfb289f24029e8e8c9f3a0f2e..55efa94dec8466d6421f830d00537b033ee7064a 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,21 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.492 units remaining) + - location: 8 (remaining gas: 1039992.492 units remaining) [ (Pair None "?") ] - - location: 8 (remaining gas: 1039992.352 units remaining) + - location: 8 (remaining gas: 1039992.412 units remaining) [ None @parameter ] - - location: 12 (remaining gas: 1039992.012 units remaining) + - location: 10 (remaining gas: 1039992.332 units remaining) + [ ] + - location: 12 (remaining gas: 1039992.252 units remaining) [ "" ] - - location: 11 (remaining gas: 1039991.942 units remaining) - [ "" ] - - location: 9 (remaining gas: 1039991.872 units remaining) - [ "" ] - - location: 16 (remaining gas: 1039991.732 units remaining) + - location: 16 (remaining gas: 1039992.172 units remaining) [ {} "" ] - - location: 18 (remaining gas: 1039991.592 units remaining) - [ (Pair {} "") ] - - location: -1 (remaining gas: 1039991.522 units remaining) + - location: 18 (remaining gas: 1039992.092 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 3b8bf5e4a94b5180d9d46441f0d1d65785573c5f..ffa878ba0b03fff710ed707111a045a2f98255d7 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair 0 None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ 0 @parameter ] - - location: 9 (remaining gas: 1039993.410 units remaining) + - location: 9 (remaining gas: 1039993.530 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039993.270 units remaining) + - location: 10 (remaining gas: 1039993.450 units remaining) [ (Some 0) ] - - location: 11 (remaining gas: 1039993.130 units remaining) + - location: 11 (remaining gas: 1039993.370 units remaining) [ {} (Some 0) ] - - location: 13 (remaining gas: 1039992.990 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039992.920 units remaining) + - location: 13 (remaining gas: 1039993.290 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 d8a45a0366ded3974f0f4d6ef961c7a9e1c041a9..f08bf077066b08f7c06de3d4a4faecce04553b99 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair 1 None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ 1 @parameter ] - - location: 9 (remaining gas: 1039993.410 units remaining) + - location: 9 (remaining gas: 1039993.530 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039993.270 units remaining) + - location: 10 (remaining gas: 1039993.450 units remaining) [ (Some 1) ] - - location: 11 (remaining gas: 1039993.130 units remaining) + - location: 11 (remaining gas: 1039993.370 units remaining) [ {} (Some 1) ] - - location: 13 (remaining gas: 1039992.990 units remaining) - [ (Pair {} (Some 1)) ] - - location: -1 (remaining gas: 1039992.920 units remaining) + - location: 13 (remaining gas: 1039993.290 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 0afc7c07ba6ca3b29034f926406dbe58f6c1dd2d..a14a357aca8bec626c41a085683ecf9d5e928ce3 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair 9999 None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ 9999 @parameter ] - - location: 9 (remaining gas: 1039993.410 units remaining) + - location: 9 (remaining gas: 1039993.530 units remaining) [ 9999 ] - - location: 10 (remaining gas: 1039993.270 units remaining) + - location: 10 (remaining gas: 1039993.450 units remaining) [ (Some 9999) ] - - location: 11 (remaining gas: 1039993.130 units remaining) + - location: 11 (remaining gas: 1039993.370 units remaining) [ {} (Some 9999) ] - - location: 13 (remaining gas: 1039992.990 units remaining) - [ (Pair {} (Some 9999)) ] - - location: -1 (remaining gas: 1039992.920 units remaining) + - location: 13 (remaining gas: 1039993.290 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 42b8ccf85770d4448bd0932668b8d6ddca460fa6..7ea0b1ca5ff13331e295763cb1e7a57b691e1aa2 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,21 +7,18 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ 0x48656c6c6f2c20776f726c6421 @parameter ] - - location: 9 (remaining gas: 1039991.700 units remaining) + - location: 9 (remaining gas: 1039991.820 units remaining) [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] - - location: 10 (remaining gas: 1039991.560 units remaining) + - location: 10 (remaining gas: 1039991.740 units remaining) [ (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - - location: 11 (remaining gas: 1039991.420 units remaining) + - location: 11 (remaining gas: 1039991.660 units remaining) [ {} (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - - location: 13 (remaining gas: 1039991.280 units remaining) - [ (Pair {} - (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 13 (remaining gas: 1039991.580 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 b81da49054aeea4e912c49a7e47f63fa98ff35b3..8a1d21c7883459c4feedb20e91886b9ed5ee632c 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,17 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.066 units remaining) + - location: 11 (remaining gas: 1039991.066 units remaining) [ (Pair (Left True) (Left "X")) ] - - location: 11 (remaining gas: 1039990.926 units remaining) + - location: 11 (remaining gas: 1039990.986 units remaining) [ (Left True) @parameter ] - - location: 14 (remaining gas: 1039990.636 units remaining) + - location: 12 (remaining gas: 1039990.896 units remaining) + [ True @parameter.left ] + - location: 14 (remaining gas: 1039990.816 units remaining) [ (Right True) ] - - location: 13 (remaining gas: 1039990.566 units remaining) - [ (Right True) ] - - location: 19 (remaining gas: 1039990.426 units remaining) + - location: 19 (remaining gas: 1039990.736 units remaining) [ {} (Right True) ] - - location: 21 (remaining gas: 1039990.286 units remaining) - [ (Pair {} (Right True)) ] - - location: -1 (remaining gas: 1039990.216 units remaining) + - location: 21 (remaining gas: 1039990.656 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 6c2c501ecec1f70161b52049a2766f3041fd832b..9c91536860aa57a4535aa0a78793819e4b88be63 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,17 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.042 units remaining) + - location: 11 (remaining gas: 1039991.042 units remaining) [ (Pair (Right "a") (Left "X")) ] - - location: 11 (remaining gas: 1039990.902 units remaining) + - location: 11 (remaining gas: 1039990.962 units remaining) [ (Right "a") @parameter ] - - location: 17 (remaining gas: 1039990.612 units remaining) + - location: 12 (remaining gas: 1039990.872 units remaining) + [ "a" @parameter.right ] + - location: 17 (remaining gas: 1039990.792 units remaining) [ (Left "a") ] - - location: 16 (remaining gas: 1039990.542 units remaining) - [ (Left "a") ] - - location: 19 (remaining gas: 1039990.402 units remaining) + - location: 19 (remaining gas: 1039990.712 units remaining) [ {} (Left "a") ] - - location: 21 (remaining gas: 1039990.262 units remaining) - [ (Pair {} (Left "a")) ] - - location: -1 (remaining gas: 1039990.192 units remaining) + - location: 21 (remaining gas: 1039990.632 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 0bdabc3860fde5d9f032c41ce4e3e50954dde19b..770da0e0e89d23f460bf48e7256737cfe9573c80 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039994.740 units remaining) + - location: 7 (remaining gas: 1039994.740 units remaining) [ (Pair Unit 111) ] - - location: 7 (remaining gas: 1039994.600 units remaining) + - location: 7 (remaining gas: 1039994.660 units remaining) [ ] - - location: 8 (remaining gas: 1039994.380 units remaining) + - location: 8 (remaining gas: 1039994.500 units remaining) [ 1 @level ] - - location: 9 (remaining gas: 1039994.240 units remaining) + - location: 9 (remaining gas: 1039994.420 units remaining) [ {} 1 @level ] - - location: 11 (remaining gas: 1039994.100 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039994.030 units remaining) + - location: 11 (remaining gas: 1039994.340 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 1db5f3c1768db54609c8fc99287cc77e766b78d7..8a3ddceac90285520b7596f51b67ff2a182e7b16 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.104 units remaining) + - location: 8 (remaining gas: 1039992.104 units remaining) [ (Pair { "d" ; "e" ; "f" } "abc") ] - - location: 8 (remaining gas: 1039991.964 units remaining) + - location: 8 (remaining gas: 1039992.024 units remaining) [ { "d" ; "e" ; "f" } @parameter "abc" @storage ] - - location: 9 (remaining gas: 1039991.834 units remaining) + - location: 9 (remaining gas: 1039991.954 units remaining) [ "abc" @storage { "d" ; "e" ; "f" } @parameter ] - - location: 10 (remaining gas: 1039991.694 units remaining) + - location: 10 (remaining gas: 1039991.874 units remaining) [ { "abc" ; "d" ; "e" ; "f" } ] - - location: 11 (remaining gas: 1039991.494 units remaining) + - location: 11 (remaining gas: 1039991.734 units remaining) [ "abcdef" ] - - location: 12 (remaining gas: 1039991.354 units remaining) + - location: 12 (remaining gas: 1039991.654 units remaining) [ {} "abcdef" ] - - location: 14 (remaining gas: 1039991.214 units remaining) - [ (Pair {} "abcdef") ] - - location: -1 (remaining gas: 1039991.144 units remaining) + - location: 14 (remaining gas: 1039991.574 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 93a911f602f26fb16233c2130dc73bac1eb6906c..fc409747abefd6f8da621994eead791249133a3c 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.896 units remaining) + - location: 8 (remaining gas: 1039992.896 units remaining) [ (Pair {} "abc") ] - - location: 8 (remaining gas: 1039992.756 units remaining) + - location: 8 (remaining gas: 1039992.816 units remaining) [ {} @parameter "abc" @storage ] - - location: 9 (remaining gas: 1039992.626 units remaining) + - location: 9 (remaining gas: 1039992.746 units remaining) [ "abc" @storage {} @parameter ] - - location: 10 (remaining gas: 1039992.486 units remaining) + - location: 10 (remaining gas: 1039992.666 units remaining) [ { "abc" } ] - - location: 11 (remaining gas: 1039992.316 units remaining) + - location: 11 (remaining gas: 1039992.556 units remaining) [ "abc" ] - - location: 12 (remaining gas: 1039992.176 units remaining) + - location: 12 (remaining gas: 1039992.476 units remaining) [ {} "abc" ] - - location: 14 (remaining gas: 1039992.036 units remaining) - [ (Pair {} "abc") ] - - location: -1 (remaining gas: 1039991.966 units remaining) + - location: 14 (remaining gas: 1039992.396 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 7dcbd264bebf40e9cb4c37c79db848d9c5b0e2f6..3d53b86b910d5608cf534debf48656bfb1ccb77d 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.220 units remaining) + - location: 8 (remaining gas: 1039992.220 units remaining) [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] - - location: 8 (remaining gas: 1039992.080 units remaining) + - location: 8 (remaining gas: 1039992.140 units remaining) [ { 0x00 ; 0x11 ; 0x00 } @parameter 0x @storage ] - - location: 9 (remaining gas: 1039991.950 units remaining) + - location: 9 (remaining gas: 1039992.070 units remaining) [ 0x @storage { 0x00 ; 0x11 ; 0x00 } @parameter ] - - location: 10 (remaining gas: 1039991.810 units remaining) + - location: 10 (remaining gas: 1039991.990 units remaining) [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] - - location: 11 (remaining gas: 1039991.610 units remaining) + - location: 11 (remaining gas: 1039991.850 units remaining) [ 0x001100 ] - - location: 12 (remaining gas: 1039991.470 units remaining) + - location: 12 (remaining gas: 1039991.770 units remaining) [ {} 0x001100 ] - - location: 14 (remaining gas: 1039991.330 units remaining) - [ (Pair {} 0x001100) ] - - location: -1 (remaining gas: 1039991.260 units remaining) + - location: 14 (remaining gas: 1039991.690 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 b5ec6358fbb017f7eb6d7ecb7900dc357e5fb619..d0908dc05f2d17034752c0a751756b207fa9a160 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.940 units remaining) + - location: 8 (remaining gas: 1039992.940 units remaining) [ (Pair {} 0x) ] - - location: 8 (remaining gas: 1039992.800 units remaining) + - location: 8 (remaining gas: 1039992.860 units remaining) [ {} @parameter 0x @storage ] - - location: 9 (remaining gas: 1039992.670 units remaining) + - location: 9 (remaining gas: 1039992.790 units remaining) [ 0x @storage {} @parameter ] - - location: 10 (remaining gas: 1039992.530 units remaining) + - location: 10 (remaining gas: 1039992.710 units remaining) [ { 0x } ] - - location: 11 (remaining gas: 1039992.360 units remaining) + - location: 11 (remaining gas: 1039992.600 units remaining) [ 0x ] - - location: 12 (remaining gas: 1039992.220 units remaining) + - location: 12 (remaining gas: 1039992.520 units remaining) [ {} 0x ] - - location: 14 (remaining gas: 1039992.080 units remaining) - [ (Pair {} 0x) ] - - location: -1 (remaining gas: 1039992.010 units remaining) + - location: 14 (remaining gas: 1039992.440 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 ff2b4bd5b5b3880a91bb8819635c032db90fff3d..590842c853297b7a0529bd19d4f60534b2f86d96 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.220 units remaining) + - location: 8 (remaining gas: 1039992.220 units remaining) [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] - - location: 8 (remaining gas: 1039992.080 units remaining) + - location: 8 (remaining gas: 1039992.140 units remaining) [ { 0xcd ; 0xef ; 0x00 } @parameter 0x00ab @storage ] - - location: 9 (remaining gas: 1039991.950 units remaining) + - location: 9 (remaining gas: 1039992.070 units remaining) [ 0x00ab @storage { 0xcd ; 0xef ; 0x00 } @parameter ] - - location: 10 (remaining gas: 1039991.810 units remaining) + - location: 10 (remaining gas: 1039991.990 units remaining) [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] - - location: 11 (remaining gas: 1039991.610 units remaining) + - location: 11 (remaining gas: 1039991.850 units remaining) [ 0x00abcdef00 ] - - location: 12 (remaining gas: 1039991.470 units remaining) + - location: 12 (remaining gas: 1039991.770 units remaining) [ {} 0x00abcdef00 ] - - location: 14 (remaining gas: 1039991.330 units remaining) - [ (Pair {} 0x00abcdef00) ] - - location: -1 (remaining gas: 1039991.260 units remaining) + - location: 14 (remaining gas: 1039991.690 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 47129c1fb71dd027956e56934c0ed685bd38967c..adfd34f51f8a1623891f27d5e5bd9946d0474cae 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,23 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039992.940 units remaining) + - location: 8 (remaining gas: 1039992.940 units remaining) [ (Pair {} 0xabcd) ] - - location: 8 (remaining gas: 1039992.800 units remaining) + - location: 8 (remaining gas: 1039992.860 units remaining) [ {} @parameter 0xabcd @storage ] - - location: 9 (remaining gas: 1039992.670 units remaining) + - location: 9 (remaining gas: 1039992.790 units remaining) [ 0xabcd @storage {} @parameter ] - - location: 10 (remaining gas: 1039992.530 units remaining) + - location: 10 (remaining gas: 1039992.710 units remaining) [ { 0xabcd } ] - - location: 11 (remaining gas: 1039992.360 units remaining) + - location: 11 (remaining gas: 1039992.600 units remaining) [ 0xabcd ] - - location: 12 (remaining gas: 1039992.220 units remaining) + - location: 12 (remaining gas: 1039992.520 units remaining) [ {} 0xabcd ] - - location: 14 (remaining gas: 1039992.080 units remaining) - [ (Pair {} 0xabcd) ] - - location: -1 (remaining gas: 1039992.010 units remaining) + - location: 14 (remaining gas: 1039992.440 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 62fcde5204c2dc02dc4afe599b664654a2e3c634..8b48080812074bdaa883b53df70165c816a92c09 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.974 units remaining) + - location: 9 (remaining gas: 1039993.974 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - - location: 9 (remaining gas: 1039993.834 units remaining) + - location: 9 (remaining gas: 1039993.894 units remaining) [ { "1" ; "2" ; "3" } @parameter ] - - location: 10 (remaining gas: 1039993.694 units remaining) + - location: 10 (remaining gas: 1039993.814 units remaining) [ {} { "1" ; "2" ; "3" } @parameter ] - - location: 12 (remaining gas: 1039993.554 units remaining) - [ (Pair {} { "1" ; "2" ; "3" }) ] - - location: -1 (remaining gas: 1039993.484 units remaining) + - location: 12 (remaining gas: 1039993.734 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 9ed51f1b7a18dd182341766756ad9d5b490b7e0a..85fd8de0b5e36aab052932acbbc40e30bbfa9aaa 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.974 units remaining) + - location: 9 (remaining gas: 1039993.974 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - - location: 9 (remaining gas: 1039993.834 units remaining) + - location: 9 (remaining gas: 1039993.894 units remaining) [ { "a" ; "b" ; "c" } @parameter ] - - location: 10 (remaining gas: 1039993.694 units remaining) + - location: 10 (remaining gas: 1039993.814 units remaining) [ {} { "a" ; "b" ; "c" } @parameter ] - - location: 12 (remaining gas: 1039993.554 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039993.484 units remaining) + - location: 12 (remaining gas: 1039993.734 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 06588fd16a51c527eb6241182fb1e95dbc66c580..25fdd2c018bfe70e1132fd2fdb5d252eb929881a 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.766 units remaining) + - location: 9 (remaining gas: 1039994.766 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039994.626 units remaining) + - location: 9 (remaining gas: 1039994.686 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039994.486 units remaining) + - location: 10 (remaining gas: 1039994.606 units remaining) [ {} {} @parameter ] - - location: 12 (remaining gas: 1039994.346 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039994.276 units remaining) + - location: 12 (remaining gas: 1039994.526 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 5f71d0c03aa3a901a38b84cc78c542555fc8fa54..ea9443feacba6a08e86f06766891063e69938066 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,23 +7,19 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.849 units remaining) + - location: 9 (remaining gas: 1039992.849 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - - location: 9 (remaining gas: 1039992.709 units remaining) + - location: 9 (remaining gas: 1039992.769 units remaining) [ { "1" ; "2" ; "3" } @parameter ] - - location: 11 (remaining gas: 1039992.043 units remaining) - [ "1" @parameter.elt ] - - location: 11 (remaining gas: 1039991.973 units remaining) - [ "2" @parameter.elt ] - - location: 11 (remaining gas: 1039991.903 units remaining) - [ "3" @parameter.elt ] - - location: 10 (remaining gas: 1039991.903 units remaining) - [ { "1" ; "2" ; "3" } ] - - location: 12 (remaining gas: 1039991.763 units remaining) + - location: 11 (remaining gas: 1039992.163 units remaining) + [ "1" ] + - location: 11 (remaining gas: 1039992.093 units remaining) + [ "2" ] + - location: 11 (remaining gas: 1039992.023 units remaining) + [ "3" ] + - location: 12 (remaining gas: 1039991.943 units remaining) [ {} { "1" ; "2" ; "3" } ] - - location: 14 (remaining gas: 1039991.623 units remaining) - [ (Pair {} { "1" ; "2" ; "3" }) ] - - location: -1 (remaining gas: 1039991.553 units remaining) + - location: 14 (remaining gas: 1039991.863 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 1cea9f4efdd9f9ab3c0f2b3c27d13fdd1bf26184..e68674faf176eeeba7add6a5b9bd167d140a9ffd 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,23 +7,19 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.849 units remaining) + - location: 9 (remaining gas: 1039992.849 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - - location: 9 (remaining gas: 1039992.709 units remaining) + - location: 9 (remaining gas: 1039992.769 units remaining) [ { "a" ; "b" ; "c" } @parameter ] - - location: 11 (remaining gas: 1039992.043 units remaining) - [ "a" @parameter.elt ] - - location: 11 (remaining gas: 1039991.973 units remaining) - [ "b" @parameter.elt ] - - location: 11 (remaining gas: 1039991.903 units remaining) - [ "c" @parameter.elt ] - - location: 10 (remaining gas: 1039991.903 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 12 (remaining gas: 1039991.763 units remaining) + - location: 11 (remaining gas: 1039992.163 units remaining) + [ "a" ] + - location: 11 (remaining gas: 1039992.093 units remaining) + [ "b" ] + - location: 11 (remaining gas: 1039992.023 units remaining) + [ "c" ] + - location: 12 (remaining gas: 1039991.943 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 14 (remaining gas: 1039991.623 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039991.553 units remaining) + - location: 14 (remaining gas: 1039991.863 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 e2483a069b92d609df9b17a270bf9cad6cbaad84..75c06345febcdc8b72ab59540b463011889cf924 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,17 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.641 units remaining) + - location: 9 (remaining gas: 1039993.641 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039993.501 units remaining) + - location: 9 (remaining gas: 1039993.561 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039992.941 units remaining) - [ {} ] - - location: 12 (remaining gas: 1039992.801 units remaining) + - location: 12 (remaining gas: 1039992.981 units remaining) [ {} {} ] - - location: 14 (remaining gas: 1039992.661 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039992.591 units remaining) + - location: 14 (remaining gas: 1039992.901 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 172dc2787ae1b43b3340d8e46d47d5d4ae2cfb41..e98b1a0f0ba1157f3675a4c9f73c20360a89a208 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,35 +7,25 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.060 units remaining) + - location: 8 (remaining gas: 1039991.060 units remaining) [ (Pair { 10 ; 2 ; 1 } 0) ] - - location: 8 (remaining gas: 1039990.920 units remaining) + - location: 8 (remaining gas: 1039990.980 units remaining) [ { 10 ; 2 ; 1 } @parameter ] - - location: 9 (remaining gas: 1039990.780 units remaining) + - location: 9 (remaining gas: 1039990.900 units remaining) [ 1 { 10 ; 2 ; 1 } @parameter ] - - location: 12 (remaining gas: 1039990.650 units remaining) + - location: 12 (remaining gas: 1039990.830 units remaining) [ { 10 ; 2 ; 1 } @parameter 1 ] - - location: 15 (remaining gas: 1039989.923 units remaining) + - location: 15 (remaining gas: 1039990.223 units remaining) [ 10 ] - - location: 14 (remaining gas: 1039989.853 units remaining) - [ 10 ] - - location: 15 (remaining gas: 1039989.707 units remaining) - [ 20 ] - - location: 14 (remaining gas: 1039989.637 units remaining) - [ 20 ] - - location: 15 (remaining gas: 1039989.491 units remaining) + - location: 15 (remaining gas: 1039990.137 units remaining) [ 20 ] - - location: 14 (remaining gas: 1039989.421 units remaining) + - location: 15 (remaining gas: 1039990.051 units remaining) [ 20 ] - - location: 13 (remaining gas: 1039989.421 units remaining) - [ 20 ] - - location: 16 (remaining gas: 1039989.281 units remaining) + - location: 16 (remaining gas: 1039989.971 units remaining) [ {} 20 ] - - location: 18 (remaining gas: 1039989.141 units remaining) - [ (Pair {} 20) ] - - location: -1 (remaining gas: 1039989.071 units remaining) + - location: 18 (remaining gas: 1039989.891 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 20e8e8cc44d673e23ba355e667fd583603130778..f8704b1a489c038933368a7dbc7b1227e80a74e3 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,35 +7,25 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.060 units remaining) + - location: 8 (remaining gas: 1039991.060 units remaining) [ (Pair { 3 ; 6 ; 9 } 0) ] - - location: 8 (remaining gas: 1039990.920 units remaining) + - location: 8 (remaining gas: 1039990.980 units remaining) [ { 3 ; 6 ; 9 } @parameter ] - - location: 9 (remaining gas: 1039990.780 units remaining) + - location: 9 (remaining gas: 1039990.900 units remaining) [ 1 { 3 ; 6 ; 9 } @parameter ] - - location: 12 (remaining gas: 1039990.650 units remaining) + - location: 12 (remaining gas: 1039990.830 units remaining) [ { 3 ; 6 ; 9 } @parameter 1 ] - - location: 15 (remaining gas: 1039989.923 units remaining) + - location: 15 (remaining gas: 1039990.223 units remaining) [ 3 ] - - location: 14 (remaining gas: 1039989.853 units remaining) - [ 3 ] - - location: 15 (remaining gas: 1039989.707 units remaining) - [ 18 ] - - location: 14 (remaining gas: 1039989.637 units remaining) + - location: 15 (remaining gas: 1039990.137 units remaining) [ 18 ] - - location: 15 (remaining gas: 1039989.491 units remaining) - [ 162 ] - - location: 14 (remaining gas: 1039989.421 units remaining) + - location: 15 (remaining gas: 1039990.051 units remaining) [ 162 ] - - location: 13 (remaining gas: 1039989.421 units remaining) - [ 162 ] - - location: 16 (remaining gas: 1039989.281 units remaining) + - location: 16 (remaining gas: 1039989.971 units remaining) [ {} 162 ] - - location: 18 (remaining gas: 1039989.141 units remaining) - [ (Pair {} 162) ] - - location: -1 (remaining gas: 1039989.071 units remaining) + - location: 18 (remaining gas: 1039989.891 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 184bda18ce327c7a339cba10416299542295e59b..ff3e4db6758c0e12f71697b860eca63fcaa54c9a 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,136 +7,85 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039984.380 units remaining) + - location: 9 (remaining gas: 1039984.380 units remaining) [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] - - location: 9 (remaining gas: 1039984.240 units remaining) + - location: 9 (remaining gas: 1039984.300 units remaining) [ { 1 ; 1 ; 1 ; 1 } @parameter ] - - location: 10 (remaining gas: 1039984.100 units remaining) + - location: 10 (remaining gas: 1039984.220 units remaining) [ 0 { 1 ; 1 ; 1 ; 1 } @parameter ] - - location: 13 (remaining gas: 1039983.970 units remaining) + - location: 13 (remaining gas: 1039984.150 units remaining) [ { 1 ; 1 ; 1 ; 1 } @parameter 0 ] - - location: 18 (remaining gas: 1039983.062 units remaining) + - location: 16 (remaining gas: 1039983.502 units remaining) + [ 0 ] + - location: 18 (remaining gas: 1039983.422 units remaining) [ 0 0 ] - - location: 17 (remaining gas: 1039982.992 units remaining) - [ 0 - 0 ] - - location: 16 (remaining gas: 1039982.992 units remaining) - [ 1 @parameter.elt - 0 - 0 ] - - location: 19 (remaining gas: 1039982.852 units remaining) + - location: 19 (remaining gas: 1039983.342 units remaining) [ 1 0 ] - - location: 22 (remaining gas: 1039982.552 units remaining) + - location: 20 (remaining gas: 1039983.242 units remaining) + [ 0 ] + - location: 22 (remaining gas: 1039983.162 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039982.412 units remaining) + - location: 25 (remaining gas: 1039983.082 units remaining) [ 1 ] - - location: -1 (remaining gas: 1039982.342 units remaining) + - location: 16 (remaining gas: 1039982.982 units remaining) [ 1 ] - - location: 20 (remaining gas: 1039982.342 units remaining) - [ 1 - 1 ] - - location: -1 (remaining gas: 1039982.272 units remaining) - [ 1 - 1 ] - - location: 18 (remaining gas: 1039981.972 units remaining) - [ 1 - 1 ] - - location: 17 (remaining gas: 1039981.902 units remaining) + - location: 18 (remaining gas: 1039982.902 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039981.902 units remaining) - [ 1 @parameter.elt - 1 - 1 ] - - location: 19 (remaining gas: 1039981.762 units remaining) + - location: 19 (remaining gas: 1039982.822 units remaining) [ 2 1 ] - - location: 22 (remaining gas: 1039981.462 units remaining) + - location: 20 (remaining gas: 1039982.722 units remaining) + [ 1 ] + - location: 22 (remaining gas: 1039982.642 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039981.322 units remaining) + - location: 25 (remaining gas: 1039982.562 units remaining) [ 2 ] - - location: -1 (remaining gas: 1039981.252 units remaining) + - location: 16 (remaining gas: 1039982.462 units remaining) [ 2 ] - - location: 20 (remaining gas: 1039981.252 units remaining) + - location: 18 (remaining gas: 1039982.382 units remaining) [ 2 2 ] - - location: -1 (remaining gas: 1039981.182 units remaining) - [ 2 - 2 ] - - location: 18 (remaining gas: 1039980.882 units remaining) - [ 2 - 2 ] - - location: 17 (remaining gas: 1039980.812 units remaining) - [ 2 - 2 ] - - location: 16 (remaining gas: 1039980.812 units remaining) - [ 1 @parameter.elt - 2 - 2 ] - - location: 19 (remaining gas: 1039980.672 units remaining) + - location: 19 (remaining gas: 1039982.302 units remaining) [ 3 2 ] - - location: 22 (remaining gas: 1039980.372 units remaining) + - location: 20 (remaining gas: 1039982.202 units remaining) + [ 2 ] + - location: 22 (remaining gas: 1039982.122 units remaining) [ 1 2 ] - - location: 25 (remaining gas: 1039980.232 units remaining) + - location: 25 (remaining gas: 1039982.042 units remaining) [ 3 ] - - location: -1 (remaining gas: 1039980.162 units remaining) + - location: 16 (remaining gas: 1039981.942 units remaining) [ 3 ] - - location: 20 (remaining gas: 1039980.162 units remaining) - [ 3 - 3 ] - - location: -1 (remaining gas: 1039980.092 units remaining) - [ 3 - 3 ] - - location: 18 (remaining gas: 1039979.792 units remaining) + - location: 18 (remaining gas: 1039981.862 units remaining) [ 3 3 ] - - location: 17 (remaining gas: 1039979.722 units remaining) - [ 3 - 3 ] - - location: 16 (remaining gas: 1039979.722 units remaining) - [ 1 @parameter.elt - 3 - 3 ] - - location: 19 (remaining gas: 1039979.582 units remaining) + - location: 19 (remaining gas: 1039981.782 units remaining) [ 4 3 ] - - location: 22 (remaining gas: 1039979.282 units remaining) + - location: 20 (remaining gas: 1039981.682 units remaining) + [ 3 ] + - location: 22 (remaining gas: 1039981.602 units remaining) [ 1 3 ] - - location: 25 (remaining gas: 1039979.142 units remaining) + - location: 25 (remaining gas: 1039981.522 units remaining) [ 4 ] - - location: -1 (remaining gas: 1039979.072 units remaining) - [ 4 ] - - location: 20 (remaining gas: 1039979.072 units remaining) - [ 4 - 4 ] - - location: -1 (remaining gas: 1039979.002 units remaining) - [ 4 - 4 ] - - location: 14 (remaining gas: 1039979.002 units remaining) - [ { 1 ; 2 ; 3 ; 4 } - 4 ] - - location: 26 (remaining gas: 1039978.862 units remaining) + - location: 26 (remaining gas: 1039981.442 units remaining) [ {} { 1 ; 2 ; 3 ; 4 } 4 ] - - location: 28 (remaining gas: 1039978.722 units remaining) + - location: 28 (remaining gas: 1039981.362 units remaining) [ (Pair {} { 1 ; 2 ; 3 ; 4 }) 4 ] - - location: 31 (remaining gas: 1039978.422 units remaining) - [ ] - - location: 30 (remaining gas: 1039978.352 units remaining) + - location: 29 (remaining gas: 1039981.262 units remaining) + [ 4 ] + - location: 31 (remaining gas: 1039981.182 units remaining) [ ] - - location: 29 (remaining gas: 1039978.352 units remaining) - [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ] - - location: -1 (remaining gas: 1039978.282 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 992a8885abd68ecf0dfdbd51c81ae4e3d346d427..5c19e10029f6ec69f8039269ed19b1177186151b 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,136 +7,85 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039984.380 units remaining) + - location: 9 (remaining gas: 1039984.380 units remaining) [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] - - location: 9 (remaining gas: 1039984.240 units remaining) + - location: 9 (remaining gas: 1039984.300 units remaining) [ { 1 ; 2 ; 3 ; 0 } @parameter ] - - location: 10 (remaining gas: 1039984.100 units remaining) + - location: 10 (remaining gas: 1039984.220 units remaining) [ 0 { 1 ; 2 ; 3 ; 0 } @parameter ] - - location: 13 (remaining gas: 1039983.970 units remaining) + - location: 13 (remaining gas: 1039984.150 units remaining) [ { 1 ; 2 ; 3 ; 0 } @parameter 0 ] - - location: 18 (remaining gas: 1039983.062 units remaining) + - location: 16 (remaining gas: 1039983.502 units remaining) + [ 0 ] + - location: 18 (remaining gas: 1039983.422 units remaining) [ 0 0 ] - - location: 17 (remaining gas: 1039982.992 units remaining) - [ 0 - 0 ] - - location: 16 (remaining gas: 1039982.992 units remaining) - [ 1 @parameter.elt - 0 - 0 ] - - location: 19 (remaining gas: 1039982.852 units remaining) + - location: 19 (remaining gas: 1039983.342 units remaining) [ 1 0 ] - - location: 22 (remaining gas: 1039982.552 units remaining) + - location: 20 (remaining gas: 1039983.242 units remaining) + [ 0 ] + - location: 22 (remaining gas: 1039983.162 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039982.412 units remaining) + - location: 25 (remaining gas: 1039983.082 units remaining) [ 1 ] - - location: -1 (remaining gas: 1039982.342 units remaining) + - location: 16 (remaining gas: 1039982.982 units remaining) [ 1 ] - - location: 20 (remaining gas: 1039982.342 units remaining) - [ 1 - 1 ] - - location: -1 (remaining gas: 1039982.272 units remaining) - [ 1 - 1 ] - - location: 18 (remaining gas: 1039981.972 units remaining) - [ 1 - 1 ] - - location: 17 (remaining gas: 1039981.902 units remaining) + - location: 18 (remaining gas: 1039982.902 units remaining) [ 1 1 ] - - location: 16 (remaining gas: 1039981.902 units remaining) - [ 2 @parameter.elt - 1 - 1 ] - - location: 19 (remaining gas: 1039981.762 units remaining) + - location: 19 (remaining gas: 1039982.822 units remaining) [ 3 1 ] - - location: 22 (remaining gas: 1039981.462 units remaining) + - location: 20 (remaining gas: 1039982.722 units remaining) + [ 1 ] + - location: 22 (remaining gas: 1039982.642 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039981.322 units remaining) + - location: 25 (remaining gas: 1039982.562 units remaining) [ 2 ] - - location: -1 (remaining gas: 1039981.252 units remaining) + - location: 16 (remaining gas: 1039982.462 units remaining) [ 2 ] - - location: 20 (remaining gas: 1039981.252 units remaining) - [ 3 - 2 ] - - location: -1 (remaining gas: 1039981.182 units remaining) - [ 3 - 2 ] - - location: 18 (remaining gas: 1039980.882 units remaining) - [ 2 - 2 ] - - location: 17 (remaining gas: 1039980.812 units remaining) + - location: 18 (remaining gas: 1039982.382 units remaining) [ 2 2 ] - - location: 16 (remaining gas: 1039980.812 units remaining) - [ 3 @parameter.elt - 2 - 2 ] - - location: 19 (remaining gas: 1039980.672 units remaining) + - location: 19 (remaining gas: 1039982.302 units remaining) [ 5 2 ] - - location: 22 (remaining gas: 1039980.372 units remaining) + - location: 20 (remaining gas: 1039982.202 units remaining) + [ 2 ] + - location: 22 (remaining gas: 1039982.122 units remaining) [ 1 2 ] - - location: 25 (remaining gas: 1039980.232 units remaining) + - location: 25 (remaining gas: 1039982.042 units remaining) [ 3 ] - - location: -1 (remaining gas: 1039980.162 units remaining) + - location: 16 (remaining gas: 1039981.942 units remaining) [ 3 ] - - location: 20 (remaining gas: 1039980.162 units remaining) - [ 5 - 3 ] - - location: -1 (remaining gas: 1039980.092 units remaining) - [ 5 - 3 ] - - location: 18 (remaining gas: 1039979.792 units remaining) + - location: 18 (remaining gas: 1039981.862 units remaining) [ 3 3 ] - - location: 17 (remaining gas: 1039979.722 units remaining) + - location: 19 (remaining gas: 1039981.782 units remaining) [ 3 3 ] - - location: 16 (remaining gas: 1039979.722 units remaining) - [ 0 @parameter.elt - 3 - 3 ] - - location: 19 (remaining gas: 1039979.582 units remaining) - [ 3 - 3 ] - - location: 22 (remaining gas: 1039979.282 units remaining) + - location: 20 (remaining gas: 1039981.682 units remaining) + [ 3 ] + - location: 22 (remaining gas: 1039981.602 units remaining) [ 1 3 ] - - location: 25 (remaining gas: 1039979.142 units remaining) + - location: 25 (remaining gas: 1039981.522 units remaining) [ 4 ] - - location: -1 (remaining gas: 1039979.072 units remaining) - [ 4 ] - - location: 20 (remaining gas: 1039979.072 units remaining) - [ 3 - 4 ] - - location: -1 (remaining gas: 1039979.002 units remaining) - [ 3 - 4 ] - - location: 14 (remaining gas: 1039979.002 units remaining) - [ { 1 ; 3 ; 5 ; 3 } - 4 ] - - location: 26 (remaining gas: 1039978.862 units remaining) + - location: 26 (remaining gas: 1039981.442 units remaining) [ {} { 1 ; 3 ; 5 ; 3 } 4 ] - - location: 28 (remaining gas: 1039978.722 units remaining) + - location: 28 (remaining gas: 1039981.362 units remaining) [ (Pair {} { 1 ; 3 ; 5 ; 3 }) 4 ] - - location: 31 (remaining gas: 1039978.422 units remaining) - [ ] - - location: 30 (remaining gas: 1039978.352 units remaining) + - location: 29 (remaining gas: 1039981.262 units remaining) + [ 4 ] + - location: 31 (remaining gas: 1039981.182 units remaining) [ ] - - location: 29 (remaining gas: 1039978.352 units remaining) - [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ] - - location: -1 (remaining gas: 1039978.282 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 0d38983a6639d40f7ec1e4209a5e98f301221037..95ac1abd9e1018f3a4f915f6f149b3e49a0b3725 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,32 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039985.340 units remaining) + - location: 9 (remaining gas: 1039985.340 units remaining) [ (Pair {} { 0 }) ] - - location: 9 (remaining gas: 1039985.200 units remaining) + - location: 9 (remaining gas: 1039985.260 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039985.060 units remaining) + - location: 10 (remaining gas: 1039985.180 units remaining) [ 0 {} @parameter ] - - location: 13 (remaining gas: 1039984.930 units remaining) + - location: 13 (remaining gas: 1039985.110 units remaining) [ {} @parameter 0 ] - - location: 14 (remaining gas: 1039984.370 units remaining) - [ {} - 0 ] - - location: 26 (remaining gas: 1039984.230 units remaining) + - location: 26 (remaining gas: 1039984.530 units remaining) [ {} {} 0 ] - - location: 28 (remaining gas: 1039984.090 units remaining) + - location: 28 (remaining gas: 1039984.450 units remaining) [ (Pair {} {}) 0 ] - - location: 31 (remaining gas: 1039983.790 units remaining) - [ ] - - location: 30 (remaining gas: 1039983.720 units remaining) + - location: 29 (remaining gas: 1039984.350 units remaining) + [ 0 ] + - location: 31 (remaining gas: 1039984.270 units remaining) [ ] - - location: 29 (remaining gas: 1039983.720 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039983.650 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 a46e67990c1c3edf33c5ceb4039a4a4232f7ad8b..48e2c040f8e210d28002a91ce931d1b2c8b54494 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.130 units remaining) + - location: 8 (remaining gas: 1039993.130 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - - location: 8 (remaining gas: 1039992.990 units remaining) + - location: 8 (remaining gas: 1039993.050 units remaining) [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] - - location: 9 (remaining gas: 1039992.850 units remaining) + - location: 9 (remaining gas: 1039992.970 units remaining) [ 6 ] - - location: 10 (remaining gas: 1039992.710 units remaining) + - location: 10 (remaining gas: 1039992.890 units remaining) [ {} 6 ] - - location: 12 (remaining gas: 1039992.570 units remaining) - [ (Pair {} 6) ] - - location: -1 (remaining gas: 1039992.500 units remaining) + - location: 12 (remaining gas: 1039992.810 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 1c32ff8dbe252ee66ed9a1bbc7d0c54bb74a2921..65bf71a33403a7150f8cf1a01ae37043e10a7848 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.850 units remaining) + - location: 8 (remaining gas: 1039993.850 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039993.710 units remaining) + - location: 8 (remaining gas: 1039993.770 units remaining) [ { 1 ; 2 ; 3 } @parameter ] - - location: 9 (remaining gas: 1039993.570 units remaining) + - location: 9 (remaining gas: 1039993.690 units remaining) [ 3 ] - - location: 10 (remaining gas: 1039993.430 units remaining) + - location: 10 (remaining gas: 1039993.610 units remaining) [ {} 3 ] - - location: 12 (remaining gas: 1039993.290 units remaining) - [ (Pair {} 3) ] - - location: -1 (remaining gas: 1039993.220 units remaining) + - location: 12 (remaining gas: 1039993.530 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 02799210c166f2afdaa4ffc3bc14121935efc395..4c781791d4b09a462eacf70a586711bed8aa5d88 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.330 units remaining) + - location: 8 (remaining gas: 1039994.330 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039994.190 units remaining) + - location: 8 (remaining gas: 1039994.250 units remaining) [ { 1 } @parameter ] - - location: 9 (remaining gas: 1039994.050 units remaining) + - location: 9 (remaining gas: 1039994.170 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039993.910 units remaining) + - location: 10 (remaining gas: 1039994.090 units remaining) [ {} 1 ] - - location: 12 (remaining gas: 1039993.770 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039993.700 units remaining) + - location: 12 (remaining gas: 1039994.010 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 7b85a238d4261c67f384752892b854c9f4458ff1..5cc528df61cfb80546bb7106fc04c2c1ae7c8c42 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.570 units remaining) + - location: 8 (remaining gas: 1039994.570 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039994.430 units remaining) + - location: 8 (remaining gas: 1039994.490 units remaining) [ {} @parameter ] - - location: 9 (remaining gas: 1039994.290 units remaining) + - location: 9 (remaining gas: 1039994.410 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039994.150 units remaining) + - location: 10 (remaining gas: 1039994.330 units remaining) [ {} 0 ] - - location: 12 (remaining gas: 1039994.010 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039993.940 units remaining) + - location: 12 (remaining gas: 1039994.250 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 7116610703063327b0d8aed7036b43913eb4b09c..3ca4b09365ed9990bd896afb3727746029e712a0 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,142 +7,118 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039976.864 units remaining) + - location: 9 (remaining gas: 1039976.864 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039976.724 units remaining) + - location: 9 (remaining gas: 1039976.784 units remaining) [ { "c" ; "b" ; "a" } @parameter ] - - location: 10 (remaining gas: 1039976.584 units remaining) + - location: 10 (remaining gas: 1039976.704 units remaining) [ {} { "c" ; "b" ; "a" } @parameter ] - - location: 12 (remaining gas: 1039976.454 units remaining) + - location: 12 (remaining gas: 1039976.634 units remaining) [ { "c" ; "b" ; "a" } @parameter {} ] - - location: 13 (remaining gas: 1039976.314 units remaining) + - location: 13 (remaining gas: 1039976.554 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] - - location: 14 (remaining gas: 1039976.174 units remaining) + - location: 14 (remaining gas: 1039976.474 units remaining) [ (Left (Pair { "c" ; "b" ; "a" } {})) ] - - location: 19 (remaining gas: 1039975.894 units remaining) + - location: 19 (remaining gas: 1039976.314 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) (Pair { "c" ; "b" ; "a" } {}) ] - - location: 20 (remaining gas: 1039975.754 units remaining) + - location: 20 (remaining gas: 1039976.234 units remaining) [ { "c" ; "b" ; "a" } @parameter (Pair { "c" ; "b" ; "a" } {}) ] - - location: 23 (remaining gas: 1039975.454 units remaining) - [ {} ] - - location: 22 (remaining gas: 1039975.384 units remaining) + - location: 21 (remaining gas: 1039976.134 units remaining) + [ (Pair { "c" ; "b" ; "a" } {}) ] + - location: 23 (remaining gas: 1039976.054 units remaining) [ {} ] - - location: 21 (remaining gas: 1039975.384 units remaining) - [ { "c" ; "b" ; "a" } @parameter + - location: 24 (remaining gas: 1039975.944 units remaining) + [ "c" @parameter.hd + { "b" ; "a" } @parameter.tl {} ] - - location: 26 (remaining gas: 1039975.084 units remaining) + - location: 26 (remaining gas: 1039975.874 units remaining) [ { "b" ; "a" } @parameter.tl "c" @parameter.hd {} ] - - location: 29 (remaining gas: 1039974.784 units remaining) - [ { "c" } ] - - location: 28 (remaining gas: 1039974.714 units remaining) + - location: 27 (remaining gas: 1039975.774 units remaining) + [ "c" @parameter.hd + {} ] + - location: 29 (remaining gas: 1039975.694 units remaining) [ { "c" } ] - - location: 27 (remaining gas: 1039974.714 units remaining) - [ { "b" ; "a" } @parameter.tl - { "c" } ] - - location: 30 (remaining gas: 1039974.574 units remaining) + - location: 30 (remaining gas: 1039975.614 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] - - location: 31 (remaining gas: 1039974.434 units remaining) - [ (Left (Pair { "b" ; "a" } { "c" })) ] - - location: -1 (remaining gas: 1039974.364 units remaining) - [ (Left (Pair { "b" ; "a" } { "c" })) ] - - location: -1 (remaining gas: 1039974.294 units remaining) + - location: 31 (remaining gas: 1039975.534 units remaining) [ (Left (Pair { "b" ; "a" } { "c" })) ] - - location: 19 (remaining gas: 1039974.074 units remaining) + - location: 19 (remaining gas: 1039975.454 units remaining) [ (Pair { "b" ; "a" } { "c" }) (Pair { "b" ; "a" } { "c" }) ] - - location: 20 (remaining gas: 1039973.934 units remaining) + - location: 20 (remaining gas: 1039975.374 units remaining) [ { "b" ; "a" } @parameter (Pair { "b" ; "a" } { "c" }) ] - - location: 23 (remaining gas: 1039973.634 units remaining) - [ { "c" } ] - - location: 22 (remaining gas: 1039973.564 units remaining) + - location: 21 (remaining gas: 1039975.274 units remaining) + [ (Pair { "b" ; "a" } { "c" }) ] + - location: 23 (remaining gas: 1039975.194 units remaining) [ { "c" } ] - - location: 21 (remaining gas: 1039973.564 units remaining) - [ { "b" ; "a" } @parameter + - location: 24 (remaining gas: 1039975.084 units remaining) + [ "b" @parameter.hd + { "a" } @parameter.tl { "c" } ] - - location: 26 (remaining gas: 1039973.264 units remaining) + - location: 26 (remaining gas: 1039975.014 units remaining) [ { "a" } @parameter.tl "b" @parameter.hd { "c" } ] - - location: 29 (remaining gas: 1039972.964 units remaining) - [ { "b" ; "c" } ] - - location: 28 (remaining gas: 1039972.894 units remaining) + - location: 27 (remaining gas: 1039974.914 units remaining) + [ "b" @parameter.hd + { "c" } ] + - location: 29 (remaining gas: 1039974.834 units remaining) [ { "b" ; "c" } ] - - location: 27 (remaining gas: 1039972.894 units remaining) - [ { "a" } @parameter.tl - { "b" ; "c" } ] - - location: 30 (remaining gas: 1039972.754 units remaining) + - location: 30 (remaining gas: 1039974.754 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] - - location: 31 (remaining gas: 1039972.614 units remaining) - [ (Left (Pair { "a" } { "b" ; "c" })) ] - - location: -1 (remaining gas: 1039972.544 units remaining) + - location: 31 (remaining gas: 1039974.674 units remaining) [ (Left (Pair { "a" } { "b" ; "c" })) ] - - location: -1 (remaining gas: 1039972.474 units remaining) - [ (Left (Pair { "a" } { "b" ; "c" })) ] - - location: 19 (remaining gas: 1039972.254 units remaining) + - location: 19 (remaining gas: 1039974.594 units remaining) [ (Pair { "a" } { "b" ; "c" }) (Pair { "a" } { "b" ; "c" }) ] - - location: 20 (remaining gas: 1039972.114 units remaining) + - location: 20 (remaining gas: 1039974.514 units remaining) [ { "a" } @parameter (Pair { "a" } { "b" ; "c" }) ] - - location: 23 (remaining gas: 1039971.814 units remaining) - [ { "b" ; "c" } ] - - location: 22 (remaining gas: 1039971.744 units remaining) + - location: 21 (remaining gas: 1039974.414 units remaining) + [ (Pair { "a" } { "b" ; "c" }) ] + - location: 23 (remaining gas: 1039974.334 units remaining) [ { "b" ; "c" } ] - - location: 21 (remaining gas: 1039971.744 units remaining) - [ { "a" } @parameter + - location: 24 (remaining gas: 1039974.224 units remaining) + [ "a" @parameter.hd + {} @parameter.tl { "b" ; "c" } ] - - location: 26 (remaining gas: 1039971.444 units remaining) + - location: 26 (remaining gas: 1039974.154 units remaining) [ {} @parameter.tl "a" @parameter.hd { "b" ; "c" } ] - - location: 29 (remaining gas: 1039971.144 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 28 (remaining gas: 1039971.074 units remaining) + - location: 27 (remaining gas: 1039974.054 units remaining) + [ "a" @parameter.hd + { "b" ; "c" } ] + - location: 29 (remaining gas: 1039973.974 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 27 (remaining gas: 1039971.074 units remaining) - [ {} @parameter.tl - { "a" ; "b" ; "c" } ] - - location: 30 (remaining gas: 1039970.934 units remaining) + - location: 30 (remaining gas: 1039973.894 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: 31 (remaining gas: 1039970.794 units remaining) - [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - - location: -1 (remaining gas: 1039970.724 units remaining) + - location: 31 (remaining gas: 1039973.814 units remaining) [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - - location: -1 (remaining gas: 1039970.654 units remaining) - [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - - location: 19 (remaining gas: 1039970.434 units remaining) + - location: 19 (remaining gas: 1039973.734 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) (Pair {} { "a" ; "b" ; "c" }) ] - - location: 20 (remaining gas: 1039970.294 units remaining) + - location: 20 (remaining gas: 1039973.654 units remaining) [ {} @parameter (Pair {} { "a" ; "b" ; "c" }) ] - - location: 23 (remaining gas: 1039969.994 units remaining) + - location: 21 (remaining gas: 1039973.554 units remaining) + [ (Pair {} { "a" ; "b" ; "c" }) ] + - location: 23 (remaining gas: 1039973.474 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 22 (remaining gas: 1039969.924 units remaining) + - location: 24 (remaining gas: 1039973.364 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 21 (remaining gas: 1039969.924 units remaining) - [ {} @parameter - { "a" ; "b" ; "c" } ] - - location: 35 (remaining gas: 1039969.614 units remaining) + - location: 35 (remaining gas: 1039973.284 units remaining) [ (Right { "a" ; "b" ; "c" }) ] - - location: 34 (remaining gas: 1039969.544 units remaining) - [ (Right { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039969.474 units remaining) - [ (Right { "a" ; "b" ; "c" }) ] - - location: 17 (remaining gas: 1039969.394 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 41 (remaining gas: 1039969.254 units remaining) + - location: 41 (remaining gas: 1039973.204 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 43 (remaining gas: 1039969.114 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039969.044 units remaining) + - location: 43 (remaining gas: 1039973.124 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 22664ccea1ee4d25862b12e9594676a3b5400106..45fa467fb10bbf73f9caa2a0b5ed6934dfd1947b 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,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039977.656 units remaining) + - location: 9 (remaining gas: 1039977.656 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039977.516 units remaining) + - location: 9 (remaining gas: 1039977.576 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039977.376 units remaining) + - location: 10 (remaining gas: 1039977.496 units remaining) [ {} {} @parameter ] - - location: 12 (remaining gas: 1039977.246 units remaining) + - location: 12 (remaining gas: 1039977.426 units remaining) [ {} @parameter {} ] - - location: 13 (remaining gas: 1039977.106 units remaining) + - location: 13 (remaining gas: 1039977.346 units remaining) [ (Pair {} {}) ] - - location: 14 (remaining gas: 1039976.966 units remaining) + - location: 14 (remaining gas: 1039977.266 units remaining) [ (Left (Pair {} {})) ] - - location: 19 (remaining gas: 1039976.686 units remaining) + - location: 19 (remaining gas: 1039977.106 units remaining) [ (Pair {} {}) (Pair {} {}) ] - - location: 20 (remaining gas: 1039976.546 units remaining) + - location: 20 (remaining gas: 1039977.026 units remaining) [ {} @parameter (Pair {} {}) ] - - location: 23 (remaining gas: 1039976.246 units remaining) + - location: 21 (remaining gas: 1039976.926 units remaining) + [ (Pair {} {}) ] + - location: 23 (remaining gas: 1039976.846 units remaining) [ {} ] - - location: 22 (remaining gas: 1039976.176 units remaining) + - location: 24 (remaining gas: 1039976.736 units remaining) [ {} ] - - location: 21 (remaining gas: 1039976.176 units remaining) - [ {} @parameter - {} ] - - location: 35 (remaining gas: 1039975.866 units remaining) - [ (Right {}) ] - - location: 34 (remaining gas: 1039975.796 units remaining) + - location: 35 (remaining gas: 1039976.656 units remaining) [ (Right {}) ] - - location: -1 (remaining gas: 1039975.726 units remaining) - [ (Right {}) ] - - location: 17 (remaining gas: 1039975.646 units remaining) - [ {} ] - - location: 41 (remaining gas: 1039975.506 units remaining) + - location: 41 (remaining gas: 1039976.576 units remaining) [ {} {} ] - - location: 43 (remaining gas: 1039975.366 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039975.296 units remaining) + - location: 43 (remaining gas: 1039976.496 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 0240d2535873a21ad20ae9262961d25dc281b1c4..8ad6cea462c5983eb2e630ae444e730befca3ebf 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039993.280 units remaining) + - location: 11 (remaining gas: 1039993.280 units remaining) [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] - - location: 11 (remaining gas: 1039993.140 units remaining) + - location: 11 (remaining gas: 1039993.200 units remaining) [ { Elt 0 0 ; Elt 3 4 } @parameter ] - - location: 12 (remaining gas: 1039993 units remaining) + - location: 12 (remaining gas: 1039993.120 units remaining) [ {} { Elt 0 0 ; Elt 3 4 } @parameter ] - - location: 14 (remaining gas: 1039992.860 units remaining) - [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] - - location: -1 (remaining gas: 1039992.790 units remaining) + - location: 14 (remaining gas: 1039993.040 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 669752847e4be5895afa2a5d3761e1407e34c708..8cba10bc2963475bec6c087d8fae661f36d019b6 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039993.990 units remaining) + - location: 11 (remaining gas: 1039993.990 units remaining) [ (Pair { Elt 0 0 } {}) ] - - location: 11 (remaining gas: 1039993.850 units remaining) + - location: 11 (remaining gas: 1039993.910 units remaining) [ { Elt 0 0 } @parameter ] - - location: 12 (remaining gas: 1039993.710 units remaining) + - location: 12 (remaining gas: 1039993.830 units remaining) [ {} { Elt 0 0 } @parameter ] - - location: 14 (remaining gas: 1039993.570 units remaining) - [ (Pair {} { Elt 0 0 }) ] - - location: -1 (remaining gas: 1039993.500 units remaining) + - location: 14 (remaining gas: 1039993.750 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 27738be18327d397392845ae55e32c022a0b87e7..a501019de5060fcc4dd01ab6876f52e8bd8bedcb 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039993.990 units remaining) + - location: 11 (remaining gas: 1039993.990 units remaining) [ (Pair { Elt 0 1 } {}) ] - - location: 11 (remaining gas: 1039993.850 units remaining) + - location: 11 (remaining gas: 1039993.910 units remaining) [ { Elt 0 1 } @parameter ] - - location: 12 (remaining gas: 1039993.710 units remaining) + - location: 12 (remaining gas: 1039993.830 units remaining) [ {} { Elt 0 1 } @parameter ] - - location: 14 (remaining gas: 1039993.570 units remaining) - [ (Pair {} { Elt 0 1 }) ] - - location: -1 (remaining gas: 1039993.500 units remaining) + - location: 14 (remaining gas: 1039993.750 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 6dcc03b00032005be64325578eabb1b626012c59..087e98c8cf6335494abbe5db88ed7d79a5571097 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,144 +7,110 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039975.900 units remaining) + - location: 11 (remaining gas: 1039975.900 units remaining) [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] - - location: 11 (remaining gas: 1039975.760 units remaining) + - location: 11 (remaining gas: 1039975.820 units remaining) [ { Elt 0 100 ; Elt 2 100 } @parameter ] - - location: 12 (remaining gas: 1039975.620 units remaining) + - location: 12 (remaining gas: 1039975.740 units remaining) [ 0 @acc_e { Elt 0 100 ; Elt 2 100 } @parameter ] - - location: 15 (remaining gas: 1039975.480 units remaining) + - location: 15 (remaining gas: 1039975.660 units remaining) [ 0 @acc_k 0 @acc_e { Elt 0 100 ; Elt 2 100 } @parameter ] - - location: 18 (remaining gas: 1039975.340 units remaining) + - location: 18 (remaining gas: 1039975.580 units remaining) [ (Pair 0 0) { Elt 0 100 ; Elt 2 100 } @parameter ] - - location: 19 (remaining gas: 1039975.210 units remaining) + - location: 19 (remaining gas: 1039975.510 units remaining) [ { Elt 0 100 ; Elt 2 100 } @parameter (Pair 0 0) ] - - location: 24 (remaining gas: 1039974.690 units remaining) + - location: 22 (remaining gas: 1039975.250 units remaining) + [ (Pair 0 0) ] + - location: 24 (remaining gas: 1039975.170 units remaining) [ (Pair 0 0) (Pair 0 0) ] - - location: 25 (remaining gas: 1039974.550 units remaining) + - location: 25 (remaining gas: 1039975.090 units remaining) [ 0 @acc_k (Pair 0 0) ] - - location: 28 (remaining gas: 1039974.250 units remaining) + - location: 26 (remaining gas: 1039974.990 units remaining) + [ (Pair 0 0) ] + - location: 28 (remaining gas: 1039974.910 units remaining) [ 0 @acc_e ] - - location: 27 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_e ] - - location: 26 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_k - 0 @acc_e ] - - location: -1 (remaining gas: 1039974.110 units remaining) - [ 0 @acc_k - 0 @acc_e ] - - location: 22 (remaining gas: 1039974.110 units remaining) + - location: 29 (remaining gas: 1039974.830 units remaining) [ (Pair 0 100) + (Pair 0 100) 0 @acc_k 0 @acc_e ] - - location: 29 (remaining gas: 1039973.970 units remaining) + - location: 30 (remaining gas: 1039974.730 units remaining) [ (Pair 0 100) - (Pair 0 100) 0 @acc_k 0 @acc_e ] - - location: 32 (remaining gas: 1039973.670 units remaining) + - location: 32 (remaining gas: 1039974.650 units remaining) [ 0 @key 0 @acc_k 0 @acc_e ] - - location: 33 (remaining gas: 1039973.530 units remaining) + - location: 33 (remaining gas: 1039974.570 units remaining) [ 0 0 @acc_e ] - - location: -1 (remaining gas: 1039973.460 units remaining) + - location: 34 (remaining gas: 1039974.500 units remaining) [ 0 + (Pair 0 100) 0 @acc_e ] - - location: 30 (remaining gas: 1039973.460 units remaining) + - location: 35 (remaining gas: 1039974.400 units remaining) [ (Pair 0 100) - 0 0 @acc_e ] - - location: 34 (remaining gas: 1039973.330 units remaining) - [ 0 - (Pair 0 100) - 0 @acc_e ] - - location: 37 (remaining gas: 1039973.030 units remaining) + - location: 37 (remaining gas: 1039974.320 units remaining) [ 100 @elt 0 @acc_e ] - - location: 38 (remaining gas: 1039972.890 units remaining) - [ 100 ] - - location: -1 (remaining gas: 1039972.820 units remaining) + - location: 38 (remaining gas: 1039974.240 units remaining) [ 100 ] - - location: 35 (remaining gas: 1039972.820 units remaining) - [ 0 - 100 ] - - location: 39 (remaining gas: 1039972.680 units remaining) + - location: 39 (remaining gas: 1039974.160 units remaining) [ (Pair 0 100) ] - - location: -1 (remaining gas: 1039972.610 units remaining) + - location: 22 (remaining gas: 1039974.060 units remaining) [ (Pair 0 100) ] - - location: 24 (remaining gas: 1039972.310 units remaining) + - location: 24 (remaining gas: 1039973.980 units remaining) [ (Pair 0 100) (Pair 0 100) ] - - location: 25 (remaining gas: 1039972.170 units remaining) + - location: 25 (remaining gas: 1039973.900 units remaining) [ 0 @acc_k (Pair 0 100) ] - - location: 28 (remaining gas: 1039971.870 units remaining) - [ 100 @acc_e ] - - location: 27 (remaining gas: 1039971.800 units remaining) + - location: 26 (remaining gas: 1039973.800 units remaining) + [ (Pair 0 100) ] + - location: 28 (remaining gas: 1039973.720 units remaining) [ 100 @acc_e ] - - location: 26 (remaining gas: 1039971.800 units remaining) - [ 0 @acc_k - 100 @acc_e ] - - location: -1 (remaining gas: 1039971.730 units remaining) - [ 0 @acc_k - 100 @acc_e ] - - location: 22 (remaining gas: 1039971.730 units remaining) + - location: 29 (remaining gas: 1039973.640 units remaining) [ (Pair 2 100) + (Pair 2 100) 0 @acc_k 100 @acc_e ] - - location: 29 (remaining gas: 1039971.590 units remaining) + - location: 30 (remaining gas: 1039973.540 units remaining) [ (Pair 2 100) - (Pair 2 100) 0 @acc_k 100 @acc_e ] - - location: 32 (remaining gas: 1039971.290 units remaining) + - location: 32 (remaining gas: 1039973.460 units remaining) [ 2 @key 0 @acc_k 100 @acc_e ] - - location: 33 (remaining gas: 1039971.150 units remaining) + - location: 33 (remaining gas: 1039973.380 units remaining) [ 2 100 @acc_e ] - - location: -1 (remaining gas: 1039971.080 units remaining) + - location: 34 (remaining gas: 1039973.310 units remaining) [ 2 + (Pair 2 100) 100 @acc_e ] - - location: 30 (remaining gas: 1039971.080 units remaining) + - location: 35 (remaining gas: 1039973.210 units remaining) [ (Pair 2 100) - 2 100 @acc_e ] - - location: 34 (remaining gas: 1039970.950 units remaining) - [ 2 - (Pair 2 100) - 100 @acc_e ] - - location: 37 (remaining gas: 1039970.650 units remaining) + - location: 37 (remaining gas: 1039973.130 units remaining) [ 100 @elt 100 @acc_e ] - - location: 38 (remaining gas: 1039970.510 units remaining) + - location: 38 (remaining gas: 1039973.050 units remaining) [ 200 ] - - location: -1 (remaining gas: 1039970.440 units remaining) - [ 200 ] - - location: 35 (remaining gas: 1039970.440 units remaining) - [ 2 - 200 ] - - location: 39 (remaining gas: 1039970.300 units remaining) + - location: 39 (remaining gas: 1039972.970 units remaining) [ (Pair 2 200) ] - - location: -1 (remaining gas: 1039970.230 units remaining) - [ (Pair 2 200) ] - - location: 20 (remaining gas: 1039970.230 units remaining) - [ (Pair 2 200) ] - - location: 40 (remaining gas: 1039970.090 units remaining) + - location: 40 (remaining gas: 1039972.890 units remaining) [ {} (Pair 2 200) ] - - location: 42 (remaining gas: 1039969.950 units remaining) - [ (Pair {} 2 200) ] - - location: -1 (remaining gas: 1039969.880 units remaining) + - location: 42 (remaining gas: 1039972.810 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 7ef195fcc6023aa2a379930d9159bdeab8c8d3f1..5dd1e1d7562c60c5c48bdc54ef9273f0e1e65f68 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,144 +7,110 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039975.900 units remaining) + - location: 11 (remaining gas: 1039975.900 units remaining) [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] - - location: 11 (remaining gas: 1039975.760 units remaining) + - location: 11 (remaining gas: 1039975.820 units remaining) [ { Elt 1 1 ; Elt 2 100 } @parameter ] - - location: 12 (remaining gas: 1039975.620 units remaining) + - location: 12 (remaining gas: 1039975.740 units remaining) [ 0 @acc_e { Elt 1 1 ; Elt 2 100 } @parameter ] - - location: 15 (remaining gas: 1039975.480 units remaining) + - location: 15 (remaining gas: 1039975.660 units remaining) [ 0 @acc_k 0 @acc_e { Elt 1 1 ; Elt 2 100 } @parameter ] - - location: 18 (remaining gas: 1039975.340 units remaining) + - location: 18 (remaining gas: 1039975.580 units remaining) [ (Pair 0 0) { Elt 1 1 ; Elt 2 100 } @parameter ] - - location: 19 (remaining gas: 1039975.210 units remaining) + - location: 19 (remaining gas: 1039975.510 units remaining) [ { Elt 1 1 ; Elt 2 100 } @parameter (Pair 0 0) ] - - location: 24 (remaining gas: 1039974.690 units remaining) + - location: 22 (remaining gas: 1039975.250 units remaining) + [ (Pair 0 0) ] + - location: 24 (remaining gas: 1039975.170 units remaining) [ (Pair 0 0) (Pair 0 0) ] - - location: 25 (remaining gas: 1039974.550 units remaining) + - location: 25 (remaining gas: 1039975.090 units remaining) [ 0 @acc_k (Pair 0 0) ] - - location: 28 (remaining gas: 1039974.250 units remaining) + - location: 26 (remaining gas: 1039974.990 units remaining) + [ (Pair 0 0) ] + - location: 28 (remaining gas: 1039974.910 units remaining) [ 0 @acc_e ] - - location: 27 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_e ] - - location: 26 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_k - 0 @acc_e ] - - location: -1 (remaining gas: 1039974.110 units remaining) - [ 0 @acc_k - 0 @acc_e ] - - location: 22 (remaining gas: 1039974.110 units remaining) + - location: 29 (remaining gas: 1039974.830 units remaining) [ (Pair 1 1) + (Pair 1 1) 0 @acc_k 0 @acc_e ] - - location: 29 (remaining gas: 1039973.970 units remaining) + - location: 30 (remaining gas: 1039974.730 units remaining) [ (Pair 1 1) - (Pair 1 1) 0 @acc_k 0 @acc_e ] - - location: 32 (remaining gas: 1039973.670 units remaining) + - location: 32 (remaining gas: 1039974.650 units remaining) [ 1 @key 0 @acc_k 0 @acc_e ] - - location: 33 (remaining gas: 1039973.530 units remaining) + - location: 33 (remaining gas: 1039974.570 units remaining) [ 1 0 @acc_e ] - - location: -1 (remaining gas: 1039973.460 units remaining) + - location: 34 (remaining gas: 1039974.500 units remaining) [ 1 + (Pair 1 1) 0 @acc_e ] - - location: 30 (remaining gas: 1039973.460 units remaining) + - location: 35 (remaining gas: 1039974.400 units remaining) [ (Pair 1 1) - 1 0 @acc_e ] - - location: 34 (remaining gas: 1039973.330 units remaining) - [ 1 - (Pair 1 1) - 0 @acc_e ] - - location: 37 (remaining gas: 1039973.030 units remaining) + - location: 37 (remaining gas: 1039974.320 units remaining) [ 1 @elt 0 @acc_e ] - - location: 38 (remaining gas: 1039972.890 units remaining) - [ 1 ] - - location: -1 (remaining gas: 1039972.820 units remaining) + - location: 38 (remaining gas: 1039974.240 units remaining) [ 1 ] - - location: 35 (remaining gas: 1039972.820 units remaining) - [ 1 - 1 ] - - location: 39 (remaining gas: 1039972.680 units remaining) + - location: 39 (remaining gas: 1039974.160 units remaining) [ (Pair 1 1) ] - - location: -1 (remaining gas: 1039972.610 units remaining) + - location: 22 (remaining gas: 1039974.060 units remaining) [ (Pair 1 1) ] - - location: 24 (remaining gas: 1039972.310 units remaining) + - location: 24 (remaining gas: 1039973.980 units remaining) [ (Pair 1 1) (Pair 1 1) ] - - location: 25 (remaining gas: 1039972.170 units remaining) + - location: 25 (remaining gas: 1039973.900 units remaining) [ 1 @acc_k (Pair 1 1) ] - - location: 28 (remaining gas: 1039971.870 units remaining) - [ 1 @acc_e ] - - location: 27 (remaining gas: 1039971.800 units remaining) + - location: 26 (remaining gas: 1039973.800 units remaining) + [ (Pair 1 1) ] + - location: 28 (remaining gas: 1039973.720 units remaining) [ 1 @acc_e ] - - location: 26 (remaining gas: 1039971.800 units remaining) - [ 1 @acc_k - 1 @acc_e ] - - location: -1 (remaining gas: 1039971.730 units remaining) - [ 1 @acc_k - 1 @acc_e ] - - location: 22 (remaining gas: 1039971.730 units remaining) + - location: 29 (remaining gas: 1039973.640 units remaining) [ (Pair 2 100) + (Pair 2 100) 1 @acc_k 1 @acc_e ] - - location: 29 (remaining gas: 1039971.590 units remaining) + - location: 30 (remaining gas: 1039973.540 units remaining) [ (Pair 2 100) - (Pair 2 100) 1 @acc_k 1 @acc_e ] - - location: 32 (remaining gas: 1039971.290 units remaining) + - location: 32 (remaining gas: 1039973.460 units remaining) [ 2 @key 1 @acc_k 1 @acc_e ] - - location: 33 (remaining gas: 1039971.150 units remaining) + - location: 33 (remaining gas: 1039973.380 units remaining) [ 3 1 @acc_e ] - - location: -1 (remaining gas: 1039971.080 units remaining) + - location: 34 (remaining gas: 1039973.310 units remaining) [ 3 + (Pair 2 100) 1 @acc_e ] - - location: 30 (remaining gas: 1039971.080 units remaining) + - location: 35 (remaining gas: 1039973.210 units remaining) [ (Pair 2 100) - 3 1 @acc_e ] - - location: 34 (remaining gas: 1039970.950 units remaining) - [ 3 - (Pair 2 100) - 1 @acc_e ] - - location: 37 (remaining gas: 1039970.650 units remaining) + - location: 37 (remaining gas: 1039973.130 units remaining) [ 100 @elt 1 @acc_e ] - - location: 38 (remaining gas: 1039970.510 units remaining) + - location: 38 (remaining gas: 1039973.050 units remaining) [ 101 ] - - location: -1 (remaining gas: 1039970.440 units remaining) - [ 101 ] - - location: 35 (remaining gas: 1039970.440 units remaining) - [ 3 - 101 ] - - location: 39 (remaining gas: 1039970.300 units remaining) + - location: 39 (remaining gas: 1039972.970 units remaining) [ (Pair 3 101) ] - - location: -1 (remaining gas: 1039970.230 units remaining) - [ (Pair 3 101) ] - - location: 20 (remaining gas: 1039970.230 units remaining) - [ (Pair 3 101) ] - - location: 40 (remaining gas: 1039970.090 units remaining) + - location: 40 (remaining gas: 1039972.890 units remaining) [ {} (Pair 3 101) ] - - location: 42 (remaining gas: 1039969.950 units remaining) - [ (Pair {} 3 101) ] - - location: -1 (remaining gas: 1039969.880 units remaining) + - location: 42 (remaining gas: 1039972.810 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 8bbdbfd47b04aa821b2e614e920afff90fe040ae..1d67341c19d3fd6fc1ff5478c8aa74341f5eff99 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,66 +7,43 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039987.192 units remaining) + - location: 9 (remaining gas: 1039987.192 units remaining) [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] - - location: 9 (remaining gas: 1039987.052 units remaining) + - location: 9 (remaining gas: 1039987.112 units remaining) [ 15 @parameter { Elt "bar" 5 ; Elt "foo" 1 } @storage ] - - location: 10 (remaining gas: 1039986.922 units remaining) + - location: 10 (remaining gas: 1039987.042 units remaining) [ { Elt "bar" 5 ; Elt "foo" 1 } @storage 15 @parameter ] - - location: 13 (remaining gas: 1039985.120 units remaining) + - location: 13 (remaining gas: 1039985.360 units remaining) [ 5 @elt 15 @parameter ] - - location: 16 (remaining gas: 1039984.820 units remaining) + - location: 14 (remaining gas: 1039985.260 units remaining) + [ 15 @parameter ] + - location: 16 (remaining gas: 1039985.180 units remaining) [ 15 @parameter 15 @parameter ] - - location: 15 (remaining gas: 1039984.750 units remaining) - [ 15 @parameter - 15 @parameter ] - - location: 14 (remaining gas: 1039984.750 units remaining) - [ 5 @elt - 15 @parameter - 15 @parameter ] - - location: 17 (remaining gas: 1039984.610 units remaining) + - location: 17 (remaining gas: 1039985.100 units remaining) [ 20 15 @parameter ] - - location: -1 (remaining gas: 1039984.540 units remaining) - [ 20 - 15 @parameter ] - - location: 13 (remaining gas: 1039984.400 units remaining) + - location: 13 (remaining gas: 1039985.020 units remaining) [ 1 @elt 15 @parameter ] - - location: 16 (remaining gas: 1039984.100 units remaining) - [ 15 @parameter - 15 @parameter ] - - location: 15 (remaining gas: 1039984.030 units remaining) + - location: 14 (remaining gas: 1039984.920 units remaining) + [ 15 @parameter ] + - location: 16 (remaining gas: 1039984.840 units remaining) [ 15 @parameter 15 @parameter ] - - location: 14 (remaining gas: 1039984.030 units remaining) - [ 1 @elt - 15 @parameter - 15 @parameter ] - - location: 17 (remaining gas: 1039983.890 units remaining) - [ 16 - 15 @parameter ] - - location: -1 (remaining gas: 1039983.820 units remaining) + - location: 17 (remaining gas: 1039984.760 units remaining) [ 16 15 @parameter ] - - location: 11 (remaining gas: 1039983.820 units remaining) - [ { Elt "bar" 20 ; Elt "foo" 16 } - 15 @parameter ] - - location: 20 (remaining gas: 1039983.520 units remaining) - [ ] - - location: 19 (remaining gas: 1039983.450 units remaining) + - location: 18 (remaining gas: 1039984.660 units remaining) + [ 15 @parameter ] + - location: 20 (remaining gas: 1039984.580 units remaining) [ ] - - location: 18 (remaining gas: 1039983.450 units remaining) - [ { Elt "bar" 20 ; Elt "foo" 16 } ] - - location: 21 (remaining gas: 1039983.310 units remaining) + - location: 21 (remaining gas: 1039984.500 units remaining) [ {} { Elt "bar" 20 ; Elt "foo" 16 } ] - - location: 23 (remaining gas: 1039983.170 units remaining) - [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ] - - location: -1 (remaining gas: 1039983.100 units remaining) + - location: 23 (remaining gas: 1039984.420 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 e27faabb4bc9dd9ef321c0d7a2cee1d6ec5381ed..fe245bc83f1919894ccdf2cd5ce2914367612227 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,47 +7,32 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039987.916 units remaining) + - location: 9 (remaining gas: 1039987.916 units remaining) [ (Pair 10 { Elt "foo" 1 }) ] - - location: 9 (remaining gas: 1039987.776 units remaining) + - location: 9 (remaining gas: 1039987.836 units remaining) [ 10 @parameter { Elt "foo" 1 } @storage ] - - location: 10 (remaining gas: 1039987.646 units remaining) + - location: 10 (remaining gas: 1039987.766 units remaining) [ { Elt "foo" 1 } @storage 10 @parameter ] - - location: 13 (remaining gas: 1039986.605 units remaining) + - location: 13 (remaining gas: 1039986.845 units remaining) [ 1 @elt 10 @parameter ] - - location: 16 (remaining gas: 1039986.305 units remaining) + - location: 14 (remaining gas: 1039986.745 units remaining) + [ 10 @parameter ] + - location: 16 (remaining gas: 1039986.665 units remaining) [ 10 @parameter 10 @parameter ] - - location: 15 (remaining gas: 1039986.235 units remaining) - [ 10 @parameter - 10 @parameter ] - - location: 14 (remaining gas: 1039986.235 units remaining) - [ 1 @elt - 10 @parameter - 10 @parameter ] - - location: 17 (remaining gas: 1039986.095 units remaining) + - location: 17 (remaining gas: 1039986.585 units remaining) [ 11 10 @parameter ] - - location: -1 (remaining gas: 1039986.025 units remaining) - [ 11 - 10 @parameter ] - - location: 11 (remaining gas: 1039986.025 units remaining) - [ { Elt "foo" 11 } - 10 @parameter ] - - location: 20 (remaining gas: 1039985.725 units remaining) + - location: 18 (remaining gas: 1039986.485 units remaining) + [ 10 @parameter ] + - location: 20 (remaining gas: 1039986.405 units remaining) [ ] - - location: 19 (remaining gas: 1039985.655 units remaining) - [ ] - - location: 18 (remaining gas: 1039985.655 units remaining) - [ { Elt "foo" 11 } ] - - location: 21 (remaining gas: 1039985.515 units remaining) + - location: 21 (remaining gas: 1039986.325 units remaining) [ {} { Elt "foo" 11 } ] - - location: 23 (remaining gas: 1039985.375 units remaining) - [ (Pair {} { Elt "foo" 11 }) ] - - location: -1 (remaining gas: 1039985.305 units remaining) + - location: 23 (remaining gas: 1039986.245 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 4d1508b7f73e60390583dad9099e3e4e1eb77ad7..8e142d8b582a910978457f9ba9d598afc03eea35 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,28 +7,21 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039988.520 units remaining) + - location: 9 (remaining gas: 1039988.520 units remaining) [ (Pair 10 {}) ] - - location: 9 (remaining gas: 1039988.380 units remaining) + - location: 9 (remaining gas: 1039988.440 units remaining) [ 10 @parameter {} @storage ] - - location: 10 (remaining gas: 1039988.250 units remaining) + - location: 10 (remaining gas: 1039988.370 units remaining) [ {} @storage 10 @parameter ] - - location: 11 (remaining gas: 1039988.110 units remaining) - [ {} - 10 @parameter ] - - location: 20 (remaining gas: 1039987.810 units remaining) + - location: 18 (remaining gas: 1039988.190 units remaining) + [ 10 @parameter ] + - location: 20 (remaining gas: 1039988.110 units remaining) [ ] - - location: 19 (remaining gas: 1039987.740 units remaining) - [ ] - - location: 18 (remaining gas: 1039987.740 units remaining) - [ {} ] - - location: 21 (remaining gas: 1039987.600 units remaining) + - location: 21 (remaining gas: 1039988.030 units remaining) [ {} {} ] - - location: 23 (remaining gas: 1039987.460 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039987.390 units remaining) + - location: 23 (remaining gas: 1039987.950 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 0ac0f989c9fb71547ee89770422a18131955877f..9f7b11ff90c85196f93e29b740a4d8efdae68a60 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.090 units remaining) + - location: 12 (remaining gas: 1039987.090 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - - location: 12 (remaining gas: 1039986.950 units remaining) + - location: 12 (remaining gas: 1039987.010 units remaining) [ 1 @parameter (Pair { Elt 0 1 } None) @storage ] - - location: 15 (remaining gas: 1039986.650 units remaining) + - location: 13 (remaining gas: 1039986.910 units remaining) + [ (Pair { Elt 0 1 } None) @storage ] + - location: 15 (remaining gas: 1039986.830 units remaining) [ { Elt 0 1 } ] - - location: 16 (remaining gas: 1039986.510 units remaining) + - location: 16 (remaining gas: 1039986.750 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - - location: -1 (remaining gas: 1039986.440 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] - - location: 13 (remaining gas: 1039986.440 units remaining) - [ 1 @parameter - { Elt 0 1 } - { Elt 0 1 } ] - - location: 17 (remaining gas: 1039986.300 units remaining) + - location: 17 (remaining gas: 1039986.670 units remaining) [ False { Elt 0 1 } ] - - location: 18 (remaining gas: 1039986.160 units remaining) + - location: 18 (remaining gas: 1039986.590 units remaining) [ (Some False) { Elt 0 1 } ] - - location: 19 (remaining gas: 1039986.030 units remaining) + - location: 19 (remaining gas: 1039986.520 units remaining) [ { Elt 0 1 } (Some False) ] - - location: 20 (remaining gas: 1039985.890 units remaining) + - location: 20 (remaining gas: 1039986.440 units remaining) [ (Pair { Elt 0 1 } (Some False)) ] - - location: 21 (remaining gas: 1039985.750 units remaining) + - location: 21 (remaining gas: 1039986.360 units remaining) [ {} (Pair { Elt 0 1 } (Some False)) ] - - location: 23 (remaining gas: 1039985.610 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] - - location: -1 (remaining gas: 1039985.540 units remaining) + - location: 23 (remaining gas: 1039986.280 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 d04bfb3978efe50e2e8fab31b0533fd1864d70a9..2fd6598da3cb4ced06aeb6a6f4e061fec19a3bc1 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.090 units remaining) + - location: 12 (remaining gas: 1039987.090 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - - location: 12 (remaining gas: 1039986.950 units remaining) + - location: 12 (remaining gas: 1039987.010 units remaining) [ 1 @parameter (Pair { Elt 1 0 } None) @storage ] - - location: 15 (remaining gas: 1039986.650 units remaining) + - location: 13 (remaining gas: 1039986.910 units remaining) + [ (Pair { Elt 1 0 } None) @storage ] + - location: 15 (remaining gas: 1039986.830 units remaining) [ { Elt 1 0 } ] - - location: 16 (remaining gas: 1039986.510 units remaining) + - location: 16 (remaining gas: 1039986.750 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - - location: -1 (remaining gas: 1039986.440 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] - - location: 13 (remaining gas: 1039986.440 units remaining) - [ 1 @parameter - { Elt 1 0 } - { Elt 1 0 } ] - - location: 17 (remaining gas: 1039986.300 units remaining) + - location: 17 (remaining gas: 1039986.670 units remaining) [ True { Elt 1 0 } ] - - location: 18 (remaining gas: 1039986.160 units remaining) + - location: 18 (remaining gas: 1039986.590 units remaining) [ (Some True) { Elt 1 0 } ] - - location: 19 (remaining gas: 1039986.030 units remaining) + - location: 19 (remaining gas: 1039986.520 units remaining) [ { Elt 1 0 } (Some True) ] - - location: 20 (remaining gas: 1039985.890 units remaining) + - location: 20 (remaining gas: 1039986.440 units remaining) [ (Pair { Elt 1 0 } (Some True)) ] - - location: 21 (remaining gas: 1039985.750 units remaining) + - location: 21 (remaining gas: 1039986.360 units remaining) [ {} (Pair { Elt 1 0 } (Some True)) ] - - location: 23 (remaining gas: 1039985.610 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] - - location: -1 (remaining gas: 1039985.540 units remaining) + - location: 23 (remaining gas: 1039986.280 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 8254acc18cec6bba729ae8890d22fd65f4ce7c87..7fbb0907eb34dfe841e5b376b81bd9491b66147d 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.380 units remaining) + - location: 12 (remaining gas: 1039986.380 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039986.240 units remaining) + - location: 12 (remaining gas: 1039986.300 units remaining) [ 1 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.940 units remaining) + - location: 13 (remaining gas: 1039986.200 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.800 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039985.730 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.730 units remaining) - [ 1 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.590 units remaining) + - location: 17 (remaining gas: 1039985.960 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.450 units remaining) + - location: 18 (remaining gas: 1039985.880 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.320 units remaining) + - location: 19 (remaining gas: 1039985.810 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.180 units remaining) + - location: 20 (remaining gas: 1039985.730 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.040 units remaining) + - location: 21 (remaining gas: 1039985.650 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.900 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 23 (remaining gas: 1039985.570 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 13a4ff6d8754c8672583ad6ae1b164c1360aaeb1..401da4946489b7afd3f05ed43b8560cd4564e435 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.380 units remaining) + - location: 12 (remaining gas: 1039986.380 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039986.240 units remaining) + - location: 12 (remaining gas: 1039986.300 units remaining) [ 2 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.940 units remaining) + - location: 13 (remaining gas: 1039986.200 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.800 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039985.730 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.730 units remaining) - [ 2 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.590 units remaining) + - location: 17 (remaining gas: 1039985.960 units remaining) [ True { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.450 units remaining) + - location: 18 (remaining gas: 1039985.880 units remaining) [ (Some True) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.320 units remaining) + - location: 19 (remaining gas: 1039985.810 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.180 units remaining) + - location: 20 (remaining gas: 1039985.730 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 21 (remaining gas: 1039985.040 units remaining) + - location: 21 (remaining gas: 1039985.650 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.900 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 23 (remaining gas: 1039985.570 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 3f38b1f6da058594a78ab5ace8280f61748f5d23..482153c160f33a00bbae4caa07e81a413335b0ba 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.380 units remaining) + - location: 12 (remaining gas: 1039986.380 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - - location: 12 (remaining gas: 1039986.240 units remaining) + - location: 12 (remaining gas: 1039986.300 units remaining) [ 3 @parameter (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.940 units remaining) + - location: 13 (remaining gas: 1039986.200 units remaining) + [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.120 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - - location: 16 (remaining gas: 1039985.800 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - - location: -1 (remaining gas: 1039985.730 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 13 (remaining gas: 1039985.730 units remaining) - [ 3 @parameter - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] - - location: 17 (remaining gas: 1039985.590 units remaining) + - location: 17 (remaining gas: 1039985.960 units remaining) [ False { Elt 1 4 ; Elt 2 11 } ] - - location: 18 (remaining gas: 1039985.450 units remaining) + - location: 18 (remaining gas: 1039985.880 units remaining) [ (Some False) { Elt 1 4 ; Elt 2 11 } ] - - location: 19 (remaining gas: 1039985.320 units remaining) + - location: 19 (remaining gas: 1039985.810 units remaining) [ { Elt 1 4 ; Elt 2 11 } (Some False) ] - - location: 20 (remaining gas: 1039985.180 units remaining) + - location: 20 (remaining gas: 1039985.730 units remaining) [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 21 (remaining gas: 1039985.040 units remaining) + - location: 21 (remaining gas: 1039985.650 units remaining) [ {} (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: 23 (remaining gas: 1039984.900 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 23 (remaining gas: 1039985.570 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 b231e18b018955f87926df95f5111a025767347f..45a2127d14744e9daa768c656ced27c70066c997 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.650 units remaining) + - location: 12 (remaining gas: 1039987.650 units remaining) [ (Pair 1 {} None) ] - - location: 12 (remaining gas: 1039987.510 units remaining) + - location: 12 (remaining gas: 1039987.570 units remaining) [ 1 @parameter (Pair {} None) @storage ] - - location: 15 (remaining gas: 1039987.210 units remaining) + - location: 13 (remaining gas: 1039987.470 units remaining) + [ (Pair {} None) @storage ] + - location: 15 (remaining gas: 1039987.390 units remaining) [ {} ] - - location: 16 (remaining gas: 1039987.070 units remaining) + - location: 16 (remaining gas: 1039987.310 units remaining) [ {} {} ] - - location: -1 (remaining gas: 1039987 units remaining) - [ {} - {} ] - - location: 13 (remaining gas: 1039987 units remaining) - [ 1 @parameter - {} - {} ] - - location: 17 (remaining gas: 1039986.860 units remaining) + - location: 17 (remaining gas: 1039987.230 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039986.720 units remaining) + - location: 18 (remaining gas: 1039987.150 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039986.590 units remaining) + - location: 19 (remaining gas: 1039987.080 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039986.450 units remaining) + - location: 20 (remaining gas: 1039987 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039986.310 units remaining) + - location: 21 (remaining gas: 1039986.920 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039986.170 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039986.100 units remaining) + - location: 23 (remaining gas: 1039986.840 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 3e9f7acf8a4546c6f439a20d312595d161d8fc08..ac9b9ef9ff75c3e46e9a6d61ca8fbe318aa86b13 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.278 units remaining) + - location: 12 (remaining gas: 1039986.278 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039986.138 units remaining) + - location: 12 (remaining gas: 1039986.198 units remaining) [ "bar" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.838 units remaining) + - location: 13 (remaining gas: 1039986.098 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.698 units remaining) + - location: 16 (remaining gas: 1039985.938 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039985.628 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.628 units remaining) - [ "bar" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039985.488 units remaining) + - location: 17 (remaining gas: 1039985.858 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039985.348 units remaining) + - location: 18 (remaining gas: 1039985.778 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039985.218 units remaining) + - location: 19 (remaining gas: 1039985.708 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.078 units remaining) + - location: 20 (remaining gas: 1039985.628 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.938 units remaining) + - location: 21 (remaining gas: 1039985.548 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.798 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: -1 (remaining gas: 1039984.728 units remaining) + - location: 23 (remaining gas: 1039985.468 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 65059dd5471d579a2d9a3675202a5f578fc1d541..114243510fd9f9ffea2a49231aeeabd5f09dc225 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.278 units remaining) + - location: 12 (remaining gas: 1039986.278 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039986.138 units remaining) + - location: 12 (remaining gas: 1039986.198 units remaining) [ "foo" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.838 units remaining) + - location: 13 (remaining gas: 1039986.098 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.698 units remaining) + - location: 16 (remaining gas: 1039985.938 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039985.628 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.628 units remaining) - [ "foo" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039985.488 units remaining) + - location: 17 (remaining gas: 1039985.858 units remaining) [ True { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039985.348 units remaining) + - location: 18 (remaining gas: 1039985.778 units remaining) [ (Some True) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039985.218 units remaining) + - location: 19 (remaining gas: 1039985.708 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some True) ] - - location: 20 (remaining gas: 1039985.078 units remaining) + - location: 20 (remaining gas: 1039985.628 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 21 (remaining gas: 1039984.938 units remaining) + - location: 21 (remaining gas: 1039985.548 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: 23 (remaining gas: 1039984.798 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - - location: -1 (remaining gas: 1039984.728 units remaining) + - location: 23 (remaining gas: 1039985.468 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 31b2afffb3d7d9f7a6fc79aa6227e84484820631..095561e51e6988222dfb2b1b0ec086d218958bd4 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039986.278 units remaining) + - location: 12 (remaining gas: 1039986.278 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - - location: 12 (remaining gas: 1039986.138 units remaining) + - location: 12 (remaining gas: 1039986.198 units remaining) [ "baz" @parameter (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] - - location: 15 (remaining gas: 1039985.838 units remaining) + - location: 13 (remaining gas: 1039986.098 units remaining) + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + - location: 15 (remaining gas: 1039986.018 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 16 (remaining gas: 1039985.698 units remaining) + - location: 16 (remaining gas: 1039985.938 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: -1 (remaining gas: 1039985.628 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 13 (remaining gas: 1039985.628 units remaining) - [ "baz" @parameter - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 17 (remaining gas: 1039985.488 units remaining) + - location: 17 (remaining gas: 1039985.858 units remaining) [ False { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 18 (remaining gas: 1039985.348 units remaining) + - location: 18 (remaining gas: 1039985.778 units remaining) [ (Some False) { Elt "bar" 4 ; Elt "foo" 11 } ] - - location: 19 (remaining gas: 1039985.218 units remaining) + - location: 19 (remaining gas: 1039985.708 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } (Some False) ] - - location: 20 (remaining gas: 1039985.078 units remaining) + - location: 20 (remaining gas: 1039985.628 units remaining) [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 21 (remaining gas: 1039984.938 units remaining) + - location: 21 (remaining gas: 1039985.548 units remaining) [ {} (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: 23 (remaining gas: 1039984.798 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - - location: -1 (remaining gas: 1039984.728 units remaining) + - location: 23 (remaining gas: 1039985.468 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 eff6dc5f2438d854d4857f0055f4519d825cfc16..d15c8cc879efb2998edd6f62af7fcf254326b2ce 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.002 units remaining) + - location: 12 (remaining gas: 1039987.002 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - - location: 12 (remaining gas: 1039986.862 units remaining) + - location: 12 (remaining gas: 1039986.922 units remaining) [ "foo" @parameter (Pair { Elt "foo" 0 } None) @storage ] - - location: 15 (remaining gas: 1039986.562 units remaining) + - location: 13 (remaining gas: 1039986.822 units remaining) + [ (Pair { Elt "foo" 0 } None) @storage ] + - location: 15 (remaining gas: 1039986.742 units remaining) [ { Elt "foo" 0 } ] - - location: 16 (remaining gas: 1039986.422 units remaining) + - location: 16 (remaining gas: 1039986.662 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - - location: -1 (remaining gas: 1039986.352 units remaining) - [ { Elt "foo" 0 } - { Elt "foo" 0 } ] - - location: 13 (remaining gas: 1039986.352 units remaining) - [ "foo" @parameter - { Elt "foo" 0 } - { Elt "foo" 0 } ] - - location: 17 (remaining gas: 1039986.212 units remaining) + - location: 17 (remaining gas: 1039986.582 units remaining) [ True { Elt "foo" 0 } ] - - location: 18 (remaining gas: 1039986.072 units remaining) + - location: 18 (remaining gas: 1039986.502 units remaining) [ (Some True) { Elt "foo" 0 } ] - - location: 19 (remaining gas: 1039985.942 units remaining) + - location: 19 (remaining gas: 1039986.432 units remaining) [ { Elt "foo" 0 } (Some True) ] - - location: 20 (remaining gas: 1039985.802 units remaining) + - location: 20 (remaining gas: 1039986.352 units remaining) [ (Pair { Elt "foo" 0 } (Some True)) ] - - location: 21 (remaining gas: 1039985.662 units remaining) + - location: 21 (remaining gas: 1039986.272 units remaining) [ {} (Pair { Elt "foo" 0 } (Some True)) ] - - location: 23 (remaining gas: 1039985.522 units remaining) - [ (Pair {} { Elt "foo" 0 } (Some True)) ] - - location: -1 (remaining gas: 1039985.452 units remaining) + - location: 23 (remaining gas: 1039986.192 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 f83cd9ba6564394581f3e34262d89352d5933dbe..a3c5af564ce5f94bd992331639cdf659fb8b41ea 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.002 units remaining) + - location: 12 (remaining gas: 1039987.002 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - - location: 12 (remaining gas: 1039986.862 units remaining) + - location: 12 (remaining gas: 1039986.922 units remaining) [ "bar" @parameter (Pair { Elt "foo" 1 } None) @storage ] - - location: 15 (remaining gas: 1039986.562 units remaining) + - location: 13 (remaining gas: 1039986.822 units remaining) + [ (Pair { Elt "foo" 1 } None) @storage ] + - location: 15 (remaining gas: 1039986.742 units remaining) [ { Elt "foo" 1 } ] - - location: 16 (remaining gas: 1039986.422 units remaining) + - location: 16 (remaining gas: 1039986.662 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - - location: -1 (remaining gas: 1039986.352 units remaining) - [ { Elt "foo" 1 } - { Elt "foo" 1 } ] - - location: 13 (remaining gas: 1039986.352 units remaining) - [ "bar" @parameter - { Elt "foo" 1 } - { Elt "foo" 1 } ] - - location: 17 (remaining gas: 1039986.212 units remaining) + - location: 17 (remaining gas: 1039986.582 units remaining) [ False { Elt "foo" 1 } ] - - location: 18 (remaining gas: 1039986.072 units remaining) + - location: 18 (remaining gas: 1039986.502 units remaining) [ (Some False) { Elt "foo" 1 } ] - - location: 19 (remaining gas: 1039985.942 units remaining) + - location: 19 (remaining gas: 1039986.432 units remaining) [ { Elt "foo" 1 } (Some False) ] - - location: 20 (remaining gas: 1039985.802 units remaining) + - location: 20 (remaining gas: 1039986.352 units remaining) [ (Pair { Elt "foo" 1 } (Some False)) ] - - location: 21 (remaining gas: 1039985.662 units remaining) + - location: 21 (remaining gas: 1039986.272 units remaining) [ {} (Pair { Elt "foo" 1 } (Some False)) ] - - location: 23 (remaining gas: 1039985.522 units remaining) - [ (Pair {} { Elt "foo" 1 } (Some False)) ] - - location: -1 (remaining gas: 1039985.452 units remaining) + - location: 23 (remaining gas: 1039986.192 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 85a2bf03c15f93d48e912a33e2a4925d8b361719..aeb2691740cbf3f81ef2241158c3a65ba583c784 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,39 +7,32 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039987.606 units remaining) + - location: 12 (remaining gas: 1039987.606 units remaining) [ (Pair "bar" {} None) ] - - location: 12 (remaining gas: 1039987.466 units remaining) + - location: 12 (remaining gas: 1039987.526 units remaining) [ "bar" @parameter (Pair {} None) @storage ] - - location: 15 (remaining gas: 1039987.166 units remaining) + - location: 13 (remaining gas: 1039987.426 units remaining) + [ (Pair {} None) @storage ] + - location: 15 (remaining gas: 1039987.346 units remaining) [ {} ] - - location: 16 (remaining gas: 1039987.026 units remaining) + - location: 16 (remaining gas: 1039987.266 units remaining) [ {} {} ] - - location: -1 (remaining gas: 1039986.956 units remaining) - [ {} - {} ] - - location: 13 (remaining gas: 1039986.956 units remaining) - [ "bar" @parameter - {} - {} ] - - location: 17 (remaining gas: 1039986.816 units remaining) + - location: 17 (remaining gas: 1039987.186 units remaining) [ False {} ] - - location: 18 (remaining gas: 1039986.676 units remaining) + - location: 18 (remaining gas: 1039987.106 units remaining) [ (Some False) {} ] - - location: 19 (remaining gas: 1039986.546 units remaining) + - location: 19 (remaining gas: 1039987.036 units remaining) [ {} (Some False) ] - - location: 20 (remaining gas: 1039986.406 units remaining) + - location: 20 (remaining gas: 1039986.956 units remaining) [ (Pair {} (Some False)) ] - - location: 21 (remaining gas: 1039986.266 units remaining) + - location: 21 (remaining gas: 1039986.876 units remaining) [ {} (Pair {} (Some False)) ] - - location: 23 (remaining gas: 1039986.126 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039986.056 units remaining) + - location: 23 (remaining gas: 1039986.796 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 34cab593491bcbbd7d8acca5cb99a7b72e00151b..f66ebae4e525b967b40c99fd85ebd9b0453304b7 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.296 units remaining) + - location: 9 (remaining gas: 1039990.296 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: 1039990.156 units remaining) + - location: 9 (remaining gas: 1039990.216 units remaining) [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } @parameter ] - - location: 10 (remaining gas: 1039990.006 units remaining) + - location: 10 (remaining gas: 1039990.126 units remaining) [ 6 ] - - location: 11 (remaining gas: 1039989.866 units remaining) + - location: 11 (remaining gas: 1039990.046 units remaining) [ {} 6 ] - - location: 13 (remaining gas: 1039989.726 units remaining) - [ (Pair {} 6) ] - - location: -1 (remaining gas: 1039989.656 units remaining) + - location: 13 (remaining gas: 1039989.966 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 46448bb879b586eaeb3562aa8570ba63e9e4d619..595f291230b9948b5ee5c097e1bbf829ef3b5777 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.408 units remaining) + - location: 9 (remaining gas: 1039992.408 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] - - location: 9 (remaining gas: 1039992.268 units remaining) + - location: 9 (remaining gas: 1039992.328 units remaining) [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } @parameter ] - - location: 10 (remaining gas: 1039992.118 units remaining) + - location: 10 (remaining gas: 1039992.238 units remaining) [ 3 ] - - location: 11 (remaining gas: 1039991.978 units remaining) + - location: 11 (remaining gas: 1039992.158 units remaining) [ {} 3 ] - - location: 13 (remaining gas: 1039991.838 units remaining) - [ (Pair {} 3) ] - - location: -1 (remaining gas: 1039991.768 units remaining) + - location: 13 (remaining gas: 1039992.078 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 0d22054525e415370935f4d2256ed582dd97b31e..d76476cf58b612ddab2b7f0024f6f41fd32ffce4 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.816 units remaining) + - location: 9 (remaining gas: 1039993.816 units remaining) [ (Pair { Elt "a" 1 } 111) ] - - location: 9 (remaining gas: 1039993.676 units remaining) + - location: 9 (remaining gas: 1039993.736 units remaining) [ { Elt "a" 1 } @parameter ] - - location: 10 (remaining gas: 1039993.526 units remaining) + - location: 10 (remaining gas: 1039993.646 units remaining) [ 1 ] - - location: 11 (remaining gas: 1039993.386 units remaining) + - location: 11 (remaining gas: 1039993.566 units remaining) [ {} 1 ] - - location: 13 (remaining gas: 1039993.246 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039993.176 units remaining) + - location: 13 (remaining gas: 1039993.486 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 643d7f1d5b53890f2cfaa87abc26520969ccf713..20350cd8a88deabd070d8cc17458384be7379807 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.400 units remaining) + - location: 9 (remaining gas: 1039994.400 units remaining) [ (Pair {} 111) ] - - location: 9 (remaining gas: 1039994.260 units remaining) + - location: 9 (remaining gas: 1039994.320 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039994.110 units remaining) + - location: 10 (remaining gas: 1039994.230 units remaining) [ 0 ] - - location: 11 (remaining gas: 1039993.970 units remaining) + - location: 11 (remaining gas: 1039994.150 units remaining) [ {} 0 ] - - location: 13 (remaining gas: 1039993.830 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039993.760 units remaining) + - location: 13 (remaining gas: 1039994.070 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 1666f3bfdc80fe7559b53526b5f8463e3b04b427..b608b8413e7b3a249279793bbed21e2c09b79c7e 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,127 +7,125 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039937.860 units remaining) + - location: 7 (remaining gas: 1039937.860 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039937.720 units remaining) + - location: 7 (remaining gas: 1039937.780 units remaining) [ Unit @parameter ] - - location: 8 (remaining gas: 1039937.580 units remaining) + - location: 8 (remaining gas: 1039937.700 units remaining) [ ] - - location: 9 (remaining gas: 1039937.440 units remaining) + - location: 9 (remaining gas: 1039937.620 units remaining) [ 7987 ] - - location: 12 (remaining gas: 1039937.300 units remaining) + - location: 12 (remaining gas: 1039937.540 units remaining) [ 10 7987 ] - - location: 15 (remaining gas: 1039936.774 units remaining) + - location: 15 (remaining gas: 1039937.074 units remaining) [ 79870 ] - - location: 16 (remaining gas: 1039936.634 units remaining) + - location: 16 (remaining gas: 1039936.994 units remaining) [ 79870 79870 ] - - location: 19 (remaining gas: 1039936.470 units remaining) + - location: 19 (remaining gas: 1039936.890 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039936.270 units remaining) + - location: 21 (remaining gas: 1039936.810 units remaining) [ True ] - - location: 23 (remaining gas: 1039936.080 units remaining) + - location: 22 (remaining gas: 1039936.750 units remaining) [ ] - - location: -1 (remaining gas: 1039936.010 units remaining) + - location: 23 (remaining gas: 1039936.680 units remaining) [ ] - - location: 28 (remaining gas: 1039935.870 units remaining) + - location: 28 (remaining gas: 1039936.600 units remaining) [ 10 ] - - location: 31 (remaining gas: 1039935.730 units remaining) + - location: 31 (remaining gas: 1039936.520 units remaining) [ 7987 10 ] - - location: 34 (remaining gas: 1039935.204 units remaining) + - location: 34 (remaining gas: 1039936.054 units remaining) [ 79870 ] - - location: 35 (remaining gas: 1039935.064 units remaining) + - location: 35 (remaining gas: 1039935.974 units remaining) [ 79870 79870 ] - - location: 38 (remaining gas: 1039934.900 units remaining) + - location: 38 (remaining gas: 1039935.870 units remaining) [ 0 ] - - location: 40 (remaining gas: 1039934.700 units remaining) + - location: 40 (remaining gas: 1039935.790 units remaining) [ True ] - - location: 42 (remaining gas: 1039934.510 units remaining) + - location: 41 (remaining gas: 1039935.730 units remaining) [ ] - - location: -1 (remaining gas: 1039934.440 units remaining) + - location: 42 (remaining gas: 1039935.660 units remaining) [ ] - - location: 47 (remaining gas: 1039934.300 units remaining) + - location: 47 (remaining gas: 1039935.580 units remaining) [ 10 ] - - location: 50 (remaining gas: 1039934.160 units remaining) + - location: 50 (remaining gas: 1039935.500 units remaining) [ -7987 10 ] - - location: 53 (remaining gas: 1039934.011 units remaining) + - location: 53 (remaining gas: 1039935.411 units remaining) [ -79870 ] - - location: 54 (remaining gas: 1039933.871 units remaining) + - location: 54 (remaining gas: 1039935.331 units remaining) [ -79870 -79870 ] - - location: 57 (remaining gas: 1039933.661 units remaining) + - location: 57 (remaining gas: 1039935.181 units remaining) [ 0 ] - - location: 59 (remaining gas: 1039933.461 units remaining) + - location: 59 (remaining gas: 1039935.101 units remaining) [ True ] - - location: 61 (remaining gas: 1039933.271 units remaining) + - location: 60 (remaining gas: 1039935.041 units remaining) [ ] - - location: -1 (remaining gas: 1039933.201 units remaining) + - location: 61 (remaining gas: 1039934.971 units remaining) [ ] - - location: 66 (remaining gas: 1039933.061 units remaining) + - location: 66 (remaining gas: 1039934.891 units remaining) [ 10 ] - - location: 69 (remaining gas: 1039932.921 units remaining) + - location: 69 (remaining gas: 1039934.811 units remaining) [ -7987 10 ] - - location: 72 (remaining gas: 1039932.772 units remaining) + - location: 72 (remaining gas: 1039934.722 units remaining) [ -79870 ] - - location: 73 (remaining gas: 1039932.632 units remaining) + - location: 73 (remaining gas: 1039934.642 units remaining) [ -79870 -79870 ] - - location: 76 (remaining gas: 1039932.422 units remaining) + - location: 76 (remaining gas: 1039934.492 units remaining) [ 0 ] - - location: 78 (remaining gas: 1039932.222 units remaining) + - location: 78 (remaining gas: 1039934.412 units remaining) [ True ] - - location: 80 (remaining gas: 1039932.032 units remaining) + - location: 79 (remaining gas: 1039934.352 units remaining) [ ] - - location: -1 (remaining gas: 1039931.962 units remaining) + - location: 80 (remaining gas: 1039934.282 units remaining) [ ] - - location: 85 (remaining gas: 1039931.822 units remaining) + - location: 85 (remaining gas: 1039934.202 units remaining) [ -10 ] - - location: 88 (remaining gas: 1039931.682 units remaining) + - location: 88 (remaining gas: 1039934.122 units remaining) [ 7987 -10 ] - - location: 91 (remaining gas: 1039931.533 units remaining) + - location: 91 (remaining gas: 1039934.033 units remaining) [ -79870 ] - - location: 92 (remaining gas: 1039931.393 units remaining) + - location: 92 (remaining gas: 1039933.953 units remaining) [ -79870 -79870 ] - - location: 95 (remaining gas: 1039931.183 units remaining) + - location: 95 (remaining gas: 1039933.803 units remaining) [ 0 ] - - location: 97 (remaining gas: 1039930.983 units remaining) + - location: 97 (remaining gas: 1039933.723 units remaining) [ True ] - - location: 99 (remaining gas: 1039930.793 units remaining) + - location: 98 (remaining gas: 1039933.663 units remaining) [ ] - - location: -1 (remaining gas: 1039930.723 units remaining) + - location: 99 (remaining gas: 1039933.593 units remaining) [ ] - - location: 104 (remaining gas: 1039930.583 units remaining) + - location: 104 (remaining gas: 1039933.513 units remaining) [ 10 ] - - location: 107 (remaining gas: 1039930.443 units remaining) + - location: 107 (remaining gas: 1039933.433 units remaining) [ 7987 10 ] - - location: 110 (remaining gas: 1039930.294 units remaining) + - location: 110 (remaining gas: 1039933.344 units remaining) [ 79870 ] - - location: 111 (remaining gas: 1039930.154 units remaining) + - location: 111 (remaining gas: 1039933.264 units remaining) [ 79870 79870 ] - - location: 114 (remaining gas: 1039929.944 units remaining) + - location: 114 (remaining gas: 1039933.114 units remaining) [ 0 ] - - location: 116 (remaining gas: 1039929.744 units remaining) + - location: 116 (remaining gas: 1039933.034 units remaining) [ True ] - - location: 118 (remaining gas: 1039929.554 units remaining) + - location: 117 (remaining gas: 1039932.974 units remaining) [ ] - - location: -1 (remaining gas: 1039929.484 units remaining) + - location: 118 (remaining gas: 1039932.904 units remaining) [ ] - - location: 123 (remaining gas: 1039929.344 units remaining) + - location: 123 (remaining gas: 1039932.824 units remaining) [ Unit ] - - location: 124 (remaining gas: 1039929.204 units remaining) + - location: 124 (remaining gas: 1039932.744 units remaining) [ {} Unit ] - - location: 126 (remaining gas: 1039929.064 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039928.994 units remaining) + - location: 126 (remaining gas: 1039932.664 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 9921037a252d169e10be0f57ea25d75f0d300a40..0b8d3e56c103d44c59f499eefdcd9974d0df9e84 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,34 +7,32 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039986.695 units remaining) + - location: 7 (remaining gas: 1039986.695 units remaining) [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039986.555 units remaining) + - location: 7 (remaining gas: 1039986.615 units remaining) [ 257 @parameter ] - - location: 8 (remaining gas: 1039986.415 units remaining) + - location: 8 (remaining gas: 1039986.535 units remaining) [ 1 257 @parameter ] - - location: 11 (remaining gas: 1039986.285 units remaining) + - location: 11 (remaining gas: 1039986.465 units remaining) [ 257 @parameter 1 ] - - location: 12 (remaining gas: 1039986.025 units remaining) + - location: 12 (remaining gas: 1039986.265 units remaining) [ (Some (Pair 257 0)) ] - - location: 19 (remaining gas: 1039985.755 units remaining) + - location: 14 (remaining gas: 1039986.185 units remaining) [ (Pair 257 0) @some ] - - location: 13 (remaining gas: 1039985.685 units remaining) + - location: 19 (remaining gas: 1039986.115 units remaining) [ (Pair 257 0) @some ] - - location: 20 (remaining gas: 1039985.545 units remaining) + - location: 20 (remaining gas: 1039986.035 units remaining) [ 257 ] - - location: 21 (remaining gas: 1039985.405 units remaining) + - location: 21 (remaining gas: 1039985.955 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 257 ] - - location: 24 (remaining gas: 1039984.955 units remaining) + - location: 24 (remaining gas: 1039985.565 units remaining) [ 0x0101000000000000000000000000000000000000000000000000000000000000 ] - - location: 25 (remaining gas: 1039984.815 units remaining) + - location: 25 (remaining gas: 1039985.485 units remaining) [ {} 0x0101000000000000000000000000000000000000000000000000000000000000 ] - - location: 27 (remaining gas: 1039984.675 units remaining) - [ (Pair {} 0x0101000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039984.605 units remaining) + - location: 27 (remaining gas: 1039985.405 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 49f60bde8d69fc29e08bfffb924b34518413aced..5dc396ecab31260f19fdb7538b59509d4d6cfd0b 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,34 +7,32 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039986.695 units remaining) + - location: 7 (remaining gas: 1039986.695 units remaining) [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - - location: 7 (remaining gas: 1039986.555 units remaining) + - location: 7 (remaining gas: 1039986.615 units remaining) [ 16 @parameter ] - - location: 8 (remaining gas: 1039986.415 units remaining) + - location: 8 (remaining gas: 1039986.535 units remaining) [ 1 16 @parameter ] - - location: 11 (remaining gas: 1039986.285 units remaining) + - location: 11 (remaining gas: 1039986.465 units remaining) [ 16 @parameter 1 ] - - location: 12 (remaining gas: 1039986.025 units remaining) + - location: 12 (remaining gas: 1039986.265 units remaining) [ (Some (Pair 16 0)) ] - - location: 19 (remaining gas: 1039985.755 units remaining) + - location: 14 (remaining gas: 1039986.185 units remaining) [ (Pair 16 0) @some ] - - location: 13 (remaining gas: 1039985.685 units remaining) + - location: 19 (remaining gas: 1039986.115 units remaining) [ (Pair 16 0) @some ] - - location: 20 (remaining gas: 1039985.545 units remaining) + - location: 20 (remaining gas: 1039986.035 units remaining) [ 16 ] - - location: 21 (remaining gas: 1039985.405 units remaining) + - location: 21 (remaining gas: 1039985.955 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 16 ] - - location: 24 (remaining gas: 1039984.955 units remaining) + - location: 24 (remaining gas: 1039985.565 units remaining) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 25 (remaining gas: 1039984.815 units remaining) + - location: 25 (remaining gas: 1039985.485 units remaining) [ {} 0x1000000000000000000000000000000000000000000000000000000000000000 ] - - location: 27 (remaining gas: 1039984.675 units remaining) - [ (Pair {} 0x1000000000000000000000000000000000000000000000000000000000000000) ] - - location: -1 (remaining gas: 1039984.605 units remaining) + - location: 27 (remaining gas: 1039985.405 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 430cb47720aaed27d621c9a64e455f54c31b27e8..dff487cbe1f27cdc96da35cccc48c32b0a81e5fc 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,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.530 units remaining) + - location: 9 (remaining gas: 1039992.530 units remaining) [ (Pair (Left -2) 0) ] - - location: 9 (remaining gas: 1039992.390 units remaining) + - location: 9 (remaining gas: 1039992.450 units remaining) [ (Left -2) @parameter ] - - location: 12 (remaining gas: 1039992.100 units remaining) + - location: 10 (remaining gas: 1039992.360 units remaining) + [ -2 @parameter.left ] + - location: 12 (remaining gas: 1039992.280 units remaining) [ 2 ] - - location: 11 (remaining gas: 1039992.030 units remaining) - [ 2 ] - - location: 15 (remaining gas: 1039991.890 units remaining) + - location: 15 (remaining gas: 1039992.200 units remaining) [ {} 2 ] - - location: 17 (remaining gas: 1039991.750 units remaining) - [ (Pair {} 2) ] - - location: -1 (remaining gas: 1039991.680 units remaining) + - location: 17 (remaining gas: 1039992.120 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 b3c8762a1f8dbdb2cc9183a77a6c30109dacce9f..7c0bf77dd5402e4b35be878a5624b1548fabdfb5 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,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.530 units remaining) + - location: 9 (remaining gas: 1039992.530 units remaining) [ (Pair (Left 0) 0) ] - - location: 9 (remaining gas: 1039992.390 units remaining) + - location: 9 (remaining gas: 1039992.450 units remaining) [ (Left 0) @parameter ] - - location: 12 (remaining gas: 1039992.100 units remaining) + - location: 10 (remaining gas: 1039992.360 units remaining) + [ 0 @parameter.left ] + - location: 12 (remaining gas: 1039992.280 units remaining) [ 0 ] - - location: 11 (remaining gas: 1039992.030 units remaining) - [ 0 ] - - location: 15 (remaining gas: 1039991.890 units remaining) + - location: 15 (remaining gas: 1039992.200 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039991.750 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039991.680 units remaining) + - location: 17 (remaining gas: 1039992.120 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 b27288b176c5d1499aa739ef98f60d68dc1b08fe..32adec55e0bfa81d34955205e3c961e7d0e944d1 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,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.530 units remaining) + - location: 9 (remaining gas: 1039992.530 units remaining) [ (Pair (Left 2) 0) ] - - location: 9 (remaining gas: 1039992.390 units remaining) + - location: 9 (remaining gas: 1039992.450 units remaining) [ (Left 2) @parameter ] - - location: 12 (remaining gas: 1039992.100 units remaining) + - location: 10 (remaining gas: 1039992.360 units remaining) + [ 2 @parameter.left ] + - location: 12 (remaining gas: 1039992.280 units remaining) [ -2 ] - - location: 11 (remaining gas: 1039992.030 units remaining) - [ -2 ] - - location: 15 (remaining gas: 1039991.890 units remaining) + - location: 15 (remaining gas: 1039992.200 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039991.750 units remaining) - [ (Pair {} -2) ] - - location: -1 (remaining gas: 1039991.680 units remaining) + - location: 17 (remaining gas: 1039992.120 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 4b47aa8c69f326af27a1ed0215f156f32c7b16e0..507deff6a14a3a43331bb546dd29fbb7a845e90c 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,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.530 units remaining) + - location: 9 (remaining gas: 1039992.530 units remaining) [ (Pair (Right 0) 0) ] - - location: 9 (remaining gas: 1039992.390 units remaining) + - location: 9 (remaining gas: 1039992.450 units remaining) [ (Right 0) @parameter ] - - location: 14 (remaining gas: 1039992.100 units remaining) + - location: 10 (remaining gas: 1039992.360 units remaining) + [ 0 @parameter.right ] + - location: 14 (remaining gas: 1039992.280 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039992.030 units remaining) - [ 0 ] - - location: 15 (remaining gas: 1039991.890 units remaining) + - location: 15 (remaining gas: 1039992.200 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039991.750 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039991.680 units remaining) + - location: 17 (remaining gas: 1039992.120 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 49fac67cdb24af2c9a591aa90d65f0a3bcaec2c2..7bcb0c0252d8c96490f2430643375b02168dc9e0 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,17 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039992.530 units remaining) + - location: 9 (remaining gas: 1039992.530 units remaining) [ (Pair (Right 2) 0) ] - - location: 9 (remaining gas: 1039992.390 units remaining) + - location: 9 (remaining gas: 1039992.450 units remaining) [ (Right 2) @parameter ] - - location: 14 (remaining gas: 1039992.100 units remaining) + - location: 10 (remaining gas: 1039992.360 units remaining) + [ 2 @parameter.right ] + - location: 14 (remaining gas: 1039992.280 units remaining) [ -2 ] - - location: 13 (remaining gas: 1039992.030 units remaining) - [ -2 ] - - location: 15 (remaining gas: 1039991.890 units remaining) + - location: 15 (remaining gas: 1039992.200 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039991.750 units remaining) - [ (Pair {} -2) ] - - location: -1 (remaining gas: 1039991.680 units remaining) + - location: 17 (remaining gas: 1039992.120 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 617843686fe7ad1802ac77bad263e3ce78558dba..58d0fc9e644f0fa4eca0320e6603dd68a43493eb 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.030 units remaining) + - location: 8 (remaining gas: 1039994.030 units remaining) [ (Pair Unit (Some 10)) ] - - location: 8 (remaining gas: 1039993.890 units remaining) + - location: 8 (remaining gas: 1039993.950 units remaining) [ ] - - location: 9 (remaining gas: 1039993.750 units remaining) + - location: 9 (remaining gas: 1039993.870 units remaining) [ None ] - - location: 11 (remaining gas: 1039993.610 units remaining) + - location: 11 (remaining gas: 1039993.790 units remaining) [ {} None ] - - location: 13 (remaining gas: 1039993.470 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039993.400 units remaining) + - location: 13 (remaining gas: 1039993.710 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 25f91795949da13ea99bfa3e68aa46f5d09dd873..323f436b8b3d2f387695f1f2728c91c79020e380 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair False None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ False @parameter ] - - location: 9 (remaining gas: 1039993.400 units remaining) + - location: 9 (remaining gas: 1039993.520 units remaining) [ True ] - - location: 10 (remaining gas: 1039993.260 units remaining) + - location: 10 (remaining gas: 1039993.440 units remaining) [ (Some True) ] - - location: 11 (remaining gas: 1039993.120 units remaining) + - location: 11 (remaining gas: 1039993.360 units remaining) [ {} (Some True) ] - - location: 13 (remaining gas: 1039992.980 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039992.910 units remaining) + - location: 13 (remaining gas: 1039993.280 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 ec5429f438d9014f66e8d2c35ecc7511866b31b6..a788649c7dfa9342146ab14796bf5350e14da1c9 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair True None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ True @parameter ] - - location: 9 (remaining gas: 1039993.400 units remaining) + - location: 9 (remaining gas: 1039993.520 units remaining) [ False ] - - location: 10 (remaining gas: 1039993.260 units remaining) + - location: 10 (remaining gas: 1039993.440 units remaining) [ (Some False) ] - - location: 11 (remaining gas: 1039993.120 units remaining) + - location: 11 (remaining gas: 1039993.360 units remaining) [ {} (Some False) ] - - location: 13 (remaining gas: 1039992.980 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039992.910 units remaining) + - location: 13 (remaining gas: 1039993.280 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 d7c99e1a20ae3dbd3337482453c5c0b68dfb3939..ab8632a36c2d138166fd48d2762280fc4b429ee6 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Left -8) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Left -8) @parameter ] - - location: 13 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ -8 @parameter.left ] + - location: 13 (remaining gas: 1039991.255 units remaining) [ 7 ] - - location: 12 (remaining gas: 1039991.005 units remaining) - [ 7 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some 7) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some 7) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some 7)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 c0e542192141663d89d3bcbc763820f736fd452a..56ab8821314b362f17a9173f4fde6f7ac266aee9 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Left -9) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Left -9) @parameter ] - - location: 13 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ -9 @parameter.left ] + - location: 13 (remaining gas: 1039991.255 units remaining) [ 8 ] - - location: 12 (remaining gas: 1039991.005 units remaining) - [ 8 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some 8) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some 8) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some 8)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 0be0f6bad8434895582bb2f7d1338545d1015aaf..521b6ef5184d97679c3d3a2ee636cc028f185651 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 0) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Left 0) @parameter ] - - location: 13 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 0 @parameter.left ] + - location: 13 (remaining gas: 1039991.255 units remaining) [ -1 ] - - location: 12 (remaining gas: 1039991.005 units remaining) - [ -1 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -1)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 0b73d171a7e40fe6e249a8a0416600158b0dc127..3dd1398f19d37217bcab7f8686263528c5e7b482 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 7) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Left 7) @parameter ] - - location: 13 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 7 @parameter.left ] + - location: 13 (remaining gas: 1039991.255 units remaining) [ -8 ] - - location: 12 (remaining gas: 1039991.005 units remaining) - [ -8 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -8)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 2b4a375a90e42f074e8d98dbdcf89d4099111707..f38e911f7f255694452c9753c09ac9165b3b2c9a 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 8) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Left 8) @parameter ] - - location: 13 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 8 @parameter.left ] + - location: 13 (remaining gas: 1039991.255 units remaining) [ -9 ] - - location: 12 (remaining gas: 1039991.005 units remaining) - [ -9 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -9)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 9cbaf3c34d336ad97dff52afb66711e6114330bc..fe67463e03930449df5421026863c8a85a149b71 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 0) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Right 0) @parameter ] - - location: 15 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 0 @parameter.right ] + - location: 15 (remaining gas: 1039991.255 units remaining) [ -1 ] - - location: 14 (remaining gas: 1039991.005 units remaining) - [ -1 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -1)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 b95b10c5559cad9ad28fd6f90401e85deef531fb..8aed8cf611659f28ce4970b0e376792757c403ab 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 7) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Right 7) @parameter ] - - location: 15 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 7 @parameter.right ] + - location: 15 (remaining gas: 1039991.255 units remaining) [ -8 ] - - location: 14 (remaining gas: 1039991.005 units remaining) - [ -8 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -8)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 95627ed86bc34443e4f35dda3a17323006f86fcc..16e435d41344c92315be697adcca9ffad26e74e0 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,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 8) None) ] - - location: 10 (remaining gas: 1039991.340 units remaining) + - location: 10 (remaining gas: 1039991.400 units remaining) [ (Right 8) @parameter ] - - location: 15 (remaining gas: 1039991.075 units remaining) + - location: 11 (remaining gas: 1039991.310 units remaining) + [ 8 @parameter.right ] + - location: 15 (remaining gas: 1039991.255 units remaining) [ -9 ] - - location: 14 (remaining gas: 1039991.005 units remaining) - [ -9 ] - - location: 16 (remaining gas: 1039990.865 units remaining) + - location: 16 (remaining gas: 1039991.175 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039990.725 units remaining) + - location: 17 (remaining gas: 1039991.095 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039990.585 units remaining) - [ (Pair {} (Some -9)) ] - - location: -1 (remaining gas: 1039990.515 units remaining) + - location: 19 (remaining gas: 1039991.015 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 400d8df30c3979593c5f4ebfd6d74ece37ed6141..82408036d7d05227c944e3d890ee73693d742724 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,31 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair False False) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair False False) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair False False) @parameter (Pair False False) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ False (Pair False False) @parameter ] - - location: 13 (remaining gas: 1039988.600 units remaining) + - location: 13 (remaining gas: 1039988.840 units remaining) [ (Pair False False) @parameter False ] - - location: 14 (remaining gas: 1039988.460 units remaining) + - location: 14 (remaining gas: 1039988.760 units remaining) [ False False ] - - location: 15 (remaining gas: 1039988.310 units remaining) + - location: 15 (remaining gas: 1039988.670 units remaining) [ False ] - - location: 16 (remaining gas: 1039988.170 units remaining) + - location: 16 (remaining gas: 1039988.590 units remaining) [ (Some False) ] - - location: 17 (remaining gas: 1039988.030 units remaining) + - location: 17 (remaining gas: 1039988.510 units remaining) [ {} (Some False) ] - - location: 19 (remaining gas: 1039987.890 units remaining) - [ (Pair {} (Some False)) ] - - location: -1 (remaining gas: 1039987.820 units remaining) + - location: 19 (remaining gas: 1039988.430 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 f2467ea84cd54ecb9739e35673f226c06beac356..12d3d34b87105a75df1bb9aac6549ed0dbcb8524 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,31 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair False True) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair False True) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair False True) @parameter (Pair False True) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ False (Pair False True) @parameter ] - - location: 13 (remaining gas: 1039988.600 units remaining) + - location: 13 (remaining gas: 1039988.840 units remaining) [ (Pair False True) @parameter False ] - - location: 14 (remaining gas: 1039988.460 units remaining) + - location: 14 (remaining gas: 1039988.760 units remaining) [ True False ] - - location: 15 (remaining gas: 1039988.310 units remaining) + - location: 15 (remaining gas: 1039988.670 units remaining) [ True ] - - location: 16 (remaining gas: 1039988.170 units remaining) + - location: 16 (remaining gas: 1039988.590 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039988.030 units remaining) + - location: 17 (remaining gas: 1039988.510 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039987.890 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039987.820 units remaining) + - location: 19 (remaining gas: 1039988.430 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 6277be717fd417717f61f398ab39de6a3b01a335..6e29ed0372609b9a8bbc4c970ef47a78332c3a30 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,31 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair True False) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair True False) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair True False) @parameter (Pair True False) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ True (Pair True False) @parameter ] - - location: 13 (remaining gas: 1039988.600 units remaining) + - location: 13 (remaining gas: 1039988.840 units remaining) [ (Pair True False) @parameter True ] - - location: 14 (remaining gas: 1039988.460 units remaining) + - location: 14 (remaining gas: 1039988.760 units remaining) [ False True ] - - location: 15 (remaining gas: 1039988.310 units remaining) + - location: 15 (remaining gas: 1039988.670 units remaining) [ True ] - - location: 16 (remaining gas: 1039988.170 units remaining) + - location: 16 (remaining gas: 1039988.590 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039988.030 units remaining) + - location: 17 (remaining gas: 1039988.510 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039987.890 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039987.820 units remaining) + - location: 19 (remaining gas: 1039988.430 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 bced723191159066b53c53b740f70c445945ada0..2011a1e369af359b120af38023a4f4b1da421311 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,31 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039989.150 units remaining) + - location: 10 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair True True) None) ] - - location: 10 (remaining gas: 1039989.010 units remaining) + - location: 10 (remaining gas: 1039989.070 units remaining) [ (Pair True True) @parameter ] - - location: 11 (remaining gas: 1039988.870 units remaining) + - location: 11 (remaining gas: 1039988.990 units remaining) [ (Pair True True) @parameter (Pair True True) @parameter ] - - location: 12 (remaining gas: 1039988.730 units remaining) + - location: 12 (remaining gas: 1039988.910 units remaining) [ True (Pair True True) @parameter ] - - location: 13 (remaining gas: 1039988.600 units remaining) + - location: 13 (remaining gas: 1039988.840 units remaining) [ (Pair True True) @parameter True ] - - location: 14 (remaining gas: 1039988.460 units remaining) + - location: 14 (remaining gas: 1039988.760 units remaining) [ True True ] - - location: 15 (remaining gas: 1039988.310 units remaining) + - location: 15 (remaining gas: 1039988.670 units remaining) [ True ] - - location: 16 (remaining gas: 1039988.170 units remaining) + - location: 16 (remaining gas: 1039988.590 units remaining) [ (Some True) ] - - location: 17 (remaining gas: 1039988.030 units remaining) + - location: 17 (remaining gas: 1039988.510 units remaining) [ {} (Some True) ] - - location: 19 (remaining gas: 1039987.890 units remaining) - [ (Pair {} (Some True)) ] - - location: -1 (remaining gas: 1039987.820 units remaining) + - location: 19 (remaining gas: 1039988.430 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 e567d16a1e9c72c63771ce4956bca484b1dd85b2..44bd4e33669bd9a9e19c99db7000a98d71927e14 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 0 8) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 0 8) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 0 8 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 8) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 8) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 8)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 e304dad7a11d73244837e8ab3b5d73f15b799356..2b353471eb1ee06909f9cdca5854920e0f7372d3 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 14 1) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 14 1) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 14 1 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 15 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 15) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 15) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 15)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 65b414663165c4004e916ac70f105b3700c187a9..8c00f05436d59e0de7a85ee7eadcafdc8b306101 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 15 4) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 15 4) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 15 4 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 15 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 15) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 15) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 15)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 e1fada0d65e639ac83ab420d4996931e8afda3ab..097ff5a197130f57c73727c8ce29ba153cb2d270 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 4 8) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 4 8) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 4 8 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 12 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 12) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 12) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 12)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 3f9a2b9ea45b579a5a1a218fc42b96bef5762ace..3444633dbb557110883cb61f358d69175d958ce7 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 7 7) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 7 7) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 7 7 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 7 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 7) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 7) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 7)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 da9bacc36810e15076fc3e983952e112089e0a2d..731a624b5e51a5141b89ca60142c808098773a4b 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,22 +7,20 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.120 units remaining) + - location: 10 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 8 0) None) ] - - location: 10 (remaining gas: 1039991.980 units remaining) + - location: 10 (remaining gas: 1039992.040 units remaining) [ (Pair 8 0) @parameter ] - - location: 11 (remaining gas: 1039991.840 units remaining) + - location: 11 (remaining gas: 1039991.960 units remaining) [ 8 0 ] - - location: 12 (remaining gas: 1039991.700 units remaining) + - location: 12 (remaining gas: 1039991.880 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039991.560 units remaining) + - location: 13 (remaining gas: 1039991.800 units remaining) [ (Some 8) ] - - location: 14 (remaining gas: 1039991.420 units remaining) + - location: 14 (remaining gas: 1039991.720 units remaining) [ {} (Some 8) ] - - location: 16 (remaining gas: 1039991.280 units remaining) - [ (Pair {} (Some 8)) ] - - location: -1 (remaining gas: 1039991.210 units remaining) + - location: 16 (remaining gas: 1039991.640 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 b5150bb9af9d1e6ef3ba1268141c75df27ca0ef0..01b5724f5b6e4153dd8abce4d629262612652efb 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: 15 (remaining gas: 1039758.056 units remaining) + - location: 16 (remaining gas: 1039758.056 units remaining) [ (Pair (Pair -1 1 "foobar" @@ -18,7 +18,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") Unit) ] - - location: 16 (remaining gas: 1039757.916 units remaining) + - location: 16 (remaining gas: 1039757.976 units remaining) [ (Pair -1 1 "foobar" @@ -28,7 +28,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 17 (remaining gas: 1039757.776 units remaining) + - location: 17 (remaining gas: 1039757.896 units remaining) [ (Pair -1 1 "foobar" @@ -47,7 +47,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 18 (remaining gas: 1039757.636 units remaining) + - location: 18 (remaining gas: 1039757.816 units remaining) [ -1 (Pair -1 1 @@ -58,29 +58,18 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 21 (remaining gas: 1039757.336 units remaining) - [ -1 - (Pair 1 - "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 20 (remaining gas: 1039757.266 units remaining) - [ -1 - (Pair 1 + - location: 19 (remaining gas: 1039757.716 units remaining) + [ (Pair -1 + 1 "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039757.266 units remaining) + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + - location: 21 (remaining gas: 1039757.636 units remaining) [ -1 - -1 (Pair 1 "foobar" 0x00aabbcc @@ -89,7 +78,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 22 (remaining gas: 1039748.966 units remaining) + - location: 22 (remaining gas: 1039749.396 units remaining) [ 0x050041 @packed -1 (Pair 1 @@ -100,7 +89,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 23 (remaining gas: 1039741.666 units remaining) + - location: 23 (remaining gas: 1039742.156 units remaining) [ (Some -1) @packed.unpacked -1 (Pair 1 @@ -111,7 +100,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 31 (remaining gas: 1039741.396 units remaining) + - location: 26 (remaining gas: 1039742.076 units remaining) [ -1 @packed.unpacked.some -1 (Pair 1 @@ -122,7 +111,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 25 (remaining gas: 1039741.326 units remaining) + - location: 31 (remaining gas: 1039742.006 units remaining) [ -1 @packed.unpacked.some -1 (Pair 1 @@ -133,7 +122,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 34 (remaining gas: 1039740.996 units remaining) + - location: 34 (remaining gas: 1039741.856 units remaining) [ 0 (Pair 1 "foobar" @@ -143,7 +132,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 35 (remaining gas: 1039740.856 units remaining) + - location: 35 (remaining gas: 1039741.776 units remaining) [ True (Pair 1 "foobar" @@ -153,17 +142,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039740.786 units remaining) - [ True - (Pair 1 - "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 37 (remaining gas: 1039740.596 units remaining) + - location: 36 (remaining gas: 1039741.716 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -172,7 +151,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039740.526 units remaining) + - location: 37 (remaining gas: 1039741.646 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -181,7 +160,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 42 (remaining gas: 1039740.386 units remaining) + - location: 42 (remaining gas: 1039741.566 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -198,7 +177,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 43 (remaining gas: 1039740.246 units remaining) + - location: 43 (remaining gas: 1039741.486 units remaining) [ 1 (Pair 1 "foobar" @@ -208,27 +187,17 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 46 (remaining gas: 1039739.946 units remaining) - [ 1 - (Pair "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 45 (remaining gas: 1039739.876 units remaining) - [ 1 - (Pair "foobar" + - location: 44 (remaining gas: 1039741.386 units remaining) + [ (Pair 1 + "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039739.876 units remaining) + - location: 46 (remaining gas: 1039741.306 units remaining) [ 1 - 1 (Pair "foobar" 0x00aabbcc 1000 @@ -236,7 +205,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 47 (remaining gas: 1039731.576 units remaining) + - location: 47 (remaining gas: 1039733.066 units remaining) [ 0x050001 @packed 1 (Pair "foobar" @@ -246,7 +215,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 48 (remaining gas: 1039724.276 units remaining) + - location: 48 (remaining gas: 1039725.826 units remaining) [ (Some 1) @packed.unpacked 1 (Pair "foobar" @@ -256,7 +225,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 56 (remaining gas: 1039724.006 units remaining) + - location: 51 (remaining gas: 1039725.746 units remaining) [ 1 @packed.unpacked.some 1 (Pair "foobar" @@ -266,7 +235,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 50 (remaining gas: 1039723.936 units remaining) + - location: 56 (remaining gas: 1039725.676 units remaining) [ 1 @packed.unpacked.some 1 (Pair "foobar" @@ -276,7 +245,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 59 (remaining gas: 1039723.606 units remaining) + - location: 59 (remaining gas: 1039725.526 units remaining) [ 0 (Pair "foobar" 0x00aabbcc @@ -285,16 +254,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 60 (remaining gas: 1039723.466 units remaining) - [ True - (Pair "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039723.396 units remaining) + - location: 60 (remaining gas: 1039725.446 units remaining) [ True (Pair "foobar" 0x00aabbcc @@ -303,7 +263,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 62 (remaining gas: 1039723.206 units remaining) + - location: 61 (remaining gas: 1039725.386 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -311,7 +271,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039723.136 units remaining) + - location: 62 (remaining gas: 1039725.316 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -319,7 +279,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 67 (remaining gas: 1039722.996 units remaining) + - location: 67 (remaining gas: 1039725.236 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -334,7 +294,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 68 (remaining gas: 1039722.856 units remaining) + - location: 68 (remaining gas: 1039725.156 units remaining) [ "foobar" (Pair "foobar" 0x00aabbcc @@ -343,32 +303,23 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 71 (remaining gas: 1039722.556 units remaining) - [ "foobar" - (Pair 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 70 (remaining gas: 1039722.486 units remaining) - [ "foobar" - (Pair 0x00aabbcc + - location: 69 (remaining gas: 1039725.056 units remaining) + [ (Pair "foobar" + 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039722.486 units remaining) + - location: 71 (remaining gas: 1039724.976 units remaining) [ "foobar" - "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 72 (remaining gas: 1039710.186 units remaining) + - location: 72 (remaining gas: 1039712.736 units remaining) [ 0x050100000006666f6f626172 @packed "foobar" (Pair 0x00aabbcc @@ -377,7 +328,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 73 (remaining gas: 1039702.812 units remaining) + - location: 73 (remaining gas: 1039705.422 units remaining) [ (Some "foobar") @packed.unpacked "foobar" (Pair 0x00aabbcc @@ -386,7 +337,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 81 (remaining gas: 1039702.542 units remaining) + - location: 76 (remaining gas: 1039705.342 units remaining) [ "foobar" @packed.unpacked.some "foobar" (Pair 0x00aabbcc @@ -395,7 +346,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 75 (remaining gas: 1039702.472 units remaining) + - location: 81 (remaining gas: 1039705.272 units remaining) [ "foobar" @packed.unpacked.some "foobar" (Pair 0x00aabbcc @@ -404,7 +355,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 84 (remaining gas: 1039702.172 units remaining) + - location: 84 (remaining gas: 1039705.152 units remaining) [ 0 (Pair 0x00aabbcc 1000 @@ -412,15 +363,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 85 (remaining gas: 1039702.032 units remaining) - [ True - (Pair 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039701.962 units remaining) + - location: 85 (remaining gas: 1039705.072 units remaining) [ True (Pair 0x00aabbcc 1000 @@ -428,21 +371,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 87 (remaining gas: 1039701.772 units remaining) + - location: 86 (remaining gas: 1039705.012 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039701.702 units remaining) + - location: 87 (remaining gas: 1039704.942 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 92 (remaining gas: 1039701.562 units remaining) + - location: 92 (remaining gas: 1039704.862 units remaining) [ (Pair 0x00aabbcc 1000 False @@ -455,7 +398,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 93 (remaining gas: 1039701.422 units remaining) + - location: 93 (remaining gas: 1039704.782 units remaining) [ 0x00aabbcc (Pair 0x00aabbcc 1000 @@ -463,29 +406,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 96 (remaining gas: 1039701.122 units remaining) - [ 0x00aabbcc - (Pair 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 95 (remaining gas: 1039701.052 units remaining) - [ 0x00aabbcc - (Pair 1000 + - location: 94 (remaining gas: 1039704.682 units remaining) + [ (Pair 0x00aabbcc + 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039701.052 units remaining) + - location: 96 (remaining gas: 1039704.602 units remaining) [ 0x00aabbcc - 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 97 (remaining gas: 1039688.752 units remaining) + - location: 97 (remaining gas: 1039692.362 units remaining) [ 0x050a0000000400aabbcc @packed 0x00aabbcc (Pair 1000 @@ -493,7 +428,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 98 (remaining gas: 1039654.452 units remaining) + - location: 98 (remaining gas: 1039658.122 units remaining) [ (Some 0x00aabbcc) @packed.unpacked 0x00aabbcc (Pair 1000 @@ -501,7 +436,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 106 (remaining gas: 1039654.182 units remaining) + - location: 101 (remaining gas: 1039658.042 units remaining) [ 0x00aabbcc @packed.unpacked.some 0x00aabbcc (Pair 1000 @@ -509,7 +444,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 100 (remaining gas: 1039654.112 units remaining) + - location: 106 (remaining gas: 1039657.972 units remaining) [ 0x00aabbcc @packed.unpacked.some 0x00aabbcc (Pair 1000 @@ -517,40 +452,33 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 109 (remaining gas: 1039653.812 units remaining) + - location: 109 (remaining gas: 1039657.852 units remaining) [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 110 (remaining gas: 1039653.672 units remaining) - [ True - (Pair 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039653.602 units remaining) + - location: 110 (remaining gas: 1039657.772 units remaining) [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 112 (remaining gas: 1039653.412 units remaining) + - location: 111 (remaining gas: 1039657.712 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039653.342 units remaining) + - location: 112 (remaining gas: 1039657.642 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 117 (remaining gas: 1039653.202 units remaining) + - location: 117 (remaining gas: 1039657.562 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -561,89 +489,76 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 118 (remaining gas: 1039653.062 units remaining) + - location: 118 (remaining gas: 1039657.482 units remaining) [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 121 (remaining gas: 1039652.762 units remaining) - [ 1000 - (Pair False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 120 (remaining gas: 1039652.692 units remaining) - [ 1000 - (Pair False + - location: 119 (remaining gas: 1039657.382 units remaining) + [ (Pair 1000 + False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039652.692 units remaining) + - location: 121 (remaining gas: 1039657.302 units remaining) [ 1000 - 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 122 (remaining gas: 1039644.392 units remaining) + - location: 122 (remaining gas: 1039649.062 units remaining) [ 0x0500a80f @packed 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 123 (remaining gas: 1039637.092 units remaining) + - location: 123 (remaining gas: 1039641.822 units remaining) [ (Some 1000) @packed.unpacked 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 131 (remaining gas: 1039636.822 units remaining) + - location: 126 (remaining gas: 1039641.742 units remaining) [ 1000 @packed.unpacked.some 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 125 (remaining gas: 1039636.752 units remaining) + - location: 131 (remaining gas: 1039641.672 units remaining) [ 1000 @packed.unpacked.some 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 134 (remaining gas: 1039636.468 units remaining) + - location: 134 (remaining gas: 1039641.568 units remaining) [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 135 (remaining gas: 1039636.328 units remaining) - [ True - (Pair False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039636.258 units remaining) + - location: 135 (remaining gas: 1039641.488 units remaining) [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 137 (remaining gas: 1039636.068 units remaining) + - location: 136 (remaining gas: 1039641.428 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039635.998 units remaining) + - location: 137 (remaining gas: 1039641.358 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 142 (remaining gas: 1039635.858 units remaining) + - location: 142 (remaining gas: 1039641.278 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -652,249 +567,220 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 143 (remaining gas: 1039635.718 units remaining) + - location: 143 (remaining gas: 1039641.198 units remaining) [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 146 (remaining gas: 1039635.418 units remaining) - [ False - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 145 (remaining gas: 1039635.348 units remaining) - [ False - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + - location: 144 (remaining gas: 1039641.098 units remaining) + [ (Pair False + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039635.348 units remaining) + - location: 146 (remaining gas: 1039641.018 units remaining) [ False - False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 147 (remaining gas: 1039627.048 units remaining) + - location: 147 (remaining gas: 1039632.778 units remaining) [ 0x050303 @packed False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 148 (remaining gas: 1039619.748 units remaining) + - location: 148 (remaining gas: 1039625.538 units remaining) [ (Some False) @packed.unpacked False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 156 (remaining gas: 1039619.478 units remaining) + - location: 151 (remaining gas: 1039625.458 units remaining) [ False @packed.unpacked.some False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 150 (remaining gas: 1039619.408 units remaining) + - location: 156 (remaining gas: 1039625.388 units remaining) [ False @packed.unpacked.some False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 159 (remaining gas: 1039619.020 units remaining) + - location: 159 (remaining gas: 1039625.180 units remaining) [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 160 (remaining gas: 1039618.880 units remaining) + - location: 160 (remaining gas: 1039625.100 units remaining) [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039618.810 units remaining) - [ True - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 162 (remaining gas: 1039618.620 units remaining) + - location: 161 (remaining gas: 1039625.040 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039618.550 units remaining) + - location: 162 (remaining gas: 1039624.970 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 167 (remaining gas: 1039618.410 units remaining) + - location: 167 (remaining gas: 1039624.890 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 168 (remaining gas: 1039618.270 units remaining) + - location: 168 (remaining gas: 1039624.810 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 171 (remaining gas: 1039617.970 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 170 (remaining gas: 1039617.900 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039617.900 units remaining) + - location: 169 (remaining gas: 1039624.710 units remaining) + [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + - location: 171 (remaining gas: 1039624.630 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 172 (remaining gas: 1039597.520 units remaining) + - location: 172 (remaining gas: 1039604.310 units remaining) [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 173 (remaining gas: 1039559.160 units remaining) + - location: 173 (remaining gas: 1039566.010 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 181 (remaining gas: 1039558.890 units remaining) + - location: 176 (remaining gas: 1039565.930 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 175 (remaining gas: 1039558.820 units remaining) + - location: 181 (remaining gas: 1039565.860 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 184 (remaining gas: 1039558.430 units remaining) + - location: 184 (remaining gas: 1039565.650 units remaining) [ 0 (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 185 (remaining gas: 1039558.290 units remaining) + - location: 185 (remaining gas: 1039565.570 units remaining) [ True (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039558.220 units remaining) - [ True - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 187 (remaining gas: 1039558.030 units remaining) + - location: 186 (remaining gas: 1039565.510 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039557.960 units remaining) + - location: 187 (remaining gas: 1039565.440 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 192 (remaining gas: 1039557.820 units remaining) + - location: 192 (remaining gas: 1039565.360 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 193 (remaining gas: 1039557.680 units remaining) + - location: 193 (remaining gas: 1039565.280 units remaining) [ "2019-09-09T08:35:33Z" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 196 (remaining gas: 1039557.380 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 195 (remaining gas: 1039557.310 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 194 (remaining gas: 1039557.310 units remaining) + - location: 194 (remaining gas: 1039565.180 units remaining) + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + - location: 196 (remaining gas: 1039565.100 units remaining) [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 197 (remaining gas: 1039549.010 units remaining) + - location: 197 (remaining gas: 1039556.860 units remaining) [ 0x050095bbb0d70b @packed "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 198 (remaining gas: 1039541.710 units remaining) + - location: 198 (remaining gas: 1039549.620 units remaining) [ (Some "2019-09-09T08:35:33Z") @packed.unpacked "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 206 (remaining gas: 1039541.440 units remaining) + - location: 201 (remaining gas: 1039549.540 units remaining) [ "2019-09-09T08:35:33Z" @packed.unpacked.some "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 200 (remaining gas: 1039541.370 units remaining) + - location: 206 (remaining gas: 1039549.470 units remaining) [ "2019-09-09T08:35:33Z" @packed.unpacked.some "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 209 (remaining gas: 1039541.050 units remaining) + - location: 209 (remaining gas: 1039549.330 units remaining) [ 0 "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 210 (remaining gas: 1039540.910 units remaining) + - location: 210 (remaining gas: 1039549.250 units remaining) [ True "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: -1 (remaining gas: 1039540.840 units remaining) - [ True - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 212 (remaining gas: 1039540.650 units remaining) + - location: 211 (remaining gas: 1039549.190 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: -1 (remaining gas: 1039540.580 units remaining) + - location: 212 (remaining gas: 1039549.120 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 217 (remaining gas: 1039540.440 units remaining) + - location: 217 (remaining gas: 1039549.040 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 218 (remaining gas: 1039509.540 units remaining) + - location: 218 (remaining gas: 1039518.200 units remaining) [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 219 (remaining gas: 1039413.240 units remaining) + - location: 219 (remaining gas: 1039421.960 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 227 (remaining gas: 1039412.970 units remaining) + - location: 222 (remaining gas: 1039421.880 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 221 (remaining gas: 1039412.900 units remaining) + - location: 227 (remaining gas: 1039421.810 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 230 (remaining gas: 1039412.502 units remaining) + - location: 230 (remaining gas: 1039421.592 units remaining) [ 0 ] - - location: 231 (remaining gas: 1039412.362 units remaining) + - location: 231 (remaining gas: 1039421.512 units remaining) [ True ] - - location: -1 (remaining gas: 1039412.292 units remaining) - [ True ] - - location: 233 (remaining gas: 1039412.102 units remaining) + - location: 232 (remaining gas: 1039421.452 units remaining) [ ] - - location: -1 (remaining gas: 1039412.032 units remaining) + - location: 233 (remaining gas: 1039421.382 units remaining) [ ] - - location: 238 (remaining gas: 1039411.892 units remaining) + - location: 238 (remaining gas: 1039421.302 units remaining) [ 0 ] - - location: 241 (remaining gas: 1039403.592 units remaining) + - location: 241 (remaining gas: 1039413.062 units remaining) [ 0x050000 @packed ] - - location: 242 (remaining gas: 1039398.292 units remaining) + - location: 242 (remaining gas: 1039407.822 units remaining) [ (Some 0) @packed.unpacked ] - - location: 250 (remaining gas: 1039398.022 units remaining) + - location: 245 (remaining gas: 1039407.742 units remaining) [ 0 @packed.unpacked.some ] - - location: 244 (remaining gas: 1039397.952 units remaining) + - location: 250 (remaining gas: 1039407.672 units remaining) [ 0 @packed.unpacked.some ] - - location: 251 (remaining gas: 1039397.812 units remaining) + - location: 251 (remaining gas: 1039407.592 units remaining) [ ] - - location: 252 (remaining gas: 1039397.672 units remaining) + - location: 252 (remaining gas: 1039407.512 units remaining) [ -1 ] - - location: 255 (remaining gas: 1039389.372 units remaining) + - location: 255 (remaining gas: 1039399.272 units remaining) [ 0x050041 @packed ] - - location: 256 (remaining gas: 1039286.312 units remaining) + - location: 256 (remaining gas: 1039296.272 units remaining) [ None @packed.unpacked ] - - location: 260 (remaining gas: 1039286.042 units remaining) + - location: 259 (remaining gas: 1039296.192 units remaining) [ ] - - location: 258 (remaining gas: 1039285.972 units remaining) + - location: 260 (remaining gas: 1039296.122 units remaining) [ ] - - location: 265 (remaining gas: 1039285.832 units remaining) + - location: 265 (remaining gas: 1039296.042 units remaining) [ 0x ] - - location: 268 (remaining gas: 1039285.772 units remaining) + - location: 268 (remaining gas: 1039296.042 units remaining) [ None @unpacked ] - - location: 272 (remaining gas: 1039285.502 units remaining) + - location: 271 (remaining gas: 1039295.962 units remaining) [ ] - - location: 270 (remaining gas: 1039285.432 units remaining) + - location: 272 (remaining gas: 1039295.892 units remaining) [ ] - - location: 277 (remaining gas: 1039285.292 units remaining) + - location: 277 (remaining gas: 1039295.812 units remaining) [ 0x04 ] - - location: 280 (remaining gas: 1039285.232 units remaining) + - location: 280 (remaining gas: 1039295.812 units remaining) [ None @unpacked ] - - location: 284 (remaining gas: 1039284.962 units remaining) + - location: 283 (remaining gas: 1039295.732 units remaining) [ ] - - location: 282 (remaining gas: 1039284.892 units remaining) + - location: 284 (remaining gas: 1039295.662 units remaining) [ ] - - location: 289 (remaining gas: 1039284.752 units remaining) + - location: 289 (remaining gas: 1039295.582 units remaining) [ 0x05 ] - - location: 292 (remaining gas: 1039284.692 units remaining) + - location: 292 (remaining gas: 1039295.582 units remaining) [ None @unpacked ] - - location: 296 (remaining gas: 1039284.422 units remaining) + - location: 295 (remaining gas: 1039295.502 units remaining) [ ] - - location: 294 (remaining gas: 1039284.352 units remaining) + - location: 296 (remaining gas: 1039295.432 units remaining) [ ] - - location: 301 (remaining gas: 1039284.212 units remaining) + - location: 301 (remaining gas: 1039295.352 units remaining) [ Unit ] - - location: 302 (remaining gas: 1039284.072 units remaining) + - location: 302 (remaining gas: 1039295.272 units remaining) [ {} Unit ] - - location: 304 (remaining gas: 1039283.932 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039283.862 units remaining) + - location: 304 (remaining gas: 1039295.192 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 38e6b7b587bd47f90312109d07e3ab17d09d4648..f3b3ec5e75433a0b446a77ee74cec5ff4de9fb2c 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: 15 (remaining gas: 1039758.056 units remaining) + - location: 16 (remaining gas: 1039758.056 units remaining) [ (Pair (Pair -1 1 "foobar" @@ -18,7 +18,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") Unit) ] - - location: 16 (remaining gas: 1039757.916 units remaining) + - location: 16 (remaining gas: 1039757.976 units remaining) [ (Pair -1 1 "foobar" @@ -28,7 +28,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 17 (remaining gas: 1039757.776 units remaining) + - location: 17 (remaining gas: 1039757.896 units remaining) [ (Pair -1 1 "foobar" @@ -47,7 +47,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 18 (remaining gas: 1039757.636 units remaining) + - location: 18 (remaining gas: 1039757.816 units remaining) [ -1 (Pair -1 1 @@ -58,29 +58,18 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] - - location: 21 (remaining gas: 1039757.336 units remaining) - [ -1 - (Pair 1 - "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 20 (remaining gas: 1039757.266 units remaining) - [ -1 - (Pair 1 + - location: 19 (remaining gas: 1039757.716 units remaining) + [ (Pair -1 + 1 "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 19 (remaining gas: 1039757.266 units remaining) + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + - location: 21 (remaining gas: 1039757.636 units remaining) [ -1 - -1 (Pair 1 "foobar" 0x00aabbcc @@ -89,7 +78,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 22 (remaining gas: 1039748.966 units remaining) + - location: 22 (remaining gas: 1039749.396 units remaining) [ 0x050041 @packed -1 (Pair 1 @@ -100,7 +89,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 23 (remaining gas: 1039741.666 units remaining) + - location: 23 (remaining gas: 1039742.156 units remaining) [ (Some -1) @packed.unpacked -1 (Pair 1 @@ -111,7 +100,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 31 (remaining gas: 1039741.396 units remaining) + - location: 26 (remaining gas: 1039742.076 units remaining) [ -1 @packed.unpacked.some -1 (Pair 1 @@ -122,7 +111,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 25 (remaining gas: 1039741.326 units remaining) + - location: 31 (remaining gas: 1039742.006 units remaining) [ -1 @packed.unpacked.some -1 (Pair 1 @@ -133,7 +122,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 34 (remaining gas: 1039740.996 units remaining) + - location: 34 (remaining gas: 1039741.856 units remaining) [ 0 (Pair 1 "foobar" @@ -143,7 +132,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 35 (remaining gas: 1039740.856 units remaining) + - location: 35 (remaining gas: 1039741.776 units remaining) [ True (Pair 1 "foobar" @@ -153,17 +142,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039740.786 units remaining) - [ True - (Pair 1 - "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 37 (remaining gas: 1039740.596 units remaining) + - location: 36 (remaining gas: 1039741.716 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -172,7 +151,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039740.526 units remaining) + - location: 37 (remaining gas: 1039741.646 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -181,7 +160,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 42 (remaining gas: 1039740.386 units remaining) + - location: 42 (remaining gas: 1039741.566 units remaining) [ (Pair 1 "foobar" 0x00aabbcc @@ -198,7 +177,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 43 (remaining gas: 1039740.246 units remaining) + - location: 43 (remaining gas: 1039741.486 units remaining) [ 1 (Pair 1 "foobar" @@ -208,27 +187,17 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 46 (remaining gas: 1039739.946 units remaining) - [ 1 - (Pair "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 45 (remaining gas: 1039739.876 units remaining) - [ 1 - (Pair "foobar" + - location: 44 (remaining gas: 1039741.386 units remaining) + [ (Pair 1 + "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 44 (remaining gas: 1039739.876 units remaining) + - location: 46 (remaining gas: 1039741.306 units remaining) [ 1 - 1 (Pair "foobar" 0x00aabbcc 1000 @@ -236,7 +205,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 47 (remaining gas: 1039731.576 units remaining) + - location: 47 (remaining gas: 1039733.066 units remaining) [ 0x050001 @packed 1 (Pair "foobar" @@ -246,7 +215,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 48 (remaining gas: 1039724.276 units remaining) + - location: 48 (remaining gas: 1039725.826 units remaining) [ (Some 1) @packed.unpacked 1 (Pair "foobar" @@ -256,7 +225,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 56 (remaining gas: 1039724.006 units remaining) + - location: 51 (remaining gas: 1039725.746 units remaining) [ 1 @packed.unpacked.some 1 (Pair "foobar" @@ -266,7 +235,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 50 (remaining gas: 1039723.936 units remaining) + - location: 56 (remaining gas: 1039725.676 units remaining) [ 1 @packed.unpacked.some 1 (Pair "foobar" @@ -276,7 +245,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 59 (remaining gas: 1039723.606 units remaining) + - location: 59 (remaining gas: 1039725.526 units remaining) [ 0 (Pair "foobar" 0x00aabbcc @@ -285,16 +254,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 60 (remaining gas: 1039723.466 units remaining) - [ True - (Pair "foobar" - 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039723.396 units remaining) + - location: 60 (remaining gas: 1039725.446 units remaining) [ True (Pair "foobar" 0x00aabbcc @@ -303,7 +263,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 62 (remaining gas: 1039723.206 units remaining) + - location: 61 (remaining gas: 1039725.386 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -311,7 +271,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039723.136 units remaining) + - location: 62 (remaining gas: 1039725.316 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -319,7 +279,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 67 (remaining gas: 1039722.996 units remaining) + - location: 67 (remaining gas: 1039725.236 units remaining) [ (Pair "foobar" 0x00aabbcc 1000 @@ -334,7 +294,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 68 (remaining gas: 1039722.856 units remaining) + - location: 68 (remaining gas: 1039725.156 units remaining) [ "foobar" (Pair "foobar" 0x00aabbcc @@ -343,32 +303,23 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 71 (remaining gas: 1039722.556 units remaining) - [ "foobar" - (Pair 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 70 (remaining gas: 1039722.486 units remaining) - [ "foobar" - (Pair 0x00aabbcc + - location: 69 (remaining gas: 1039725.056 units remaining) + [ (Pair "foobar" + 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 69 (remaining gas: 1039722.486 units remaining) + - location: 71 (remaining gas: 1039724.976 units remaining) [ "foobar" - "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 72 (remaining gas: 1039710.186 units remaining) + - location: 72 (remaining gas: 1039712.736 units remaining) [ 0x050100000006666f6f626172 @packed "foobar" (Pair 0x00aabbcc @@ -377,7 +328,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 73 (remaining gas: 1039702.812 units remaining) + - location: 73 (remaining gas: 1039705.422 units remaining) [ (Some "foobar") @packed.unpacked "foobar" (Pair 0x00aabbcc @@ -386,7 +337,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 81 (remaining gas: 1039702.542 units remaining) + - location: 76 (remaining gas: 1039705.342 units remaining) [ "foobar" @packed.unpacked.some "foobar" (Pair 0x00aabbcc @@ -395,7 +346,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 75 (remaining gas: 1039702.472 units remaining) + - location: 81 (remaining gas: 1039705.272 units remaining) [ "foobar" @packed.unpacked.some "foobar" (Pair 0x00aabbcc @@ -404,7 +355,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 84 (remaining gas: 1039702.172 units remaining) + - location: 84 (remaining gas: 1039705.152 units remaining) [ 0 (Pair 0x00aabbcc 1000 @@ -412,15 +363,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 85 (remaining gas: 1039702.032 units remaining) - [ True - (Pair 0x00aabbcc - 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039701.962 units remaining) + - location: 85 (remaining gas: 1039705.072 units remaining) [ True (Pair 0x00aabbcc 1000 @@ -428,21 +371,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 87 (remaining gas: 1039701.772 units remaining) + - location: 86 (remaining gas: 1039705.012 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039701.702 units remaining) + - location: 87 (remaining gas: 1039704.942 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 92 (remaining gas: 1039701.562 units remaining) + - location: 92 (remaining gas: 1039704.862 units remaining) [ (Pair 0x00aabbcc 1000 False @@ -455,7 +398,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 93 (remaining gas: 1039701.422 units remaining) + - location: 93 (remaining gas: 1039704.782 units remaining) [ 0x00aabbcc (Pair 0x00aabbcc 1000 @@ -463,29 +406,21 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 96 (remaining gas: 1039701.122 units remaining) - [ 0x00aabbcc - (Pair 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 95 (remaining gas: 1039701.052 units remaining) - [ 0x00aabbcc - (Pair 1000 + - location: 94 (remaining gas: 1039704.682 units remaining) + [ (Pair 0x00aabbcc + 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 94 (remaining gas: 1039701.052 units remaining) + - location: 96 (remaining gas: 1039704.602 units remaining) [ 0x00aabbcc - 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 97 (remaining gas: 1039688.752 units remaining) + - location: 97 (remaining gas: 1039692.362 units remaining) [ 0x050a0000000400aabbcc @packed 0x00aabbcc (Pair 1000 @@ -493,7 +428,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 98 (remaining gas: 1039654.452 units remaining) + - location: 98 (remaining gas: 1039658.122 units remaining) [ (Some 0x00aabbcc) @packed.unpacked 0x00aabbcc (Pair 1000 @@ -501,7 +436,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 106 (remaining gas: 1039654.182 units remaining) + - location: 101 (remaining gas: 1039658.042 units remaining) [ 0x00aabbcc @packed.unpacked.some 0x00aabbcc (Pair 1000 @@ -509,7 +444,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 100 (remaining gas: 1039654.112 units remaining) + - location: 106 (remaining gas: 1039657.972 units remaining) [ 0x00aabbcc @packed.unpacked.some 0x00aabbcc (Pair 1000 @@ -517,40 +452,33 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 109 (remaining gas: 1039653.812 units remaining) + - location: 109 (remaining gas: 1039657.852 units remaining) [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 110 (remaining gas: 1039653.672 units remaining) - [ True - (Pair 1000 - False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039653.602 units remaining) + - location: 110 (remaining gas: 1039657.772 units remaining) [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 112 (remaining gas: 1039653.412 units remaining) + - location: 111 (remaining gas: 1039657.712 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039653.342 units remaining) + - location: 112 (remaining gas: 1039657.642 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 117 (remaining gas: 1039653.202 units remaining) + - location: 117 (remaining gas: 1039657.562 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -561,89 +489,76 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 118 (remaining gas: 1039653.062 units remaining) + - location: 118 (remaining gas: 1039657.482 units remaining) [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 121 (remaining gas: 1039652.762 units remaining) - [ 1000 - (Pair False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 120 (remaining gas: 1039652.692 units remaining) - [ 1000 - (Pair False + - location: 119 (remaining gas: 1039657.382 units remaining) + [ (Pair 1000 + False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 119 (remaining gas: 1039652.692 units remaining) + - location: 121 (remaining gas: 1039657.302 units remaining) [ 1000 - 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 122 (remaining gas: 1039644.392 units remaining) + - location: 122 (remaining gas: 1039649.062 units remaining) [ 0x0500a80f @packed 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 123 (remaining gas: 1039637.092 units remaining) + - location: 123 (remaining gas: 1039641.822 units remaining) [ (Some 1000) @packed.unpacked 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 131 (remaining gas: 1039636.822 units remaining) + - location: 126 (remaining gas: 1039641.742 units remaining) [ 1000 @packed.unpacked.some 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 125 (remaining gas: 1039636.752 units remaining) + - location: 131 (remaining gas: 1039641.672 units remaining) [ 1000 @packed.unpacked.some 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 134 (remaining gas: 1039636.468 units remaining) + - location: 134 (remaining gas: 1039641.568 units remaining) [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 135 (remaining gas: 1039636.328 units remaining) - [ True - (Pair False - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039636.258 units remaining) + - location: 135 (remaining gas: 1039641.488 units remaining) [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 137 (remaining gas: 1039636.068 units remaining) + - location: 136 (remaining gas: 1039641.428 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039635.998 units remaining) + - location: 137 (remaining gas: 1039641.358 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 142 (remaining gas: 1039635.858 units remaining) + - location: 142 (remaining gas: 1039641.278 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -652,249 +567,220 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 143 (remaining gas: 1039635.718 units remaining) + - location: 143 (remaining gas: 1039641.198 units remaining) [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 146 (remaining gas: 1039635.418 units remaining) - [ False - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 145 (remaining gas: 1039635.348 units remaining) - [ False - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + - location: 144 (remaining gas: 1039641.098 units remaining) + [ (Pair False + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 144 (remaining gas: 1039635.348 units remaining) + - location: 146 (remaining gas: 1039641.018 units remaining) [ False - False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 147 (remaining gas: 1039627.048 units remaining) + - location: 147 (remaining gas: 1039632.778 units remaining) [ 0x050303 @packed False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 148 (remaining gas: 1039619.748 units remaining) + - location: 148 (remaining gas: 1039625.538 units remaining) [ (Some False) @packed.unpacked False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 156 (remaining gas: 1039619.478 units remaining) + - location: 151 (remaining gas: 1039625.458 units remaining) [ False @packed.unpacked.some False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 150 (remaining gas: 1039619.408 units remaining) + - location: 156 (remaining gas: 1039625.388 units remaining) [ False @packed.unpacked.some False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 159 (remaining gas: 1039619.020 units remaining) + - location: 159 (remaining gas: 1039625.180 units remaining) [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 160 (remaining gas: 1039618.880 units remaining) + - location: 160 (remaining gas: 1039625.100 units remaining) [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039618.810 units remaining) - [ True - (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 162 (remaining gas: 1039618.620 units remaining) + - location: 161 (remaining gas: 1039625.040 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039618.550 units remaining) + - location: 162 (remaining gas: 1039624.970 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 167 (remaining gas: 1039618.410 units remaining) + - location: 167 (remaining gas: 1039624.890 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 168 (remaining gas: 1039618.270 units remaining) + - location: 168 (remaining gas: 1039624.810 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 171 (remaining gas: 1039617.970 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 170 (remaining gas: 1039617.900 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 169 (remaining gas: 1039617.900 units remaining) + - location: 169 (remaining gas: 1039624.710 units remaining) + [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + - location: 171 (remaining gas: 1039624.630 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 172 (remaining gas: 1039597.520 units remaining) + - location: 172 (remaining gas: 1039604.310 units remaining) [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 173 (remaining gas: 1039559.160 units remaining) + - location: 173 (remaining gas: 1039566.010 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 181 (remaining gas: 1039558.890 units remaining) + - location: 176 (remaining gas: 1039565.930 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 175 (remaining gas: 1039558.820 units remaining) + - location: 181 (remaining gas: 1039565.860 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 184 (remaining gas: 1039558.430 units remaining) + - location: 184 (remaining gas: 1039565.650 units remaining) [ 0 (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 185 (remaining gas: 1039558.290 units remaining) + - location: 185 (remaining gas: 1039565.570 units remaining) [ True (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039558.220 units remaining) - [ True - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 187 (remaining gas: 1039558.030 units remaining) + - location: 186 (remaining gas: 1039565.510 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: -1 (remaining gas: 1039557.960 units remaining) + - location: 187 (remaining gas: 1039565.440 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 192 (remaining gas: 1039557.820 units remaining) + - location: 192 (remaining gas: 1039565.360 units remaining) [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 193 (remaining gas: 1039557.680 units remaining) + - location: 193 (remaining gas: 1039565.280 units remaining) [ "2019-09-09T08:35:33Z" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - - location: 196 (remaining gas: 1039557.380 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 195 (remaining gas: 1039557.310 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 194 (remaining gas: 1039557.310 units remaining) + - location: 194 (remaining gas: 1039565.180 units remaining) + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + - location: 196 (remaining gas: 1039565.100 units remaining) [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 197 (remaining gas: 1039549.010 units remaining) + - location: 197 (remaining gas: 1039556.860 units remaining) [ 0x050095bbb0d70b @packed "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 198 (remaining gas: 1039541.710 units remaining) + - location: 198 (remaining gas: 1039549.620 units remaining) [ (Some "2019-09-09T08:35:33Z") @packed.unpacked "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 206 (remaining gas: 1039541.440 units remaining) + - location: 201 (remaining gas: 1039549.540 units remaining) [ "2019-09-09T08:35:33Z" @packed.unpacked.some "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 200 (remaining gas: 1039541.370 units remaining) + - location: 206 (remaining gas: 1039549.470 units remaining) [ "2019-09-09T08:35:33Z" @packed.unpacked.some "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 209 (remaining gas: 1039541.050 units remaining) + - location: 209 (remaining gas: 1039549.330 units remaining) [ 0 "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 210 (remaining gas: 1039540.910 units remaining) + - location: 210 (remaining gas: 1039549.250 units remaining) [ True "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: -1 (remaining gas: 1039540.840 units remaining) - [ True - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 212 (remaining gas: 1039540.650 units remaining) + - location: 211 (remaining gas: 1039549.190 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: -1 (remaining gas: 1039540.580 units remaining) + - location: 212 (remaining gas: 1039549.120 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 217 (remaining gas: 1039540.440 units remaining) + - location: 217 (remaining gas: 1039549.040 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 218 (remaining gas: 1039509.540 units remaining) + - location: 218 (remaining gas: 1039518.200 units remaining) [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 219 (remaining gas: 1039413.240 units remaining) + - location: 219 (remaining gas: 1039421.960 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 227 (remaining gas: 1039412.970 units remaining) + - location: 222 (remaining gas: 1039421.880 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 221 (remaining gas: 1039412.900 units remaining) + - location: 227 (remaining gas: 1039421.810 units remaining) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - - location: 230 (remaining gas: 1039412.502 units remaining) + - location: 230 (remaining gas: 1039421.592 units remaining) [ 0 ] - - location: 231 (remaining gas: 1039412.362 units remaining) + - location: 231 (remaining gas: 1039421.512 units remaining) [ True ] - - location: -1 (remaining gas: 1039412.292 units remaining) - [ True ] - - location: 233 (remaining gas: 1039412.102 units remaining) + - location: 232 (remaining gas: 1039421.452 units remaining) [ ] - - location: -1 (remaining gas: 1039412.032 units remaining) + - location: 233 (remaining gas: 1039421.382 units remaining) [ ] - - location: 238 (remaining gas: 1039411.892 units remaining) + - location: 238 (remaining gas: 1039421.302 units remaining) [ 0 ] - - location: 241 (remaining gas: 1039403.592 units remaining) + - location: 241 (remaining gas: 1039413.062 units remaining) [ 0x050000 @packed ] - - location: 242 (remaining gas: 1039398.292 units remaining) + - location: 242 (remaining gas: 1039407.822 units remaining) [ (Some 0) @packed.unpacked ] - - location: 250 (remaining gas: 1039398.022 units remaining) + - location: 245 (remaining gas: 1039407.742 units remaining) [ 0 @packed.unpacked.some ] - - location: 244 (remaining gas: 1039397.952 units remaining) + - location: 250 (remaining gas: 1039407.672 units remaining) [ 0 @packed.unpacked.some ] - - location: 251 (remaining gas: 1039397.812 units remaining) + - location: 251 (remaining gas: 1039407.592 units remaining) [ ] - - location: 252 (remaining gas: 1039397.672 units remaining) + - location: 252 (remaining gas: 1039407.512 units remaining) [ -1 ] - - location: 255 (remaining gas: 1039389.372 units remaining) + - location: 255 (remaining gas: 1039399.272 units remaining) [ 0x050041 @packed ] - - location: 256 (remaining gas: 1039286.312 units remaining) + - location: 256 (remaining gas: 1039296.272 units remaining) [ None @packed.unpacked ] - - location: 260 (remaining gas: 1039286.042 units remaining) + - location: 259 (remaining gas: 1039296.192 units remaining) [ ] - - location: 258 (remaining gas: 1039285.972 units remaining) + - location: 260 (remaining gas: 1039296.122 units remaining) [ ] - - location: 265 (remaining gas: 1039285.832 units remaining) + - location: 265 (remaining gas: 1039296.042 units remaining) [ 0x ] - - location: 268 (remaining gas: 1039285.772 units remaining) + - location: 268 (remaining gas: 1039296.042 units remaining) [ None @unpacked ] - - location: 272 (remaining gas: 1039285.502 units remaining) + - location: 271 (remaining gas: 1039295.962 units remaining) [ ] - - location: 270 (remaining gas: 1039285.432 units remaining) + - location: 272 (remaining gas: 1039295.892 units remaining) [ ] - - location: 277 (remaining gas: 1039285.292 units remaining) + - location: 277 (remaining gas: 1039295.812 units remaining) [ 0x04 ] - - location: 280 (remaining gas: 1039285.232 units remaining) + - location: 280 (remaining gas: 1039295.812 units remaining) [ None @unpacked ] - - location: 284 (remaining gas: 1039284.962 units remaining) + - location: 283 (remaining gas: 1039295.732 units remaining) [ ] - - location: 282 (remaining gas: 1039284.892 units remaining) + - location: 284 (remaining gas: 1039295.662 units remaining) [ ] - - location: 289 (remaining gas: 1039284.752 units remaining) + - location: 289 (remaining gas: 1039295.582 units remaining) [ 0x05 ] - - location: 292 (remaining gas: 1039284.692 units remaining) + - location: 292 (remaining gas: 1039295.582 units remaining) [ None @unpacked ] - - location: 296 (remaining gas: 1039284.422 units remaining) + - location: 295 (remaining gas: 1039295.502 units remaining) [ ] - - location: 294 (remaining gas: 1039284.352 units remaining) + - location: 296 (remaining gas: 1039295.432 units remaining) [ ] - - location: 301 (remaining gas: 1039284.212 units remaining) + - location: 301 (remaining gas: 1039295.352 units remaining) [ Unit ] - - location: 302 (remaining gas: 1039284.072 units remaining) + - location: 302 (remaining gas: 1039295.272 units remaining) [ {} Unit ] - - location: 304 (remaining gas: 1039283.932 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039283.862 units remaining) + - location: 304 (remaining gas: 1039295.192 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 56f418df6df94c41255b1b52d50b8848e31544e1..6245d883b10b4be0b87741f578e15ac6bb547805 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: 27 (remaining gas: 1039743.141 units remaining) + - location: 28 (remaining gas: 1039743.141 units remaining) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -19,7 +19,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) Unit) ] - - location: 28 (remaining gas: 1039743.001 units remaining) + - location: 28 (remaining gas: 1039743.061 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -30,7 +30,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) @parameter ] - - location: 29 (remaining gas: 1039742.861 units remaining) + - location: 29 (remaining gas: 1039742.981 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -51,7 +51,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) @parameter ] - - location: 30 (remaining gas: 1039742.721 units remaining) + - location: 30 (remaining gas: 1039742.901 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -63,9 +63,9 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) @parameter ] - - location: 33 (remaining gas: 1039742.421 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - (Pair Unit + - location: 31 (remaining gas: 1039742.801 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -73,8 +73,8 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 32 (remaining gas: 1039742.351 units remaining) + { PACK }) @parameter ] + - location: 33 (remaining gas: 1039742.721 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -85,8 +85,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 31 (remaining gas: 1039742.351 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + - location: 34 (remaining gas: 1039717.991 units remaining) + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -97,9 +97,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 34 (remaining gas: 1039717.561 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + - location: 35 (remaining gas: 1039717.891 units remaining) + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -109,7 +108,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 37 (remaining gas: 1039692.611 units remaining) + - location: 37 (remaining gas: 1039693.161 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -120,7 +119,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 38 (remaining gas: 1039625.311 units remaining) + - location: 38 (remaining gas: 1039625.921 units remaining) [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -131,7 +130,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 46 (remaining gas: 1039625.041 units remaining) + - location: 41 (remaining gas: 1039625.841 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -142,7 +141,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 40 (remaining gas: 1039624.971 units remaining) + - location: 46 (remaining gas: 1039625.771 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -153,7 +152,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 47 (remaining gas: 1039600.181 units remaining) + - location: 47 (remaining gas: 1039601.041 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -164,30 +163,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039600.111 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 35 (remaining gas: 1039600.111 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 50 (remaining gas: 1039599.810 units remaining) + - location: 50 (remaining gas: 1039600.920 units remaining) [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -198,7 +174,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 51 (remaining gas: 1039599.670 units remaining) + - location: 51 (remaining gas: 1039600.840 units remaining) [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -209,18 +185,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039599.600 units remaining) - [ True - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 53 (remaining gas: 1039599.410 units remaining) + - location: 52 (remaining gas: 1039600.780 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -230,7 +195,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039599.340 units remaining) + - location: 53 (remaining gas: 1039600.710 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -240,7 +205,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 58 (remaining gas: 1039599.200 units remaining) + - location: 58 (remaining gas: 1039600.630 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -259,7 +224,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 59 (remaining gas: 1039599.060 units remaining) + - location: 59 (remaining gas: 1039600.550 units remaining) [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -270,9 +235,9 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 62 (remaining gas: 1039598.760 units remaining) - [ Unit - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 60 (remaining gas: 1039600.450 units remaining) + [ (Pair Unit + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -280,7 +245,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 61 (remaining gas: 1039598.690 units remaining) + - location: 62 (remaining gas: 1039600.370 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -290,8 +255,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 60 (remaining gas: 1039598.690 units remaining) - [ Unit + - location: 63 (remaining gas: 1039592.130 units remaining) + [ 0x05030b @packed Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -301,9 +266,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 63 (remaining gas: 1039590.390 units remaining) - [ 0x05030b @packed - Unit + - location: 64 (remaining gas: 1039592.030 units remaining) + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -312,7 +276,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 66 (remaining gas: 1039581.930 units remaining) + - location: 66 (remaining gas: 1039583.790 units remaining) [ 0x05030b @packed (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -322,7 +286,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 67 (remaining gas: 1039574.630 units remaining) + - location: 67 (remaining gas: 1039576.550 units remaining) [ (Some Unit) @packed.unpacked (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -332,7 +296,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 75 (remaining gas: 1039574.360 units remaining) + - location: 70 (remaining gas: 1039576.470 units remaining) [ Unit @packed.unpacked.some (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -342,7 +306,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 69 (remaining gas: 1039574.290 units remaining) + - location: 75 (remaining gas: 1039576.400 units remaining) [ Unit @packed.unpacked.some (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -352,7 +316,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 76 (remaining gas: 1039565.990 units remaining) + - location: 76 (remaining gas: 1039568.160 units remaining) [ 0x05030b @packed.unpacked.some.packed (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -362,28 +326,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039565.920 units remaining) - [ 0x05030b @packed.unpacked.some.packed - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 64 (remaining gas: 1039565.920 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 79 (remaining gas: 1039565.620 units remaining) + - location: 79 (remaining gas: 1039568.040 units remaining) [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -393,17 +336,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 80 (remaining gas: 1039565.480 units remaining) - [ True - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: -1 (remaining gas: 1039565.410 units remaining) + - location: 80 (remaining gas: 1039567.960 units remaining) [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -413,7 +346,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 82 (remaining gas: 1039565.220 units remaining) + - location: 81 (remaining gas: 1039567.900 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -422,7 +355,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039565.150 units remaining) + - location: 82 (remaining gas: 1039567.830 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -431,7 +364,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 87 (remaining gas: 1039565.010 units remaining) + - location: 87 (remaining gas: 1039567.750 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -448,7 +381,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 88 (remaining gas: 1039564.870 units remaining) + - location: 88 (remaining gas: 1039567.670 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -458,16 +391,16 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 91 (remaining gas: 1039564.570 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + - location: 89 (remaining gas: 1039567.570 units remaining) + [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 90 (remaining gas: 1039564.500 units remaining) + - location: 91 (remaining gas: 1039567.490 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -476,8 +409,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 89 (remaining gas: 1039564.500 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 92 (remaining gas: 1039527.210 units remaining) + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -486,9 +419,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 92 (remaining gas: 1039524.160 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 93 (remaining gas: 1039527.110 units remaining) + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -496,7 +428,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 95 (remaining gas: 1039483.660 units remaining) + - location: 95 (remaining gas: 1039486.830 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -505,7 +437,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 96 (remaining gas: 1039435.330 units remaining) + - location: 96 (remaining gas: 1039438.560 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -514,7 +446,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 104 (remaining gas: 1039435.060 units remaining) + - location: 99 (remaining gas: 1039438.480 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -523,7 +455,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 98 (remaining gas: 1039434.990 units remaining) + - location: 104 (remaining gas: 1039438.410 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -532,16 +464,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 105 (remaining gas: 1039394.650 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: -1 (remaining gas: 1039394.580 units remaining) + - location: 105 (remaining gas: 1039398.130 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -550,17 +473,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 93 (remaining gas: 1039394.580 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 108 (remaining gas: 1039394.278 units remaining) + - location: 108 (remaining gas: 1039398.008 units remaining) [ 0 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -569,7 +482,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 109 (remaining gas: 1039394.138 units remaining) + - location: 109 (remaining gas: 1039397.928 units remaining) [ True (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -578,16 +491,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039394.068 units remaining) - [ True - (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 111 (remaining gas: 1039393.878 units remaining) + - location: 110 (remaining gas: 1039397.868 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -595,7 +499,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039393.808 units remaining) + - location: 111 (remaining gas: 1039397.798 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -603,7 +507,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 116 (remaining gas: 1039393.668 units remaining) + - location: 116 (remaining gas: 1039397.718 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -618,7 +522,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 117 (remaining gas: 1039393.528 units remaining) + - location: 117 (remaining gas: 1039397.638 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -627,15 +531,15 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 120 (remaining gas: 1039393.228 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - (Pair { Unit } + - location: 118 (remaining gas: 1039397.538 units remaining) + [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 119 (remaining gas: 1039393.158 units remaining) + - location: 120 (remaining gas: 1039397.458 units remaining) [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -643,8 +547,8 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 118 (remaining gas: 1039393.158 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + - location: 121 (remaining gas: 1039356.938 units remaining) + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -652,16 +556,15 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 121 (remaining gas: 1039352.578 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + - location: 122 (remaining gas: 1039356.838 units remaining) + [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 124 (remaining gas: 1039311.838 units remaining) + - location: 124 (remaining gas: 1039316.318 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed (Pair { Unit } { True } @@ -669,7 +572,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 125 (remaining gas: 1039249.268 units remaining) + - location: 125 (remaining gas: 1039253.808 units remaining) [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) @packed.unpacked (Pair { Unit } { True } @@ -677,7 +580,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 134 (remaining gas: 1039248.998 units remaining) + - location: 129 (remaining gas: 1039253.728 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some (Pair { Unit } { True } @@ -685,7 +588,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 128 (remaining gas: 1039248.928 units remaining) + - location: 134 (remaining gas: 1039253.658 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some (Pair { Unit } { True } @@ -693,7 +596,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 135 (remaining gas: 1039208.348 units remaining) + - location: 135 (remaining gas: 1039213.138 units remaining) [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed (Pair { Unit } { True } @@ -701,24 +604,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039208.278 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 122 (remaining gas: 1039208.278 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 138 (remaining gas: 1039207.976 units remaining) + - location: 138 (remaining gas: 1039213.016 units remaining) [ 0 (Pair { Unit } { True } @@ -726,15 +612,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 139 (remaining gas: 1039207.836 units remaining) - [ True - (Pair { Unit } - { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: -1 (remaining gas: 1039207.766 units remaining) + - location: 139 (remaining gas: 1039212.936 units remaining) [ True (Pair { Unit } { True } @@ -742,21 +620,21 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 141 (remaining gas: 1039207.576 units remaining) + - location: 140 (remaining gas: 1039212.876 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039207.506 units remaining) + - location: 141 (remaining gas: 1039212.806 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 146 (remaining gas: 1039207.366 units remaining) + - location: 146 (remaining gas: 1039212.726 units remaining) [ (Pair { Unit } { True } (Pair 19 10) @@ -769,7 +647,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 147 (remaining gas: 1039207.226 units remaining) + - location: 147 (remaining gas: 1039212.646 units remaining) [ { Unit } (Pair { Unit } { True } @@ -777,120 +655,97 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 150 (remaining gas: 1039206.926 units remaining) - [ { Unit } - (Pair { True } + - location: 148 (remaining gas: 1039212.546 units remaining) + [ (Pair { Unit } + { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 149 (remaining gas: 1039206.856 units remaining) + - location: 150 (remaining gas: 1039212.466 units remaining) [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 148 (remaining gas: 1039206.856 units remaining) - [ { Unit } + - location: 151 (remaining gas: 1039203.986 units remaining) + [ 0x050200000002030b @packed { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 151 (remaining gas: 1039198.316 units remaining) - [ 0x050200000002030b @packed - { Unit } + - location: 152 (remaining gas: 1039203.886 units remaining) + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 154 (remaining gas: 1039189.616 units remaining) + - location: 154 (remaining gas: 1039195.406 units remaining) [ 0x050200000002030b @packed (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 155 (remaining gas: 1039168.076 units remaining) + - location: 155 (remaining gas: 1039173.926 units remaining) [ (Some { Unit }) @packed.unpacked (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 164 (remaining gas: 1039167.806 units remaining) + - location: 159 (remaining gas: 1039173.846 units remaining) [ { Unit } @packed.unpacked.some (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 158 (remaining gas: 1039167.736 units remaining) + - location: 164 (remaining gas: 1039173.776 units remaining) [ { Unit } @packed.unpacked.some (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 165 (remaining gas: 1039159.196 units remaining) - [ 0x050200000002030b @packed.unpacked.some.packed - (Pair { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: -1 (remaining gas: 1039159.126 units remaining) + - location: 165 (remaining gas: 1039165.296 units remaining) [ 0x050200000002030b @packed.unpacked.some.packed (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 152 (remaining gas: 1039159.126 units remaining) - [ 0x050200000002030b @packed - 0x050200000002030b @packed.unpacked.some.packed - (Pair { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 168 (remaining gas: 1039158.826 units remaining) + - location: 168 (remaining gas: 1039165.176 units remaining) [ 0 (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 169 (remaining gas: 1039158.686 units remaining) - [ True - (Pair { True } - (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: -1 (remaining gas: 1039158.616 units remaining) + - location: 169 (remaining gas: 1039165.096 units remaining) [ True (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 171 (remaining gas: 1039158.426 units remaining) + - location: 170 (remaining gas: 1039165.036 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039158.356 units remaining) + - location: 171 (remaining gas: 1039164.966 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 176 (remaining gas: 1039158.216 units remaining) + - location: 176 (remaining gas: 1039164.886 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @@ -901,111 +756,91 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 177 (remaining gas: 1039158.076 units remaining) + - location: 177 (remaining gas: 1039164.806 units remaining) [ { True } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 180 (remaining gas: 1039157.776 units remaining) - [ { True } - (Pair (Pair 19 10) + - location: 178 (remaining gas: 1039164.706 units remaining) + [ (Pair { True } + (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 179 (remaining gas: 1039157.706 units remaining) + - location: 180 (remaining gas: 1039164.626 units remaining) [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 178 (remaining gas: 1039157.706 units remaining) - [ { True } + - location: 181 (remaining gas: 1039156.146 units remaining) + [ 0x050200000002030a @packed { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 181 (remaining gas: 1039149.166 units remaining) - [ 0x050200000002030a @packed - { True } + - location: 182 (remaining gas: 1039156.046 units remaining) + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 184 (remaining gas: 1039140.466 units remaining) + - location: 184 (remaining gas: 1039147.566 units remaining) [ 0x050200000002030a @packed (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 185 (remaining gas: 1039118.845 units remaining) + - location: 185 (remaining gas: 1039126.005 units remaining) [ (Some { True }) @packed.unpacked (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 194 (remaining gas: 1039118.575 units remaining) + - location: 189 (remaining gas: 1039125.925 units remaining) [ { True } @packed.unpacked.some (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 188 (remaining gas: 1039118.505 units remaining) + - location: 194 (remaining gas: 1039125.855 units remaining) [ { True } @packed.unpacked.some (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 195 (remaining gas: 1039109.965 units remaining) + - location: 195 (remaining gas: 1039117.375 units remaining) [ 0x050200000002030a @packed.unpacked.some.packed (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039109.895 units remaining) - [ 0x050200000002030a @packed.unpacked.some.packed - (Pair (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 182 (remaining gas: 1039109.895 units remaining) - [ 0x050200000002030a @packed - 0x050200000002030a @packed.unpacked.some.packed - (Pair (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 198 (remaining gas: 1039109.595 units remaining) + - location: 198 (remaining gas: 1039117.255 units remaining) [ 0 (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 199 (remaining gas: 1039109.455 units remaining) + - location: 199 (remaining gas: 1039117.175 units remaining) [ True (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039109.385 units remaining) - [ True - (Pair (Pair 19 10) - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 201 (remaining gas: 1039109.195 units remaining) + - location: 200 (remaining gas: 1039117.115 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039109.125 units remaining) + - location: 201 (remaining gas: 1039117.045 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 206 (remaining gas: 1039108.985 units remaining) + - location: 206 (remaining gas: 1039116.965 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } @@ -1014,247 +849,201 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 207 (remaining gas: 1039108.845 units remaining) + - location: 207 (remaining gas: 1039116.885 units remaining) [ (Pair 19 10) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 210 (remaining gas: 1039108.545 units remaining) - [ (Pair 19 10) - (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + - location: 208 (remaining gas: 1039116.785 units remaining) + [ (Pair (Pair 19 10) + (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 209 (remaining gas: 1039108.475 units remaining) + - location: 210 (remaining gas: 1039116.705 units remaining) [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 208 (remaining gas: 1039108.475 units remaining) - [ (Pair 19 10) + - location: 211 (remaining gas: 1039107.985 units remaining) + [ 0x0507070013000a @packed (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 211 (remaining gas: 1039099.695 units remaining) - [ 0x0507070013000a @packed - (Pair 19 10) + - location: 212 (remaining gas: 1039107.885 units remaining) + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 214 (remaining gas: 1039090.755 units remaining) + - location: 214 (remaining gas: 1039099.165 units remaining) [ 0x0507070013000a @packed (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 215 (remaining gas: 1039054.975 units remaining) + - location: 215 (remaining gas: 1039063.445 units remaining) [ (Some (Pair 19 10)) @packed.unpacked (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 225 (remaining gas: 1039054.705 units remaining) + - location: 220 (remaining gas: 1039063.365 units remaining) [ (Pair 19 10) @packed.unpacked.some (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 219 (remaining gas: 1039054.635 units remaining) + - location: 225 (remaining gas: 1039063.295 units remaining) [ (Pair 19 10) @packed.unpacked.some (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 226 (remaining gas: 1039045.855 units remaining) + - location: 226 (remaining gas: 1039054.575 units remaining) [ 0x0507070013000a @packed.unpacked.some.packed (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039045.785 units remaining) - [ 0x0507070013000a @packed.unpacked.some.packed - (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 212 (remaining gas: 1039045.785 units remaining) - [ 0x0507070013000a @packed - 0x0507070013000a @packed.unpacked.some.packed - (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 229 (remaining gas: 1039045.485 units remaining) + - location: 229 (remaining gas: 1039054.455 units remaining) [ 0 (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 230 (remaining gas: 1039045.345 units remaining) + - location: 230 (remaining gas: 1039054.375 units remaining) [ True (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039045.275 units remaining) - [ True - (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] - - location: 232 (remaining gas: 1039045.085 units remaining) + - location: 231 (remaining gas: 1039054.315 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1039045.015 units remaining) + - location: 232 (remaining gas: 1039054.245 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 237 (remaining gas: 1039044.875 units remaining) + - location: 237 (remaining gas: 1039054.165 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: 1039044.735 units remaining) + - location: 238 (remaining gas: 1039054.085 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 241 (remaining gas: 1039044.435 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 240 (remaining gas: 1039044.365 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 239 (remaining gas: 1039044.365 units remaining) + - location: 239 (remaining gas: 1039053.985 units remaining) + [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + { Elt 0 "foo" ; Elt 1 "bar" } + { PACK }) ] + - location: 241 (remaining gas: 1039053.905 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 242 (remaining gas: 1039023.745 units remaining) + - location: 242 (remaining gas: 1039033.345 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 245 (remaining gas: 1039002.965 units remaining) + - location: 243 (remaining gas: 1039033.245 units remaining) + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + - location: 245 (remaining gas: 1039012.685 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 246 (remaining gas: 1038950.365 units remaining) + - location: 246 (remaining gas: 1038960.145 units remaining) [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) @packed.unpacked (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 256 (remaining gas: 1038950.095 units remaining) + - location: 251 (remaining gas: 1038960.065 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 250 (remaining gas: 1038950.025 units remaining) + - location: 256 (remaining gas: 1038959.995 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 257 (remaining gas: 1038929.405 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1038929.335 units remaining) + - location: 257 (remaining gas: 1038939.435 units remaining) [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 243 (remaining gas: 1038929.335 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed - 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 260 (remaining gas: 1038929.035 units remaining) + - location: 260 (remaining gas: 1038939.315 units remaining) [ 0 (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 261 (remaining gas: 1038928.895 units remaining) - [ True - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1038928.825 units remaining) + - location: 261 (remaining gas: 1038939.235 units remaining) [ True (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 263 (remaining gas: 1038928.635 units remaining) + - location: 262 (remaining gas: 1038939.175 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: -1 (remaining gas: 1038928.565 units remaining) + - location: 263 (remaining gas: 1038939.105 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 268 (remaining gas: 1038928.425 units remaining) + - location: 268 (remaining gas: 1038939.025 units remaining) [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 269 (remaining gas: 1038928.285 units remaining) + - location: 269 (remaining gas: 1038938.945 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - - location: 272 (remaining gas: 1038927.985 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] - - location: 271 (remaining gas: 1038927.915 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] - - location: 270 (remaining gas: 1038927.915 units remaining) + - location: 270 (remaining gas: 1038938.845 units remaining) + [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + - location: 272 (remaining gas: 1038938.765 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } - { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 273 (remaining gas: 1038906.455 units remaining) + - location: 273 (remaining gas: 1038917.365 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - - location: 276 (remaining gas: 1038884.835 units remaining) + - location: 274 (remaining gas: 1038917.265 units remaining) + [ { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] + - location: 276 (remaining gas: 1038895.865 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed { PACK } ] - - location: 277 (remaining gas: 1038794.177 units remaining) + - location: 277 (remaining gas: 1038805.267 units remaining) [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) @packed.unpacked { PACK } ] - - location: 287 (remaining gas: 1038793.907 units remaining) + - location: 282 (remaining gas: 1038805.187 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some { PACK } ] - - location: 281 (remaining gas: 1038793.837 units remaining) + - location: 287 (remaining gas: 1038805.117 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some { PACK } ] - - location: 288 (remaining gas: 1038772.377 units remaining) + - location: 288 (remaining gas: 1038783.717 units remaining) [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed { PACK } ] - - location: -1 (remaining gas: 1038772.307 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed - { PACK } ] - - location: 274 (remaining gas: 1038772.307 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed - 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed - { PACK } ] - - location: 291 (remaining gas: 1038772.007 units remaining) + - location: 291 (remaining gas: 1038783.597 units remaining) [ 0 { PACK } ] - - location: 292 (remaining gas: 1038771.867 units remaining) + - location: 292 (remaining gas: 1038783.517 units remaining) [ True { PACK } ] - - location: -1 (remaining gas: 1038771.797 units remaining) - [ True - { PACK } ] - - location: 294 (remaining gas: 1038771.607 units remaining) + - location: 293 (remaining gas: 1038783.457 units remaining) [ { PACK } ] - - location: -1 (remaining gas: 1038771.537 units remaining) + - location: 294 (remaining gas: 1038783.387 units remaining) [ { PACK } ] - - location: 299 (remaining gas: 1038771.397 units remaining) + - location: 299 (remaining gas: 1038783.307 units remaining) [ { PACK } { PACK } ] - - location: 300 (remaining gas: 1038762.597 units remaining) + - location: 300 (remaining gas: 1038774.567 units remaining) [ 0x050200000002030c @packed { PACK } ] - - location: 303 (remaining gas: 1038753.637 units remaining) + - location: 301 (remaining gas: 1038774.467 units remaining) + [ { PACK } ] + - location: 303 (remaining gas: 1038765.727 units remaining) [ 0x050200000002030c @packed ] - - location: 304 (remaining gas: 1038731.457 units remaining) + - location: 304 (remaining gas: 1038743.607 units remaining) [ (Some { PACK }) @packed.unpacked ] - - location: 314 (remaining gas: 1038731.187 units remaining) + - location: 309 (remaining gas: 1038743.527 units remaining) [ { PACK } @packed.unpacked.some ] - - location: 308 (remaining gas: 1038731.117 units remaining) + - location: 314 (remaining gas: 1038743.457 units remaining) [ { PACK } @packed.unpacked.some ] - - location: 315 (remaining gas: 1038722.317 units remaining) - [ 0x050200000002030c @packed.unpacked.some.packed ] - - location: -1 (remaining gas: 1038722.247 units remaining) + - location: 315 (remaining gas: 1038734.717 units remaining) [ 0x050200000002030c @packed.unpacked.some.packed ] - - location: 301 (remaining gas: 1038722.247 units remaining) - [ 0x050200000002030c @packed - 0x050200000002030c @packed.unpacked.some.packed ] - - location: 318 (remaining gas: 1038721.947 units remaining) + - location: 318 (remaining gas: 1038734.597 units remaining) [ 0 ] - - location: 319 (remaining gas: 1038721.807 units remaining) - [ True ] - - location: -1 (remaining gas: 1038721.737 units remaining) + - location: 319 (remaining gas: 1038734.517 units remaining) [ True ] - - location: 321 (remaining gas: 1038721.547 units remaining) + - location: 320 (remaining gas: 1038734.457 units remaining) [ ] - - location: -1 (remaining gas: 1038721.477 units remaining) + - location: 321 (remaining gas: 1038734.387 units remaining) [ ] - - location: 326 (remaining gas: 1038721.337 units remaining) + - location: 326 (remaining gas: 1038734.307 units remaining) [ Unit ] - - location: 327 (remaining gas: 1038721.197 units remaining) + - location: 327 (remaining gas: 1038734.227 units remaining) [ {} Unit ] - - location: 329 (remaining gas: 1038721.057 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1038720.987 units remaining) + - location: 329 (remaining gas: 1038734.147 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 a834f2f22388d0b6e49575eae3e63418288c14d2..799bae6187fa9928c4d2889b69936d3b4f084fe6 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: 27 (remaining gas: 1039753.330 units remaining) + - location: 28 (remaining gas: 1039753.330 units remaining) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -19,7 +19,7 @@ trace {} { DUP ; DROP ; PACK }) Unit) ] - - location: 28 (remaining gas: 1039753.190 units remaining) + - location: 28 (remaining gas: 1039753.250 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -30,7 +30,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) @parameter ] - - location: 29 (remaining gas: 1039753.050 units remaining) + - location: 29 (remaining gas: 1039753.170 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -51,7 +51,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) @parameter ] - - location: 30 (remaining gas: 1039752.910 units remaining) + - location: 30 (remaining gas: 1039753.090 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -63,9 +63,9 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) @parameter ] - - location: 33 (remaining gas: 1039752.610 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - (Pair Unit + - location: 31 (remaining gas: 1039752.990 units remaining) + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -73,8 +73,8 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] - - location: 32 (remaining gas: 1039752.540 units remaining) + { DUP ; DROP ; PACK }) @parameter ] + - location: 33 (remaining gas: 1039752.910 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -85,8 +85,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 31 (remaining gas: 1039752.540 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + - location: 34 (remaining gas: 1039728.180 units remaining) + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -97,9 +97,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 34 (remaining gas: 1039727.750 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + - location: 35 (remaining gas: 1039728.080 units remaining) + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -109,7 +108,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 37 (remaining gas: 1039702.800 units remaining) + - location: 37 (remaining gas: 1039703.350 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -120,7 +119,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 38 (remaining gas: 1039635.500 units remaining) + - location: 38 (remaining gas: 1039636.110 units remaining) [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -131,7 +130,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 46 (remaining gas: 1039635.230 units remaining) + - location: 41 (remaining gas: 1039636.030 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -142,7 +141,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 40 (remaining gas: 1039635.160 units remaining) + - location: 46 (remaining gas: 1039635.960 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -153,18 +152,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 47 (remaining gas: 1039610.370 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039610.300 units remaining) + - location: 47 (remaining gas: 1039611.230 units remaining) [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -175,19 +163,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 35 (remaining gas: 1039610.300 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: 50 (remaining gas: 1039609.999 units remaining) + - location: 50 (remaining gas: 1039611.109 units remaining) [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -198,18 +174,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 51 (remaining gas: 1039609.859 units remaining) - [ True - (Pair Unit - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039609.789 units remaining) + - location: 51 (remaining gas: 1039611.029 units remaining) [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -220,7 +185,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 53 (remaining gas: 1039609.599 units remaining) + - location: 52 (remaining gas: 1039610.969 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -230,7 +195,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039609.529 units remaining) + - location: 53 (remaining gas: 1039610.899 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -240,7 +205,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 58 (remaining gas: 1039609.389 units remaining) + - location: 58 (remaining gas: 1039610.819 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -259,7 +224,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 59 (remaining gas: 1039609.249 units remaining) + - location: 59 (remaining gas: 1039610.739 units remaining) [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -270,9 +235,9 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 62 (remaining gas: 1039608.949 units remaining) - [ Unit - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 60 (remaining gas: 1039610.639 units remaining) + [ (Pair Unit + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} {} @@ -280,7 +245,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 61 (remaining gas: 1039608.879 units remaining) + - location: 62 (remaining gas: 1039610.559 units remaining) [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -290,8 +255,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 60 (remaining gas: 1039608.879 units remaining) - [ Unit + - location: 63 (remaining gas: 1039602.319 units remaining) + [ 0x05030b @packed Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -301,9 +266,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 63 (remaining gas: 1039600.579 units remaining) - [ 0x05030b @packed - Unit + - location: 64 (remaining gas: 1039602.219 units remaining) + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -312,7 +276,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 66 (remaining gas: 1039592.119 units remaining) + - location: 66 (remaining gas: 1039593.979 units remaining) [ 0x05030b @packed (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -322,7 +286,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 67 (remaining gas: 1039584.819 units remaining) + - location: 67 (remaining gas: 1039586.739 units remaining) [ (Some Unit) @packed.unpacked (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -332,7 +296,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 75 (remaining gas: 1039584.549 units remaining) + - location: 70 (remaining gas: 1039586.659 units remaining) [ Unit @packed.unpacked.some (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -342,7 +306,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 69 (remaining gas: 1039584.479 units remaining) + - location: 75 (remaining gas: 1039586.589 units remaining) [ Unit @packed.unpacked.some (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -352,17 +316,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 76 (remaining gas: 1039576.179 units remaining) - [ 0x05030b @packed.unpacked.some.packed - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039576.109 units remaining) + - location: 76 (remaining gas: 1039578.349 units remaining) [ 0x05030b @packed.unpacked.some.packed (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -372,18 +326,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 64 (remaining gas: 1039576.109 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: 79 (remaining gas: 1039575.809 units remaining) + - location: 79 (remaining gas: 1039578.229 units remaining) [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -393,17 +336,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 80 (remaining gas: 1039575.669 units remaining) - [ True - (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039575.599 units remaining) + - location: 80 (remaining gas: 1039578.149 units remaining) [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -413,7 +346,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 82 (remaining gas: 1039575.409 units remaining) + - location: 81 (remaining gas: 1039578.089 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -422,7 +355,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039575.339 units remaining) + - location: 82 (remaining gas: 1039578.019 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -431,7 +364,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 87 (remaining gas: 1039575.199 units remaining) + - location: 87 (remaining gas: 1039577.939 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -448,7 +381,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 88 (remaining gas: 1039575.059 units remaining) + - location: 88 (remaining gas: 1039577.859 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -458,16 +391,16 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 91 (remaining gas: 1039574.759 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - (Pair None + - location: 89 (remaining gas: 1039577.759 units remaining) + [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 90 (remaining gas: 1039574.689 units remaining) + - location: 91 (remaining gas: 1039577.679 units remaining) [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -476,8 +409,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 89 (remaining gas: 1039574.689 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 92 (remaining gas: 1039537.399 units remaining) + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -486,9 +419,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 92 (remaining gas: 1039534.349 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + - location: 93 (remaining gas: 1039537.299 units remaining) + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} {} @@ -496,7 +428,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 95 (remaining gas: 1039493.849 units remaining) + - location: 95 (remaining gas: 1039497.019 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed (Pair None {} @@ -505,7 +437,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 96 (remaining gas: 1039445.519 units remaining) + - location: 96 (remaining gas: 1039448.749 units remaining) [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked (Pair None {} @@ -514,7 +446,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 104 (remaining gas: 1039445.249 units remaining) + - location: 99 (remaining gas: 1039448.669 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some (Pair None {} @@ -523,7 +455,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 98 (remaining gas: 1039445.179 units remaining) + - location: 104 (remaining gas: 1039448.599 units remaining) [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some (Pair None {} @@ -532,16 +464,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 105 (remaining gas: 1039404.839 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039404.769 units remaining) + - location: 105 (remaining gas: 1039408.319 units remaining) [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed (Pair None {} @@ -550,17 +473,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 93 (remaining gas: 1039404.769 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed - (Pair None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: 108 (remaining gas: 1039404.467 units remaining) + - location: 108 (remaining gas: 1039408.197 units remaining) [ 0 (Pair None {} @@ -569,16 +482,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 109 (remaining gas: 1039404.327 units remaining) - [ True - (Pair None - {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039404.257 units remaining) + - location: 109 (remaining gas: 1039408.117 units remaining) [ True (Pair None {} @@ -587,7 +491,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 111 (remaining gas: 1039404.067 units remaining) + - location: 110 (remaining gas: 1039408.057 units remaining) [ (Pair None {} {} @@ -595,7 +499,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039403.997 units remaining) + - location: 111 (remaining gas: 1039407.987 units remaining) [ (Pair None {} {} @@ -603,7 +507,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 116 (remaining gas: 1039403.857 units remaining) + - location: 116 (remaining gas: 1039407.907 units remaining) [ (Pair None {} {} @@ -618,7 +522,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 117 (remaining gas: 1039403.717 units remaining) + - location: 117 (remaining gas: 1039407.827 units remaining) [ None (Pair None {} @@ -627,15 +531,15 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 120 (remaining gas: 1039403.417 units remaining) - [ None - (Pair {} + - location: 118 (remaining gas: 1039407.727 units remaining) + [ (Pair None + {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 119 (remaining gas: 1039403.347 units remaining) + - location: 120 (remaining gas: 1039407.647 units remaining) [ None (Pair {} {} @@ -643,8 +547,8 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 118 (remaining gas: 1039403.347 units remaining) - [ None + - location: 121 (remaining gas: 1039399.407 units remaining) + [ 0x050306 @packed None (Pair {} {} @@ -652,16 +556,15 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 121 (remaining gas: 1039395.047 units remaining) - [ 0x050306 @packed - None + - location: 122 (remaining gas: 1039399.307 units remaining) + [ None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 124 (remaining gas: 1039386.587 units remaining) + - location: 124 (remaining gas: 1039391.067 units remaining) [ 0x050306 @packed (Pair {} {} @@ -669,7 +572,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 125 (remaining gas: 1039379.287 units remaining) + - location: 125 (remaining gas: 1039383.827 units remaining) [ (Some None) @packed.unpacked (Pair {} {} @@ -677,7 +580,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 134 (remaining gas: 1039379.017 units remaining) + - location: 129 (remaining gas: 1039383.747 units remaining) [ None @packed.unpacked.some (Pair {} {} @@ -685,7 +588,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 128 (remaining gas: 1039378.947 units remaining) + - location: 134 (remaining gas: 1039383.677 units remaining) [ None @packed.unpacked.some (Pair {} {} @@ -693,15 +596,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 135 (remaining gas: 1039370.647 units remaining) - [ 0x050306 @packed.unpacked.some.packed - (Pair {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039370.577 units remaining) + - location: 135 (remaining gas: 1039375.437 units remaining) [ 0x050306 @packed.unpacked.some.packed (Pair {} {} @@ -709,16 +604,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 122 (remaining gas: 1039370.577 units remaining) - [ 0x050306 @packed - 0x050306 @packed.unpacked.some.packed - (Pair {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: 138 (remaining gas: 1039370.277 units remaining) + - location: 138 (remaining gas: 1039375.317 units remaining) [ 0 (Pair {} {} @@ -726,7 +612,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 139 (remaining gas: 1039370.137 units remaining) + - location: 139 (remaining gas: 1039375.237 units remaining) [ True (Pair {} {} @@ -734,29 +620,21 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039370.067 units remaining) - [ True - (Pair {} - {} - (Pair 40 -10) - (Right "2019-09-09T08:35:33Z") - {} - { DUP ; DROP ; PACK }) ] - - location: 141 (remaining gas: 1039369.877 units remaining) + - location: 140 (remaining gas: 1039375.177 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039369.807 units remaining) + - location: 141 (remaining gas: 1039375.107 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 146 (remaining gas: 1039369.667 units remaining) + - location: 146 (remaining gas: 1039375.027 units remaining) [ (Pair {} {} (Pair 40 -10) @@ -769,7 +647,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 147 (remaining gas: 1039369.527 units remaining) + - location: 147 (remaining gas: 1039374.947 units remaining) [ {} (Pair {} {} @@ -777,313 +655,251 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 150 (remaining gas: 1039369.227 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 149 (remaining gas: 1039369.157 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 148 (remaining gas: 1039369.157 units remaining) + - location: 148 (remaining gas: 1039374.847 units remaining) + [ (Pair {} + {} + (Pair 40 -10) + (Right "2019-09-09T08:35:33Z") + {} + { DUP ; DROP ; PACK }) ] + - location: 150 (remaining gas: 1039374.767 units remaining) [ {} - {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 151 (remaining gas: 1039360.857 units remaining) + - location: 151 (remaining gas: 1039366.527 units remaining) [ 0x050200000000 @packed {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 154 (remaining gas: 1039352.397 units remaining) + - location: 152 (remaining gas: 1039366.427 units remaining) + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 154 (remaining gas: 1039358.187 units remaining) [ 0x050200000000 @packed (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 155 (remaining gas: 1039345.097 units remaining) + - location: 155 (remaining gas: 1039350.947 units remaining) [ (Some {}) @packed.unpacked (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 164 (remaining gas: 1039344.827 units remaining) + - location: 159 (remaining gas: 1039350.867 units remaining) [ {} @packed.unpacked.some (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 158 (remaining gas: 1039344.757 units remaining) + - location: 164 (remaining gas: 1039350.797 units remaining) [ {} @packed.unpacked.some (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 165 (remaining gas: 1039336.457 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039336.387 units remaining) + - location: 165 (remaining gas: 1039342.557 units remaining) [ 0x050200000000 @packed.unpacked.some.packed (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 152 (remaining gas: 1039336.387 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 168 (remaining gas: 1039336.087 units remaining) + - location: 168 (remaining gas: 1039342.437 units remaining) [ 0 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 169 (remaining gas: 1039335.947 units remaining) - [ True - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039335.877 units remaining) + - location: 169 (remaining gas: 1039342.357 units remaining) [ True (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 171 (remaining gas: 1039335.687 units remaining) + - location: 170 (remaining gas: 1039342.297 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039335.617 units remaining) + - location: 171 (remaining gas: 1039342.227 units remaining) [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 176 (remaining gas: 1039335.477 units remaining) + - location: 176 (remaining gas: 1039342.147 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: 1039335.337 units remaining) + - location: 177 (remaining gas: 1039342.067 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 180 (remaining gas: 1039335.037 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 179 (remaining gas: 1039334.967 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 178 (remaining gas: 1039334.967 units remaining) + - location: 178 (remaining gas: 1039341.967 units remaining) + [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 180 (remaining gas: 1039341.887 units remaining) [ {} - {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 181 (remaining gas: 1039326.667 units remaining) + - location: 181 (remaining gas: 1039333.647 units remaining) [ 0x050200000000 @packed {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 184 (remaining gas: 1039318.207 units remaining) + - location: 182 (remaining gas: 1039333.547 units remaining) + [ {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 184 (remaining gas: 1039325.307 units remaining) [ 0x050200000000 @packed (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 185 (remaining gas: 1039310.907 units remaining) + - location: 185 (remaining gas: 1039318.067 units remaining) [ (Some {}) @packed.unpacked (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 194 (remaining gas: 1039310.637 units remaining) + - location: 189 (remaining gas: 1039317.987 units remaining) [ {} @packed.unpacked.some (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 188 (remaining gas: 1039310.567 units remaining) + - location: 194 (remaining gas: 1039317.917 units remaining) [ {} @packed.unpacked.some (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 195 (remaining gas: 1039302.267 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039302.197 units remaining) + - location: 195 (remaining gas: 1039309.677 units remaining) [ 0x050200000000 @packed.unpacked.some.packed (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 182 (remaining gas: 1039302.197 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 198 (remaining gas: 1039301.897 units remaining) + - location: 198 (remaining gas: 1039309.557 units remaining) [ 0 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 199 (remaining gas: 1039301.757 units remaining) - [ True - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039301.687 units remaining) + - location: 199 (remaining gas: 1039309.477 units remaining) [ True (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 201 (remaining gas: 1039301.497 units remaining) + - location: 200 (remaining gas: 1039309.417 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039301.427 units remaining) + - location: 201 (remaining gas: 1039309.347 units remaining) [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 206 (remaining gas: 1039301.287 units remaining) + - location: 206 (remaining gas: 1039309.267 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: 1039301.147 units remaining) + - location: 207 (remaining gas: 1039309.187 units remaining) [ (Pair 40 -10) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 210 (remaining gas: 1039300.847 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 209 (remaining gas: 1039300.777 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 208 (remaining gas: 1039300.777 units remaining) + - location: 208 (remaining gas: 1039309.087 units remaining) + [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 210 (remaining gas: 1039309.007 units remaining) [ (Pair 40 -10) - (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 211 (remaining gas: 1039291.997 units remaining) + - location: 211 (remaining gas: 1039300.287 units remaining) [ 0x0507070028004a @packed (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 214 (remaining gas: 1039283.057 units remaining) + - location: 212 (remaining gas: 1039300.187 units remaining) + [ (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 214 (remaining gas: 1039291.467 units remaining) [ 0x0507070028004a @packed (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 215 (remaining gas: 1039247.277 units remaining) + - location: 215 (remaining gas: 1039255.747 units remaining) [ (Some (Pair 40 -10)) @packed.unpacked (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 225 (remaining gas: 1039247.007 units remaining) + - location: 220 (remaining gas: 1039255.667 units remaining) [ (Pair 40 -10) @packed.unpacked.some (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 219 (remaining gas: 1039246.937 units remaining) + - location: 225 (remaining gas: 1039255.597 units remaining) [ (Pair 40 -10) @packed.unpacked.some (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 226 (remaining gas: 1039238.157 units remaining) - [ 0x0507070028004a @packed.unpacked.some.packed - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039238.087 units remaining) + - location: 226 (remaining gas: 1039246.877 units remaining) [ 0x0507070028004a @packed.unpacked.some.packed (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 212 (remaining gas: 1039238.087 units remaining) - [ 0x0507070028004a @packed - 0x0507070028004a @packed.unpacked.some.packed - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 229 (remaining gas: 1039237.787 units remaining) + - location: 229 (remaining gas: 1039246.757 units remaining) [ 0 (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 230 (remaining gas: 1039237.647 units remaining) - [ True - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039237.577 units remaining) + - location: 230 (remaining gas: 1039246.677 units remaining) [ True (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 232 (remaining gas: 1039237.387 units remaining) + - location: 231 (remaining gas: 1039246.617 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039237.317 units remaining) + - location: 232 (remaining gas: 1039246.547 units remaining) [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 237 (remaining gas: 1039237.177 units remaining) + - location: 237 (remaining gas: 1039246.467 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: 1039237.037 units remaining) + - location: 238 (remaining gas: 1039246.387 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - - location: 241 (remaining gas: 1039236.737 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] - - location: 240 (remaining gas: 1039236.667 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] - - location: 239 (remaining gas: 1039236.667 units remaining) + - location: 239 (remaining gas: 1039246.287 units remaining) + [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + - location: 241 (remaining gas: 1039246.207 units remaining) [ (Right "2019-09-09T08:35:33Z") - (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 242 (remaining gas: 1039226.127 units remaining) + - location: 242 (remaining gas: 1039235.727 units remaining) [ 0x0505080095bbb0d70b @packed (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - - location: 245 (remaining gas: 1039215.427 units remaining) + - location: 243 (remaining gas: 1039235.627 units remaining) + [ (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] + - location: 245 (remaining gas: 1039225.147 units remaining) [ 0x0505080095bbb0d70b @packed (Pair {} { DUP ; DROP ; PACK }) ] - - location: 246 (remaining gas: 1039193.887 units remaining) + - location: 246 (remaining gas: 1039203.667 units remaining) [ (Some (Right "2019-09-09T08:35:33Z")) @packed.unpacked (Pair {} { DUP ; DROP ; PACK }) ] - - location: 256 (remaining gas: 1039193.617 units remaining) + - location: 251 (remaining gas: 1039203.587 units remaining) [ (Right "2019-09-09T08:35:33Z") @packed.unpacked.some (Pair {} { DUP ; DROP ; PACK }) ] - - location: 250 (remaining gas: 1039193.547 units remaining) + - location: 256 (remaining gas: 1039203.517 units remaining) [ (Right "2019-09-09T08:35:33Z") @packed.unpacked.some (Pair {} { DUP ; DROP ; PACK }) ] - - location: 257 (remaining gas: 1039183.007 units remaining) - [ 0x0505080095bbb0d70b @packed.unpacked.some.packed - (Pair {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039182.937 units remaining) + - location: 257 (remaining gas: 1039193.037 units remaining) [ 0x0505080095bbb0d70b @packed.unpacked.some.packed (Pair {} { DUP ; DROP ; PACK }) ] - - location: 243 (remaining gas: 1039182.937 units remaining) - [ 0x0505080095bbb0d70b @packed - 0x0505080095bbb0d70b @packed.unpacked.some.packed - (Pair {} { DUP ; DROP ; PACK }) ] - - location: 260 (remaining gas: 1039182.637 units remaining) + - location: 260 (remaining gas: 1039192.917 units remaining) [ 0 (Pair {} { DUP ; DROP ; PACK }) ] - - location: 261 (remaining gas: 1039182.497 units remaining) - [ True - (Pair {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039182.427 units remaining) + - location: 261 (remaining gas: 1039192.837 units remaining) [ True (Pair {} { DUP ; DROP ; PACK }) ] - - location: 263 (remaining gas: 1039182.237 units remaining) + - location: 262 (remaining gas: 1039192.777 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) ] - - location: -1 (remaining gas: 1039182.167 units remaining) + - location: 263 (remaining gas: 1039192.707 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) ] - - location: 268 (remaining gas: 1039182.027 units remaining) + - location: 268 (remaining gas: 1039192.627 units remaining) [ (Pair {} { DUP ; DROP ; PACK }) (Pair {} { DUP ; DROP ; PACK }) ] - - location: 269 (remaining gas: 1039181.887 units remaining) + - location: 269 (remaining gas: 1039192.547 units remaining) [ {} (Pair {} { DUP ; DROP ; PACK }) ] - - location: 272 (remaining gas: 1039181.587 units remaining) - [ {} - { DUP ; DROP ; PACK } ] - - location: 271 (remaining gas: 1039181.517 units remaining) - [ {} - { DUP ; DROP ; PACK } ] - - location: 270 (remaining gas: 1039181.517 units remaining) + - location: 270 (remaining gas: 1039192.447 units remaining) + [ (Pair {} { DUP ; DROP ; PACK }) ] + - location: 272 (remaining gas: 1039192.367 units remaining) [ {} - {} { DUP ; DROP ; PACK } ] - - location: 273 (remaining gas: 1039173.217 units remaining) + - location: 273 (remaining gas: 1039184.127 units remaining) [ 0x050200000000 @packed {} { DUP ; DROP ; PACK } ] - - location: 276 (remaining gas: 1039164.757 units remaining) + - location: 274 (remaining gas: 1039184.027 units remaining) + [ {} + { DUP ; DROP ; PACK } ] + - location: 276 (remaining gas: 1039175.787 units remaining) [ 0x050200000000 @packed { DUP ; DROP ; PACK } ] - - location: 277 (remaining gas: 1039157.457 units remaining) + - location: 277 (remaining gas: 1039168.547 units remaining) [ (Some {}) @packed.unpacked { DUP ; DROP ; PACK } ] - - location: 287 (remaining gas: 1039157.187 units remaining) + - location: 282 (remaining gas: 1039168.467 units remaining) [ {} @packed.unpacked.some { DUP ; DROP ; PACK } ] - - location: 281 (remaining gas: 1039157.117 units remaining) + - location: 287 (remaining gas: 1039168.397 units remaining) [ {} @packed.unpacked.some { DUP ; DROP ; PACK } ] - - location: 288 (remaining gas: 1039148.817 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed - { DUP ; DROP ; PACK } ] - - location: -1 (remaining gas: 1039148.747 units remaining) + - location: 288 (remaining gas: 1039160.157 units remaining) [ 0x050200000000 @packed.unpacked.some.packed { DUP ; DROP ; PACK } ] - - location: 274 (remaining gas: 1039148.747 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed - { DUP ; DROP ; PACK } ] - - location: 291 (remaining gas: 1039148.447 units remaining) + - location: 291 (remaining gas: 1039160.037 units remaining) [ 0 { DUP ; DROP ; PACK } ] - - location: 292 (remaining gas: 1039148.307 units remaining) + - location: 292 (remaining gas: 1039159.957 units remaining) [ True { DUP ; DROP ; PACK } ] - - location: -1 (remaining gas: 1039148.237 units remaining) - [ True - { DUP ; DROP ; PACK } ] - - location: 294 (remaining gas: 1039148.047 units remaining) + - location: 293 (remaining gas: 1039159.897 units remaining) [ { DUP ; DROP ; PACK } ] - - location: -1 (remaining gas: 1039147.977 units remaining) + - location: 294 (remaining gas: 1039159.827 units remaining) [ { DUP ; DROP ; PACK } ] - - location: 299 (remaining gas: 1039147.837 units remaining) + - location: 299 (remaining gas: 1039159.747 units remaining) [ { DUP ; DROP ; PACK } { DUP ; DROP ; PACK } ] - - location: 300 (remaining gas: 1039134.437 units remaining) + - location: 300 (remaining gas: 1039146.407 units remaining) [ 0x05020000000603210320030c @packed { DUP ; DROP ; PACK } ] - - location: 303 (remaining gas: 1039120.877 units remaining) + - location: 301 (remaining gas: 1039146.307 units remaining) + [ { DUP ; DROP ; PACK } ] + - location: 303 (remaining gas: 1039132.967 units remaining) [ 0x05020000000603210320030c @packed ] - - location: 304 (remaining gas: 1039068.957 units remaining) + - location: 304 (remaining gas: 1039081.107 units remaining) [ (Some { DUP ; DROP ; PACK }) @packed.unpacked ] - - location: 314 (remaining gas: 1039068.687 units remaining) + - location: 309 (remaining gas: 1039081.027 units remaining) [ { DUP ; DROP ; PACK } @packed.unpacked.some ] - - location: 308 (remaining gas: 1039068.617 units remaining) + - location: 314 (remaining gas: 1039080.957 units remaining) [ { DUP ; DROP ; PACK } @packed.unpacked.some ] - - location: 315 (remaining gas: 1039055.217 units remaining) - [ 0x05020000000603210320030c @packed.unpacked.some.packed ] - - location: -1 (remaining gas: 1039055.147 units remaining) + - location: 315 (remaining gas: 1039067.617 units remaining) [ 0x05020000000603210320030c @packed.unpacked.some.packed ] - - location: 301 (remaining gas: 1039055.147 units remaining) - [ 0x05020000000603210320030c @packed - 0x05020000000603210320030c @packed.unpacked.some.packed ] - - location: 318 (remaining gas: 1039054.847 units remaining) + - location: 318 (remaining gas: 1039067.497 units remaining) [ 0 ] - - location: 319 (remaining gas: 1039054.707 units remaining) - [ True ] - - location: -1 (remaining gas: 1039054.637 units remaining) + - location: 319 (remaining gas: 1039067.417 units remaining) [ True ] - - location: 321 (remaining gas: 1039054.447 units remaining) + - location: 320 (remaining gas: 1039067.357 units remaining) [ ] - - location: -1 (remaining gas: 1039054.377 units remaining) + - location: 321 (remaining gas: 1039067.287 units remaining) [ ] - - location: 326 (remaining gas: 1039054.237 units remaining) + - location: 326 (remaining gas: 1039067.207 units remaining) [ Unit ] - - location: 327 (remaining gas: 1039054.097 units remaining) + - location: 327 (remaining gas: 1039067.127 units remaining) [ {} Unit ] - - location: 329 (remaining gas: 1039053.957 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039053.887 units remaining) + - location: 329 (remaining gas: 1039067.047 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 9111d2014509098f6dd4a1c87031c49a940a206a..899fbf4544bd0d076e221dd467b72d80f7b05a02 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039993.020 units remaining) + - location: 12 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair False False) None) ] - - location: 12 (remaining gas: 1039992.880 units remaining) + - location: 12 (remaining gas: 1039992.940 units remaining) [ (Pair False False) @parameter ] - - location: 13 (remaining gas: 1039992.740 units remaining) + - location: 13 (remaining gas: 1039992.860 units remaining) [ (Some (Pair False False)) ] - - location: 14 (remaining gas: 1039992.600 units remaining) + - location: 14 (remaining gas: 1039992.780 units remaining) [ {} (Some (Pair False False)) ] - - location: 16 (remaining gas: 1039992.460 units remaining) - [ (Pair {} (Some (Pair False False))) ] - - location: -1 (remaining gas: 1039992.390 units remaining) + - location: 16 (remaining gas: 1039992.700 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 34af3223486fe27a84c6a66601e455309d387d81..bed4d3c85ce842c1f9ab8051afe9a9fb04cc8c97 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039993.020 units remaining) + - location: 12 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair False True) None) ] - - location: 12 (remaining gas: 1039992.880 units remaining) + - location: 12 (remaining gas: 1039992.940 units remaining) [ (Pair False True) @parameter ] - - location: 13 (remaining gas: 1039992.740 units remaining) + - location: 13 (remaining gas: 1039992.860 units remaining) [ (Some (Pair False True)) ] - - location: 14 (remaining gas: 1039992.600 units remaining) + - location: 14 (remaining gas: 1039992.780 units remaining) [ {} (Some (Pair False True)) ] - - location: 16 (remaining gas: 1039992.460 units remaining) - [ (Pair {} (Some (Pair False True))) ] - - location: -1 (remaining gas: 1039992.390 units remaining) + - location: 16 (remaining gas: 1039992.700 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 ce7074f7d9ef7f9e2d5e3c8537fa305121695b65..cf53201dbe9429f3b579234212a5ce1794cff768 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039993.020 units remaining) + - location: 12 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair True False) None) ] - - location: 12 (remaining gas: 1039992.880 units remaining) + - location: 12 (remaining gas: 1039992.940 units remaining) [ (Pair True False) @parameter ] - - location: 13 (remaining gas: 1039992.740 units remaining) + - location: 13 (remaining gas: 1039992.860 units remaining) [ (Some (Pair True False)) ] - - location: 14 (remaining gas: 1039992.600 units remaining) + - location: 14 (remaining gas: 1039992.780 units remaining) [ {} (Some (Pair True False)) ] - - location: 16 (remaining gas: 1039992.460 units remaining) - [ (Pair {} (Some (Pair True False))) ] - - location: -1 (remaining gas: 1039992.390 units remaining) + - location: 16 (remaining gas: 1039992.700 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 e4443e1b7623d34c90d84f240105dce89510747a..af3f8651899064a73399df1d4611c1f9262ed0ad 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039993.020 units remaining) + - location: 12 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair True True) None) ] - - location: 12 (remaining gas: 1039992.880 units remaining) + - location: 12 (remaining gas: 1039992.940 units remaining) [ (Pair True True) @parameter ] - - location: 13 (remaining gas: 1039992.740 units remaining) + - location: 13 (remaining gas: 1039992.860 units remaining) [ (Some (Pair True True)) ] - - location: 14 (remaining gas: 1039992.600 units remaining) + - location: 14 (remaining gas: 1039992.780 units remaining) [ {} (Some (Pair True True)) ] - - location: 16 (remaining gas: 1039992.460 units remaining) - [ (Pair {} (Some (Pair True True))) ] - - location: -1 (remaining gas: 1039992.390 units remaining) + - location: 16 (remaining gas: 1039992.700 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 ae8b1a0f5a42cd5892250979ff556af73a1ad65d..306efe8f46dca0adff7e7201af29061e7292c232 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,46 +7,38 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039989.170 units remaining) + - location: 7 (remaining gas: 1039989.170 units remaining) [ (Pair 38 14) ] - - location: 7 (remaining gas: 1039989.030 units remaining) + - location: 7 (remaining gas: 1039989.090 units remaining) [ { UNPAIR ; ADD } (Pair 38 14) ] - - location: 15 (remaining gas: 1039988.900 units remaining) + - location: 15 (remaining gas: 1039989.020 units remaining) [ (Pair 38 14) { UNPAIR ; ADD } ] - - location: 16 (remaining gas: 1039988.760 units remaining) + - location: 16 (remaining gas: 1039988.940 units remaining) [ 38 @parameter 14 @storage { UNPAIR ; ADD } ] - - location: 19 (remaining gas: 1039987.215 units remaining) - [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - - location: 18 (remaining gas: 1039987.145 units remaining) + - location: 17 (remaining gas: 1039988.840 units remaining) + [ 14 @storage + { UNPAIR ; ADD } ] + - location: 19 (remaining gas: 1039987.515 units remaining) [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - - location: 17 (remaining gas: 1039987.145 units remaining) - [ 38 @parameter - { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - - location: 12 (remaining gas: 1039986.985 units remaining) + - location: 20 (remaining gas: 1039987.415 units remaining) [ 38 ] - - location: 12 (remaining gas: 1039986.785 units remaining) + - location: 12 (remaining gas: 1039987.335 units remaining) [ 14 38 ] - - location: 12 (remaining gas: 1039986.705 units remaining) - [ (Pair 14 38) ] - - location: 13 (remaining gas: 1039986.565 units remaining) + - location: 12 (remaining gas: 1039987.255 units remaining) + [ (Pair 14 38) @arg ] + - location: 13 (remaining gas: 1039987.175 units remaining) [ 14 38 ] - - location: 14 (remaining gas: 1039986.425 units remaining) + - location: 14 (remaining gas: 1039987.095 units remaining) [ 52 ] - - location: -1 (remaining gas: 1039986.355 units remaining) - [ 52 ] - - location: 20 (remaining gas: 1039986.355 units remaining) - [ 52 ] - - location: 21 (remaining gas: 1039986.215 units remaining) + - location: 21 (remaining gas: 1039987.015 units remaining) [ {} 52 ] - - location: 23 (remaining gas: 1039986.075 units remaining) - [ (Pair {} 52) ] - - location: -1 (remaining gas: 1039986.005 units remaining) + - location: 23 (remaining gas: 1039986.935 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 23fbbaa1a5a2e4fd4b895ceb199f094b2626a8ca..e7ed38dbfb05e0a878f914d43a6f7bba21c3345e 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,308 +7,189 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039978.900 units remaining) + - location: 8 (remaining gas: 1039978.900 units remaining) [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] - - location: 8 (remaining gas: 1039978.760 units remaining) + - location: 8 (remaining gas: 1039978.820 units remaining) [ 4 @p { 0 ; 1 ; 2 ; 3 } @s ] - - location: 9 (remaining gas: 1039978.620 units remaining) + - location: 9 (remaining gas: 1039978.740 units remaining) [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } 4 @p { 0 ; 1 ; 2 ; 3 } @s ] - - location: 23 (remaining gas: 1039978.490 units remaining) + - location: 23 (remaining gas: 1039978.670 units remaining) [ 4 @p { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } { 0 ; 1 ; 2 ; 3 } @s ] - - location: 24 (remaining gas: 1039977.105 units remaining) + - location: 24 (remaining gas: 1039977.345 units remaining) [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } { 0 ; 1 ; 2 ; 3 } @s ] - - location: 25 (remaining gas: 1039976.965 units remaining) + - location: 25 (remaining gas: 1039977.265 units remaining) [ 3 { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } { 0 ; 1 ; 2 ; 3 } @s ] - - location: 28 (remaining gas: 1039975.580 units remaining) + - location: 28 (remaining gas: 1039975.940 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { 0 ; 1 ; 2 ; 3 } @s ] - - location: 29 (remaining gas: 1039975.450 units remaining) + - location: 29 (remaining gas: 1039975.870 units remaining) [ { 0 ; 1 ; 2 ; 3 } @s { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039974.542 units remaining) + - location: 32 (remaining gas: 1039975.222 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: 33 (remaining gas: 1039974.472 units remaining) + - location: 34 (remaining gas: 1039975.142 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: 1039974.472 units remaining) - [ 0 @s.elt - { 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: 16 (remaining gas: 1039974.312 units remaining) + - location: 35 (remaining gas: 1039975.042 units remaining) [ 0 ] - - location: 16 (remaining gas: 1039974.112 units remaining) + - location: 16 (remaining gas: 1039974.962 units remaining) [ 3 0 ] - - location: 16 (remaining gas: 1039974.032 units remaining) + - location: 16 (remaining gas: 1039974.882 units remaining) [ (Pair 3 0) ] - - location: 16 (remaining gas: 1039973.832 units remaining) + - location: 16 (remaining gas: 1039974.802 units remaining) [ 4 (Pair 3 0) ] - - location: 16 (remaining gas: 1039973.752 units remaining) - [ (Pair 4 3 0) ] - - location: 17 (remaining gas: 1039973.612 units remaining) + - location: 16 (remaining gas: 1039974.722 units remaining) + [ (Pair 4 3 0) @arg ] + - location: 17 (remaining gas: 1039974.642 units remaining) [ 4 (Pair 3 0) ] - - location: 20 (remaining gas: 1039973.312 units remaining) - [ 3 - 0 ] - - location: 19 (remaining gas: 1039973.242 units remaining) + - location: 18 (remaining gas: 1039974.542 units remaining) + [ (Pair 3 0) ] + - location: 20 (remaining gas: 1039974.462 units remaining) [ 3 0 ] - - location: 18 (remaining gas: 1039973.242 units remaining) - [ 4 - 3 - 0 ] - - location: 21 (remaining gas: 1039973.102 units remaining) + - location: 21 (remaining gas: 1039974.382 units remaining) [ 7 0 ] - - location: 22 (remaining gas: 1039972.960 units remaining) - [ 0 ] - - location: -1 (remaining gas: 1039972.890 units remaining) + - location: 22 (remaining gas: 1039974.300 units remaining) [ 0 ] - - location: 35 (remaining gas: 1039972.890 units remaining) - [ 0 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: -1 (remaining gas: 1039972.820 units remaining) - [ 0 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039972.520 units remaining) + - location: 32 (remaining gas: 1039974.200 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: 33 (remaining gas: 1039972.450 units remaining) + - location: 34 (remaining gas: 1039974.120 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: 1039972.450 units remaining) - [ 1 @s.elt - { 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: 16 (remaining gas: 1039972.290 units remaining) + - location: 35 (remaining gas: 1039974.020 units remaining) [ 1 ] - - location: 16 (remaining gas: 1039972.090 units remaining) + - location: 16 (remaining gas: 1039973.940 units remaining) [ 3 1 ] - - location: 16 (remaining gas: 1039972.010 units remaining) + - location: 16 (remaining gas: 1039973.860 units remaining) [ (Pair 3 1) ] - - location: 16 (remaining gas: 1039971.810 units remaining) + - location: 16 (remaining gas: 1039973.780 units remaining) [ 4 (Pair 3 1) ] - - location: 16 (remaining gas: 1039971.730 units remaining) - [ (Pair 4 3 1) ] - - location: 17 (remaining gas: 1039971.590 units remaining) + - location: 16 (remaining gas: 1039973.700 units remaining) + [ (Pair 4 3 1) @arg ] + - location: 17 (remaining gas: 1039973.620 units remaining) [ 4 (Pair 3 1) ] - - location: 20 (remaining gas: 1039971.290 units remaining) - [ 3 - 1 ] - - location: 19 (remaining gas: 1039971.220 units remaining) + - location: 18 (remaining gas: 1039973.520 units remaining) + [ (Pair 3 1) ] + - location: 20 (remaining gas: 1039973.440 units remaining) [ 3 1 ] - - location: 18 (remaining gas: 1039971.220 units remaining) - [ 4 - 3 - 1 ] - - location: 21 (remaining gas: 1039971.080 units remaining) + - location: 21 (remaining gas: 1039973.360 units remaining) [ 7 1 ] - - location: 22 (remaining gas: 1039970.934 units remaining) - [ 7 ] - - location: -1 (remaining gas: 1039970.864 units remaining) + - location: 22 (remaining gas: 1039973.274 units remaining) [ 7 ] - - location: 35 (remaining gas: 1039970.864 units remaining) - [ 7 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: -1 (remaining gas: 1039970.794 units remaining) - [ 7 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039970.494 units remaining) + - location: 32 (remaining gas: 1039973.174 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: 33 (remaining gas: 1039970.424 units remaining) + - location: 34 (remaining gas: 1039973.094 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: 1039970.424 units remaining) - [ 2 @s.elt - { 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: 16 (remaining gas: 1039970.264 units remaining) + - location: 35 (remaining gas: 1039972.994 units remaining) [ 2 ] - - location: 16 (remaining gas: 1039970.064 units remaining) + - location: 16 (remaining gas: 1039972.914 units remaining) [ 3 2 ] - - location: 16 (remaining gas: 1039969.984 units remaining) + - location: 16 (remaining gas: 1039972.834 units remaining) [ (Pair 3 2) ] - - location: 16 (remaining gas: 1039969.784 units remaining) + - location: 16 (remaining gas: 1039972.754 units remaining) [ 4 (Pair 3 2) ] - - location: 16 (remaining gas: 1039969.704 units remaining) - [ (Pair 4 3 2) ] - - location: 17 (remaining gas: 1039969.564 units remaining) + - location: 16 (remaining gas: 1039972.674 units remaining) + [ (Pair 4 3 2) @arg ] + - location: 17 (remaining gas: 1039972.594 units remaining) [ 4 (Pair 3 2) ] - - location: 20 (remaining gas: 1039969.264 units remaining) - [ 3 - 2 ] - - location: 19 (remaining gas: 1039969.194 units remaining) + - location: 18 (remaining gas: 1039972.494 units remaining) + [ (Pair 3 2) ] + - location: 20 (remaining gas: 1039972.414 units remaining) [ 3 2 ] - - location: 18 (remaining gas: 1039969.194 units remaining) - [ 4 - 3 - 2 ] - - location: 21 (remaining gas: 1039969.054 units remaining) + - location: 21 (remaining gas: 1039972.334 units remaining) [ 7 2 ] - - location: 22 (remaining gas: 1039968.908 units remaining) - [ 14 ] - - location: -1 (remaining gas: 1039968.838 units remaining) + - location: 22 (remaining gas: 1039972.248 units remaining) [ 14 ] - - location: 35 (remaining gas: 1039968.838 units remaining) - [ 14 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: -1 (remaining gas: 1039968.768 units remaining) - [ 14 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 34 (remaining gas: 1039968.468 units remaining) + - location: 32 (remaining gas: 1039972.148 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: 33 (remaining gas: 1039968.398 units remaining) + - location: 34 (remaining gas: 1039972.068 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: 1039968.398 units remaining) - [ 3 @s.elt - { 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: 16 (remaining gas: 1039968.238 units remaining) + - location: 35 (remaining gas: 1039971.968 units remaining) [ 3 ] - - location: 16 (remaining gas: 1039968.038 units remaining) + - location: 16 (remaining gas: 1039971.888 units remaining) [ 3 3 ] - - location: 16 (remaining gas: 1039967.958 units remaining) + - location: 16 (remaining gas: 1039971.808 units remaining) [ (Pair 3 3) ] - - location: 16 (remaining gas: 1039967.758 units remaining) + - location: 16 (remaining gas: 1039971.728 units remaining) [ 4 (Pair 3 3) ] - - location: 16 (remaining gas: 1039967.678 units remaining) - [ (Pair 4 3 3) ] - - location: 17 (remaining gas: 1039967.538 units remaining) + - location: 16 (remaining gas: 1039971.648 units remaining) + [ (Pair 4 3 3) @arg ] + - location: 17 (remaining gas: 1039971.568 units remaining) [ 4 (Pair 3 3) ] - - location: 20 (remaining gas: 1039967.238 units remaining) - [ 3 - 3 ] - - location: 19 (remaining gas: 1039967.168 units remaining) + - location: 18 (remaining gas: 1039971.468 units remaining) + [ (Pair 3 3) ] + - location: 20 (remaining gas: 1039971.388 units remaining) [ 3 3 ] - - location: 18 (remaining gas: 1039967.168 units remaining) - [ 4 - 3 - 3 ] - - location: 21 (remaining gas: 1039967.028 units remaining) + - location: 21 (remaining gas: 1039971.308 units remaining) [ 7 3 ] - - location: 22 (remaining gas: 1039966.882 units remaining) + - location: 22 (remaining gas: 1039971.222 units remaining) [ 21 ] - - location: -1 (remaining gas: 1039966.812 units remaining) - [ 21 ] - - location: 35 (remaining gas: 1039966.812 units remaining) - [ 21 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: -1 (remaining gas: 1039966.742 units remaining) - [ 21 - { PUSH int 3 ; - PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 30 (remaining gas: 1039966.742 units remaining) - [ { 0 ; 7 ; 14 ; 21 } - { PUSH int 3 ; + - location: 36 (remaining gas: 1039971.122 units remaining) + [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - - location: 38 (remaining gas: 1039966.442 units remaining) + - location: 38 (remaining gas: 1039971.042 units remaining) [ ] - - location: 37 (remaining gas: 1039966.372 units remaining) - [ ] - - location: 36 (remaining gas: 1039966.372 units remaining) - [ { 0 ; 7 ; 14 ; 21 } ] - - location: 39 (remaining gas: 1039966.232 units remaining) + - location: 39 (remaining gas: 1039970.962 units remaining) [ {} { 0 ; 7 ; 14 ; 21 } ] - - location: 41 (remaining gas: 1039966.092 units remaining) - [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ] - - location: -1 (remaining gas: 1039966.022 units remaining) + - location: 41 (remaining gas: 1039970.882 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 9782e41d759cf565e580245a9193cc7c4cd6047b..10aa08634616ed05566ac2a265b78a41e6118f01 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,19 +7,17 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.280 units remaining) + - location: 8 (remaining gas: 1039993.280 units remaining) [ (Pair Unit None) ] - - location: 8 (remaining gas: 1039993.140 units remaining) + - location: 8 (remaining gas: 1039993.200 units remaining) [ ] - - location: 9 (remaining gas: 1039993 units remaining) + - location: 9 (remaining gas: 1039993.120 units remaining) [ 300 ] - - location: 12 (remaining gas: 1039992.860 units remaining) + - location: 12 (remaining gas: 1039993.040 units remaining) [ (Some 300) ] - - location: 13 (remaining gas: 1039992.720 units remaining) + - location: 13 (remaining gas: 1039992.960 units remaining) [ {} (Some 300) ] - - location: 15 (remaining gas: 1039992.580 units remaining) - [ (Pair {} (Some 300)) ] - - location: -1 (remaining gas: 1039992.510 units remaining) + - location: 15 (remaining gas: 1039992.880 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 c5dc6e75b6452b68fcf6d600b6817720a4f64967..fe3e19d81b90b6e6cbcbfab08bee906d18f4e3af 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,35 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.414 units remaining) + - location: 9 (remaining gas: 1039990.414 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039990.274 units remaining) + - location: 9 (remaining gas: 1039990.334 units remaining) [ { "c" ; "b" ; "a" } @parameter ] - - location: 10 (remaining gas: 1039990.134 units remaining) + - location: 10 (remaining gas: 1039990.254 units remaining) [ {} { "c" ; "b" ; "a" } @parameter ] - - location: 12 (remaining gas: 1039990.004 units remaining) + - location: 12 (remaining gas: 1039990.184 units remaining) [ { "c" ; "b" ; "a" } @parameter {} ] - - location: 15 (remaining gas: 1039989.283 units remaining) + - location: 15 (remaining gas: 1039989.583 units remaining) [ { "c" } ] - - location: 14 (remaining gas: 1039989.213 units remaining) - [ { "c" } ] - - location: 15 (remaining gas: 1039989.073 units remaining) - [ { "b" ; "c" } ] - - location: 14 (remaining gas: 1039989.003 units remaining) + - location: 15 (remaining gas: 1039989.503 units remaining) [ { "b" ; "c" } ] - - location: 15 (remaining gas: 1039988.863 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 14 (remaining gas: 1039988.793 units remaining) + - location: 15 (remaining gas: 1039989.423 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 13 (remaining gas: 1039988.793 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 16 (remaining gas: 1039988.653 units remaining) + - location: 16 (remaining gas: 1039989.343 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 18 (remaining gas: 1039988.513 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039988.443 units remaining) + - location: 18 (remaining gas: 1039989.263 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 f236a2165550bd01c91214a3cedf5ce5b67ed751..1083ecf44567550982e3f6ea5ac771798c95272e 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,23 +7,19 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039991.206 units remaining) + - location: 9 (remaining gas: 1039991.206 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039991.066 units remaining) + - location: 9 (remaining gas: 1039991.126 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039990.926 units remaining) + - location: 10 (remaining gas: 1039991.046 units remaining) [ {} {} @parameter ] - - location: 12 (remaining gas: 1039990.796 units remaining) + - location: 12 (remaining gas: 1039990.976 units remaining) [ {} @parameter {} ] - - location: 13 (remaining gas: 1039990.236 units remaining) - [ {} ] - - location: 16 (remaining gas: 1039990.096 units remaining) + - location: 16 (remaining gas: 1039990.396 units remaining) [ {} {} ] - - location: 18 (remaining gas: 1039989.956 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039989.886 units remaining) + - location: 18 (remaining gas: 1039990.316 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 6b89f5a1f5964a229b25e9646a03d7d62ec1a24e..bafcdf5698cb67392e50a532e87b68b837656b5a 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,114 +7,85 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039981.974 units remaining) + - location: 9 (remaining gas: 1039981.974 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - - location: 9 (remaining gas: 1039981.834 units remaining) + - location: 9 (remaining gas: 1039981.894 units remaining) [ { "c" ; "b" ; "a" } @parameter ] - - location: 10 (remaining gas: 1039981.694 units remaining) + - location: 10 (remaining gas: 1039981.814 units remaining) [ {} { "c" ; "b" ; "a" } @parameter ] - - location: 12 (remaining gas: 1039981.564 units remaining) + - location: 12 (remaining gas: 1039981.744 units remaining) [ { "c" ; "b" ; "a" } @parameter {} ] - - location: 13 (remaining gas: 1039981.424 units remaining) + - location: 13 (remaining gas: 1039981.664 units remaining) [ True { "c" ; "b" ; "a" } @parameter {} ] - - location: 20 (remaining gas: 1039980.994 units remaining) + - location: 18 (remaining gas: 1039981.484 units remaining) + [ "c" @parameter.hd + { "b" ; "a" } @parameter.tl + {} ] + - location: 20 (remaining gas: 1039981.414 units remaining) [ { "b" ; "a" } @parameter.tl "c" @parameter.hd {} ] - - location: 23 (remaining gas: 1039980.694 units remaining) - [ { "c" } ] - - location: 22 (remaining gas: 1039980.624 units remaining) + - location: 21 (remaining gas: 1039981.314 units remaining) + [ "c" @parameter.hd + {} ] + - location: 23 (remaining gas: 1039981.234 units remaining) [ { "c" } ] - - location: 21 (remaining gas: 1039980.624 units remaining) - [ { "b" ; "a" } @parameter.tl - { "c" } ] - - location: 24 (remaining gas: 1039980.484 units remaining) + - location: 24 (remaining gas: 1039981.154 units remaining) [ True - { "b" ; "a" } @parameter.tl - { "c" } ] - - location: -1 (remaining gas: 1039980.414 units remaining) - [ True - { "b" ; "a" } @parameter.tl + { "b" ; "a" } @parameter { "c" } ] - - location: 17 (remaining gas: 1039980.344 units remaining) - [ True - { "b" ; "a" } + - location: 18 (remaining gas: 1039981.044 units remaining) + [ "b" @parameter.hd + { "a" } @parameter.tl { "c" } ] - - location: 20 (remaining gas: 1039979.974 units remaining) + - location: 20 (remaining gas: 1039980.974 units remaining) [ { "a" } @parameter.tl "b" @parameter.hd { "c" } ] - - location: 23 (remaining gas: 1039979.674 units remaining) - [ { "b" ; "c" } ] - - location: 22 (remaining gas: 1039979.604 units remaining) + - location: 21 (remaining gas: 1039980.874 units remaining) + [ "b" @parameter.hd + { "c" } ] + - location: 23 (remaining gas: 1039980.794 units remaining) [ { "b" ; "c" } ] - - location: 21 (remaining gas: 1039979.604 units remaining) - [ { "a" } @parameter.tl - { "b" ; "c" } ] - - location: 24 (remaining gas: 1039979.464 units remaining) + - location: 24 (remaining gas: 1039980.714 units remaining) [ True - { "a" } @parameter.tl - { "b" ; "c" } ] - - location: -1 (remaining gas: 1039979.394 units remaining) - [ True - { "a" } @parameter.tl + { "a" } @parameter { "b" ; "c" } ] - - location: 17 (remaining gas: 1039979.324 units remaining) - [ True - { "a" } + - location: 18 (remaining gas: 1039980.604 units remaining) + [ "a" @parameter.hd + {} @parameter.tl { "b" ; "c" } ] - - location: 20 (remaining gas: 1039978.954 units remaining) + - location: 20 (remaining gas: 1039980.534 units remaining) [ {} @parameter.tl "a" @parameter.hd { "b" ; "c" } ] - - location: 23 (remaining gas: 1039978.654 units remaining) - [ { "a" ; "b" ; "c" } ] - - location: 22 (remaining gas: 1039978.584 units remaining) + - location: 21 (remaining gas: 1039980.434 units remaining) + [ "a" @parameter.hd + { "b" ; "c" } ] + - location: 23 (remaining gas: 1039980.354 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 21 (remaining gas: 1039978.584 units remaining) - [ {} @parameter.tl - { "a" ; "b" ; "c" } ] - - location: 24 (remaining gas: 1039978.444 units remaining) + - location: 24 (remaining gas: 1039980.274 units remaining) [ True - {} @parameter.tl - { "a" ; "b" ; "c" } ] - - location: -1 (remaining gas: 1039978.374 units remaining) - [ True - {} @parameter.tl + {} @parameter { "a" ; "b" ; "c" } ] - - location: 17 (remaining gas: 1039978.304 units remaining) - [ True - {} - { "a" ; "b" ; "c" } ] - - location: 28 (remaining gas: 1039977.924 units remaining) + - location: 18 (remaining gas: 1039980.164 units remaining) + [ { "a" ; "b" ; "c" } ] + - location: 28 (remaining gas: 1039980.084 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 30 (remaining gas: 1039977.784 units remaining) - [ False - {} - { "a" ; "b" ; "c" } ] - - location: -1 (remaining gas: 1039977.714 units remaining) + - location: 30 (remaining gas: 1039980.004 units remaining) [ False - {} + {} @parameter { "a" ; "b" ; "c" } ] - - location: 17 (remaining gas: 1039977.644 units remaining) - [ False - {} - { "a" ; "b" ; "c" } ] - - location: 16 (remaining gas: 1039977.574 units remaining) - [ {} @parameter - { "a" ; "b" ; "c" } ] - - location: 33 (remaining gas: 1039977.434 units remaining) + - location: 33 (remaining gas: 1039979.924 units remaining) [ { "a" ; "b" ; "c" } ] - - location: 34 (remaining gas: 1039977.294 units remaining) + - location: 34 (remaining gas: 1039979.844 units remaining) [ {} { "a" ; "b" ; "c" } ] - - location: 36 (remaining gas: 1039977.154 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039977.084 units remaining) + - location: 36 (remaining gas: 1039979.764 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 90aa1c6c3d9e64554183bdd306a3c7c583c1dde4..289455377b2d0c8502ba9ddf931ff1049646f0ab 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,45 +7,34 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039982.766 units remaining) + - location: 9 (remaining gas: 1039982.766 units remaining) [ (Pair {} { "" }) ] - - location: 9 (remaining gas: 1039982.626 units remaining) + - location: 9 (remaining gas: 1039982.686 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039982.486 units remaining) + - location: 10 (remaining gas: 1039982.606 units remaining) [ {} {} @parameter ] - - location: 12 (remaining gas: 1039982.356 units remaining) + - location: 12 (remaining gas: 1039982.536 units remaining) [ {} @parameter {} ] - - location: 13 (remaining gas: 1039982.216 units remaining) + - location: 13 (remaining gas: 1039982.456 units remaining) [ True {} @parameter {} ] - - location: 28 (remaining gas: 1039981.776 units remaining) + - location: 18 (remaining gas: 1039982.276 units remaining) + [ {} ] + - location: 28 (remaining gas: 1039982.196 units remaining) [ {} {} ] - - location: 30 (remaining gas: 1039981.636 units remaining) - [ False - {} - {} ] - - location: -1 (remaining gas: 1039981.566 units remaining) - [ False - {} - {} ] - - location: 17 (remaining gas: 1039981.496 units remaining) + - location: 30 (remaining gas: 1039982.116 units remaining) [ False - {} - {} ] - - location: 16 (remaining gas: 1039981.426 units remaining) - [ {} @parameter + {} @parameter {} ] - - location: 33 (remaining gas: 1039981.286 units remaining) + - location: 33 (remaining gas: 1039982.036 units remaining) [ {} ] - - location: 34 (remaining gas: 1039981.146 units remaining) + - location: 34 (remaining gas: 1039981.956 units remaining) [ {} {} ] - - location: 36 (remaining gas: 1039981.006 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039980.936 units remaining) + - location: 36 (remaining gas: 1039981.876 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 f60f32e052790b7c0bad55f06f27221643bb259a..60efd0cc4cbcee40eb27a15ee71b3c4c1db0afec 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.740 units remaining) + - location: 8 (remaining gas: 1039994.740 units remaining) [ (Pair Unit {}) ] - - location: 8 (remaining gas: 1039994.600 units remaining) + - location: 8 (remaining gas: 1039994.660 units remaining) [ ] - - location: 9 (remaining gas: 1039994.300 units remaining) + - location: 9 (remaining gas: 1039994.420 units remaining) [ {} @sapling ] - - location: 11 (remaining gas: 1039994.160 units remaining) + - location: 11 (remaining gas: 1039994.340 units remaining) [ {} {} @sapling ] - - location: 13 (remaining gas: 1039994.020 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039993.950 units remaining) + - location: 13 (remaining gas: 1039994.260 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 637267502fe56fcd0e4ac5f3ab2472327a3aeb30..c60fc39732ba586fa76bfc7818511b5e5d501b8b 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,48 +7,40 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039983.390 units remaining) + - location: 7 (remaining gas: 1039983.390 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039983.250 units remaining) + - location: 7 (remaining gas: 1039983.310 units remaining) [ ] - - location: 8 (remaining gas: 1039983.110 units remaining) + - location: 8 (remaining gas: 1039983.230 units remaining) [ { DROP ; SELF_ADDRESS } ] - - location: 14 (remaining gas: 1039982.970 units remaining) + - location: 14 (remaining gas: 1039983.150 units remaining) [ Unit { DROP ; SELF_ADDRESS } ] - - location: 11 (remaining gas: 1039982.810 units remaining) + - location: 15 (remaining gas: 1039983.050 units remaining) [ Unit @arg ] - - location: 12 (remaining gas: 1039982.670 units remaining) + - location: 12 (remaining gas: 1039982.970 units remaining) [ ] - - location: 13 (remaining gas: 1039982.530 units remaining) + - location: 13 (remaining gas: 1039982.890 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: -1 (remaining gas: 1039982.460 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 15 (remaining gas: 1039982.460 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 16 (remaining gas: 1039982.320 units remaining) + - location: 16 (remaining gas: 1039982.810 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 17 (remaining gas: 1039982.180 units remaining) + - location: 17 (remaining gas: 1039982.730 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self.address "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 20 (remaining gas: 1039981.782 units remaining) + - location: 20 (remaining gas: 1039982.512 units remaining) [ 0 ] - - location: 21 (remaining gas: 1039981.642 units remaining) - [ True ] - - location: -1 (remaining gas: 1039981.572 units remaining) + - location: 21 (remaining gas: 1039982.432 units remaining) [ True ] - - location: 23 (remaining gas: 1039981.382 units remaining) + - location: 22 (remaining gas: 1039982.372 units remaining) [ ] - - location: -1 (remaining gas: 1039981.312 units remaining) + - location: 23 (remaining gas: 1039982.302 units remaining) [ ] - - location: 28 (remaining gas: 1039981.172 units remaining) + - location: 28 (remaining gas: 1039982.222 units remaining) [ Unit ] - - location: 29 (remaining gas: 1039981.032 units remaining) + - location: 29 (remaining gas: 1039982.142 units remaining) [ {} Unit ] - - location: 31 (remaining gas: 1039980.892 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039980.822 units remaining) + - location: 31 (remaining gas: 1039982.062 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 a3a54486df12db73e2571541f5fc1eb07e74f549..ce287bc998557766aabe35a6aaac7e2cf8d0ca58 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,45 +7,41 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039981.740 units remaining) + - location: 13 (remaining gas: 1039981.740 units remaining) [ (Pair (Right (Left Unit)) Unit) ] - - location: 13 (remaining gas: 1039981.600 units remaining) + - location: 13 (remaining gas: 1039981.660 units remaining) [ ] - - location: 14 (remaining gas: 1039981.460 units remaining) + - location: 14 (remaining gas: 1039981.580 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 15 (remaining gas: 1039981.320 units remaining) + - location: 15 (remaining gas: 1039981.500 units remaining) [ ] - - location: 16 (remaining gas: 1039981.180 units remaining) + - location: 16 (remaining gas: 1039981.420 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] - - location: 17 (remaining gas: 1039981.040 units remaining) + - location: 17 (remaining gas: 1039981.340 units remaining) [ ] - - location: 18 (remaining gas: 1039980.900 units remaining) + - location: 18 (remaining gas: 1039981.260 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 19 (remaining gas: 1039950 units remaining) + - location: 19 (remaining gas: 1039950.420 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] - - location: 20 (remaining gas: 1039949.860 units remaining) + - location: 20 (remaining gas: 1039950.340 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] - - location: 21 (remaining gas: 1039918.960 units remaining) + - location: 21 (remaining gas: 1039919.500 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] - - location: 24 (remaining gas: 1039918.660 units remaining) + - location: 24 (remaining gas: 1039919.380 units remaining) [ 0 ] - - location: 25 (remaining gas: 1039918.520 units remaining) + - location: 25 (remaining gas: 1039919.300 units remaining) [ True ] - - location: -1 (remaining gas: 1039918.450 units remaining) - [ True ] - - location: 27 (remaining gas: 1039918.260 units remaining) + - location: 26 (remaining gas: 1039919.240 units remaining) [ ] - - location: -1 (remaining gas: 1039918.190 units remaining) + - location: 27 (remaining gas: 1039919.170 units remaining) [ ] - - location: 32 (remaining gas: 1039918.050 units remaining) + - location: 32 (remaining gas: 1039919.090 units remaining) [ Unit ] - - location: 33 (remaining gas: 1039917.910 units remaining) + - location: 33 (remaining gas: 1039919.010 units remaining) [ {} Unit ] - - location: 35 (remaining gas: 1039917.770 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039917.700 units remaining) + - location: 35 (remaining gas: 1039918.930 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 9d4b0c8da9433ff7b697acc13d9c52fbac43d462..8adce20526b65b9714765c0cdf0b7591d7c0fc41 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,106 +7,95 @@ emitted operations big_map diff trace - - location: 12 (remaining gas: 1039953.950 units remaining) + - location: 13 (remaining gas: 1039953.950 units remaining) [ (Pair (Left (Left 0)) Unit) ] - - location: 13 (remaining gas: 1039953.810 units remaining) + - location: 13 (remaining gas: 1039953.870 units remaining) [ ] - - location: 14 (remaining gas: 1039953.670 units remaining) + - location: 14 (remaining gas: 1039953.790 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] - - location: 15 (remaining gas: 1039922.770 units remaining) + - location: 15 (remaining gas: 1039922.950 units remaining) [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] - - location: 16 (remaining gas: 1039922.630 units remaining) + - location: 16 (remaining gas: 1039922.870 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] - - location: 17 (remaining gas: 1039891.730 units remaining) + - location: 17 (remaining gas: 1039892.030 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] - - location: 18 (remaining gas: 1039891.590 units remaining) + - location: 18 (remaining gas: 1039891.950 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] - - location: 21 (remaining gas: 1039891.300 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 20 (remaining gas: 1039891.230 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 19 (remaining gas: 1039891.230 units remaining) + - location: 19 (remaining gas: 1039891.850 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + - location: 21 (remaining gas: 1039891.780 units remaining) + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 24 (remaining gas: 1039890.930 units remaining) + - location: 24 (remaining gas: 1039891.660 units remaining) [ -1 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 25 (remaining gas: 1039890.790 units remaining) - [ True - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: -1 (remaining gas: 1039890.720 units remaining) + - location: 25 (remaining gas: 1039891.580 units remaining) [ True 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 27 (remaining gas: 1039890.530 units remaining) + - location: 26 (remaining gas: 1039891.520 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: -1 (remaining gas: 1039890.460 units remaining) + - location: 27 (remaining gas: 1039891.450 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 32 (remaining gas: 1039890.320 units remaining) + - location: 32 (remaining gas: 1039891.370 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 33 (remaining gas: 1039859.420 units remaining) + - location: 33 (remaining gas: 1039860.530 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @selfpacked 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] - - location: 36 (remaining gas: 1039859.120 units remaining) + - location: 36 (remaining gas: 1039860.410 units remaining) [ 0 ] - - location: 37 (remaining gas: 1039858.980 units remaining) + - location: 37 (remaining gas: 1039860.330 units remaining) [ True ] - - location: -1 (remaining gas: 1039858.910 units remaining) - [ True ] - - location: 39 (remaining gas: 1039858.720 units remaining) + - location: 38 (remaining gas: 1039860.270 units remaining) [ ] - - location: -1 (remaining gas: 1039858.650 units remaining) + - location: 39 (remaining gas: 1039860.200 units remaining) [ ] - - location: 44 (remaining gas: 1039858.510 units remaining) + - location: 44 (remaining gas: 1039860.120 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] - - location: 45 (remaining gas: 1039858.380 units remaining) + - location: 45 (remaining gas: 1039860.050 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] - - location: 48 (remaining gas: 1039858.240 units remaining) + - location: 48 (remaining gas: 1039859.970 units remaining) [ ] - - location: 49 (remaining gas: 1039858.100 units remaining) + - location: 49 (remaining gas: 1039859.890 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" @self ] - - location: 50 (remaining gas: 1039857.970 units remaining) + - location: 50 (remaining gas: 1039859.820 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" @self ] - - location: 53 (remaining gas: 1039857.830 units remaining) + - location: 53 (remaining gas: 1039859.740 units remaining) [ ] - - location: 54 (remaining gas: 1039857.690 units remaining) + - location: 54 (remaining gas: 1039859.660 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" @self ] - - location: 55 (remaining gas: 1039857.560 units remaining) + - location: 55 (remaining gas: 1039859.590 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" @self ] - - location: 60 (remaining gas: 1039857.420 units remaining) + - location: 60 (remaining gas: 1039859.510 units remaining) [ ] - - location: 61 (remaining gas: 1039857.280 units remaining) + - location: 61 (remaining gas: 1039859.430 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" @self ] - - location: 62 (remaining gas: 1039857.150 units remaining) + - location: 62 (remaining gas: 1039859.360 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" @self ] - - location: 65 (remaining gas: 1039857.010 units remaining) + - location: 65 (remaining gas: 1039859.280 units remaining) [ ] - - location: 66 (remaining gas: 1039856.870 units remaining) + - location: 66 (remaining gas: 1039859.200 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 67 (remaining gas: 1039856.740 units remaining) + - location: 67 (remaining gas: 1039859.130 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 76 (remaining gas: 1039856.600 units remaining) + - location: 76 (remaining gas: 1039859.050 units remaining) [ ] - - location: 77 (remaining gas: 1039856.460 units remaining) + - location: 77 (remaining gas: 1039858.970 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 78 (remaining gas: 1039856.330 units remaining) + - location: 78 (remaining gas: 1039858.900 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] - - location: 87 (remaining gas: 1039856.190 units remaining) + - location: 87 (remaining gas: 1039858.820 units remaining) [ ] - - location: 88 (remaining gas: 1039856.050 units remaining) + - location: 88 (remaining gas: 1039858.740 units remaining) [ Unit ] - - location: 89 (remaining gas: 1039855.910 units remaining) + - location: 89 (remaining gas: 1039858.660 units remaining) [ {} Unit ] - - location: 91 (remaining gas: 1039855.770 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039855.700 units remaining) + - location: 91 (remaining gas: 1039858.580 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 0f2bb032f31e31d02f9af8b7aaff99464beba462..aac9f74f7947ae88433f4e4b84a39f3edc9f0aed 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,47 +7,40 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039985.287 units remaining) + - location: 9 (remaining gas: 1039985.287 units remaining) [ (Pair "" "hello" 0) ] - - location: 9 (remaining gas: 1039985.147 units remaining) + - location: 9 (remaining gas: 1039985.207 units remaining) [ (Pair "" "hello" 0) (Pair "" "hello" 0) ] - - location: 10 (remaining gas: 1039985.007 units remaining) + - location: 10 (remaining gas: 1039985.127 units remaining) [ (Pair "hello" 0) @storage (Pair "" "hello" 0) ] - - location: 13 (remaining gas: 1039984.707 units remaining) - [ "" @parameter ] - - location: 12 (remaining gas: 1039984.637 units remaining) + - location: 11 (remaining gas: 1039985.027 units remaining) + [ (Pair "" "hello" 0) ] + - location: 13 (remaining gas: 1039984.947 units remaining) [ "" @parameter ] - - location: 11 (remaining gas: 1039984.637 units remaining) - [ (Pair "hello" 0) @storage - "" @parameter ] - - location: 15 (remaining gas: 1039984.437 units remaining) + - location: 15 (remaining gas: 1039984.867 units remaining) [ (Pair "hello" 0) @storage (Pair "hello" 0) @storage "" @parameter ] - - location: 16 (remaining gas: 1039984.297 units remaining) + - location: 16 (remaining gas: 1039984.787 units remaining) [ "hello" (Pair "hello" 0) @storage "" @parameter ] - - location: 17 (remaining gas: 1039984.157 units remaining) + - location: 17 (remaining gas: 1039984.707 units remaining) [ (Pair "hello" 0) @storage "" @parameter ] - - location: 18 (remaining gas: 1039984.017 units remaining) + - location: 18 (remaining gas: 1039984.627 units remaining) [ 0 @storage.n "" @parameter ] - - location: 19 (remaining gas: 1039983.887 units remaining) + - location: 19 (remaining gas: 1039984.557 units remaining) [ "" @parameter 0 @storage.n ] - - location: 20 (remaining gas: 1039983.747 units remaining) - [ (Pair "" 0) @storage ] - - location: -1 (remaining gas: 1039983.677 units remaining) + - location: 20 (remaining gas: 1039984.477 units remaining) [ (Pair "" 0) @storage ] - - location: 21 (remaining gas: 1039983.537 units remaining) + - location: 21 (remaining gas: 1039984.397 units remaining) [ {} (Pair "" 0) @storage ] - - location: 23 (remaining gas: 1039983.397 units remaining) - [ (Pair {} "" 0) ] - - location: -1 (remaining gas: 1039983.327 units remaining) + - location: 23 (remaining gas: 1039984.317 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 7bb2dca1dfe728cab8de72d041536dcf6be4cd90..6c4ef591286a6a694d4c9adfb313013807cf60e6 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,47 +7,40 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039985.257 units remaining) + - location: 9 (remaining gas: 1039985.257 units remaining) [ (Pair "abc" "hello" 0) ] - - location: 9 (remaining gas: 1039985.117 units remaining) + - location: 9 (remaining gas: 1039985.177 units remaining) [ (Pair "abc" "hello" 0) (Pair "abc" "hello" 0) ] - - location: 10 (remaining gas: 1039984.977 units remaining) + - location: 10 (remaining gas: 1039985.097 units remaining) [ (Pair "hello" 0) @storage (Pair "abc" "hello" 0) ] - - location: 13 (remaining gas: 1039984.677 units remaining) - [ "abc" @parameter ] - - location: 12 (remaining gas: 1039984.607 units remaining) + - location: 11 (remaining gas: 1039984.997 units remaining) + [ (Pair "abc" "hello" 0) ] + - location: 13 (remaining gas: 1039984.917 units remaining) [ "abc" @parameter ] - - location: 11 (remaining gas: 1039984.607 units remaining) - [ (Pair "hello" 0) @storage - "abc" @parameter ] - - location: 15 (remaining gas: 1039984.407 units remaining) + - location: 15 (remaining gas: 1039984.837 units remaining) [ (Pair "hello" 0) @storage (Pair "hello" 0) @storage "abc" @parameter ] - - location: 16 (remaining gas: 1039984.267 units remaining) + - location: 16 (remaining gas: 1039984.757 units remaining) [ "hello" (Pair "hello" 0) @storage "abc" @parameter ] - - location: 17 (remaining gas: 1039984.127 units remaining) + - location: 17 (remaining gas: 1039984.677 units remaining) [ (Pair "hello" 0) @storage "abc" @parameter ] - - location: 18 (remaining gas: 1039983.987 units remaining) + - location: 18 (remaining gas: 1039984.597 units remaining) [ 0 @storage.n "abc" @parameter ] - - location: 19 (remaining gas: 1039983.857 units remaining) + - location: 19 (remaining gas: 1039984.527 units remaining) [ "abc" @parameter 0 @storage.n ] - - location: 20 (remaining gas: 1039983.717 units remaining) - [ (Pair "abc" 0) @storage ] - - location: -1 (remaining gas: 1039983.647 units remaining) + - location: 20 (remaining gas: 1039984.447 units remaining) [ (Pair "abc" 0) @storage ] - - location: 21 (remaining gas: 1039983.507 units remaining) + - location: 21 (remaining gas: 1039984.367 units remaining) [ {} (Pair "abc" 0) @storage ] - - location: 23 (remaining gas: 1039983.367 units remaining) - [ (Pair {} "abc" 0) ] - - location: -1 (remaining gas: 1039983.297 units remaining) + - location: 23 (remaining gas: 1039984.287 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 86e5b0f6ff1855f91aeba8bdcc6f33ca4dac0bdb..eeb2d58f2737d989f0b297adc8c93e49a5b6915e 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,47 +7,40 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039985.237 units remaining) + - location: 9 (remaining gas: 1039985.237 units remaining) [ (Pair "world" "hello" 0) ] - - location: 9 (remaining gas: 1039985.097 units remaining) + - location: 9 (remaining gas: 1039985.157 units remaining) [ (Pair "world" "hello" 0) (Pair "world" "hello" 0) ] - - location: 10 (remaining gas: 1039984.957 units remaining) + - location: 10 (remaining gas: 1039985.077 units remaining) [ (Pair "hello" 0) @storage (Pair "world" "hello" 0) ] - - location: 13 (remaining gas: 1039984.657 units remaining) - [ "world" @parameter ] - - location: 12 (remaining gas: 1039984.587 units remaining) + - location: 11 (remaining gas: 1039984.977 units remaining) + [ (Pair "world" "hello" 0) ] + - location: 13 (remaining gas: 1039984.897 units remaining) [ "world" @parameter ] - - location: 11 (remaining gas: 1039984.587 units remaining) - [ (Pair "hello" 0) @storage - "world" @parameter ] - - location: 15 (remaining gas: 1039984.387 units remaining) + - location: 15 (remaining gas: 1039984.817 units remaining) [ (Pair "hello" 0) @storage (Pair "hello" 0) @storage "world" @parameter ] - - location: 16 (remaining gas: 1039984.247 units remaining) + - location: 16 (remaining gas: 1039984.737 units remaining) [ "hello" (Pair "hello" 0) @storage "world" @parameter ] - - location: 17 (remaining gas: 1039984.107 units remaining) + - location: 17 (remaining gas: 1039984.657 units remaining) [ (Pair "hello" 0) @storage "world" @parameter ] - - location: 18 (remaining gas: 1039983.967 units remaining) + - location: 18 (remaining gas: 1039984.577 units remaining) [ 0 @storage.n "world" @parameter ] - - location: 19 (remaining gas: 1039983.837 units remaining) + - location: 19 (remaining gas: 1039984.507 units remaining) [ "world" @parameter 0 @storage.n ] - - location: 20 (remaining gas: 1039983.697 units remaining) - [ (Pair "world" 0) @storage ] - - location: -1 (remaining gas: 1039983.627 units remaining) + - location: 20 (remaining gas: 1039984.427 units remaining) [ (Pair "world" 0) @storage ] - - location: 21 (remaining gas: 1039983.487 units remaining) + - location: 21 (remaining gas: 1039984.347 units remaining) [ {} (Pair "world" 0) @storage ] - - location: 23 (remaining gas: 1039983.347 units remaining) - [ (Pair {} "world" 0) ] - - location: -1 (remaining gas: 1039983.277 units remaining) + - location: 23 (remaining gas: 1039984.267 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 99928a15f788b81169be7a57ed22e441cbd0f9ea..955d41ee7db19f251356557746d8e4d9ec3374c1 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,44 +7,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039986.051 units remaining) + - location: 9 (remaining gas: 1039986.051 units remaining) [ (Pair 1 "hello" 0) ] - - location: 9 (remaining gas: 1039985.911 units remaining) + - location: 9 (remaining gas: 1039985.971 units remaining) [ (Pair 1 "hello" 0) (Pair 1 "hello" 0) ] - - location: 10 (remaining gas: 1039985.771 units remaining) + - location: 10 (remaining gas: 1039985.891 units remaining) [ (Pair "hello" 0) @storage (Pair 1 "hello" 0) ] - - location: 13 (remaining gas: 1039985.471 units remaining) - [ 1 @parameter ] - - location: 12 (remaining gas: 1039985.401 units remaining) + - location: 11 (remaining gas: 1039985.791 units remaining) + [ (Pair 1 "hello" 0) ] + - location: 13 (remaining gas: 1039985.711 units remaining) [ 1 @parameter ] - - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 0) @storage - 1 @parameter ] - - location: 15 (remaining gas: 1039985.201 units remaining) + - location: 15 (remaining gas: 1039985.631 units remaining) [ (Pair "hello" 0) @storage (Pair "hello" 0) @storage 1 @parameter ] - - location: 16 (remaining gas: 1039985.061 units remaining) + - location: 16 (remaining gas: 1039985.551 units remaining) [ 0 (Pair "hello" 0) @storage 1 @parameter ] - - location: 17 (remaining gas: 1039984.921 units remaining) + - location: 17 (remaining gas: 1039985.471 units remaining) [ (Pair "hello" 0) @storage 1 @parameter ] - - location: 18 (remaining gas: 1039984.781 units remaining) + - location: 18 (remaining gas: 1039985.391 units remaining) [ "hello" @storage.s 1 @parameter ] - - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 1) @storage ] - - location: -1 (remaining gas: 1039984.571 units remaining) + - location: 19 (remaining gas: 1039985.311 units remaining) [ (Pair "hello" 1) @storage ] - - location: 20 (remaining gas: 1039984.431 units remaining) + - location: 20 (remaining gas: 1039985.231 units remaining) [ {} (Pair "hello" 1) @storage ] - - location: 22 (remaining gas: 1039984.291 units remaining) - [ (Pair {} "hello" 1) ] - - location: -1 (remaining gas: 1039984.221 units remaining) + - location: 22 (remaining gas: 1039985.151 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 90f24907b12532965c5f6b7d56d86968477a870e..d1eb90d18c8ae7bd4a50a2b4c3e6423d3f787459 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,44 +7,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039986.051 units remaining) + - location: 9 (remaining gas: 1039986.051 units remaining) [ (Pair 3 "hello" 500) ] - - location: 9 (remaining gas: 1039985.911 units remaining) + - location: 9 (remaining gas: 1039985.971 units remaining) [ (Pair 3 "hello" 500) (Pair 3 "hello" 500) ] - - location: 10 (remaining gas: 1039985.771 units remaining) + - location: 10 (remaining gas: 1039985.891 units remaining) [ (Pair "hello" 500) @storage (Pair 3 "hello" 500) ] - - location: 13 (remaining gas: 1039985.471 units remaining) - [ 3 @parameter ] - - location: 12 (remaining gas: 1039985.401 units remaining) + - location: 11 (remaining gas: 1039985.791 units remaining) + [ (Pair 3 "hello" 500) ] + - location: 13 (remaining gas: 1039985.711 units remaining) [ 3 @parameter ] - - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 500) @storage - 3 @parameter ] - - location: 15 (remaining gas: 1039985.201 units remaining) + - location: 15 (remaining gas: 1039985.631 units remaining) [ (Pair "hello" 500) @storage (Pair "hello" 500) @storage 3 @parameter ] - - location: 16 (remaining gas: 1039985.061 units remaining) + - location: 16 (remaining gas: 1039985.551 units remaining) [ 500 (Pair "hello" 500) @storage 3 @parameter ] - - location: 17 (remaining gas: 1039984.921 units remaining) + - location: 17 (remaining gas: 1039985.471 units remaining) [ (Pair "hello" 500) @storage 3 @parameter ] - - location: 18 (remaining gas: 1039984.781 units remaining) + - location: 18 (remaining gas: 1039985.391 units remaining) [ "hello" @storage.s 3 @parameter ] - - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 3) @storage ] - - location: -1 (remaining gas: 1039984.571 units remaining) + - location: 19 (remaining gas: 1039985.311 units remaining) [ (Pair "hello" 3) @storage ] - - location: 20 (remaining gas: 1039984.431 units remaining) + - location: 20 (remaining gas: 1039985.231 units remaining) [ {} (Pair "hello" 3) @storage ] - - location: 22 (remaining gas: 1039984.291 units remaining) - [ (Pair {} "hello" 3) ] - - location: -1 (remaining gas: 1039984.221 units remaining) + - location: 22 (remaining gas: 1039985.151 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 e30541807548685f4e070310deecb08804d9ac1e..cfe7cc263b0b92769ab400ddf3aa9e495b365fa5 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,44 +7,37 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039986.051 units remaining) + - location: 9 (remaining gas: 1039986.051 units remaining) [ (Pair 100 "hello" 7) ] - - location: 9 (remaining gas: 1039985.911 units remaining) + - location: 9 (remaining gas: 1039985.971 units remaining) [ (Pair 100 "hello" 7) (Pair 100 "hello" 7) ] - - location: 10 (remaining gas: 1039985.771 units remaining) + - location: 10 (remaining gas: 1039985.891 units remaining) [ (Pair "hello" 7) @storage (Pair 100 "hello" 7) ] - - location: 13 (remaining gas: 1039985.471 units remaining) - [ 100 @parameter ] - - location: 12 (remaining gas: 1039985.401 units remaining) + - location: 11 (remaining gas: 1039985.791 units remaining) + [ (Pair 100 "hello" 7) ] + - location: 13 (remaining gas: 1039985.711 units remaining) [ 100 @parameter ] - - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 7) @storage - 100 @parameter ] - - location: 15 (remaining gas: 1039985.201 units remaining) + - location: 15 (remaining gas: 1039985.631 units remaining) [ (Pair "hello" 7) @storage (Pair "hello" 7) @storage 100 @parameter ] - - location: 16 (remaining gas: 1039985.061 units remaining) + - location: 16 (remaining gas: 1039985.551 units remaining) [ 7 (Pair "hello" 7) @storage 100 @parameter ] - - location: 17 (remaining gas: 1039984.921 units remaining) + - location: 17 (remaining gas: 1039985.471 units remaining) [ (Pair "hello" 7) @storage 100 @parameter ] - - location: 18 (remaining gas: 1039984.781 units remaining) + - location: 18 (remaining gas: 1039985.391 units remaining) [ "hello" @storage.s 100 @parameter ] - - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 100) @storage ] - - location: -1 (remaining gas: 1039984.571 units remaining) + - location: 19 (remaining gas: 1039985.311 units remaining) [ (Pair "hello" 100) @storage ] - - location: 20 (remaining gas: 1039984.431 units remaining) + - location: 20 (remaining gas: 1039985.231 units remaining) [ {} (Pair "hello" 100) @storage ] - - location: 22 (remaining gas: 1039984.291 units remaining) - [ (Pair {} "hello" 100) ] - - location: -1 (remaining gas: 1039984.221 units remaining) + - location: 22 (remaining gas: 1039985.151 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 81808359d9f2e88962dea6f14a08b30f45668132..03c85e76ff572dccad7f0d4e0b2e6975a3a83fb0 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039993.748 units remaining) + - location: 9 (remaining gas: 1039993.748 units remaining) [ (Pair { "a" ; "b" ; "c" } {}) ] - - location: 9 (remaining gas: 1039993.608 units remaining) + - location: 9 (remaining gas: 1039993.668 units remaining) [ { "a" ; "b" ; "c" } @parameter ] - - location: 10 (remaining gas: 1039993.468 units remaining) + - location: 10 (remaining gas: 1039993.588 units remaining) [ {} { "a" ; "b" ; "c" } @parameter ] - - location: 12 (remaining gas: 1039993.328 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] - - location: -1 (remaining gas: 1039993.258 units remaining) + - location: 12 (remaining gas: 1039993.508 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 752b64b9259f4c51599b4dfe04095f93616dc4b3..6afcee1d024ab397b895b234404113dacf4337f2 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039994.151 units remaining) + - location: 9 (remaining gas: 1039994.151 units remaining) [ (Pair { "asdf" ; "bcde" } {}) ] - - location: 9 (remaining gas: 1039994.011 units remaining) + - location: 9 (remaining gas: 1039994.071 units remaining) [ { "asdf" ; "bcde" } @parameter ] - - location: 10 (remaining gas: 1039993.871 units remaining) + - location: 10 (remaining gas: 1039993.991 units remaining) [ {} { "asdf" ; "bcde" } @parameter ] - - location: 12 (remaining gas: 1039993.731 units remaining) - [ (Pair {} { "asdf" ; "bcde" }) ] - - location: -1 (remaining gas: 1039993.661 units remaining) + - location: 12 (remaining gas: 1039993.911 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 fbfd815d55587bdb15c4347994ecdc9c40dbfd30..a62e238abafd464abf3a1938600b880dabcafacf 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,15 +7,13 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039995.020 units remaining) + - location: 9 (remaining gas: 1039995.020 units remaining) [ (Pair {} {}) ] - - location: 9 (remaining gas: 1039994.880 units remaining) + - location: 9 (remaining gas: 1039994.940 units remaining) [ {} @parameter ] - - location: 10 (remaining gas: 1039994.740 units remaining) + - location: 10 (remaining gas: 1039994.860 units remaining) [ {} {} @parameter ] - - location: 12 (remaining gas: 1039994.600 units remaining) - [ (Pair {} {}) ] - - location: -1 (remaining gas: 1039994.530 units remaining) + - location: 12 (remaining gas: 1039994.780 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 ce525432f6ebef5358794e2d603b0479da3c8941..ec65ff543643abd53556f2ec5dff9dd538a8d730 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,39 +7,27 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039990.050 units remaining) + - location: 8 (remaining gas: 1039990.050 units remaining) [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039989.910 units remaining) + - location: 8 (remaining gas: 1039989.970 units remaining) [ { -100 ; 1 ; 2 ; 3 } @parameter ] - - location: 9 (remaining gas: 1039989.770 units remaining) + - location: 9 (remaining gas: 1039989.890 units remaining) [ 0 { -100 ; 1 ; 2 ; 3 } @parameter ] - - location: 12 (remaining gas: 1039989.640 units remaining) + - location: 12 (remaining gas: 1039989.820 units remaining) [ { -100 ; 1 ; 2 ; 3 } @parameter 0 ] - - location: 15 (remaining gas: 1039989.216 units remaining) + - location: 15 (remaining gas: 1039989.516 units remaining) [ -100 ] - - location: 14 (remaining gas: 1039989.146 units remaining) - [ -100 ] - - location: 15 (remaining gas: 1039989.006 units remaining) - [ -99 ] - - location: 14 (remaining gas: 1039988.936 units remaining) + - location: 15 (remaining gas: 1039989.436 units remaining) [ -99 ] - - location: 15 (remaining gas: 1039988.796 units remaining) - [ -97 ] - - location: 14 (remaining gas: 1039988.726 units remaining) + - location: 15 (remaining gas: 1039989.356 units remaining) [ -97 ] - - location: 15 (remaining gas: 1039988.586 units remaining) + - location: 15 (remaining gas: 1039989.276 units remaining) [ -94 ] - - location: 14 (remaining gas: 1039988.516 units remaining) - [ -94 ] - - location: 13 (remaining gas: 1039988.516 units remaining) - [ -94 ] - - location: 16 (remaining gas: 1039988.376 units remaining) + - location: 16 (remaining gas: 1039989.196 units remaining) [ {} -94 ] - - location: 18 (remaining gas: 1039988.236 units remaining) - [ (Pair {} -94) ] - - location: -1 (remaining gas: 1039988.166 units remaining) + - location: 18 (remaining gas: 1039989.116 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 1d0194349a3803d6ea7da534434fd33afa41706d..0005887144cd4de97e4738f495f23fb01aa30959 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,27 +7,21 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.460 units remaining) + - location: 8 (remaining gas: 1039991.460 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039991.320 units remaining) + - location: 8 (remaining gas: 1039991.380 units remaining) [ { 1 } @parameter ] - - location: 9 (remaining gas: 1039991.180 units remaining) + - location: 9 (remaining gas: 1039991.300 units remaining) [ 0 { 1 } @parameter ] - - location: 12 (remaining gas: 1039991.050 units remaining) + - location: 12 (remaining gas: 1039991.230 units remaining) [ { 1 } @parameter 0 ] - - location: 15 (remaining gas: 1039990.734 units remaining) + - location: 15 (remaining gas: 1039991.034 units remaining) [ 1 ] - - location: 14 (remaining gas: 1039990.664 units remaining) - [ 1 ] - - location: 13 (remaining gas: 1039990.664 units remaining) - [ 1 ] - - location: 16 (remaining gas: 1039990.524 units remaining) + - location: 16 (remaining gas: 1039990.954 units remaining) [ {} 1 ] - - location: 18 (remaining gas: 1039990.384 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039990.314 units remaining) + - location: 18 (remaining gas: 1039990.874 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 2d684bbc214ea1d68eb7e48575647fd7b40f7274..e02ee8db691e5c82806f7f4a421a8b7ef51cc335 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,23 +7,19 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.780 units remaining) + - location: 8 (remaining gas: 1039991.780 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039991.640 units remaining) + - location: 8 (remaining gas: 1039991.700 units remaining) [ {} @parameter ] - - location: 9 (remaining gas: 1039991.500 units remaining) + - location: 9 (remaining gas: 1039991.620 units remaining) [ 0 {} @parameter ] - - location: 12 (remaining gas: 1039991.370 units remaining) + - location: 12 (remaining gas: 1039991.550 units remaining) [ {} @parameter 0 ] - - location: 13 (remaining gas: 1039991.230 units remaining) - [ 0 ] - - location: 16 (remaining gas: 1039991.090 units remaining) + - location: 16 (remaining gas: 1039991.390 units remaining) [ {} 0 ] - - location: 18 (remaining gas: 1039990.950 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039990.880 units remaining) + - location: 18 (remaining gas: 1039991.310 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 5fce395a2d52437fc4975eee93ae1a93cdbd0a50..b4a48e80084a2f143bbd54ecf1de2ae2de0e2d63 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,62 +7,48 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039980.147 units remaining) + - location: 11 (remaining gas: 1039980.147 units remaining) [ (Pair "" { "Hello" ; "World" } None) ] - - location: 11 (remaining gas: 1039980.007 units remaining) + - location: 11 (remaining gas: 1039980.067 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 12 (remaining gas: 1039979.867 units remaining) + - location: 12 (remaining gas: 1039979.987 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 13 (remaining gas: 1039979.727 units remaining) + - location: 13 (remaining gas: 1039979.907 units remaining) [ "" @parameter (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: 17 (remaining gas: 1039979.367 units remaining) - [ (Pair { "Hello" ; "World" } None) @storage - (Pair "" { "Hello" ; "World" } None) ] - - location: 18 (remaining gas: 1039979.227 units remaining) - [ { "Hello" ; "World" } + - location: 14 (remaining gas: 1039979.807 units remaining) + [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - - location: -1 (remaining gas: 1039979.157 units remaining) - [ { "Hello" ; "World" } + - location: 17 (remaining gas: 1039979.727 units remaining) + [ (Pair { "Hello" ; "World" } None) @storage (Pair "" { "Hello" ; "World" } None) ] - - location: 15 (remaining gas: 1039979.087 units remaining) + - location: 18 (remaining gas: 1039979.647 units remaining) [ { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - - location: 14 (remaining gas: 1039979.087 units remaining) - [ "" @parameter - { "Hello" ; "World" } - (Pair "" { "Hello" ; "World" } None) ] - - location: 19 (remaining gas: 1039978.947 units remaining) + - location: 19 (remaining gas: 1039979.567 units remaining) [ False (Pair "" { "Hello" ; "World" } None) ] - - location: 20 (remaining gas: 1039978.807 units remaining) + - location: 20 (remaining gas: 1039979.487 units remaining) [ (Some False) (Pair "" { "Hello" ; "World" } None) ] - - location: 24 (remaining gas: 1039978.447 units remaining) + - location: 21 (remaining gas: 1039979.387 units remaining) + [ (Pair "" { "Hello" ; "World" } None) ] + - location: 24 (remaining gas: 1039979.307 units remaining) [ (Pair { "Hello" ; "World" } None) @storage ] - - location: 25 (remaining gas: 1039978.307 units remaining) - [ { "Hello" ; "World" } ] - - location: -1 (remaining gas: 1039978.237 units remaining) + - location: 25 (remaining gas: 1039979.227 units remaining) [ { "Hello" ; "World" } ] - - location: 22 (remaining gas: 1039978.167 units remaining) - [ { "Hello" ; "World" } ] - - location: 21 (remaining gas: 1039978.167 units remaining) - [ (Some False) - { "Hello" ; "World" } ] - - location: 26 (remaining gas: 1039978.037 units remaining) + - location: 26 (remaining gas: 1039979.157 units remaining) [ { "Hello" ; "World" } (Some False) ] - - location: 27 (remaining gas: 1039977.897 units remaining) + - location: 27 (remaining gas: 1039979.077 units remaining) [ (Pair { "Hello" ; "World" } (Some False)) ] - - location: 28 (remaining gas: 1039977.757 units remaining) + - location: 28 (remaining gas: 1039978.997 units remaining) [ {} (Pair { "Hello" ; "World" } (Some False)) ] - - location: 30 (remaining gas: 1039977.617 units remaining) - [ (Pair {} { "Hello" ; "World" } (Some False)) ] - - location: -1 (remaining gas: 1039977.547 units remaining) + - location: 30 (remaining gas: 1039978.917 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 85bc7a391f23751039414e450b1e99ca9698a0f0..f04bda89b875c2196cc6445b5ea8fffbc4c46ed0 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,62 +7,48 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039980.662 units remaining) + - location: 11 (remaining gas: 1039980.662 units remaining) [ (Pair "Hi" { "Hi" } None) ] - - location: 11 (remaining gas: 1039980.522 units remaining) + - location: 11 (remaining gas: 1039980.582 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 12 (remaining gas: 1039980.382 units remaining) + - location: 12 (remaining gas: 1039980.502 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 13 (remaining gas: 1039980.242 units remaining) + - location: 13 (remaining gas: 1039980.422 units remaining) [ "Hi" @parameter (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: 17 (remaining gas: 1039979.882 units remaining) - [ (Pair { "Hi" } None) @storage - (Pair "Hi" { "Hi" } None) ] - - location: 18 (remaining gas: 1039979.742 units remaining) - [ { "Hi" } + - location: 14 (remaining gas: 1039980.322 units remaining) + [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - - location: -1 (remaining gas: 1039979.672 units remaining) - [ { "Hi" } + - location: 17 (remaining gas: 1039980.242 units remaining) + [ (Pair { "Hi" } None) @storage (Pair "Hi" { "Hi" } None) ] - - location: 15 (remaining gas: 1039979.602 units remaining) + - location: 18 (remaining gas: 1039980.162 units remaining) [ { "Hi" } (Pair "Hi" { "Hi" } None) ] - - location: 14 (remaining gas: 1039979.602 units remaining) - [ "Hi" @parameter - { "Hi" } - (Pair "Hi" { "Hi" } None) ] - - location: 19 (remaining gas: 1039979.462 units remaining) + - location: 19 (remaining gas: 1039980.082 units remaining) [ True (Pair "Hi" { "Hi" } None) ] - - location: 20 (remaining gas: 1039979.322 units remaining) + - location: 20 (remaining gas: 1039980.002 units remaining) [ (Some True) (Pair "Hi" { "Hi" } None) ] - - location: 24 (remaining gas: 1039978.962 units remaining) + - location: 21 (remaining gas: 1039979.902 units remaining) + [ (Pair "Hi" { "Hi" } None) ] + - location: 24 (remaining gas: 1039979.822 units remaining) [ (Pair { "Hi" } None) @storage ] - - location: 25 (remaining gas: 1039978.822 units remaining) - [ { "Hi" } ] - - location: -1 (remaining gas: 1039978.752 units remaining) + - location: 25 (remaining gas: 1039979.742 units remaining) [ { "Hi" } ] - - location: 22 (remaining gas: 1039978.682 units remaining) - [ { "Hi" } ] - - location: 21 (remaining gas: 1039978.682 units remaining) - [ (Some True) - { "Hi" } ] - - location: 26 (remaining gas: 1039978.552 units remaining) + - location: 26 (remaining gas: 1039979.672 units remaining) [ { "Hi" } (Some True) ] - - location: 27 (remaining gas: 1039978.412 units remaining) + - location: 27 (remaining gas: 1039979.592 units remaining) [ (Pair { "Hi" } (Some True)) ] - - location: 28 (remaining gas: 1039978.272 units remaining) + - location: 28 (remaining gas: 1039979.512 units remaining) [ {} (Pair { "Hi" } (Some True)) ] - - location: 30 (remaining gas: 1039978.132 units remaining) - [ (Pair {} { "Hi" } (Some True)) ] - - location: -1 (remaining gas: 1039978.062 units remaining) + - location: 30 (remaining gas: 1039979.432 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 a86af8deacf9d7cb78ab408e2d1d65e51a57dd92..d263fab824472118d149fe4d98c1700c9e294056 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,62 +7,48 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039981.016 units remaining) + - location: 11 (remaining gas: 1039981.016 units remaining) [ (Pair "Hi" {} None) ] - - location: 11 (remaining gas: 1039980.876 units remaining) + - location: 11 (remaining gas: 1039980.936 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 12 (remaining gas: 1039980.736 units remaining) + - location: 12 (remaining gas: 1039980.856 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 13 (remaining gas: 1039980.596 units remaining) + - location: 13 (remaining gas: 1039980.776 units remaining) [ "Hi" @parameter (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: 17 (remaining gas: 1039980.236 units remaining) - [ (Pair {} None) @storage - (Pair "Hi" {} None) ] - - location: 18 (remaining gas: 1039980.096 units remaining) - [ {} + - location: 14 (remaining gas: 1039980.676 units remaining) + [ (Pair "Hi" {} None) (Pair "Hi" {} None) ] - - location: -1 (remaining gas: 1039980.026 units remaining) - [ {} + - location: 17 (remaining gas: 1039980.596 units remaining) + [ (Pair {} None) @storage (Pair "Hi" {} None) ] - - location: 15 (remaining gas: 1039979.956 units remaining) + - location: 18 (remaining gas: 1039980.516 units remaining) [ {} (Pair "Hi" {} None) ] - - location: 14 (remaining gas: 1039979.956 units remaining) - [ "Hi" @parameter - {} - (Pair "Hi" {} None) ] - - location: 19 (remaining gas: 1039979.816 units remaining) + - location: 19 (remaining gas: 1039980.436 units remaining) [ False (Pair "Hi" {} None) ] - - location: 20 (remaining gas: 1039979.676 units remaining) + - location: 20 (remaining gas: 1039980.356 units remaining) [ (Some False) (Pair "Hi" {} None) ] - - location: 24 (remaining gas: 1039979.316 units remaining) + - location: 21 (remaining gas: 1039980.256 units remaining) + [ (Pair "Hi" {} None) ] + - location: 24 (remaining gas: 1039980.176 units remaining) [ (Pair {} None) @storage ] - - location: 25 (remaining gas: 1039979.176 units remaining) - [ {} ] - - location: -1 (remaining gas: 1039979.106 units remaining) + - location: 25 (remaining gas: 1039980.096 units remaining) [ {} ] - - location: 22 (remaining gas: 1039979.036 units remaining) - [ {} ] - - location: 21 (remaining gas: 1039979.036 units remaining) - [ (Some False) - {} ] - - location: 26 (remaining gas: 1039978.906 units remaining) + - location: 26 (remaining gas: 1039980.026 units remaining) [ {} (Some False) ] - - location: 27 (remaining gas: 1039978.766 units remaining) + - location: 27 (remaining gas: 1039979.946 units remaining) [ (Pair {} (Some False)) ] - - location: 28 (remaining gas: 1039978.626 units remaining) + - location: 28 (remaining gas: 1039979.866 units remaining) [ {} (Pair {} (Some False)) ] - - location: 30 (remaining gas: 1039978.486 units remaining) - [ (Pair {} {} (Some False)) ] - - location: -1 (remaining gas: 1039978.416 units remaining) + - location: 30 (remaining gas: 1039979.786 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 f641cc926c4fd659da090eaa4c7699f2b6a263a5..fe553ea21aef40a9bbbc6bae996a0d8977340188 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039991.900 units remaining) + - location: 8 (remaining gas: 1039991.900 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - - location: 8 (remaining gas: 1039991.760 units remaining) + - location: 8 (remaining gas: 1039991.820 units remaining) [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] - - location: 9 (remaining gas: 1039991.620 units remaining) + - location: 9 (remaining gas: 1039991.740 units remaining) [ 6 ] - - location: 10 (remaining gas: 1039991.480 units remaining) + - location: 10 (remaining gas: 1039991.660 units remaining) [ {} 6 ] - - location: 12 (remaining gas: 1039991.340 units remaining) - [ (Pair {} 6) ] - - location: -1 (remaining gas: 1039991.270 units remaining) + - location: 12 (remaining gas: 1039991.580 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 99a0329dc37cf77f51e93b3ef782ea218f3746c5..0c45ee9dd02704c25244a988a388344296b50e67 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.310 units remaining) + - location: 8 (remaining gas: 1039993.310 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - - location: 8 (remaining gas: 1039993.170 units remaining) + - location: 8 (remaining gas: 1039993.230 units remaining) [ { 1 ; 2 ; 3 } @parameter ] - - location: 9 (remaining gas: 1039993.030 units remaining) + - location: 9 (remaining gas: 1039993.150 units remaining) [ 3 ] - - location: 10 (remaining gas: 1039992.890 units remaining) + - location: 10 (remaining gas: 1039993.070 units remaining) [ {} 3 ] - - location: 12 (remaining gas: 1039992.750 units remaining) - [ (Pair {} 3) ] - - location: -1 (remaining gas: 1039992.680 units remaining) + - location: 12 (remaining gas: 1039992.990 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 bb0aef40bd8aab8ba8c5311da638feab183c60b3..1a89f57f4906cd1b0ffe5069adc02d430b3829bb 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.250 units remaining) + - location: 8 (remaining gas: 1039994.250 units remaining) [ (Pair { 1 } 111) ] - - location: 8 (remaining gas: 1039994.110 units remaining) + - location: 8 (remaining gas: 1039994.170 units remaining) [ { 1 } @parameter ] - - location: 9 (remaining gas: 1039993.970 units remaining) + - location: 9 (remaining gas: 1039994.090 units remaining) [ 1 ] - - location: 10 (remaining gas: 1039993.830 units remaining) + - location: 10 (remaining gas: 1039994.010 units remaining) [ {} 1 ] - - location: 12 (remaining gas: 1039993.690 units remaining) - [ (Pair {} 1) ] - - location: -1 (remaining gas: 1039993.620 units remaining) + - location: 12 (remaining gas: 1039993.930 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 c6e7e5309aa75f2ed39911f380af582b480c2971..39de0988603241bc8d8956bd18586f5a1e2d79f5 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.570 units remaining) + - location: 8 (remaining gas: 1039994.570 units remaining) [ (Pair {} 111) ] - - location: 8 (remaining gas: 1039994.430 units remaining) + - location: 8 (remaining gas: 1039994.490 units remaining) [ {} @parameter ] - - location: 9 (remaining gas: 1039994.290 units remaining) + - location: 9 (remaining gas: 1039994.410 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039994.150 units remaining) + - location: 10 (remaining gas: 1039994.330 units remaining) [ {} 0 ] - - location: 12 (remaining gas: 1039994.010 units remaining) - [ (Pair {} 0) ] - - location: -1 (remaining gas: 1039993.940 units remaining) + - location: 12 (remaining gas: 1039994.250 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 b5a76591fb5554e4cee9a176e7410a767190da50..5225cc608a8d91ec514452b3b5909d40769289ef 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,21 +7,18 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039993.690 units remaining) + - location: 8 (remaining gas: 1039993.690 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - - location: 8 (remaining gas: 1039993.550 units remaining) + - location: 8 (remaining gas: 1039993.610 units remaining) [ 0x48656c6c6f2c20776f726c6421 @parameter ] - - location: 9 (remaining gas: 1039991.674 units remaining) + - location: 9 (remaining gas: 1039991.794 units remaining) [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] - - location: 10 (remaining gas: 1039991.534 units remaining) + - location: 10 (remaining gas: 1039991.714 units remaining) [ (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - - location: 11 (remaining gas: 1039991.394 units remaining) + - location: 11 (remaining gas: 1039991.634 units remaining) [ {} (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - - location: 13 (remaining gas: 1039991.254 units remaining) - [ (Pair {} - (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)) ] - - location: -1 (remaining gas: 1039991.184 units remaining) + - location: 13 (remaining gas: 1039991.554 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 b8f6a0f7dd03daa58305654a38f1b3bc8c3544d7..8fb5cd0aa7081e6a24bedba19a7a37a12b42ab5d 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Left (Pair 0 0)) @parameter ] - - location: 17 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 0 0) @parameter.left ] + - location: 17 (remaining gas: 1039988.570 units remaining) [ 0 0 ] - - location: 18 (remaining gas: 1039988.180 units remaining) + - location: 18 (remaining gas: 1039988.420 units remaining) [ 0 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 0 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 7af8cacdfb8dc48aa25332ab9eeda602a65be785..fe63ab520c0772b876024bbfba47349fa51d8fb7 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Left (Pair 0 1)) @parameter ] - - location: 17 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 0 1) @parameter.left ] + - location: 17 (remaining gas: 1039988.570 units remaining) [ 0 1 ] - - location: 18 (remaining gas: 1039988.180 units remaining) + - location: 18 (remaining gas: 1039988.420 units remaining) [ 0 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 0 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 88872a209374adbee3bb6577d562d77394024523..ce42fc5ea2868fc57c0bfea71178bb4975cf73ee 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Left (Pair 1 2)) @parameter ] - - location: 17 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 1 2) @parameter.left ] + - location: 17 (remaining gas: 1039988.570 units remaining) [ 1 2 ] - - location: 18 (remaining gas: 1039988.180 units remaining) + - location: 18 (remaining gas: 1039988.420 units remaining) [ 4 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 4 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 4)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 569053fe5b80a306acab8bfa5d4fe58d5a24ce2f..08099ccb63db8d132b058b4a1ec2ca3eac297b8c 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Left (Pair 15 2)) @parameter ] - - location: 17 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 15 2) @parameter.left ] + - location: 17 (remaining gas: 1039988.570 units remaining) [ 15 2 ] - - location: 18 (remaining gas: 1039988.180 units remaining) + - location: 18 (remaining gas: 1039988.420 units remaining) [ 60 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 60 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 60) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 60) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 60)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 d0f29922302841fb449b47d82e65b981550f1af3..47ef0d1afa904f33e339385de8ec80f3e4293095 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Left (Pair 8 1)) @parameter ] - - location: 17 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 8 1) @parameter.left ] + - location: 17 (remaining gas: 1039988.570 units remaining) [ 8 1 ] - - location: 18 (remaining gas: 1039988.180 units remaining) + - location: 18 (remaining gas: 1039988.420 units remaining) [ 16 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 16 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 16) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 16) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 16)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 af25e29cb48306c49bb91a85a9a61ac9de449bea..af0fc663e792796aa2bcf933176a6305fe5a2281 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Right (Pair 0 0)) @parameter ] - - location: 20 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 0 0) @parameter.right ] + - location: 20 (remaining gas: 1039988.570 units remaining) [ 0 0 ] - - location: 21 (remaining gas: 1039988.180 units remaining) + - location: 21 (remaining gas: 1039988.420 units remaining) [ 0 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 0 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 927a77656a06e039e0aaf21ae4d49558bb1ce82e..852fcecc5e8583623732f06f51d3c86153a0fa0a 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Right (Pair 0 1)) @parameter ] - - location: 20 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 0 1) @parameter.right ] + - location: 20 (remaining gas: 1039988.570 units remaining) [ 0 1 ] - - location: 21 (remaining gas: 1039988.180 units remaining) + - location: 21 (remaining gas: 1039988.420 units remaining) [ 0 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 0 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 30f8b88d7e0e994cae9d694cd11f54bb591f7243..62374d7a8cc5d7267ef9ff87f21d116999362624 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Right (Pair 1 2)) @parameter ] - - location: 20 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 1 2) @parameter.right ] + - location: 20 (remaining gas: 1039988.570 units remaining) [ 1 2 ] - - location: 21 (remaining gas: 1039988.180 units remaining) + - location: 21 (remaining gas: 1039988.420 units remaining) [ 0 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 0 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 0)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 b5e0abee9459f05553012164a7534408b49fdf8a..6abcc1b396ee56114be78b1edc3ddb173c93a449 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Right (Pair 15 2)) @parameter ] - - location: 20 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 15 2) @parameter.right ] + - location: 20 (remaining gas: 1039988.570 units remaining) [ 15 2 ] - - location: 21 (remaining gas: 1039988.180 units remaining) + - location: 21 (remaining gas: 1039988.420 units remaining) [ 3 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 3 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 3) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 3) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 3)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 45226de767465ab1ac0d9b020e8e323b79725f31..e7c9dd1e0adcae58baff414a8d54712a43e9eba4 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,22 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039988.820 units remaining) + - location: 14 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039988.680 units remaining) + - location: 14 (remaining gas: 1039988.740 units remaining) [ (Right (Pair 8 1)) @parameter ] - - location: 20 (remaining gas: 1039988.390 units remaining) + - location: 15 (remaining gas: 1039988.650 units remaining) + [ (Pair 8 1) @parameter.right ] + - location: 20 (remaining gas: 1039988.570 units remaining) [ 8 1 ] - - location: 21 (remaining gas: 1039988.180 units remaining) + - location: 21 (remaining gas: 1039988.420 units remaining) [ 4 ] - - location: -1 (remaining gas: 1039988.110 units remaining) - [ 4 ] - - location: 22 (remaining gas: 1039987.970 units remaining) + - location: 22 (remaining gas: 1039988.340 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039987.830 units remaining) + - location: 23 (remaining gas: 1039988.260 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039987.690 units remaining) - [ (Pair {} (Some 4)) ] - - location: -1 (remaining gas: 1039987.620 units remaining) + - location: 25 (remaining gas: 1039988.180 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 514549d1b36064de3fc84c76a40928d3cf0cf94e..c21aaef97d32c92cd3f4c65e3e30e05a4241eae6 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,27 +7,23 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.315 units remaining) + - location: 10 (remaining gas: 1039988.315 units remaining) [ (Pair (Pair 0 0) None) ] - - location: 10 (remaining gas: 1039988.175 units remaining) + - location: 10 (remaining gas: 1039988.235 units remaining) [ (Pair 0 0) @parameter None @storage ] - - location: 11 (remaining gas: 1039988.045 units remaining) + - location: 11 (remaining gas: 1039988.165 units remaining) [ None @storage (Pair 0 0) @parameter ] - - location: 15 (remaining gas: 1039987.705 units remaining) + - location: 13 (remaining gas: 1039988.085 units remaining) + [ (Pair 0 0) @parameter ] + - location: 15 (remaining gas: 1039988.005 units remaining) [ ] - - location: 16 (remaining gas: 1039987.565 units remaining) + - location: 16 (remaining gas: 1039987.925 units remaining) [ None ] - - location: -1 (remaining gas: 1039987.495 units remaining) - [ None ] - - location: 12 (remaining gas: 1039987.425 units remaining) - [ None ] - - location: 22 (remaining gas: 1039987.285 units remaining) + - location: 22 (remaining gas: 1039987.845 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039987.145 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039987.075 units remaining) + - location: 24 (remaining gas: 1039987.765 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 008950114a4104e8872d194d87c249ba68050307..bc30ee00ddc85c02e589afdd116ed27190c4d62b 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 0) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 0 0) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 0 0) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 0 0) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 0 0) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 0 0 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "") @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "") @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ (Some "") ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} (Some "") ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} (Some "")) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 1d5bdf7cf9732d22207f32d7e2c17ad9027ca30c..f4bd1c045927383dcafdba88bee2d2a3a71a32fd 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 10) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 0 10) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 0 10) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 0 10) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 0 10) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 0 10 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ None ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 4e81ce6193965bd031db1f6e2979dbab1a17cfb3..431c1081c119a9e1e1c5351ce110995e3a923451 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 2) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 0 2) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 0 2) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 0 2) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 0 2) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 0 2 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "Fo") @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "Fo") @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ (Some "Fo") ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} (Some "Fo") ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} (Some "Fo")) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 797b6e721bffe304876985923f1a0f1a291ebf13..817d6fc320f4681cfaaf316d470f028f31a5b60c 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 1 1) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 1 1) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 1 1) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 1 1) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 1 1) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 1 1 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "o") @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "o") @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ (Some "o") ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} (Some "o") ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} (Some "o")) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 0ee9f112b7a1ed015ba2c5e41b6533bd5543f7f1..808e8a89d024a9b1c9372c999ef51963bda549f5 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 1 3) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 1 3) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 1 3) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 1 3) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 1 3) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 1 3 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ None ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 943ef227376714922a042c0ceed5fe66e5848e4c..856021442193f6940ad8e01d12ed6e37e369517c 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.031 units remaining) + - location: 10 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 10 5) (Some "Foo")) ] - - location: 10 (remaining gas: 1039987.891 units remaining) + - location: 10 (remaining gas: 1039987.951 units remaining) [ (Pair 10 5) @parameter (Some "Foo") @storage ] - - location: 11 (remaining gas: 1039987.761 units remaining) + - location: 11 (remaining gas: 1039987.881 units remaining) [ (Some "Foo") @storage (Pair 10 5) @parameter ] - - location: 19 (remaining gas: 1039987.431 units remaining) + - location: 13 (remaining gas: 1039987.801 units remaining) + [ "Foo" @storage.some + (Pair 10 5) @parameter ] + - location: 19 (remaining gas: 1039987.731 units remaining) [ (Pair 10 5) @parameter "Foo" @storage.some ] - - location: 20 (remaining gas: 1039987.291 units remaining) + - location: 20 (remaining gas: 1039987.651 units remaining) [ 10 5 "Foo" @storage.some ] - - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039987.011 units remaining) + - location: 21 (remaining gas: 1039987.571 units remaining) [ None ] - - location: 22 (remaining gas: 1039986.871 units remaining) + - location: 22 (remaining gas: 1039987.491 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039986.731 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039986.661 units remaining) + - location: 24 (remaining gas: 1039987.411 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 4c024a25b0b5af8bc9255c956c8edf220d5b5958..52d244dac6123631c70a857f8fe510580dff5882 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,33 +7,30 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039928.061 units remaining) + - location: 10 (remaining gas: 1039928.061 units remaining) [ (Pair (Pair 1 10000) (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] - - location: 10 (remaining gas: 1039927.921 units remaining) + - location: 10 (remaining gas: 1039927.981 units remaining) [ (Pair 1 10000) @parameter (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage ] - - location: 11 (remaining gas: 1039927.791 units remaining) + - location: 11 (remaining gas: 1039927.911 units remaining) [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage (Pair 1 10000) @parameter ] - - location: 19 (remaining gas: 1039927.461 units remaining) + - location: 13 (remaining gas: 1039927.831 units remaining) + [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some + (Pair 1 10000) @parameter ] + - location: 19 (remaining gas: 1039927.761 units remaining) [ (Pair 1 10000) @parameter "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] - - location: 20 (remaining gas: 1039927.321 units remaining) + - location: 20 (remaining gas: 1039927.681 units remaining) [ 1 10000 "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] - - location: 21 (remaining gas: 1039926.806 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039926.736 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039926.666 units remaining) + - location: 21 (remaining gas: 1039927.226 units remaining) [ None ] - - location: 22 (remaining gas: 1039926.526 units remaining) + - location: 22 (remaining gas: 1039927.146 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039926.386 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039926.316 units remaining) + - location: 24 (remaining gas: 1039927.066 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 7acfc36720ef59c084d08ce35f00ef4fa622d937..bddc9caac7046dec1831ce342a2914c02333e469 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,27 +7,23 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.315 units remaining) + - location: 10 (remaining gas: 1039988.315 units remaining) [ (Pair (Pair 0 1) None) ] - - location: 10 (remaining gas: 1039988.175 units remaining) + - location: 10 (remaining gas: 1039988.235 units remaining) [ (Pair 0 1) @parameter None @storage ] - - location: 11 (remaining gas: 1039988.045 units remaining) + - location: 11 (remaining gas: 1039988.165 units remaining) [ None @storage (Pair 0 1) @parameter ] - - location: 15 (remaining gas: 1039987.705 units remaining) + - location: 13 (remaining gas: 1039988.085 units remaining) + [ (Pair 0 1) @parameter ] + - location: 15 (remaining gas: 1039988.005 units remaining) [ ] - - location: 16 (remaining gas: 1039987.565 units remaining) + - location: 16 (remaining gas: 1039987.925 units remaining) [ None ] - - location: -1 (remaining gas: 1039987.495 units remaining) - [ None ] - - location: 12 (remaining gas: 1039987.425 units remaining) - [ None ] - - location: 22 (remaining gas: 1039987.285 units remaining) + - location: 22 (remaining gas: 1039987.845 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039987.145 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039987.075 units remaining) + - location: 24 (remaining gas: 1039987.765 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 f936750d7a7b3f80311286cef5884cba16b23b80..395f0469915ae1992397ca10072787de3b6e2b5e 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 0 0) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 0 0) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 0 0) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 0 0) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 0 0 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0x) @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0x) @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ (Some 0x) ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} (Some 0x) ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} (Some 0x)) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 b06c993ff5389f6fb9f163ce97c93e4eedc005f9..ee5b7c72848342909956006aa23a5a2f2b4a1a24 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 0 1) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 0 1) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 0 1) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 0 1) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 0 1 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xaa) @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xaa) @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ (Some 0xaa) ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} (Some 0xaa) ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} (Some 0xaa)) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 975c7d8b3f73cbe284d19e3acae99540c4f55222..651b2bb7c6ad62146eee530da801cd1c6f91f5e7 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 1 1) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 1 1) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 1 1) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 1 1) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 1 1 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbb) @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbb) @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ (Some 0xbb) ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} (Some 0xbb) ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} (Some 0xbb)) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 03c5a705c9ca174193eb3e5cee2b0455191bcbd8..e2b8ddb6a553ff3249dfd6af09333dbd946ca3d6 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 1 1) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 1 1) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 1 1) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 1 1) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 1 1 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbb) @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbb) @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ (Some 0xbb) ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} (Some 0xbb) ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} (Some 0xbb)) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 85903d27cc50e9ce74dd2154d77535197e863f60..7c891c51bbe1d583f89cf7078c859a84d8f750c2 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 1 2) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 1 2) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 1 2) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 1 2) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 1 2 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbbcc) @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbbcc) @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ (Some 0xbbcc) ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} (Some 0xbbcc) ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} (Some 0xbbcc)) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 77831d407a98b10aa35dd7a2970f7759240d53e2..13e6015e1aae4531666f10ab0681b2e0463f6cd6 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,32 +7,29 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 1 3) @parameter (Some 0xaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbcc) @storage (Pair 1 3) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbcc @storage.some + (Pair 1 3) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 1 3) @parameter 0xaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 1 3 0xaabbcc @storage.some ] - - location: 21 (remaining gas: 1039987.195 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039987.125 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039987.055 units remaining) + - location: 21 (remaining gas: 1039987.615 units remaining) [ None ] - - location: 22 (remaining gas: 1039986.915 units remaining) + - location: 22 (remaining gas: 1039987.535 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039986.775 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039986.705 units remaining) + - location: 24 (remaining gas: 1039987.455 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 1e20ce18c446d46f92443f45f8d97f3da4907f87..81e480bb3b16a01c0a0201a109c143843376e30d 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,33 +7,30 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039988.075 units remaining) + - location: 10 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 10000) (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] - - location: 10 (remaining gas: 1039987.935 units remaining) + - location: 10 (remaining gas: 1039987.995 units remaining) [ (Pair 1 10000) @parameter (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage ] - - location: 11 (remaining gas: 1039987.805 units remaining) + - location: 11 (remaining gas: 1039987.925 units remaining) [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage (Pair 1 10000) @parameter ] - - location: 19 (remaining gas: 1039987.475 units remaining) + - location: 13 (remaining gas: 1039987.845 units remaining) + [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some + (Pair 1 10000) @parameter ] + - location: 19 (remaining gas: 1039987.775 units remaining) [ (Pair 1 10000) @parameter 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] - - location: 20 (remaining gas: 1039987.335 units remaining) + - location: 20 (remaining gas: 1039987.695 units remaining) [ 1 10000 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] - - location: 21 (remaining gas: 1039986.820 units remaining) - [ None @storage.some.slice ] - - location: -1 (remaining gas: 1039986.750 units remaining) - [ None @storage.some.slice ] - - location: 12 (remaining gas: 1039986.680 units remaining) + - location: 21 (remaining gas: 1039987.240 units remaining) [ None ] - - location: 22 (remaining gas: 1039986.540 units remaining) + - location: 22 (remaining gas: 1039987.160 units remaining) [ {} None ] - - location: 24 (remaining gas: 1039986.400 units remaining) - [ (Pair {} None) ] - - location: -1 (remaining gas: 1039986.330 units remaining) + - location: 24 (remaining gas: 1039987.080 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 d5ffa24502742a3124ea6a385e6246135d99b8e5..2b31b049e27ccf714cc2bc03253e840e0d00db49 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.376 units remaining) + - location: 8 (remaining gas: 1039994.376 units remaining) [ (Pair "Hello" None) ] - - location: 8 (remaining gas: 1039994.236 units remaining) + - location: 8 (remaining gas: 1039994.296 units remaining) [ "Hello" @parameter ] - - location: 9 (remaining gas: 1039994.096 units remaining) + - location: 9 (remaining gas: 1039994.216 units remaining) [ (Some "Hello") ] - - location: 10 (remaining gas: 1039993.956 units remaining) + - location: 10 (remaining gas: 1039994.136 units remaining) [ {} (Some "Hello") ] - - location: 12 (remaining gas: 1039993.816 units remaining) - [ (Pair {} (Some "Hello")) ] - - location: -1 (remaining gas: 1039993.746 units remaining) + - location: 12 (remaining gas: 1039994.056 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 f1a76c74d2864d13266eb264784dc761dcb33839..b09c931f54aa02da6ce1b1c36113f1d443a2720c 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,17 +7,15 @@ emitted operations big_map diff trace - - location: 7 (remaining gas: 1039994.386 units remaining) + - location: 8 (remaining gas: 1039994.386 units remaining) [ (Pair "abcd" None) ] - - location: 8 (remaining gas: 1039994.246 units remaining) + - location: 8 (remaining gas: 1039994.306 units remaining) [ "abcd" @parameter ] - - location: 9 (remaining gas: 1039994.106 units remaining) + - location: 9 (remaining gas: 1039994.226 units remaining) [ (Some "abcd") ] - - location: 10 (remaining gas: 1039993.966 units remaining) + - location: 10 (remaining gas: 1039994.146 units remaining) [ {} (Some "abcd") ] - - location: 12 (remaining gas: 1039993.826 units remaining) - [ (Pair {} (Some "abcd")) ] - - location: -1 (remaining gas: 1039993.756 units remaining) + - location: 12 (remaining gas: 1039994.066 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 7142350b5fd41958d3816b25197173492f578ece..80bc04e457cf77c4dd84da2171eb112e1cf1c43b 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:01:40Z" -100) @parameter (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" -100) @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ -100 ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ -100 ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:01:40Z" - -100 ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ "1970-01-01T00:03:20Z" ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} "1970-01-01T00:03:20Z" ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} "1970-01-01T00:03:20Z") ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 49a92fce50c1149bd285d6792196fdd7171c2805..c1e0445f268fc8a57cb0d5765807883ea237b56b 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:01:40Z" 100) @parameter (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 100) @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ 100 ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ 100 ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:01:40Z" - 100 ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ "1970-01-01T00:00:00Z" ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} "1970-01-01T00:00:00Z" ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} "1970-01-01T00:00:00Z") ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 f8a6e61ed8a475b719b6bc2588e07826cc7a4f0f..753e803d7541a15e742ed2e0cdeeec86b40ac7e7 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,30 +7,25 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039990.200 units remaining) + - location: 9 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] - - location: 9 (remaining gas: 1039990.060 units remaining) + - location: 9 (remaining gas: 1039990.120 units remaining) [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] - - location: 10 (remaining gas: 1039989.920 units remaining) + - location: 10 (remaining gas: 1039990.040 units remaining) [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] - - location: 11 (remaining gas: 1039989.780 units remaining) + - location: 11 (remaining gas: 1039989.960 units remaining) [ "1970-01-01T00:01:40Z" (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] - - location: 14 (remaining gas: 1039989.480 units remaining) - [ 2000000000000000000 ] - - location: 13 (remaining gas: 1039989.410 units remaining) + - location: 12 (remaining gas: 1039989.860 units remaining) + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + - location: 14 (remaining gas: 1039989.780 units remaining) [ 2000000000000000000 ] - - location: 12 (remaining gas: 1039989.410 units remaining) - [ "1970-01-01T00:01:40Z" - 2000000000000000000 ] - - location: 15 (remaining gas: 1039989.270 units remaining) + - location: 15 (remaining gas: 1039989.700 units remaining) [ -1999999999999999900 ] - - location: 16 (remaining gas: 1039989.130 units remaining) + - location: 16 (remaining gas: 1039989.620 units remaining) [ {} -1999999999999999900 ] - - location: 18 (remaining gas: 1039988.990 units remaining) - [ (Pair {} -1999999999999999900) ] - - location: -1 (remaining gas: 1039988.920 units remaining) + - location: 18 (remaining gas: 1039989.540 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 a54871f6577204f898ce487e031a752978b9f8ec..b0c68f8b5983faeace92d2af9fbbbc395ee7fd98 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,63 +7,51 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039981.110 units remaining) + - location: 12 (remaining gas: 1039981.110 units remaining) [ (Pair (Pair 2000000 1000000) None) ] - - location: 12 (remaining gas: 1039980.970 units remaining) + - location: 12 (remaining gas: 1039981.030 units remaining) [ (Pair 2000000 1000000) @parameter ] - - location: 13 (remaining gas: 1039980.830 units remaining) + - location: 13 (remaining gas: 1039980.950 units remaining) [ (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter ] - - location: 14 (remaining gas: 1039980.690 units remaining) + - location: 14 (remaining gas: 1039980.870 units remaining) [ (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter ] - - location: 15 (remaining gas: 1039980.550 units remaining) + - location: 15 (remaining gas: 1039980.790 units remaining) [ 2000000 (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter ] - - location: 18 (remaining gas: 1039980.250 units remaining) - [ 1000000 + - location: 16 (remaining gas: 1039980.690 units remaining) + [ (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter ] - - location: 17 (remaining gas: 1039980.180 units remaining) + - location: 18 (remaining gas: 1039980.610 units remaining) [ 1000000 (Pair 2000000 1000000) @parameter ] - - location: 16 (remaining gas: 1039980.180 units remaining) - [ 2000000 - 1000000 - (Pair 2000000 1000000) @parameter ] - - location: 19 (remaining gas: 1039980.020 units remaining) + - location: 19 (remaining gas: 1039980.510 units remaining) [ 3000000 (Pair 2000000 1000000) @parameter ] - - location: 22 (remaining gas: 1039979.720 units remaining) + - location: 20 (remaining gas: 1039980.410 units remaining) + [ (Pair 2000000 1000000) @parameter ] + - location: 22 (remaining gas: 1039980.330 units remaining) [ (Pair 2000000 1000000) @parameter (Pair 2000000 1000000) @parameter ] - - location: 23 (remaining gas: 1039979.580 units remaining) + - location: 23 (remaining gas: 1039980.250 units remaining) [ 2000000 (Pair 2000000 1000000) @parameter ] - - location: 26 (remaining gas: 1039979.280 units remaining) - [ 1000000 ] - - location: 25 (remaining gas: 1039979.210 units remaining) - [ 1000000 ] - - location: 24 (remaining gas: 1039979.210 units remaining) - [ 2000000 - 1000000 ] - - location: 27 (remaining gas: 1039979.070 units remaining) + - location: 24 (remaining gas: 1039980.150 units remaining) + [ (Pair 2000000 1000000) @parameter ] + - location: 26 (remaining gas: 1039980.070 units remaining) [ 1000000 ] - - location: -1 (remaining gas: 1039979 units remaining) + - location: 27 (remaining gas: 1039979.990 units remaining) [ 1000000 ] - - location: 20 (remaining gas: 1039979 units remaining) - [ 3000000 - 1000000 ] - - location: 28 (remaining gas: 1039978.860 units remaining) + - location: 28 (remaining gas: 1039979.910 units remaining) [ (Pair 3000000 1000000) ] - - location: 29 (remaining gas: 1039978.720 units remaining) + - location: 29 (remaining gas: 1039979.830 units remaining) [ (Some (Pair 3000000 1000000)) ] - - location: 30 (remaining gas: 1039978.580 units remaining) + - location: 30 (remaining gas: 1039979.750 units remaining) [ {} (Some (Pair 3000000 1000000)) ] - - location: 32 (remaining gas: 1039978.440 units remaining) - [ (Pair {} (Some (Pair 3000000 1000000))) ] - - location: -1 (remaining gas: 1039978.370 units remaining) + - location: 32 (remaining gas: 1039979.670 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 03648b5c39a7e327bbdcd6a0e244c926c5c10bda..4b7111ff634a079ea766e33b4ae77a3e30754058 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,63 +7,51 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039981.110 units remaining) + - location: 12 (remaining gas: 1039981.110 units remaining) [ (Pair (Pair 2310000 1010000) None) ] - - location: 12 (remaining gas: 1039980.970 units remaining) + - location: 12 (remaining gas: 1039981.030 units remaining) [ (Pair 2310000 1010000) @parameter ] - - location: 13 (remaining gas: 1039980.830 units remaining) + - location: 13 (remaining gas: 1039980.950 units remaining) [ (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter ] - - location: 14 (remaining gas: 1039980.690 units remaining) + - location: 14 (remaining gas: 1039980.870 units remaining) [ (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter ] - - location: 15 (remaining gas: 1039980.550 units remaining) + - location: 15 (remaining gas: 1039980.790 units remaining) [ 2310000 (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter ] - - location: 18 (remaining gas: 1039980.250 units remaining) - [ 1010000 + - location: 16 (remaining gas: 1039980.690 units remaining) + [ (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter ] - - location: 17 (remaining gas: 1039980.180 units remaining) + - location: 18 (remaining gas: 1039980.610 units remaining) [ 1010000 (Pair 2310000 1010000) @parameter ] - - location: 16 (remaining gas: 1039980.180 units remaining) - [ 2310000 - 1010000 - (Pair 2310000 1010000) @parameter ] - - location: 19 (remaining gas: 1039980.020 units remaining) + - location: 19 (remaining gas: 1039980.510 units remaining) [ 3320000 (Pair 2310000 1010000) @parameter ] - - location: 22 (remaining gas: 1039979.720 units remaining) + - location: 20 (remaining gas: 1039980.410 units remaining) + [ (Pair 2310000 1010000) @parameter ] + - location: 22 (remaining gas: 1039980.330 units remaining) [ (Pair 2310000 1010000) @parameter (Pair 2310000 1010000) @parameter ] - - location: 23 (remaining gas: 1039979.580 units remaining) + - location: 23 (remaining gas: 1039980.250 units remaining) [ 2310000 (Pair 2310000 1010000) @parameter ] - - location: 26 (remaining gas: 1039979.280 units remaining) - [ 1010000 ] - - location: 25 (remaining gas: 1039979.210 units remaining) + - location: 24 (remaining gas: 1039980.150 units remaining) + [ (Pair 2310000 1010000) @parameter ] + - location: 26 (remaining gas: 1039980.070 units remaining) [ 1010000 ] - - location: 24 (remaining gas: 1039979.210 units remaining) - [ 2310000 - 1010000 ] - - location: 27 (remaining gas: 1039979.070 units remaining) - [ 1300000 ] - - location: -1 (remaining gas: 1039979 units remaining) + - location: 27 (remaining gas: 1039979.990 units remaining) [ 1300000 ] - - location: 20 (remaining gas: 1039979 units remaining) - [ 3320000 - 1300000 ] - - location: 28 (remaining gas: 1039978.860 units remaining) + - location: 28 (remaining gas: 1039979.910 units remaining) [ (Pair 3320000 1300000) ] - - location: 29 (remaining gas: 1039978.720 units remaining) + - location: 29 (remaining gas: 1039979.830 units remaining) [ (Some (Pair 3320000 1300000)) ] - - location: 30 (remaining gas: 1039978.580 units remaining) + - location: 30 (remaining gas: 1039979.750 units remaining) [ {} (Some (Pair 3320000 1300000)) ] - - location: 32 (remaining gas: 1039978.440 units remaining) - [ (Pair {} (Some (Pair 3320000 1300000))) ] - - location: -1 (remaining gas: 1039978.370 units remaining) + - location: 32 (remaining gas: 1039979.670 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 0d5705c29814004a701c54a70a73a2ce0b520b4e..2b8161407489fe890344b70115b23f3abc1a73b6 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,46 +7,44 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039986.880 units remaining) + - location: 10 (remaining gas: 1039986.880 units remaining) [ (Pair (Pair 1 4 2) 0) ] - - location: 10 (remaining gas: 1039986.740 units remaining) + - location: 10 (remaining gas: 1039986.800 units remaining) [ (Pair 1 4 2) @parameter ] - - location: 11 (remaining gas: 1039986.590 units remaining) + - location: 11 (remaining gas: 1039986.710 units remaining) [ 1 4 2 ] - - location: 13 (remaining gas: 1039986.450 units remaining) + - location: 13 (remaining gas: 1039986.630 units remaining) [ 100 1 4 2 ] - - location: 16 (remaining gas: 1039986.304 units remaining) + - location: 16 (remaining gas: 1039986.544 units remaining) [ 100 4 2 ] - - location: 17 (remaining gas: 1039986.174 units remaining) + - location: 17 (remaining gas: 1039986.474 units remaining) [ 4 100 2 ] - - location: 18 (remaining gas: 1039986.034 units remaining) + - location: 18 (remaining gas: 1039986.394 units remaining) [ 10 4 100 2 ] - - location: 21 (remaining gas: 1039985.888 units remaining) + - location: 21 (remaining gas: 1039986.308 units remaining) [ 40 100 2 ] - - location: 22 (remaining gas: 1039985.748 units remaining) + - location: 22 (remaining gas: 1039986.228 units remaining) [ 140 2 ] - - location: 23 (remaining gas: 1039985.608 units remaining) + - location: 23 (remaining gas: 1039986.148 units remaining) [ 142 ] - - location: 24 (remaining gas: 1039985.468 units remaining) + - location: 24 (remaining gas: 1039986.068 units remaining) [ {} 142 ] - - location: 26 (remaining gas: 1039985.328 units remaining) - [ (Pair {} 142) ] - - location: -1 (remaining gas: 1039985.258 units remaining) + - location: 26 (remaining gas: 1039985.988 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 847976182dd414c2fed1735ee8195c2d874904b7..773300a5e537993815ed2cabd6eb77dca890c576 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,458 +7,456 @@ emitted operations big_map diff trace - - location: 6 (remaining gas: 1039845.320 units remaining) + - location: 7 (remaining gas: 1039845.320 units remaining) [ (Pair Unit Unit) ] - - location: 7 (remaining gas: 1039845.180 units remaining) + - location: 7 (remaining gas: 1039845.240 units remaining) [ ] - - location: 8 (remaining gas: 1039845.040 units remaining) + - location: 8 (remaining gas: 1039845.160 units remaining) [ Unit ] - - location: 9 (remaining gas: 1039844.900 units remaining) + - location: 9 (remaining gas: 1039845.080 units remaining) [ Unit Unit ] - - location: 10 (remaining gas: 1039844.760 units remaining) + - location: 10 (remaining gas: 1039845 units remaining) [ (Pair Unit Unit) ] - - location: 11 (remaining gas: 1039844.620 units remaining) + - location: 11 (remaining gas: 1039844.920 units remaining) [ Unit Unit ] - - location: 12 (remaining gas: 1039844.452 units remaining) + - location: 12 (remaining gas: 1039844.812 units remaining) [ ] - - location: 14 (remaining gas: 1039844.312 units remaining) + - location: 14 (remaining gas: 1039844.732 units remaining) [ Unit @b ] - - location: 15 (remaining gas: 1039844.172 units remaining) + - location: 15 (remaining gas: 1039844.652 units remaining) [ Unit @a Unit @b ] - - location: 16 (remaining gas: 1039844.032 units remaining) + - location: 16 (remaining gas: 1039844.572 units remaining) [ (Pair Unit Unit) ] - - location: 17 (remaining gas: 1039843.892 units remaining) + - location: 17 (remaining gas: 1039844.492 units remaining) [ Unit @c Unit @d ] - - location: 18 (remaining gas: 1039843.724 units remaining) + - location: 18 (remaining gas: 1039844.384 units remaining) [ ] - - location: 20 (remaining gas: 1039843.584 units remaining) + - location: 20 (remaining gas: 1039844.304 units remaining) [ Unit @b ] - - location: 21 (remaining gas: 1039843.444 units remaining) + - location: 21 (remaining gas: 1039844.224 units remaining) [ Unit @a Unit @b ] - - location: 22 (remaining gas: 1039843.304 units remaining) + - location: 22 (remaining gas: 1039844.144 units remaining) [ (Pair Unit Unit) ] - - location: 23 (remaining gas: 1039843.164 units remaining) + - location: 23 (remaining gas: 1039844.064 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 24 (remaining gas: 1039843.024 units remaining) + - location: 24 (remaining gas: 1039843.984 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 25 (remaining gas: 1039842.856 units remaining) + - location: 25 (remaining gas: 1039843.876 units remaining) [ (Pair Unit Unit) ] - - location: 27 (remaining gas: 1039842.716 units remaining) + - location: 27 (remaining gas: 1039843.796 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 28 (remaining gas: 1039842.576 units remaining) + - location: 28 (remaining gas: 1039843.716 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 29 (remaining gas: 1039842.408 units remaining) + - location: 29 (remaining gas: 1039843.608 units remaining) [ (Pair Unit Unit) ] - - location: 31 (remaining gas: 1039842.268 units remaining) + - location: 31 (remaining gas: 1039843.528 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 32 (remaining gas: 1039842.128 units remaining) + - location: 32 (remaining gas: 1039843.448 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 33 (remaining gas: 1039841.960 units remaining) + - location: 33 (remaining gas: 1039843.340 units remaining) [ (Pair Unit Unit) ] - - location: 35 (remaining gas: 1039841.820 units remaining) + - location: 35 (remaining gas: 1039843.260 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 36 (remaining gas: 1039841.680 units remaining) + - location: 36 (remaining gas: 1039843.180 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 37 (remaining gas: 1039841.512 units remaining) + - location: 37 (remaining gas: 1039843.072 units remaining) [ (Pair Unit Unit) ] - - location: 39 (remaining gas: 1039841.372 units remaining) + - location: 39 (remaining gas: 1039842.992 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 40 (remaining gas: 1039841.232 units remaining) + - location: 40 (remaining gas: 1039842.912 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 41 (remaining gas: 1039841.064 units remaining) + - location: 41 (remaining gas: 1039842.804 units remaining) [ (Pair Unit Unit) ] - - location: 43 (remaining gas: 1039840.924 units remaining) + - location: 43 (remaining gas: 1039842.724 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 44 (remaining gas: 1039840.784 units remaining) + - location: 44 (remaining gas: 1039842.644 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 45 (remaining gas: 1039840.616 units remaining) + - location: 45 (remaining gas: 1039842.536 units remaining) [ (Pair Unit Unit) ] - - location: 47 (remaining gas: 1039840.476 units remaining) + - location: 47 (remaining gas: 1039842.456 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 48 (remaining gas: 1039840.336 units remaining) + - location: 48 (remaining gas: 1039842.376 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 49 (remaining gas: 1039840.168 units remaining) + - location: 49 (remaining gas: 1039842.268 units remaining) [ (Pair Unit Unit) ] - - location: 51 (remaining gas: 1039840.028 units remaining) + - location: 51 (remaining gas: 1039842.188 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 52 (remaining gas: 1039839.888 units remaining) + - location: 52 (remaining gas: 1039842.108 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 53 (remaining gas: 1039839.720 units remaining) + - location: 53 (remaining gas: 1039842 units remaining) [ (Pair Unit Unit) ] - - location: 55 (remaining gas: 1039839.580 units remaining) + - location: 55 (remaining gas: 1039841.920 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 56 (remaining gas: 1039839.440 units remaining) + - location: 56 (remaining gas: 1039841.840 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 57 (remaining gas: 1039839.272 units remaining) + - location: 57 (remaining gas: 1039841.732 units remaining) [ (Pair Unit Unit) ] - - location: 59 (remaining gas: 1039839.132 units remaining) + - location: 59 (remaining gas: 1039841.652 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 60 (remaining gas: 1039838.992 units remaining) + - location: 60 (remaining gas: 1039841.572 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 61 (remaining gas: 1039838.824 units remaining) + - location: 61 (remaining gas: 1039841.464 units remaining) [ (Pair Unit Unit) ] - - location: 63 (remaining gas: 1039838.684 units remaining) + - location: 63 (remaining gas: 1039841.384 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 64 (remaining gas: 1039838.544 units remaining) + - location: 64 (remaining gas: 1039841.304 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 65 (remaining gas: 1039838.376 units remaining) + - location: 65 (remaining gas: 1039841.196 units remaining) [ (Pair Unit Unit) ] - - location: 67 (remaining gas: 1039838.236 units remaining) + - location: 67 (remaining gas: 1039841.116 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 68 (remaining gas: 1039838.096 units remaining) + - location: 68 (remaining gas: 1039841.036 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 69 (remaining gas: 1039837.928 units remaining) + - location: 69 (remaining gas: 1039840.928 units remaining) [ (Pair Unit Unit) ] - - location: 71 (remaining gas: 1039837.788 units remaining) + - location: 71 (remaining gas: 1039840.848 units remaining) [ ] - - location: 72 (remaining gas: 1039837.648 units remaining) + - location: 72 (remaining gas: 1039840.768 units remaining) [ Unit @d ] - - location: 73 (remaining gas: 1039837.508 units remaining) + - location: 73 (remaining gas: 1039840.688 units remaining) [ Unit @c Unit @d ] - - location: 74 (remaining gas: 1039837.368 units remaining) + - location: 74 (remaining gas: 1039840.608 units remaining) [ (Pair Unit Unit) ] - - location: 75 (remaining gas: 1039837.228 units remaining) + - location: 75 (remaining gas: 1039840.528 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 76 (remaining gas: 1039837.088 units remaining) + - location: 76 (remaining gas: 1039840.448 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 77 (remaining gas: 1039836.920 units remaining) + - location: 77 (remaining gas: 1039840.340 units remaining) [ (Pair Unit Unit) ] - - location: 79 (remaining gas: 1039836.780 units remaining) + - location: 79 (remaining gas: 1039840.260 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 80 (remaining gas: 1039836.640 units remaining) + - location: 80 (remaining gas: 1039840.180 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 81 (remaining gas: 1039836.472 units remaining) + - location: 81 (remaining gas: 1039840.072 units remaining) [ (Pair Unit Unit) ] - - location: 83 (remaining gas: 1039836.332 units remaining) + - location: 83 (remaining gas: 1039839.992 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 84 (remaining gas: 1039836.192 units remaining) + - location: 84 (remaining gas: 1039839.912 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 85 (remaining gas: 1039836.024 units remaining) + - location: 85 (remaining gas: 1039839.804 units remaining) [ (Pair Unit Unit) ] - - location: 87 (remaining gas: 1039835.884 units remaining) + - location: 87 (remaining gas: 1039839.724 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 88 (remaining gas: 1039835.744 units remaining) + - location: 88 (remaining gas: 1039839.644 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 89 (remaining gas: 1039835.576 units remaining) + - location: 89 (remaining gas: 1039839.536 units remaining) [ (Pair Unit Unit) ] - - location: 91 (remaining gas: 1039835.436 units remaining) + - location: 91 (remaining gas: 1039839.456 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 92 (remaining gas: 1039835.296 units remaining) + - location: 92 (remaining gas: 1039839.376 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 93 (remaining gas: 1039835.128 units remaining) + - location: 93 (remaining gas: 1039839.268 units remaining) [ (Pair Unit Unit) ] - - location: 95 (remaining gas: 1039834.988 units remaining) + - location: 95 (remaining gas: 1039839.188 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 96 (remaining gas: 1039834.848 units remaining) + - location: 96 (remaining gas: 1039839.108 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 97 (remaining gas: 1039834.680 units remaining) + - location: 97 (remaining gas: 1039839 units remaining) [ (Pair Unit Unit) ] - - location: 99 (remaining gas: 1039834.540 units remaining) + - location: 99 (remaining gas: 1039838.920 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 100 (remaining gas: 1039834.400 units remaining) + - location: 100 (remaining gas: 1039838.840 units remaining) [ Unit @c Unit @d (Pair Unit Unit) ] - - location: 101 (remaining gas: 1039834.232 units remaining) + - location: 101 (remaining gas: 1039838.732 units remaining) [ (Pair Unit Unit) ] - - location: 103 (remaining gas: 1039834.092 units remaining) + - location: 103 (remaining gas: 1039838.652 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 104 (remaining gas: 1039833.952 units remaining) + - location: 104 (remaining gas: 1039838.572 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 105 (remaining gas: 1039833.784 units remaining) + - location: 105 (remaining gas: 1039838.464 units remaining) [ (Pair Unit Unit) ] - - location: 107 (remaining gas: 1039833.644 units remaining) + - location: 107 (remaining gas: 1039838.384 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 108 (remaining gas: 1039833.504 units remaining) + - location: 108 (remaining gas: 1039838.304 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 109 (remaining gas: 1039833.336 units remaining) + - location: 109 (remaining gas: 1039838.196 units remaining) [ (Pair Unit Unit) ] - - location: 111 (remaining gas: 1039833.196 units remaining) + - location: 111 (remaining gas: 1039838.116 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 112 (remaining gas: 1039833.056 units remaining) + - location: 112 (remaining gas: 1039838.036 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 113 (remaining gas: 1039832.888 units remaining) + - location: 113 (remaining gas: 1039837.928 units remaining) [ (Pair Unit Unit) ] - - location: 115 (remaining gas: 1039832.748 units remaining) + - location: 115 (remaining gas: 1039837.848 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 116 (remaining gas: 1039832.608 units remaining) + - location: 116 (remaining gas: 1039837.768 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 117 (remaining gas: 1039832.440 units remaining) + - location: 117 (remaining gas: 1039837.660 units remaining) [ (Pair Unit Unit) ] - - location: 119 (remaining gas: 1039832.300 units remaining) + - location: 119 (remaining gas: 1039837.580 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 120 (remaining gas: 1039832.160 units remaining) + - location: 120 (remaining gas: 1039837.500 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 121 (remaining gas: 1039831.992 units remaining) + - location: 121 (remaining gas: 1039837.392 units remaining) [ (Pair Unit Unit) ] - - location: 123 (remaining gas: 1039831.852 units remaining) + - location: 123 (remaining gas: 1039837.312 units remaining) [ ] - - location: 124 (remaining gas: 1039831.712 units remaining) + - location: 124 (remaining gas: 1039837.232 units remaining) [ Unit ] - - location: 125 (remaining gas: 1039831.572 units remaining) + - location: 125 (remaining gas: 1039837.152 units remaining) [ Unit Unit ] - - location: 126 (remaining gas: 1039831.432 units remaining) + - location: 126 (remaining gas: 1039837.072 units remaining) [ (Pair Unit Unit) ] - - location: 127 (remaining gas: 1039831.292 units remaining) + - location: 127 (remaining gas: 1039836.992 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 128 (remaining gas: 1039831.152 units remaining) + - location: 128 (remaining gas: 1039836.912 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 129 (remaining gas: 1039830.984 units remaining) + - location: 129 (remaining gas: 1039836.804 units remaining) [ (Pair Unit Unit) ] - - location: 131 (remaining gas: 1039830.844 units remaining) + - location: 131 (remaining gas: 1039836.724 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 132 (remaining gas: 1039830.704 units remaining) + - location: 132 (remaining gas: 1039836.644 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 133 (remaining gas: 1039830.536 units remaining) + - location: 133 (remaining gas: 1039836.536 units remaining) [ (Pair Unit Unit) ] - - location: 135 (remaining gas: 1039830.396 units remaining) + - location: 135 (remaining gas: 1039836.456 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 136 (remaining gas: 1039830.256 units remaining) + - location: 136 (remaining gas: 1039836.376 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 137 (remaining gas: 1039830.088 units remaining) + - location: 137 (remaining gas: 1039836.268 units remaining) [ (Pair Unit Unit) ] - - location: 139 (remaining gas: 1039829.948 units remaining) + - location: 139 (remaining gas: 1039836.188 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 140 (remaining gas: 1039829.808 units remaining) + - location: 140 (remaining gas: 1039836.108 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 141 (remaining gas: 1039829.640 units remaining) + - location: 141 (remaining gas: 1039836 units remaining) [ (Pair Unit Unit) ] - - location: 143 (remaining gas: 1039829.500 units remaining) + - location: 143 (remaining gas: 1039835.920 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 144 (remaining gas: 1039829.360 units remaining) + - location: 144 (remaining gas: 1039835.840 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 145 (remaining gas: 1039829.192 units remaining) + - location: 145 (remaining gas: 1039835.732 units remaining) [ (Pair Unit Unit) ] - - location: 147 (remaining gas: 1039829.052 units remaining) + - location: 147 (remaining gas: 1039835.652 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 148 (remaining gas: 1039828.912 units remaining) + - location: 148 (remaining gas: 1039835.572 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 149 (remaining gas: 1039828.744 units remaining) + - location: 149 (remaining gas: 1039835.464 units remaining) [ (Pair Unit Unit) ] - - location: 151 (remaining gas: 1039828.604 units remaining) + - location: 151 (remaining gas: 1039835.384 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 152 (remaining gas: 1039828.464 units remaining) + - location: 152 (remaining gas: 1039835.304 units remaining) [ Unit Unit (Pair Unit Unit) ] - - location: 153 (remaining gas: 1039828.296 units remaining) + - location: 153 (remaining gas: 1039835.196 units remaining) [ (Pair Unit Unit) ] - - location: 155 (remaining gas: 1039828.156 units remaining) + - location: 155 (remaining gas: 1039835.116 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 156 (remaining gas: 1039828.016 units remaining) + - location: 156 (remaining gas: 1039835.036 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 157 (remaining gas: 1039827.848 units remaining) + - location: 157 (remaining gas: 1039834.928 units remaining) [ (Pair Unit Unit) ] - - location: 159 (remaining gas: 1039827.708 units remaining) + - location: 159 (remaining gas: 1039834.848 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 160 (remaining gas: 1039827.568 units remaining) + - location: 160 (remaining gas: 1039834.768 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 161 (remaining gas: 1039827.400 units remaining) + - location: 161 (remaining gas: 1039834.660 units remaining) [ (Pair Unit Unit) ] - - location: 163 (remaining gas: 1039827.260 units remaining) + - location: 163 (remaining gas: 1039834.580 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 164 (remaining gas: 1039827.120 units remaining) + - location: 164 (remaining gas: 1039834.500 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 165 (remaining gas: 1039826.952 units remaining) + - location: 165 (remaining gas: 1039834.392 units remaining) [ (Pair Unit Unit) ] - - location: 167 (remaining gas: 1039826.812 units remaining) + - location: 167 (remaining gas: 1039834.312 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 168 (remaining gas: 1039826.672 units remaining) + - location: 168 (remaining gas: 1039834.232 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 169 (remaining gas: 1039826.504 units remaining) + - location: 169 (remaining gas: 1039834.124 units remaining) [ (Pair Unit Unit) ] - - location: 171 (remaining gas: 1039826.364 units remaining) + - location: 171 (remaining gas: 1039834.044 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - - location: 172 (remaining gas: 1039826.224 units remaining) + - location: 172 (remaining gas: 1039833.964 units remaining) [ Unit @a Unit @b (Pair Unit Unit) ] - - location: 173 (remaining gas: 1039826.056 units remaining) + - location: 173 (remaining gas: 1039833.856 units remaining) [ (Pair Unit Unit) ] - - location: 175 (remaining gas: 1039825.916 units remaining) + - location: 175 (remaining gas: 1039833.776 units remaining) [ ] - - location: 176 (remaining gas: 1039825.776 units remaining) + - location: 176 (remaining gas: 1039833.696 units remaining) [ Unit ] - - location: 177 (remaining gas: 1039825.636 units remaining) + - location: 177 (remaining gas: 1039833.616 units remaining) [ Unit Unit ] - - location: 178 (remaining gas: 1039825.496 units remaining) + - location: 178 (remaining gas: 1039833.536 units remaining) [ (Pair Unit Unit) @p ] - - location: 179 (remaining gas: 1039825.356 units remaining) + - location: 179 (remaining gas: 1039833.456 units remaining) [ (Pair Unit Unit) @p (Pair Unit Unit) @p ] - - location: 180 (remaining gas: 1039825.216 units remaining) + - location: 180 (remaining gas: 1039833.376 units remaining) [ Unit @p.a Unit @b (Pair Unit Unit) @p ] - - location: 181 (remaining gas: 1039825.048 units remaining) + - location: 181 (remaining gas: 1039833.268 units remaining) [ (Pair Unit Unit) @p ] - - location: 183 (remaining gas: 1039824.908 units remaining) + - location: 183 (remaining gas: 1039833.188 units remaining) [ (Pair Unit Unit) @p (Pair Unit Unit) @p ] - - location: 184 (remaining gas: 1039824.768 units remaining) + - location: 184 (remaining gas: 1039833.108 units remaining) [ Unit @a Unit @p.b (Pair Unit Unit) @p ] - - location: 185 (remaining gas: 1039824.600 units remaining) + - location: 185 (remaining gas: 1039833 units remaining) [ (Pair Unit Unit) @p ] - - location: 187 (remaining gas: 1039824.460 units remaining) + - location: 187 (remaining gas: 1039832.920 units remaining) [ (Pair Unit Unit) @p (Pair Unit Unit) @p ] - - location: 188 (remaining gas: 1039824.320 units remaining) + - location: 188 (remaining gas: 1039832.840 units remaining) [ Unit @p.a Unit @p.b (Pair Unit Unit) @p ] - - location: 189 (remaining gas: 1039824.152 units remaining) + - location: 189 (remaining gas: 1039832.732 units remaining) [ (Pair Unit Unit) @p ] - - location: 191 (remaining gas: 1039824.012 units remaining) + - location: 191 (remaining gas: 1039832.652 units remaining) [ (Pair Unit Unit) @p (Pair Unit Unit) @p ] - - location: 192 (remaining gas: 1039823.872 units remaining) + - location: 192 (remaining gas: 1039832.572 units remaining) [ Unit @a Unit @p.b (Pair Unit Unit) @p ] - - location: 193 (remaining gas: 1039823.704 units remaining) + - location: 193 (remaining gas: 1039832.464 units remaining) [ (Pair Unit Unit) @p ] - - location: 195 (remaining gas: 1039823.564 units remaining) + - location: 195 (remaining gas: 1039832.384 units remaining) [ (Pair Unit Unit) @p (Pair Unit Unit) @p ] - - location: 196 (remaining gas: 1039823.424 units remaining) + - location: 196 (remaining gas: 1039832.304 units remaining) [ Unit @p.a Unit @b (Pair Unit Unit) @p ] - - location: 197 (remaining gas: 1039823.256 units remaining) + - location: 197 (remaining gas: 1039832.196 units remaining) [ (Pair Unit Unit) @p ] - - location: 199 (remaining gas: 1039823.116 units remaining) + - location: 199 (remaining gas: 1039832.116 units remaining) [ ] - - location: 200 (remaining gas: 1039822.976 units remaining) + - location: 200 (remaining gas: 1039832.036 units remaining) [ Unit @b ] - - location: 201 (remaining gas: 1039822.836 units remaining) + - location: 201 (remaining gas: 1039831.956 units remaining) [ Unit @a Unit @b ] - - location: 202 (remaining gas: 1039822.696 units remaining) + - location: 202 (remaining gas: 1039831.876 units remaining) [ (Pair Unit Unit) @c ] - - location: 203 (remaining gas: 1039822.556 units remaining) + - location: 203 (remaining gas: 1039831.796 units remaining) [ Unit @b Unit @a ] - - location: 204 (remaining gas: 1039822.388 units remaining) + - location: 204 (remaining gas: 1039831.688 units remaining) [ ] - - location: 206 (remaining gas: 1039822.248 units remaining) + - location: 206 (remaining gas: 1039831.608 units remaining) [ Unit ] - - location: 207 (remaining gas: 1039822.108 units remaining) + - location: 207 (remaining gas: 1039831.528 units remaining) [ {} Unit ] - - location: 209 (remaining gas: 1039821.968 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039821.898 units remaining) + - location: 209 (remaining gas: 1039831.448 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.b2c677ad7b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" index 8ac4aff2ad0850c7e3d5a2530a9d37f77e52a247..8b21bae96cf5dee2a33547a0fa4408af8ff16a51 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" @@ -7,28 +7,23 @@ emitted operations big_map diff trace - - location: 8 (remaining gas: 1039961.660 units remaining) + - location: 9 (remaining gas: 1039961.660 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] - - location: 9 (remaining gas: 1039961.520 units remaining) + - location: 9 (remaining gas: 1039961.580 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] - - location: 10 (remaining gas: 1039960.880 units remaining) + - location: 10 (remaining gas: 1039961 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - - location: 11 (remaining gas: 1039745.412 units remaining) + - location: 11 (remaining gas: 1039745.592 units remaining) [ 500 ] - - location: 14 (remaining gas: 1039534.784 units remaining) + - location: 12 (remaining gas: 1039745.492 units remaining) + [ ] + - location: 14 (remaining gas: 1039535.084 units remaining) [ 2500 ] - - location: 13 (remaining gas: 1039534.714 units remaining) - [ 2500 ] - - location: 12 (remaining gas: 1039534.714 units remaining) - [ 500 - 2500 ] - - location: 15 (remaining gas: 1039534.574 units remaining) + - location: 15 (remaining gas: 1039535.004 units remaining) [ (Pair 500 2500) ] - - location: 16 (remaining gas: 1039534.434 units remaining) + - location: 16 (remaining gas: 1039534.924 units remaining) [ {} (Pair 500 2500) ] - - location: 18 (remaining gas: 1039534.294 units remaining) - [ (Pair {} 500 2500) ] - - location: -1 (remaining gas: 1039534.224 units remaining) + - location: 18 (remaining gas: 1039534.844 units remaining) [ (Pair {} 500 2500) ] 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 ef06a157be102470026a1b4a525a682f6deb635a..26877b8baf684d1eb306b03025e8cfdfd35768fa 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair False False)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Left (Pair False False)) @parameter ] - - location: 19 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair False False) @parameter.left ] + - location: 19 (remaining gas: 1039985.870 units remaining) [ False False ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039985.770 units remaining) [ False ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039985.690 units remaining) [ (Left False) ] - - location: -1 (remaining gas: 1039985.320 units remaining) - [ (Left False) ] - - location: 28 (remaining gas: 1039985.180 units remaining) + - location: 28 (remaining gas: 1039985.610 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039985.040 units remaining) + - location: 29 (remaining gas: 1039985.530 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039984.900 units remaining) - [ (Pair {} (Some (Left False))) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 31 (remaining gas: 1039985.450 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 fab8a4c7f00ed326fc6b1623f53a1c1e814dee80..f8f11821fd5a1f443e16cf6947a9f5f0376921b3 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair False True)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Left (Pair False True)) @parameter ] - - location: 19 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair False True) @parameter.left ] + - location: 19 (remaining gas: 1039985.870 units remaining) [ False True ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039985.770 units remaining) [ True ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039985.690 units remaining) [ (Left True) ] - - location: -1 (remaining gas: 1039985.320 units remaining) - [ (Left True) ] - - location: 28 (remaining gas: 1039985.180 units remaining) + - location: 28 (remaining gas: 1039985.610 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039985.040 units remaining) + - location: 29 (remaining gas: 1039985.530 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039984.900 units remaining) - [ (Pair {} (Some (Left True))) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 31 (remaining gas: 1039985.450 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 dacf12743a86a6e50eae496ac4c20b186d4e629d..c5e11178b7bc418ac4804191ffaa000945703a2c 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair True False)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Left (Pair True False)) @parameter ] - - location: 19 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair True False) @parameter.left ] + - location: 19 (remaining gas: 1039985.870 units remaining) [ True False ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039985.770 units remaining) [ True ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039985.690 units remaining) [ (Left True) ] - - location: -1 (remaining gas: 1039985.320 units remaining) - [ (Left True) ] - - location: 28 (remaining gas: 1039985.180 units remaining) + - location: 28 (remaining gas: 1039985.610 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039985.040 units remaining) + - location: 29 (remaining gas: 1039985.530 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039984.900 units remaining) - [ (Pair {} (Some (Left True))) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 31 (remaining gas: 1039985.450 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 243292b7636adb7205ef8bfc5c8e5e36329fcfcc..939d9960375df8bbac8d38d1fbca685b4d42ab0a 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair True True)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Left (Pair True True)) @parameter ] - - location: 19 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair True True) @parameter.left ] + - location: 19 (remaining gas: 1039985.870 units remaining) [ True True ] - - location: 20 (remaining gas: 1039985.530 units remaining) + - location: 20 (remaining gas: 1039985.770 units remaining) [ False ] - - location: 21 (remaining gas: 1039985.390 units remaining) + - location: 21 (remaining gas: 1039985.690 units remaining) [ (Left False) ] - - location: -1 (remaining gas: 1039985.320 units remaining) - [ (Left False) ] - - location: 28 (remaining gas: 1039985.180 units remaining) + - location: 28 (remaining gas: 1039985.610 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039985.040 units remaining) + - location: 29 (remaining gas: 1039985.530 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039984.900 units remaining) - [ (Pair {} (Some (Left False))) ] - - location: -1 (remaining gas: 1039984.830 units remaining) + - location: 31 (remaining gas: 1039985.450 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 0b460597de9b8f45b6cfd4e1388276622baba5ad..1b75c4f7596a4ec57424f8b4864b6e911577f100 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 0 0)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 0 0) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 0 0 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 0) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 0) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 0))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 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 33a73cd6fabbe147a8128e33dd531aee69accbec..c52a1a6b483e72fce63548970804e3f9452ae2f6 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 0 1)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 0 1) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 0 1 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 1) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 1) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 1))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 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 a9e58da37eccef9abe3508d229aca3912188926b..5aec9227dfc0b33b92760a9eacd1f08ac5dd7650 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 1 0)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 1 0)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 1 0) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 1) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 1) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 1))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 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 819d1c45f020eb62a7b43bbc62c8bd81a76872f2..8da12e0b697566954814c0832e9cfac7f1286fef 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 1 1)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 1 1)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 1 1) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 0) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 0) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 0))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 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 b4259dac6665fc2176dc4295f9ffa4e1b3b916b7..990fcff1f581a3750d2b6b7453b571ec056a659a 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 42 21)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 42 21)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 42 21) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 42 21 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 63 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 63) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 63) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 63)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 63)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 63))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 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 7924c60b56175aec958a742d55a70f9da3706eb4..cb2b04248e825ea74728c8258bf2f4f71f8e461e 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,24 @@ emitted operations big_map diff trace - - location: 15 (remaining gas: 1039986.120 units remaining) + - location: 16 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 42 63)) None) ] - - location: 16 (remaining gas: 1039985.980 units remaining) + - location: 16 (remaining gas: 1039986.040 units remaining) [ (Right (Pair 42 63)) @parameter ] - - location: 24 (remaining gas: 1039985.690 units remaining) + - location: 17 (remaining gas: 1039985.950 units remaining) + [ (Pair 42 63) @parameter.right ] + - location: 24 (remaining gas: 1039985.870 units remaining) [ 42 63 ] - - location: 25 (remaining gas: 1039985.550 units remaining) + - location: 25 (remaining gas: 1039985.790 units remaining) [ 21 ] - - location: 26 (remaining gas: 1039985.410 units remaining) + - location: 26 (remaining gas: 1039985.710 units remaining) [ (Right 21) ] - - location: -1 (remaining gas: 1039985.340 units remaining) - [ (Right 21) ] - - location: 28 (remaining gas: 1039985.200 units remaining) + - location: 28 (remaining gas: 1039985.630 units remaining) [ (Some (Right 21)) ] - - location: 29 (remaining gas: 1039985.060 units remaining) + - location: 29 (remaining gas: 1039985.550 units remaining) [ {} (Some (Right 21)) ] - - location: 31 (remaining gas: 1039984.920 units remaining) - [ (Pair {} (Some (Right 21))) ] - - location: -1 (remaining gas: 1039984.850 units remaining) + - location: 31 (remaining gas: 1039985.470 units remaining) [ (Pair {} (Some (Right 21))) ] 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 9eeb93805a14c3761ed68733280df47f3106b520..9da2a4e139f2d0ec52cc61379f146d471fbf5eef 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,59 +7,49 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039974.861 units remaining) + - location: 15 (remaining gas: 1039974.861 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) Unit) ] - - location: 15 (remaining gas: 1039974.721 units remaining) + - location: 15 (remaining gas: 1039974.781 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) @parameter ] - - location: 16 (remaining gas: 1039974.581 units remaining) + - location: 16 (remaining gas: 1039974.701 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 19 (remaining gas: 1039974.281 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 18 (remaining gas: 1039974.211 units remaining) + - location: 17 (remaining gas: 1039974.601 units remaining) + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + - location: 19 (remaining gas: 1039974.521 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 17 (remaining gas: 1039974.211 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 20 (remaining gas: 1039947.271 units remaining) + - location: 20 (remaining gas: 1039947.641 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 23 (remaining gas: 1039946.970 units remaining) + - location: 23 (remaining gas: 1039947.520 units remaining) [ 0 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 24 (remaining gas: 1039946.830 units remaining) - [ True - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: -1 (remaining gas: 1039946.760 units remaining) + - location: 24 (remaining gas: 1039947.440 units remaining) [ True 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 26 (remaining gas: 1039946.570 units remaining) + - location: 25 (remaining gas: 1039947.380 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: -1 (remaining gas: 1039946.500 units remaining) + - location: 26 (remaining gas: 1039947.310 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - - location: 31 (remaining gas: 1039781.966 units remaining) + - location: 31 (remaining gas: 1039782.836 units remaining) [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) @unpacked ] - - location: 45 (remaining gas: 1039781.696 units remaining) + - location: 40 (remaining gas: 1039782.756 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) @unpacked.some ] - - location: 39 (remaining gas: 1039781.626 units remaining) + - location: 45 (remaining gas: 1039782.686 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) @unpacked.some ] - - location: 46 (remaining gas: 1039781.486 units remaining) + - location: 46 (remaining gas: 1039782.606 units remaining) [ ] - - location: 47 (remaining gas: 1039781.346 units remaining) + - location: 47 (remaining gas: 1039782.526 units remaining) [ Unit ] - - location: 48 (remaining gas: 1039781.206 units remaining) + - location: 48 (remaining gas: 1039782.446 units remaining) [ {} Unit ] - - location: 50 (remaining gas: 1039781.066 units remaining) - [ (Pair {} Unit) ] - - location: -1 (remaining gas: 1039780.996 units remaining) + - location: 50 (remaining gas: 1039782.366 units remaining) [ (Pair {} Unit) ] Runtime error in contract [CONTRACT_HASH]: @@ -74,40 +64,34 @@ At line 4 characters 14 to 26, script reached FAILWITH instruction with Unit trace - - location: 14 (remaining gas: 1039974.861 units remaining) + - location: 15 (remaining gas: 1039974.861 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) Unit) ] - - location: 15 (remaining gas: 1039974.721 units remaining) + - location: 15 (remaining gas: 1039974.781 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) @parameter ] - - location: 16 (remaining gas: 1039974.581 units remaining) + - location: 16 (remaining gas: 1039974.701 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 19 (remaining gas: 1039974.281 units remaining) - [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 18 (remaining gas: 1039974.211 units remaining) + - location: 17 (remaining gas: 1039974.601 units remaining) + [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + - location: 19 (remaining gas: 1039974.521 units remaining) [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 17 (remaining gas: 1039974.211 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 20 (remaining gas: 1039947.271 units remaining) + - location: 20 (remaining gas: 1039947.641 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 23 (remaining gas: 1039946.970 units remaining) + - location: 23 (remaining gas: 1039947.520 units remaining) [ -1 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 24 (remaining gas: 1039946.830 units remaining) - [ False - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: -1 (remaining gas: 1039946.760 units remaining) + - location: 24 (remaining gas: 1039947.440 units remaining) [ False 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - - location: 29 (remaining gas: 1039946.440 units remaining) + - location: 25 (remaining gas: 1039947.380 units remaining) + [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + - location: 29 (remaining gas: 1039947.300 units remaining) [ Unit 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] Fatal error: diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py index 95ed80a352f1709ed3dea584e1ac3da1acfc3c72..de75678b908e34f0085108c9efff92648c03a894 100644 --- a/tests_python/tests_alpha/test_contract.py +++ b/tests_python/tests_alpha/test_contract.py @@ -388,6 +388,23 @@ class TestContracts: @pytest.mark.parametrize( "contract,error_pattern", [ + # Even though the interpreter uses a nonempty stack internally, + # the typechecker should not be able to observe it. + ("stack_bottom_unfailwithable.tz", r'ill-typed script'), + ("stack_bottom_unrightable.tz", r'ill-typed script'), + ("stack_bottom_unleftable.tz", r'ill-typed script'), + ("stack_bottom_ungetable.tz", r'ill-typed script'), + ("stack_bottom_unpairable.tz", r'ill-typed script'), + ("stack_bottom_undug2able.tz", r'ill-typed script'), + ("stack_bottom_undugable.tz", r'ill-typed script'), + ("stack_bottom_undig2able.tz", r'ill-typed script'), + ("stack_bottom_undigable.tz", r'ill-typed script'), + ("stack_bottom_undip2able.tz", r'ill-typed script'), + ("stack_bottom_undipable.tz", r'ill-typed script'), + ("stack_bottom_undup2able.tz", r'ill-typed script'), + ("stack_bottom_undropable.tz", r'ill-typed script'), + ("stack_bottom_unpopable.tz", r'ill-typed script'), + ("stack_bottom_unpopable_in_lambda.tz", r'ill-typed script'), # operations cannot be PACKed ( "pack_operation.tz", diff --git a/tezos-analyzer-006-PsCARTHA b/tezos-analyzer-006-PsCARTHA new file mode 100755 index 0000000000000000000000000000000000000000..6871a83a0c1bf8ab966410d98506a2e5a532161a Binary files /dev/null and b/tezos-analyzer-006-PsCARTHA differ