Merge branch 'main' into processors-crate

Author: Larkooo

.devcontainer/Dockerfile

@@ -1,19 +1,21 @@
-# See here for image contents: https://hub.docker.com/layers/library/rust/1.81.0-slim/images/sha256-ba4ee661bb466ab49f6ceb8c6d9e9f9784bba7c6e45225187cd3c7fb1fbc12ce
-
 ARG RUST_VERSION=1.85.0
-FROM rust:${RUST_VERSION}-slim
+FROM ubuntu:24.04
 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 make pkg-config libssl-dev
+    && apt-get -y install --no-install-recommends protobuf-compiler libprotobuf-dev libclang-dev libzstd-dev make pkg-config libssl-dev gcc
 
 RUN apt-get install -y gh libgmp3-dev software-properties-common curl git unzip
 
+# Install rust.
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain ${RUST_VERSION}
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 # To allow independent workflow of the container, the rust-toolchain is explicitely given.
 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
+RUN echo "nightly-2025-02-20" > nightly_rust_toolchain_version
 
 # Install cargo-binstall
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
@@ -24,7 +26,7 @@ RUN rustup toolchain install $(cat rust_toolchain_version) && \
     rustup component add rustfmt
 
 RUN rustup toolchain install $(cat nightly_rust_toolchain_version) && \
-	rustup component add rustfmt clippy --toolchain $(cat nightly_rust_toolchain_version)
+        rustup component add rustfmt clippy --toolchain $(cat nightly_rust_toolchain_version)
 
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add wasm32-unknown-unknown
@@ -40,8 +42,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
     rm -r hurl-4.1.0-aarch64-unknown-linux-gnu && \
     rm hurl.tar.gz && \
     rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-aarch64-unknown-linux-gnu; \
-    curl -L https://go.dev/dl/go1.24.2.linux-arm64.tar.gz -o go.tar.gz; \
-    curl -L https://github.com/dojoengine/dojo/releases/download/v1.4.1/dojo_v1.4.1_linux_arm64.tar.gz -o dojo.tar.gz; \
+    curl -L https://github.com/asdf-vm/asdf/releases/download/v0.16.7/asdf-v0.16.7-linux-arm64.tar.gz -o asdf.tar.gz; \
     elif [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
     curl -L https://github.com/Orange-OpenSource/hurl/releases/download/4.1.0/hurl-4.1.0-x86_64-unknown-linux-gnu.tar.gz -o hurl.tar.gz && \
     tar -xzf hurl.tar.gz && \
@@ -50,24 +51,13 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
     rm hurl.tar.gz && \
     rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-x86_64-unknown-linux-gnu && \
     rustup target add x86_64-fortanix-unknown-sgx --toolchain $(cat nightly_rust_toolchain_version); \
-    curl -L https://go.dev/dl/go1.24.2.linux-amd64.tar.gz -o go.tar.gz; \
-    curl -L https://github.com/dojoengine/dojo/releases/download/v1.4.1/dojo_v1.4.1_linux_amd64.tar.gz -o dojo.tar.gz; \
+    curl -L https://github.com/asdf-vm/asdf/releases/download/v0.16.7/asdf-v0.16.7-linux-amd64.tar.gz -o asdf.tar.gz; \
     fi
 
-# Don't use asdf for dojo, since it's aarch64 for asdf, but dojo uses `arm64`.
-RUN tar -C /usr/local -xzf dojo.tar.gz
-ENV PATH="${PATH}:/usr/local"
-
 # For asdf to be installed for the current platform automatically.
-RUN tar -C /usr/local -xzf go.tar.gz
-ENV PATH="${PATH}:/usr/local/go/bin"
+RUN tar -C /usr/local/bin -xzf asdf.tar.gz
 
-RUN go install github.com/asdf-vm/asdf/cmd/asdf@v0.16.0
 ENV PATH="/root/.asdf/shims:$PATH"
-ENV PATH="${PATH}:/root/go/bin"
 
 RUN asdf plugin add scarb
 RUN asdf install scarb 2.9.4
-
-RUN chown -R root:root /usr/local/cargo
-RUN chmod -R 700 /usr/local/cargo

.github/workflows/devcontainer.yml

@@ -1,4 +1,4 @@
-name: build and push devcontainer
+name: devcontainer
 
 on:
   workflow_dispatch:
@@ -17,6 +17,8 @@ on:
 
 jobs:
   build-and-push:
+    # The runner even if 24.04 doesn't have glibc 2.38+ as it should.
+    # So using a lower glibc version for better compatibility.
     runs-on: ubuntu-latest-4-cores
 
     env:

.github/workflows/release.yml

@@ -47,7 +47,6 @@ jobs:
       PLATFORM_NAME: ${{ matrix.job.platform }}
       TARGET: ${{ matrix.job.target }}
       ARCH: ${{ matrix.job.arch }}
-      CARGO_PROFILE: performance
     strategy:
       matrix:
         job:
@@ -73,6 +72,10 @@ jobs:
             platform: darwin
             target: aarch64-apple-darwin
             arch: arm64
+          - os: windows-latest
+            platform: win32
+            target: x86_64-pc-windows-msvc
+            arch: amd64
 
     steps:
       - uses: actions/checkout@v4
@@ -85,32 +88,10 @@ jobs:
           cache-on-failure: true
           cache-key: ${{ matrix.job.target }}
 
-      - uses: oven-sh/setup-bun@v2
+      - uses: arduino/setup-protoc@v2
         with:
-          bun-version: latest
-
-      - name: Install LLVM dependencies for Linux
-        if: ${{ matrix.job.platform == 'linux' }}
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 19
-          sudo apt-get update -y
-          sudo apt-get install -y g++ llvm-19 llvm-19-dev llvm-19-runtime clang-19 clang-tools-19 lld-19 libpolly-19-dev libmlir-19-dev mlir-19-tools
-          echo "MLIR_SYS_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
-          echo "LLVM_SYS_191_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
-          echo "TABLEGEN_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
-
-      - name: Install LLVM dependencies for macOS
-        if: ${{ matrix.job.platform == 'darwin' }}
-        run: |
-          brew install llvm@19 --quiet
-          brew install zstd
-          echo "MLIR_SYS_190_PREFIX=$(brew --prefix llvm@19)" >> $GITHUB_ENV
-          echo "LLVM_SYS_191_PREFIX=$(brew --prefix llvm@19)" >> $GITHUB_ENV
-          echo "TABLEGEN_190_PREFIX=$(brew --prefix llvm@19)" >> $GITHUB_ENV
-          echo "LIBRARY_PATH=$(brew --prefix zstd)/lib:$LIBRARY_PATH" >> $GITHUB_ENV
-          echo "CPATH=$(brew --prefix zstd)/include:$CPATH" >> $GITHUB_ENV
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: "25.x"
 
       - name: Apple M1 setup
         if: ${{ matrix.job.target == 'aarch64-apple-darwin' }}
@@ -130,21 +111,26 @@ jobs:
       - name: Build binary
         run: |
           cargo --version
-          cargo build -p torii --profile ${CARGO_PROFILE} --target ${{ matrix.job.target }}
+          cargo build -p torii --release --target ${{ matrix.job.target }}
 
       - name: Archive binaries
         id: artifacts
         env:
           VERSION_NAME: ${{ needs.prepare.outputs.tag_name }}
         run: |
           if [ "$PLATFORM_NAME" == "linux" ]; then
-            tar -czvf "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/${CARGO_PROFILE} torii
+            tar -czvf "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release torii
             echo "file_name=torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
           elif [ "$PLATFORM_NAME" == "darwin" ]; then
             # We need to use gtar here otherwise the archive is corrupt.
             # See: https://github.com/actions/virtual-environments/issues/2619
-            gtar -czvf "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/${CARGO_PROFILE} torii
+            gtar -czvf "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release torii
             echo "file_name=torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
+          else
+            cd ./target/${TARGET}/release
+            7z a -tzip "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" torii.exe
+            mv "torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" ../../../
+            echo "file_name=torii_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" >> $GITHUB_OUTPUT
           fi
         shell: bash
 
@@ -153,7 +139,7 @@ jobs:
         if: ${{ env.PLATFORM_NAME == 'linux' }}
         run: |
           mkdir -p $PLATFORM_NAME/$ARCH
-          mv target/${TARGET}/${CARGO_PROFILE}/torii $PLATFORM_NAME/$ARCH
+          mv target/${TARGET}/release/torii $PLATFORM_NAME/$ARCH
         shell: bash
 
       - name: Upload docker binaries
@@ -171,11 +157,12 @@ jobs:
           retention-days: 1
 
   create-draft-release:
-    runs-on: ubuntu-20.04-4-cores
+    runs-on: ubuntu-latest-4-cores
     needs: [prepare, release]
     env:
       GITHUB_USER: ${{ github.repository_owner }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    if: ${{ !contains(needs.prepare.outputs.tag_name, 'preview') }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -189,15 +176,15 @@ jobs:
           echo "version=v$(cargo get workspace.package.version)" >> $GITHUB_OUTPUT
       - name: Display structure of downloaded files
         run: ls -R artifacts
-      - run: gh release create ${{ steps.version_info.outputs.version }} ./artifacts/* --generate-notes --draft
+      - run: gh release create ${{ steps.version_info.outputs.version }} ./artifacts/*.{gz,zip} --generate-notes --draft
 
   docker-build-and-push:
-    runs-on: ubuntu-20.04-4-cores
+    runs-on: ubuntu-latest-4-cores
     needs: [prepare, release]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Download binaries
         uses: actions/download-artifact@v4

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     container:
       image: ghcr.io/dojoengine/torii-dev:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - run: scripts/rust_fmt.sh
 
@@ -26,29 +26,29 @@ jobs:
     container:
       image: ghcr.io/dojoengine/torii-dev:latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      # Workaround for https://github.com/actions/runner-images/issues/6775
-      - run: git config --global --add safe.directory "*"
-
-      - name: Run Clippy
-        run: |
-          ./scripts/clippy.sh
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: ./scripts/clippy.sh
 
   test:
     needs: [fmt, clippy]
     runs-on: ubuntu-latest-32-cores
     container:
       image: ghcr.io/dojoengine/torii-dev:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build Torii binary
+      - name: Check env
+        run: |
+          strings /lib/x86_64-linux-gnu/libc.so.6 | grep GLIBC_
+          ldd --version
+
+      # This puts Katana in the path for integration tests.
+      - name: Download Katana for integration tests
         run: |
-          cargo build --release --bin torii
-          echo "$PWD/target/release" >> $GITHUB_PATH
+          curl -L https://github.com/dojoengine/katana/releases/download/v1.5.0-alpha.2/katana_v1.5.0-alpha.2_linux_amd64.tar.gz -o katana.tar.gz;
+          tar -C /usr/local/bin -xzf katana.tar.gz
 
       - name: Run tests
         run: |