merge dojo/main

ArkProjectNFTs · Jan 24, 2024 · 0f81cb5 · 0f81cb5
2 parents 70747dc + df68436
commit 0f81cb5
Show file tree

Hide file tree

Showing 207 changed files with 8,067 additions and 3,136 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -11,13 +11,14 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 
 RUN apt install -y gh libgmp3-dev
 
-COPY rust-toolchain.toml .
+# To allow independent workflow of the container, the rust-toolchain is explicitely given.
+RUN echo "1.74.0" > 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
 
-RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
-    rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
+RUN rustup toolchain install $(cat rust_toolchain_version) && \
+    rustup default $(cat rust_toolchain_version) && \
     rustup component add clippy && \
     rustup component add rustfmt
 
@@ -37,14 +38,14 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
     mv hurl-4.1.0-aarch64-unknown-linux-gnu/hurl /usr/local/bin/ && \
     rm -r hurl-4.1.0-aarch64-unknown-linux-gnu && \
     rm hurl.tar.gz && \
-    rustup component add llvm-tools-preview --toolchain 1.70.0-aarch64-unknown-linux-gnu; \
+    rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-aarch64-unknown-linux-gnu; \
     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 && \
     mv hurl-4.1.0-x86_64-unknown-linux-gnu/hurl /usr/local/bin/ && \
     rm -r hurl-4.1.0-x86_64-unknown-linux-gnu && \
     rm hurl.tar.gz && \
-    rustup component add llvm-tools-preview --toolchain 1.70.0-x86_64-unknown-linux-gnu && \
+    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 nightly; \
     fi
 

diff --git a/.devcontainer/devcontainer.json b/.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:448ffda",
+	"image": "ghcr.io/dojoengine/dojo-dev:136a67a",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,13 +8,13 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.70.0
+  RUST_VERSION: 1.74.0
 
 jobs:
   test:
     runs-on: ubuntu-latest-16-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:448ffda
+      image: ghcr.io/dojoengine/dojo-dev:136a67a
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -28,7 +28,7 @@ jobs:
   ensure-wasm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:448ffda
+      image: ghcr.io/dojoengine/dojo-dev:136a67a
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -61,7 +61,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:448ffda
+      image: ghcr.io/dojoengine/dojo-dev:136a67a
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -70,7 +70,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:448ffda
+      image: ghcr.io/dojoengine/dojo-dev:136a67a
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml
@@ -14,7 +14,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:448ffda
+      image: ghcr.io/dojoengine/dojo-dev:136a67a
     steps:
       # Workaround described here: https://github.com/actions/checkout/issues/760
       - uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.70.0
+  RUST_VERSION: 1.74.0
   REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
 
 jobs: