fix: build and dep issues

dojoengine · Apr 4, 2024 · 5358dbf · 5358dbf
1 parent cc0decf
commit 5358dbf
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 51 deletions.
diff --git a/examples/react/react-app/src/dojo/DojoContext.tsx b/examples/react/react-app/src/dojo/DojoContext.tsx
@@ -45,6 +45,7 @@ export const DojoProvider = ({
         select,
         isDeploying,
         clear,
+        count,
         copyToClipboard,
         applyFromClipboard,
     } = useBurnerManager({
@@ -62,6 +63,7 @@ export const DojoProvider = ({
                     get,
                     select,
                     clear,
+                    count,
                     account: account ? account : masterAccount,
                     isDeploying,
                     copyToClipboard,

diff --git a/examples/react/react-phaser-example/src/dojo/createBurner.ts b/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) {

diff --git a/examples/react/starknet-react-app/package.json b/examples/react/starknet-react-app/package.json
@@ -29,7 +29,7 @@
         "react": "^18",
         "react-dom": "^18",
         "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"
     },

diff --git a/examples/react/starknet-react-app/src/dojo/DojoContext.tsx b/examples/react/starknet-react-app/src/dojo/DojoContext.tsx
@@ -30,14 +30,14 @@ export const DojoProvider = ({
 
     const { account: walletAccount } = useAccount();
 
+    const {
+        config: { masterAddress, masterPrivateKey },
+        dojoProvider,
+    } = value;
+
     if (walletAccount) {
         masterAccount = walletAccount;
     } else {
-        const {
-            config: { masterAddress, masterPrivateKey },
-            dojoProvider,
-        } = value;
-
         masterAccount = new Account(
             dojoProvider.provider,
             masterAddress,
@@ -46,12 +46,17 @@ export const DojoProvider = ({
         );
     }
 
-    console.log(value.dojoProvider.provider);
-
     const burnerManager = new BurnerManager({
-        masterAccount: masterAccount,
+        masterAccount: new Account(
+            {
+                nodeUrl: dojoConfig.rpcUrl,
+            },
+            dojoConfig.masterAddress,
+            dojoConfig.masterPrivateKey
+        ),
         accountClassHash: dojoConfig.accountClassHash,
-        rpcProvider: value.dojoProvider.provider,
+        rpcProvider: dojoProvider.provider,
+        feeTokenAddress: dojoConfig.feeTokenAddress,
     });
 
     const {

diff --git a/examples/react/starknet-react-app/src/dojo/generated/setup.ts b/examples/react/starknet-react-app/src/dojo/generated/setup.ts
@@ -6,8 +6,6 @@ import { createSystemCalls } from "../createSystemCalls";
 import { defineContractComponents } from "./contractComponents";
 import { world } from "./world";
 import { setupWorld } from "./generated";
-import { Account } from "starknet";
-import { BurnerManager } from "@dojoengine/create-burner";
 
 export type SetupResult = Awaited<ReturnType<typeof setup>>;
 
@@ -16,6 +14,7 @@ export async function setup({ ...config }: DojoConfig) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
+        relayUrl: "",
         worldAddress: config.manifest.world.address || "",
     });
 

diff --git a/examples/vue/vue-app/dist/assets/index-CbQMbAXL.css b/examples/vue/vue-app/dist/assets/index-CbQMbAXL.css
diff --git a/examples/vue/vue-app/dist/assets/index-CfBgCni9.js b/examples/vue/vue-app/dist/assets/index-CfBgCni9.js
diff --git a/examples/vue/vue-app/dist/assets/torii_client_wasm_bg-Dtg_a3kE.wasm b/examples/vue/vue-app/dist/assets/torii_client_wasm_bg-Dtg_a3kE.wasm
diff --git a/examples/vue/vue-app/dist/index.html b/examples/vue/vue-app/dist/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Vite + Vue + TS</title>
+      <script type="module" crossorigin src="/assets/index-CfBgCni9.js"></script>
+      <link rel="stylesheet" crossorigin href="/assets/index-CbQMbAXL.css">
+    </head>
+    <body>
+        <div id="app"></div>
+    </body>
+</html>
diff --git a/examples/vue/vue-app/dist/vite.svg b/examples/vue/vue-app/dist/vite.svg
diff --git a/examples/vue/vue-app/dojoConfig.ts b/examples/vue/vue-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({

diff --git a/packages/torii-wasm/crate/Cargo.lock b/packages/torii-wasm/crate/Cargo.lock
diff --git a/packages/torii-wasm/crate/Cargo.toml b/packages/torii-wasm/crate/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 edition = "2021"
 name = "torii-client-wasm"
-version = "0.3.1"
+version = "0.6.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/torii-wasm/crate/rust-toolchain.toml b/packages/torii-wasm/crate/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "1.75.0"
diff --git a/packages/utils-wasm/crate/rust-toolchain.toml b/packages/utils-wasm/crate/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "1.75.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml