chore: bump dojo 1.5

.changeset/thirty-cheetahs-design.md

@@ -0,0 +1,15 @@
+---
+"@dojoengine/torii-wasm": minor
+"@dojoengine/state": minor
+"@dojoengine/sdk": minor
+"@dojoengine/core": minor
+"@dojoengine/create-burner": minor
+"@dojoengine/create-dojo": minor
+"@dojoengine/predeployed-connector": minor
+"@dojoengine/react": minor
+"@dojoengine/torii-client": minor
+"@dojoengine/utils": minor
+"@dojoengine/utils-wasm": minor
+---
+
+chore: bump dojo 1.5

.github/workflows/ci.yaml

@@ -46,10 +46,11 @@ jobs:
       - run: curl -L https://install.dojoengine.org | bash
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.9.2"
-      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.2.1
+          scarb-version: "2.10.1"
+      - run: /home/runner/.config/.dojo/dojoup/dojoup install v1.5.0-alpha.2
       - run: |
           cd worlds/dojo-starter
+          ls -la /home/runner/.config/.dojo/bin
           /home/runner/.config/.dojo/bin/sozo build
           /home/runner/.config/.dojo/bin/sozo test
       - run: |

.github/workflows/release.yaml

@@ -28,10 +28,10 @@ jobs:
       - name: Setup Node.js with PNPM cache
         uses: actions/setup-node@v4
         with:
-          node-version: 'lts/*'
-          cache: 'pnpm'
+          node-version: "lts/*"
+          cache: "pnpm"
           # The cache will be invalidated if these files change
-          cache-dependency-path: '**/pnpm-lock.yaml'
+          cache-dependency-path: "**/pnpm-lock.yaml"
 
       # Cache the PNPM store to speed up installations
       - name: Get PNPM store directory
@@ -58,7 +58,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-build-
-            
+
       # Add Cargo cache for torii-wasm
       - name: Cache Cargo dependencies and build artifacts
         uses: actions/cache@v3
@@ -74,8 +74,8 @@ jobs:
       - run: curl -L https://install.dojoengine.org | bash
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.9.2"
-      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.2.1
+          scarb-version: "2.10.1"
+      - run: /home/runner/.config/.dojo/dojoup/dojoup install v1.5.0-alpha.2
       - run: |
           cd worlds/dojo-starter
           /home/runner/.config/.dojo/bin/sozo build
@@ -106,7 +106,7 @@ jobs:
           STATUS=$(pnpm changeset status)
           echo "Changeset status:"
           echo "$STATUS"
-          
+
           # Check if we have packages to bump
           if echo "$STATUS" | grep -q "NO packages to be bumped at patch" && \
              echo "$STATUS" | grep -q "NO packages to be bumped at minor" && \
@@ -124,7 +124,7 @@ jobs:
         run: |
           # Apply version bump based on release type
           pnpm changeset version
-          
+
           # If this is a dry run, revert the version changes
           if [ "${{ github.event.inputs.dry_run }}" == "true" ]; then
             echo "DRY RUN: Would version packages to ${NEW_VERSION}"
@@ -166,4 +166,4 @@ jobs:
           TAGS=$(pnpm changeset tag)
           echo "DRY RUN: Would commit changes with message: chore: release"
           echo "DRY RUN: Would create and push tag: $TAGS"
-          git status
+          git status

examples/example-node-worker/dojoConfig.ts

@@ -1,6 +1,8 @@
 import { createDojoConfig } from "@dojoengine/core";
 
-import manifest from "../../worlds/dojo-starter/manifest_dev.json";
+import manifest from "../../worlds/dojo-starter/manifest_dev.json" with {
+    type: "json",
+};
 
 export const dojoConfig = createDojoConfig({
     manifest,

examples/example-node-worker/env.ts

@@ -0,0 +1,9 @@
+import "dotenv/config";
+import { z } from "zod";
+
+const envSchema = z.object({
+    IDENTITY: z.string(),
+    SECRET_KEY: z.string(),
+});
+
+export const env = envSchema.parse(process.env);

examples/example-node-worker/main.ts

@@ -1,53 +1,177 @@
-import { init, KeysClause, ToriiQueryBuilder } from "@dojoengine/sdk/node";
-import { dojoConfig } from "./dojoConfig";
+import {
+    KeysClause,
+    ToriiQueryBuilder,
+    createWorker,
+    init,
+    type ParsedEntity,
+    getModel,
+    HistoricalToriiQueryBuilder,
+} from "@dojoengine/sdk/node";
+import { SigningKey } from "@dojoengine/torii-wasm/node";
+import { dojoConfig } from "./dojoConfig.ts";
+import {
+    ModelsMapping,
+    type Moves,
+    type SchemaType,
+} from "./src/typescript/models.gen.ts";
+import { addAddressPadding, type BigNumberish } from "starknet";
+import { w3cwebsocket } from "websocket";
+import { env } from "./env.ts";
+
+// Those lines are require so that websocket works.
+// @ts-ignore
+global.Websocket = w3cwebsocket;
+// @ts-ignore
+global.WorkerGlobalScope = global;
 
 const sdk = await init({
     client: {
         toriiUrl: dojoConfig.toriiUrl,
-        relayUrl: dojoConfig.relayUrl,
+        relayUrl: "/ip4/127.0.0.1/tcp/9092/ws",
         worldAddress: dojoConfig.manifest.world.address,
     },
-    domain: {},
+    domain: {
+        name: "node-worker",
+        version: "0.0.1",
+        chainId: "KATANA",
+        revision: "1",
+    },
+
+    identity: env.IDENTITY,
+    signer: SigningKey.fromSecretScalar(env.SECRET_KEY),
 });
 
-const query = new ToriiQueryBuilder()
-    .withClause(
-        KeysClause(
-            ["dojo_starter-Position", "dojo_starter-Moves"],
-            [undefined]
-        ).build()
-    )
-    .includeHashedKeys();
-
-function onEntityUpdated({ data, error }) {
-    if (error) {
-        console.error(error);
-        return;
+type PositionCount = {
+    Up: number;
+    Down: number;
+    Left: number;
+    Right: number;
+};
+const defaultPositionCount = {
+    Up: 0,
+    Down: 0,
+    Left: 0,
+    Right: 0,
+};
+
+const positionToU8 = (position: string) => {
+    const mapping = {
+        Up: 0,
+        Down: 1,
+        Left: 2,
+        Right: 3,
+    };
+
+    // 10 is used as default value
+    return mapping[position] ?? 10;
+};
+const intoPositionCount = (
+    pos: PositionCount
+): Array<[BigNumberish, BigNumberish]> => {
+    return [
+        [positionToU8("Up"), `0x${pos.Up.toString(16)}`],
+        [positionToU8("Down"), `0x${pos.Down.toString(16)}`],
+        [positionToU8("Left"), `0x${pos.Left.toString(16)}`],
+        [positionToU8("Right"), `0x${pos.Right.toString(16)}`],
+    ];
+};
+
+async function publishOffchainPositionCount(moves: Moves): Promise<void> {
+    const model = await sdk.getEntities({
+        query: new ToriiQueryBuilder()
+            .withClause(
+                KeysClause(
+                    [ModelsMapping.PositionCount],
+                    [addAddressPadding(moves.player)]
+                ).build()
+            )
+            .includeHashedKeys(),
+    });
+    const m = getModel(ModelsMapping.PositionCount, model);
+    if (!m) {
+        const data = sdk.generateTypedData(
+            ModelsMapping.PositionCount,
+            {
+                identity: moves.player,
+                position: intoPositionCount(positionCount),
+            },
+            [
+                {
+                    name: "identity",
+                    type: "felt",
+                },
+                {
+                    name: "position",
+                    type: "(u8, u128)*",
+                },
+            ]
+        );
+
+        try {
+            await sdk.sendMessage(data);
+        } catch (err) {
+            console.error(err);
+        }
+    } else {
+        console.log(m.position);
     }
+}
 
-    const entity = data.pop();
-    if (entity && entity.entityId !== "0x0") {
-        // do whatever you need here
-        console.log(entity.models.dojo_starter);
+let positionCount = defaultPositionCount;
+
+function initPositionFromEvent(
+    events: ParsedEntity<SchemaType>[]
+): PositionCount {
+    const pc = defaultPositionCount;
+    for (const e of events) {
+        const moved = e.models.dojo_starter.Moved;
+        if (!moved) {
+            continue;
+        }
+        pc[moved.direction] += 1;
     }
+    return pc;
 }
 
-const [entities, sub] = await sdk.subscribeEntityQuery({
-    query,
-    callback: onEntityUpdated,
-    historical: false,
-});
+await createWorker(async () => {
+    async function onEntityUpdated({ data, error }) {
+        if (error) {
+            console.error(error);
+            return;
+        }
 
-console.log(entities);
+        const entity = data.pop();
+        if (entity && entity.entityId !== "0x0") {
+            // do whatever you need here
+            const model = entity.models.dojo_starter;
+            if (model?.Moves) {
+                await publishOffchainPositionCount(model.Moves);
+            }
+        }
+    }
 
-process.on("SIGTERM", () => {
-    // NOTE: do not forget to free sub here;
-    sub.free();
-    process.exit(0);
-});
+    const query = new HistoricalToriiQueryBuilder()
+        .withClause(
+            KeysClause(
+                [ModelsMapping.Moved, ModelsMapping.Moves],
+                [undefined]
+            ).build()
+        )
+        .includeHashedKeys();
+
+    const events = await sdk.getEventMessages({
+        query: query,
+    });
+    positionCount = initPositionFromEvent(events);
+
+    const [entities, sub] = await sdk.subscribeEntityQuery({
+        query,
+        callback: onEntityUpdated,
+    });
+
+    console.log("Entities from worker", entities);
+    console.log(positionCount);
 
-process.on("SIGINT", () => {
-    // NOTE: do not forget to free sub here;
-    sub.free();
-    process.exit(0);
+    return [];
+    return [sub];
 });

examples/example-node-worker/package.json

@@ -3,11 +3,22 @@
     "version": "0.0.1",
     "private": true,
     "type": "module",
+    "scripts": {
+        "bun": "IDENTITY=0x0127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec SECRET_KEY=0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912 bun run main.ts",
+        "node": "IDENTITY=0x0127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec SECRET_KEY=0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912 node main.ts",
+        "build": "tsc -b"
+    },
     "dependencies": {
         "@dojoengine/core": "workspace:*",
-        "@dojoengine/sdk": "workspace:*"
+        "@dojoengine/sdk": "workspace:*",
+        "@dojoengine/torii-wasm": "workspace:*",
+        "dotenv": "^16.4.7",
+        "starknet": "catalog:",
+        "websocket": "^1.0.35",
+        "zod": "^3.24.3"
     },
     "devDependencies": {
-        "@types/node": "^22.14.1"
+        "@types/node": "^22.14.1",
+        "@types/websocket": "^1.0.10"
     }
 }