@cartridge/controller 0.5.7 → 0.5.9

package/dist/index.js

@@ -17,8 +17,10 @@ var ResponseCodes = /* @__PURE__ */ ((ResponseCodes2) => {
 import {
   addAddressPadding,
   CallData,
+  constants,
   getChecksumAddress,
   hash,
+  shortString,
   typedData,
   TypedDataRevision
 } from "starknet";
@@ -110,11 +112,33 @@ function toArray(val) {
 function humanizeString(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/_/g, " ").toLowerCase().replace(/^\w/, (c) => c.toUpperCase());
 }
+function parseChainId(url) {
+  const parts = url.pathname.split("/");
+  if (parts.includes("starknet")) {
+    if (parts.includes("mainnet")) {
+      return constants.StarknetChainId.SN_MAIN;
+    } else if (parts.includes("sepolia")) {
+      return constants.StarknetChainId.SN_SEPOLIA;
+    }
+  } else if (parts.length >= 3) {
+    const projectName = parts[2];
+    if (parts.includes("katana")) {
+      return shortString.encodeShortString(
+        `WP_${projectName.toUpperCase().replace(/-/g, "_")}`
+      );
+    } else if (parts.includes("mainnet")) {
+      return shortString.encodeShortString(
+        `GG_${projectName.toUpperCase().replace(/-/g, "_")}`
+      );
+    }
+  }
+  throw new Error(`Chain ${url.toString()} not supported`);
+}
 
 // src/account.ts
 var ControllerAccount = class extends WalletAccount {
-  constructor(provider, address, keychain, options, modal) {
-    super({ nodeUrl: provider.rpc.toString() }, provider);
+  constructor(provider, rpcUrl, address, keychain, options, modal) {
+    super({ nodeUrl: rpcUrl }, provider);
     this.address = address;
     this.keychain = keychain;
     this.options = options;
@@ -390,7 +414,7 @@ import {
 // package.json
 var package_default = {
   name: "@cartridge/controller",
-  version: "0.5.7",
+  version: "0.5.9",
   description: "Cartridge Controller",
   module: "dist/index.js",
   types: "dist/index.d.ts",
@@ -400,6 +424,7 @@ var package_default = {
     build: "pnpm build:deps",
     format: 'prettier --write "src/**/*.ts"',
     "format:check": 'prettier --check "src/**/*.ts"',
+    test: "jest",
     version: "pnpm pkg get version"
   },
   exports: {
@@ -432,7 +457,10 @@ var package_default = {
   },
   devDependencies: {
     "@cartridge/tsconfig": "workspace:*",
+    "@types/jest": "^29.5.14",
     "@types/node": "^20.6.0",
+    jest: "^29.7.0",
+    "ts-jest": "^29.2.5",
     typescript: "^5.4.5"
   }
 };
@@ -442,7 +470,7 @@ var icon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AA
 
 // src/provider.ts
 var BaseProvider = class {
-  constructor(options) {
+  constructor() {
     this.id = "controller";
     this.name = "Controller";
     this.version = package_default.version;
@@ -460,8 +488,9 @@ var BaseProvider = class {
           if (this.account) {
             return [this.account.address];
           }
+          const silentMode = call.params && call.params.silent_mode;
           this.account = await this.probe();
-          if (!this.account) {
+          if (!this.account && !silentMode) {
             this.account = await this.connect();
           }
           if (this.account) {
@@ -475,24 +504,20 @@ var BaseProvider = class {
             message: "An unexpected error occurred",
             data: "wallet_watchAsset not implemented"
           };
-        case "wallet_addStarknetChain":
-          throw {
-            code: 63,
-            message: "An unexpected error occurred",
-            data: "wallet_addStarknetChain not implemented"
-          };
-        case "wallet_switchStarknetChain":
-          throw {
-            code: 63,
-            message: "An unexpected error occurred",
-            data: "wallet_switchStarknetChain not implemented"
-          };
+        case "wallet_addStarknetChain": {
+          let params2 = call.params;
+          return this.addStarknetChain(params2);
+        }
+        case "wallet_switchStarknetChain": {
+          let params2 = call.params;
+          return this.switchStarknetChain(params2.chainId);
+        }
         case "wallet_requestChainId":
           if (!this.account) {
             throw {
               code: 63,
               message: "An unexpected error occurred",
-              data: "wallet_deploymentData not implemented"
+              data: "Account not initialized"
             };
           }
           return await this.account.getChainId();
@@ -507,7 +532,7 @@ var BaseProvider = class {
             throw {
               code: 63,
               message: "An unexpected error occurred",
-              data: "wallet_deploymentData not implemented"
+              data: "Account not initialized"
             };
           }
           let params = call.params;
@@ -563,16 +588,41 @@ var BaseProvider = class {
         this.subscriptions.splice(idx, 1);
       }
     };
-    const { rpc } = options;
-    this.rpc = new URL(rpc);
+  }
+  emitNetworkChanged(chainId) {
+    this.subscriptions.filter((sub) => sub.type === "networkChanged").forEach((sub) => {
+      sub.handler(chainId);
+    });
+  }
+  emitAccountsChanged(accounts) {
+    this.subscriptions.filter((sub) => sub.type === "accountsChanged").forEach((sub) => {
+      sub.handler(accounts);
+    });
   }
 };
 
 // src/controller.ts
 var ControllerProvider = class extends BaseProvider {
   constructor(options) {
-    const { rpc } = options;
-    super({ rpc });
+    super();
+    const chains = /* @__PURE__ */ new Map();
+    for (const chain of options.chains) {
+      const url = new URL(chain.rpcUrl);
+      const chainId = parseChainId(url);
+      chains.set(chainId, chain);
+    }
+    if (options.policies?.messages?.length && options.policies.messages.length !== chains.size) {
+      console.warn(
+        "Each message policy is associated with a specific chain. The number of message policies does not match the number of chains specified - session message signing may not work on some chains."
+      );
+    }
+    this.chains = chains;
+    this.selectedChain = options.defaultChainId;
+    if (!this.chains.has(this.selectedChain)) {
+      throw new Error(
+        `Chain ${this.selectedChain} not found in configured chains`
+      );
+    }
     this.iframes = {
       keychain: new KeychainIFrame({
         ...options,
@@ -594,11 +644,10 @@ var ControllerProvider = class extends BaseProvider {
         console.error(new NotReadyToConnect().message);
         return;
       }
-      const response = await this.keychain.probe(
-        this.rpc.toString()
-      );
+      const response = await this.keychain.probe(this.rpcUrl());
       this.account = new account_default(
         this,
+        this.rpcUrl(),
         response.address,
         this.keychain,
         this.options,
@@ -620,7 +669,7 @@ var ControllerProvider = class extends BaseProvider {
           openPurchaseCredits: () => this.openPurchaseCredits.bind(this),
           openExecute: () => this.openExecute.bind(this)
         },
-        rpcUrl: this.rpc.toString(),
+        rpcUrl: this.rpcUrl(),
         username,
         version: this.version
       });
@@ -644,8 +693,8 @@ var ControllerProvider = class extends BaseProvider {
     this.iframes.keychain.open();
     try {
       let response = await this.keychain.connect(
-        this.options.policies || [],
-        this.rpc.toString()
+        this.options.policies || {},
+        this.rpcUrl()
       );
       if (response.code !== "SUCCESS" /* SUCCESS */) {
         throw new Error(response.message);
@@ -653,6 +702,7 @@ var ControllerProvider = class extends BaseProvider {
       response = response;
       this.account = new account_default(
         this,
+        this.rpcUrl(),
         response.address,
         this.keychain,
         this.options,
@@ -665,6 +715,23 @@ var ControllerProvider = class extends BaseProvider {
       this.iframes.keychain.close();
     }
   }
+  async switchStarknetChain(chainId) {
+    try {
+      this.selectedChain = chainId;
+      this.account = await this.probe();
+      if (!this.account) {
+        this.account = await this.connect();
+      }
+    } catch (e) {
+      console.error(e);
+      return false;
+    }
+    this.emitNetworkChanged(chainId);
+    return true;
+  }
+  addStarknetChain(_chain) {
+    return Promise.resolve(true);
+  }
   async disconnect() {
     if (!this.keychain) {
       console.error(new NotReadyToConnect().message);
@@ -717,6 +784,9 @@ var ControllerProvider = class extends BaseProvider {
     }
     return this.keychain.revoke(origin);
   }
+  rpcUrl() {
+    return this.chains.get(this.selectedChain).rpcUrl;
+  }
   username() {
     if (!this.keychain) {
       console.error(new NotReadyToConnect().message);
@@ -743,7 +813,7 @@ var ControllerProvider = class extends BaseProvider {
     this.iframes.keychain.open();
     this.keychain.openPurchaseCredits();
   }
-  async openExecute(calls) {
+  async openExecute(calls, chainId) {
     if (!this.keychain || !this.iframes.keychain) {
       console.error(new NotReadyToConnect().message);
       return;
@@ -752,16 +822,21 @@ var ControllerProvider = class extends BaseProvider {
       console.error("Profile is not ready");
       return;
     }
-    if (this.iframes.profile?.sendBackward) {
-      this.iframes.profile?.sendBackward();
-    } else {
-      this.iframes.profile?.close();
+    let currentChainId = this.selectedChain;
+    if (chainId) {
+      this.switchStarknetChain(chainId);
     }
+    this.iframes.profile?.sendBackward();
     this.iframes.keychain.open();
+    this.iframes.profile?.close();
     const res = await this.keychain.execute(calls, void 0, void 0, true);
+    this.iframes.profile?.open();
     this.iframes.keychain.close();
-    this.iframes.profile?.sendForward?.();
-    return !(res && res.code === "NOT_CONNECTED" /* NOT_CONNECTED */);
+    this.iframes.profile?.sendForward();
+    if (chainId) {
+      this.switchStarknetChain(currentChainId);
+    }
+    return !(res && (res.code === "NOT_CONNECTED" /* NOT_CONNECTED */ || res.code === "CANCELED" /* CANCELED */));
   }
   async delegateAccount() {
     if (!this.keychain) {
@@ -837,7 +912,7 @@ async function lookupAddresses(addresses) {
   );
 }
 
-// ../../node_modules/.pnpm/@cartridge+presets@https+++codeload.github.com+cartridge-gg+presets+tar.gz+570ecfe/node_modules/@cartridge/presets/dist/index.js
+// ../../node_modules/.pnpm/@cartridge+presets@https+++codeload.github.com+cartridge-gg+presets+tar.gz+b0def0f/node_modules/@cartridge/presets/dist/index.js
 var configs = {
   "blob-arena": {
     origin: "blobarena.xyz",
@@ -1343,6 +1418,22 @@ var configs = {
               entrypoint: "set_approval_for_all"
             }
           ]
+        },
+        "0x4b5e65a9617c7ba3c7ea64324ff4338a400adb1a3cfe903b3f8b647cbb59fb7": {
+          name: "Season Systems",
+          description: "Register and claim",
+          methods: [
+            {
+              name: "Register",
+              description: "Registers to leaderboard",
+              entrypoint: "register_to_leaderboard"
+            },
+            {
+              name: "Claim",
+              description: "Claim",
+              entrypoint: "claim_leaderboard_rewards"
+            }
+          ]
         }
       },
       messages: [