Update 6

.github/workflows/ci.yaml

@@ -4,10 +4,10 @@ on:
     push:
         branches: [main]
     pull_request:
-        branches: [main]
+        branches: [opened, synchronize]
 
 jobs:
-    prettier:
+    check:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
@@ -20,12 +20,17 @@ jobs:
               run: git submodule update --init --recursive
 
             - run: curl -L https://install.dojoengine.org | bash
-            - run: /home/runner/.config/.dojo/bin/dojoup -v v0.5.1
+            - run: /home/runner/.config/.dojo/bin/dojoup -v v0.6.0-alpha.13
             - run: |
                   cd examples/dojo-starter
                   /home/runner/.config/.dojo/bin/sozo build
                   /home/runner/.config/.dojo/bin/sozo test
 
+            - name: "Setup npm"
+              run: |
+                  npm set @ponderingdemocritus:registry=https://npm.pkg.github.com/dojoengine
+                  npm set "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}"
+
             - name: Install Protobuf Compiler
               run: sudo apt-get install -y protobuf-compiler
 

.github/workflows/release.yaml

@@ -1,33 +1,43 @@
-name: Build and NPM Release
-
+name: Publish
 on:
-    push:
-        tags:
-            - "v*"
+    pull_request:
+        types: [closed]
+        branches:
+            - development
+            - main
 
 jobs:
-    create-release:
+    publish:
+        if: github.event.pull_request.merged == true
         runs-on: ubuntu-latest
 
         steps:
-            - name: Extract version from tag
-              id: tag-version
-              run: |
-                  echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
+            - name: "Checkout"
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
 
-            - name: Create GitHub Release
-              run: |
-                  curl -s \
-                    -X POST \
-                    -H "Authorization: token $GIT_TOKEN" \
-                    -H "Accept: application/vnd.github.v3+json" \
-                    https://api.github.com/repos/${{ github.repository }}/releases \
-                    -d '{
-                      "tag_name": "v${{ steps.tag-version.outputs.version }}",
-                      "name": "Release v${{ steps.tag-version.outputs.version }}",
-                      "body": "Release of version ${{ steps.tag-version.outputs.version }}",
-                      "draft": false,
-                      "prerelease": false
-                    }'
+            - uses: pnpm/action-setup@v3
+              with:
+                  version: 8
+
+            - name: Install dependencies
+              run: pnpm i
+
+            - name: Build dependencies
+              run: pnpm run build
+
+            - name: "Version and publish"
               env:
-                  GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  git config user.name "${{ github.actor }}"
+                  git config user.email "${{ github.actor}}@users.noreply.github.com"
+
+                  if [ ${{ github.base_ref }} = development ]; then
+                    npx lerna version --conventional-commits --conventional-prerelease --preid beta --yes
+                  else
+                    npx lerna version --conventional-commits --conventional-graduate --yes
+                  fi
+
+                  npx lerna publish from-git --yes

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-bun run prettier-check
+pnpm run prettier-check

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to Dojo.js will be documented in this file.
 
+## 0.6.0 -0 3.04.2024
+
+### Added
+
+-   Increased batch size of entity query
+-   Improved burner architecture
+-   Updated Starknet js
+-   Added relayUrl into ToriiClient ready for RTC
+-   Remove bun and replaced with pnpm everywhere
+
+### Changed
+
+### Removed
+
+### Fixed
+
 ## 0.5.4 -0 1.02.2024
 
 ### Added

examples/node/torii-bot/dojoConfig.ts

@@ -1,4 +1,4 @@
-import manifest from "../../dojo-starter/target/dev/manifest.json" assert { type: "json" };
+import manifest from "../../dojo-starter/manifests/deployments/KATANA.json" assert { type: "json" };
 
 import { createDojoConfig } from "@dojoengine/core";
 

examples/node/torii-bot/package.json

@@ -16,7 +16,7 @@
         "bun-types": "latest"
     },
     "dependencies": {
-        "@dojoengine/core": "^0.5.0",
+        "@dojoengine/core": "workspace:*",
         "@pinecone-database/pinecone": "^1.1.2",
         "@sapphire/decorators": "^6.0.2",
         "@sapphire/framework": "^4.6.0",

examples/react/react-app/dojoConfig.ts

@@ -1,4 +1,4 @@
-import manifest from "../../dojo-starter/target/dev/manifest.json";
+import manifest from "../../dojo-starter/manifests/deployments/KATANA.json";
 import { createDojoConfig } from "@dojoengine/core";
 
 export const dojoConfig = createDojoConfig({

examples/react/react-app/package.json

@@ -12,12 +12,12 @@
         "create-components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x28f5999ae62fec17c09c52a800e244961dba05251f5aaf923afabd9c9804d1a"
     },
     "dependencies": {
-        "@dojoengine/core": "^0.5.0",
-        "@dojoengine/create-burner": "^0.5.0",
-        "@dojoengine/torii-client": "^0.5.0",
-        "@dojoengine/utils": "^0.5.0",
-        "@dojoengine/react": "^0.5.0",
-        "@dojoengine/state": "^0.5.0",
+        "@dojoengine/core": "workspace:*",
+        "@dojoengine/create-burner": "workspace:*",
+        "@dojoengine/torii-client": "workspace:*",
+        "@dojoengine/utils": "workspace:*",
+        "@dojoengine/react": "workspace:*",
+        "@dojoengine/state": "workspace:*",
         "@dojoengine/recs": "0.1.35",
         "@latticexyz/react": "^2.0.0-next.11",
         "@latticexyz/utils": "^2.0.0-next.11",
@@ -29,7 +29,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "rxjs": "^7.8.1",
-        "starknet": "5.25.0",
+        "starknet": "^6.1.5",
         "vite-plugin-top-level-await": "^1.3.1",
         "vite-plugin-wasm": "^3.2.2"
     },

examples/react/react-app/src/dojo/DojoContext.tsx

@@ -63,9 +63,9 @@ export const DojoProvider = ({
                     get,
                     select,
                     clear,
+                    count,
                     account: account ? account : masterAccount,
                     isDeploying,
-                    count,
                     copyToClipboard,
                     applyFromClipboard,
                 },

examples/react/react-app/src/dojo/createSystemCalls.ts

@@ -44,6 +44,12 @@ export function createSystemCalls(
                 account,
             });
 
+            console.log(
+                await account.waitForTransaction(transaction_hash, {
+                    retryInterval: 100,
+                })
+            );
+
             setComponentsFromEvents(
                 contractComponents,
                 getEvents(

examples/react/react-app/src/dojo/generated/setup.ts

@@ -6,7 +6,7 @@ import { createSystemCalls } from "../createSystemCalls";
 import { defineContractComponents } from "./contractComponents";
 import { world } from "./world";
 import { setupWorld } from "./generated";
-import { Account } from "starknet";
+import { Account, ProviderOptions } from "starknet";
 import { BurnerManager } from "@dojoengine/create-burner";
 
 export type SetupResult = Awaited<ReturnType<typeof setup>>;
@@ -16,6 +16,7 @@ export async function setup({ ...config }: DojoConfig) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
+        relayUrl: "",
         worldAddress: config.manifest.world.address || "",
     });
 
@@ -37,12 +38,15 @@ export async function setup({ ...config }: DojoConfig) {
     // create burner manager
     const burnerManager = new BurnerManager({
         masterAccount: new Account(
-            dojoProvider.provider,
+            {
+                nodeUrl: config.rpcUrl,
+            },
             config.masterAddress,
             config.masterPrivateKey
         ),
         accountClassHash: config.accountClassHash,
         rpcProvider: dojoProvider.provider,
+        feeTokenAddress: config.feeTokenAddress,
     });
 
     try {

examples/react/react-phaser-example/dojoConfig.ts

@@ -1,4 +1,4 @@
-import manifest from "../../dojo-starter/target/dev/manifest.json";
+import manifest from "../../dojo-starter/manifests/deployments/KATANA.json";
 import { createDojoConfig } from "@dojoengine/core";
 
 export const dojoConfig = createDojoConfig({

examples/react/react-phaser-example/package.json

@@ -12,14 +12,14 @@
         "components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x28f5999ae62fec17c09c52a800e244961dba05251f5aaf923afabd9c9804d1a"
     },
     "dependencies": {
-        "@dojoengine/core": "^0.5.0",
-        "@dojoengine/create-burner": "^0.5.0",
-        "@dojoengine/react": "^0.5.0",
+        "@dojoengine/core": "workspace:*",
+        "@dojoengine/create-burner": "workspace:*",
+        "@dojoengine/torii-client": "workspace:*",
+        "@dojoengine/utils": "workspace:*",
+        "@dojoengine/react": "workspace:*",
+        "@dojoengine/state": "workspace:*",
         "@dojoengine/recs": "0.1.35",
-        "@dojoengine/state": "^0.5.0",
-        "@dojoengine/torii-client": "^0.5.0",
         "@dojoengine/torii-wasm": "^0.5.0",
-        "@dojoengine/utils": "^0.5.0",
         "@latticexyz/phaserx": "^2.0.0-next.14",
         "@latticexyz/utils": "^2.0.0-next.14",
         "@radix-ui/react-slot": "^1.0.2",
@@ -36,7 +36,7 @@
         "react-dom": "^18.2.0",
         "rxjs": "^7.8.1",
         "simplex-noise": "^4.0.1",
-        "starknet": "5.25.0",
+        "starknet": "^6.1.5",
         "styled-components": "^6.0.7",
         "tailwind-merge": "^2.0.0",
         "tailwindcss-animate": "^1.0.7",

examples/react/react-phaser-example/src/dojo/createBurner.ts

@@ -11,15 +11,16 @@ export const createBurner = async ({ ...config }: DojoConfig) => {
 
     const burnerManager = new BurnerManager({
         masterAccount: new Account(
-            rpcProvider,
+            {
+                nodeUrl: config.rpcUrl,
+            },
             config.masterAddress,
-            config.masterPrivateKey,
-            "1"
+            config.masterPrivateKey
         ),
         accountClassHash: config.accountClassHash,
-        rpcProvider,
+        rpcProvider: rpcProvider,
+        feeTokenAddress: config.feeTokenAddress,
     });
-
     try {
         await burnerManager.init();
         if (burnerManager.list().length === 0) {

examples/react/react-phaser-example/src/dojo/generated/setup.ts

@@ -14,6 +14,7 @@ export async function setup({ ...config }: DojoConfig) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
+        relayUrl: config.relayUrl,
         worldAddress: config.manifest.world.address || "",
     });
 

examples/react/react-pwa-app/dojoConfig.ts

@@ -1,4 +1,4 @@
-import manifest from "../../dojo-starter/target/dev/manifest.json";
+import manifest from "../../dojo-starter/manifests/deployments/KATANA.json";
 import { createDojoConfig } from "@dojoengine/core";
 
 export const dojoConfig = createDojoConfig({

examples/react/react-pwa-app/package.json

@@ -13,13 +13,13 @@
         "generate-pwa-assets": "pwa-assets-generator"
     },
     "dependencies": {
-        "@dojoengine/core": "^0.5.0",
-        "@dojoengine/create-burner": "^0.5.0",
-        "@dojoengine/react": "^0.5.0",
+        "@dojoengine/core": "workspace:*",
+        "@dojoengine/create-burner": "workspace:*",
+        "@dojoengine/torii-client": "workspace:*",
+        "@dojoengine/utils": "workspace:*",
+        "@dojoengine/react": "workspace:*",
+        "@dojoengine/state": "workspace:*",
         "@dojoengine/recs": "0.1.35",
-        "@dojoengine/state": "^0.5.0",
-        "@dojoengine/torii-client": "^0.5.0",
-        "@dojoengine/utils": "^0.5.0",
         "@latticexyz/react": "^2.0.0-next.11",
         "@latticexyz/utils": "^2.0.0-next.11",
         "@vite-pwa/assets-generator": "^0.2.4",
@@ -31,7 +31,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "rxjs": "^7.8.1",
-        "starknet": "5.25.0",
+        "starknet": "^6.1.5",
         "vite-plugin-top-level-await": "^1.3.1",
         "vite-plugin-wasm": "^3.2.2"
     },

examples/react/react-pwa-app/src/dojo/generated/setup.ts

@@ -16,6 +16,7 @@ export async function setup({ ...config }: DojoConfig) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
+        relayUrl: config.relayUrl,
         worldAddress: config.manifest.world.address || "",
     });
 
@@ -37,12 +38,15 @@ export async function setup({ ...config }: DojoConfig) {
     // create burner manager
     const burnerManager = new BurnerManager({
         masterAccount: new Account(
-            dojoProvider.provider,
+            {
+                nodeUrl: config.rpcUrl,
+            },
             config.masterAddress,
             config.masterPrivateKey
         ),
         accountClassHash: config.accountClassHash,
         rpcProvider: dojoProvider.provider,
+        feeTokenAddress: config.feeTokenAddress,
     });
 
     try {

examples/react/react-threejs/dojoConfig.ts

@@ -1,4 +1,4 @@
-import manifest from "../../dojo-starter/target/dev/manifest.json";
+import manifest from "../../dojo-starter/manifests/deployments/KATANA.json";
 import { createDojoConfig } from "@dojoengine/core";
 
 export const dojoConfig = createDojoConfig({