diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 90f0930b..ef4dcd52 100644
--- 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.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<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
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<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
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<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
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<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
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<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
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<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
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<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
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<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
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<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
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<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
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