@phantom/browser-sdk 1.0.2 → 1.0.3

package/dist/index.js

@@ -30,11 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  AddressType: () => import_client4.AddressType,
+  AddressType: () => import_client5.AddressType,
   BrowserSDK: () => BrowserSDK,
   DebugCategory: () => DebugCategory,
   DebugLevel: () => DebugLevel,
-  NetworkId: () => import_constants5.NetworkId,
+  NetworkId: () => import_constants7.NetworkId,
+  PHANTOM_ICON: () => import_constants8.PHANTOM_ICON,
   debug: () => debug,
   detectBrowser: () => detectBrowser,
   getBrowserDisplayName: () => getBrowserDisplayName,
@@ -51,7 +52,7 @@ module.exports = __toCommonJS(src_exports);
 var import_client = require("@phantom/client");
 
 // src/providers/injected/index.ts
-var import_client3 = require("@phantom/client");
+var import_client4 = require("@phantom/client");
 
 // src/debug.ts
 var DebugLevel = /* @__PURE__ */ ((DebugLevel2) => {
@@ -128,12 +129,27 @@ var DebugCategory = {
 };
 
 // src/wallets/discovery.ts
-var import_client2 = require("@phantom/client");
+var import_constants = require("@phantom/constants");
+var import_client3 = require("@phantom/client");
 var import_browser_injected_sdk = require("@phantom/browser-injected-sdk");
 var import_browser_injected_sdk2 = require("@phantom/browser-injected-sdk");
 var import_solana = require("@phantom/browser-injected-sdk/solana");
 var import_ethereum = require("@phantom/browser-injected-sdk/ethereum");
 var import_auto_confirm = require("@phantom/browser-injected-sdk/auto-confirm");
+
+// src/wallets/custom-wallets.ts
+var import_client2 = require("@phantom/client");
+var CUSTOM_WALLET_CONFIGS = [
+  {
+    id: "coinbase-wallet",
+    name: "Coinbase Wallet",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNTYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTI4IDU2YzE1LjQ2NCAwIDI4LTEyLjUzNiAyOC0yOFM0My40NjQgMCAyOCAwIDAgMTIuNTM2IDAgMjhzMTIuNTM2IDI4IDI4IDI4WiIgZmlsbD0iIzFCNTNFNCIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNyAyOGMwIDExLjU5OCA5LjQwMiAyMSAyMSAyMXMyMS05LjQwMiAyMS0yMVMzOS41OTggNyAyOCA3IDcgMTYuNDAyIDcgMjhabTE3LjIzNC02Ljc2NmEzIDMgMCAwIDAtMyAzdjcuNTMzYTMgMyAwIDAgMCAzIDNoNy41MzNhMyAzIDAgMCAwIDMtM3YtNy41MzNhMyAzIDAgMCAwLTMtM2gtNy41MzNaIiBmaWxsPSIjZmZmIi8+PC9zdmc+",
+    windowProperty: "coinbaseSolana",
+    addressTypes: [import_client2.AddressType.solana]
+  }
+];
+
+// src/wallets/discovery.ts
 function generateWalletIdFromEIP6963(info) {
   if (info.rdns) {
     return info.rdns.split(".").reverse().join("-");
@@ -166,7 +182,7 @@ function processEIP6963Providers(providers) {
       id: walletId,
       name: info.name,
       icon: info.icon,
-      addressTypes: [import_client2.AddressType.ethereum],
+      addressTypes: [import_client3.AddressType.ethereum],
       providers: {
         // EIP-6963 provider implements EIP-1193 interface (IEthereumChain)
         ethereum: provider
@@ -376,7 +392,7 @@ async function discoverSolanaWallets() {
         id: walletId,
         name: wallet.name,
         icon: wallet.icon,
-        addressTypes: [import_client2.AddressType.solana],
+        addressTypes: [import_client3.AddressType.solana],
         providers: {
           // Cast to ISolanaChain - Wallet Standard wallets have compatible methods
           // The InjectedWalletSolanaChain wrapper will handle the actual method calls
@@ -397,6 +413,51 @@ async function discoverSolanaWallets() {
     walletNames: wallets.map((w) => w.name)
   };
   debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard Solana discovery completed", finalLogData);
+  const customWallets = discoverCustomSolanaWallets();
+  wallets.push(...customWallets);
+  return wallets;
+}
+function discoverCustomSolanaWallets() {
+  const wallets = [];
+  if (typeof window === "undefined") {
+    debug.log(DebugCategory.BROWSER_SDK, "Custom wallet discovery skipped (not in browser environment)");
+    return wallets;
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "Starting custom Solana wallet discovery", {
+    configCount: CUSTOM_WALLET_CONFIGS.length
+  });
+  for (const config of CUSTOM_WALLET_CONFIGS) {
+    if (!config.addressTypes.includes(import_client3.AddressType.solana)) {
+      continue;
+    }
+    const provider = window[config.windowProperty];
+    if (!provider) {
+      debug.log(DebugCategory.BROWSER_SDK, "Custom wallet not found", {
+        walletId: config.id,
+        windowProperty: config.windowProperty
+      });
+      continue;
+    }
+    debug.log(DebugCategory.BROWSER_SDK, "Discovered custom Solana wallet", {
+      walletId: config.id,
+      walletName: config.name,
+      windowProperty: config.windowProperty
+    });
+    wallets.push({
+      id: config.id,
+      name: config.name,
+      icon: config.icon,
+      addressTypes: config.addressTypes,
+      providers: {
+        solana: provider
+      },
+      discovery: "custom"
+    });
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "Custom Solana wallet discovery completed", {
+    discoveredCount: wallets.length,
+    walletIds: wallets.map((w) => w.id)
+  });
   return wallets;
 }
 function discoverPhantomWallet(addressTypes) {
@@ -407,10 +468,10 @@ function discoverPhantomWallet(addressTypes) {
     return null;
   }
   const plugins = [(0, import_browser_injected_sdk2.createExtensionPlugin)()];
-  if (addressTypes.includes(import_client2.AddressType.solana)) {
+  if (addressTypes.includes(import_client3.AddressType.solana)) {
     plugins.push((0, import_solana.createSolanaPlugin)());
   }
-  if (addressTypes.includes(import_client2.AddressType.ethereum)) {
+  if (addressTypes.includes(import_client3.AddressType.ethereum)) {
     plugins.push((0, import_ethereum.createEthereumPlugin)());
   }
   plugins.push((0, import_auto_confirm.createAutoConfirmPlugin)());
@@ -418,12 +479,11 @@ function discoverPhantomWallet(addressTypes) {
   return {
     id: "phantom",
     name: "Phantom",
-    icon: void 0,
-    // Icon will be rendered from icons package in UI components
+    icon: import_constants.PHANTOM_ICON,
     addressTypes,
     providers: {
-      solana: addressTypes.includes(import_client2.AddressType.solana) ? phantomInstance.solana : void 0,
-      ethereum: addressTypes.includes(import_client2.AddressType.ethereum) ? phantomInstance.ethereum : void 0
+      solana: addressTypes.includes(import_client3.AddressType.solana) ? phantomInstance.solana : void 0,
+      ethereum: addressTypes.includes(import_client3.AddressType.ethereum) ? phantomInstance.ethereum : void 0
     },
     isPhantom: true,
     phantomInstance,
@@ -488,6 +548,9 @@ async function discoverWallets(addressTypes) {
   return Array.from(walletMap.values());
 }
 
+// src/wallets/registry.ts
+var import_constants2 = require("@phantom/constants");
+
 // src/providers/injected/chains/InjectedWalletSolanaChain.ts
 var import_eventemitter3 = require("eventemitter3");
 var import_buffer = require("buffer");
@@ -495,61 +558,55 @@ var InjectedWalletSolanaChain = class {
   constructor(provider, walletId, walletName) {
     // Expose eventEmitter for testing - allows tests to trigger events directly
     this.eventEmitter = new import_eventemitter3.EventEmitter();
-    this._connected = false;
     this._publicKey = null;
     this.provider = provider;
     this.walletId = walletId;
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._connected;
-  }
   get publicKey() {
     return this._publicKey;
   }
+  get isConnected() {
+    return this.provider.isConnected || !!this._publicKey;
+  }
   async connect(options) {
-    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connect", {
-      walletId: this.walletId,
-      walletName: this.walletName,
-      onlyIfTrusted: options?.onlyIfTrusted
-    });
     try {
-      const result = await this.provider.connect(options);
-      if (typeof result === "string") {
-        this._connected = true;
-        this._publicKey = result;
-        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+      await this.provider.connect(options);
+      const isConnected = this.provider.isConnected;
+      if (!isConnected || this.provider.publicKey === null) {
+        debug.error(DebugCategory.INJECTED_PROVIDER, "Provider not connected after connect() call", {
           walletId: this.walletId,
           walletName: this.walletName,
-          publicKey: result
+          providerConnected: isConnected,
+          providerPublicKey: this.provider.publicKey
         });
-        return { publicKey: result };
-      }
-      if (typeof result === "object" && result !== null && "publicKey" in result) {
-        this._connected = true;
-        this._publicKey = result.publicKey;
-        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+        throw new Error("Provider not connected after connect() call");
+      }
+      let publicKey;
+      const providerPublicKey = this.provider.publicKey;
+      if (typeof providerPublicKey === "string") {
+        publicKey = providerPublicKey;
+      } else if (providerPublicKey !== null && providerPublicKey !== void 0 && typeof providerPublicKey.toString === "function") {
+        publicKey = providerPublicKey.toString();
+      } else {
+        debug.error(DebugCategory.INJECTED_PROVIDER, "Invalid publicKey format in provider state", {
           walletId: this.walletId,
           walletName: this.walletName,
-          publicKey: result.publicKey
+          publicKeyType: typeof providerPublicKey
         });
-        return result;
-      }
-      if (Array.isArray(result) && result.length > 0) {
-        const firstAccount = result[0];
-        if (typeof firstAccount === "object" && firstAccount !== null && "address" in firstAccount) {
-          this._connected = true;
-          this._publicKey = firstAccount.address;
-          debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
-            walletId: this.walletId,
-            walletName: this.walletName,
-            publicKey: firstAccount.address
-          });
-          return { publicKey: firstAccount.address };
-        }
+        throw new Error("Invalid publicKey format in provider state");
       }
-      throw new Error("Unexpected connect result format");
+      if (!publicKey || publicKey.length === 0) {
+        throw new Error("Empty publicKey from provider");
+      }
+      this._publicKey = publicKey;
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        publicKey
+      });
+      return { publicKey };
     } catch (error) {
       debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connect failed", {
         walletId: this.walletId,
@@ -566,7 +623,6 @@ var InjectedWalletSolanaChain = class {
     });
     try {
       await this.provider.disconnect();
-      this._connected = false;
       this._publicKey = null;
       debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana disconnected", {
         walletId: this.walletId,
@@ -702,28 +758,19 @@ var InjectedWalletSolanaChain = class {
   switchNetwork(_network) {
     return Promise.resolve();
   }
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
-  }
-  isConnected() {
-    return this._connected;
-  }
   setupEventListeners() {
     if (typeof this.provider.on === "function") {
       this.provider.on("connect", (publicKey) => {
-        this._connected = true;
         this._publicKey = publicKey;
         this.eventEmitter.emit("connect", publicKey);
       });
       this.provider.on("disconnect", () => {
-        this._connected = false;
         this._publicKey = null;
         this.eventEmitter.emit("disconnect");
       });
       this.provider.on("accountChanged", (publicKey) => {
-        this._publicKey = publicKey;
-        this._connected = publicKey != null && publicKey.length > 0;
-        this.eventEmitter.emit("accountChanged", publicKey);
+        this._publicKey = publicKey ? publicKey : null;
+        this.eventEmitter.emit("accountChanged", this._publicKey);
       });
     }
   }
@@ -749,12 +796,12 @@ var WalletStandardSolanaAdapter = class {
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._publicKey !== null;
-  }
   get publicKey() {
     return this._publicKey;
   }
+  get isConnected() {
+    return this._publicKey !== null;
+  }
   async connect(_options) {
     try {
       const connectFeature = this.wallet.features["standard:connect"];
@@ -966,12 +1013,6 @@ var WalletStandardSolanaAdapter = class {
   async switchNetwork(_network) {
     return Promise.resolve();
   }
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
-  }
-  isConnected() {
-    return this._publicKey !== null;
-  }
   /**
    * Set up event listeners for Wallet Standard events
    * Maps Wallet Standard "change" events to "accountChanged" events
@@ -1106,9 +1147,6 @@ var InjectedWalletEthereumChain = class {
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._connected;
-  }
   get chainId() {
     return this._chainId;
   }
@@ -1238,7 +1276,8 @@ var InjectedWalletEthereumChain = class {
       address
     });
     try {
-      const providerConnected = this.provider.isConnected?.() || this.provider.connected || false;
+      const providerAny = this.provider;
+      const providerConnected = (typeof providerAny.isConnected === "function" ? providerAny.isConnected() : false) || (typeof providerAny.connected === "boolean" ? providerAny.connected : false);
       if (!this._connected || this._accounts.length === 0 || !providerConnected) {
         debug.log(DebugCategory.INJECTED_PROVIDER, "Not connected, attempting to connect before signing", {
           walletId: this.walletId,
@@ -1552,8 +1591,7 @@ var InjectedWalletRegistry = class {
     const phantomWallet = {
       id: "phantom",
       name: "Phantom",
-      icon: "",
-      // Icon will be rendered from icons package in UI components
+      icon: import_constants2.PHANTOM_ICON,
       addressTypes,
       providers: wrappedProviders,
       isPhantom: true,
@@ -1699,13 +1737,13 @@ var InjectedProvider = class {
     return provider;
   }
   get solana() {
-    return this.getChainProvider(import_client3.AddressType.solana, "solana", "Solana");
+    return this.getChainProvider(import_client4.AddressType.solana, "solana", "Solana");
   }
   /**
    * Access to Ethereum chain operations
    */
   get ethereum() {
-    return this.getChainProvider(import_client3.AddressType.ethereum, "ethereum", "Ethereum");
+    return this.getChainProvider(import_client4.AddressType.ethereum, "ethereum", "Ethereum");
   }
   validateAndSelectWallet(requestedWalletId) {
     if (!this.walletRegistry.has(requestedWalletId)) {
@@ -1746,7 +1784,7 @@ var InjectedProvider = class {
       this.setupEventListeners(walletInfo);
     }
     const connectedAddresses = [];
-    if (this.addressTypes.includes(import_client3.AddressType.solana) && walletInfo.providers?.solana) {
+    if (this.addressTypes.includes(import_client4.AddressType.solana) && walletInfo.providers?.solana) {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Solana connection", {
         walletId: this.selectedWalletId,
         walletName: walletInfo.name,
@@ -1758,7 +1796,7 @@ var InjectedProvider = class {
         );
         const address = result.publicKey;
         connectedAddresses.push({
-          addressType: import_client3.AddressType.solana,
+          addressType: import_client4.AddressType.solana,
           address
         });
         debug.info(DebugCategory.INJECTED_PROVIDER, "Solana connected successfully", {
@@ -1779,7 +1817,7 @@ var InjectedProvider = class {
         throw err;
       }
     }
-    if (this.addressTypes.includes(import_client3.AddressType.ethereum) && walletInfo.providers?.ethereum) {
+    if (this.addressTypes.includes(import_client4.AddressType.ethereum) && walletInfo.providers?.ethereum) {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Ethereum connection", {
         walletId: this.selectedWalletId,
         walletName: walletInfo.name,
@@ -1795,7 +1833,7 @@ var InjectedProvider = class {
         if (accounts.length > 0) {
           connectedAddresses.push(
             ...accounts.map((address) => ({
-              addressType: import_client3.AddressType.ethereum,
+              addressType: import_client4.AddressType.ethereum,
               address
             }))
           );
@@ -1875,7 +1913,8 @@ var InjectedProvider = class {
     this.emit("connect", {
       addresses: connectedAddresses,
       source: "manual-connect",
-      authUserId
+      authUserId,
+      walletId
     });
     return result;
   }
@@ -1887,12 +1926,13 @@ var InjectedProvider = class {
     if (authOptions.provider !== "injected") {
       throw new Error(`Invalid provider for injected connection: ${authOptions.provider}. Must be "injected"`);
     }
+    const requestedWalletId = authOptions.walletId || "phantom";
     this.emit("connect_start", {
       source: "manual-connect",
-      providerType: "injected"
+      providerType: "injected",
+      walletId: requestedWalletId
     });
     try {
-      const requestedWalletId = authOptions.walletId || "phantom";
       const walletInfo = this.validateAndSelectWallet(requestedWalletId);
       const connectedAddresses = await this.connectToWallet(walletInfo);
       return await this.finalizeConnection(connectedAddresses, "injected", this.selectedWalletId || void 0);
@@ -1908,7 +1948,7 @@ var InjectedProvider = class {
     debug.info(DebugCategory.INJECTED_PROVIDER, "Starting injected provider disconnect");
     const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
     if (walletInfo?.providers) {
-      if (this.addressTypes.includes(import_client3.AddressType.solana) && walletInfo.providers.solana) {
+      if (this.addressTypes.includes(import_client4.AddressType.solana) && walletInfo.providers.solana) {
         try {
           await walletInfo.providers.solana.disconnect();
           debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnected successfully");
@@ -1916,7 +1956,7 @@ var InjectedProvider = class {
           debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to disconnect Solana", { error: err });
         }
       }
-      if (this.addressTypes.includes(import_client3.AddressType.ethereum) && walletInfo.providers.ethereum) {
+      if (this.addressTypes.includes(import_client4.AddressType.ethereum) && walletInfo.providers.ethereum) {
         try {
           await walletInfo.providers.ethereum.disconnect();
           debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnected successfully");
@@ -2012,7 +2052,8 @@ var InjectedProvider = class {
       this.emit("connect", {
         addresses: connectedAddresses,
         source: "auto-connect",
-        authUserId
+        authUserId,
+        walletId: this.selectedWalletId
       });
       debug.info(DebugCategory.INJECTED_PROVIDER, "Auto-connect successful", {
         addressCount: connectedAddresses.length,
@@ -2073,12 +2114,13 @@ var InjectedProvider = class {
   createSolanaConnectHandler(walletId, source) {
     return async (publicKey) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana connect event received", { publicKey, walletId });
-      const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client3.AddressType.solana);
+      const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client4.AddressType.solana);
       const authUserId = await this.getAuthUserId("Solana connect event");
       this.emit("connect", {
         addresses: newAddresses,
         source,
-        authUserId
+        authUserId,
+        walletId: this.selectedWalletId
       });
     };
   }
@@ -2089,7 +2131,7 @@ var InjectedProvider = class {
     return () => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnect event received", { walletId });
       const state = this.getWalletState(walletId);
-      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.solana);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client4.AddressType.solana);
       this.setWalletState(walletId, {
         connected: filteredAddresses.length > 0,
         addresses: filteredAddresses
@@ -2107,16 +2149,17 @@ var InjectedProvider = class {
     return async (publicKey) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana account changed event received", { publicKey, walletId });
       if (publicKey) {
-        const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client3.AddressType.solana);
+        const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client4.AddressType.solana);
         const authUserId = await this.getAuthUserId("Solana account changed event");
         this.emit("connect", {
           addresses: newAddresses,
           source: this.getAccountChangeSource(source),
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       } else {
         const state = this.getWalletState(walletId);
-        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.solana);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client4.AddressType.solana);
         this.setWalletState(walletId, {
           connected: otherAddresses.length > 0,
           addresses: otherAddresses
@@ -2148,12 +2191,13 @@ var InjectedProvider = class {
       }
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum connect event received", { accounts, walletId });
       if (accounts.length > 0) {
-        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client3.AddressType.ethereum);
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client4.AddressType.ethereum);
         const authUserId = await this.getAuthUserId("Ethereum connect event");
         this.emit("connect", {
           addresses: newAddresses,
           source,
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       }
     };
@@ -2165,7 +2209,7 @@ var InjectedProvider = class {
     return () => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnect event received", { walletId });
       const state = this.getWalletState(walletId);
-      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client4.AddressType.ethereum);
       this.setWalletState(walletId, {
         connected: filteredAddresses.length > 0,
         addresses: filteredAddresses
@@ -2182,16 +2226,17 @@ var InjectedProvider = class {
     return async (accounts) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum accounts changed event received", { accounts, walletId });
       if (accounts && accounts.length > 0) {
-        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client3.AddressType.ethereum);
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client4.AddressType.ethereum);
         const authUserId = await this.getAuthUserId("Ethereum accounts changed event");
         this.emit("connect", {
           addresses: newAddresses,
           source: this.getAccountChangeSource(source),
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       } else {
         const state = this.getWalletState(walletId);
-        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client4.AddressType.ethereum);
         this.setWalletState(walletId, {
           connected: otherAddresses.length > 0,
           addresses: otherAddresses
@@ -2385,7 +2430,9 @@ var InjectedProvider = class {
     this.eventListenerCleanups.set(walletId, [...existingCleanups, ...cleanups]);
   }
   /**
-   * Unified event listener setup for all wallet types (Phantom and external)
+   * Unified event listener setup for all wallet types (Phantom and external).
+   * Cleans up listeners for previously selected wallets to prevent stale events
+   * from causing walletId flicker during connections.
    */
   setupEventListeners(walletInfo) {
     const walletId = this.selectedWalletId || "phantom";
@@ -2393,11 +2440,22 @@ var InjectedProvider = class {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Event listeners already set up for wallet", { walletId });
       return;
     }
+    for (const existingWalletId of this.eventListenersSetup) {
+      if (existingWalletId === walletId) {
+        continue;
+      }
+      const cleanups = this.eventListenerCleanups.get(existingWalletId);
+      if (cleanups) {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Cleaning up event listeners for wallet", { existingWalletId });
+        cleanups.forEach((cleanup) => cleanup());
+      }
+      this.eventListenersSetup.delete(existingWalletId);
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up event listeners", { walletId });
-    if (this.addressTypes.includes(import_client3.AddressType.solana) && walletInfo.providers?.solana) {
+    if (this.addressTypes.includes(import_client4.AddressType.solana) && walletInfo.providers?.solana) {
       this.setupSolanaEventListeners(walletInfo.providers.solana, walletId, "wallet");
     }
-    if (this.addressTypes.includes(import_client3.AddressType.ethereum) && walletInfo.providers?.ethereum) {
+    if (this.addressTypes.includes(import_client4.AddressType.ethereum) && walletInfo.providers?.ethereum) {
       this.setupEthereumEventListeners(walletInfo.providers.ethereum, walletId, "wallet");
     }
     this.eventListenersSetup.add(walletId);
@@ -2541,7 +2599,7 @@ var BrowserURLParamsAccessor = class {
 var browserUrlParamsAccessor = new BrowserURLParamsAccessor();
 
 // src/providers/embedded/adapters/auth.ts
-var import_constants = require("@phantom/constants");
+var import_constants3 = require("@phantom/constants");
 
 // src/utils/browser-detection.ts
 function parseBrowserFromUserAgent(userAgent, hasBraveAPI) {
@@ -2706,7 +2764,7 @@ var BrowserAuthProvider = class {
         provider: phantomOptions.provider,
         authUrl: phantomOptions.authUrl
       });
-      const baseUrl = phantomOptions.authUrl || import_constants.DEFAULT_AUTH_URL;
+      const baseUrl = phantomOptions.authUrl || import_constants3.DEFAULT_AUTH_URL;
       debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Using auth URL", { baseUrl });
       const params = new URLSearchParams({
         public_key: phantomOptions.publicKey,
@@ -2716,9 +2774,10 @@ var BrowserAuthProvider = class {
         // OAuth session management - defaults to allow refresh unless explicitly clearing after logout
         clear_previous_session: (phantomOptions.clearPreviousSession ?? false).toString(),
         allow_refresh: (phantomOptions.allowRefresh ?? true).toString(),
-        sdk_version: "1.0.2",
+        sdk_version: "1.0.3",
         sdk_type: "browser",
-        platform: detectBrowser().name
+        platform: detectBrowser().name,
+        algorithm: phantomOptions.algorithm || import_constants3.DEFAULT_AUTHENTICATOR_ALGORITHM
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -2839,28 +2898,9 @@ var BrowserAuthProvider = class {
 // src/providers/embedded/adapters/phantom-app.ts
 var import_browser_injected_sdk4 = require("@phantom/browser-injected-sdk");
 
-// src/isPhantomLoginAvailable.ts
+// src/waitForPhantomExtension.ts
 var import_browser_injected_sdk3 = require("@phantom/browser-injected-sdk");
-async function isPhantomLoginAvailable(timeoutMs = 3e3) {
-  const extensionInstalled = await waitForExtension(timeoutMs);
-  if (!extensionInstalled) {
-    return false;
-  }
-  try {
-    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
-      return false;
-    }
-    const response = await window.phantom.app.features();
-    if (!Array.isArray(response.features)) {
-      return false;
-    }
-    return response.features.includes("phantom_login");
-  } catch (error) {
-    console.error("Error checking Phantom extension features", error);
-    return false;
-  }
-}
-async function waitForExtension(timeoutMs) {
+async function waitForPhantomExtension(timeoutMs = 3e3) {
   return new Promise((resolve) => {
     const startTime = Date.now();
     const checkInterval = 100;
@@ -2883,6 +2923,27 @@ async function waitForExtension(timeoutMs) {
   });
 }
 
+// src/isPhantomLoginAvailable.ts
+async function isPhantomLoginAvailable(timeoutMs = 3e3) {
+  const extensionInstalled = await waitForPhantomExtension(timeoutMs);
+  if (!extensionInstalled) {
+    return false;
+  }
+  try {
+    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
+      return false;
+    }
+    const response = await window.phantom.app.features();
+    if (!Array.isArray(response.features)) {
+      return false;
+    }
+    return response.features.includes("phantom_login");
+  } catch (error) {
+    console.error("Error checking Phantom extension features", error);
+    return false;
+  }
+}
+
 // src/providers/embedded/adapters/phantom-app.ts
 var BrowserPhantomAppProvider = class {
   /**
@@ -2952,7 +3013,7 @@ var BrowserLogger = class {
 };
 
 // src/providers/embedded/index.ts
-var import_constants2 = require("@phantom/constants");
+var import_constants4 = require("@phantom/constants");
 var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvider {
   constructor(config) {
     debug.log(DebugCategory.EMBEDDED_PROVIDER, "Initializing Browser EmbeddedProvider", { config });
@@ -2973,14 +3034,14 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
       name: platformName,
       // Use detected browser name and version for identification
       analyticsHeaders: {
-        [import_constants2.ANALYTICS_HEADERS.SDK_TYPE]: "browser",
-        [import_constants2.ANALYTICS_HEADERS.PLATFORM]: browserName,
+        [import_constants4.ANALYTICS_HEADERS.SDK_TYPE]: "browser",
+        [import_constants4.ANALYTICS_HEADERS.PLATFORM]: browserName,
         // firefox, chrome, safari, etc.
-        [import_constants2.ANALYTICS_HEADERS.PLATFORM_VERSION]: version,
+        [import_constants4.ANALYTICS_HEADERS.PLATFORM_VERSION]: version,
         // Full user agent for more detailed info
-        [import_constants2.ANALYTICS_HEADERS.APP_ID]: config.appId,
-        [import_constants2.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.2"
+        [import_constants4.ANALYTICS_HEADERS.APP_ID]: config.appId,
+        [import_constants4.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
+        [import_constants4.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.3"
         // Replaced at build time
       }
     };
@@ -2997,7 +3058,7 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
 
 // src/ProviderManager.ts
 var import_embedded_provider_core2 = require("@phantom/embedded-provider-core");
-var import_constants3 = require("@phantom/constants");
+var import_constants5 = require("@phantom/constants");
 
 // src/utils/auth-callback.ts
 function isAuthFailureCallback(searchParams) {
@@ -3017,11 +3078,12 @@ function isAuthCallbackUrl(searchParams) {
 }
 
 // src/utils/deeplink.ts
-function getDeeplinkToPhantom(ref) {
-  if (!window.location.href.startsWith("http:") && !window.location.href.startsWith("https:")) {
+function getDeeplinkToPhantom(ref, currentHref) {
+  const resolvedHref = currentHref ?? window.location.href;
+  if (!resolvedHref.startsWith("http:") && !resolvedHref.startsWith("https:")) {
     throw new Error("Invalid URL protocol - only HTTP/HTTPS URLs are supported for deeplinks");
   }
-  const currentUrl = encodeURIComponent(window.location.href);
+  const currentUrl = encodeURIComponent(resolvedHref);
   const refParam = ref ? `?ref=${encodeURIComponent(ref)}` : "";
   return `https://phantom.app/ul/browse/${currentUrl}${refParam}`;
 }
@@ -3117,8 +3179,14 @@ var ProviderManager = class {
     } else if (requestedProvider === "deeplink") {
       try {
         const deeplinkUrl = getDeeplinkToPhantom();
-        if (typeof window !== "undefined") {
-          window.location.href = deeplinkUrl;
+        if (typeof window !== "undefined" && window.location) {
+          try {
+            window.location.href = deeplinkUrl;
+          } catch (error) {
+            debug.warn(DebugCategory.PROVIDER_MANAGER, "Failed to set deeplink location", {
+              error: error instanceof Error ? error.message : String(error)
+            });
+          }
         }
         return {
           addresses: [],
@@ -3381,8 +3449,8 @@ var ProviderManager = class {
       if (!this.config.appId) {
         throw new Error("appId is required for embedded provider");
       }
-      const apiBaseUrl = this.config.apiBaseUrl || import_constants3.DEFAULT_WALLET_API_URL;
-      const authUrl = this.config.authOptions?.authUrl || import_constants3.DEFAULT_AUTH_URL;
+      const apiBaseUrl = this.config.apiBaseUrl || import_constants5.DEFAULT_WALLET_API_URL;
+      const authUrl = this.config.authOptions?.authUrl || import_constants5.DEFAULT_AUTH_URL;
       provider = new EmbeddedProvider({
         apiBaseUrl,
         appId: this.config.appId,
@@ -3391,7 +3459,7 @@ var ProviderManager = class {
           authUrl,
           redirectUrl: this.config.authOptions?.redirectUrl || this.getValidatedCurrentUrl()
         },
-        embeddedWalletType: embeddedWalletType || import_constants3.DEFAULT_EMBEDDED_WALLET_TYPE,
+        embeddedWalletType: embeddedWalletType || import_constants5.DEFAULT_EMBEDDED_WALLET_TYPE,
         addressTypes: this.config.addressTypes || [import_client.AddressType.solana]
       });
     } else {
@@ -3427,7 +3495,7 @@ var ProviderManager = class {
 
 // src/BrowserSDK.ts
 var import_embedded_provider_core3 = require("@phantom/embedded-provider-core");
-var import_constants4 = require("@phantom/constants");
+var import_constants6 = require("@phantom/constants");
 var BROWSER_SDK_PROVIDER_TYPES = [
   ...import_embedded_provider_core3.EMBEDDED_PROVIDER_AUTH_TYPES,
   "injected",
@@ -3463,7 +3531,7 @@ var BrowserSDK = class {
       });
       throw new Error("appId is required when using embedded providers (google, apple, phantom, etc.)");
     }
-    const embeddedWalletType = config.embeddedWalletType || import_constants4.DEFAULT_EMBEDDED_WALLET_TYPE;
+    const embeddedWalletType = config.embeddedWalletType || import_constants6.DEFAULT_EMBEDDED_WALLET_TYPE;
     if (!["app-wallet", "user-wallet"].includes(embeddedWalletType)) {
       debug.error(DebugCategory.BROWSER_SDK, "Invalid embeddedWalletType", {
         embeddedWalletType: config.embeddedWalletType
@@ -3589,6 +3657,7 @@ var BrowserSDK = class {
    */
   async autoConnect() {
     debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect with fallback strategy");
+    await this.discoverWallets();
     const result = await this.providerManager.autoConnect();
     if (result) {
       debug.info(DebugCategory.BROWSER_SDK, "Auto-connect successful", {
@@ -3736,31 +3805,7 @@ var BrowserSDK = class {
   }
 };
 
-// src/waitForPhantomExtension.ts
-var import_browser_injected_sdk5 = require("@phantom/browser-injected-sdk");
-async function waitForPhantomExtension(timeoutMs = 3e3) {
-  return new Promise((resolve) => {
-    const startTime = Date.now();
-    const checkInterval = 100;
-    const checkForExtension = () => {
-      try {
-        if ((0, import_browser_injected_sdk5.isPhantomExtensionInstalled)()) {
-          resolve(true);
-          return;
-        }
-      } catch (error) {
-      }
-      const elapsed = Date.now() - startTime;
-      if (elapsed >= timeoutMs) {
-        resolve(false);
-        return;
-      }
-      setTimeout(checkForExtension, checkInterval);
-    };
-    checkForExtension();
-  });
-}
-
 // src/index.ts
-var import_constants5 = require("@phantom/constants");
-var import_client4 = require("@phantom/client");
+var import_constants7 = require("@phantom/constants");
+var import_client5 = require("@phantom/client");
+var import_constants8 = require("@phantom/constants");