Merge branch 'main' into enable-messaging-build

Author: kariy

.devcontainer/Dockerfile

@@ -1,32 +1,20 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust/.devcontainer/base.Dockerfile
+# See here for image contents: https://hub.docker.com/layers/library/rust/1.81.0-slim/images/sha256-ba4ee661bb466ab49f6ceb8c6d9e9f9784bba7c6e45225187cd3c7fb1fbc12ce
 
-# [Choice] Debian OS version (use bookworm on local arm64/Apple Silicon): buster, bullseye, bookworm
-
-ARG VARIANT
-FROM mcr.microsoft.com/vscode/devcontainers/rust:${VARIANT}
-ARG VARIANT
+ARG RUST_VERSION=1.81.0
+FROM rust:${RUST_VERSION}-slim
+ARG RUST_VERSION
 
 # Install additional packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends protobuf-compiler libprotobuf-dev libclang-dev libzstd-dev
-
-RUN apt install -y gh libgmp3-dev software-properties-common
+    && apt-get -y install --no-install-recommends protobuf-compiler libprotobuf-dev libclang-dev libzstd-dev make pkg-config libssl-dev
 
-# Install Cairo Native dependencies
-RUN curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null
-RUN echo "deb http://apt.llvm.org/${VARIANT}/ llvm-toolchain-${VARIANT}-17 main" | tee /etc/apt/sources.list.d/llvm.list && apt-get update
-RUN apt-get -y install -t llvm-toolchain-${VARIANT}-17 llvm-17 llvm-17-dev llvm-17-runtime clang-17 clang-tools-17 lld-17 libpolly-17-dev libmlir-17-dev mlir-17-tools
+RUN apt-get install -y gh libgmp3-dev software-properties-common curl git
 
 RUN curl -L https://foundry.paradigm.xyz/ | bash && . /root/.bashrc && foundryup
 ENV PATH="${PATH}:/root/.foundry/bin"
 
-# To build Katana with 'native' feature, we need to set the following environment variables
-ENV MLIR_SYS_170_PREFIX=/usr/lib/llvm-17
-ENV LLVM_SYS_170_PREFIX=/usr/lib/llvm-17
-ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17
-
 # To allow independent workflow of the container, the rust-toolchain is explicitely given.
-RUN echo "1.80.0" > rust_toolchain_version
+RUN echo ${RUST_VERSION} > rust_toolchain_version
 # Make sure to sync the nightly version with the scripts in ./scripts
 RUN echo "nightly-2024-08-28" > nightly_rust_toolchain_version
 

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust
 {
 	"name": "Rust",
-	"image": "ghcr.io/dojoengine/dojo-dev:v1.0.12",
+	"image": "ghcr.io/dojoengine/dojo-dev:b37b325",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

.github/workflows/bench.yml

@@ -14,7 +14,7 @@ jobs:
   bench-katana:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -36,7 +36,7 @@ jobs:
   bench-sozo:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

.github/workflows/ci.yml

@@ -8,12 +8,14 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.80.0
+  RUST_VERSION: 1.81.0
 
 jobs:
   build:
     runs-on: ubuntu-latest-4-cores
     needs: [fmt, cairofmt]
+    container:
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -32,7 +34,7 @@ jobs:
     needs: ensure-docker
     runs-on: ubuntu-latest-32-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -58,7 +60,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -92,7 +94,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: debian:bookworm-slim
+      image: ubuntu:noble
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -114,7 +116,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.8.4"
+          scarb-version: "2.9.2"
       - run: |
           scarb --manifest-path examples/spawn-and-move/Scarb.toml fmt --check
           scarb --manifest-path examples/simple/Scarb.toml fmt --check
@@ -124,9 +126,10 @@ jobs:
   dojo-core-test:
     needs: build
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
     steps:
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.9.2"
       - uses: actions/download-artifact@v4
         with:
           name: dojo-bins
@@ -137,27 +140,31 @@ jobs:
           /tmp/bins/sozo --manifest-path crates/dojo/core/Scarb.toml test
           /tmp/bins/sozo --manifest-path crates/dojo/core-cairo-test/Scarb.toml test
 
-  dojo-spawn-and-move-example-test:
+  dojo-examples-test:
     needs: build
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
     steps:
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.9.2"
       - uses: actions/download-artifact@v4
         with:
           name: dojo-bins
           path: /tmp/bins
       - uses: actions/checkout@v3
       - run: |
           chmod +x /tmp/bins/sozo
+          /tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml build
+          /tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml inspect ns-Flatbow
+          /tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml inspect ns-RiverSkale
           /tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml test
           /tmp/bins/sozo --manifest-path examples/simple/Scarb.toml test
 
   clippy:
     runs-on: ubuntu-latest-4-cores
     needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -166,7 +173,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -176,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

.github/workflows/devcontainer.yml

@@ -64,11 +64,11 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
-          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) }}
+          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) || github.event_name == 'workflow_dispatch' }}
           file: .devcontainer/Dockerfile
           tags: ghcr.io/${{ github.repository }}-dev:latest,ghcr.io/${{ github.repository }}-dev:${{ env.DOCKER_TAG }}
           build-args: |
-            VARIANT=bookworm
+            RUST_VERSION=1.81.0
             BUILD_TYPE=${{ github.event_name }}
             DOJO_VERSION=${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64

.github/workflows/release-dispatch.yml

@@ -14,7 +14,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.12
+      image: ghcr.io/dojoengine/dojo-dev:b37b325
     env:
       VERSION: ""
     steps:

.tool-versions

@@ -1,2 +1,2 @@
-scarb 2.8.4
+scarb 2.9.2
 starknet-foundry 0.30.0