@tomo-inc/wallet-adaptor-base 0.0.2 → 0.0.4

package/src/wallets/default/phantomWallet/phantomWallet.ts

@@ -24,5 +24,12 @@ export const phantomWallet = (): WalletConfig => {
       firefox: "https://addons.mozilla.org/firefox/addon/phantom-app/",
       browserExtension: "https://phantom.app/download",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string, _chainId?: number): string => {
+        if (!dappUrl) return "";
+        const encodedDappUrl = encodeURIComponent(dappUrl);
+        return `https://phantom.app/ul/v1/connect?app_url=${encodedDappUrl}`;
+      },
+    },
   };
 };

package/src/wallets/default/rainbowWallet/rainbowWallet.ts

@@ -1,4 +1,5 @@
 import type { WalletConfig } from "../../Wallet";
+import { isAndroid, isIOS } from "../../../utils/isMobile";
 import icon from "./rainbowWallet.svg";
 
 export const rainbowWallet = (): WalletConfig => {
@@ -18,5 +19,14 @@ export const rainbowWallet = (): WalletConfig => {
       qrCode: "https://rainbow.download?utm_source=rainbowkit&utm_medium=qrcode",
       browserExtension: "https://rainbow.me/extension?utm_source=rainbowkit",
     },
+    mobile: {
+      getUri: (uri: string) => {
+        return isAndroid()
+          ? uri
+          : isIOS()
+            ? `rainbow://wc?uri=${encodeURIComponent(uri)}&connector=rainbowkit`
+            : `https://rnbwapp.com/wc?uri=${encodeURIComponent(uri)}&connector=rainbowkit`;
+      },
+    },
   };
 };

package/src/wallets/default/solflareWallet/solflareWallet.ts

@@ -19,5 +19,12 @@ export const solflareWallet = (): WalletConfig => {
       mobile: "https://solflare.com/",
       qrCode: "https://solflare.com/",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        const encodedDappUrl = encodeURIComponent(dappUrl);
+        return `https://solflare.com/ul/v1/browse/${encodedDappUrl}?ref=${encodedDappUrl}`;
+      },
+    },
   };
 };

package/src/wallets/default/tokenPocketWallet/tokenPocketWallet.ts

@@ -20,5 +20,11 @@ export const tokenPocketWallet = (): WalletConfig => {
       qrCode: "https://tokenpocket.pro/en/download/app",
       mobile: "https://tokenpocket.pro/en/download/app",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        return `tpdapp://open?params={"url":"${dappUrl}"}`;
+      },
+    },
   };
 };

package/src/wallets/default/trustWallet/trustWallet.ts

@@ -19,5 +19,11 @@ export const trustWallet = (): WalletConfig => {
       chrome: "https://chrome.google.com/webstore/detail/trust-wallet/egjidjbpglichdcondbcbdnbeeppgdph",
       browserExtension: "https://trustwallet.com/browser-extension",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        return `https://link.trustwallet.com/open_url?coin_id=60&url=${dappUrl}`;
+      },
+    },
   };
 };

package/src/wallets/default/uniswapWallet/uniswapWallet.ts

@@ -12,4 +12,9 @@ export const uniswapWallet = (): WalletConfig => ({
     mobile: "https://wallet.uniswap.org/",
     qrCode: "https://wallet.uniswap.org/",
   },
+  mobile: {
+    getUri: (uri: string) => {
+      return `uniswap://wc?uri=${encodeURIComponent(uri)}`;
+    },
+  },
 });

package/src/wallets/default/valoraWallet/valoraWallet.ts

@@ -1,4 +1,5 @@
 import type { WalletConfig } from "../../Wallet";
+import { isAndroid } from "../../../utils/isMobile";
 import icon from "./valoraWallet.svg";
 
 export const valoraWallet = (): WalletConfig => ({
@@ -13,4 +14,7 @@ export const valoraWallet = (): WalletConfig => ({
     mobile: "https://valora.xyz",
     qrCode: "https://valora.xyz",
   },
+  mobile: {
+    getUri: (uri: string) => (isAndroid() ? uri : `celo://wallet/wc?uri=${encodeURIComponent(uri)}`),
+  },
 });

package/src/wallets/default/zealWallet/zealWallet.ts

@@ -19,5 +19,10 @@ export const zealWallet = (): WalletConfig => {
       mobile: "https://zeal.app",
       qrCode: "https://zeal.app",
     },
+    mobile: {
+      getUri: (uri: string) => {
+        return `zeal://wc?uri=${encodeURIComponent(uri)}`;
+      },
+    },
   };
 };

package/src/wallets/default/zerionWallet/zerionWallet.ts

@@ -1,4 +1,5 @@
 import type { WalletConfig } from "../../Wallet";
+import { isIOS } from "../../../utils/isMobile";
 import icon from "./zerionWallet.svg";
 
 export const zerionWallet = (): WalletConfig => {
@@ -18,5 +19,10 @@ export const zerionWallet = (): WalletConfig => {
       chrome: "https://chrome.google.com/webstore/detail/klghhnkeealcohjjanjjdaeeggmfmlpl",
       browserExtension: "https://zerion.io/extension",
     },
+    mobile: {
+      getUri: (uri: string) => {
+        return isIOS() ? `zerion://wc?uri=${encodeURIComponent(uri)}` : uri;
+      },
+    },
   };
 };

package/src/wallets/detector.ts

@@ -1,5 +1,5 @@
-import { WagmiWalletConfig, WalletConfig } from "./Wallet";
 import { Connector, ProviderProtocol, WalletConnectorType } from "../type";
+import { WagmiWalletConfig, WalletConfig } from "./Wallet";
 
 type WalletProviderFlags = string;
 type WindowProvider = any;
@@ -98,23 +98,38 @@ export function connectorDector(wallet: WalletConfig): Connector {
   const isInstalled = isEvmExists || isSolanaExists || isAptosExists;
 
   const providers: any = {};
-  if (isEvmExists) {
-    providers.evm = {
-      provider: getInjectedProvider(evmNS),
-      protocol: ProviderProtocol.EIP6963,
-    };
+  if (evmNS.namespace || evmNS.flag) {
+    providers.evm = isEvmExists
+      ? {
+          provider: getInjectedProvider(evmNS),
+          protocol: ProviderProtocol.EIP6963,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
-  if (isSolanaExists) {
-    providers.solana = {
-      provider: getInjectedProvider(solanaNS),
-      protocol: ProviderProtocol.INJECT,
-    };
+  if (solanaNS.namespace) {
+    providers.solana = isSolanaExists
+      ? {
+          provider: getInjectedProvider(solanaNS),
+          protocol: ProviderProtocol.INJECT,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
-  if (isAptosExists) {
-    providers.aptos = {
-      provider: getInjectedProvider(aptosNS),
-      protocol: ProviderProtocol.INJECT,
-    };
+  if (aptosNS.namespace) {
+    providers.aptos = isAptosExists
+      ? {
+          provider: getInjectedProvider(aptosNS),
+          protocol: ProviderProtocol.INJECT,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
   return {
     info: {
@@ -124,6 +139,7 @@ export function connectorDector(wallet: WalletConfig): Connector {
       iconBackground: wallet?.iconBackground,
       rdns: wallet?.rdns,
       deeplink: wallet?.deeplink,
+      mobile: wallet?.mobile,
       links: {
         homepage: wallet?.downloadUrls?.qrCode || "",
         ios_install: wallet?.downloadUrls?.ios || "",

package/src/wallets/providers/WalletConnectProvider.ts

@@ -20,6 +20,7 @@ export interface WalletConnectProviderConfig {
   optionalChains?: string[];
   methods?: string[];
   events?: string[];
+  namespaces?: Record<string, NamespaceConfig>;
 }
 
 const defaultNamespaces: Record<string, NamespaceConfig> = {
@@ -47,6 +48,7 @@ export class WalletConnectProvider {
   private sessionMap: Map<string, SessionInfo> = new Map();
   public uri: string | null = null;
   public qrCode: string | null = null;
+  private namespaces: Record<string, NamespaceConfig> = defaultNamespaces;
 
   constructor(config: WalletConnectProviderConfig) {
     this.client = new WalletConnectClient({
@@ -54,6 +56,8 @@ export class WalletConnectProvider {
       metadata: config.metadata,
     });
 
+    this.namespaces = config.namespaces || defaultNamespaces;
+
     this.setupClientListeners();
   }
 
@@ -67,7 +71,7 @@ export class WalletConnectProvider {
       if (sessions.length > 0) {
         this.session = sessions[0];
         this.updateAccountsFromSession();
-        this.emit("connect", { chainId: this.chainId });
+        this.emit("connect", { chainId: this.chainId, accounts: this.accounts });
       }
     });
 
@@ -107,13 +111,20 @@ export class WalletConnectProvider {
     }
   }
 
-  public async getUri(config: { requiredNamespaces: Record<string, NamespaceConfig> }): Promise<string> {
+  public async getUri(): Promise<string> {
+    // Return existing URI if available to avoid creating duplicate proposals
+    if (this.uri) {
+      this.emit("uri_changed", { uri: this.uri });
+      return this.uri;
+    }
+
     // Create connection and get URI
     const uri = await this.client.connect({
-      requiredNamespaces: config.requiredNamespaces || defaultNamespaces,
+      requiredNamespaces: this.namespaces,
     });
 
     this.uri = uri;
+    this.emit("uri_changed", { uri: this.uri });
     return uri;
   }
   /**
@@ -126,9 +137,11 @@ export class WalletConnectProvider {
     sessions.forEach((session: SessionInfo) => {
       this.sessionMap.set(session.topic, session);
     });
-    this.uri = await this.getUri({
-      requiredNamespaces: defaultNamespaces,
-    });
+
+    // Only create new URI if we don't have an active session
+    if (sessions.length === 0) {
+      this.uri = await this.getUri();
+    }
   }
 
   /**
@@ -139,6 +152,8 @@ export class WalletConnectProvider {
   async connect(): Promise<string[] | undefined> {
     // Start waiting for connection in background (don't await)
     // Connection will emit 'connect' event when established
+    this.uri = await this.getUri();
+    this.emit("uri_changed", { uri: this.uri });
     const connected = await this.waitForConnection().catch((error) => {
       console.error("WalletConnect connection failed:", error);
       this.emit("error", error);
@@ -157,6 +172,7 @@ export class WalletConnectProvider {
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         reject(new Error("Connection timeout"));
+        this.emit("error", new Error("Connection timeout"));
       }, 300000); // 5 minutes
 
       const checkConnection = () => {
@@ -166,7 +182,7 @@ export class WalletConnectProvider {
           clearTimeout(timeout);
           this.session = newSessions[0];
           this.updateAccountsFromSession();
-          this.emit("connect", { chainId: this.chainId });
+          this.emit("connect", { chainId: this.chainId, accounts: this.accounts });
           resolve(true);
         } else {
           setTimeout(checkConnection, 500);
@@ -198,11 +214,6 @@ export class WalletConnectProvider {
       if (this.accounts.length > 0) {
         return this.accounts;
       }
-      if (this.uri === null) {
-        this.uri = await this.getUri({
-          requiredNamespaces: defaultNamespaces,
-        });
-      }
       return this.connect();
     }
 

package/src/wallets/providers/WalletConnectSolanaProvider.ts

@@ -19,6 +19,7 @@ export interface WalletConnectSolanaProviderConfig {
   chains?: string[];
   methods?: string[];
   events?: string[];
+  namespaces?: Record<string, NamespaceConfig>;
 }
 
 const defaultSolanaNamespaces: Record<string, NamespaceConfig> = {
@@ -39,12 +40,13 @@ const defaultSolanaNamespaces: Record<string, NamespaceConfig> = {
 export class WalletConnectSolanaProvider {
   private client: WalletConnectClient;
   private session: SessionInfo | null = null;
-  private accounts: string[] = [];
+  private accounts: { publicKey: string }[] = [];
   private chainId: string = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"; // Default to Solana mainnet
   private eventListeners: Map<string, Set<(...args: any[]) => void>> = new Map();
   private sessionMap: Map<string, SessionInfo> = new Map();
   public uri: string | null = null;
   public qrCode: string | null = null;
+  private namespaces: Record<string, NamespaceConfig> = defaultSolanaNamespaces;
 
   constructor(config: WalletConnectSolanaProviderConfig) {
     this.client = new WalletConnectClient({
@@ -52,6 +54,8 @@ export class WalletConnectSolanaProvider {
       metadata: config.metadata,
     });
 
+    this.namespaces = config.namespaces || defaultSolanaNamespaces;
+
     this.setupClientListeners();
   }
 
@@ -94,11 +98,13 @@ export class WalletConnectSolanaProvider {
 
     const allAccounts = Object.values(this.session.namespaces).flatMap((ns: any) => ns.accounts || []);
 
-    this.accounts = allAccounts.map((account: string) => {
-      const parts = account.split(":");
-      // Solana account format: solana:chainId:pubkey
-      return parts[2] || account;
-    });
+    this.accounts = allAccounts
+      .filter((account: string) => account.startsWith("solana:"))
+      .map((account) => {
+        const parts = account.split(":");
+        // Solana account format: solana:chainId:pubkey
+        return { publicKey: parts[2] };
+      });
 
     if (allAccounts.length > 0) {
       const chainIdPart = allAccounts[0].split(":")[1];
@@ -106,13 +112,20 @@ export class WalletConnectSolanaProvider {
     }
   }
 
-  public async getUri(config: { requiredNamespaces: Record<string, NamespaceConfig> }): Promise<string> {
+  public async getUri(): Promise<string> {
+    // Return existing URI if available to avoid creating duplicate proposals
+    if (this.uri) {
+      this.emit("uri_changed", { uri: this.uri });
+      return this.uri;
+    }
+
     // Create connection and get URI
     const uri = await this.client.connect({
-      requiredNamespaces: config.requiredNamespaces || defaultSolanaNamespaces,
+      requiredNamespaces: this.namespaces,
     });
 
     this.uri = uri;
+    this.emit("uri_changed", { uri: this.uri });
     return uri;
   }
 
@@ -126,16 +139,17 @@ export class WalletConnectSolanaProvider {
     sessions.forEach((session: SessionInfo) => {
       this.sessionMap.set(session.topic, session);
     });
-    this.uri = await this.getUri({
-      requiredNamespaces: defaultSolanaNamespaces,
-    });
   }
 
   /**
    * Connect to wallet via WalletConnect
    * Returns accounts when connected
    */
-  async connect(): Promise<string[] | undefined> {
+  async connect(): Promise<{ publicKey: string } | undefined> {
+    if (this.accounts.length > 0) {
+      return this.accounts[0];
+    }
+    this.uri = await this.getUri();
     // Start waiting for connection in background (don't await)
     // Connection will emit 'connect' event when established
     const connected = await this.waitForConnection().catch((error) => {
@@ -145,7 +159,7 @@ export class WalletConnectSolanaProvider {
     });
 
     if (connected) {
-      return this.accounts;
+      return this.accounts?.length > 0 ? this.accounts[0] : undefined;
     }
   }
 
@@ -195,20 +209,15 @@ export class WalletConnectSolanaProvider {
     // solana_requestAccounts
     if (args.method === "solana_requestAccounts") {
       if (this.accounts.length > 0) {
-        return this.accounts.map((account) => ({ pubkey: account }));
-      }
-      if (this.uri === null) {
-        this.uri = await this.getUri({
-          requiredNamespaces: defaultSolanaNamespaces,
-        });
+        return { publicKey: this.accounts[0] };
       }
       const accounts = await this.connect();
-      return accounts?.map((account) => ({ pubkey: account })) || [];
+      return accounts;
     }
 
     // solana_getAccounts
     if (args.method === "solana_getAccounts") {
-      return this.accounts.map((account) => ({ pubkey: account }));
+      return this.accounts || [];
     }
 
     if (!this.session) {
@@ -234,9 +243,9 @@ export class WalletConnectSolanaProvider {
   /**
    * Get current accounts
    */
-  async getAccounts(): Promise<string[]> {
+  async getAccounts(): Promise<{ publicKey: string }[]> {
     if (!this.session) {
-      return [];
+      return [{ publicKey: "" }];
     }
     return this.accounts;
   }

package/src/wallets/wallet-walletconnect.ts

@@ -1,3 +1,4 @@
+import { NamespaceConfig } from "@tomo-inc/wallet-connect-protocol";
 import { Connector, ProviderProtocol } from "../type";
 import { walletConnectWallet } from "./default/walletConnectWallet/walletConnectWallet";
 import { WalletConnectProvider } from "./providers/WalletConnectProvider";
@@ -15,6 +16,8 @@ let walletConnectConfig: {
     url: string;
     icons: string[];
   };
+  solanaNamespaces?: Record<string, NamespaceConfig>;
+  evmNamespaces?: Record<string, NamespaceConfig>;
 } | null = null;
 
 let providerInstance: WalletConnectProvider | null = null;
@@ -66,13 +69,13 @@ function convertWalletToConnector(wallet: ReturnType<typeof walletConnectWallet>
     isInstalled: true, // Always available
     providers: {
       evm: {
-        provider: createWalletConnectEVMProvider(),
+        provider: createWalletConnectEVMProvider(walletConnectConfig?.evmNamespaces),
+        protocol: ProviderProtocol.WALLET_CONNECT,
+      },
+      solana: {
+        provider: createWalletConnectSolanaProvider(walletConnectConfig?.solanaNamespaces),
         protocol: ProviderProtocol.WALLET_CONNECT,
       },
-      // solana: {
-      //   provider: createWalletConnectSolanaProvider(),
-      //   protocol: ProviderProtocol.WALLET_CONNECT,
-      // },
     },
   };
 }
@@ -81,14 +84,17 @@ function convertWalletToConnector(wallet: ReturnType<typeof walletConnectWallet>
  * Create a WalletConnect provider instance
  * Provider will be initialized when connect() is called
  */
-function createWalletConnectEVMProvider(): any {
+export function createWalletConnectEVMProvider(namespaces?: Record<string, NamespaceConfig>): any {
   const getProvider = async () => {
     if (!providerInstance) {
       if (!walletConnectConfig) {
         throw new Error("WalletConnect not configured. Please call setWalletConnectConfig() first.");
       }
 
-      providerInstance = new WalletConnectProvider(walletConnectConfig);
+      providerInstance = new WalletConnectProvider({
+        ...walletConnectConfig,
+        namespaces: namespaces || walletConnectConfig?.evmNamespaces,
+      });
       await providerInstance.initialize();
     }
     return providerInstance;
@@ -143,14 +149,17 @@ function createWalletConnectEVMProvider(): any {
  * Create a WalletConnect Solana provider instance
  * Provider will be initialized when connect() is called
  */
-function createWalletConnectSolanaProvider(): any {
+function createWalletConnectSolanaProvider(namespaces?: Record<string, NamespaceConfig>): any {
   const getProvider = async () => {
     if (!solanaProviderInstance) {
       if (!walletConnectConfig) {
         throw new Error("WalletConnect not configured. Please call setWalletConnectConfig() first.");
       }
 
-      solanaProviderInstance = new WalletConnectSolanaProvider(walletConnectConfig);
+      solanaProviderInstance = new WalletConnectSolanaProvider({
+        ...walletConnectConfig,
+        namespaces: namespaces || walletConnectConfig?.solanaNamespaces || {},
+      });
       await solanaProviderInstance.initialize();
     }
     return solanaProviderInstance;

package/tsup.config.ts

@@ -1,6 +1,6 @@
-import { defineConfig } from "tsup";
-import { readFileSync, writeFileSync, readdirSync, statSync } from "fs";
+import { readdirSync, readFileSync, statSync, writeFileSync } from "fs";
 import { join } from "path";
+import { defineConfig } from "tsup";
 
 // Recursively find all JS files in dist directory
 function findJsFiles(dir: string, fileList: string[] = []): string[] {
@@ -24,6 +24,7 @@ export default defineConfig({
   treeshake: true,
   clean: true,
   platform: "browser",
+  tsconfig: "tsconfig.json",
   loader: {
     ".svg": "base64",
   },