v9

dojoengine · Sep 1, 2024 · f8944f3 · f8944f3
1 parent 5f05a9d
commit f8944f3
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 41 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,21 +1,21 @@
 name: CI
 
 on:
-  push:
-  pull_request:
+    push:
+    pull_request:
 
 jobs:
-  sozo-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: curl -L https://install.dojoengine.org | bash
-      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.6
-      - run: |
-          /home/runner/.config/.dojo/bin/sozo build
-          /home/runner/.config/.dojo/bin/sozo test
-          if [[ `git status --porcelain` ]]; then
-            echo The git repo is dirty
-            echo "Make sure to run \"sozo build\" after changing Scarb.toml"
-            exit 1
-          fi
+    sozo-test:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - run: curl -L https://install.dojoengine.org | bash
+            - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.6
+            - run: |
+                  /home/runner/.config/.dojo/bin/sozo build
+                  /home/runner/.config/.dojo/bin/sozo test
+                  if [[ `git status --porcelain` ]]; then
+                    echo The git repo is dirty
+                    echo "Make sure to run \"sozo build\" after changing Scarb.toml"
+                    exit 1
+                  fi
diff --git a/README.md b/README.md
@@ -25,12 +25,14 @@ Read the full tutorial [here](https://book.dojoengine.org/tutorial/dojo-starter)
 ## Running Locally
 
 #### Terminal one (Make sure this is running)
+
 ```bash
 # Run Katana
 katana --disable-fee --allowed-origins "*"
 ```
 
 #### Terminal two
+
 ```bash
 # Build the example
 sozo build
@@ -39,7 +41,7 @@ sozo build
 sozo migrate apply
 
 # Start Torii
-torii --world 0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7 --allowed-origins "*"
+torii --world 0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e --allowed-origins "*"
 ```
 
 ---
@@ -50,13 +52,13 @@ This starter project is a constant work in progress and contributions are greatl
 
 1. **Report a Bug**
 
-   - If you think you have encountered a bug, and we should know about it, feel free to report it [here](https://github.com/dojoengine/dojo-starter/issues) and we will take care of it.
+    - If you think you have encountered a bug, and we should know about it, feel free to report it [here](https://github.com/dojoengine/dojo-starter/issues) and we will take care of it.
 
 2. **Request a Feature**
 
-   - You can also request for a feature [here](https://github.com/dojoengine/dojo-starter/issues), and if it's viable, it will be picked for development.
+    - You can also request for a feature [here](https://github.com/dojoengine/dojo-starter/issues), and if it's viable, it will be picked for development.
 
 3. **Create a Pull Request**
-   - It can't get better then this, your pull request will be appreciated by the community.
+    - It can't get better then this, your pull request will be appreciated by the community.
 
 Happy coding!
diff --git a/Scarb.lock b/Scarb.lock
@@ -4,7 +4,7 @@ version = 1
 [[package]]
 name = "dojo"
 version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.6#ede7930735c708572af8a87f81bb76354a401b3a"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.9#e42ce0c220a59d75c5b08e87a81de12cfdc27a55"
 dependencies = [
  "dojo_plugin",
 ]

diff --git a/Scarb.toml b/Scarb.toml
@@ -12,6 +12,6 @@ spawn = "./scripts/spawn.sh"
 move = "./scripts/move.sh"
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.6" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.9" }
 
 [[target.dojo]]
diff --git a/dojo_dev.toml b/dojo_dev.toml
@@ -20,4 +20,4 @@ rpc_url = "http://localhost:5050/"
 # Default account for katana with seed = 0
 account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
 private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address = "0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7"
+world_address = "0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e"
diff --git a/manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml b/manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173"
-original_class_hash = "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173"
+class_hash = "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4"
+original_class_hash = "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_starter-actions-7a1c7102.json"
 reads = []

diff --git a/manifests/dev/base/dojo-world.toml b/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2"
-original_class_hash = "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2"
+class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
+original_class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/manifests/dev/base/models/dojo_starter-DirectionsAvailable-77844f1f.toml b/manifests/dev/base/models/dojo_starter-DirectionsAvailable-77844f1f.toml
@@ -3,6 +3,7 @@ class_hash = "0x72c6666cfeebc41544f502cfe9c32ad7b91fce12881709420335794dfcb324a"
 original_class_hash = "0x72c6666cfeebc41544f502cfe9c32ad7b91fce12881709420335794dfcb324a"
 abi = "manifests/dev/base/abis/models/dojo_starter-DirectionsAvailable-77844f1f.json"
 tag = "dojo_starter-DirectionsAvailable"
+qualified_path = "dojo_starter::models::directions_available"
 manifest_name = "dojo_starter-DirectionsAvailable-77844f1f"
 
 [[members]]

diff --git a/manifests/dev/base/models/dojo_starter-Moved-504403e5.toml b/manifests/dev/base/models/dojo_starter-Moved-504403e5.toml
@@ -3,6 +3,7 @@ class_hash = "0x2e06be7cf406eb3161fedf460a47faca68855eb9dad7d505c1b1f1875192ccd"
 original_class_hash = "0x2e06be7cf406eb3161fedf460a47faca68855eb9dad7d505c1b1f1875192ccd"
 abi = "manifests/dev/base/abis/models/dojo_starter-Moved-504403e5.json"
 tag = "dojo_starter-Moved"
+qualified_path = "dojo_starter::systems::actions::actions::moved"
 manifest_name = "dojo_starter-Moved-504403e5"
 
 [[members]]

diff --git a/manifests/dev/base/models/dojo_starter-Moves-2a29373f.toml b/manifests/dev/base/models/dojo_starter-Moves-2a29373f.toml
@@ -3,6 +3,7 @@ class_hash = "0x4eac0db062821cc05485ba088b0bb748de83e901116216da171744dfc5ec6fa"
 original_class_hash = "0x4eac0db062821cc05485ba088b0bb748de83e901116216da171744dfc5ec6fa"
 abi = "manifests/dev/base/abis/models/dojo_starter-Moves-2a29373f.json"
 tag = "dojo_starter-Moves"
+qualified_path = "dojo_starter::models::moves"
 manifest_name = "dojo_starter-Moves-2a29373f"
 
 [[members]]

diff --git a/manifests/dev/base/models/dojo_starter-Position-2ac8b4c1.toml b/manifests/dev/base/models/dojo_starter-Position-2ac8b4c1.toml
@@ -3,6 +3,7 @@ class_hash = "0x6531637b0bbd741f8823b127d8958ed10a483dd1f2d7654975c1d7d7cbdab65"
 original_class_hash = "0x6531637b0bbd741f8823b127d8958ed10a483dd1f2d7654975c1d7d7cbdab65"
 abi = "manifests/dev/base/abis/models/dojo_starter-Position-2ac8b4c1.json"
 tag = "dojo_starter-Position"
+qualified_path = "dojo_starter::models::position"
 manifest_name = "dojo_starter-Position-2ac8b4c1"
 
 [[members]]

diff --git a/manifests/dev/deployment/manifest.json b/manifests/dev/deployment/manifest.json
@@ -1,8 +1,8 @@
 {
   "world": {
     "kind": "WorldContract",
-    "class_hash": "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2",
-    "original_class_hash": "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2",
+    "class_hash": "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597",
+    "original_class_hash": "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597",
     "abi": [
       {
         "type": "impl",
@@ -1229,8 +1229,8 @@
         ]
       }
     ],
-    "address": "0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7",
-    "transaction_hash": "0x12df6c5a6c89d2c128c96026395f1f8917c36a7864aca26f0c7b9e2ea152bca",
+    "address": "0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e",
+    "transaction_hash": "0x4729b83525f0dddbfce0afd73e0b6a39303de51690efd756691356c21c30067",
     "block_number": 3,
     "seed": "dojo_starter",
     "metadata": {
@@ -1250,9 +1250,9 @@
   "contracts": [
     {
       "kind": "DojoContract",
-      "address": "0x36e4506b35e6dfb301d437c95f74b3e1f4f82da5d8841bec894bb8de29ec13",
-      "class_hash": "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173",
-      "original_class_hash": "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173",
+      "address": "0x5e8df8a235031ba8e66e590a7289d27d7d54c026bcdbda62b791c0a69055225",
+      "class_hash": "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4",
+      "original_class_hash": "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -1982,6 +1982,7 @@
         }
       ],
       "tag": "dojo_starter-DirectionsAvailable",
+      "qualified_path": "dojo_starter::models::directions_available",
       "manifest_name": "dojo_starter-DirectionsAvailable-77844f1f"
     },
     {
@@ -2434,6 +2435,7 @@
         }
       ],
       "tag": "dojo_starter-Moved",
+      "qualified_path": "dojo_starter::systems::actions::actions::moved",
       "manifest_name": "dojo_starter-Moved-504403e5"
     },
     {
@@ -2918,6 +2920,7 @@
         }
       ],
       "tag": "dojo_starter-Moves",
+      "qualified_path": "dojo_starter::models::moves",
       "manifest_name": "dojo_starter-Moves-2a29373f"
     },
     {
@@ -3358,6 +3361,7 @@
         }
       ],
       "tag": "dojo_starter-Position",
+      "qualified_path": "dojo_starter::models::position",
       "manifest_name": "dojo_starter-Position-2ac8b4c1"
     }
   ]

diff --git a/manifests/dev/deployment/manifest.toml b/manifests/dev/deployment/manifest.toml
@@ -1,10 +1,10 @@
 [world]
 kind = "WorldContract"
-class_hash = "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2"
-original_class_hash = "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2"
+class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
+original_class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
 abi = "manifests/dev/deployment/abis/dojo-world.json"
-address = "0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7"
-transaction_hash = "0x12df6c5a6c89d2c128c96026395f1f8917c36a7864aca26f0c7b9e2ea152bca"
+address = "0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e"
+transaction_hash = "0x4729b83525f0dddbfce0afd73e0b6a39303de51690efd756691356c21c30067"
 block_number = 3
 seed = "dojo_starter"
 manifest_name = "dojo-world"
@@ -23,9 +23,9 @@ manifest_name = "dojo-base"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x36e4506b35e6dfb301d437c95f74b3e1f4f82da5d8841bec894bb8de29ec13"
-class_hash = "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173"
-original_class_hash = "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173"
+address = "0x5e8df8a235031ba8e66e590a7289d27d7d54c026bcdbda62b791c0a69055225"
+class_hash = "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4"
+original_class_hash = "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_starter-actions-7a1c7102.json"
 reads = []
@@ -48,6 +48,7 @@ class_hash = "0x72c6666cfeebc41544f502cfe9c32ad7b91fce12881709420335794dfcb324a"
 original_class_hash = "0x72c6666cfeebc41544f502cfe9c32ad7b91fce12881709420335794dfcb324a"
 abi = "manifests/dev/deployment/abis/models/dojo_starter-DirectionsAvailable-77844f1f.json"
 tag = "dojo_starter-DirectionsAvailable"
+qualified_path = "dojo_starter::models::directions_available"
 manifest_name = "dojo_starter-DirectionsAvailable-77844f1f"
 
 [[models.members]]
@@ -66,6 +67,7 @@ class_hash = "0x2e06be7cf406eb3161fedf460a47faca68855eb9dad7d505c1b1f1875192ccd"
 original_class_hash = "0x2e06be7cf406eb3161fedf460a47faca68855eb9dad7d505c1b1f1875192ccd"
 abi = "manifests/dev/deployment/abis/models/dojo_starter-Moved-504403e5.json"
 tag = "dojo_starter-Moved"
+qualified_path = "dojo_starter::systems::actions::actions::moved"
 manifest_name = "dojo_starter-Moved-504403e5"
 
 [[models.members]]
@@ -84,6 +86,7 @@ class_hash = "0x4eac0db062821cc05485ba088b0bb748de83e901116216da171744dfc5ec6fa"
 original_class_hash = "0x4eac0db062821cc05485ba088b0bb748de83e901116216da171744dfc5ec6fa"
 abi = "manifests/dev/deployment/abis/models/dojo_starter-Moves-2a29373f.json"
 tag = "dojo_starter-Moves"
+qualified_path = "dojo_starter::models::moves"
 manifest_name = "dojo_starter-Moves-2a29373f"
 
 [[models.members]]
@@ -112,6 +115,7 @@ class_hash = "0x6531637b0bbd741f8823b127d8958ed10a483dd1f2d7654975c1d7d7cbdab65"
 original_class_hash = "0x6531637b0bbd741f8823b127d8958ed10a483dd1f2d7654975c1d7d7cbdab65"
 abi = "manifests/dev/deployment/abis/models/dojo_starter-Position-2ac8b4c1.json"
 tag = "dojo_starter-Position"
+qualified_path = "dojo_starter::models::position"
 manifest_name = "dojo_starter-Position-2ac8b4c1"
 
 [[models.members]]