@cartridge/controller 0.7.13-alpha.2 → 0.7.13-alpha.4

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

@@ -4,6 +4,7 @@ export declare class MetaMaskWallet implements WalletAdapter {
     readonly platform: ExternalPlatform;
     private MMSDK;
     private account;
+    private connectedAccounts;
     constructor();
     isAvailable(): boolean;
     getInfo(): ExternalWallet;

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

@@ -5,6 +5,7 @@ export declare class RabbyWallet implements WalletAdapter {
     private account;
     private store;
     private provider;
+    private connectedAccounts;
     constructor();
     isAvailable(): boolean;
     getInfo(): ExternalWallet;

package/dist/wallets/types.d.ts

@@ -7,6 +7,7 @@ export interface ExternalWallet {
     chainId?: string;
     name?: string;
     platform?: ExternalPlatform;
+    connectedAccounts?: string[];
 }
 export interface ExternalWalletResponse<T = unknown> {
     success: boolean;

package/dist/wallets/wallet-connect/index.d.ts

@@ -5,7 +5,7 @@ export declare class WalletConnectWallet implements WalletAdapter {
     readonly type: ExternalWalletType;
     readonly platform: ExternalPlatform;
     private account;
-    constructor(provider: Provider);
+    constructor(provider: Provider, account?: string);
     isAvailable(): boolean;
     getInfo(): ExternalWallet;
     connect(): Promise<ExternalWalletResponse<any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.7.13-alpha.2",
+  "version": "0.7.13-alpha.4",
   "description": "Cartridge Controller",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,8 +36,8 @@
     "cbor-x": "^1.5.0",
     "mipd": "^0.0.7",
     "@walletconnect/ethereum-provider": "^2.20.0",
-    "@cartridge/account-wasm": "0.7.13-alpha.2",
-    "@cartridge/utils": "0.7.13-alpha.2"
+    "@cartridge/account-wasm": "0.7.13-alpha.4",
+    "@cartridge/utils": "0.7.13-alpha.4"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
@@ -53,7 +53,7 @@
     "vite-plugin-node-polyfills": "^0.22.0",
     "vite-plugin-top-level-await": "^1.4.4",
     "vite-plugin-wasm": "^3.4.1",
-    "@cartridge/tsconfig": "0.7.13-alpha.2"
+    "@cartridge/tsconfig": "0.7.13-alpha.4"
   },
   "scripts": {
     "build:deps": "pnpm build",

package/src/wallets/bridge.ts

@@ -20,10 +20,14 @@ export class WalletBridge {
 
   constructor() {
     this.walletAdapters = new Map<ExternalWalletType, WalletAdapter>();
-    this.walletAdapters.set("metamask", new MetaMaskWallet());
-    this.walletAdapters.set("phantom", new PhantomWallet());
-    this.walletAdapters.set("argent", new ArgentWallet());
-    this.walletAdapters.set("rabby", new RabbyWallet());
+    const metamask = new MetaMaskWallet();
+    metamask.isAvailable() && this.walletAdapters.set("metamask", metamask);
+    const phantom = new PhantomWallet();
+    phantom.isAvailable() && this.walletAdapters.set("phantom", phantom);
+    const argent = new ArgentWallet();
+    argent.isAvailable() && this.walletAdapters.set("argent", argent);
+    const rabby = new RabbyWallet();
+    rabby.isAvailable() && this.walletAdapters.set("rabby", rabby);
 
     if (typeof window !== "undefined") {
       window.wallet_bridge = this;

package/src/wallets/metamask/index.ts

@@ -12,6 +12,7 @@ export class MetaMaskWallet implements WalletAdapter {
   readonly platform: ExternalPlatform = "ethereum";
   private MMSDK: MetaMaskSDK;
   private account: string | undefined = undefined;
+  private connectedAccounts: string[] = [];
 
   constructor() {
     this.MMSDK = new MetaMaskSDK({
@@ -20,6 +21,19 @@ export class MetaMaskWallet implements WalletAdapter {
         url: window.location.href,
       },
     });
+    this.MMSDK.sdkInitPromise?.then(() => {
+      this.MMSDK.getProvider()
+        ?.request({
+          method: "eth_accounts",
+        })
+        .then((accounts: any) => {
+          if (accounts && accounts.length > 0) {
+            console.log(accounts);
+            this.account = accounts[0];
+            this.connectedAccounts = accounts;
+          }
+        });
+    });
   }
 
   isAvailable(): boolean {
@@ -36,6 +50,7 @@ export class MetaMaskWallet implements WalletAdapter {
       chainId: available ? window.ethereum?.chainId : undefined,
       name: "MetaMask",
       platform: this.platform,
+      connectedAccounts: this.connectedAccounts,
     };
   }
 
@@ -52,6 +67,7 @@ export class MetaMaskWallet implements WalletAdapter {
       const accounts = await this.MMSDK.connect();
       if (accounts && accounts.length > 0) {
         this.account = accounts[0];
+        this.connectedAccounts = accounts;
         return { success: true, wallet: this.type, account: this.account };
       }
 

package/src/wallets/rabby/index.ts

@@ -15,19 +15,19 @@ export class RabbyWallet implements WalletAdapter {
   private account: string | undefined = undefined;
   private store = createStore();
   private provider: EIP6963ProviderDetail | undefined;
+  private connectedAccounts: string[] = [];
 
   constructor() {
     this.provider = this.store
       .getProviders()
       .find((provider) => provider.info.rdns === RABBY_RDNS);
-    this.store.subscribe((providerDetails) => {
-      const rabbyProvider = providerDetails.find(
-        (provider) => provider.info.rdns === RABBY_RDNS,
-      );
-      if (rabbyProvider) {
-        this.provider = rabbyProvider;
-      }
-    });
+    this.provider?.provider
+      .request({
+        method: "eth_accounts",
+      })
+      .then((accounts) => {
+        this.connectedAccounts = accounts;
+      });
   }
 
   isAvailable(): boolean {
@@ -44,6 +44,7 @@ export class RabbyWallet implements WalletAdapter {
       chainId: available ? window.ethereum?.chainId : undefined,
       name: "Rabby",
       platform: this.platform,
+      connectedAccounts: this.connectedAccounts,
     };
   }
 
@@ -62,6 +63,7 @@ export class RabbyWallet implements WalletAdapter {
       });
       if (accounts && accounts.length > 0) {
         this.account = accounts[0];
+        this.connectedAccounts = accounts;
         return { success: true, wallet: this.type, account: this.account };
       }
 

package/src/wallets/types.ts

@@ -8,6 +8,7 @@ export interface ExternalWallet {
   chainId?: string;
   name?: string;
   platform?: ExternalPlatform;
+  connectedAccounts?: string[];
 }
 
 export interface ExternalWalletResponse<T = unknown> {

package/src/wallets/wallet-connect/index.ts

@@ -12,7 +12,12 @@ export class WalletConnectWallet implements WalletAdapter {
   readonly platform: ExternalPlatform = "ethereum";
   private account: string | undefined = undefined;
 
-  constructor(private provider: Provider) {}
+  constructor(
+    private provider: Provider,
+    account?: string,
+  ) {
+    this.account = account;
+  }
 
   isAvailable(): boolean {
     return !!this.provider;