Merge pull request #303 from dojoengine/torii-upgrade

feat: Torii upgrade
dojoengine · Oct 17, 2024 · b3339ce · b3339ce
2 parents e7d6f1f + 8ef3c84
commit b3339ce
Show file tree

Hide file tree

Showing 6 changed files with 2,636 additions and 3,281 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
               run: git submodule update --init --recursive
 
             - run: curl -L https://install.dojoengine.org | bash
-            - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.12
+            - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.16
             - run: |
                   cd worlds/dojo-starter
                   /home/runner/.config/.dojo/bin/sozo build

diff --git a/packages/state/package.json b/packages/state/package.json
@@ -25,7 +25,7 @@
     },
     "dependencies": {
         "@dojoengine/recs": "2.0.13",
-        "@dojoengine/torii-client": "1.0.0-alpha.20",
+        "@dojoengine/torii-client": "workspace:*",
         "vitest": "^1.6.0"
     }
 }
diff --git a/packages/state/src/recs/index.ts b/packages/state/src/recs/index.ts
@@ -122,7 +122,12 @@ export const getEntities = async <S extends Schema>(
     let continueFetching = true;
 
     while (continueFetching) {
-        const entities = await client.getEntities({ limit, offset, clause });
+        const entities = await client.getEntities({
+            limit,
+            offset,
+            clause,
+            dont_include_hashed_keys: true,
+        });
 
         if (logging) console.log(`Fetched ${entities} entities`);
 
@@ -160,6 +165,7 @@ export const getEvents = async <S extends Schema>(
             limit,
             offset,
             clause,
+            dont_include_hashed_keys: true,
         });
 
         if (logging) console.log("entities", entities);
@@ -226,6 +232,7 @@ export const getEntitiesQuery = async <S extends Schema>(
         limit,
         offset: cursor,
         clause: clause || undefined,
+        dont_include_hashed_keys: true,
     });
 
     while (continueFetching) {

diff --git a/packages/torii-wasm/build.sh b/packages/torii-wasm/build.sh
@@ -4,7 +4,7 @@
 set -ex
 
 # Clone the repository
-git clone --depth 1 https://github.com/dojoengine/dojo.c dojo.c
+git clone --depth 1 --branch grpc-update https://github.com/dojoengine/dojo.c dojo.c
 cd dojo.c
 
 # Build for web (browser)