chore: update examples - changed contracts to branch main

dojoengine · Feb 19, 2025 · 175c80f · 175c80f
1 parent 7048112
commit 175c80f
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 27 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ 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
+      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.1.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
@@ -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
@@ -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
@@ -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
@@ -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<SchemaType>({
         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
@@ -37,7 +37,6 @@ export const useDojoStore = createDojoStore<SchemaType>();
 async function main() {
     const sdk = await init<SchemaType>({
         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
@@ -15,7 +15,6 @@ export type SetupResult = Awaited<ReturnType<typeof setup>>;
 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
@@ -13,7 +13,6 @@ export type SetupResult = Awaited<ReturnType<typeof setup>>;
 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
@@ -15,7 +15,6 @@ export type SetupResult = Awaited<ReturnType<typeof setup>>;
 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
@@ -22,7 +22,6 @@ import StarknetProvider from "./starknet-provider.tsx";
 async function main() {
     const sdk = await init<SchemaType>({
         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
@@ -33,7 +33,6 @@ declare module "@tanstack/react-router" {
 async function main() {
     const sdk = await init<SchemaType>({
         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
@@ -15,7 +15,6 @@ export type SetupResult = Awaited<ReturnType<typeof setup>>;
 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
@@ -15,7 +15,6 @@ export type SetupResult = Awaited<ReturnType<typeof setup>>;
 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
@@ -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<ReturnType<typeof setup>>;
 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/worlds/dojo-starter b/worlds/dojo-starter
diff --git a/worlds/onchain-dash b/worlds/onchain-dash
+20 −16		.github/workflows/test.yaml
+2 −1		.gitignore
+9 −6		README.md
+7 −7		Scarb.lock
+9 −8		Scarb.toml
+1 −1		dojo_dev.toml
+3 −3		dojo_release.toml
+1,513 −0		manifest_dev.json
+0 −262		manifests/dev/base/abis/contracts/dojo_starter-actions-7a1c7102.json
+0 −98		manifests/dev/base/abis/dojo-base.json
+0 −1,231		manifests/dev/base/abis/dojo-world.json
+0 −433		manifests/dev/base/abis/models/dojo_starter-DirectionsAvailable-77844f1f.json
+0 −433		manifests/dev/base/abis/models/dojo_starter-Moved-504403e5.json
+0 −455		manifests/dev/base/abis/models/dojo_starter-Moves-2a29373f.json
+0 −421		manifests/dev/base/abis/models/dojo_starter-Position-2ac8b4c1.json
+0 −14		manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml
+0 −6		manifests/dev/base/dojo-base.toml
+0 −6		manifests/dev/base/dojo-world.toml
+0 −17		manifests/dev/base/models/dojo_starter-DirectionsAvailable-77844f1f.toml
+0 −17		manifests/dev/base/models/dojo_starter-Moved-504403e5.toml
+0 −27		manifests/dev/base/models/dojo_starter-Moves-2a29373f.toml
+0 −17		manifests/dev/base/models/dojo_starter-Position-2ac8b4c1.toml
+0 −262		manifests/dev/deployment/abis/contracts/dojo_starter-actions-7a1c7102.json
+0 −98		manifests/dev/deployment/abis/dojo-base.json
+0 −1,231		manifests/dev/deployment/abis/dojo-world.json
+0 −433		manifests/dev/deployment/abis/models/dojo_starter-DirectionsAvailable-77844f1f.json
+0 −433		manifests/dev/deployment/abis/models/dojo_starter-Moved-504403e5.json
+0 −455		manifests/dev/deployment/abis/models/dojo_starter-Moves-2a29373f.json
+0 −421		manifests/dev/deployment/abis/models/dojo_starter-Position-2ac8b4c1.json
+0 −3,373		manifests/dev/deployment/manifest.json
+0 −129		manifests/dev/deployment/manifest.toml
+0 −10		scripts/move.sh
+0 −10		scripts/spawn.sh
+4 −4		src/lib.cairo
+12 −6		src/models.cairo
+41 −24		src/systems/actions.cairo
+31 −15		src/tests/test_world.cairo