@cartridge/controller 0.5.8 → 0.5.9

package/src/__tests__/parseChainId.test.ts

@@ -0,0 +1,60 @@
+import { constants, shortString } from "starknet";
+import { parseChainId } from "../utils";
+
+describe("parseChainId", () => {
+  describe("Starknet chains", () => {
+    test("identifies mainnet", () => {
+      expect(
+        parseChainId(new URL("https://api.cartridge.gg/x/starknet/mainnet")),
+      ).toBe(constants.StarknetChainId.SN_MAIN);
+    });
+
+    test("identifies sepolia", () => {
+      expect(
+        parseChainId(new URL("https://api.cartridge.gg/x/starknet/sepolia")),
+      ).toBe(constants.StarknetChainId.SN_SEPOLIA);
+    });
+  });
+
+  describe("Project-specific chains", () => {
+    test("identifies slot chain", () => {
+      expect(
+        parseChainId(new URL("https://api.cartridge.gg/x/slot/katana")),
+      ).toBe(shortString.encodeShortString("WP_SLOT"));
+    });
+
+    test("identifies slot chain on localhost", () => {
+      expect(parseChainId(new URL("http://localhost:8001/x/slot/katana"))).toBe(
+        shortString.encodeShortString("WP_SLOT"),
+      );
+    });
+
+    test("identifies slot chain with hyphenated name", () => {
+      expect(
+        parseChainId(
+          new URL("https://api.cartridge.gg/x/my-slot-chain/katana"),
+        ),
+      ).toBe(shortString.encodeShortString("WP_MY_SLOT_CHAIN"));
+    });
+
+    test("identifies slot mainnet chain", () => {
+      expect(
+        parseChainId(new URL("https://api.cartridge.gg/x/slot/mainnet")),
+      ).toBe(shortString.encodeShortString("GG_SLOT"));
+    });
+  });
+
+  describe("Error cases", () => {
+    test("throws error for unsupported URL format", () => {
+      expect(() =>
+        parseChainId(new URL("https://api.example.com/unsupported")),
+      ).toThrow("Chain https://api.example.com/unsupported not supported");
+    });
+
+    test("throws error for URLs without proper chain identifiers", () => {
+      expect(() =>
+        parseChainId(new URL("https://api.example.com/v1/starknet")),
+      ).toThrow("Chain https://api.example.com/v1/starknet not supported");
+    });
+  });
+});

package/src/controller.ts

@@ -16,9 +16,10 @@ import {
   Chain,
 } from "./types";
 import BaseProvider from "./provider";
-import { constants, WalletAccount } from "starknet";
+import { WalletAccount } from "starknet";
 import { Policy } from "@cartridge/presets";
 import { AddStarknetChainParameters, ChainId } from "@starknet-io/types-js";
+import { parseChainId } from "./utils";
 
 export default class ControllerProvider extends BaseProvider {
   private keychain?: AsyncMethodReturns<Keychain>;
@@ -34,28 +35,8 @@ export default class ControllerProvider extends BaseProvider {
     const chains = new Map<ChainId, Chain>();
 
     for (const chain of options.chains) {
-      let chainId: ChainId | undefined;
       const url = new URL(chain.rpcUrl);
-      const parts = url.pathname.split("/");
-      if (parts.includes("starknet")) {
-        if (parts.includes("mainnet")) {
-          chainId = constants.StarknetChainId.SN_MAIN;
-        } else if (parts.includes("sepolia")) {
-          chainId = constants.StarknetChainId.SN_SEPOLIA;
-        }
-      } else if (parts.length >= 3) {
-        const projectName = parts[2];
-        if (parts.includes("katana")) {
-          chainId = `WP_${projectName.toUpperCase()}` as ChainId;
-        } else if (parts.includes("mainnet")) {
-          chainId = `GG_${projectName.toUpperCase()}` as ChainId;
-        }
-      }
-
-      if (!chainId) {
-        throw new Error(`Chain ${chain.rpcUrl} not supported`);
-      }
-
+      const chainId = parseChainId(url);
       chains.set(chainId, chain);
     }
 
@@ -305,7 +286,7 @@ export default class ControllerProvider extends BaseProvider {
     this.keychain.openPurchaseCredits();
   }
 
-  async openExecute(calls: any) {
+  async openExecute(calls: any, chainId?: string) {
     if (!this.keychain || !this.iframes.keychain) {
       console.error(new NotReadyToConnect().message);
       return;
@@ -314,16 +295,30 @@ export default class ControllerProvider extends BaseProvider {
       console.error("Profile is not ready");
       return;
     }
-    if (this.iframes.profile?.sendBackward) {
-      this.iframes.profile?.sendBackward();
-    } else {
-      this.iframes.profile?.close();
+    // Switch to the chain if provided
+    let currentChainId = this.selectedChain;
+    if (chainId) {
+      this.switchStarknetChain(chainId);
     }
+    // Switch iframes
+    this.iframes.profile?.sendBackward();
     this.iframes.keychain.open();
+    this.iframes.profile?.close();
+    // Invoke execute
     const res = await this.keychain.execute(calls, undefined, undefined, true);
+    // Switch back iframes
+    this.iframes.profile?.open();
     this.iframes.keychain.close();
-    this.iframes.profile?.sendForward?.();
-    return !(res && (res as ConnectError).code === ResponseCodes.NOT_CONNECTED);
+    this.iframes.profile?.sendForward();
+    // Switch back to the original chain
+    if (chainId) {
+      this.switchStarknetChain(currentChainId);
+    }
+    return !(
+      res &&
+      ((res as ConnectError).code === ResponseCodes.NOT_CONNECTED ||
+        (res as ConnectError).code === ResponseCodes.CANCELED)
+    );
   }
 
   async delegateAccount() {

package/src/utils.ts

@@ -2,13 +2,16 @@ import {
   addAddressPadding,
   Call,
   CallData,
+  constants,
   getChecksumAddress,
   hash,
+  shortString,
   typedData,
   TypedDataRevision,
 } from "starknet";
 import wasm from "@cartridge/account-wasm/controller";
 import { Policies, SessionPolicies } from "@cartridge/presets";
+import { ChainId } from "@starknet-io/types-js";
 
 // Whitelist of allowed property names to prevent prototype pollution
 const ALLOWED_PROPERTIES = new Set([
@@ -129,3 +132,28 @@ export function humanizeString(str: string): string {
       .replace(/^\w/, (c) => c.toUpperCase())
   );
 }
+
+export function parseChainId(url: URL): ChainId {
+  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, "_")}`,
+      ) as ChainId;
+    } else if (parts.includes("mainnet")) {
+      return shortString.encodeShortString(
+        `GG_${projectName.toUpperCase().replace(/-/g, "_")}`,
+      ) as ChainId;
+    }
+  }
+
+  throw new Error(`Chain ${url.toString()} not supported`);
+}