From 704811257a4681a7d762ff1c4cb8604bc9427fad Mon Sep 17 00:00:00 2001 From: notV4l Date: Mon, 17 Feb 2025 21:46:35 +0100 Subject: [PATCH 1/2] chore: update sdk --- packages/sdk/src/index.ts | 23 +++++++++++++++++------ packages/sdk/src/types.ts | 16 +++++++++++++--- worlds/dojo-starter | 2 +- worlds/onchain-dash | 2 +- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts index 2658ba27..62317577 100644 --- a/packages/sdk/src/index.ts +++ b/packages/sdk/src/index.ts @@ -257,26 +257,31 @@ export async function init( /** * @param {(string)[]} contract_addresses + * @param {string[]} token_ids * @returns {Promise} */ getTokens: async ( - contract_addresses: string[] + contract_addresses: string[], + token_ids: string[] ): Promise => { - return await client.getTokens(contract_addresses); + return await client.getTokens(contract_addresses, token_ids); }, /** * @param {(string)[]} account_addresses * @param {(string)[]} contract_addresses + * @param {string[]} token_ids * @returns {Promise} */ getTokenBalances: async ( account_addresses: string[], - contract_addresses: string[] + contract_addresses: string[], + token_ids: string[] ): Promise => { return await client.getTokenBalances( account_addresses, - contract_addresses + contract_addresses, + token_ids ); }, @@ -286,6 +291,7 @@ export async function init( * # Parameters * @param {string[]} contract_addresses - Array of contract addresses to filter (empty for all) * @param {string[]} account_addresses - Array of account addresses to filter (empty for all) + * @param {string[]} token_ids - Array of token ids to filter (empty for all) * @param {Funtion} callback - JavaScript function to call on updates * * # Returns @@ -295,11 +301,13 @@ export async function init( onTokenBalanceUpdated: ( contract_addresses: string[], account_addresses: string[], + token_ids: string[], callback: Function ): torii.Subscription => { return client.onTokenBalanceUpdated( contract_addresses, account_addresses, + token_ids, callback ); }, @@ -311,6 +319,7 @@ export async function init( * @param {torii.Subscription} subscription - Existing subscription to update * @param {string[]} contract_addresses - New array of contract addresses to filter * @param {string[]} account_addresses - New array of account addresses to filter + * @param {string[]} token_ids - New array of token ids to filter (empty for all) * * # Returns * Result containing unit or error @@ -319,12 +328,14 @@ export async function init( updateTokenBalanceSubscription: async ( subscription: torii.Subscription, contract_addresses: string[], - account_addresses: string[] + account_addresses: string[], + token_ids: string[] ): Promise => { return await client.updateTokenBalanceSubscription( subscription, contract_addresses, - account_addresses + account_addresses, + token_ids ); }, diff --git a/packages/sdk/src/types.ts b/packages/sdk/src/types.ts index 6ad6c450..ab825bd1 100644 --- a/packages/sdk/src/types.ts +++ b/packages/sdk/src/types.ts @@ -324,18 +324,24 @@ export interface SDK { /** * @param {string[]} contract_addresses + * @param {string[]} token_ids * @returns {Promise} */ - getTokens(contract_addresses: string[]): Promise; + getTokens( + contract_addresses: string[], + token_ids: string[] + ): Promise; /** * @param {string[]} account_addresses * @param {string[]} contract_addresses + * @param {string[]} token_ids * @returns {Promise} */ getTokenBalances( account_addresses: string[], - contract_addresses: string[] + contract_addresses: string[], + token_ids: string[] ): Promise; /** @@ -344,6 +350,7 @@ export interface SDK { * # Parameters * @param {string[]} contract_addresses - Array of contract addresses to filter (empty for all) * @param {string[]} account_addresses - Array of account addresses to filter (empty for all) + * @param {string[]} token_ids - Array of token ids to filter (empty for all) * @param {Funtion} callback - JavaScript function to call on updates * * # Returns @@ -353,6 +360,7 @@ export interface SDK { onTokenBalanceUpdated: ( contract_addresses: string[], account_addresses: string[], + token_ids: string[], callback: Function ) => torii.Subscription; @@ -363,6 +371,7 @@ export interface SDK { * @param {torii.Subscription} subscription - Existing subscription to update * @param {string[]} contract_addresses - New array of contract addresses to filter * @param {string[]} account_addresses - New array of account addresses to filter + * @param {string[]} token_ids - New array of token ids to filter * * # Returns * Result containing unit or error @@ -371,7 +380,8 @@ export interface SDK { updateTokenBalanceSubscription: ( subscription: torii.Subscription, contract_addresses: string[], - account_addresses: string[] + account_addresses: string[], + token_ids: string[] ) => Promise; /** diff --git a/worlds/dojo-starter b/worlds/dojo-starter index 435171ea..4964f2b3 160000 --- a/worlds/dojo-starter +++ b/worlds/dojo-starter @@ -1 +1 @@ -Subproject commit 435171ea38c17e36d6760532e34fb797dc1cf834 +Subproject commit 4964f2b38671ed4182b2762fb2ae421812fc45c3 diff --git a/worlds/onchain-dash b/worlds/onchain-dash index 437c5d2c..48c4ef12 160000 --- a/worlds/onchain-dash +++ b/worlds/onchain-dash @@ -1 +1 @@ -Subproject commit 437c5d2cb23deb04876dfd2546378f66afae94ac +Subproject commit 48c4ef126ac9862a2ab2a947635ccaa7f3322971 From 896c98e7a85a3c61764735ec841f5c813ce27eec Mon Sep 17 00:00:00 2001 From: Valentin Dosimont Date: Wed, 19 Feb 2025 14:00:25 +0100 Subject: [PATCH 2/2] chore: update examples - changed contracts to branch main --- .github/workflows/ci.yaml | 5 ++++- .../example-vanillajs-phaser-recs/src/dojo/setup.ts | 1 - examples/example-vite-experimental-sdk/src/main.ts | 1 - examples/example-vite-grpc-playground/src/main.tsx | 1 - examples/example-vite-kitchen-sink/src/main.tsx | 3 +-- examples/example-vite-phaser-sdk/src/main.ts | 1 - .../example-vite-react-app-recs/src/dojo/setup.ts | 1 - .../src/dojo/generated/setup.ts | 1 - .../src/dojo/generated/setup.ts | 1 - examples/example-vite-react-sdk/src/main.tsx | 1 - examples/example-vite-react-sql/src/main.tsx | 1 - .../src/dojo/generated/setup.ts | 1 - examples/example-vite-svelte-recs/src/dojo/setup.ts | 1 - .../src/dojo/generated/setup.ts | 13 ++----------- packages/sdk/src/__example__/index.ts | 1 - worlds/dojo-starter | 2 +- worlds/onchain-dash | 2 +- 17 files changed, 9 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 90f0930b..c05a158f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,10 @@ 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.10 + - uses: software-mansion/setup-scarb@v1 + with: + scarb-version: "2.9.2" + - run: /home/runner/.config/.dojo/bin/dojoup -v v1.2.1 - run: | cd worlds/dojo-starter /home/runner/.config/.dojo/bin/sozo build diff --git a/examples/example-vanillajs-phaser-recs/src/dojo/setup.ts b/examples/example-vanillajs-phaser-recs/src/dojo/setup.ts index 809dcb43..5d5bc585 100644 --- a/examples/example-vanillajs-phaser-recs/src/dojo/setup.ts +++ b/examples/example-vanillajs-phaser-recs/src/dojo/setup.ts @@ -23,7 +23,6 @@ export async function setup({ ...config }: Config) { let toriiClient = null; try { toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: "", worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vite-experimental-sdk/src/main.ts b/examples/example-vite-experimental-sdk/src/main.ts index 73659410..8ea0deb7 100644 --- a/examples/example-vite-experimental-sdk/src/main.ts +++ b/examples/example-vite-experimental-sdk/src/main.ts @@ -12,7 +12,6 @@ async function main() { const sdk = await init({ client: { - rpcUrl: dojoConfig.rpcUrl, toriiUrl: dojoConfig.toriiUrl, relayUrl: dojoConfig.relayUrl, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-grpc-playground/src/main.tsx b/examples/example-vite-grpc-playground/src/main.tsx index 354cfde9..6d9ad4b4 100644 --- a/examples/example-vite-grpc-playground/src/main.tsx +++ b/examples/example-vite-grpc-playground/src/main.tsx @@ -8,7 +8,6 @@ import { dojoConfig } from "../dojoConfig.ts"; async function main() { const sdk = await init({ client: { - rpcUrl: dojoConfig.rpcUrl, toriiUrl: dojoConfig.toriiUrl, relayUrl: dojoConfig.relayUrl, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-kitchen-sink/src/main.tsx b/examples/example-vite-kitchen-sink/src/main.tsx index da1b8a68..7eef5ad0 100644 --- a/examples/example-vite-kitchen-sink/src/main.tsx +++ b/examples/example-vite-kitchen-sink/src/main.tsx @@ -12,12 +12,11 @@ import { dojoConfig } from "../dojoConfig"; import { setupWorld } from "./typescript/contracts.gen"; import { SchemaType } from "./typescript/models.gen"; -import { env, getRpcUrl } from "@/env"; +import { env } from "@/env"; async function main() { const sdk = await init({ client: { - rpcUrl: getRpcUrl(), toriiUrl: env.VITE_TORII_URL, relayUrl: env.VITE_RELAY_URL, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-phaser-sdk/src/main.ts b/examples/example-vite-phaser-sdk/src/main.ts index 1e8f4ed6..f58ad4a3 100644 --- a/examples/example-vite-phaser-sdk/src/main.ts +++ b/examples/example-vite-phaser-sdk/src/main.ts @@ -37,7 +37,6 @@ export const useDojoStore = createDojoStore(); async function main() { const sdk = await init({ client: { - rpcUrl: dojoConfig.rpcUrl, toriiUrl: dojoConfig.toriiUrl, relayUrl: dojoConfig.relayUrl, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-react-app-recs/src/dojo/setup.ts b/examples/example-vite-react-app-recs/src/dojo/setup.ts index 299834b7..259334d0 100644 --- a/examples/example-vite-react-app-recs/src/dojo/setup.ts +++ b/examples/example-vite-react-app-recs/src/dojo/setup.ts @@ -15,7 +15,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // Initialize Torii client for interacting with the Dojo network const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: "", worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vite-react-phaser-recs/src/dojo/generated/setup.ts b/examples/example-vite-react-phaser-recs/src/dojo/generated/setup.ts index 207d6a97..cd70868b 100644 --- a/examples/example-vite-react-phaser-recs/src/dojo/generated/setup.ts +++ b/examples/example-vite-react-phaser-recs/src/dojo/generated/setup.ts @@ -13,7 +13,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // torii client const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: config.relayUrl, worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vite-react-pwa-recs/src/dojo/generated/setup.ts b/examples/example-vite-react-pwa-recs/src/dojo/generated/setup.ts index dacff0ff..88de8eef 100644 --- a/examples/example-vite-react-pwa-recs/src/dojo/generated/setup.ts +++ b/examples/example-vite-react-pwa-recs/src/dojo/generated/setup.ts @@ -15,7 +15,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // torii client const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: config.relayUrl, worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vite-react-sdk/src/main.tsx b/examples/example-vite-react-sdk/src/main.tsx index 14f24bc0..177de83a 100644 --- a/examples/example-vite-react-sdk/src/main.tsx +++ b/examples/example-vite-react-sdk/src/main.tsx @@ -22,7 +22,6 @@ import StarknetProvider from "./starknet-provider.tsx"; async function main() { const sdk = await init({ client: { - rpcUrl: dojoConfig.rpcUrl, toriiUrl: dojoConfig.toriiUrl, relayUrl: dojoConfig.relayUrl, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-react-sql/src/main.tsx b/examples/example-vite-react-sql/src/main.tsx index 5e8770e9..c60c49f0 100644 --- a/examples/example-vite-react-sql/src/main.tsx +++ b/examples/example-vite-react-sql/src/main.tsx @@ -33,7 +33,6 @@ declare module "@tanstack/react-router" { async function main() { const sdk = await init({ client: { - rpcUrl: dojoConfig.rpcUrl, toriiUrl: dojoConfig.toriiUrl, relayUrl: dojoConfig.relayUrl, worldAddress: dojoConfig.manifest.world.address, diff --git a/examples/example-vite-react-threejs-recs/src/dojo/generated/setup.ts b/examples/example-vite-react-threejs-recs/src/dojo/generated/setup.ts index bcd64209..ce205f00 100644 --- a/examples/example-vite-react-threejs-recs/src/dojo/generated/setup.ts +++ b/examples/example-vite-react-threejs-recs/src/dojo/generated/setup.ts @@ -15,7 +15,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // torii client const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: config.relayUrl, worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vite-svelte-recs/src/dojo/setup.ts b/examples/example-vite-svelte-recs/src/dojo/setup.ts index 05550f6d..02b3b6af 100644 --- a/examples/example-vite-svelte-recs/src/dojo/setup.ts +++ b/examples/example-vite-svelte-recs/src/dojo/setup.ts @@ -15,7 +15,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // torii client const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: "", worldAddress: config.manifest.world.address || "", diff --git a/examples/example-vue-app-recs/src/dojo/generated/setup.ts b/examples/example-vue-app-recs/src/dojo/generated/setup.ts index 82db81fe..7637ca3d 100644 --- a/examples/example-vue-app-recs/src/dojo/generated/setup.ts +++ b/examples/example-vue-app-recs/src/dojo/generated/setup.ts @@ -1,15 +1,7 @@ -import { - createModelTypedData, - DojoConfig, - DojoProvider, -} from "@dojoengine/core"; +import { DojoConfig, DojoProvider } from "@dojoengine/core"; import { getSyncEntities } from "@dojoengine/state"; import * as torii from "@dojoengine/torii-client"; -import { - ArraySignatureType, - TypedData, - WeierstrassSignatureType, -} from "starknet"; +import { ArraySignatureType } from "starknet"; import { createClientComponents } from "../createClientComponents"; import { createSystemCalls } from "../createSystemCalls"; @@ -22,7 +14,6 @@ export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { // torii client const toriiClient = await torii.createClient({ - rpcUrl: config.rpcUrl, toriiUrl: config.toriiUrl, relayUrl: "", worldAddress: config.manifest.world.address || "", diff --git a/packages/sdk/src/__example__/index.ts b/packages/sdk/src/__example__/index.ts index 4d2159d2..f3e76e5b 100644 --- a/packages/sdk/src/__example__/index.ts +++ b/packages/sdk/src/__example__/index.ts @@ -79,7 +79,6 @@ export const schema: MockSchemaType = { async function exampleUsage() { const db = await init({ client: { - rpcUrl: "your-rpc-url", toriiUrl: "your-torii-url", relayUrl: "your-relay-url", worldAddress: "your-world-address", diff --git a/worlds/dojo-starter b/worlds/dojo-starter index 4964f2b3..0c97b2c7 160000 --- a/worlds/dojo-starter +++ b/worlds/dojo-starter @@ -1 +1 @@ -Subproject commit 4964f2b38671ed4182b2762fb2ae421812fc45c3 +Subproject commit 0c97b2c79646039b4af8c6fd3735470946512422 diff --git a/worlds/onchain-dash b/worlds/onchain-dash index 48c4ef12..257558d6 160000 --- a/worlds/onchain-dash +++ b/worlds/onchain-dash @@ -1 +1 @@ -Subproject commit 48c4ef126ac9862a2ab2a947635ccaa7f3322971 +Subproject commit 257558d6b8f60c1250aef6af23e419cefc1cfcfe