@phantom/browser-sdk 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { AddressType } from "@phantom/client";
 
 // src/providers/injected/index.ts
-import { AddressType as AddressType2 } from "@phantom/client";
+import { AddressType as AddressType3 } from "@phantom/client";
 
 // src/debug.ts
 var DebugLevel = /* @__PURE__ */ ((DebugLevel2) => {
@@ -79,12 +79,27 @@ var DebugCategory = {
 };
 
 // src/wallets/discovery.ts
+import { PHANTOM_ICON } from "@phantom/constants";
 import { AddressType as ClientAddressType } from "@phantom/client";
 import { isPhantomExtensionInstalled } from "@phantom/browser-injected-sdk";
 import { createPhantom, createExtensionPlugin } from "@phantom/browser-injected-sdk";
 import { createSolanaPlugin } from "@phantom/browser-injected-sdk/solana";
 import { createEthereumPlugin } from "@phantom/browser-injected-sdk/ethereum";
 import { createAutoConfirmPlugin } from "@phantom/browser-injected-sdk/auto-confirm";
+
+// src/wallets/custom-wallets.ts
+import { AddressType as AddressType2 } from "@phantom/client";
+var CUSTOM_WALLET_CONFIGS = [
+  {
+    id: "coinbase-wallet",
+    name: "Coinbase Wallet",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNTYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTI4IDU2YzE1LjQ2NCAwIDI4LTEyLjUzNiAyOC0yOFM0My40NjQgMCAyOCAwIDAgMTIuNTM2IDAgMjhzMTIuNTM2IDI4IDI4IDI4WiIgZmlsbD0iIzFCNTNFNCIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNyAyOGMwIDExLjU5OCA5LjQwMiAyMSAyMSAyMXMyMS05LjQwMiAyMS0yMVMzOS41OTggNyAyOCA3IDcgMTYuNDAyIDcgMjhabTE3LjIzNC02Ljc2NmEzIDMgMCAwIDAtMyAzdjcuNTMzYTMgMyAwIDAgMCAzIDNoNy41MzNhMyAzIDAgMCAwIDMtM3YtNy41MzNhMyAzIDAgMCAwLTMtM2gtNy41MzNaIiBmaWxsPSIjZmZmIi8+PC9zdmc+",
+    windowProperty: "coinbaseSolana",
+    addressTypes: [AddressType2.solana]
+  }
+];
+
+// src/wallets/discovery.ts
 function generateWalletIdFromEIP6963(info) {
   if (info.rdns) {
     return info.rdns.split(".").reverse().join("-");
@@ -348,6 +363,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(ClientAddressType.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) {
@@ -369,8 +429,7 @@ function discoverPhantomWallet(addressTypes) {
   return {
     id: "phantom",
     name: "Phantom",
-    icon: void 0,
-    // Icon will be rendered from icons package in UI components
+    icon: PHANTOM_ICON,
     addressTypes,
     providers: {
       solana: addressTypes.includes(ClientAddressType.solana) ? phantomInstance.solana : void 0,
@@ -439,6 +498,9 @@ async function discoverWallets(addressTypes) {
   return Array.from(walletMap.values());
 }
 
+// src/wallets/registry.ts
+import { PHANTOM_ICON as PHANTOM_ICON2 } from "@phantom/constants";
+
 // src/providers/injected/chains/InjectedWalletSolanaChain.ts
 import { EventEmitter } from "eventemitter3";
 import { Buffer } from "buffer";
@@ -446,61 +508,55 @@ var InjectedWalletSolanaChain = class {
   constructor(provider, walletId, walletName) {
     // Expose eventEmitter for testing - allows tests to trigger events directly
     this.eventEmitter = new 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,
@@ -517,7 +573,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,
@@ -653,28 +708,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);
       });
     }
   }
@@ -700,12 +746,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"];
@@ -917,12 +963,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
@@ -1057,9 +1097,6 @@ var InjectedWalletEthereumChain = class {
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._connected;
-  }
   get chainId() {
     return this._chainId;
   }
@@ -1189,7 +1226,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,
@@ -1503,8 +1541,7 @@ var InjectedWalletRegistry = class {
     const phantomWallet = {
       id: "phantom",
       name: "Phantom",
-      icon: "",
-      // Icon will be rendered from icons package in UI components
+      icon: PHANTOM_ICON2,
       addressTypes,
       providers: wrappedProviders,
       isPhantom: true,
@@ -1650,13 +1687,13 @@ var InjectedProvider = class {
     return provider;
   }
   get solana() {
-    return this.getChainProvider(AddressType2.solana, "solana", "Solana");
+    return this.getChainProvider(AddressType3.solana, "solana", "Solana");
   }
   /**
    * Access to Ethereum chain operations
    */
   get ethereum() {
-    return this.getChainProvider(AddressType2.ethereum, "ethereum", "Ethereum");
+    return this.getChainProvider(AddressType3.ethereum, "ethereum", "Ethereum");
   }
   validateAndSelectWallet(requestedWalletId) {
     if (!this.walletRegistry.has(requestedWalletId)) {
@@ -1697,7 +1734,7 @@ var InjectedProvider = class {
       this.setupEventListeners(walletInfo);
     }
     const connectedAddresses = [];
-    if (this.addressTypes.includes(AddressType2.solana) && walletInfo.providers?.solana) {
+    if (this.addressTypes.includes(AddressType3.solana) && walletInfo.providers?.solana) {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Solana connection", {
         walletId: this.selectedWalletId,
         walletName: walletInfo.name,
@@ -1709,7 +1746,7 @@ var InjectedProvider = class {
         );
         const address = result.publicKey;
         connectedAddresses.push({
-          addressType: AddressType2.solana,
+          addressType: AddressType3.solana,
           address
         });
         debug.info(DebugCategory.INJECTED_PROVIDER, "Solana connected successfully", {
@@ -1718,19 +1755,14 @@ var InjectedProvider = class {
           walletName: walletInfo.name
         });
       } catch (err) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, stopping", {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, continuing with other chains", {
           error: err,
           walletId: this.selectedWalletId,
           walletName: walletInfo.name
         });
-        this.emit("connect_error", {
-          error: err instanceof Error ? err.message : "Failed to connect",
-          source: options?.skipEventListeners ? "auto-connect" : "manual-connect"
-        });
-        throw err;
       }
     }
-    if (this.addressTypes.includes(AddressType2.ethereum) && walletInfo.providers?.ethereum) {
+    if (this.addressTypes.includes(AddressType3.ethereum) && walletInfo.providers?.ethereum) {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Ethereum connection", {
         walletId: this.selectedWalletId,
         walletName: walletInfo.name,
@@ -1746,7 +1778,7 @@ var InjectedProvider = class {
         if (accounts.length > 0) {
           connectedAddresses.push(
             ...accounts.map((address) => ({
-              addressType: AddressType2.ethereum,
+              addressType: AddressType3.ethereum,
               address
             }))
           );
@@ -1757,16 +1789,11 @@ var InjectedProvider = class {
           });
         }
       } catch (err) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, stopping", {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, continuing with other chains", {
           error: err,
           walletId: this.selectedWalletId,
           walletName: walletInfo.name
         });
-        this.emit("connect_error", {
-          error: err instanceof Error ? err.message : "Failed to connect",
-          source: options?.skipEventListeners ? "auto-connect" : "manual-connect"
-        });
-        throw err;
       }
     }
     return connectedAddresses;
@@ -1826,7 +1853,8 @@ var InjectedProvider = class {
     this.emit("connect", {
       addresses: connectedAddresses,
       source: "manual-connect",
-      authUserId
+      authUserId,
+      walletId
     });
     return result;
   }
@@ -1838,12 +1866,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);
@@ -1859,7 +1888,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(AddressType2.solana) && walletInfo.providers.solana) {
+      if (this.addressTypes.includes(AddressType3.solana) && walletInfo.providers.solana) {
         try {
           await walletInfo.providers.solana.disconnect();
           debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnected successfully");
@@ -1867,7 +1896,7 @@ var InjectedProvider = class {
           debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to disconnect Solana", { error: err });
         }
       }
-      if (this.addressTypes.includes(AddressType2.ethereum) && walletInfo.providers.ethereum) {
+      if (this.addressTypes.includes(AddressType3.ethereum) && walletInfo.providers.ethereum) {
         try {
           await walletInfo.providers.ethereum.disconnect();
           debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnected successfully");
@@ -1963,7 +1992,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,
@@ -2024,12 +2054,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], AddressType2.solana);
+      const newAddresses = this.updateWalletAddresses(walletId, [publicKey], AddressType3.solana);
       const authUserId = await this.getAuthUserId("Solana connect event");
       this.emit("connect", {
         addresses: newAddresses,
         source,
-        authUserId
+        authUserId,
+        walletId: this.selectedWalletId
       });
     };
   }
@@ -2040,7 +2071,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 !== AddressType2.solana);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType3.solana);
       this.setWalletState(walletId, {
         connected: filteredAddresses.length > 0,
         addresses: filteredAddresses
@@ -2058,16 +2089,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], AddressType2.solana);
+        const newAddresses = this.updateWalletAddresses(walletId, [publicKey], AddressType3.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 !== AddressType2.solana);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType3.solana);
         this.setWalletState(walletId, {
           connected: otherAddresses.length > 0,
           addresses: otherAddresses
@@ -2099,12 +2131,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, AddressType2.ethereum);
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, AddressType3.ethereum);
         const authUserId = await this.getAuthUserId("Ethereum connect event");
         this.emit("connect", {
           addresses: newAddresses,
           source,
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       }
     };
@@ -2116,7 +2149,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 !== AddressType2.ethereum);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType3.ethereum);
       this.setWalletState(walletId, {
         connected: filteredAddresses.length > 0,
         addresses: filteredAddresses
@@ -2133,16 +2166,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, AddressType2.ethereum);
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, AddressType3.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 !== AddressType2.ethereum);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType3.ethereum);
         this.setWalletState(walletId, {
           connected: otherAddresses.length > 0,
           addresses: otherAddresses
@@ -2336,7 +2370,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";
@@ -2344,11 +2380,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(AddressType2.solana) && walletInfo.providers?.solana) {
+    if (this.addressTypes.includes(AddressType3.solana) && walletInfo.providers?.solana) {
       this.setupSolanaEventListeners(walletInfo.providers.solana, walletId, "wallet");
     }
-    if (this.addressTypes.includes(AddressType2.ethereum) && walletInfo.providers?.ethereum) {
+    if (this.addressTypes.includes(AddressType3.ethereum) && walletInfo.providers?.ethereum) {
       this.setupEthereumEventListeners(walletInfo.providers.ethereum, walletId, "wallet");
     }
     this.eventListenersSetup.add(walletId);
@@ -2492,7 +2539,7 @@ var BrowserURLParamsAccessor = class {
 var browserUrlParamsAccessor = new BrowserURLParamsAccessor();
 
 // src/providers/embedded/adapters/auth.ts
-import { DEFAULT_AUTH_URL } from "@phantom/constants";
+import { DEFAULT_AUTH_URL, DEFAULT_AUTHENTICATOR_ALGORITHM } from "@phantom/constants";
 
 // src/utils/browser-detection.ts
 function parseBrowserFromUserAgent(userAgent, hasBraveAPI) {
@@ -2667,9 +2714,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.4",
         sdk_type: "browser",
-        platform: detectBrowser().name
+        platform: detectBrowser().name,
+        algorithm: phantomOptions.algorithm || DEFAULT_AUTHENTICATOR_ALGORITHM
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -2697,7 +2745,7 @@ var BrowserAuthProvider = class {
       resolve();
     });
   }
-  resumeAuthFromRedirect(provider) {
+  async resumeAuthFromRedirect(provider) {
     try {
       const walletId = this.urlParamsAccessor.getParam("wallet_id");
       const sessionId = this.urlParamsAccessor.getParam("session_id");
@@ -2772,14 +2820,14 @@ var BrowserAuthProvider = class {
           }
         );
       }
-      return {
+      return Promise.resolve({
         walletId,
         organizationId,
         accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
         expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0,
         authUserId: authUserId || void 0,
         provider
-      };
+      });
     } catch (error) {
       sessionStorage.removeItem("phantom-auth-context");
       throw error;
@@ -2787,31 +2835,292 @@ var BrowserAuthProvider = class {
   }
 };
 
-// src/providers/embedded/adapters/phantom-app.ts
-import { isPhantomExtensionInstalled as isPhantomExtensionInstalled3 } from "@phantom/browser-injected-sdk";
-
-// src/isPhantomLoginAvailable.ts
-import { isPhantomExtensionInstalled as isPhantomExtensionInstalled2 } from "@phantom/browser-injected-sdk";
-async function isPhantomLoginAvailable(timeoutMs = 3e3) {
-  const extensionInstalled = await waitForExtension(timeoutMs);
-  if (!extensionInstalled) {
-    return false;
+// src/providers/embedded/adapters/Auth2AuthProvider.ts
+import {
+  createCodeVerifier,
+  createSalt,
+  createConnectStartUrl,
+  exchangeAuthCode,
+  Auth2KmsRpcClient
+} from "@phantom/auth2";
+var Auth2AuthProvider = class {
+  constructor(stamper, storage, urlParamsAccessor, auth2ProviderOptions, kmsClientOptions) {
+    this.stamper = stamper;
+    this.storage = storage;
+    this.urlParamsAccessor = urlParamsAccessor;
+    this.auth2ProviderOptions = auth2ProviderOptions;
+    this.kms = new Auth2KmsRpcClient(stamper, kmsClientOptions);
   }
-  try {
-    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
-      return false;
+  /** Redirect the browser. Extracted as a static method so tests can spy on it. */
+  static navigate(url) {
+    window.location.href = url;
+  }
+  /**
+   * Builds the Auth2 /login/start URL and redirects the browser.
+   *
+   * Called by EmbeddedProvider.handleRedirectAuth() after the stamper has
+   * already been initialized and a pending Session has been saved to storage.
+   * We store the PKCE code_verifier and salt into that session so they survive
+   * the page redirect without ever touching sessionStorage.
+   */
+  async authenticate(options) {
+    if (!this.stamper.getKeyInfo()) {
+      await this.stamper.init();
+    }
+    const keyPair = this.stamper.getCryptoKeyPair();
+    if (!keyPair) {
+      throw new Error("Stamper key pair not found.");
+    }
+    const codeVerifier = createCodeVerifier();
+    const salt = createSalt();
+    const session = await this.storage.getSession();
+    if (!session) {
+      throw new Error("Session not found.");
+    }
+    await this.storage.saveSession({ ...session, pkceCodeVerifier: codeVerifier, salt });
+    const url = await createConnectStartUrl({
+      keyPair,
+      connectLoginUrl: this.auth2ProviderOptions.connectLoginUrl,
+      clientId: this.auth2ProviderOptions.clientId,
+      redirectUri: this.auth2ProviderOptions.redirectUri,
+      sessionId: options.sessionId,
+      provider: options.provider,
+      codeVerifier,
+      salt
+    });
+    Auth2AuthProvider.navigate(url);
+  }
+  /**
+   * Processes the Auth2 callback after the browser returns from /login/start.
+   *
+   * Exchanges the authorization code for tokens, discovers the organization
+   * and wallet via KMS RPC, then returns a completed AuthResult.
+   */
+  async resumeAuthFromRedirect(provider) {
+    const code = this.urlParamsAccessor.getParam("code");
+    if (!code) {
+      return null;
     }
-    const response = await window.phantom.app.features();
-    if (!Array.isArray(response.features)) {
-      return false;
+    if (!this.stamper.getKeyInfo()) {
+      await this.stamper.init();
     }
-    return response.features.includes("phantom_login");
-  } catch (error) {
-    console.error("Error checking Phantom extension features", error);
-    return false;
+    const session = await this.storage.getSession();
+    if (!session) {
+      throw new Error("Session not found.");
+    }
+    const codeVerifier = session?.pkceCodeVerifier;
+    if (!codeVerifier) {
+      return null;
+    }
+    const state = this.urlParamsAccessor.getParam("state");
+    if (!state || state !== session.sessionId) {
+      throw new Error("Missing or invalid Auth2 state parameter \u2014 possible CSRF attack.");
+    }
+    const error = this.urlParamsAccessor.getParam("error");
+    if (error) {
+      const description = this.urlParamsAccessor.getParam("error_description");
+      throw new Error(`Auth2 callback error: ${description ?? error}`);
+    }
+    const { idToken, bearerToken, authUserId, expiresInMs } = await exchangeAuthCode({
+      authApiBaseUrl: this.auth2ProviderOptions.authApiBaseUrl,
+      clientId: this.auth2ProviderOptions.clientId,
+      redirectUri: this.auth2ProviderOptions.redirectUri,
+      code,
+      codeVerifier
+    });
+    this.stamper.idToken = idToken;
+    this.stamper.salt = session?.salt;
+    await this.storage.saveSession({
+      ...session,
+      status: "completed",
+      bearerToken,
+      authUserId,
+      pkceCodeVerifier: void 0,
+      // no longer needed after code exchange
+      salt: void 0
+      // no longer needed after nonce binding is complete
+    });
+    const { organizationId, walletId } = await this.kms.discoverOrganizationAndWalletId(bearerToken, authUserId);
+    return {
+      walletId,
+      organizationId,
+      provider,
+      accountDerivationIndex: 0,
+      // discoverWalletId uses derivation index of 0.
+      expiresInMs,
+      authUserId,
+      bearerToken
+    };
   }
-}
-async function waitForExtension(timeoutMs) {
+};
+
+// src/providers/embedded/adapters/Auth2Stamper.ts
+import bs582 from "bs58";
+import { base64urlEncode } from "@phantom/base64url";
+import { Algorithm } from "@phantom/sdk-types";
+var STORE_NAME = "crypto-keys";
+var ACTIVE_KEY = "auth2-p256-signing-key";
+var Auth2Stamper = class {
+  /**
+   * @param dbName - IndexedDB database name (use a unique name per app to
+   *   avoid key collisions with other stampers, e.g. `phantom-auth2-<appId>`).
+   */
+  constructor(dbName) {
+    this.dbName = dbName;
+    this.db = null;
+    this.keyPair = null;
+    this._keyInfo = null;
+    this.algorithm = Algorithm.secp256r1;
+    this.type = "PKI";
+  }
+  async init() {
+    await this.openDB();
+    const stored = await this.loadKeyPair();
+    if (stored) {
+      this.keyPair = stored.keyPair;
+      this._keyInfo = stored.keyInfo;
+      return this._keyInfo;
+    }
+    return this.generateAndStore();
+  }
+  getKeyInfo() {
+    return this._keyInfo;
+  }
+  getCryptoKeyPair() {
+    return this.keyPair;
+  }
+  async stamp(params) {
+    if (!this.keyPair || !this._keyInfo) {
+      throw new Error("Auth2Stamper not initialized. Call init() first.");
+    }
+    const signatureRaw = await crypto.subtle.sign(
+      { name: "ECDSA", hash: "SHA-256" },
+      this.keyPair.privateKey,
+      new Uint8Array(params.data)
+    );
+    const rawPublicKey = bs582.decode(this._keyInfo.publicKey);
+    if (this.idToken === void 0 || this.salt === void 0) {
+      throw new Error("Auth2Stamper not initialized with idToken or salt.");
+    }
+    const stampData = {
+      kind: "OIDC",
+      idToken: this.idToken,
+      publicKey: base64urlEncode(rawPublicKey),
+      algorithm: "Secp256r1",
+      salt: this.salt,
+      signature: base64urlEncode(new Uint8Array(signatureRaw))
+    };
+    return base64urlEncode(new TextEncoder().encode(JSON.stringify(stampData)));
+  }
+  async resetKeyPair() {
+    await this.clearStoredKey();
+    this.keyPair = null;
+    this._keyInfo = null;
+    return this.generateAndStore();
+  }
+  async clear() {
+    await this.clearStoredKey();
+    this.keyPair = null;
+    this._keyInfo = null;
+  }
+  // Auth2 doesn't use key rotation; provide minimal no-op implementations.
+  async rotateKeyPair() {
+    return this.init();
+  }
+  // eslint-disable-next-line @typescript-eslint/require-await
+  async commitRotation(authenticatorId) {
+    if (this._keyInfo) {
+      this._keyInfo.authenticatorId = authenticatorId;
+    }
+  }
+  async rollbackRotation() {
+  }
+  async generateAndStore() {
+    const keyPair = await crypto.subtle.generateKey(
+      { name: "ECDSA", namedCurve: "P-256" },
+      false,
+      // non-extractable — private key never leaves Web Crypto
+      ["sign", "verify"]
+    );
+    const rawPublicKey = new Uint8Array(await crypto.subtle.exportKey("raw", keyPair.publicKey));
+    const publicKeyBase58 = bs582.encode(rawPublicKey);
+    const keyIdBuffer = await crypto.subtle.digest("SHA-256", rawPublicKey.buffer);
+    const keyId = base64urlEncode(new Uint8Array(keyIdBuffer)).substring(0, 16);
+    this.keyPair = keyPair;
+    this._keyInfo = {
+      keyId,
+      publicKey: publicKeyBase58,
+      createdAt: Date.now()
+    };
+    await this.storeKeyPair(keyPair, this._keyInfo);
+    return this._keyInfo;
+  }
+  async openDB() {
+    return new Promise((resolve, reject) => {
+      const request = indexedDB.open(this.dbName, 1);
+      request.onsuccess = () => {
+        this.db = request.result;
+        resolve();
+      };
+      request.onerror = () => reject(request.error);
+      request.onupgradeneeded = (event) => {
+        const db = event.target.result;
+        if (!db.objectStoreNames.contains(STORE_NAME)) {
+          db.createObjectStore(STORE_NAME);
+        }
+      };
+    });
+  }
+  async loadKeyPair() {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readonly").objectStore(STORE_NAME).get(ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve(request.result ?? null);
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+  async storeKeyPair(keyPair, keyInfo) {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readwrite").objectStore(STORE_NAME).put({ keyPair, keyInfo }, ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve();
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+  async clearStoredKey() {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readwrite").objectStore(STORE_NAME).delete(ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve();
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+};
+
+// src/providers/embedded/adapters/phantom-app.ts
+import { isPhantomExtensionInstalled as isPhantomExtensionInstalled3 } from "@phantom/browser-injected-sdk";
+
+// src/waitForPhantomExtension.ts
+import { isPhantomExtensionInstalled as isPhantomExtensionInstalled2 } from "@phantom/browser-injected-sdk";
+async function waitForPhantomExtension(timeoutMs = 3e3) {
   return new Promise((resolve) => {
     const startTime = Date.now();
     const checkInterval = 100;
@@ -2834,6 +3143,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 {
   /**
@@ -2908,16 +3238,32 @@ var EmbeddedProvider = class extends CoreEmbeddedProvider {
   constructor(config) {
     debug.log(DebugCategory.EMBEDDED_PROVIDER, "Initializing Browser EmbeddedProvider", { config });
     const urlParamsAccessor = new BrowserURLParamsAccessor();
-    const stamper = new IndexedDbStamper({
+    const storage = new BrowserStorage();
+    const stamper = config.unstable__auth2Options ? new Auth2Stamper(`phantom-auth2-${config.appId}`) : new IndexedDbStamper({
       dbName: `phantom-embedded-sdk-${config.appId}`,
       storeName: "crypto-keys",
       keyName: "signing-key"
     });
     const platformName = getPlatformName();
     const { name: browserName, version } = detectBrowser();
+    const authProvider = config.unstable__auth2Options && config.authOptions?.authUrl && config.authOptions?.redirectUrl && stamper instanceof Auth2Stamper ? new Auth2AuthProvider(
+      stamper,
+      storage,
+      urlParamsAccessor,
+      {
+        redirectUri: config.authOptions.redirectUrl,
+        connectLoginUrl: config.authOptions.authUrl,
+        clientId: config.unstable__auth2Options.clientId,
+        authApiBaseUrl: config.unstable__auth2Options.authApiBaseUrl
+      },
+      {
+        apiBaseUrl: config.apiBaseUrl,
+        appId: config.appId
+      }
+    ) : new BrowserAuthProvider(urlParamsAccessor);
     const platform = {
-      storage: new BrowserStorage(),
-      authProvider: new BrowserAuthProvider(urlParamsAccessor),
+      storage,
+      authProvider,
       phantomAppProvider: new BrowserPhantomAppProvider(),
       urlParamsAccessor,
       stamper,
@@ -2925,13 +3271,12 @@ var EmbeddedProvider = class extends CoreEmbeddedProvider {
       // Use detected browser name and version for identification
       analyticsHeaders: {
         [ANALYTICS_HEADERS.SDK_TYPE]: "browser",
-        [ANALYTICS_HEADERS.PLATFORM]: browserName,
-        // firefox, chrome, safari, etc.
+        [ANALYTICS_HEADERS.PLATFORM]: "ext-sdk",
         [ANALYTICS_HEADERS.PLATFORM_VERSION]: version,
-        // Full user agent for more detailed info
+        [ANALYTICS_HEADERS.CLIENT]: browserName,
         [ANALYTICS_HEADERS.APP_ID]: config.appId,
         [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.2"
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.4"
         // Replaced at build time
       }
     };
@@ -2970,11 +3315,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}`;
 }
@@ -3070,8 +3416,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: [],
@@ -3344,6 +3696,7 @@ var ProviderManager = class {
           authUrl,
           redirectUrl: this.config.authOptions?.redirectUrl || this.getValidatedCurrentUrl()
         },
+        unstable__auth2Options: this.config.unstable__auth2Options,
         embeddedWalletType: embeddedWalletType || DEFAULT_EMBEDDED_WALLET_TYPE,
         addressTypes: this.config.addressTypes || [AddressType.solana]
       });
@@ -3542,6 +3895,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", {
@@ -3689,40 +4043,17 @@ var BrowserSDK = class {
   }
 };
 
-// src/waitForPhantomExtension.ts
-import { isPhantomExtensionInstalled as isPhantomExtensionInstalled4 } from "@phantom/browser-injected-sdk";
-async function waitForPhantomExtension(timeoutMs = 3e3) {
-  return new Promise((resolve) => {
-    const startTime = Date.now();
-    const checkInterval = 100;
-    const checkForExtension = () => {
-      try {
-        if (isPhantomExtensionInstalled4()) {
-          resolve(true);
-          return;
-        }
-      } catch (error) {
-      }
-      const elapsed = Date.now() - startTime;
-      if (elapsed >= timeoutMs) {
-        resolve(false);
-        return;
-      }
-      setTimeout(checkForExtension, checkInterval);
-    };
-    checkForExtension();
-  });
-}
-
 // src/index.ts
 import { NetworkId } from "@phantom/constants";
-import { AddressType as AddressType3 } from "@phantom/client";
+import { AddressType as AddressType4 } from "@phantom/client";
+import { PHANTOM_ICON as PHANTOM_ICON3 } from "@phantom/constants";
 export {
-  AddressType3 as AddressType,
+  AddressType4 as AddressType,
   BrowserSDK,
   DebugCategory,
   DebugLevel,
   NetworkId,
+  PHANTOM_ICON3 as PHANTOM_ICON,
   debug,
   detectBrowser,
   getBrowserDisplayName,