chore: support v1 accounts

dojoengine · Jan 19, 2024 · c002a04 · c002a04
1 parent 8980503
commit c002a04
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/examples/dojo-starter b/examples/dojo-starter
diff --git a/examples/react/react-app/src/dojo/DojoContext.tsx b/examples/react/react-app/src/dojo/DojoContext.tsx
@@ -37,7 +37,7 @@ export const DojoProvider = ({
     );
 
     const masterAccount = useMemo(
-        () => new Account(rpcProvider, masterAddress, masterPrivateKey),
+        () => new Account(rpcProvider, masterAddress, masterPrivateKey, "1"),
         [rpcProvider, masterAddress, masterPrivateKey]
     );
 

diff --git a/examples/react/react-phaser-example/src/dojo/createBurner.ts b/examples/react/react-phaser-example/src/dojo/createBurner.ts
@@ -14,7 +14,8 @@ export const createBurner = async ({ ...config }: Config) => {
         masterAccount: new Account(
             rpcProvider,
             config.masterAddress,
-            config.masterPrivateKey
+            config.masterPrivateKey,
+            "1"
         ),
         accountClassHash: config.accountClassHash,
         rpcProvider,

diff --git a/packages/core/src/provider/DojoProvider.ts b/packages/core/src/provider/DojoProvider.ts
@@ -153,14 +153,16 @@ export class DojoProvider extends Provider {
             const nonce = await account?.getNonce();
 
             return await account?.execute(
-                {
-                    contractAddress: getContractByName(
-                        this.manifest,
-                        contract_name
-                    ),
-                    entrypoint: call,
-                    calldata: calldata,
-                },
+                [
+                    {
+                        contractAddress: getContractByName(
+                            this.manifest,
+                            contract_name
+                        ),
+                        entrypoint: call,
+                        calldata: calldata,
+                    },
+                ],
                 undefined,
                 {
                     maxFee: 0, // TODO: Update this value as needed.

diff --git a/packages/create-burner/src/manager/burnerManager.ts b/packages/create-burner/src/manager/burnerManager.ts
@@ -20,7 +20,8 @@ import { prefundAccount } from "./prefundAccount";
  *  const masterAccount = new Account(
  *      rpcProvider,
  *      import.meta.env.VITE_PUBLIC_MASTER_ADDRESS!,
- *      import.meta.env.VITE_PUBLIC_MASTER_PRIVATE_KEY!
+ *      import.meta.env.VITE_PUBLIC_MASTER_PRIVATE_KEY!,
+ *      "1"
  *   );
  *
  *   const burnerManager = new BurnerManager({
@@ -90,7 +91,8 @@ export class BurnerManager {
                 this.account = new Account(
                     this.provider,
                     address,
-                    storage[address].privateKey
+                    storage[address].privateKey,
+                    "1"
                 );
                 return;
             }
@@ -146,7 +148,8 @@ export class BurnerManager {
         this.account = new Account(
             this.provider,
             address,
-            storage[address].privateKey
+            storage[address].privateKey,
+            "1"
         );
     }
 
@@ -156,7 +159,12 @@ export class BurnerManager {
             throw new Error("burner not found");
         }
 
-        return new Account(this.provider, address, storage[address].privateKey);
+        return new Account(
+            this.provider,
+            address,
+            storage[address].privateKey,
+            "1"
+        );
     }
 
     clear(): void {
@@ -170,7 +178,8 @@ export class BurnerManager {
                 return new Account(
                     this.provider,
                     address,
-                    storage[address].privateKey
+                    storage[address].privateKey,
+                    "1"
                 );
             }
         }
@@ -192,7 +201,6 @@ export class BurnerManager {
         if (!this.masterAccount) {
             throw new Error("wallet account not found");
         }
-
         try {
             await prefundAccount(address, this.masterAccount);
         } catch (e) {
@@ -206,7 +214,7 @@ export class BurnerManager {
         };
 
         // deploy burner
-        const burner = new Account(this.provider, address, privateKey);
+        const burner = new Account(this.provider, address, privateKey, "1");
 
         const nonce = await this.account?.getNonce();
 

diff --git a/packages/create-burner/src/manager/prefundAccount.ts b/packages/create-burner/src/manager/prefundAccount.ts
@@ -32,10 +32,9 @@ 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,
+            [transferOptions],
             undefined,
             {
                 nonce,
+1 −1		.github/workflows/test.yaml
+3 −3		.vscode/settings.json
+8 −9		Scarb.lock
+4 −4		Scarb.toml
+1 −3		scripts/default_auth.sh
+70 −17		src/actions.cairo
+3 −11		src/lib.cairo
+32 −3		src/models.cairo
+0 −31		src/models/moves.cairo
+0 −62		src/tests/test_world.cairo
+23 −0		src/utils.cairo