fix: sync

ponderingdemocritus · ponderingdemocritus · commit a10ad41b4503 · 2024-09-01T18:07:32.000-04:00
diff --git a/examples/clients/react/react-app/src/App.tsx b/examples/clients/react/react-app/src/App.tsx
@@ -17,6 +17,7 @@ function App() {
         account,
     } = useDojo();
 
+    // sync entities
     useQuerySync(toriiClient, contractComponents as any, []);
 
     const [clipboardStatus, setClipboardStatus] = useState({
diff --git a/examples/clients/react/react-app/src/dojo/setup.ts b/examples/clients/react/react-app/src/dojo/setup.ts
@@ -7,7 +7,7 @@ import { world } from "./world";
 import { setupWorld } from "./typescript/contracts.gen";
 import { Account, ArraySignatureType } from "starknet";
 import { BurnerManager } from "@dojoengine/create-burner";
-import { getSyncEvents } from "@dojoengine/state";
+import { getSyncEvents, getSyncEntities } from "@dojoengine/state";
 
 export type SetupResult = Awaited<ReturnType<typeof setup>>;
 
@@ -29,13 +29,21 @@ export async function setup({ ...config }: DojoConfig) {
     // create dojo provider
     const dojoProvider = new DojoProvider(config.manifest, config.rpcUrl);
 
+    // Sync all events
     const eventSync = getSyncEvents(
         toriiClient,
         contractComponents as any,
         undefined,
         []
     );
 
+    // Sync all entities
+    const sync = await getSyncEntities(
+        toriiClient,
+        contractComponents as any,
+        []
+    );
+
     // setup world
     const client = await setupWorld(dojoProvider);
 
@@ -75,5 +83,6 @@ export async function setup({ ...config }: DojoConfig) {
         burnerManager,
         toriiClient,
         eventSync,
+        sync,
     };
 }
diff --git a/examples/dojo/dojo-starter/.github/workflows/test.yaml b/examples/dojo/dojo-starter/.github/workflows/test.yaml
@@ -10,7 +10,7 @@ jobs:
         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/dojoup -v v1.0.0-alpha.9
             - run: |
                   /home/runner/.config/.dojo/bin/sozo build
                   /home/runner/.config/.dojo/bin/sozo test
diff --git a/examples/dojo/dojo-starter/README.md b/examples/dojo/dojo-starter/README.md
@@ -41,7 +41,7 @@ sozo build
 sozo migrate apply
 
 # Start Torii
-torii --world 0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7 --allowed-origins "*"
+torii --world 0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e --allowed-origins "*"
 ```
 
 ---
diff --git a/examples/dojo/dojo-starter/Scarb.lock b/examples/dojo/dojo-starter/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/examples/dojo/dojo-starter/Scarb.toml b/examples/dojo/dojo-starter/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/examples/dojo/dojo-starter/dojo_dev.toml b/examples/dojo/dojo-starter/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/examples/dojo/dojo-starter/manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml b/examples/dojo/dojo-starter/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/examples/dojo/dojo-starter/manifests/dev/base/dojo-world.toml b/examples/dojo/dojo-starter/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/examples/dojo/dojo-starter/manifests/dev/deployment/manifest.json b/examples/dojo/dojo-starter/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": [
                 {
diff --git a/examples/dojo/dojo-starter/manifests/dev/deployment/manifest.toml b/examples/dojo/dojo-starter/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 = []
diff --git a/packages/state/src/recs/index.ts b/packages/state/src/recs/index.ts
@@ -217,13 +217,13 @@ export const getEntitiesQuery = async <S extends Schema>(
           }
         : null;
 
-    const fetchedEntities = await client.getEntities({
-        limit,
-        offset: cursor,
-        clause: clause || undefined,
-    });
-
     while (continueFetching) {
+        const fetchedEntities = await client.getEntities({
+            limit,
+            offset: cursor,
+            clause: clause || undefined,
+        });
+
         setEntities(fetchedEntities, components);
 
         if (Object.keys(fetchedEntities).length < limit) {
@@ -279,8 +279,6 @@ export const syncEvents = async <S extends Schema>(
     return await client.onEventMessageUpdated(
         entityKeyClause,
         (fetchedEntities: any, data: any) => {
-            // Log the fetched entities and data for debugging purposes
-            console.log("fetchedEntities", data);
             // Update the local state with the fetched entities and their data
             setEntities({ [fetchedEntities]: data }, components);
         }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ version = 1`
`4`	`4`	`[[package]]`
`5`	`5`	`name = "dojo"`
`6`	`6`	`version = "1.0.0-alpha.4"`
`7`		`-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.6#ede7930735c708572af8a87f81bb76354a401b3a"`
	`7`	`+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.9#e42ce0c220a59d75c5b08e87a81de12cfdc27a55"`
`8`	`8`	`dependencies = [`
`9`	`9`	`"dojo_plugin",`
`10`	`10`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"world": {`
`3`	`3`	`"kind": "WorldContract",`
`4`		`- "class_hash": "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2",`
`5`		`- "original_class_hash": "0x458d0ce5b14a4844092bdb62050f462d53362304a13febbac6d973691d61be2",`
	`4`	`+ "class_hash": "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597",`
	`5`	`+ "original_class_hash": "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597",`
`6`	`6`	`"abi": [`
`7`	`7`	`{`
`8`	`8`	`"type": "impl",`
`@@ -1229,8 +1229,8 @@`
`1229`	`1229`	`]`
`1230`	`1230`	`}`
`1231`	`1231`	`],`
`1232`		`- "address": "0x403b5f047b8c4797139e30801e310473d99ca6877d19e0f27506f353f8f70f7",`
`1233`		`- "transaction_hash": "0x12df6c5a6c89d2c128c96026395f1f8917c36a7864aca26f0c7b9e2ea152bca",`
	`1232`	`+ "address": "0x3b34889efbdf01f707d5d7421f112e8fb85a42fb6f2e5422c75ce3253148b0e",`
	`1233`	`+ "transaction_hash": "0x4729b83525f0dddbfce0afd73e0b6a39303de51690efd756691356c21c30067",`
`1234`	`1234`	`"block_number": 3,`
`1235`	`1235`	`"seed": "dojo_starter",`
`1236`	`1236`	`"metadata": {`
`@@ -1250,9 +1250,9 @@`
`1250`	`1250`	`"contracts": [`
`1251`	`1251`	`{`
`1252`	`1252`	`"kind": "DojoContract",`
`1253`		`- "address": "0x36e4506b35e6dfb301d437c95f74b3e1f4f82da5d8841bec894bb8de29ec13",`
`1254`		`- "class_hash": "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173",`
`1255`		`- "original_class_hash": "0x4f10da1ba615523c1a4b9e2ad40df134edbcf2d971a1074efbd9772c86c2173",`
	`1253`	`+ "address": "0x5e8df8a235031ba8e66e590a7289d27d7d54c026bcdbda62b791c0a69055225",`
	`1254`	`+ "class_hash": "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4",`
	`1255`	`+ "original_class_hash": "0x7304354bfea03508e0a8beaca98c9580c852a0e350b74dcafb55192c62fa3f4",`
`1256`	`1256`	`"base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",`
`1257`	`1257`	`"abi": [`
`1258`	`1258`	`{`