From 83408a935b14a51f0fd2374858f45096e321a476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Wed, 26 Apr 2023 16:41:34 +0200 Subject: [PATCH 1/6] Proto/Michelson: add the UNIT instruction to the IR The UNIT instruction is currently handled very specifically; it is a kind of macro which is expanded to `PUSH unit Unit` at elaboration time. This commit promotes it to a real instruction by adding a case in the GADT. The only observable effect is a slightly reduced footprint in the contract cache for scripts using this instruction. --- .../lib_benchmarks_proto/interpreter_benchmarks.ml | 8 ++++++++ .../lib_benchmarks_proto/interpreter_model.ml | 4 ++-- .../lib_benchmarks_proto/interpreter_workload.ml | 5 +++++ src/proto_alpha/lib_plugin/RPC.ml | 1 + src/proto_alpha/lib_plugin/script_interpreter_logging.ml | 9 +++++++++ src/proto_alpha/lib_protocol/michelson_v1_gas.ml | 2 ++ src/proto_alpha/lib_protocol/michelson_v1_gas.mli | 2 ++ .../lib_protocol/michelson_v1_gas_costs_generated.ml | 3 +++ src/proto_alpha/lib_protocol/script_interpreter.ml | 1 + src/proto_alpha/lib_protocol/script_interpreter_defs.ml | 1 + src/proto_alpha/lib_protocol/script_ir_translator.ml | 4 ++-- src/proto_alpha/lib_protocol/script_typed_ir.ml | 5 +++++ src/proto_alpha/lib_protocol/script_typed_ir.mli | 3 +++ src/proto_alpha/lib_protocol/script_typed_ir_size.ml | 8 ++++++++ 14 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml index 48c7e81303c8..25268a0bf556 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml @@ -771,6 +771,14 @@ module Registration_section = struct ~kinstr:(IPush (dummy_loc, unit, (), halt)) () + let () = + simple_benchmark + ~amplification:100 + ~name:Interpreter_workload.N_IUnit + ~stack_type:(unit @$ unit @$ bot) + ~kinstr:(IUnit (dummy_loc, halt)) + () + (* deep stack manipulation *) (* Constructing these instructions is made especially painful by the diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml index 9f9b4b5188a0..76866083af3b 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml @@ -404,8 +404,8 @@ let ir_model instr_or_cont = match instr_or_cont with | Instr_name instr -> ( match instr with - | N_IDrop | N_IDup | N_ISwap | N_IPush | N_ICons_pair | N_ICar | N_ICdr - | N_ICons_some | N_ICons_none | N_IIf_none | N_IOpt_map | N_ILeft + | N_IDrop | N_IDup | N_ISwap | N_IPush | N_IUnit | N_ICons_pair | N_ICar + | N_ICdr | N_ICons_some | N_ICons_none | N_IIf_none | N_IOpt_map | N_ILeft | N_IRight | N_IIf_left | N_ICons_list | N_INil | N_IIf_cons | N_IEmpty_set | N_IEmpty_map | N_IEmpty_big_map | N_IOr | N_IAnd | N_IXor | N_INot | N_IIf | N_ILoop | N_ILoop_left | N_IDip | N_IExec | N_IView diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml index 76da169ca2eb..329440ed0b9d 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml @@ -45,6 +45,7 @@ type instruction_name = | N_IDup | N_ISwap | N_IPush + | N_IUnit (* pairs *) | N_ICons_pair | N_ICar @@ -268,6 +269,7 @@ let string_of_instruction_name : instruction_name -> string = | N_IDup -> "N_IDup" | N_ISwap -> "N_ISwap" | N_IPush -> "N_IPush" + | N_IUnit -> "N_IUnit" | N_ICons_pair -> "N_ICons_pair" | N_ICar -> "N_ICar" | N_ICdr -> "N_ICdr" @@ -754,6 +756,8 @@ module Instructions = struct let push = ir_sized_step N_IPush nullary + let unit = ir_sized_step N_IUnit nullary + let cons_pair = ir_sized_step N_ICons_pair nullary let car = ir_sized_step N_ICar nullary @@ -1223,6 +1227,7 @@ let extract_ir_sized_step : | IDup (_, _), _ -> Instructions.dup | ISwap (_, _), _ -> Instructions.swap | IPush (_, _, _, _), _ -> Instructions.push + | IUnit (_, _), _ -> Instructions.unit | ICons_pair (_, _), _ -> Instructions.cons_pair | ICar (_, _), _ -> Instructions.car | ICdr (_, _), _ -> Instructions.cdr diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml index afac7f99ca1b..2e724515757e 100644 --- a/src/proto_alpha/lib_plugin/RPC.ml +++ b/src/proto_alpha/lib_plugin/RPC.ml @@ -755,6 +755,7 @@ module Scripts = struct | IDup _ -> pp_print_string fmt "DUP" | ISwap _ -> pp_print_string fmt "SWAP" | IPush _ -> pp_print_string fmt "PUSH" + | IUnit _ -> pp_print_string fmt "PUSH" | ICons_pair _ -> pp_print_string fmt "PAIR" | ICar _ -> pp_print_string fmt "CAR" | ICdr _ -> pp_print_string fmt "CDR" diff --git a/src/proto_alpha/lib_plugin/script_interpreter_logging.ml b/src/proto_alpha/lib_plugin/script_interpreter_logging.ml index 297f153d731f..663283db73ec 100644 --- a/src/proto_alpha/lib_plugin/script_interpreter_logging.ml +++ b/src/proto_alpha/lib_plugin/script_interpreter_logging.ml @@ -182,6 +182,15 @@ module Stack_utils = struct continuation = k; reconstruct = (fun k -> IPush (loc, a, x, k)); } + | IUnit (loc, k), s -> + let s = Item_t (unit_t, s) in + ok + @@ Ex_split_kinstr + { + cont_init_stack = s; + continuation = k; + reconstruct = (fun k -> IUnit (loc, k)); + } | ICons_pair (loc, k), Item_t (a, Item_t (b, s)) -> pair_t dummy a b >|? fun (Ty_ex_c c) -> let s = Item_t (c, s) in diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index f53c4be85e3c..e548e6aceb8b 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -396,6 +396,8 @@ module Cost_of = struct let push = atomic_step_cost cost_N_IPush + let unit = atomic_step_cost cost_N_IUnit + let empty_big_map = atomic_step_cost cost_N_IEmpty_big_map let lt = atomic_step_cost cost_N_ILt diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli index bc804d926472..012db06656f4 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli @@ -315,6 +315,8 @@ module Cost_of : sig val push : Gas.cost + val unit : Gas.cost + val empty_big_map : Gas.cost val lt : Gas.cost diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml index 6d5c3af303e7..15286d499890 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml @@ -178,6 +178,9 @@ let cost_N_ICons_some = S.safe_int 10 (* model N_IPush *) let cost_N_IPush = S.safe_int 10 +(* model N_IUnit *) +let cost_N_IUnit = S.safe_int 10 + (* model N_IDig *) (* Approximating 6.750442 x term *) let cost_N_IDig size = diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index f6cf653a3658..e90e9c291fb0 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -656,6 +656,7 @@ module Raw = struct (step [@ocaml.tailcall]) g gas k ks top (accu, stack) | IPush (_, _ty, v, k) -> (step [@ocaml.tailcall]) g gas k ks v (accu, stack) + | IUnit (_, k) -> (step [@ocaml.tailcall]) g gas k ks () (accu, stack) (* options *) | ICons_some (_, k) -> (step [@ocaml.tailcall]) g gas k ks (Some accu) stack diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 0e92de38d5d2..7b6265d4e76d 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -294,6 +294,7 @@ let cost_of_instr : type a s r f. (a, s, r, f) kinstr -> a -> s -> Gas.cost = | IDup _ -> Interp_costs.dup | ISwap _ -> Interp_costs.swap | IPush _ -> Interp_costs.push + | IUnit _ -> Interp_costs.unit | ICons_some _ -> Interp_costs.cons_some | ICons_none _ -> Interp_costs.cons_none | IIf_none _ -> Interp_costs.if_none diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 674a376463ad..4093dccc1538 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -2694,8 +2694,8 @@ and parse_instr : typed ctxt loc push (Item_t (t, stack)) | Prim (loc, I_UNIT, [], annot), stack -> check_var_type_annot loc annot >>?= fun () -> - let push = {apply = (fun k -> IPush (loc, unit_t, (), k))} in - typed ctxt loc push (Item_t (unit_t, stack)) + let unit = {apply = (fun k -> IUnit (loc, k))} in + typed ctxt loc unit (Item_t (unit_t, stack)) (* options *) | Prim (loc, I_SOME, [], annot), Item_t (t, rest) -> check_var_type_annot loc annot >>?= fun () -> diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index c7c6935b2274..2edc9f236e7d 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -454,6 +454,9 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = | IPush : Script.location * ('ty, _) ty * 'ty * ('ty, 'a * 'S, 'r, 'F) kinstr -> ('a, 'S, 'r, 'F) kinstr + | IUnit : + Script.location * (unit, 'a * 'S, 'r, 'F) kinstr + -> ('a, 'S, 'r, 'F) kinstr (* Pairs ----- @@ -1539,6 +1542,7 @@ let kinstr_location : type a s b f. (a, s, b, f) kinstr -> Script.location = | IDup (loc, _) -> loc | ISwap (loc, _) -> loc | IPush (loc, _, _, _) -> loc + | IUnit (loc, _) -> loc | ICons_pair (loc, _) -> loc | ICar (loc, _) -> loc | ICdr (loc, _) -> loc @@ -2083,6 +2087,7 @@ let kinstr_traverse i init f = | IDup (_, k) -> (next [@ocaml.tailcall]) k | ISwap (_, k) -> (next [@ocaml.tailcall]) k | IPush (_, _, _, k) -> (next [@ocaml.tailcall]) k + | IUnit (_, k) -> (next [@ocaml.tailcall]) k | ICons_pair (_, k) -> (next [@ocaml.tailcall]) k | ICar (_, k) -> (next [@ocaml.tailcall]) k | ICdr (_, k) -> (next [@ocaml.tailcall]) k diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index 8c01f106563e..ff246e041dce 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -446,6 +446,9 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = | IPush : Script.location * ('ty, _) ty * 'ty * ('ty, 'a * 'S, 'r, 'F) kinstr -> ('a, 'S, 'r, 'F) kinstr + | IUnit : + Script.location * (unit, 'a * 'S, 'r, 'F) kinstr + -> ('a, 'S, 'r, 'F) kinstr (* Pairs ----- diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml index cd5b437ecd71..ab49df04c830 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -425,6 +425,14 @@ and kinstr_size : (accu ++ ty_size ty) ty x + | IUnit (loc, k) -> + let accu = ret_succ_adding accu (base1 loc k +! (word_size *? 2)) in + let ty = unit_t in + (value_size [@ocaml.tailcall]) + ~count_lambda_nodes + (accu ++ ty_size ty) + ty + () | ICons_pair (loc, k) -> ret_succ_adding accu (base1 loc k) | ICar (loc, k) -> ret_succ_adding accu (base1 loc k) | ICdr (loc, k) -> ret_succ_adding accu (base1 loc k) -- GitLab From 959caf0f9a2c81042d7f7216a9dc6d9e212c7a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Wed, 26 Apr 2023 16:59:21 +0200 Subject: [PATCH 2/6] Changes: mention MR !8579 --- docs/protocols/alpha.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index 66401eb169ec..83d6a9257777 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -56,3 +56,5 @@ Internal - Remove the deprecated and unused ``tx_rollup_l2_address`` Michelson type. (MR :gl:`!8546`) + +- Add an internal represention case for the ``UNIT`` Michelson instruction. (MR :gl:`!8579`) -- GitLab From 145d8a30e71a94b5694baa70294d5cd708888131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Thu, 27 Apr 2023 15:03:28 +0200 Subject: [PATCH 3/6] Proto/Michelson: Improve the size model for UNIT --- src/proto_alpha/lib_protocol/script_typed_ir_size.ml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml index ab49df04c830..2bb0e205b604 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -425,14 +425,7 @@ and kinstr_size : (accu ++ ty_size ty) ty x - | IUnit (loc, k) -> - let accu = ret_succ_adding accu (base1 loc k +! (word_size *? 2)) in - let ty = unit_t in - (value_size [@ocaml.tailcall]) - ~count_lambda_nodes - (accu ++ ty_size ty) - ty - () + | IUnit (loc, k) -> ret_succ_adding accu (base1 loc k) | ICons_pair (loc, k) -> ret_succ_adding accu (base1 loc k) | ICar (loc, k) -> ret_succ_adding accu (base1 loc k) | ICdr (loc, k) -> ret_succ_adding accu (base1 loc k) -- GitLab From 1bf676b39fa0c3433322000a5c3dba31fb9f711f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Fri, 28 Apr 2023 09:49:06 +0200 Subject: [PATCH 4/6] Tezt: update regression traces Gas is slightly lower because some gas cost depends on the IR size. --- ...t onchain opcodes- test_contract_fails.out | 4 ++-- ... Contract onchain opcodes- test_sender.out | 10 ++++---- ...- Contract onchain opcodes- test_slice.out | 10 ++++---- ... Contract onchain opcodes- test_source.out | 10 ++++---- ...ract onchain opcodes- test_split_bytes.out | 20 ++++++++-------- ...act onchain opcodes- test_split_string.out | 20 ++++++++-------- ...est_trace_origination_compare_big_type.out | 4 ++-- ...st_trace_origination_compare_big_type2.out | 4 ++-- ... onchain opcodes- test_transfer_tokens.out | 12 +++++----- ...abs--storage125992234--input254251340-.out | 2 +- ...abs--storage125992234--input420401245-.out | 2 +- ...abs--storage125992234--input680650890-.out | 2 +- ...add--storage125992234--input125992234-.out | 2 +- ...ary--storage125992234--input125992234-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...tez--storage680650890--input229402968-.out | 2 +- ...int--storage125992234--input125992234-.out | 2 +- ...nat--storage125992234--input125992234-.out | 2 +- ...get--storage125992234--input186507116-.out | 2 +- ...set--storage186507116--input125992234-.out | 2 +- ...are--storage125992234--input125992234-.out | 2 +- ...act--storage125992234--input117475800-.out | 2 +- ...act--storage921624073--input125992234-.out | 2 +- ..._eq--storage125992234--input246866101-.out | 2 +- ...g_eq--storage125992234--input26856104-.out | 2 +- ...p-n--storage125992234--input125992234-.out | 2 +- ...mit--storage125992234--input125992234-.out | 2 +- ...rst--storage492856247--input478406404-.out | 2 +- ...rst--storage492856247--input962874972-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...mul--storage125992234--input125992234-.out | 2 +- ..._fr--storage151303925--input216277421-.out | 2 +- ..._fr--storage287799761--input485842614-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...rev--storage125992234--input305844558-.out | 2 +- ...rev--storage125992234--input646365167-.out | 2 +- ...ty--storage125992234--input1028781121-.out | 2 +- ...cty--storage125992234--input802670583-.out | 2 +- ...ess--storage125992234--input125992234-.out | 2 +- ...int--storage125992234--input125992234-.out | 2 +- ...int--storage125992234--input289072903-.out | 2 +- ...sub--storage921624073--input706350605-.out | 2 +- ...sub--storage921624073--input856198194-.out | 2 +- ...air--storage125992234--input125992234-.out | 2 +- ...tes--storage125992234--input125992234-.out | 2 +- ...Michelson opcodes- big_map_contract_io.out | 12 +++++----- ...est Michelson opcodes- check_signature.out | 4 ++-- ...a- test Michelson opcodes- pack_unpack.out | 4 ++-- .../Alpha- Create contract.out | 8 +++---- .../Alpha- Self address transfer.out | 16 ++++++------- .../Alpha- Ticket updates in receipt.out | 6 ++--- .../Alpha- Create and remove tickets.out | 24 +++++++++---------- ...rt-contract rollup should succeed with.out | 4 ++-- ...rom implicit accounts must be rejected.out | 12 +++++----- ...inated contracts and implicit accounts.out | 20 ++++++++-------- ... implicit accounts with some Tez along.out | 8 +++---- ...icit accounts with the wrong type must.out | 8 +++---- ...ts from contracts to implicit accounts.out | 8 +++---- .../Alpha- Send tickets in bigmap.out | 8 +++---- ... contract storage to implicit accounts.out | 20 ++++++++-------- ...rom implicit accounts must be rejected.out | 8 +++---- ...rt-contract rollup should succeed with.out | 4 ++-- ...accounts or originated contracts accep.out | 12 +++++----- ...rom implicit accounts must be rejected.out | 12 +++++----- ... tx kernel should run e2e (kernel_e2e).out | 4 ++-- .../expected/views.ml/Alpha- Run views.out | 16 ++++++------- 68 files changed, 194 insertions(+), 194 deletions(-) diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_contract_fails.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_contract_fails.out index 52363e3275f2..222fc29cd993 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_contract_fails.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_contract_fails.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract contract transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/contract.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 589.326 units (will add 100 for safety) +Estimated gas: 589.146 units (will add 100 for safety) Estimated storage: 329 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 72 bytes Paid storage size diff: 72 bytes - Consumed gas: 589.292 + Consumed gas: 589.112 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.018 storage fees ........................... +ꜩ0.018 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out index cbefc4d7f435..73be7bfe57b5 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_sender.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract proxy transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/proxy.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 585.283 units (will add 100 for safety) +Estimated gas: 585.193 units (will add 100 for safety) Estimated storage: 312 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 55 bytes Paid storage size diff: 55 bytes - Consumed gas: 585.250 + Consumed gas: 585.160 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01375 storage fees ........................... +ꜩ0.01375 @@ -128,7 +128,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2949.067 units (will add 100 for safety) +Estimated gas: 2948.977 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -141,7 +141,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000599 Expected counter: 2 - Gas limit: 3050 + Gas limit: 3049 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000599 @@ -154,7 +154,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 1739.558 + Consumed gas: 1739.468 Internal operations: Internal Transaction: Amount: ꜩ0 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out index 5b4b8f9047c0..b3b80e9e4d6a 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract slices transferring 1 from bootstrap1 running michelson_test_scripts/opcodes/slices.tz --init '"sppk7dBPqMPjDjXgKbb5f7V3PuKUrA4Zuwc3c3H7XqQerqPUWbK7Hna"' --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 1079.522 units (will add 100 for safety) +Estimated gas: 1078.622 units (will add 100 for safety) Estimated storage: 835 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000946 Expected counter: 1 - Gas limit: 1180 + Gas limit: 1179 Storage limit: 855 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000946 @@ -73,7 +73,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 578 bytes Paid storage size diff: 578 bytes - Consumed gas: 1079.489 + Consumed gas: 1078.589 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.1445 storage fees ........................... +ꜩ0.1445 @@ -417,7 +417,7 @@ Fatal error: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")' Node is bootstrapped. -Estimated gas: 1625.970 units (will add 100 for safety) +Estimated gas: 1625.070 units (will add 100 for safety) Estimated storage: 257 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -445,7 +445,7 @@ This sequence of operations was run: Updated storage: 0x0103fe5753baadb56a4836e34571ce4cbe82158ee40eba872b848f709699019725ba Storage size: 578 bytes - Consumed gas: 1526.495 + Consumed gas: 1525.595 Internal operations: Internal Transaction: Amount: ꜩ1 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out index c0aca5beecd8..e9e097b02312 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_source.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract proxy transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/proxy.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 585.283 units (will add 100 for safety) +Estimated gas: 585.193 units (will add 100 for safety) Estimated storage: 312 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 55 bytes Paid storage size diff: 55 bytes - Consumed gas: 585.250 + Consumed gas: 585.160 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01375 storage fees ........................... +ꜩ0.01375 @@ -128,7 +128,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from '[PUBLIC_KEY_HASH]' to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2949.067 units (will add 100 for safety) +Estimated gas: 2948.977 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -141,7 +141,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000599 Expected counter: 2 - Gas limit: 3050 + Gas limit: 3049 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000599 @@ -154,7 +154,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 55 bytes - Consumed gas: 1739.558 + Consumed gas: 1739.468 Internal operations: Internal Transaction: Amount: ꜩ0 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out index 67ad38e33eb2..30c9de162896 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_bytes.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract split_bytes transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/split_bytes.tz --init '{}' --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 650.005 units (will add 100 for safety) +Estimated gas: 649.915 units (will add 100 for safety) Estimated storage: 511 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000557 + Fee to the baker: ꜩ0.000556 Expected counter: 1 - Gas limit: 751 + Gas limit: 750 Storage limit: 531 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000557 - payload fees(the block proposer) ....... +ꜩ0.000557 + [PUBLIC_KEY_HASH] ... -ꜩ0.000556 + payload fees(the block proposer) ....... +ꜩ0.000556 Origination: From: [PUBLIC_KEY_HASH] Credit: ꜩ0 @@ -55,7 +55,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 254 bytes Paid storage size diff: 254 bytes - Consumed gas: 649.972 + Consumed gas: 649.882 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0635 storage fees ........................... +ꜩ0.0635 @@ -67,7 +67,7 @@ Contract memorized as split_bytes. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg 0xaabbcc Node is bootstrapped. -Estimated gas: 1320.096 units (will add 100 for safety) +Estimated gas: 1320.006 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -94,7 +94,7 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 1320.632 + Consumed gas: 1320.542 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -105,7 +105,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg 0xddeeff Node is bootstrapped. -Estimated gas: 1322.712 units (will add 100 for safety) +Estimated gas: 1322.622 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -132,7 +132,7 @@ This sequence of operations was run: Updated storage: { 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff } Storage size: 290 bytes Paid storage size diff: 18 bytes - Consumed gas: 1323.248 + Consumed gas: 1323.158 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out index 367243708cbf..b30080abed65 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract split_string transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/split_string.tz --init '{}' --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 650.005 units (will add 100 for safety) +Estimated gas: 649.915 units (will add 100 for safety) Estimated storage: 511 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000557 + Fee to the baker: ꜩ0.000556 Expected counter: 1 - Gas limit: 751 + Gas limit: 750 Storage limit: 531 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000557 - payload fees(the block proposer) ....... +ꜩ0.000557 + [PUBLIC_KEY_HASH] ... -ꜩ0.000556 + payload fees(the block proposer) ....... +ꜩ0.000556 Origination: From: [PUBLIC_KEY_HASH] Credit: ꜩ0 @@ -55,7 +55,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 254 bytes Paid storage size diff: 254 bytes - Consumed gas: 649.972 + Consumed gas: 649.882 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0635 storage fees ........................... +ꜩ0.0635 @@ -67,7 +67,7 @@ Contract memorized as split_string. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"abc"' Node is bootstrapped. -Estimated gas: 1320.160 units (will add 100 for safety) +Estimated gas: 1320.070 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -94,7 +94,7 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" } Storage size: 272 bytes Paid storage size diff: 18 bytes - Consumed gas: 1320.696 + Consumed gas: 1320.606 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 @@ -105,7 +105,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"def"' Node is bootstrapped. -Estimated gas: 1322.848 units (will add 100 for safety) +Estimated gas: 1322.758 units (will add 100 for safety) Estimated storage: 18 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -132,7 +132,7 @@ This sequence of operations was run: Updated storage: { "a" ; "b" ; "c" ; "d" ; "e" ; "f" } Storage size: 290 bytes Paid storage size diff: 18 bytes - Consumed gas: 1323.384 + Consumed gas: 1323.294 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0045 storage fees ........................... +ꜩ0.0045 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type.out index f85e5501f520..80da41e9581e 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract compare_big_type transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/compare_big_type.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 1611.480 units (will add 100 for safety) +Estimated gas: 1611.390 units (will add 100 for safety) Estimated storage: 385 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -78,7 +78,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 128 bytes Paid storage size diff: 128 bytes - Consumed gas: 1611.446 + Consumed gas: 1611.356 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.032 storage fees ........................... +ꜩ0.032 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type2.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type2.out index eb6d41f503cf..0e4c287b5e72 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type2.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_trace_origination_compare_big_type2.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract compare_big_type2 transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/compare_big_type2.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 1771.634 units (will add 100 for safety) +Estimated gas: 1771.544 units (will add 100 for safety) Estimated storage: 393 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -82,7 +82,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 136 bytes Paid storage size diff: 136 bytes - Consumed gas: 1771.600 + Consumed gas: 1771.510 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.034 storage fees ........................... +ꜩ0.034 diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out index 5f824663924f..75e4d0c6cd2c 100644 --- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out +++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_transfer_tokens.out @@ -89,7 +89,7 @@ Contract memorized as test_transfer_contract2. ./octez-client --mode mockup --wait none originate contract transfer_tokens transferring 1000 from bootstrap1 running michelson_test_scripts/opcodes/transfer_tokens.tz --burn-cap 10 --force Node is bootstrapped. -Estimated gas: 589.415 units (will add 100 for safety) +Estimated gas: 589.235 units (will add 100 for safety) Estimated storage: 323 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -129,7 +129,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 66 bytes Paid storage size diff: 66 bytes - Consumed gas: 589.382 + Consumed gas: 589.202 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -143,7 +143,7 @@ Contract memorized as transfer_tokens. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.774 units (will add 100 for safety) +Estimated gas: 2948.594 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -169,7 +169,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 1741.557 + Consumed gas: 1741.377 Internal operations: Internal Transaction: Amount: ꜩ100 @@ -186,7 +186,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2948.774 units (will add 100 for safety) +Estimated gas: 2948.594 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -212,7 +212,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 66 bytes - Consumed gas: 1741.557 + Consumed gas: 1741.377 Internal operations: Internal Transaction: Amount: ꜩ100 diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input254251340-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input254251340-.out index ec8fe7cc7ee5..8be48c1e09f7 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input254251340-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input254251340-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 10.211) + - location: 7 (just consumed gas: 10.031) [ (Pair 948 Unit) ] - location: 7 (just consumed gas: 0.010) [ 948 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input420401245-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input420401245-.out index c5f6016e97e7..809616da5be7 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input420401245-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input420401245-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 10.211) + - location: 7 (just consumed gas: 10.031) [ (Pair 12039123919239192312931 Unit) ] - location: 7 (just consumed gas: 0.010) [ 12039123919239192312931 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input680650890-.out index 889308f66e97..1496a9cf81b7 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input680650890-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -abs--storage125992234--input680650890-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 10.211) + - location: 7 (just consumed gas: 10.031) [ (Pair 0 Unit) ] - location: 7 (just consumed gas: 0.010) [ 0 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -add--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -add--storage125992234--input125992234-.out index 9e99cb7e119c..4856e3ebb546 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -add--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -add--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 68.449) + - location: 7 (just consumed gas: 67.729) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ Unit ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_binary--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_binary--storage125992234--input125992234-.out index af7abbecab57..e808547aac77 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_binary--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_binary--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 36.249) + - location: 7 (just consumed gas: 35.799) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_bytes--storage125992234--input125992234-.out index 3e2df28b5545..443c0e9d2458 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -and_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 28.329) + - location: 7 (just consumed gas: 27.969) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out index f7ed78c62f32..6ac1df8b6a61 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 9.316) + - location: 7 (just consumed gas: 9.226) [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (just consumed gas: 0.010) [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_int--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_int--storage125992234--input125992234-.out index 3bd13a79444c..09e090cfb612 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_int--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_int--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 118.175) + - location: 7 (just consumed gas: 116.645) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_nat--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_nat--storage125992234--input125992234-.out index 30481674f273..d8e7a29ed192 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_nat--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -bytes_of_nat--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 53.702) + - location: 7 (just consumed gas: 52.982) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-get--storage125992234--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-get--storage125992234--input186507116-.out index 8c880313e2d4..5fedc3aafcb1 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-get--storage125992234--input186507116-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-get--storage125992234--input186507116-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 11 (just consumed gas: 43.348) + - location: 11 (just consumed gas: 42.718) [ (Pair (Pair 1 4 2 Unit) Unit) ] - location: 11 (just consumed gas: 0.010) [ (Pair 1 4 2 Unit) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set--storage186507116--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set--storage186507116--input125992234-.out index 2a60bf77b1ed..792a3b036606 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set--storage186507116--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set--storage186507116--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 11 (just consumed gas: 12.667) + - location: 11 (just consumed gas: 12.577) [ (Pair Unit 1 4 2 Unit) ] - location: 11 (just consumed gas: 0.010) [ (Pair 1 4 2 Unit) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out index 514eecf097ba..155a3b68cd5b 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 200.472) + - location: 7 (just consumed gas: 197.772) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contract--storage125992234--input117475800-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contract--storage125992234--input117475800-.out index 31e3dcc79e86..a6cb79d811e2 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contract--storage125992234--input117475800-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contract--storage125992234--input117475800-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 12.110) + - location: 7 (just consumed gas: 11.930) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - location: 7 (just consumed gas: 0.010) [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -create_contract--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -create_contract--storage921624073--input125992234-.out index 502ed5a25368..4ffcc6747173 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -create_contract--storage921624073--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -create_contract--storage921624073--input125992234-.out @@ -13,7 +13,7 @@ emitted operations big_map diff trace - - location: 8 (just consumed gas: 12.061) + - location: 8 (just consumed gas: 11.971) [ (Pair Unit None) ] - location: 8 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input246866101-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input246866101-.out index 5c2856ebdf9d..bee541dbee6c 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input246866101-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input246866101-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 24 (just consumed gas: 159.743) + - location: 24 (just consumed gas: 159.563) [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ] - location: 24 (just consumed gas: 0.010) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input26856104-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input26856104-.out index fd4400c72a56..4de4c123d802 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input26856104-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dig_eq--storage125992234--input26856104-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 24 (just consumed gas: 159.743) + - location: 24 (just consumed gas: 159.563) [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ] - location: 24 (just consumed gas: 0.010) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dup-n--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dup-n--storage125992234--input125992234-.out index 812e516bc21e..b64431d72c2a 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dup-n--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -dup-n--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 42.228) + - location: 7 (just consumed gas: 41.688) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out index 33ae1614d2e2..0bc7f071f128 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out @@ -16,7 +16,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 13.135) + - location: 7 (just consumed gas: 13.045) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input478406404-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input478406404-.out index 86f36411e11d..9c88ce1380a1 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input478406404-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input478406404-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 8 (just consumed gas: 7.522) + - location: 8 (just consumed gas: 7.432) [ (Pair { 4 } 111) ] - location: 8 (just consumed gas: 0.010) [ { 4 } ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input962874972-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input962874972-.out index e251cc686ad9..c42bda715a51 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input962874972-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -first--storage492856247--input962874972-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 8 (just consumed gas: 7.822) + - location: 8 (just consumed gas: 7.732) [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - location: 8 (just consumed gas: 0.010) [ { 1 ; 2 ; 3 ; 4 } ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsl_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsl_bytes--storage125992234--input125992234-.out index 89e69340568c..bb484c7a5130 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsl_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsl_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 36.249) + - location: 7 (just consumed gas: 35.799) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsr_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsr_bytes--storage125992234--input125992234-.out index 2ae9d867969a..91cd20aeb3b0 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsr_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -lsr_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 52.699) + - location: 7 (just consumed gas: 52.069) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out index 033ad7a67eb1..14289d13ff50 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 50.799) + - location: 7 (just consumed gas: 50.169) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ Unit ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out index 126bcbfa2c6c..a456c5d96e9f 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 10.947) + - location: 7 (just consumed gas: 10.857) [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (just consumed gas: 0.010) [ 257 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out index 30b8938fc7cf..13fc83b10e77 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 10.947) + - location: 7 (just consumed gas: 10.857) [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (just consumed gas: 0.010) [ 16 ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -not_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -not_bytes--storage125992234--input125992234-.out index b4f1e0fa5a67..29f34211f48f 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -not_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -not_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 25.094) + - location: 7 (just consumed gas: 24.734) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -or_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -or_bytes--storage125992234--input125992234-.out index 069987bd4c4d..8688e61896a0 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -or_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -or_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 28.329) + - location: 7 (just consumed gas: 27.969) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out index 7b694101cab4..f211a1bd8ccb 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 16 (just consumed gas: 148.783) + - location: 16 (just consumed gas: 146.623) [ (Pair (Pair -1 1 "foobar" diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out index 2a6b66c8c793..d6720f3c67b8 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 16 (just consumed gas: 148.783) + - location: 16 (just consumed gas: 146.623) [ (Pair (Pair -1 1 "foobar" diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out index 101b4253219e..2f7dd4b18f0d 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 28 (just consumed gas: 503.139) + - location: 28 (just consumed gas: 501.249) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out index 78f57e647eca..a38f91836621 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 28 (just consumed gas: 493.644) + - location: 28 (just consumed gas: 491.754) [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_address--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_address--storage125992234--input125992234-.out index 4ff76b10c0be..67bd179a0165 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_address--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_address--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 13.726) + - location: 7 (just consumed gas: 13.456) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out index 97a5fe6651f4..1f8b329ac947 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 13 (just consumed gas: 15.515) + - location: 13 (just consumed gas: 15.335) [ (Pair (Right (Left Unit)) Unit) ] - location: 13 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_entrypoint--storage125992234--input289072903-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_entrypoint--storage125992234--input289072903-.out index 13f1edf71730..a9e38ffc1eb8 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_entrypoint--storage125992234--input289072903-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -self_with_entrypoint--storage125992234--input289072903-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 13 (just consumed gas: 40.124) + - location: 13 (just consumed gas: 39.854) [ (Pair (Left (Left 0)) Unit) ] - location: 13 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input706350605-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input706350605-.out index f38818b4629d..98a9c678e297 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input706350605-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input706350605-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 12 (just consumed gas: 16.995) + - location: 12 (just consumed gas: 16.905) [ (Pair (Pair 2310000 1010000) None) ] - location: 12 (just consumed gas: 0.010) [ (Pair 2310000 1010000) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input856198194-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input856198194-.out index 47276bad8c29..d166f51b9c53 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input856198194-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -tez_add_sub--storage921624073--input856198194-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 12 (just consumed gas: 16.995) + - location: 12 (just consumed gas: 16.905) [ (Pair (Pair 2000000 1000000) None) ] - location: 12 (just consumed gas: 0.010) [ (Pair 2000000 1000000) ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -unpair--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -unpair--storage125992234--input125992234-.out index f2d2e5b14e86..3ec02934e00c 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -unpair--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -unpair--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 127.791) + - location: 7 (just consumed gas: 126.441) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -xor_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -xor_bytes--storage125992234--input125992234-.out index 6d3b7f6e6544..7858ee9be90d 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -xor_bytes--storage125992234--input125992234-.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -xor_bytes--storage125992234--input125992234-.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 7 (just consumed gas: 28.329) + - location: 7 (just consumed gas: 27.969) [ (Pair Unit Unit) ] - location: 7 (just consumed gas: 0.010) [ ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out index a3c2b8fc908c..9252d12eb06c 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out @@ -672,7 +672,7 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["2"] to "two" trace - - location: 43 (just consumed gas: 62.128) + - location: 43 (just consumed gas: 61.768) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (just consumed gas: 0.010) [ (Left Unit) @@ -716,7 +716,7 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["3"] to "three" trace - - location: 43 (just consumed gas: 65.416) + - location: 43 (just consumed gas: 65.056) [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (just consumed gas: 0.010) @@ -752,7 +752,7 @@ emitted operations big_map diff trace - - location: 43 (just consumed gas: 62.768) + - location: 43 (just consumed gas: 62.408) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (just consumed gas: 0.010) [ (Right (Left (Right Unit))) @@ -790,7 +790,7 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["foo"] to "bar" trace - - location: 43 (just consumed gas: 60.906) + - location: 43 (just consumed gas: 60.546) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - location: 43 (just consumed gas: 0.010) [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) @@ -926,7 +926,7 @@ big_map diff Set map(4)["3"] to "three" Set map(4)["1"] to "one" trace - - location: 43 (just consumed gas: 63.036) + - location: 43 (just consumed gas: 62.676) [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (just consumed gas: 0.010) @@ -1015,7 +1015,7 @@ big_map diff New map(4) of type (big_map string string) Unset map(4)["1"] trace - - location: 43 (just consumed gas: 62.772) + - location: 43 (just consumed gas: 62.412) [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (just consumed gas: 0.010) diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out index 0102e4185557..d6e752c4eced 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out @@ -8,7 +8,7 @@ emitted operations big_map diff trace - - location: 9 (just consumed gas: 346.280) + - location: 9 (just consumed gas: 346.190) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -138,7 +138,7 @@ At line 8 characters 14 to 18, script reached FAILWITH instruction with Unit trace - - location: 9 (just consumed gas: 346.270) + - location: 9 (just consumed gas: 346.180) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out index e30afebf1042..233f87247b52 100644 --- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out +++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out @@ -7,7 +7,7 @@ emitted operations big_map diff trace - - location: 15 (just consumed gas: 19.769) + - location: 15 (just consumed gas: 19.499) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) Unit) ] @@ -70,7 +70,7 @@ At line 4 characters 14 to 26, script reached FAILWITH instruction with Unit trace - - location: 15 (just consumed gas: 19.769) + - location: 15 (just consumed gas: 19.499) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) Unit) ] diff --git a/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out b/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out index 590266bef812..3a4686fd3316 100644 --- a/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out +++ b/tezt/tests/expected/create_contract.ml/Alpha- Create contract.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract originate_contract transferring 200 from bootstrap1 running michelson_test_scripts/mini_scenarios/originate_contract.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 599.777 units (will add 100 for safety) +Estimated gas: 599.687 units (will add 100 for safety) Estimated storage: 350 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -41,7 +41,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 93 bytes Paid storage size diff: 93 bytes - Consumed gas: 599.743 + Consumed gas: 599.653 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02325 storage fees ........................... +ꜩ0.02325 @@ -55,7 +55,7 @@ Contract memorized as originate_contract. ./octez-client --mode mockup --wait none transfer 1 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg Unit Node is bootstrapped. -Estimated gas: 1794.177 units (will add 100 for safety) +Estimated gas: 1794.087 units (will add 100 for safety) Estimated storage: 295 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 93 bytes - Consumed gas: 1289.501 + Consumed gas: 1289.411 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 [CONTRACT_HASH] ... +ꜩ1 diff --git a/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out b/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out index 88b38d676bb0..671a49d97d5d 100644 --- a/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out +++ b/tezt/tests/expected/self_address_transfer.ml/Alpha- Self address transfer.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract self_address_sender transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/self_address_sender.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 592.748 units (will add 100 for safety) +Estimated gas: 592.658 units (will add 100 for safety) Estimated storage: 339 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 82 bytes Paid storage size diff: 82 bytes - Consumed gas: 592.715 + Consumed gas: 592.625 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0205 storage fees ........................... +ꜩ0.0205 @@ -51,7 +51,7 @@ Contract memorized as self_address_sender. ./octez-client --mode mockup --wait none originate contract self_address_receiver transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/self_address_receiver.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 593.190 units (will add 100 for safety) +Estimated gas: 593.010 units (will add 100 for safety) Estimated storage: 340 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -89,7 +89,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 83 bytes Paid storage size diff: 83 bytes - Consumed gas: 593.157 + Consumed gas: 592.977 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02075 storage fees ........................... +ꜩ0.02075 @@ -101,7 +101,7 @@ Contract memorized as self_address_receiver. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 2962.097 units (will add 100 for safety) +Estimated gas: 2961.827 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -114,7 +114,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000601 Expected counter: 1 - Gas limit: 3063 + Gas limit: 3062 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000601 @@ -127,7 +127,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 82 bytes - Consumed gas: 1746.191 + Consumed gas: 1746.101 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -137,5 +137,5 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: Unit Storage size: 83 bytes - Consumed gas: 1217.087 + Consumed gas: 1216.907 diff --git a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out index ff6690df9346..a9cdd273f5fb 100644 --- a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out +++ b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '(Pair "[CONTRACT_HASH]" "[CONTRACT_HASH]")' Node is bootstrapped. -Estimated gas: 7901.227 units (will add 100 for safety) +Estimated gas: 7900.777 units (will add 100 for safety) Estimated storage: 475 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.001139 Expected counter: 1 - Gas limit: 8002 + Gas limit: 8001 Storage limit: 495 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.001139 @@ -31,7 +31,7 @@ This sequence of operations was run: Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "green" 1) } Storage size: 525 bytes Paid storage size diff: 325 bytes - Consumed gas: 3194.103 + Consumed gas: 3193.653 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.08125 storage fees ........................... +ꜩ0.08125 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out index dfe0869ab372..e54bb804ae79 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract add_clear_tickets transferring 200 from bootstrap1 running michelson_test_scripts/mini_scenarios/add_clear_tickets_015.tz --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 610.470 units (will add 100 for safety) +Estimated gas: 610.380 units (will add 100 for safety) Estimated storage: 398 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -44,7 +44,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 141 bytes Paid storage size diff: 141 bytes - Consumed gas: 610.436 + Consumed gas: 610.346 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.03525 storage fees ........................... +ꜩ0.03525 @@ -58,7 +58,7 @@ Contract memorized as add_clear_tickets. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "A"' Node is bootstrapped. -Estimated gas: 1752.086 units (will add 100 for safety) +Estimated gas: 1751.996 units (will add 100 for safety) Estimated storage: 105 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -71,7 +71,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000453 Expected counter: 1 - Gas limit: 1853 + Gas limit: 1852 Storage limit: 125 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000453 @@ -87,7 +87,7 @@ This sequence of operations was run: { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "A" 1) } Storage size: 180 bytes Paid storage size diff: 105 bytes - Consumed gas: 1752.664 + Consumed gas: 1752.574 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02625 storage fees ........................... +ꜩ0.02625 @@ -101,7 +101,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint clear --arg Unit Node is bootstrapped. -Estimated gas: 1941.758 units (will add 100 for safety) +Estimated gas: 1941.668 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -127,7 +127,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 141 bytes - Consumed gas: 1942.337 + Consumed gas: 1942.247 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -138,7 +138,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "B"' Node is bootstrapped. -Estimated gas: 1752.086 units (will add 100 for safety) +Estimated gas: 1751.996 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -151,7 +151,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000453 Expected counter: 3 - Gas limit: 1853 + Gas limit: 1852 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000453 @@ -166,7 +166,7 @@ This sequence of operations was run: Updated storage: { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) } Storage size: 180 bytes - Consumed gas: 1752.664 + Consumed gas: 1752.574 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -177,7 +177,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "C"' Node is bootstrapped. -Estimated gas: 2434.095 units (will add 100 for safety) +Estimated gas: 2434.005 units (will add 100 for safety) Estimated storage: 105 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -207,7 +207,7 @@ This sequence of operations was run: Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) } Storage size: 219 bytes Paid storage size diff: 105 bytes - Consumed gas: 2434.673 + Consumed gas: 2434.583 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.02625 storage fees ........................... +ꜩ0.02625 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out index d6051495412f..1cd8f67a6b5c 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 2784.628 units (will add 100 for safety) +Estimated gas: 2784.268 units (will add 100 for safety) Estimated storage: 132 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -28,7 +28,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 197 bytes Paid storage size diff: 132 bytes - Consumed gas: 2674.654 + Consumed gas: 2674.294 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.033 storage fees ........................... +ꜩ0.033 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out index d0e4923c0192..fa023e31367f 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -130,7 +130,7 @@ Error: ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 620.652 units (will add 100 for safety) +Estimated gas: 620.562 units (will add 100 for safety) Estimated storage: 451 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -177,7 +177,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 194 bytes Paid storage size diff: 194 bytes - Consumed gas: 620.619 + Consumed gas: 620.529 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0485 storage fees ........................... +ꜩ0.0485 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out index 04f820ec16d8..dea15ec76ad8 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 620.652 units (will add 100 for safety) +Estimated gas: 620.562 units (will add 100 for safety) Estimated storage: 451 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -107,7 +107,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 194 bytes Paid storage size diff: 194 bytes - Consumed gas: 620.619 + Consumed gas: 620.529 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0485 storage fees ........................... +ꜩ0.0485 @@ -163,7 +163,7 @@ Contract memorized as tickets_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 3' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -190,7 +190,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -263,7 +263,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap2 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1 Node is bootstrapped. -Estimated gas: 3207.355 units (will add 100 for safety) +Estimated gas: 3207.265 units (will add 100 for safety) Estimated storage: 110 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -313,7 +313,7 @@ This sequence of operations was run: { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) } Storage size: 238 bytes Paid storage size diff: 44 bytes - Consumed gas: 1911.415 + Consumed gas: 1911.325 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 @@ -333,7 +333,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 4717.552 units (will add 100 for safety) +Estimated gas: 4717.462 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -360,7 +360,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 194 bytes - Consumed gas: 2864.858 + Consumed gas: 2864.768 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out index b746f178be30..8465a39d8e42 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send_with_tez transferring 1 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 612.587 units (will add 100 for safety) +Estimated gas: 612.497 units (will add 100 for safety) Estimated storage: 411 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -47,7 +47,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 154 bytes Paid storage size diff: 154 bytes - Consumed gas: 612.554 + Consumed gas: 612.464 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0385 storage fees ........................... +ꜩ0.0385 @@ -61,7 +61,7 @@ Contract memorized as tickets_send_with_tez. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[PUBLIC_KEY_HASH]"' Node is bootstrapped. -Estimated gas: 1857.302 units (will add 100 for safety) +Estimated gas: 1857.212 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -88,7 +88,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 154 bytes Paid storage size diff: 66 bytes - Consumed gas: 1757.483 + Consumed gas: 1757.393 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out index 4ef9068eabf9..360640776b37 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract send_ticket_list transferring 1 from bootstrap1 running michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.629 units (will add 100 for safety) +Estimated gas: 614.359 units (will add 100 for safety) Estimated storage: 402 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -49,7 +49,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 145 bytes Paid storage size diff: 145 bytes - Consumed gas: 614.596 + Consumed gas: 614.326 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.03625 storage fees ........................... +ꜩ0.03625 @@ -109,7 +109,7 @@ Contract memorized as tickets_list_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 4064.546 units (will add 100 for safety) +Estimated gas: 4064.276 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -136,7 +136,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 145 bytes Paid storage size diff: 66 bytes - Consumed gas: 2211.797 + Consumed gas: 2211.527 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out index d518cd93d434..a685e37c98b5 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out index 6a0d080d7f37..7b5826ebd556 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out @@ -49,7 +49,7 @@ Contract memorized as receive_tickets_in_big_map. ./octez-client --mode mockup --wait none originate contract send_tickets_in_big_map transferring 200 from bootstrap1 running michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 675.926 units (will add 100 for safety) +Estimated gas: 675.836 units (will add 100 for safety) Estimated storage: 577 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -123,7 +123,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 320 bytes Paid storage size diff: 320 bytes - Consumed gas: 675.893 + Consumed gas: 675.803 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.08 storage fees ........................... +ꜩ0.08 @@ -137,7 +137,7 @@ Contract memorized as send_tickets_in_big_map. ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 30 --storage-limit 1000000 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 98835.811 units (will add 100 for safety) +Estimated gas: 98835.721 units (will add 100 for safety) Estimated storage: 10767 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -266,7 +266,7 @@ This sequence of operations was run: Set temp(1)[40] to (Pair 0x01b15c53925dc62a43681d4bdc4f24b31eeb31a49200 (Pair "BLUE" 1)) Storage size: 320 bytes Paid storage size diff: 67 bytes - Consumed gas: 49911.017 + Consumed gas: 49910.927 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out index c84a77b15172..1b1b44f5ebb6 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none originate contract tickets_bag_implicit transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 619.638 units (will add 100 for safety) +Estimated gas: 619.548 units (will add 100 for safety) Estimated storage: 440 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -107,7 +107,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 183 bytes Paid storage size diff: 183 bytes - Consumed gas: 619.605 + Consumed gas: 619.515 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.04575 storage fees ........................... +ꜩ0.04575 @@ -119,7 +119,7 @@ Contract memorized as tickets_bag_implicit. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -146,7 +146,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -171,7 +171,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap1 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1 Node is bootstrapped. -Estimated gas: 3176.844 units (will add 100 for safety) +Estimated gas: 3176.754 units (will add 100 for safety) Estimated storage: 44 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -217,7 +217,7 @@ This sequence of operations was run: { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) } Storage size: 227 bytes Paid storage size diff: 44 bytes - Consumed gas: 1910.908 + Consumed gas: 1910.818 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.011 storage fees ........................... +ꜩ0.011 @@ -237,7 +237,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[PUBLIC_KEY_HASH]"' Node is bootstrapped. -Estimated gas: 2511.684 units (will add 100 for safety) +Estimated gas: 2511.594 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -264,7 +264,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 183 bytes - Consumed gas: 2411.864 + Consumed gas: 2411.774 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out index 71f5aabbebfd..80ff7d42856a 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out index c07a08a59f41..ace75fc56245 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint mint Node is bootstrapped. -Estimated gas: 2222.694 units (will add 100 for safety) +Estimated gas: 2222.514 units (will add 100 for safety) Estimated storage: 221 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -30,7 +30,7 @@ This sequence of operations was run: Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket" 1) } Storage size: 309 bytes Paid storage size diff: 221 bytes - Consumed gas: 2222.661 + Consumed gas: 2222.481 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.05525 storage fees ........................... +ꜩ0.05525 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out index ea01aeebfaa8..bef983ee8270 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -104,7 +104,7 @@ Contract memorized as tickets_blackhole. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -131,7 +131,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -153,7 +153,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[CONTRACT_HASH]" 1' Node is bootstrapped. -Estimated gas: 4064.179 units (will add 100 for safety) +Estimated gas: 4064.089 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -180,7 +180,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 2211.485 + Consumed gas: 2211.395 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out index 0f5ff07dc370..3ecc0a618b19 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out @@ -1,7 +1,7 @@ ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1 Node is bootstrapped. -Estimated gas: 614.381 units (will add 100 for safety) +Estimated gas: 614.291 units (will add 100 for safety) Estimated storage: 415 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -48,7 +48,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 158 bytes Paid storage size diff: 158 bytes - Consumed gas: 614.348 + Consumed gas: 614.258 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0395 storage fees ........................... +ꜩ0.0395 @@ -60,7 +60,7 @@ Contract memorized as tickets_send. ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1' Node is bootstrapped. -Estimated gas: 1858.818 units (will add 100 for safety) +Estimated gas: 1858.728 units (will add 100 for safety) Estimated storage: 66 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -87,7 +87,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 158 bytes Paid storage size diff: 66 bytes - Consumed gas: 1758.998 + Consumed gas: 1758.908 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 @@ -112,7 +112,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 620.652 units (will add 100 for safety) +Estimated gas: 620.562 units (will add 100 for safety) Estimated storage: 451 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -159,7 +159,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 194 bytes Paid storage size diff: 194 bytes - Consumed gas: 620.619 + Consumed gas: 620.529 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.0485 storage fees ........................... +ꜩ0.0485 diff --git a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out index 6abe524699cb..fdda06983cdc 100644 --- a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out +++ b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out @@ -8,7 +8,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1000 --arg 'Pair (Pair "[SMART_ROLLUP_HASH]" "[PUBLIC_KEY_HASH]") (Pair 450 "Hello, Ticket!")' Node is bootstrapped. -Estimated gas: 2330.278 units (will add 100 for safety) +Estimated gas: 2330.188 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -36,7 +36,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 205 bytes Paid storage size diff: 67 bytes - Consumed gas: 2223.251 + Consumed gas: 2223.161 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 diff --git a/tezt/tests/expected/views.ml/Alpha- Run views.out b/tezt/tests/expected/views.ml/Alpha- Run views.out index 045cc11dc077..b5d4575994a4 100644 --- a/tezt/tests/expected/views.ml/Alpha- Run views.out +++ b/tezt/tests/expected/views.ml/Alpha- Run views.out @@ -50,7 +50,7 @@ Contract memorized as view_registers_callers. ./octez-client --mode mockup --wait none originate contract view_check_caller transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/view_check_caller.tz --init None --burn-cap 1 Node is bootstrapped. -Estimated gas: 629.030 units (will add 100 for safety) +Estimated gas: 628.400 units (will add 100 for safety) Estimated storage: 465 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -63,7 +63,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000508 Expected counter: 2 - Gas limit: 730 + Gas limit: 729 Storage limit: 485 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000508 @@ -95,7 +95,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 208 bytes Paid storage size diff: 208 bytes - Consumed gas: 628.996 + Consumed gas: 628.366 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.052 storage fees ........................... +ꜩ0.052 @@ -107,7 +107,7 @@ Contract memorized as view_check_caller. ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 3584.052 units (will add 100 for safety) +Estimated gas: 3583.422 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -120,7 +120,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000665 Expected counter: 3 - Gas limit: 3685 + Gas limit: 3684 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000665 @@ -133,7 +133,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: None Storage size: 208 bytes - Consumed gas: 3584.631 + Consumed gas: 3584.001 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ1 [CONTRACT_HASH] ... +ꜩ1 @@ -177,7 +177,7 @@ This sequence of operations was run: ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"' Node is bootstrapped. -Estimated gas: 3587.684 units (will add 100 for safety) +Estimated gas: 3587.054 units (will add 100 for safety) Estimated storage: 27 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -204,7 +204,7 @@ This sequence of operations was run: Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) Storage size: 235 bytes Paid storage size diff: 27 bytes - Consumed gas: 3588.263 + Consumed gas: 3587.633 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 -- GitLab From 29c5c982ad0d52e7688c43a3a463b476972eb331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Thu, 27 Apr 2023 21:30:56 +0200 Subject: [PATCH 5/6] Plugin/Michelson: fix UNIT case in pp_instr_name --- src/proto_alpha/lib_plugin/RPC.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml index 2e724515757e..f1e0049511e6 100644 --- a/src/proto_alpha/lib_plugin/RPC.ml +++ b/src/proto_alpha/lib_plugin/RPC.ml @@ -755,7 +755,7 @@ module Scripts = struct | IDup _ -> pp_print_string fmt "DUP" | ISwap _ -> pp_print_string fmt "SWAP" | IPush _ -> pp_print_string fmt "PUSH" - | IUnit _ -> pp_print_string fmt "PUSH" + | IUnit _ -> pp_print_string fmt "UNIT" | ICons_pair _ -> pp_print_string fmt "PAIR" | ICar _ -> pp_print_string fmt "CAR" | ICdr _ -> pp_print_string fmt "CDR" -- GitLab From 8668aba3a265175496329e047a7339f71b1f17ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Fri, 28 Apr 2023 09:58:58 +0200 Subject: [PATCH 6/6] Tezts/Proto: Reset regression traces --- .../test/regression/expected/test_logging.ml/auction.out | 4 ++-- .../test/regression/expected/test_logging.ml/comb-get.out | 8 ++++---- .../test/regression/expected/test_logging.ml/comb-set.out | 4 ++-- .../test/regression/expected/test_logging.ml/faucet.out | 4 ++-- .../regression/expected/test_logging.ml/packunpack.out | 4 ++-- .../regression/expected/test_logging.ml/ticket_split.out | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out index 4b6dfefc1ebe..ac865144621f 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out @@ -356,11 +356,11 @@ trace (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] - control: KUndip - control: KCons - - log/PUSH (exit) @ location: 55 + - log/UNIT (exit) @ location: 55 [ 50000000 "[PUBLIC_KEY_HASH]" (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] - - PUSH (entry) @ location: 59 + - UNIT (entry) @ location: 59 [ 50000000 "[PUBLIC_KEY_HASH]" (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out index 9bba705816e2..f1ef1d79cf48 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out @@ -178,10 +178,10 @@ trace - GET (entry) @ location: 76 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/PUSH (exit) @ location: 76 + - log/UNIT (exit) @ location: 76 [ Unit (Pair 1 4 2 Unit) ] - - PUSH (entry) @ location: 78 + - UNIT (entry) @ location: 78 [ Unit (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 78 @@ -213,9 +213,9 @@ trace [ (Pair 1 4 2 Unit) ] - DROP (entry) @ location: 89 [ (Pair 1 4 2 Unit) ] - - log/PUSH (exit) @ location: 89 + - log/UNIT (exit) @ location: 89 [ ] - - PUSH (entry) @ location: 90 + - UNIT (entry) @ location: 90 [ ] - log/NIL (exit) @ location: 90 [ Unit ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out index f9f1eab6ed02..87ead45da454 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out @@ -34,9 +34,9 @@ trace - UPDATE (entry) @ location: 25 [ 8 (Pair 2 12 2 Unit) ] - - log/PUSH (exit) @ location: 25 + - log/UNIT (exit) @ location: 25 [ (Pair 2 12 8 Unit) ] - - PUSH (entry) @ location: 27 + - UNIT (entry) @ location: 27 [ (Pair 2 12 8 Unit) ] - log/UPDATE (exit) @ location: 27 [ Unit diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out index 702128601876..6909d0ea978a 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out @@ -63,10 +63,10 @@ trace [ "[PUBLIC_KEY_HASH]" ] - PUSH (entry) @ location: 25 [ "[PUBLIC_KEY_HASH]" ] - - log/PUSH (exit) @ location: 25 + - log/UNIT (exit) @ location: 25 [ 1000000 "[PUBLIC_KEY_HASH]" ] - - PUSH (entry) @ location: 28 + - UNIT (entry) @ location: 28 [ 1000000 "[PUBLIC_KEY_HASH]" ] - log/TRANSFER_TOKENS (exit) @ location: 28 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out index 0246417e2aa9..847e8b481add 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out @@ -82,9 +82,9 @@ trace [ (Pair (Pair "abc" { 1 ; 2 ; 3 }) { 4 ; 5 ; 6 }) ] - DROP (entry) @ location: 46 [ (Pair (Pair "abc" { 1 ; 2 ; 3 }) { 4 ; 5 ; 6 }) ] - - log/PUSH (exit) @ location: 46 + - log/UNIT (exit) @ location: 46 [ ] - - PUSH (entry) @ location: 47 + - UNIT (entry) @ location: 47 [ ] - log/NIL (exit) @ location: 47 [ Unit ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out index 52f6e5de51a3..ae449fe91b48 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out @@ -159,9 +159,9 @@ trace [ (Pair "[CONTRACT_HASH]" 17 2) ] - DROP (entry) @ location: 61 [ (Pair "[CONTRACT_HASH]" 17 2) ] - - log/PUSH (exit) @ location: 61 + - log/UNIT (exit) @ location: 61 [ ] - - PUSH (entry) @ location: 62 + - UNIT (entry) @ location: 62 [ ] - log/NIL (exit) @ location: 62 [ Unit ] -- GitLab