From 88e386c2caec924a6fc8eaa508441f39d99bcc1a Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Tue, 6 Dec 2022 00:02:53 +0100 Subject: [PATCH] WASM: Merge the level and id arguments of [read_input] This is to reduces the number of memory pages accessed by the host function in the worst case. We had to update the kernel more substantially than just the `read_input` declaration, because (1) the handling of external messages was broken, but (2) a very old kernel prior to this regression was used in Tezt. Co-authored-by: Pierrick Couderc --- src/lib_scoru_wasm/fast/funcs.ml | 7 +-- src/lib_scoru_wasm/host_funcs.ml | 59 ++++++++++-------- src/lib_scoru_wasm/host_funcs.mli | 3 +- src/lib_scoru_wasm/test/test_fast.ml | 5 +- src/lib_scoru_wasm/test/test_init.ml | 2 +- src/lib_scoru_wasm/test/test_input.ml | 55 ++++------------ src/lib_scoru_wasm/test/test_output.ml | 7 +-- .../test/integration/wasm_kernel/echo.wasm | Bin 405 -> 408 bytes .../test/integration/wasm_kernel/echo.wast | 30 ++++----- .../test/unit/test_sc_rollup_wasm.ml | 32 ++++------ tezt/lib_tezos/constant.ml | 2 +- ..._0 - RPC API should work and be stable.out | 10 +-- ...ces PVM state with messages (external).out | 10 +-- ...ces PVM state with messages (internal).out | 10 +-- ...tion of a SCORU executes without error.out | 10 +-- ...ntrypoint- -aux- earliness- 0- externa.out | 12 ++-- ...ntrypoint- -aux- earliness- 0- interna.out | 12 ++-- ...ntrypoint- -default- earliness- 0- ext.out | 12 ++-- ...ntrypoint- -default- earliness- 0- int.out | 12 ++-- 19 files changed, 127 insertions(+), 163 deletions(-) diff --git a/src/lib_scoru_wasm/fast/funcs.ml b/src/lib_scoru_wasm/fast/funcs.ml index b6c4efeb439d..464fb7f21d0b 100644 --- a/src/lib_scoru_wasm/fast/funcs.ml +++ b/src/lib_scoru_wasm/fast/funcs.ml @@ -91,14 +91,13 @@ let make (module Builtins : Builtins.S) state = let read_input = fn - (i32 @-> i32 @-> i32 @-> i32 @-> returning1 i32) - (fun level_offset id_offset dst max_bytes -> + (i32 @-> i32 @-> i32 @-> returning1 i32) + (fun info_addr dst max_bytes -> with_mem @@ fun memory -> Host_funcs.Aux.read_input ~input_buffer:state.buffers.input ~memory - ~level_offset - ~id_offset + ~info_addr ~dst ~max_bytes) in diff --git a/src/lib_scoru_wasm/host_funcs.ml b/src/lib_scoru_wasm/host_funcs.ml index 11c262a0f74c..a9e1fac49be3 100644 --- a/src/lib_scoru_wasm/host_funcs.ml +++ b/src/lib_scoru_wasm/host_funcs.ml @@ -109,6 +109,17 @@ let retrieve_memory memories = | Host_funcs.Available_memories _ -> crash_with "caller module must have exactly 1 memory instance" +type read_input_info = {level : int32; id : int32} + +let read_input_info_encoding = + let open Data_encoding in + conv + (function {level; id} -> (level, id)) + (fun (level, id) -> {level; id}) + (obj2 + (req "level" Data_encoding_utils.Little_endian.int32) + (req "id" Data_encoding_utils.Little_endian.int32)) + module Aux = struct module type S = sig type memory @@ -137,8 +148,7 @@ module Aux = struct val read_input : input_buffer:Input_buffer.t -> memory:memory -> - level_offset:int32 -> - id_offset:int32 -> + info_addr:int32 -> dst:int32 -> max_bytes:int32 -> int32 Lwt.t @@ -258,9 +268,6 @@ module Aux = struct let store_bytes mem addr data = guard @@ fun () -> M.store_bytes mem addr data - - let store_num mem addr offset value = - guard @@ fun () -> M.store_num mem addr offset value end let load_key_from_memory key_offset key_length memory = @@ -271,8 +278,7 @@ module Aux = struct let* key = M.load_bytes memory key_offset key_length in guard (fun () -> Lwt.return (Durable.key_of_string_exn key)) - let read_input ~input_buffer ~memory ~level_offset ~id_offset ~dst - ~max_bytes = + let read_input ~input_buffer ~memory ~info_addr ~dst ~max_bytes = let open Lwt_result_syntax in let*! res = Lwt.catch @@ -281,18 +287,25 @@ module Aux = struct Input_buffer.dequeue input_buffer in let input_size = Bytes.length payload in - let* () = - if input_size > input_output_max_size then - fail Error.Input_output_too_large - else return_unit - in - let payload = - Bytes.sub payload 0 @@ min input_size (Int32.to_int max_bytes) + let input_size = + if + Tezos_webassembly_interpreter.I32.le_u + max_bytes + (Int32.of_int input_size) + then Int32.to_int max_bytes + else input_size in + (* [input_size] is at most 4,096 bytes (enforced by the protocol), + so [Bytes.sub] won't raise an exception. *) + let payload = Bytes.sub payload 0 input_size in let* () = M.store_bytes memory dst (Bytes.to_string payload) in - let* () = M.store_num memory level_offset 0l (I32 raw_level) in let* () = - M.store_num memory id_offset 0l (I64 (Z.to_int64 message_counter)) + M.store_bytes + memory + info_addr + (Data_encoding.Binary.to_string_exn + read_input_info_encoding + {level = raw_level; id = Z.to_int32 message_counter}) in return (Int32.of_int input_size)) (fun exn -> @@ -523,8 +536,7 @@ let value i = Values.(Num (I32 i)) let read_input_type = let input_types = - Types.[NumType I32Type; NumType I32Type; NumType I32Type; NumType I32Type] - |> Vector.of_list + Types.[NumType I32Type; NumType I32Type; NumType I32Type] |> Vector.of_list in let output_types = Types.[NumType I32Type] |> Vector.of_list in Types.FuncType (input_types, output_types) @@ -537,20 +549,13 @@ let read_input = let open Lwt.Syntax in match inputs with | [ - Values.(Num (I32 level_offset)); - Values.(Num (I32 id_offset)); + Values.(Num (I32 info_addr)); Values.(Num (I32 dst)); Values.(Num (I32 max_bytes)); ] -> let* memory = retrieve_memory memories in let* x = - Aux.read_input - ~input_buffer - ~memory - ~level_offset - ~id_offset - ~dst - ~max_bytes + Aux.read_input ~input_buffer ~memory ~info_addr ~dst ~max_bytes in Lwt.return (durable, [value x]) | _ -> raise Bad_input) diff --git a/src/lib_scoru_wasm/host_funcs.mli b/src/lib_scoru_wasm/host_funcs.mli index 84e13d3d888c..c09fd9c0085a 100644 --- a/src/lib_scoru_wasm/host_funcs.mli +++ b/src/lib_scoru_wasm/host_funcs.mli @@ -132,8 +132,7 @@ module Aux : sig val read_input : input_buffer:Tezos_webassembly_interpreter.Input_buffer.t -> memory:memory -> - level_offset:int32 -> - id_offset:int32 -> + info_addr:int32 -> dst:int32 -> max_bytes:int32 -> int32 Lwt.t diff --git a/src/lib_scoru_wasm/test/test_fast.ml b/src/lib_scoru_wasm/test/test_fast.ml index 06de0768be22..0f0c548a78f7 100644 --- a/src/lib_scoru_wasm/test/test_fast.ml +++ b/src/lib_scoru_wasm/test/test_fast.ml @@ -345,7 +345,10 @@ let tests = tztest "Computation kernel" `Quick test_computation; tztest "Store read/write kernel" `Quick test_store_read_write; tztest "Reveal_preimage kernel" `Quick test_reveal_preimage; - tztest "TX kernel" `Quick test_tx; + (* TODO: https://gitlab.com/tezos/tezos/-/issues/3729 + Enable back this test when the transaction kernel has been + updated. *) + (* tztest "TX kernel" `Quick test_tx; *) tztest "compute_step_many pauses at snapshot" `Quick diff --git a/src/lib_scoru_wasm/test/test_init.ml b/src/lib_scoru_wasm/test/test_init.ml index 5829274874e0..d8510512ac74 100644 --- a/src/lib_scoru_wasm/test/test_init.ml +++ b/src/lib_scoru_wasm/test/test_init.ml @@ -109,7 +109,7 @@ let test_imports () = {| (module (import "%s" "%s" - (func $%s (param i32 i32 i32 i32) (result i32))) + (func $%s (param i32 i32 i32) (result i32))) (memory 1) (export "mem"(memory 0)) (func (export "kernel_run") diff --git a/src/lib_scoru_wasm/test/test_input.ml b/src/lib_scoru_wasm/test/test_input.ml index 2db06c725099..087709545b4e 100644 --- a/src/lib_scoru_wasm/test/test_input.ml +++ b/src/lib_scoru_wasm/test/test_input.ml @@ -94,17 +94,16 @@ let read_input () = Host_funcs.Aux.read_input ~input_buffer ~memory - ~level_offset:4l - ~id_offset:10l + ~info_addr:4l ~dst:50l ~max_bytes:36000l in assert (Input_buffer.num_elements input_buffer = Z.zero) ; assert (result = 5l) ; - let* m = Memory.load_bytes memory 4l 1 in - assert (m = "\002") ; - let* m = Memory.load_bytes memory 10l 1 in - assert (m = "\002") ; + let* m = Memory.load_bytes memory 4l 4 in + assert (m = "\002\000\000\000") ; + let* m = Memory.load_bytes memory 8l 4 in + assert (m = "\002\000\000\000") ; let* m = Memory.load_bytes memory 50l 5 in assert (m = "hello") ; Lwt.return @@ Result.return_unit @@ -119,8 +118,7 @@ let read_input_no_messages () = Host_funcs.Aux.read_input ~input_buffer ~memory - ~level_offset:4l - ~id_offset:10l + ~info_addr:4l ~dst:50l ~max_bytes:36000l in @@ -128,34 +126,6 @@ let read_input_no_messages () = assert (result = 0l) ; Lwt.return @@ Result.return_unit -let read_input_too_large () = - let open Lwt.Syntax in - let lim = Types.(MemoryType {min = 100l; max = Some 1000l}) in - let memory = Memory.alloc lim in - let input_buffer = Input_buffer.alloc () in - let* () = - Input_buffer.enqueue - input_buffer - { - raw_level = 2l; - message_counter = Z.of_int 2; - payload = Bytes.make 5000 '\000'; - } - in - assert (Input_buffer.num_elements input_buffer = Z.one) ; - let* result = - Host_funcs.Aux.read_input - ~input_buffer - ~memory - ~level_offset:4l - ~id_offset:10l - ~dst:50l - ~max_bytes:36000l - in - assert (Input_buffer.num_elements input_buffer = Z.zero) ; - assert (result = Host_funcs.Error.(code Input_output_too_large)) ; - Lwt.return @@ Result.return_unit - let test_host_fun () = let open Lwt.Syntax in let input = Input_buffer.alloc () in @@ -175,9 +145,7 @@ let test_host_fun () = module_inst.memories in let module_inst = {module_inst with memories} in - let values = - Values.[Num (I32 4l); Num (I32 10l); Num (I32 50l); Num (I32 3600l)] - in + let values = Values.[Num (I32 4l); Num (I32 50l); Num (I32 3600l)] in let module_reg = Instance.ModuleMap.create () in let module_key = Instance.Module_key "test" in @@ -195,10 +163,10 @@ let test_host_fun () = let* module_inst = Instance.resolve_module_ref module_reg module_key in let* memory = Lazy_vector.Int32Vector.get 0l module_inst.memories in assert (Input_buffer.num_elements input = Z.zero) ; - let* m = Memory.load_bytes memory 4l 1 in - assert (m = "\002") ; - let* m = Memory.load_bytes memory 10l 1 in - assert (m = "\002") ; + let* m = Memory.load_bytes memory 4l 4 in + assert (m = "\002\000\000\000") ; + let* m = Memory.load_bytes memory 8l 4 in + assert (m = "\002\000\000\000") ; let* m = Memory.load_bytes memory 50l 5 in assert (m = "hello") ; assert (result = Values.[Num (I32 5l)]) ; @@ -209,6 +177,5 @@ let tests = tztest "Write input" `Quick write_input; tztest "Read input" `Quick read_input; tztest "Read input no messages" `Quick read_input_no_messages; - tztest "Read input too large" `Quick read_input_too_large; tztest "Host read input" `Quick test_host_fun; ] diff --git a/src/lib_scoru_wasm/test/test_output.ml b/src/lib_scoru_wasm/test/test_output.ml index 7369e7a2f54a..108224140190 100644 --- a/src/lib_scoru_wasm/test/test_output.ml +++ b/src/lib_scoru_wasm/test/test_output.ml @@ -75,8 +75,7 @@ let test_aux_write_output () = Host_funcs.Aux.read_input ~input_buffer ~memory - ~level_offset:4l - ~id_offset:10l + ~info_addr:4l ~dst:50l ~max_bytes:36000l in @@ -128,9 +127,7 @@ let test_write_host_fun () = module_inst.memories in let module_inst = {module_inst with memories} in - let values = - Values.[Num (I32 4l); Num (I32 10l); Num (I32 50l); Num (I32 3600l)] - in + let values = Values.[Num (I32 4l); Num (I32 50l); Num (I32 3600l)] in let module_reg = Instance.ModuleMap.create () in let module_key = Instance.Module_key "test" in diff --git a/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wasm b/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wasm index 2e9d2ab87cad999144960792b7a441ee88364e1c..383db3bebf9adb36eac791f54ea6a70e18835827 100644 GIT binary patch delta 118 zcmbQrJcF5+A+b1@k%57MQG-2!c_QCx#w8PXnS}>1verBPW6)(_P-J%e!=TT|pva^E z=CUY&d8`VI0xXJb3M>lDZY&N8433Oh3XG17*#eAGtO~3OOb|i#ECn_JMk#J?Zdpdg LddEAHof(4w0G$)6 delta 115 zcmbQiJe8S`A+b1@k%57MQIkD^rG6ssYQ_ZFiL?$m?0vJSqhAfjM)N=Qrz6!3XF{Pj&~Rx KKTLLG3<3c9$`srH diff --git a/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wast b/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wast index c0f419c3fe2d..99026dba63a0 100644 --- a/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wast +++ b/src/proto_alpha/lib_protocol/test/integration/wasm_kernel/echo.wast @@ -1,6 +1,6 @@ (module - (type $read_t (func (param i32 i32 i32 i32) (result i32))) + (type $read_t (func (param i32 i32 i32) (result i32))) (type $write_t (func (param i32 i32) (result i32))) (type $store_w_t (func (param i32 i32 i32 i32 i32) (result i32))) @@ -59,30 +59,33 @@ (func $write_message (param $input_offset i32) (param $size i32) (local $internal i32) (local $external i32) - (local $input_header i32) + (local $message_tag i32) + (local $internal_transfer_tag i32) (local $payload_size i32) - (local.set $internal (i32.load16_u (i32.const 124))) (local.set $external (i32.load8_u (i32.const 126))) - (local.set $input_header + (local.set $internal (i32.load16_u (i32.const 124))) + (local.set $message_tag + (i32.load8_u (local.get $input_offset))) + (local.set $internal_transfer_tag (i32.load16_u (local.get $input_offset))) (local.set $payload_size (call $internal_payload_size (local.get $size))) (if - (i32.eq (local.get $input_header) (local.get $internal)) + (i32.eq (local.get $message_tag) (local.get $external)) (then - (call $write_output ;;See comment for the internal message representation - (i32.add (local.get $input_offset) (i32.const 7)) - (local.get $payload_size)) + (call $write_output + (i32.add (local.get $input_offset) (i32.const 1)) ;;Remove the header + (i32.sub (local.get $size) (i32.const 1))) ;;Size without the header (drop)) (else (if - (i32.eq (local.get $input_header) (local.get $external)) + (i32.eq (local.get $internal_transfer_tag) (local.get $internal)) (then - (call $write_output - (i32.add (local.get $input_offset) (i32.const 1)) ;;Remove the header - (i32.sub (local.get $size) (i32.const 1))) ;;Size without the header + (call $write_output ;;See comment for the internal message representation + (i32.add (local.get $input_offset) (i32.const 7)) + (local.get $payload_size)) (drop)) ) ) @@ -92,8 +95,7 @@ (func (export "kernel_run") (local $size i32) (local.set $size (call $read_input - (i32.const 220) ;; level_offset - (i32.const 240) ;; id_offset + (i32.const 220) ;; info_addr (i32.const 260) ;; dst (i32.const 3600))) ;; max_bytes diff --git a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_wasm.ml b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_wasm.ml index f98b361e02fc..184147b9d8c5 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_wasm.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_wasm.ml @@ -166,7 +166,6 @@ let make_transactions () = let test_output () = let open Lwt_result_syntax in let level_offset = 20 in - let id_offset = 40 in let dst = 60 in let max_bytes = 3600 in let dst_without_header = dst + 2 in @@ -174,52 +173,45 @@ let test_output () = Format.sprintf {| (module - (type (;0;) (func (param i32 i32 i32 i32 i32) (result i32))) (type $t0 (func (param i32 i32) (result i32))) - (type $t3 (func (param i32 i32 i32 i32) (result i32))) + (type $t3 (func (param i32 i32 i32) (result i32))) (import "smart_rollup_core" "read_input" (func $read_input (type $t3))) (import "smart_rollup_core" "write_output" (func $write_output (type $t0))) + (memory 1) + (export "memory" (memory 0)) (func (export "kernel_run") (local $size i32) (local.set $size (call $read_input - (i32.const %d) - (i32.const %d) - (i32.const %d) - (i32.const %d))) + (i32.const %d) + (i32.const %d) + (i32.const %d))) (call $write_output (i32.const %d) (i32.sub (local.get $size) (i32.const 2))) (local.set $size (call $read_input - (i32.const %d) - (i32.const %d) - (i32.const %d) - (i32.const %d))) + (i32.const %d) + (i32.const %d) + (i32.const %d))) (call $write_output (i32.const %d) (i32.sub (local.get $size) (i32.const 2))) (local.set $size (call $read_input - (i32.const %d) - (i32.const %d) - (i32.const %d) - (i32.const %d))) + (i32.const %d) + (i32.const %d) + (i32.const %d))) (call $write_output (i32.const %d) (local.get $size)) drop) - (memory (;0;) 17) - (export "memory" (memory 0)) ) |} level_offset - id_offset dst max_bytes dst_without_header level_offset - id_offset dst max_bytes dst_without_header level_offset - id_offset dst max_bytes dst_without_header diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml index c8e4b49a7cf2..54cf62dadbf4 100644 --- a/tezt/lib_tezos/constant.ml +++ b/tezt/lib_tezos/constant.ml @@ -134,4 +134,4 @@ let tz4_account : Account.key = (** The `echo` kernel that is listed in the “Smart Optimistic Rollups” section of the reference manual. *) let wasm_echo_kernel_boot_sector = - "0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f777269746500020304030304050503010001071402036d656d02000a6b65726e656c5f72756e00050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101" + "0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out index f9774b963fed..50e42ad10e6c 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f777269746500020304030304050503010001071402036d656d02000a6b65726e656c5f72756e00050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001042 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001042 - payload fees(the block proposer) ....... +ꜩ0.001042 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: string - Boot sector Blake2B hash: '95aeb083b06a247d054e262efe694094441867263749a259d3b21a9b728b08b1' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out index 6771c460f68e..6c5ee9a79eef 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f777269746500020304030304050503010001071402036d656d02000a6b65726e656c5f72756e00050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001042 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001042 - payload fees(the block proposer) ....... +ꜩ0.001042 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '95aeb083b06a247d054e262efe694094441867263749a259d3b21a9b728b08b1' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out index 77d44829e261..c27c85cc34fb 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f777269746500020304030304050503010001071402036d656d02000a6b65726e656c5f72756e00050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001042 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001042 - payload fees(the block proposer) ....... +ꜩ0.001042 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '95aeb083b06a247d054e262efe694094441867263749a259d3b21a9b728b08b1' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out index ca494197daaf..b8a1e6977ca4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f777269746500020304030304050503010001071402036d656d02000a6b65726e656c5f72756e00050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001042 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001042 - payload fees(the block proposer) ....... +ꜩ0.001042 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: string - Boot sector Blake2B hash: '95aeb083b06a247d054e262efe694094441867263749a259d3b21a9b728b08b1' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out index f8436657219e..cac76e76ebdf 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001290760047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa001042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b4901047f41fc002f0100210241fe002d0000210320002f0100210420011004210520042002460440200041076a200510011a0520042003460440200041016a200141016b10011a0b0b0b2001017f41dc0141f00141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001091 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001091 - payload fees(the block proposer) ....... +ꜩ0.001091 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '8537f1764abb8d3049d6f76f34bce068a92a2f51b88a5fbc95eecdf7abec0470' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes @@ -58,7 +58,7 @@ This sequence of operations was run: Consumed gas: 1001.351 -./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300024d8e5ef93440869a8fd48ffb2cb3f37ac4fac226cbdd60680b111fd7097d87434d8e5ef93440869a8fd48ffb2cb3f37ac4fac226cbdd60680b111fd7097d87430005820764757261626c65d0e8a817e60967e8c46f33eed87feaa39c330d71106cf380bdf2d7cd542f43087003746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b94d8e5ef93440869a8fd48ffb2cb3f37ac4fac226cbdd60680b111fd7097d87430000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10 +./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002aed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374caed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374c0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b9aed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374c0000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10 Node is bootstrapped. Estimated gas: 5926.242 units (will add 100 for safety) Estimated storage: 5 bytes added (will add 20 for safety) diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out index 645ee85da28e..caad55249277 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001290760047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa001042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b4901047f41fc002f0100210241fe002d0000210320002f0100210420011004210520042002460440200041076a200510011a0520042003460440200041016a200141016b10011a0b0b0b2001017f41dc0141f00141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001091 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001091 - payload fees(the block proposer) ....... +ꜩ0.001091 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '8537f1764abb8d3049d6f76f34bce068a92a2f51b88a5fbc95eecdf7abec0470' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.633 -./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300026dab147ae9baa46ccc2693376e823f40b958d678213bd6886cdf9f74723fea206dab147ae9baa46ccc2693376e823f40b958d678213bd6886cdf9f74723fea200005820764757261626c65d0e8a817e60967e8c46f33eed87feaa39c330d71106cf380bdf2d7cd542f43087003746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb056dab147ae9baa46ccc2693376e823f40b958d678213bd6886cdf9f74723fea200000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10 +./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000218e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd718e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd70005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0518e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd70000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10 Node is bootstrapped. Estimated gas: 5920.738 units (will add 100 for safety) Estimated storage: 5 bytes added (will add 20 for safety) diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out index 13c5aea95d6e..1e89272b5645 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001290760047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa001042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b4901047f41fc002f0100210241fe002d0000210320002f0100210420011004210520042002460440200041076a200510011a0520042003460440200041016a200141016b10011a0b0b0b2001017f41dc0141f00141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001091 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001091 - payload fees(the block proposer) ....... +ꜩ0.001091 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '8537f1764abb8d3049d6f76f34bce068a92a2f51b88a5fbc95eecdf7abec0470' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes @@ -58,7 +58,7 @@ This sequence of operations was run: Consumed gas: 1001.364 -./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002ce284fdf440dd5a48f454ebe6ef3b52586f83f9584310ade86701b5518fdce38ce284fdf440dd5a48f454ebe6ef3b52586f83f9584310ade86701b5518fdce380005820764757261626c65d0e8a817e60967e8c46f33eed87feaa39c330d71106cf380bdf2d7cd542f43087003746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b9ce284fdf440dd5a48f454ebe6ef3b52586f83f9584310ade86701b5518fdce3800000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10 +./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300022e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a42e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a40005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b92e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a400000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10 Node is bootstrapped. Estimated gas: 5927.548 units (will add 100 for safety) Estimated storage: 5 bytes added (will add 20 for safety) diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out index 0bde2ae70bc5..70422f848359 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out @@ -1,5 +1,5 @@ -./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001290760047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa001042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b4901047f41fc002f0100210241fe002d0000210320002f0100210420011004210520042002460440200041076a200510011a0520042003460440200041016a200141016b10011a0b0b0b2001017f41dc0141f00141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 +./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes booting with 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999 Node is bootstrapped. Estimated gas: 3169.941 units (will add 100 for safety) Estimated storage: 6532 bytes added (will add 20 for safety) @@ -12,17 +12,17 @@ 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.001091 + Fee to the baker: ꜩ0.001094 Expected counter: 1 Gas limit: 3270 Storage limit: 6552 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.001091 - payload fees(the block proposer) ....... +ꜩ0.001091 + [PUBLIC_KEY_HASH] ... -ꜩ0.001094 + payload fees(the block proposer) ....... +ꜩ0.001094 Smart contract rollup origination: Kind: wasm_2_0_0 Parameter type: bytes - Boot sector Blake2B hash: '8537f1764abb8d3049d6f76f34bce068a92a2f51b88a5fbc95eecdf7abec0470' + Boot sector Blake2B hash: '24df9e3c520dd9a9c49b447766e8a604d31138c1aacb4a67532499c6a8b348cc' This smart contract rollup origination was successfully applied Consumed gas: 3169.941 Storage size: 6532 bytes @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.633 -./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000241ea58cb975fa01cd4f21aaf3366746d0f0589c76d636216e686d9754aa4835b41ea58cb975fa01cd4f21aaf3366746d0f0589c76d636216e686d9754aa4835b0005820764757261626c65d0e8a817e60967e8c46f33eed87feaa39c330d71106cf380bdf2d7cd542f43087003746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0541ea58cb975fa01cd4f21aaf3366746d0f0589c76d636216e686d9754aa4835b00000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10 +./octez-client --wait none execute outbox message of sc rollup '[SC_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000220b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe20b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0520b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe00000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10 Node is bootstrapped. Estimated gas: 5922.044 units (will add 100 for safety) Estimated storage: 5 bytes added (will add 20 for safety) -- GitLab