chore: bump starknetjs version to v7 (#440)

MartianGreed · web-flow · commit b9817aae6145 · 2025-07-09T11:35:10.000+02:00
* chore: bump starknetjs version to v7

* chore: bump starknet-react
diff --git a/.changeset/long-papers-judge.md b/.changeset/long-papers-judge.md
@@ -0,0 +1,15 @@
+---
+"@dojoengine/predeployed-connector": minor
+"@dojoengine/create-burner": minor
+"@dojoengine/react": minor
+"@dojoengine/core": minor
+"@dojoengine/create-dojo": minor
+"@dojoengine/sdk": minor
+"@dojoengine/state": minor
+"@dojoengine/torii-client": minor
+"@dojoengine/torii-wasm": minor
+"@dojoengine/utils": minor
+"@dojoengine/utils-wasm": minor
+---
+
+chore: bump starknetjs version
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,6 @@ docs-json
 lerna-debug.log
 
 .turbo/
-**/**/vite.config.ts.timestamp-*
+**/**/vite.config.ts.timestamp-*
+**/**/tsup.config.bundled*
+
diff --git a/examples/example-vite-experimental-sdk/src/main.ts b/examples/example-vite-experimental-sdk/src/main.ts
@@ -1,6 +1,5 @@
 import "./style.css";
 import { init } from "@dojoengine/sdk/experimental";
-import { ModelsMapping } from "./typescript/models.gen";
 import { dojoConfig } from "../dojoConfig.ts";
 import { ThemeManager } from "./theme-manager";
 import { UpdateManager } from "./update-manager";
@@ -25,7 +24,7 @@ async function main() {
     const entities = await sdk.getEntities(
         new ToriiQueryBuilder()
             .withClause(new ClauseBuilder().keys([], [undefined]).build())
-            .addOrderBy(ModelsMapping.Moves, "remaining", "Asc")
+            .addOrderBy("remaining", "Asc")
             .build()
     );
     console.log("entities", entities);
@@ -40,7 +39,7 @@ async function main() {
     const [initialEntities, freeSubscription] = await sdk.subscribeEntities(
         new ToriiQueryBuilder()
             .withClause(new ClauseBuilder().keys([], [undefined]).build())
-            .addOrderBy(ModelsMapping.Moves, "remaining", "Asc")
+            .addOrderBy("remaining", "Asc")
             .includeHashedKeys()
             .build(),
         ({ data, error }) => {
diff --git a/package.json b/package.json
@@ -22,18 +22,18 @@
     "devDependencies": {
         "@commitlint/cli": "^18.6.1",
         "@commitlint/config-conventional": "^18.6.3",
-        "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
+        "@ianvs/prettier-plugin-sort-imports": "^4.4.2",
         "@typhonjs-typedoc/typedoc-theme-dmt": "^0.2.3",
         "husky": "^9.1.7",
-        "lerna": "^8.1.9",
-        "prettier": "^3.4.2",
-        "tsup": "^8.3.5",
-        "turbo": "^2.4.4",
+        "lerna": "^8.2.3",
+        "prettier": "^3.6.2",
+        "tsup": "^8.5.0",
+        "turbo": "^2.5.4",
         "typedoc": "^0.26.11",
         "typedoc-plugin-coverage": "^3.4.1",
         "typedoc-plugin-missing-exports": "^3.1.0"
     },
     "dependencies": {
-        "@changesets/cli": "^2.27.11"
+        "@changesets/cli": "^2.29.5"
     }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -23,7 +23,7 @@
     "devDependencies": {
         "@types/elliptic": "^6.4.18",
         "@vitest/coverage-v8": "^1.6.0",
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^1.6.0"
     },
diff --git a/packages/core/src/provider/DojoProvider.ts b/packages/core/src/provider/DojoProvider.ts
@@ -194,7 +194,7 @@ export class DojoProvider extends Provider {
         );
 
         try {
-            return await account?.execute(calls, undefined, details);
+            return await account?.execute(calls, details);
         } catch (error) {
             this.logger.error("Error occured: ", error);
             throw error;
diff --git a/packages/create-burner/package.json b/packages/create-burner/package.json
@@ -39,16 +39,16 @@
         "@types/web": "^0.0.114",
         "@vitest/coverage-v8": "^1.6.0",
         "jsdom": "^24.1.3",
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^1.6.0"
     },
     "dependencies": {
         "@dojoengine/core": "workspace:*",
         "@scure/bip32": "^1.5.0",
+        "@starknet-io/get-starknet-core": "catalog:",
         "@starknet-react/core": "catalog:",
         "encoding": "^0.1.13",
-        "get-starknet-core": "catalog:",
         "js-cookie": "^3.0.5"
     }
 }
diff --git a/packages/create-burner/readme.md b/packages/create-burner/readme.md
@@ -91,7 +91,6 @@ const activeAccount = manager.getActiveAccount();
 ## API
 
 - **useBurner**: A React hook that provides functionalities like creating burners, selecting them, and more.
-
     - `get(address: string)`: Get a burner account based on its address.
     - `list()`: List all burners.
     - `select(address: string)`: Set a burner as the active account.
diff --git a/packages/create-burner/src/connectors/burner.ts b/packages/create-burner/src/connectors/burner.ts
@@ -1,5 +1,5 @@
 import { Connector } from "@starknet-react/core";
-import { StarknetWindowObject } from "get-starknet-core";
+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";
 import { Account, AccountInterface, shortString } from "starknet";
 
 import { katanaIcon } from "./icons";
diff --git a/packages/create-burner/src/connectors/dojoBurnerSWO.ts b/packages/create-burner/src/connectors/dojoBurnerSWO.ts
@@ -1,4 +1,4 @@
-import { StarknetWindowObject } from "get-starknet-core";
+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";
 import { AccountInterface, RpcProvider } from "starknet";
 
 import { BurnerManager } from "..";
diff --git a/packages/create-burner/src/connectors/dojoPredeployedSWO.ts b/packages/create-burner/src/connectors/dojoPredeployedSWO.ts
@@ -1,4 +1,4 @@
-import { StarknetWindowObject } from "get-starknet-core";
+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";
 import { AccountInterface, RpcProvider } from "starknet";
 
 import { PredeployedManager } from "..";
diff --git a/packages/create-burner/src/hooks/useBurnerWindowObject.ts b/packages/create-burner/src/hooks/useBurnerWindowObject.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { StarknetWindowObject } from "get-starknet-core";
+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";
 
 import { BurnerManager, DojoBurnerStarknetWindowObject } from "..";
 
diff --git a/packages/create-burner/src/hooks/usePredeployedWindowObject.ts b/packages/create-burner/src/hooks/usePredeployedWindowObject.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { StarknetWindowObject } from "get-starknet-core";
+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";
 
 import { DojoPredeployedStarknetWindowObject, PredeployedManager } from "..";
 
diff --git a/packages/create-burner/src/manager/prefundAccount.ts b/packages/create-burner/src/manager/prefundAccount.ts
@@ -34,14 +34,10 @@ export const prefundAccount = async (
         // Retrieve the nonce for the account to avoid transaction collisions
         const nonce = await account.getNonce();
         // Initiate the transaction
-        const { transaction_hash } = await account.execute(
-            [transferOptions],
-            undefined,
-            {
-                nonce,
-                maxFee,
-            }
-        );
+        const { transaction_hash } = await account.execute([transferOptions], {
+            nonce,
+            maxFee,
+        });
 
         // Wait for the transaction to complete and check its status
         const result = await account.waitForTransaction(transaction_hash, {
diff --git a/packages/create-dojo/package.json b/packages/create-dojo/package.json
@@ -36,7 +36,7 @@
         "@types/fs-extra": "^11.0.4",
         "@types/js-yaml": "^4.0.9",
         "@types/node": "^20.0.0",
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^2.1.1"
     }
diff --git a/packages/predeployed-connector/src/index.ts b/packages/predeployed-connector/src/index.ts
@@ -250,7 +250,8 @@ export async function predeployedAccounts(
         return res.map((a: PredeployedAccountRpcResponse, idx: number) => ({
             id: `${id}-${idx}`,
             name: `${name} ${idx}`,
-            account: new PredeployedWalletAccount(
+            account: PredeployedWalletAccount.connect(
+                provider,
                 new PredeployedWallet(
                     `${id}-${idx}`,
                     `${name} ${idx}`,
@@ -261,8 +262,7 @@ export async function predeployedAccounts(
                         undefined,
                         constants.TRANSACTION_VERSION.V3
                     )
-                ),
-                options.rpc
+                )
             ),
         }));
     }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -34,7 +34,7 @@
         "@types/react": "^18.3.9",
         "@types/react-dom": "^18.3.0",
         "@types/web": "^0.0.114",
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^3.1.2"
     },
@@ -44,9 +44,9 @@
         "@dojoengine/torii-client": "workspace:*",
         "@dojoengine/utils": "workspace:*",
         "@latticexyz/utils": "^2.2.8",
+        "@starknet-io/get-starknet-core": "catalog:",
         "encoding": "^0.1.13",
         "fast-deep-equal": "^3.1.3",
-        "get-starknet-core": "catalog:",
         "js-cookie": "^3.0.5",
         "rxjs": "7.5.5",
         "zustand": "^4.5.5"
diff --git a/packages/sdk/src/__tests__/createSDK.test.ts b/packages/sdk/src/__tests__/createSDK.test.ts
@@ -47,7 +47,7 @@ const createMockClient = (): torii.ToriiClient =>
         updateEventMessageSubscription: vi.fn().mockResolvedValue(undefined),
         getControllers: vi.fn().mockResolvedValue([]),
         // Add other required methods as needed
-    }) as unknown as torii.ToriiClient;
+    } as unknown as torii.ToriiClient);
 
 describe("createSDK", () => {
     let mockClient: torii.ToriiClient;
diff --git a/packages/sdk/src/__tests__/toriiQueryBuilder.test.ts b/packages/sdk/src/__tests__/toriiQueryBuilder.test.ts
@@ -88,19 +88,17 @@ describe("ToriiQueryBuilder", () => {
     describe("order by handling", () => {
         it("should add a single order by", () => {
             const builder = new ToriiQueryBuilder<TestModels>();
-            const query = builder
-                .addOrderBy("dojo_starter", "x", "Asc")
-                .build();
+            const query = builder.addOrderBy("x", "Asc").build();
 
             expect(query.pagination.order_by).toEqual([
-                { model: "dojo_starter", member: "x", direction: "Asc" },
+                { field: "x", direction: "Asc" },
             ]);
         });
 
         it("should set multiple order by clauses", () => {
             const orderBy: OrderBy[] = [
-                { model: "dojo_starter", member: "x", direction: "Asc" },
-                { model: "dojo_starter", member: "y", direction: "Desc" },
+                { field: "x", direction: "Asc" },
+                { field: "y", direction: "Desc" },
             ];
 
             const builder = new ToriiQueryBuilder<TestModels>();
@@ -155,7 +153,7 @@ describe("ToriiQueryBuilder", () => {
                 .withLimit(10)
                 .withCursor("cursor")
                 .addEntityModel("dojo_starter-Position")
-                .addOrderBy("dojo_starter-Position", "x", "Asc")
+                .addOrderBy("x", "Asc")
                 .includeHashedKeys()
                 .build();
 
@@ -166,8 +164,7 @@ describe("ToriiQueryBuilder", () => {
                     direction: "Forward",
                     order_by: [
                         {
-                            model: "dojo_starter-Position",
-                            member: "x",
+                            field: "x",
                             direction: "Asc",
                         },
                     ],
diff --git a/packages/sdk/src/internal/pagination.ts b/packages/sdk/src/internal/pagination.ts
@@ -1,6 +1,8 @@
 import type { PaginationDirection } from "@dojoengine/torii-wasm/types";
 import type { SchemaType, ToriiQueryBuilder } from "./types.ts";
 
+const DEFAULT_LIMIT = 1000;
+
 /**
  * A generic pagination class that handles cursor-based pagination for query results.
  * This class manages the state of paginated items and provides methods to navigate through pages.
@@ -41,7 +43,7 @@ export class Pagination<T extends SchemaType, Inner extends any[]> {
     ): Pagination<T, Inner> {
         const pagination = query.getPagination();
         return new Pagination(
-            pagination.limit,
+            pagination.limit ?? DEFAULT_LIMIT,
             nextCursor,
             pagination.direction
         );
diff --git a/packages/sdk/src/internal/toriiQueryBuilder.ts b/packages/sdk/src/internal/toriiQueryBuilder.ts
@@ -86,13 +86,11 @@ export class ToriiQueryBuilder<T extends SchemaType> {
      * Add a single order by clause
      */
     addOrderBy(
-        model: keyof T & string,
         member: string,
         direction: "Asc" | "Desc"
     ): ToriiQueryBuilder<T> {
         this.query.pagination.order_by.push({
-            model,
-            member,
+            field: member,
             direction,
         });
         return this;
diff --git a/packages/state/package.json b/packages/state/package.json
@@ -21,7 +21,7 @@
         }
     },
     "devDependencies": {
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2"
     },
     "peerDependencies": {
diff --git a/packages/torii-client/package.json b/packages/torii-client/package.json
@@ -24,7 +24,7 @@
         "@dojoengine/torii-wasm": "workspace:*"
     },
     "devDependencies": {
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^3.1.2"
     }
diff --git a/packages/torii-wasm/dojo.c b/packages/torii-wasm/dojo.c
@@ -1 +1 @@
-Subproject commit 62bf0fc596c25f0b586af27385ee2c47e5242d36
+Subproject commit b3950fac489affacc37b20c71b28cab0bffdcf44
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -24,7 +24,7 @@
     "devDependencies": {
         "@types/elliptic": "^6.4.18",
         "@vitest/coverage-v8": "^1.6.0",
-        "tsup": "^8.3.5",
+        "tsup": "^8.4.0",
         "typescript": "^5.6.2",
         "vitest": "^1.6.0"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { StarknetWindowObject } from "get-starknet-core";`
	`1`	`+import { StarknetWindowObject } from "@starknet-io/get-starknet-core";`
`2`	`2`	`import { AccountInterface, RpcProvider } from "starknet";`
`3`	`3`
`4`	`4`	`import { BurnerManager } from "..";`