infra: sync with main from gl tezos kernel repo on commit d4585026

.gitignore

@@ -2,4 +2,4 @@
 target/
 _build
 preimage
-
+stripped_debug_kernel.wasm

.gitlab-ci.yml

@@ -1,6 +1,24 @@
-run_everything:
-  image: nixos/nix
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+
+stages:
+  - test
+  - build
+
+cargo-test:
+  stage: test
+  image: rust
+  script:
+    - rustup component add clippy rustfmt
+    - cargo fmt --check
+    - cargo clippy -- -D warnings
+    - cargo test
+
+cargo-build:
+  stage: build
+  image: rust
   variables:
     TZWITTER_L1_CONTRACT: "KT1..."
   script:
-    - nix develop --experimental-features "nix-command flakes" --extra-substituters https://tezos.nix-cache.workers.dev  --extra-trusted-public-keys tezos-nix-cache.marigold.dev-1:4nS7FPPQPKJIaNQcbwzN6m7kylv16UCWWgjeZZr2wXA=  --command cargo make ci
+    - cargo build --release

00_debug_kernel/Cargo.toml

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2022 Marigold <[email protected]>
+# SPDX-FileCopyrightText: 2022 Nomadic Labs <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
 [package]
 name = "debug-kernel"
 version = "0.1.0"
@@ -7,4 +12,4 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-tezos-smart-rollup = "0.1.0"
+tezos-smart-rollup = "0.2.1"

00_debug_kernel/README.md

@@ -6,23 +6,23 @@ and read from the shared inbox.
 ## Running the example
 
 First, compile the kernel to WASM with Cargo:
+
 <!-- $MDX skip -->
+
 ```sh
 $ cargo build --release --target wasm32-unknown-unknown
 ```
 
 Then you can execute the kernel locally against the provided inputs (empty in this example) and commands:
+
 ```sh
-$ octez-smart-rollup-wasm-debugger \
-> ../target/wasm32-unknown-unknown/release/debug_kernel.wasm \
-> --inputs ./inputs.json \
-> --commands ./commands.json
+octez-smart-rollup-wasm-debugger ../target/wasm32-unknown-unknown/release/debug_kernel.wasm --inputs ./inputs.json <<< $(cat ./commands.txt)
 Loaded 0 inputs at level 0
 Hello from kernel!
 Evaluation took 222965 ticks so far
 Status: Evaluating
 Internal_status: Evaluation succeeded
 ```
 
-Additionally, you can omit the `--commands` flag to enter a REPL mode and
-explore the execution of the kernel interactively. Try it out!
+Additionally, you can omit the `<<< $(cat ./commands.txt)` to enter a REPL mode and
+explore the execution of the kernel interactively.

00_debug_kernel/commands.txt

@@ -0,0 +1,2 @@
+load inputs
+step result

00_debug_kernel/src/lib.rs

@@ -1,3 +1,8 @@
+// SPDX-FileCopyrightText: 2022 Marigold <[email protected]>
+// SPDX-FileCopyrightText: 2022 Nomadic Labs <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
 extern crate alloc;
 
 use tezos_smart_rollup::{kernel_entry, prelude::*};

01_storage_kernel/Cargo.toml

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+# SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
 [package]
 name = "storage-kernel"
 version = "0.1.0"
@@ -7,4 +12,4 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-tezos-smart-rollup = {version = "0.1.0", features = ["testing"]}
+tezos-smart-rollup = {version = "0.2.0", features = ["testing"]}

01_storage_kernel/README.md

@@ -9,25 +9,29 @@ Additionally, we introduce the Mock Host to enable a simple unit test of our ker
 Run the unit test with `cargo test`:
 
 <!-- $MDX skip -->
+
 ```sh
 $ cargo test
 ```
 
 To run the kernel locally, compile the kernel to WASM with Cargo:
+
 <!-- $MDX skip -->
+
 ```sh
 $ cargo build --release --target wasm32-unknown-unknown
 ```
 
 Then you can execute the kernel against the provided inputs (empty in this example) and commands:
+
 ```sh
-$ octez-smart-rollup-wasm-debugger \
-> ../target/wasm32-unknown-unknown/release/storage_kernel.wasm \
-> --inputs ./inputs.json \
-> --commands ./commands.json
+$ octez-smart-rollup-wasm-debugger ../target/wasm32-unknown-unknown/release/storage_kernel.wasm --inputs ./inputs.json <<< $(cat ./commands.txt)
 68656c6c6f20776f726c64
 Loaded 0 inputs at level 0
 Evaluation took 235916 ticks so far
 Status: Evaluating
 Internal_status: Evaluation succeeded
 ```
+
+Additionally, you can omit the `<<< $(cat ./commands.txt)` to enter a REPL mode and
+explore the execution of the kernel interactively.

01_storage_kernel/commands.txt

@@ -0,0 +1,3 @@
+load inputs
+step result
+show key /greeting

01_storage_kernel/src/lib.rs

@@ -1,3 +1,8 @@
+// SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+// SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
 extern crate alloc;
 
 use tezos_smart_rollup::{kernel_entry, prelude::*, storage::path::OwnedPath};

02_reboot_kernel/Cargo.toml

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+# SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
 [package]
 name = "reboot-kernel"
 version = "0.1.0"
@@ -7,4 +12,4 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-tezos-smart-rollup = "0.1.0"
+tezos-smart-rollup = "0.2.1"

02_reboot_kernel/README.md

@@ -6,17 +6,17 @@ the kernel and learn how to mark the kernel for reboot at runtime.
 ## Running the example
 
 First, compile the kernel to WASM with Cargo:
+
 <!-- $MDX skip -->
+
 ```sh
 $ cargo build --release --target wasm32-unknown-unknown
 ```
 
 Then you can execute the kernel locally against the provided inputs (empty in this example) and commands:
+
 ```sh
-$ octez-smart-rollup-wasm-debugger \
-> ../target/wasm32-unknown-unknown/release/reboot_kernel.wasm \
-> --inputs ./inputs.json \
-> --commands ./commands.json
+$ octez-smart-rollup-wasm-debugger ../target/wasm32-unknown-unknown/release/reboot_kernel.wasm --inputs ./inputs.json <<< $(cat ./commands.txt)
 Loaded 0 inputs at level 0
 Hello from kernel!
 Evaluation took 256897 ticks so far
@@ -36,5 +36,5 @@ Status: Evaluating
 Internal_status: Evaluation succeeded
 ```
 
-Additionally, you can omit the `--commands` flag to enter a REPL mode and
-explore the execution of the kernel interactively. Try it out!
+Additionally, you can omit the `<<< $(cat ./commands.txt)` to enter a REPL mode and
+explore the execution of the kernel interactively.

02_reboot_kernel/commands.txt

@@ -0,0 +1,5 @@
+load inputs
+step result
+step result
+step result
+step result

02_reboot_kernel/src/lib.rs

@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
 use tezos_smart_rollup::{kernel_entry, prelude::*, storage::path::OwnedPath};
 
 /// In this example, we'll begin to explore the control
@@ -24,7 +28,7 @@ use tezos_smart_rollup::{kernel_entry, prelude::*, storage::path::OwnedPath};
 /// a single call to the entry function; instead, mark
 /// it for reboot, exit, and process the remaining inputs
 /// in the next call.
-fn entry(host: &mut impl Runtime) {
+pub fn entry(host: &mut impl Runtime) {
     debug_msg!(host, "Hello from kernel!\n");
     let greeting_path: OwnedPath = "/greeting".as_bytes().to_vec().try_into().unwrap();
     let _ = Runtime::store_write(host, &greeting_path, "hello world".as_bytes(), 0);

03_inbox_kernel/Cargo.toml

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+# SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
 [package]
 name = "inbox-kernel"
 version = "0.1.0"
@@ -7,4 +12,4 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-tezos-smart-rollup = "0.1.0"
+tezos-smart-rollup = "0.2.1"

03_inbox_kernel/README.md

@@ -3,17 +3,17 @@
 ## Running the example
 
 To run the kernel locally, compile the kernel to WASM with Cargo:
+
 <!-- $MDX skip -->
+
 ```sh
 $ cargo build --release --target wasm32-unknown-unknown
 ```
 
 Then you can execute the kernel against the provided inputs and commands:
+
 ```sh
-$ octez-smart-rollup-wasm-debugger \
-> ../target/wasm32-unknown-unknown/release/inbox_kernel.wasm \
-> --inputs ./inputs.json \
-> --commands ./commands.json
+$ octez-smart-rollup-wasm-debugger ../target/wasm32-unknown-unknown/release/inbox_kernel.wasm --inputs ./inputs.json <<< $(cat ./commands.txt)
 Loaded 2 inputs at level 0
 Inbox level: 0 Internal message: start of level
 Inbox level: 0 Internal message: level info (block predecessor: BKiHLREqU3JkXfzEDYAkmmfX48gBDtYhMrpA98s7Aq4SzbUAB6M, predecessor_timestamp: 1970-01-01T00:00:00Z
@@ -24,3 +24,6 @@ Evaluation took 1093784 ticks so far
 Status: Evaluating
 Internal_status: Evaluation succeeded
 ```
+
+Additionally, you can omit the `<<< $(cat ./commands.txt)` to enter a REPL mode and
+explore the execution of the kernel interactively.

03_inbox_kernel/commands.txt

@@ -0,0 +1,2 @@
+load inputs
+step result

03_inbox_kernel/src/lib.rs

@@ -1,3 +1,8 @@
+// SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+// SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
 use tezos_smart_rollup::{
     inbox::{InboxMessage, InternalInboxMessage},
     kernel_entry,
@@ -39,7 +44,7 @@ fn read_inbox_message<Expr: Michelson>(host: &mut impl Runtime) {
                 match InboxMessage::<Expr>::parse(message.as_ref()) {
                     Ok(parsed_msg) => match parsed_msg {
                         (remaining, InboxMessage::Internal(msg)) => {
-                            assert!(remaining.is_empty());
+                            debug_assert!(remaining.is_empty());
                             match msg {
                                 InternalInboxMessage::StartOfLevel => {
                                     // The "Start of level" message is pushed by the Layer 1
@@ -78,8 +83,8 @@ fn read_inbox_message<Expr: Michelson>(host: &mut impl Runtime) {
                             // For a simple practical example, see `counter-kernel`, where
                             // external messages are used to encode the state transitions
                             // of a counter.
-                            assert!(remaining.is_empty());
-                            let message = String::from_utf8_lossy(&msg);
+                            debug_assert!(remaining.is_empty());
+                            let message = String::from_utf8_lossy(msg);
                             debug_msg!(host, "External message: \"{}\"\n", message);
                         }
                     },
@@ -107,7 +112,7 @@ fn read_inbox_message<Expr: Michelson>(host: &mut impl Runtime) {
     }
 }
 
-fn entry(host: &mut impl Runtime) {
+pub fn entry(host: &mut impl Runtime) {
     // Every rollup has a Michelson type, declared at origination, which
     // represents the kind of data it can receive via internal transfer
     // messages. We won't delve into this here - for simplicity, the type

04_filtering_kernel/Cargo.toml

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2023 Marigold <[email protected]>
+# SPDX-FileCopyrightText: 2023 Nomadic Labs <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
 [package]
 name = "filtering-kernel"
 version = "0.1.0"
@@ -7,4 +12,4 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-tezos-smart-rollup = "0.1.0"
+tezos-smart-rollup = "0.2.1"

04_filtering_kernel/README.md

@@ -5,25 +5,29 @@
 Run the unit test with `cargo test`:
 
 <!-- $MDX skip -->
+
 ```sh
 $ cargo test
 ```
 
 To run the kernel locally, compile the kernel to WASM with Cargo:
+
 <!-- $MDX skip -->
+
 ```sh
 $ cargo build --release --target wasm32-unknown-unknown
 ```
 
 Then you can execute the kernel against the provided inputs (empty in this example) and commands:
+
 ```sh
-$ octez-smart-rollup-wasm-debugger \
-> ../target/wasm32-unknown-unknown/release/filtering_kernel.wasm \
-> --inputs ./inputs.json \
-> --commands ./commands.json
+$ octez-smart-rollup-wasm-debugger ../target/wasm32-unknown-unknown/release/filtering_kernel.wasm --inputs ./inputs.json <<< $(cat ./commands.txt)
 Loaded 2 inputs at level 0
 External message: "This message is for me"
 Evaluation took 417738 ticks so far
 Status: Evaluating
 Internal_status: Evaluation succeeded
 ```
+
+Additionally, you can omit the `<<< $(cat ./commands.txt)` to enter a REPL mode and
+explore the execution of the kernel interactively.

04_filtering_kernel/commands.txt

@@ -0,0 +1,2 @@
+load inputs
+step result