Merge branch 'main' into long-poll-txns

.devcontainer/Dockerfile

@@ -4,12 +4,23 @@
 
 ARG VARIANT
 FROM mcr.microsoft.com/vscode/devcontainers/rust:${VARIANT}
+ARG VARIANT
 
 # Install additional packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends protobuf-compiler libprotobuf-dev libclang-dev
+    && 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
+
+# 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 install -y gh libgmp3-dev
+# 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.74.0" > rust_toolchain_version

.github/workflows/ci.yml

@@ -14,11 +14,15 @@ jobs:
   test:
     runs-on: ubuntu-latest-16-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
-      - run: cargo build -r --bin katana && cargo llvm-cov nextest --all-features --lcov --output-path lcov.info
+      - run: |       
+          cargo llvm-cov nextest --no-report --all-features --workspace --exclude katana --build-jobs 10
+          cargo llvm-cov nextest --no-report -p katana
+          cargo llvm-cov nextest --no-report -p katana --no-default-features --features sir
+          cargo llvm-cov report --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -27,7 +31,7 @@ jobs:
   ensure-wasm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -62,7 +66,7 @@ jobs:
   dojo-core-test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -71,7 +75,7 @@ jobs:
   dojo-spawn-and-move-example-test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -80,7 +84,7 @@ jobs:
   dojo-world-bindings-check:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -89,7 +93,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -98,7 +102,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -107,7 +111,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:5d61184
+      image: nondeterministickari/dojo-dev:cc6554da
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

.gitignore

@@ -15,3 +15,4 @@ output.txt
 **/katana-logs
 crates/benches/bench_results.txt
 **/generated
+.vscode