@cartridge/controller 0.8.0 → 0.9.1

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import { Policy, SessionPolicies } from '@cartridge/presets';
 import { AddInvokeTransactionResult, ChainId, Signature, TypedData } from '@starknet-io/types-js';
 import { Abi, BigNumberish, Call, constants, InvocationsDetails } from 'starknet';
-import { KeychainIFrame, ProfileIFrame } from './iframe';
+import { KeychainIFrame } from './iframe';
 import { ExternalWallet, ExternalWalletResponse, ExternalWalletType } from './wallets/types';
 export type Session = {
     chainId: constants.StarknetChainId;
@@ -53,7 +53,6 @@ export type DeployReply = {
 };
 export type IFrames = {
     keychain: KeychainIFrame;
-    profile?: ProfileIFrame;
     version?: number;
 };
 export interface LookupRequest {
@@ -76,7 +75,7 @@ type CartridgeID = string;
 export type ControllerAccounts = Record<ContractAddress, CartridgeID>;
 export interface Keychain {
     probe(rpcUrl: string): Promise<ProbeReply | ConnectError>;
-    connect(policies: SessionPolicies, rpcUrl: string, signupOptions?: AuthOptions, version?: string): Promise<ConnectReply | ConnectError>;
+    connect(policies: SessionPolicies, rpcUrl: string, signupOptions?: AuthOptions): Promise<ConnectReply | ConnectError>;
     disconnect(): void;
     reset(): void;
     revoke(origin: string): void;
@@ -94,6 +93,7 @@ export interface Keychain {
     openExecute(calls: Call[]): Promise<void>;
     switchChain(rpcUrl: string): Promise<void>;
     openStarterPack(starterpackId: string): void;
+    navigate(path: string): Promise<void>;
     externalDetectWallets(): Promise<ExternalWallet[]>;
     externalConnectWallet(type: ExternalWalletType, address?: string): Promise<ExternalWalletResponse>;
     externalSignMessage(type: ExternalWalletType, message: string): Promise<ExternalWalletResponse>;
@@ -111,7 +111,7 @@ export interface Modal {
 /**
  * Options for configuring the controller
  */
-export type ControllerOptions = ProviderOptions & KeychainOptions & ProfileOptions;
+export type ControllerOptions = ProviderOptions & KeychainOptions;
 export type IFrameOptions = {
     /** The ID of the starter pack to use */
     starterPackId?: string;
@@ -139,10 +139,6 @@ export type KeychainOptions = IFrameOptions & {
     signupOptions?: AuthOptions;
     /** When true, manually provided policies will override preset policies. Default is false. */
     shouldOverridePresetPolicies?: boolean;
-};
-export type ProfileOptions = IFrameOptions & {
-    /** The URL of profile. Mainly for internal development purpose */
-    profileUrl?: string;
     /** The project name of Slot instance. */
     slot?: string;
     /** The namespace to use to fetch trophies data from indexer. Will be mandatory once profile page is in production */

package/dist/wallets/bridge.d.ts

@@ -4,7 +4,7 @@ export declare class WalletBridge {
     constructor();
     getIFrameMethods(): {
         externalDetectWallets: (_origin: string) => () => Promise<ExternalWallet[]>;
-        externalConnectWallet: (_origin: string) => (type: ExternalWalletType, address?: string) => Promise<ExternalWalletResponse<unknown>>;
+        externalConnectWallet: (_origin: string) => (type: ExternalWalletType) => Promise<ExternalWalletResponse<unknown>>;
         externalSignMessage: (_origin: string) => (identifier: ExternalWalletType | string, message: string) => Promise<ExternalWalletResponse<unknown>>;
         externalSignTypedData: (_origin: string) => (identifier: ExternalWalletType | string, data: any) => Promise<ExternalWalletResponse<unknown>>;
         externalSendTransaction: (_origin: string) => (identifier: ExternalWalletType | string, txn: any) => Promise<ExternalWalletResponse<unknown>>;
@@ -13,7 +13,7 @@ export declare class WalletBridge {
     detectWallets(): Promise<ExternalWallet[]>;
     private getWalletAdapterByType;
     private handleError;
-    connectWallet(type: ExternalWalletType, address?: string): Promise<ExternalWalletResponse>;
+    connectWallet(type: ExternalWalletType): Promise<ExternalWalletResponse>;
     private getConnectedWalletAdapter;
     signMessage(identifier: ExternalWalletType | string, message: string): Promise<ExternalWalletResponse>;
     signTypedData(identifier: ExternalWalletType | string, data: any): Promise<ExternalWalletResponse>;

package/dist/wallets/metamask/index.d.ts

@@ -9,10 +9,10 @@ export declare class MetaMaskWallet implements WalletAdapter {
     constructor();
     isAvailable(): boolean;
     getInfo(): ExternalWallet;
-    connect(address?: string): Promise<ExternalWalletResponse<any>>;
+    connect(): Promise<ExternalWalletResponse<any>>;
     getConnectedAccounts(): string[];
     signTransaction(transaction: any): Promise<ExternalWalletResponse<any>>;
-    signMessage(message: string): Promise<ExternalWalletResponse<any>>;
+    signMessage(message: string, address?: string): Promise<ExternalWalletResponse<any>>;
     signTypedData(data: any): Promise<ExternalWalletResponse<any>>;
     sendTransaction(_txn: any): Promise<ExternalWalletResponse<any>>;
     switchChain(chainId: string): Promise<boolean>;

package/dist/wallets/rabby/index.d.ts

@@ -12,7 +12,7 @@ export declare class RabbyWallet implements WalletAdapter {
     connect(address?: string): Promise<ExternalWalletResponse<any>>;
     getConnectedAccounts(): string[];
     signTransaction(transaction: any): Promise<ExternalWalletResponse<any>>;
-    signMessage(message: `0x${string}`): Promise<ExternalWalletResponse<any>>;
+    signMessage(message: `0x${string}`, address?: string): Promise<ExternalWalletResponse<any>>;
     signTypedData(data: any): Promise<ExternalWalletResponse<any>>;
     sendTransaction(_txn: any): Promise<ExternalWalletResponse<any>>;
     switchChain(chainId: string): Promise<boolean>;

package/dist/wallets/types.d.ts

@@ -22,8 +22,8 @@ export interface WalletAdapter {
     isAvailable(): boolean;
     getInfo(): ExternalWallet;
     getConnectedAccounts(): string[];
-    connect(address?: string): Promise<ExternalWalletResponse<any>>;
-    signMessage?(message: string): Promise<ExternalWalletResponse<any>>;
+    connect(): Promise<ExternalWalletResponse<any>>;
+    signMessage?(message: string, address?: string): Promise<ExternalWalletResponse<any>>;
     signTypedData?(data: any): Promise<ExternalWalletResponse<any>>;
     sendTransaction(tx: any): Promise<ExternalWalletResponse<any>>;
     getBalance(tokenAddress?: string): Promise<ExternalWalletResponse<any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Cartridge Controller",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,14 +24,14 @@
     "@metamask/sdk": "^0.32.1",
     "@solana/web3.js": "^1.98.0",
     "open": "^10.1.0",
-    "starknet": "^6.21.0",
+    "starknet": "^7.6.2",
     "starknetkit": "^2.6.1"
   },
   "dependencies": {
-    "@cartridge/controller-wasm": "0.1.7",
+    "@cartridge/controller-wasm": "^0.2.3",
     "@cartridge/penpal": "^6.2.4",
     "ethers": "^6.13.5",
-    "@starknet-io/types-js": "^0.7.7",
+    "@starknet-io/types-js": "^0.8.4",
     "@telegram-apps/sdk": "^2.4.0",
     "@turnkey/sdk-browser": "^4.0.0",
     "cbor-x": "^1.5.0",
@@ -50,10 +50,10 @@
     "typescript": "^5.7.3",
     "vite": "^6.0.0",
     "vite-plugin-dts": "^4.5.3",
-    "vite-plugin-node-polyfills": "^0.22.0",
+    "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-top-level-await": "^1.4.4",
     "vite-plugin-wasm": "^3.4.1",
-    "@cartridge/tsconfig": "0.8.0"
+    "@cartridge/tsconfig": "0.9.1"
   },
   "scripts": {
     "build:deps": "pnpm build",
@@ -61,6 +61,7 @@
     "build:browser": "vite build",
     "build:node": "tsup --config tsup.node.config.ts",
     "build": "pnpm build:browser && pnpm build:node",
+    "build:compat": "pnpm build:browser && pnpm build:node",
     "format": "prettier --write \"src/**/*.ts\"",
     "format:check": "prettier --check \"src/**/*.ts\"",
     "test": "jest",

package/src/account.ts

@@ -6,8 +6,6 @@ import {
   AllowArray,
 } from "starknet";
 
-import { SPEC } from "@starknet-io/types-js";
-
 import {
   ConnectError,
   Keychain,
@@ -18,9 +16,9 @@ import {
 import { AsyncMethodReturns } from "@cartridge/penpal";
 import BaseProvider from "./provider";
 import { toArray } from "./utils";
+import { SIGNATURE } from "@starknet-io/types-js";
 
 class ControllerAccount extends WalletAccount {
-  address: string;
   private keychain: AsyncMethodReturns<Keychain>;
   private modal: Modal;
   private options?: KeychainOptions;
@@ -33,9 +31,8 @@ class ControllerAccount extends WalletAccount {
     options: KeychainOptions,
     modal: Modal,
   ) {
-    super({ nodeUrl: rpcUrl }, provider);
+    super({ nodeUrl: rpcUrl }, provider, address);
 
-    this.address = address;
     this.keychain = keychain;
     this.options = options;
     this.modal = modal;
@@ -111,13 +108,13 @@ class ControllerAccount extends WalletAccount {
    * @returns the signature of the JSON object
    * @throws {Error} if the JSON object is not a valid JSON
    */
-  async signMessage(typedData: TypedData): Promise<SPEC.SIGNATURE> {
+  async signMessage(typedData: TypedData): Promise<SIGNATURE> {
     return new Promise(async (resolve, reject) => {
       const sessionSign = await this.keychain.signMessage(typedData, "", true);
 
       // Session sign succeeded
       if (!("code" in sessionSign)) {
-        resolve(sessionSign as SPEC.SIGNATURE);
+        resolve(sessionSign as SIGNATURE);
         return;
       }
 
@@ -126,7 +123,7 @@ class ControllerAccount extends WalletAccount {
       const manualSign = await this.keychain.signMessage(typedData, "", false);
 
       if (!("code" in manualSign)) {
-        resolve(manualSign as SPEC.SIGNATURE);
+        resolve(manualSign as SIGNATURE);
       } else {
         reject((manualSign as ConnectError).error);
       }

package/src/controller.ts

@@ -10,7 +10,7 @@ import { constants, shortString, WalletAccount } from "starknet";
 import { version } from "../package.json";
 import ControllerAccount from "./account";
 import { NotReadyToConnect } from "./errors";
-import { KeychainIFrame, ProfileIFrame } from "./iframe";
+import { KeychainIFrame } from "./iframe";
 import BaseProvider from "./provider";
 import {
   Chain,
@@ -20,7 +20,6 @@ import {
   IFrames,
   Keychain,
   ProbeReply,
-  Profile,
   ProfileContextTypeVariant,
   ResponseCodes,
 } from "./types";
@@ -28,7 +27,6 @@ import { parseChainId } from "./utils";
 
 export default class ControllerProvider extends BaseProvider {
   private keychain?: AsyncMethodReturns<Keychain>;
-  private profile?: AsyncMethodReturns<Profile>;
   private options: ControllerOptions;
   private iframes: IFrames;
   private selectedChain: ChainId;
@@ -38,7 +36,7 @@ export default class ControllerProvider extends BaseProvider {
     return !!this.keychain;
   }
 
-  constructor(options: ControllerOptions) {
+  constructor(options: ControllerOptions = {}) {
     super();
 
     // Default Cartridge chains that are always available
@@ -63,6 +61,7 @@ export default class ControllerProvider extends BaseProvider {
         onConnect: (keychain) => {
           this.keychain = keychain;
         },
+        version: version,
       }),
     };
 
@@ -134,26 +133,6 @@ export default class ControllerProvider extends BaseProvider {
       return;
     }
 
-    if (!this.iframes.profile) {
-      const username = await this.keychain.username();
-
-      this.iframes.profile = new ProfileIFrame({
-        ...this.options,
-        onConnect: (profile) => {
-          this.profile = profile;
-        },
-        methods: {
-          openSettings: () => this.openSettings.bind(this),
-          openPurchaseCredits: () => this.openPurchaseCredits.bind(this),
-          openExecute: () => this.openExecute.bind(this),
-          logout: () => this.logout.bind(this),
-        },
-        rpcUrl: this.rpcUrl(),
-        username,
-        version: this.version,
-      });
-    }
-
     return this.account;
   }
 
@@ -189,7 +168,6 @@ export default class ControllerProvider extends BaseProvider {
             : this.options.policies || {},
         this.rpcUrl(),
         this.options.signupOptions,
-        version,
       );
       if (response.code !== ResponseCodes.SUCCESS) {
         throw new Error(response.message);
@@ -228,7 +206,6 @@ export default class ControllerProvider extends BaseProvider {
       }
 
       await this.keychain.switchChain(this.rpcUrl());
-      await this.profile?.switchChain(this.rpcUrl());
     } catch (e) {
       console.error(e);
       return false;
@@ -260,22 +237,27 @@ export default class ControllerProvider extends BaseProvider {
   }
 
   async openProfile(tab: ProfileContextTypeVariant = "inventory") {
-    if (!this.profile || !this.iframes.profile?.url) {
-      console.error("Profile is not ready");
+    // Profile functionality is now integrated into keychain
+    // Navigate keychain iframe to profile page
+    if (!this.keychain || !this.iframes.keychain) {
+      console.error(new NotReadyToConnect().message);
       return;
     }
     if (!this.account) {
       console.error("Account is not ready");
       return;
     }
+    const username = await this.keychain.username();
 
-    this.profile.navigate(`${this.iframes.profile.url?.pathname}/${tab}`);
-    this.iframes.profile.open();
+    // Navigate first, then open to avoid flash
+    await this.keychain.navigate(`/account/${username}/${tab}`);
+    this.iframes.keychain.open();
   }
 
   async openProfileTo(to: string) {
-    if (!this.profile || !this.iframes.profile?.url) {
-      console.error("Profile is not ready");
+    // Profile functionality is now integrated into keychain
+    if (!this.keychain || !this.iframes.keychain) {
+      console.error(new NotReadyToConnect().message);
       return;
     }
     if (!this.account) {
@@ -283,13 +265,15 @@ export default class ControllerProvider extends BaseProvider {
       return;
     }
 
-    this.profile.navigate(`${this.iframes.profile.url?.pathname}/${to}`);
-    this.iframes.profile.open();
+    const username = await this.keychain.username();
+    await this.keychain.navigate(`/account/${username}/${to}`);
+    this.iframes.keychain.open();
   }
 
   async openProfileAt(at: string) {
-    if (!this.profile || !this.iframes.profile?.url) {
-      console.error("Profile is not ready");
+    // Profile functionality is now integrated into keychain
+    if (!this.keychain || !this.iframes.keychain) {
+      console.error(new NotReadyToConnect().message);
       return;
     }
     if (!this.account) {
@@ -297,28 +281,17 @@ export default class ControllerProvider extends BaseProvider {
       return;
     }
 
-    this.profile.navigate(at);
-    this.iframes.profile.open();
+    await this.keychain.navigate(at);
+    this.iframes.keychain.open();
   }
 
-  async openSettings() {
+  openSettings() {
     if (!this.keychain || !this.iframes.keychain) {
       console.error(new NotReadyToConnect().message);
-      return null;
-    }
-    if (this.iframes.profile?.sendBackward) {
-      this.iframes.profile?.sendBackward();
-    } else {
-      this.iframes.profile?.close();
+      return;
     }
     this.iframes.keychain.open();
-    const res = await this.keychain.openSettings();
-    this.iframes.keychain.close();
-    this.iframes.profile?.sendForward?.();
-    if (res && (res as ConnectError).code === ResponseCodes.NOT_CONNECTED) {
-      return false;
-    }
-    return true;
+    this.keychain.openSettings();
   }
 
   revoke(origin: string, _policy: Policy[]) {
@@ -357,11 +330,6 @@ export default class ControllerProvider extends BaseProvider {
       console.error(new NotReadyToConnect().message);
       return;
     }
-    if (!this.iframes.profile) {
-      console.error("Profile is not ready");
-      return;
-    }
-    this.iframes.profile.close();
     this.iframes.keychain.open();
     this.keychain.openPurchaseCredits();
   }
@@ -371,13 +339,11 @@ export default class ControllerProvider extends BaseProvider {
       console.error(new NotReadyToConnect().message);
       return;
     }
-    if (!this.iframes.profile) {
-      console.error("Profile is not ready");
-      return;
-    }
-    this.iframes.profile.close();
-    this.iframes.keychain.open();
-    this.keychain.openStarterPack(starterpackId);
+
+    // Navigate first, then open the iframe
+    this.keychain.navigate(`/starter-pack/${starterpackId}`).then(() => {
+      this.iframes.keychain.open();
+    });
   }
 
   async openExecute(calls: any, chainId?: string) {
@@ -385,25 +351,17 @@ export default class ControllerProvider extends BaseProvider {
       console.error(new NotReadyToConnect().message);
       return;
     }
-    if (!this.iframes.profile) {
-      console.error("Profile is not ready");
-      return;
-    }
     // Switch to the chain if provided
     let currentChainId = this.selectedChain;
     if (chainId) {
       this.switchStarknetChain(chainId);
     }
-    // Switch iframes
-    this.iframes.profile?.sendBackward();
+    // Open keychain
     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();
+    // Close keychain
     this.iframes.keychain.close();
-    this.iframes.profile?.sendForward();
     // Switch back to the original chain
     if (chainId) {
       this.switchStarknetChain(currentChainId);

package/src/iframe/base.ts

@@ -94,22 +94,6 @@ export class IFrame<CallSender extends {}> implements Modal {
       iframe: this.iframe,
       methods: {
         close: (_origin: string) => () => this.close(),
-        closeAll: (_origin: string) => () => {
-          // Close all iframes
-          const iframes = document.querySelectorAll(
-            'iframe[id^="controller-"]',
-          );
-          iframes.forEach((iframe) => {
-            const container = iframe.parentElement;
-            if (container) {
-              container.style.visibility = "hidden";
-              container.style.opacity = "0";
-            }
-          });
-          if (document.body) {
-            document.body.style.overflow = "auto";
-          }
-        },
         reload: (_origin: string) => () => window.location.reload(),
         ...methods,
       },
@@ -125,10 +109,7 @@ export class IFrame<CallSender extends {}> implements Modal {
       if (typeof document === "undefined") return;
       const existingController = document.getElementById("controller");
       if (document.body) {
-        if (
-          (id === "controller-keychain" && !existingController) ||
-          id === "controller-profile"
-        ) {
+        if (id === "controller-keychain" && !existingController) {
           document.body.appendChild(container);
           observer.disconnect();
         }
@@ -142,10 +123,7 @@ export class IFrame<CallSender extends {}> implements Modal {
 
     const existingController = document.getElementById("controller");
     if (document.body) {
-      if (
-        (id === "controller-keychain" && !existingController) ||
-        id === "controller-profile"
-      ) {
+      if (id === "controller-keychain" && !existingController) {
         document.body.appendChild(container);
       }
     }
@@ -199,4 +177,8 @@ export class IFrame<CallSender extends {}> implements Modal {
     this.iframe.style.width = "432px";
     this.iframe.style.borderRadius = "8px";
   }
+
+  isOpen() {
+    return this.iframe?.style.display !== "none";
+  }
 }

package/src/iframe/index.ts

@@ -1,3 +1,2 @@
 export * from "./base";
 export * from "./keychain";
-export * from "./profile";

package/src/iframe/keychain.ts

@@ -3,12 +3,23 @@ import { Keychain, KeychainOptions } from "../types";
 import { WalletBridge } from "../wallets/bridge";
 import { IFrame, IFrameOptions } from "./base";
 
-type KeychainIframeOptions = IFrameOptions<Keychain> & KeychainOptions;
+type KeychainIframeOptions = IFrameOptions<Keychain> &
+  KeychainOptions & {
+    version?: string;
+  };
 
 export class KeychainIFrame extends IFrame<Keychain> {
   private walletBridge: WalletBridge;
 
-  constructor({ url, policies, ...iframeOptions }: KeychainIframeOptions) {
+  constructor({
+    url,
+    policies,
+    version,
+    slot,
+    namespace,
+    tokens,
+    ...iframeOptions
+  }: KeychainIframeOptions) {
     const _url = new URL(url ?? KEYCHAIN_URL);
     const walletBridge = new WalletBridge();
 
@@ -19,6 +30,25 @@ export class KeychainIFrame extends IFrame<Keychain> {
       );
     }
 
+    if (version) {
+      _url.searchParams.set("v", encodeURIComponent(version));
+    }
+
+    if (slot) {
+      _url.searchParams.set("ps", encodeURIComponent(slot));
+    }
+
+    if (namespace) {
+      _url.searchParams.set("ns", encodeURIComponent(namespace));
+    }
+
+    if (tokens?.erc20) {
+      _url.searchParams.set(
+        "erc20",
+        encodeURIComponent(tokens.erc20.toString()),
+      );
+    }
+
     super({
       ...iframeOptions,
       id: "controller-keychain",

package/src/node/account.ts

@@ -37,7 +37,7 @@ export default class SessionAccount extends WalletAccount {
       sessionKeyGuid: string;
     },
   ) {
-    super({ nodeUrl: rpcUrl }, provider);
+    super({ nodeUrl: rpcUrl }, provider, address);
 
     this.address = address;
     this.controller = CartridgeSessionAccount.newAsRegistered(

package/src/provider.ts

@@ -1,18 +1,18 @@
-import { WalletAccount } from "starknet";
 import {
   AddInvokeTransactionParameters,
   AddStarknetChainParameters,
-  Errors,
   Permission,
   RequestAccountsParameters,
   RequestFn,
   StarknetWindowObject,
   SwitchStarknetChainParameters,
   TypedData,
+  UNEXPECTED_ERROR,
   WalletEventHandlers,
   WalletEventListener,
   WalletEvents,
 } from "@starknet-io/types-js";
+import { WalletAccount } from "starknet";
 import manifest from "../package.json";
 
 import { icon } from "./icon";
@@ -93,7 +93,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
           code: 63,
           message: "An unexpected error occurred",
           data: "wallet_watchAsset not implemented",
-        } as Errors.UNEXPECTED_ERROR;
+        } as UNEXPECTED_ERROR;
 
       case "wallet_addStarknetChain": {
         let params = call.params as AddStarknetChainParameters;
@@ -111,7 +111,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
             code: 63,
             message: "An unexpected error occurred",
             data: "Account not initialized",
-          } as Errors.UNEXPECTED_ERROR;
+          } as UNEXPECTED_ERROR;
         }
 
         return await this.account.getChainId();
@@ -121,7 +121,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
           code: 63,
           message: "An unexpected error occurred",
           data: "wallet_deploymentData not implemented",
-        } as Errors.UNEXPECTED_ERROR;
+        } as UNEXPECTED_ERROR;
 
       case "wallet_addInvokeTransaction":
         if (!this.account) {
@@ -129,7 +129,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
             code: 63,
             message: "An unexpected error occurred",
             data: "Account not initialized",
-          } as Errors.UNEXPECTED_ERROR;
+          } as UNEXPECTED_ERROR;
         }
 
         let params = call.params as AddInvokeTransactionParameters;
@@ -146,7 +146,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
           code: 63,
           message: "An unexpected error occurred",
           data: "wallet_addDeclareTransaction not implemented",
-        } as Errors.UNEXPECTED_ERROR;
+        } as UNEXPECTED_ERROR;
 
       case "wallet_signTypedData": {
         if (!this.account) {
@@ -154,7 +154,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
             code: 63,
             message: "An unexpected error occurred",
             data: "Account not initialized",
-          } as Errors.UNEXPECTED_ERROR;
+          } as UNEXPECTED_ERROR;
         }
 
         return await this.account.signMessage(call.params as TypedData);
@@ -169,7 +169,7 @@ export default abstract class BaseProvider implements StarknetWindowObject {
           code: 63,
           message: "An unexpected error occurred",
           data: `Unknown RPC call type: ${call.type}`,
-        } as Errors.UNEXPECTED_ERROR;
+        } as UNEXPECTED_ERROR;
     }
   };
 

package/src/session/account.ts

@@ -37,9 +37,8 @@ export default class SessionAccount extends WalletAccount {
       sessionKeyGuid: string;
     },
   ) {
-    super({ nodeUrl: rpcUrl }, provider);
+    super({ nodeUrl: rpcUrl }, provider, address);
 
-    this.address = address;
     this.controller = CartridgeSessionAccount.newAsRegistered(
       rpcUrl,
       privateKey,