merge main

dojoengine · Jan 15, 2025 · 3e5bf2b · 3e5bf2b
2 parents 8a1f9d9 + 47349d1
commit 3e5bf2b
Show file tree

Hide file tree

Showing 373 changed files with 21,557 additions and 8,931 deletions.
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:v1.0.1",
+	"image": "ghcr.io/dojoengine/dojo-dev:v1.0.10",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -14,7 +14,7 @@ jobs:
   bench-katana:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     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.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,11 +8,12 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.79.0
+  RUST_VERSION: 1.80.0
 
 jobs:
   build:
     runs-on: ubuntu-latest-4-cores
+    needs: [fmt, cairofmt]
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -31,7 +32,7 @@ jobs:
     needs: ensure-docker
     runs-on: ubuntu-latest-32-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -55,8 +56,9 @@ jobs:
 
   ensure-wasm:
     runs-on: ubuntu-latest
+    needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -123,7 +125,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -139,7 +141,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -153,8 +155,9 @@ jobs:
 
   clippy:
     runs-on: ubuntu-latest-4-cores
+    needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -163,16 +166,17 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - run: scripts/rust_fmt.sh --check
 
   docs:
     runs-on: ubuntu-latest
+    needs: [fmt, cairofmt]
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
@@ -100,7 +100,7 @@ jobs:
         with:
           # We have to use a PAT in order to trigger ci
           token: ${{ secrets.CREATE_PR_TOKEN }}
-          title: "Update devcontainer image: ${{ needs.build-and-push.outputs.tag_name }}"
+          title: "chore(devcontainer): update image: ${{ needs.build-and-push.outputs.tag_name }}"
           commit-message: "Update devcontainer image: ${{ needs.build-and-push.outputs.tag_name }}"
           branch: bump-devcontainer
           base: main

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -81,6 +81,6 @@ jobs:
         name: Move cache
         run: |
           rm -rf /tmp/.buildx-cache/prebuild
-          mv /tmp/.buildx-cache-new/prebuild /tmp/.buildx-cache/prebuild
+          mv /tmp/.buildx-cache-new/prebuild /tmp/.buildx-cache/prebuild || true
           rm -rf /tmp/.buildx-cache/build
-          mv /tmp/.buildx-cache-new/build /tmp/.buildx-cache/build
+          mv /tmp/.buildx-cache-new/build /tmp/.buildx-cache/build || true
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:v1.0.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.10
     env:
       VERSION: ""
     steps:

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "crates/katana/contracts/messaging/solidity/lib/forge-std"]
 	path = crates/katana/contracts/messaging/solidity/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "crates/katana/contracts/piltover"]
+	path = crates/katana/contracts/piltover
+	url = https://github.com/cartridge-gg/piltover.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -98,4 +98,4 @@ The [Dojo Book repository](https://github.com/dojoengine/book) is where you shou
 
 ## Final Notes
 
-Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.gg/PwDa2mKhR4) or on [GitHub](https://github.com/dojoengine/dojo/issues).
+Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.com/invite/dojoengine) or on [GitHub](https://github.com/dojoengine/dojo/issues).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,4 @@ The [Dojo Book repository](https://github.com/dojoengine/book) is where you shou

		## Final Notes

		Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.gg/PwDa2mKhR4) or on [GitHub](https://github.com/dojoengine/dojo/issues).
		Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.com/invite/dojoengine) or on [GitHub](https://github.com/dojoengine/dojo/issues).