@phantom/browser-sdk 1.0.0-beta.22 → 1.0.0-beta.25

package/dist/index.mjs

@@ -2,13 +2,7 @@
 import { AddressType } from "@phantom/client";
 
 // src/providers/injected/index.ts
-import { AddressType as AddressType4 } from "@phantom/client";
-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";
+import { AddressType as AddressType2 } from "@phantom/client";
 
 // src/debug.ts
 var DebugLevel = /* @__PURE__ */ ((DebugLevel2) => {
@@ -27,111 +21,1404 @@ var Debug = class {
     if (!Debug.instance) {
       Debug.instance = new Debug();
     }
-    return Debug.instance;
+    return Debug.instance;
+  }
+  setCallback(callback) {
+    this.callback = callback;
+  }
+  setLevel(level) {
+    this.level = level;
+  }
+  enable() {
+    this.enabled = true;
+  }
+  disable() {
+    this.enabled = false;
+  }
+  writeLog(level, category, message, data) {
+    if (!this.enabled || level > this.level) {
+      return;
+    }
+    const debugMessage = {
+      timestamp: Date.now(),
+      level,
+      category,
+      message,
+      data
+    };
+    if (this.callback) {
+      this.callback(debugMessage);
+    }
+  }
+  error(category, message, data) {
+    this.writeLog(0 /* ERROR */, category, message, data);
+  }
+  warn(category, message, data) {
+    this.writeLog(1 /* WARN */, category, message, data);
+  }
+  info(category, message, data) {
+    this.writeLog(2 /* INFO */, category, message, data);
+  }
+  debug(category, message, data) {
+    this.writeLog(3 /* DEBUG */, category, message, data);
+  }
+  log(category, message, data) {
+    this.writeLog(3 /* DEBUG */, category, message, data);
+  }
+};
+var debug = Debug.getInstance();
+var DebugCategory = {
+  BROWSER_SDK: "BrowserSDK",
+  PROVIDER_MANAGER: "ProviderManager",
+  EMBEDDED_PROVIDER: "EmbeddedProvider",
+  INJECTED_PROVIDER: "InjectedProvider",
+  PHANTOM_CONNECT_AUTH: "PhantomConnectAuth",
+  JWT_AUTH: "JWTAuth",
+  STORAGE: "Storage",
+  SESSION: "Session"
+};
+
+// src/wallets/discovery.ts
+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";
+function generateWalletIdFromEIP6963(info) {
+  if (info.rdns) {
+    return info.rdns.split(".").reverse().join("-");
+  }
+  return info.name.toLowerCase().replace(/\s+/g, "-");
+}
+function generateWalletIdFromName(name) {
+  return name.toLowerCase().replace(/\s+/g, "-");
+}
+function processEIP6963Providers(providers) {
+  const wallets = [];
+  debug.log(DebugCategory.BROWSER_SDK, "Processing EIP-6963 providers", {
+    providerCount: providers.size,
+    providerNames: Array.from(providers.values()).map((d) => d.info.name)
+  });
+  for (const [, detail] of providers) {
+    const { info, provider } = detail;
+    const isPhantom = info.name.toLowerCase().includes("phantom") || info.rdns && (info.rdns.toLowerCase().includes("phantom") || info.rdns.toLowerCase() === "app.phantom");
+    if (isPhantom) {
+      debug.log(DebugCategory.BROWSER_SDK, "Skipping Phantom from EIP-6963", { name: info.name, rdns: info.rdns });
+      continue;
+    }
+    const walletId = generateWalletIdFromEIP6963(info);
+    debug.log(DebugCategory.BROWSER_SDK, "Discovered EIP-6963 wallet", {
+      walletId,
+      walletName: info.name,
+      rdns: info.rdns
+    });
+    wallets.push({
+      id: walletId,
+      name: info.name,
+      icon: info.icon,
+      addressTypes: [ClientAddressType.ethereum],
+      providers: {
+        // EIP-6963 provider implements EIP-1193 interface (IEthereumChain)
+        ethereum: provider
+      },
+      rdns: info.rdns
+      // Store rdns for potential future matching
+    });
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "EIP-6963 discovery completed", {
+    discoveredCount: wallets.length,
+    walletIds: wallets.map((w) => w.id)
+  });
+  return wallets;
+}
+function discoverEthereumWallets() {
+  return new Promise((resolve) => {
+    const discoveredProviders = /* @__PURE__ */ new Map();
+    if (typeof window === "undefined") {
+      resolve([]);
+      return;
+    }
+    const handleAnnounce = (event) => {
+      const detail = event.detail;
+      if (detail?.info && detail?.provider) {
+        discoveredProviders.set(detail.info.uuid, detail);
+      }
+    };
+    window.addEventListener("eip6963:announceProvider", handleAnnounce);
+    window.dispatchEvent(new Event("eip6963:requestProvider"));
+    const processProviders = () => {
+      const wallets = processEIP6963Providers(discoveredProviders);
+      window.removeEventListener("eip6963:announceProvider", handleAnnounce);
+      resolve(wallets);
+    };
+    setTimeout(processProviders, 400);
+  });
+}
+async function discoverSolanaWallets() {
+  const wallets = [];
+  if (typeof window === "undefined" || typeof navigator === "undefined") {
+    debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard discovery skipped (not in browser environment)");
+    return wallets;
+  }
+  const registeredWalletsSet = /* @__PURE__ */ new Set();
+  let cachedWalletsArray;
+  function addRegisteredWallet(wallet) {
+    cachedWalletsArray = void 0;
+    registeredWalletsSet.add(wallet);
+    const featureKeys = wallet.features ? Object.keys(wallet.features) : [];
+    debug.log(DebugCategory.BROWSER_SDK, "Wallet registered", {
+      name: wallet.name,
+      chains: wallet.chains,
+      featureKeys,
+      totalWallets: registeredWalletsSet.size
+    });
+  }
+  function removeRegisteredWallet(wallet) {
+    cachedWalletsArray = void 0;
+    registeredWalletsSet.delete(wallet);
+  }
+  function getRegisteredWallets() {
+    if (!cachedWalletsArray) {
+      cachedWalletsArray = [...registeredWalletsSet];
+    }
+    return cachedWalletsArray;
+  }
+  function register(...wallets2) {
+    wallets2 = wallets2.filter((wallet) => !registeredWalletsSet.has(wallet));
+    if (!wallets2.length) {
+      return () => {
+      };
+    }
+    wallets2.forEach((wallet) => addRegisteredWallet(wallet));
+    return function unregister() {
+      wallets2.forEach((wallet) => removeRegisteredWallet(wallet));
+    };
+  }
+  const registerAPI = Object.freeze({ register });
+  const handleRegisterWalletEvent = (event) => {
+    const callback = event.detail;
+    if (typeof callback === "function") {
+      try {
+        callback(registerAPI);
+      } catch (error) {
+        debug.warn(DebugCategory.BROWSER_SDK, "Error calling wallet registration callback", { error });
+      }
+    }
+  };
+  try {
+    window.addEventListener("wallet-standard:register-wallet", handleRegisterWalletEvent);
+  } catch (error) {
+    debug.warn(DebugCategory.BROWSER_SDK, "Could not add register-wallet event listener", { error });
+  }
+  class AppReadyEvent extends Event {
+    constructor(api) {
+      super("wallet-standard:app-ready", {
+        bubbles: false,
+        cancelable: false,
+        composed: false
+      });
+      this.detail = api;
+    }
+  }
+  try {
+    window.dispatchEvent(new AppReadyEvent(registerAPI));
+    debug.log(DebugCategory.BROWSER_SDK, "Dispatched wallet-standard:app-ready event");
+  } catch (error) {
+    debug.warn(DebugCategory.BROWSER_SDK, "Could not dispatch app-ready event", { error });
+  }
+  const walletsAPI = {
+    getWallets: () => {
+      return {
+        get: getRegisteredWallets,
+        on: (_event, _listener) => {
+          return () => {
+          };
+        },
+        register
+      };
+    }
+  };
+  if (!navigator.wallets) {
+    navigator.wallets = walletsAPI;
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "Initialized Wallet Standard registry");
+  await new Promise((resolve) => setTimeout(resolve, 100));
+  const existingWalletsAPI = navigator.wallets || window.wallets;
+  if (!existingWalletsAPI || typeof existingWalletsAPI.getWallets !== "function") {
+    const logData = {
+      hasNavigator: !!navigator,
+      hasWindow: typeof window !== "undefined",
+      note: "Wallet Standard API not properly initialized"
+    };
+    debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard API not available", logData);
+    return wallets;
+  }
+  const walletsGetter = existingWalletsAPI.getWallets();
+  const getWalletsFn = () => Promise.resolve([...walletsGetter.get()]);
+  debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard API detected, starting discovery");
+  try {
+    let registeredWallets = [];
+    let attempts = 0;
+    const maxAttempts = 5;
+    const initialDelay = 100;
+    const eip6963Timeout = 400;
+    await new Promise((resolve) => setTimeout(resolve, initialDelay));
+    while (attempts < maxAttempts) {
+      registeredWallets = await getWalletsFn();
+      const logData = {
+        attempt: attempts + 1,
+        walletCount: registeredWallets.length,
+        walletNames: registeredWallets.map((w) => w.name),
+        chains: registeredWallets.flatMap((w) => w.chains)
+      };
+      debug.log(DebugCategory.BROWSER_SDK, `Wallet Standard getWallets attempt ${attempts + 1}`, logData);
+      if (registeredWallets.length > 0 || attempts === maxAttempts - 1) {
+        break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, initialDelay));
+      attempts++;
+    }
+    const totalWaitTime = initialDelay + attempts * initialDelay;
+    if (totalWaitTime < eip6963Timeout) {
+      const remainingWait = eip6963Timeout - totalWaitTime;
+      await new Promise((resolve) => setTimeout(resolve, remainingWait));
+      registeredWallets = await getWalletsFn();
+    }
+    debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard getWallets final result", {
+      walletCount: registeredWallets.length,
+      walletNames: registeredWallets.map((w) => w.name),
+      attempts: attempts + 1
+    });
+    for (const wallet of registeredWallets) {
+      const supportsSolana = wallet.chains.some((chain) => {
+        const chainLower = chain.toLowerCase();
+        return chainLower.startsWith("solana:") || chainLower === "solana";
+      }) || wallet.features && typeof wallet.features === "object" && Object.keys(wallet.features).some((featureKey) => {
+        const featureLower = featureKey.toLowerCase();
+        return featureLower.includes("solana") || featureLower.includes("standard:connect") || featureLower.includes("standard:signTransaction");
+      });
+      if (!supportsSolana) {
+        const featureKeys = wallet.features ? Object.keys(wallet.features) : [];
+        debug.log(DebugCategory.BROWSER_SDK, "Wallet does not support Solana", {
+          walletName: wallet.name,
+          chains: wallet.chains,
+          featureKeys
+        });
+        continue;
+      }
+      if (wallet.name.toLowerCase().includes("phantom")) {
+        debug.log(DebugCategory.BROWSER_SDK, "Skipping Phantom from Wallet Standard (handled separately)");
+        continue;
+      }
+      const walletId = generateWalletIdFromName(wallet.name);
+      const safeFeatures = wallet.features ? Object.keys(wallet.features) : [];
+      debug.log(DebugCategory.BROWSER_SDK, "Discovered Wallet Standard Solana wallet", {
+        walletId,
+        walletName: wallet.name,
+        chains: wallet.chains,
+        featureKeys: safeFeatures,
+        icon: wallet.icon,
+        version: wallet.version,
+        accountCount: wallet.accounts?.length || 0
+      });
+      wallets.push({
+        id: walletId,
+        name: wallet.name,
+        icon: wallet.icon,
+        addressTypes: [ClientAddressType.solana],
+        providers: {
+          // Cast to ISolanaChain - Wallet Standard wallets have compatible methods
+          // The InjectedWalletSolanaChain wrapper will handle the actual method calls
+          solana: wallet
+        }
+      });
+    }
+  } catch (error) {
+    debug.warn(DebugCategory.BROWSER_SDK, "Wallet Standard API error", {
+      error: error instanceof Error ? error.message : String(error),
+      stack: error instanceof Error ? error.stack : void 0
+    });
+  }
+  const finalLogData = {
+    discoveredCount: wallets.length,
+    walletIds: wallets.map((w) => w.id),
+    walletNames: wallets.map((w) => w.name)
+  };
+  debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard Solana discovery completed", finalLogData);
+  return wallets;
+}
+function discoverPhantomWallet(addressTypes) {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  if (!isPhantomExtensionInstalled()) {
+    return null;
+  }
+  const plugins = [createExtensionPlugin()];
+  if (addressTypes.includes(ClientAddressType.solana)) {
+    plugins.push(createSolanaPlugin());
+  }
+  if (addressTypes.includes(ClientAddressType.ethereum)) {
+    plugins.push(createEthereumPlugin());
+  }
+  plugins.push(createAutoConfirmPlugin());
+  const phantomInstance = createPhantom({ plugins });
+  return {
+    id: "phantom",
+    name: "Phantom",
+    icon: void 0,
+    // Icon will be rendered from icons package in UI components
+    addressTypes,
+    providers: {
+      solana: addressTypes.includes(ClientAddressType.solana) ? phantomInstance.solana : void 0,
+      ethereum: addressTypes.includes(ClientAddressType.ethereum) ? phantomInstance.ethereum : void 0
+    },
+    isPhantom: true,
+    phantomInstance
+  };
+}
+async function discoverWallets(addressTypes) {
+  const requestedAddressTypes = addressTypes || [];
+  debug.log(DebugCategory.BROWSER_SDK, "Starting all wallet discovery methods", {
+    addressTypes: requestedAddressTypes
+  });
+  const [solanaWallets, ethereumWallets] = await Promise.all([discoverSolanaWallets(), discoverEthereumWallets()]);
+  const phantomWallet = discoverPhantomWallet(requestedAddressTypes);
+  debug.log(DebugCategory.BROWSER_SDK, "All wallet discovery methods completed", {
+    phantomFound: !!phantomWallet,
+    solanaWalletsCount: solanaWallets.length,
+    ethereumWalletsCount: ethereumWallets.length,
+    solanaWalletIds: solanaWallets.map((w) => w.id),
+    ethereumWalletIds: ethereumWallets.map((w) => w.id)
+  });
+  const walletMap = /* @__PURE__ */ new Map();
+  if (phantomWallet) {
+    walletMap.set("phantom", phantomWallet);
+  }
+  for (const wallet of [...solanaWallets, ...ethereumWallets]) {
+    const existing = walletMap.get(wallet.id);
+    if (existing) {
+      const mergedAddressTypes = Array.from(/* @__PURE__ */ new Set([...existing.addressTypes, ...wallet.addressTypes]));
+      const mergedProviders = {
+        ...existing.providers,
+        ...wallet.providers
+      };
+      const mergedWallet = {
+        ...existing,
+        addressTypes: mergedAddressTypes,
+        // Prefer icon from the most recent discovery
+        icon: wallet.icon || existing.icon,
+        providers: mergedProviders
+      };
+      walletMap.set(wallet.id, mergedWallet);
+      debug.log(DebugCategory.BROWSER_SDK, "Merged wallet by ID", {
+        walletName: wallet.name,
+        walletId: wallet.id,
+        existingAddressTypes: existing.addressTypes,
+        newAddressTypes: wallet.addressTypes,
+        mergedAddressTypes,
+        existingProviders: Object.keys(existing.providers || {}),
+        newProviders: Object.keys(wallet.providers || {}),
+        mergedProviders: Object.keys(mergedProviders)
+      });
+      debug.log(DebugCategory.BROWSER_SDK, "Merged wallet from multiple discovery methods", {
+        walletId: wallet.id,
+        walletName: wallet.name,
+        existingAddressTypes: existing.addressTypes,
+        newAddressTypes: wallet.addressTypes,
+        mergedAddressTypes
+      });
+    } else {
+      walletMap.set(wallet.id, wallet);
+    }
+  }
+  return Array.from(walletMap.values());
+}
+
+// src/providers/injected/chains/InjectedWalletSolanaChain.ts
+import { EventEmitter } from "eventemitter3";
+import { Buffer as Buffer2 } from "buffer";
+var InjectedWalletSolanaChain = class {
+  constructor(provider, walletId, walletName) {
+    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;
+  }
+  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", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          publicKey: result
+        });
+        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", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          publicKey: result.publicKey
+        });
+        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("Unexpected connect result format");
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async disconnect() {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana disconnect", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    try {
+      await this.provider.disconnect();
+      this._connected = false;
+      this._publicKey = null;
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana disconnected", {
+        walletId: this.walletId,
+        walletName: this.walletName
+      });
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana disconnect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signMessage(message) {
+    const messageBytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
+    const messagePreview = typeof message === "string" ? message.substring(0, 50) : `${messageBytes.length} bytes`;
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signMessage", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      messagePreview,
+      messageLength: messageBytes.length
+    });
+    try {
+      const result = await this.provider.signMessage(message);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signMessage success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signatureLength: result.signature.length
+      });
+      return {
+        signature: result.signature instanceof Uint8Array ? result.signature : new Uint8Array(Buffer2.from(result.signature, "base64")),
+        publicKey: result.publicKey || this._publicKey || ""
+      };
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signMessage failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signTransaction(transaction) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signTransaction", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    try {
+      const result = await this.provider.signTransaction(transaction);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signTransaction success", {
+        walletId: this.walletId,
+        walletName: this.walletName
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAndSendTransaction(transaction) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendTransaction", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    try {
+      const result = await this.provider.signAndSendTransaction(transaction);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendTransaction success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signature: result.signature
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAllTransactions(transactions) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAllTransactions", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      transactionCount: transactions.length
+    });
+    try {
+      const result = await this.provider.signAllTransactions(transactions);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAllTransactions success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signedCount: result.length
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAllTransactions failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAndSendAllTransactions(transactions) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendAllTransactions", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      transactionCount: transactions.length
+    });
+    try {
+      const result = await this.provider.signAndSendAllTransactions(transactions);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendAllTransactions success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signatureCount: result.signatures.length
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana signAndSendAllTransactions failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  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.eventEmitter.emit("accountChanged", publicKey);
+      });
+    }
+  }
+  on(event, listener) {
+    this.eventEmitter.on(event, listener);
+  }
+  off(event, listener) {
+    this.eventEmitter.off(event, listener);
+  }
+};
+
+// src/providers/injected/chains/WalletStandardSolanaAdapter.ts
+import { deserializeSolanaTransaction } from "@phantom/parsers";
+import bs58 from "bs58";
+var WalletStandardSolanaAdapter = class {
+  constructor(wallet, walletId, walletName) {
+    this._connected = false;
+    this._publicKey = null;
+    this.wallet = wallet;
+    this.walletId = walletId;
+    this.walletName = walletName;
+  }
+  get connected() {
+    return this._connected;
+  }
+  get publicKey() {
+    return this._publicKey;
+  }
+  async connect(_options) {
+    try {
+      const connectFeature = this.wallet.features?.["standard:connect"];
+      if (!connectFeature || typeof connectFeature.connect !== "function") {
+        throw new Error("Wallet Standard connect feature not available");
+      }
+      const connectResult = await connectFeature.connect();
+      let accounts;
+      if (Array.isArray(connectResult) && connectResult.length > 0) {
+        accounts = connectResult;
+      } else if (this.wallet.accounts && this.wallet.accounts.length > 0) {
+        accounts = Array.from(this.wallet.accounts);
+      }
+      if (!accounts || accounts.length === 0) {
+        throw new Error("No accounts available after connecting to wallet");
+      }
+      const firstAccount = accounts[0];
+      if (!firstAccount) {
+        throw new Error("First account is null or undefined");
+      }
+      let address;
+      if (typeof firstAccount === "string") {
+        address = firstAccount;
+      } else if (typeof firstAccount === "object" && firstAccount !== null) {
+        address = firstAccount.address || firstAccount.publicKey?.toString() || (firstAccount.publicKey instanceof Uint8Array ? Buffer.from(firstAccount.publicKey).toString("hex") : void 0);
+      }
+      if (!address) {
+        throw new Error(
+          `Could not extract address from account. Account structure: ${JSON.stringify(firstAccount, null, 2)}`
+        );
+      }
+      this._connected = true;
+      this._publicKey = address;
+      return { publicKey: address };
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana connect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async disconnect() {
+    try {
+      const disconnectFeature = this.wallet.features?.["standard:disconnect"];
+      if (disconnectFeature && typeof disconnectFeature.disconnect === "function") {
+        await disconnectFeature.disconnect();
+      }
+      this._connected = false;
+      this._publicKey = null;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana disconnect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signMessage(message) {
+    try {
+      const signMessageFeature = this.wallet.features?.["solana:signMessage"];
+      if (!signMessageFeature || typeof signMessageFeature.signMessage !== "function") {
+        throw new Error("Wallet Standard signMessage feature not available");
+      }
+      const messageBytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
+      const result = await signMessageFeature.signMessage({
+        message: messageBytes,
+        account: this.wallet.accounts?.[0]
+      });
+      if (!Array.isArray(result) || result.length === 0) {
+        throw new Error(`Expected array result from signMessage, got: ${typeof result}`);
+      }
+      const signedMessageResult = result[0];
+      if (!signedMessageResult || !signedMessageResult.signature) {
+        throw new Error(`Invalid signMessage result structure: ${JSON.stringify(result)}`);
+      }
+      const signature = this.parseUint8Array(signedMessageResult.signature);
+      if (signature.length === 0) {
+        throw new Error(`Signature is empty`);
+      }
+      const publicKey = signedMessageResult.account?.address || this.wallet.accounts?.[0]?.address || this._publicKey || "";
+      return { signature, publicKey };
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signMessage failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signTransaction(transaction) {
+    try {
+      const signTransactionFeature = this.wallet.features?.["solana:signTransaction"];
+      if (!signTransactionFeature || typeof signTransactionFeature.signTransaction !== "function") {
+        throw new Error("Wallet Standard signTransaction feature not available");
+      }
+      if (!this.wallet.accounts || this.wallet.accounts.length === 0) {
+        throw new Error("No accounts available. Please connect first.");
+      }
+      const account = this.wallet.accounts[0];
+      const serializedTransaction = this.serializeTransaction(transaction);
+      const results = await signTransactionFeature.signTransaction({
+        transaction: serializedTransaction,
+        account
+      });
+      let transactionData;
+      if (Array.isArray(results) && results.length > 0) {
+        const firstItem = results[0];
+        if (firstItem && typeof firstItem === "object") {
+          transactionData = firstItem.signedTransaction || firstItem.transaction;
+        }
+      } else if (results && typeof results === "object" && !Array.isArray(results)) {
+        transactionData = results.transaction || results.signedTransaction;
+      }
+      if (!transactionData) {
+        throw new Error("No transaction data found in Wallet Standard result");
+      }
+      const signedBytes = this.parseUint8Array(transactionData);
+      if (signedBytes.length === 0) {
+        throw new Error("Empty signed transaction returned from Wallet Standard");
+      }
+      const signedTx = deserializeSolanaTransaction(signedBytes);
+      return signedTx;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAndSendTransaction(transaction) {
+    try {
+      const signAndSendTransactionFeature = this.wallet.features?.["solana:signAndSendTransaction"];
+      if (!signAndSendTransactionFeature || typeof signAndSendTransactionFeature.signAndSendTransaction !== "function") {
+        throw new Error("Wallet Standard signAndSendTransaction feature not available");
+      }
+      if (!this.wallet.accounts || this.wallet.accounts.length === 0) {
+        throw new Error("No accounts available. Please connect first.");
+      }
+      const account = this.wallet.accounts[0];
+      const chain = account.chains?.[0] || "solana:mainnet";
+      const serializedTransaction = this.serializeTransaction(transaction);
+      const results = await signAndSendTransactionFeature.signAndSendTransaction({
+        transaction: serializedTransaction,
+        account,
+        chain
+      });
+      let signatureOutput;
+      if (Array.isArray(results) && results.length > 0) {
+        signatureOutput = results[0];
+      } else if (results && typeof results === "object" && !Array.isArray(results)) {
+        signatureOutput = results;
+      } else {
+        throw new Error("Invalid signAndSendTransaction result format");
+      }
+      if (!signatureOutput.signature) {
+        throw new Error("No signature found in signAndSendTransaction result");
+      }
+      const signatureBytes = this.parseUint8Array(signatureOutput.signature);
+      const signature = bs58.encode(signatureBytes);
+      return { signature };
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signAndSendTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAllTransactions(transactions) {
+    try {
+      const signedTransactions = [];
+      for (const transaction of transactions) {
+        const signedTx = await this.signTransaction(transaction);
+        signedTransactions.push(signedTx);
+      }
+      return signedTransactions;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signAllTransactions failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async signAndSendAllTransactions(transactions) {
+    try {
+      const signatures = [];
+      for (const transaction of transactions) {
+        const result = await this.signAndSendTransaction(transaction);
+        signatures.push(result.signature);
+      }
+      return { signatures };
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signAndSendAllTransactions failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async switchNetwork(network) {
+    try {
+      const switchNetworkFeature = this.wallet.features?.["standard:switchNetwork"];
+      if (switchNetworkFeature && typeof switchNetworkFeature.switchNetwork === "function") {
+        const chainId = network === "mainnet" ? "solana:mainnet" : "solana:devnet";
+        await switchNetworkFeature.switchNetwork({ chain: chainId });
+      }
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana switchNetwork failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        network,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  getPublicKey() {
+    return Promise.resolve(this._publicKey);
+  }
+  isConnected() {
+    return this._connected;
+  }
+  on(_event, _listener) {
+    const eventsFeature = this.wallet.features?.["standard:events"];
+    if (eventsFeature && typeof eventsFeature.on === "function") {
+      eventsFeature.on(_event, _listener);
+    }
+  }
+  off(_event, _listener) {
+    const eventsFeature = this.wallet.features?.["standard:events"];
+    if (eventsFeature && typeof eventsFeature.off === "function") {
+      eventsFeature.off(_event, _listener);
+    }
+  }
+  /**
+   * Serialize a transaction to Uint8Array for Wallet Standard API
+   */
+  serializeTransaction(transaction) {
+    if (typeof transaction.serialize === "function") {
+      return transaction.serialize({
+        requireAllSignatures: false,
+        verifySignatures: false
+      });
+    }
+    if (transaction instanceof Uint8Array) {
+      return transaction;
+    }
+    return new Uint8Array(0);
+  }
+  /**
+   * Parse a Uint8Array from various formats
+   * Handles: Uint8Array, Array, object with numeric keys (JSON-serialized Uint8Array)
+   */
+  parseUint8Array(value) {
+    if (value instanceof Uint8Array) {
+      return value;
+    }
+    if (Array.isArray(value)) {
+      return new Uint8Array(value);
+    }
+    if (typeof value === "object" && value !== null) {
+      const keys = Object.keys(value).map(Number).filter((k) => !isNaN(k) && k >= 0).sort((a, b) => a - b);
+      if (keys.length > 0) {
+        const maxKey = Math.max(...keys);
+        const array = new Uint8Array(maxKey + 1);
+        for (const key of keys) {
+          array[key] = Number(value[key]) || 0;
+        }
+        return array;
+      }
+    }
+    return new Uint8Array(0);
+  }
+};
+
+// src/providers/injected/chains/InjectedWalletEthereumChain.ts
+import { EventEmitter as EventEmitter2 } from "eventemitter3";
+var InjectedWalletEthereumChain = class {
+  constructor(provider, walletId, walletName) {
+    this.eventEmitter = new EventEmitter2();
+    this._connected = false;
+    this._chainId = "0x1";
+    this._accounts = [];
+    this.provider = provider;
+    this.walletId = walletId;
+    this.walletName = walletName;
+    this.setupEventListeners();
+  }
+  get connected() {
+    return this._connected;
+  }
+  get chainId() {
+    return this._chainId;
+  }
+  get accounts() {
+    return this._accounts;
+  }
+  async request(args) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum request", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      method: args.method
+    });
+    try {
+      const requiresAuth = [
+        "personal_sign",
+        "eth_sign",
+        "eth_signTypedData",
+        "eth_signTypedData_v4",
+        "eth_sendTransaction",
+        "eth_signTransaction"
+      ].includes(args.method);
+      if (requiresAuth && (!this._connected || this._accounts.length === 0)) {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Method requires authorization, ensuring connection", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          method: args.method
+        });
+        await this.connect();
+      }
+      const result = await this.provider.request(args);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum request success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        method: args.method
+      });
+      return result;
+    } catch (error) {
+      if (error?.code === 4100) {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Got 4100 Unauthorized, attempting to re-authorize", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          method: args.method
+        });
+        try {
+          await this.provider.request({ method: "eth_requestAccounts" });
+          const result = await this.provider.request(args);
+          debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum request success (after re-auth)", {
+            walletId: this.walletId,
+            walletName: this.walletName,
+            method: args.method
+          });
+          return result;
+        } catch (retryError) {
+          debug.error(DebugCategory.INJECTED_PROVIDER, "Failed after re-authorization", {
+            walletId: this.walletId,
+            walletName: this.walletName,
+            method: args.method,
+            error: retryError instanceof Error ? retryError.message : String(retryError)
+          });
+          throw retryError;
+        }
+      }
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum request failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        method: args.method,
+        error: error instanceof Error ? error.message : String(error),
+        errorCode: error?.code
+      });
+      throw error;
+    }
+  }
+  async connect() {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum connect", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    try {
+      const accounts = await this.provider.request({ method: "eth_requestAccounts" });
+      this._connected = accounts.length > 0;
+      this._accounts = accounts;
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum connected (via eth_requestAccounts)", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        accountCount: accounts.length,
+        accounts
+      });
+      return accounts;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum connect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async disconnect() {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum disconnect", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    try {
+      await this.provider.disconnect();
+      this._connected = false;
+      this._accounts = [];
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum disconnected", {
+        walletId: this.walletId,
+        walletName: this.walletName
+      });
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum disconnect failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
-  setCallback(callback) {
-    this.callback = callback;
+  async signPersonalMessage(message, address) {
+    const messagePreview = message.length > 50 ? message.substring(0, 50) + "..." : message;
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signPersonalMessage", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      messagePreview,
+      messageLength: message.length,
+      address
+    });
+    try {
+      const providerConnected = this.provider.isConnected?.() || this.provider.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,
+          walletName: this.walletName,
+          internalConnected: this._connected,
+          accountsLength: this._accounts.length,
+          providerConnected
+        });
+        await this.connect();
+      }
+      const normalizedAddress = address.toLowerCase();
+      const normalizedAccounts = this._accounts.map((acc) => acc.toLowerCase());
+      if (!normalizedAccounts.includes(normalizedAddress)) {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Address not in connected accounts, refreshing connection", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          requestedAddress: address,
+          connectedAccounts: this._accounts
+        });
+        const currentAccounts = await this.getAccounts();
+        const normalizedCurrentAccounts = currentAccounts.map((acc) => acc.toLowerCase());
+        if (!normalizedCurrentAccounts.includes(normalizedAddress)) {
+          throw new Error(`Address ${address} is not connected. Connected accounts: ${currentAccounts.join(", ")}`);
+        }
+        this._accounts = currentAccounts;
+      }
+      if (typeof this.provider.signPersonalMessage === "function") {
+        const result2 = await this.provider.signPersonalMessage(message, address);
+        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signPersonalMessage success", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          signatureLength: result2.length
+        });
+        return result2;
+      }
+      const result = await this.request({
+        method: "personal_sign",
+        params: [message, address]
+      });
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signPersonalMessage success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signatureLength: result.length
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signPersonalMessage failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error),
+        errorCode: error?.code
+      });
+      throw error;
+    }
   }
-  setLevel(level) {
-    this.level = level;
+  async signTypedData(typedData, address) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTypedData", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      primaryType: typedData?.primaryType,
+      address
+    });
+    try {
+      if (typeof this.provider.signTypedData === "function") {
+        const result2 = await this.provider.signTypedData(typedData, address);
+        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTypedData success", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          signatureLength: result2.length
+        });
+        return result2;
+      }
+      const result = await this.request({
+        method: "eth_signTypedData_v4",
+        params: [address, typedData]
+      });
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTypedData success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signatureLength: result.length
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTypedData failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
-  enable() {
-    this.enabled = true;
+  async signTransaction(transaction) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTransaction", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      from: transaction.from,
+      to: transaction.to
+    });
+    try {
+      if (typeof this.provider.signTransaction === "function") {
+        const result2 = await this.provider.signTransaction(transaction);
+        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTransaction success", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          signatureLength: result2.length
+        });
+        return result2;
+      }
+      const result = await this.request({
+        method: "eth_signTransaction",
+        params: [transaction]
+      });
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTransaction success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        signatureLength: result.length
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum signTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
-  disable() {
-    this.enabled = false;
+  async sendTransaction(transaction) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum sendTransaction", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      from: transaction.from,
+      to: transaction.to,
+      value: transaction.value
+    });
+    try {
+      if (typeof this.provider.sendTransaction === "function") {
+        const result2 = await this.provider.sendTransaction(transaction);
+        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum sendTransaction success", {
+          walletId: this.walletId,
+          walletName: this.walletName,
+          txHash: result2
+        });
+        return result2;
+      }
+      const result = await this.request({
+        method: "eth_sendTransaction",
+        params: [transaction]
+      });
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum sendTransaction success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        txHash: result
+      });
+      return result;
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum sendTransaction failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
-  writeLog(level, category, message, data) {
-    if (!this.enabled || level > this.level) {
-      return;
+  async switchChain(chainId) {
+    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum switchChain", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      chainId
+    });
+    try {
+      const hexChainId = typeof chainId === "string" ? chainId.toLowerCase().startsWith("0x") ? chainId : `0x${parseInt(chainId, 10).toString(16)}` : `0x${chainId.toString(16)}`;
+      if (typeof this.provider.switchChain === "function") {
+        await this.provider.switchChain(hexChainId);
+      } else {
+        await this.request({ method: "wallet_switchEthereumChain", params: [{ chainId: hexChainId }] });
+      }
+      this._chainId = hexChainId;
+      this.eventEmitter.emit("chainChanged", this._chainId);
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum switchChain success", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        chainId: hexChainId
+      });
+    } catch (error) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum switchChain failed", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
     }
-    const debugMessage = {
-      timestamp: Date.now(),
-      level,
-      category,
-      message,
-      data
-    };
-    if (this.callback) {
-      this.callback(debugMessage);
+  }
+  async getChainId() {
+    if (typeof this.provider.getChainId === "function") {
+      const chainId2 = await this.provider.getChainId();
+      this._chainId = `0x${chainId2.toString(16)}`;
+      return chainId2;
     }
+    const chainId = await this.request({ method: "eth_chainId" });
+    const parsed = parseInt(chainId, 16);
+    this._chainId = chainId;
+    return parsed;
   }
-  error(category, message, data) {
-    this.writeLog(0 /* ERROR */, category, message, data);
+  async getAccounts() {
+    if (typeof this.provider.getAccounts === "function") {
+      const accounts2 = await this.provider.getAccounts();
+      this._accounts = accounts2;
+      return accounts2;
+    }
+    const accounts = await this.request({ method: "eth_accounts" });
+    this._accounts = accounts;
+    return accounts;
   }
-  warn(category, message, data) {
-    this.writeLog(1 /* WARN */, category, message, data);
+  isConnected() {
+    return this._connected;
   }
-  info(category, message, data) {
-    this.writeLog(2 /* INFO */, category, message, data);
+  setupEventListeners() {
+    if (typeof this.provider.on === "function") {
+      this.provider.on("connect", (info) => {
+        this._connected = true;
+        this._chainId = info.chainId;
+        this.eventEmitter.emit("connect", info);
+      });
+      this.provider.on("disconnect", (error) => {
+        this._connected = false;
+        this._accounts = [];
+        this.eventEmitter.emit("disconnect", error);
+        this.eventEmitter.emit("accountsChanged", []);
+      });
+      this.provider.on("accountsChanged", (accounts) => {
+        this._accounts = accounts;
+        this.eventEmitter.emit("accountsChanged", accounts);
+      });
+      this.provider.on("chainChanged", (chainId) => {
+        this._chainId = chainId;
+        this.eventEmitter.emit("chainChanged", chainId);
+      });
+    }
   }
-  debug(category, message, data) {
-    this.writeLog(3 /* DEBUG */, category, message, data);
+  on(event, listener) {
+    this.eventEmitter.on(event, listener);
   }
-  log(category, message, data) {
-    this.writeLog(3 /* DEBUG */, category, message, data);
+  off(event, listener) {
+    this.eventEmitter.off(event, listener);
   }
 };
-var debug = Debug.getInstance();
-var DebugCategory = {
-  BROWSER_SDK: "BrowserSDK",
-  PROVIDER_MANAGER: "ProviderManager",
-  EMBEDDED_PROVIDER: "EmbeddedProvider",
-  INJECTED_PROVIDER: "InjectedProvider",
-  PHANTOM_CONNECT_AUTH: "PhantomConnectAuth",
-  JWT_AUTH: "JWTAuth",
-  STORAGE: "Storage",
-  SESSION: "Session"
-};
 
 // src/providers/injected/chains/SolanaChain.ts
-import { EventEmitter } from "eventemitter3";
-import { AddressType as AddressType2 } from "@phantom/client";
-import { Buffer } from "buffer";
-var InjectedSolanaChain = class {
-  constructor(phantom, callbacks) {
-    this._connected = false;
+import { EventEmitter as EventEmitter3 } from "eventemitter3";
+import { Buffer as Buffer3 } from "buffer";
+var PhantomSolanaChain = class {
+  constructor(phantom) {
     this._publicKey = null;
-    this.eventEmitter = new EventEmitter();
+    this.eventEmitter = new EventEmitter3();
     this.phantom = phantom;
-    this.callbacks = callbacks;
     this.setupEventListeners();
-    this.syncInitialState();
   }
   // Wallet adapter compliant properties
   get connected() {
-    return this._connected;
+    return this._publicKey !== null;
   }
   get publicKey() {
     return this._publicKey;
   }
-  // Connection methods - delegate to provider
-  connect(_options) {
-    if (!this.callbacks.isConnected()) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
-    }
-    const addresses = this.callbacks.getAddresses();
-    const solanaAddress = addresses.find((addr) => addr.addressType === AddressType2.solana);
-    if (!solanaAddress) {
-      return Promise.reject(new Error("Solana not enabled for this provider"));
+  // Connection methods
+  async connect(options) {
+    const result = await this.phantom.solana.connect(options);
+    if (!result) {
+      throw new Error("Failed to connect to Solana wallet");
     }
-    this.updateConnectionState(true, solanaAddress.address);
-    return Promise.resolve({ publicKey: solanaAddress.address });
+    const publicKey = typeof result === "string" ? result : "";
+    this._publicKey = publicKey;
+    return { publicKey };
   }
   async disconnect() {
-    await this.callbacks.disconnect();
+    await this.phantom.solana.disconnect();
+    this._publicKey = null;
   }
   // Standard wallet adapter methods
   async signMessage(message) {
     const messageBytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
     const result = await this.phantom.solana.signMessage(messageBytes);
     return {
-      signature: result.signature instanceof Uint8Array ? result.signature : new Uint8Array(Buffer.from(result.signature, "base64")),
+      signature: result.signature instanceof Uint8Array ? result.signature : new Uint8Array(Buffer3.from(result.signature, "base64")),
       publicKey: this._publicKey || ""
     };
   }
   async signTransaction(transaction) {
-    if (!this.callbacks.isConnected()) {
+    if (!this.connected) {
       return Promise.reject(new Error("Provider not connected. Call provider connect first."));
     }
     try {
@@ -146,7 +1433,7 @@ var InjectedSolanaChain = class {
     return { signature: result.signature };
   }
   async signAllTransactions(transactions) {
-    if (!this.callbacks.isConnected()) {
+    if (!this.connected) {
       return Promise.reject(new Error("Provider not connected. Call provider connect first."));
     }
     try {
@@ -157,7 +1444,7 @@ var InjectedSolanaChain = class {
     }
   }
   async signAndSendAllTransactions(transactions) {
-    if (!this.callbacks.isConnected()) {
+    if (!this.connected) {
       return Promise.reject(new Error("Provider not connected. Call provider connect first."));
     }
     try {
@@ -175,42 +1462,21 @@ var InjectedSolanaChain = class {
     return Promise.resolve(this._publicKey);
   }
   isConnected() {
-    return this._connected && this.callbacks.isConnected();
+    return this.connected;
   }
   setupEventListeners() {
     this.phantom.solana.addEventListener("connect", (publicKey) => {
-      this.updateConnectionState(true, publicKey);
+      this._publicKey = publicKey;
       this.eventEmitter.emit("connect", publicKey);
     });
     this.phantom.solana.addEventListener("disconnect", () => {
-      this.updateConnectionState(false, null);
+      this._publicKey = null;
       this.eventEmitter.emit("disconnect");
     });
     this.phantom.solana.addEventListener("accountChanged", (publicKey) => {
       this._publicKey = publicKey;
       this.eventEmitter.emit("accountChanged", publicKey);
     });
-    this.callbacks.on("connect", (data) => {
-      const solanaAddress = data.addresses?.find((addr) => addr.addressType === AddressType2.solana);
-      if (solanaAddress) {
-        this.updateConnectionState(true, solanaAddress.address);
-      }
-    });
-    this.callbacks.on("disconnect", () => {
-      this.updateConnectionState(false, null);
-    });
-  }
-  syncInitialState() {
-    if (this.callbacks.isConnected()) {
-      const solanaAddress = this.callbacks.getAddresses().find((addr) => addr.addressType === AddressType2.solana);
-      if (solanaAddress) {
-        this.updateConnectionState(true, solanaAddress.address);
-      }
-    }
-  }
-  updateConnectionState(connected, publicKey) {
-    this._connected = connected;
-    this._publicKey = publicKey;
   }
   // Event methods for interface compliance
   on(event, listener) {
@@ -222,22 +1488,18 @@ var InjectedSolanaChain = class {
 };
 
 // src/providers/injected/chains/EthereumChain.ts
-import { EventEmitter as EventEmitter2 } from "eventemitter3";
-import { AddressType as AddressType3 } from "@phantom/client";
-var InjectedEthereumChain = class {
-  constructor(phantom, callbacks) {
-    this._connected = false;
+import { EventEmitter as EventEmitter4 } from "eventemitter3";
+var PhantomEthereumChain = class {
+  constructor(phantom) {
     this._chainId = "0x1";
     this._accounts = [];
-    this.eventEmitter = new EventEmitter2();
+    this.eventEmitter = new EventEmitter4();
     this.phantom = phantom;
-    this.callbacks = callbacks;
     this.setupEventListeners();
-    this.syncInitialState();
   }
   // EIP-1193 compliant properties
   get connected() {
-    return this._connected;
+    return this._accounts.length > 0;
   }
   get chainId() {
     return this._chainId;
@@ -252,21 +1514,18 @@ var InjectedEthereumChain = class {
       const result = await this.signTransaction(transaction);
       return result;
     }
-    const provider = await this.phantom.ethereum.getProvider();
-    return await provider.request(args);
+    const phantomProvider = await this.phantom.ethereum.getProvider();
+    return await phantomProvider.request(args);
   }
-  // Connection methods - delegate to provider
-  connect() {
-    if (!this.callbacks.isConnected()) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
-    }
-    const addresses = this.callbacks.getAddresses();
-    const ethAddresses = addresses.filter((addr) => addr.addressType === AddressType3.ethereum).map((addr) => addr.address);
-    this.updateConnectionState(true, ethAddresses);
-    return Promise.resolve(ethAddresses);
+  // Connection methods
+  async connect() {
+    const accounts = await this.phantom.ethereum.getAccounts();
+    this._accounts = accounts;
+    return accounts;
   }
   async disconnect() {
-    await this.callbacks.disconnect();
+    await this.phantom.ethereum.disconnect();
+    this._accounts = [];
   }
   // Standard compliant methods (return raw values, not wrapped objects)
   async signPersonalMessage(message, address) {
@@ -295,16 +1554,16 @@ var InjectedEthereumChain = class {
     return await this.phantom.ethereum.getAccounts();
   }
   isConnected() {
-    return this._connected && this.callbacks.isConnected();
+    return this.connected;
   }
   setupEventListeners() {
     this.phantom.ethereum.addEventListener("connect", (accounts) => {
-      this.updateConnectionState(true, accounts);
+      this._accounts = accounts;
       this.eventEmitter.emit("connect", { chainId: this._chainId });
       this.eventEmitter.emit("accountsChanged", accounts);
     });
     this.phantom.ethereum.addEventListener("disconnect", () => {
-      this.updateConnectionState(false, []);
+      this._accounts = [];
       this.eventEmitter.emit("disconnect", { code: 4900, message: "Provider disconnected" });
       this.eventEmitter.emit("accountsChanged", []);
     });
@@ -316,27 +1575,6 @@ var InjectedEthereumChain = class {
       this._chainId = chainId;
       this.eventEmitter.emit("chainChanged", chainId);
     });
-    this.callbacks.on("connect", (data) => {
-      const ethAddresses = data.addresses?.filter((addr) => addr.addressType === AddressType3.ethereum)?.map((addr) => addr.address) || [];
-      if (ethAddresses.length > 0) {
-        this.updateConnectionState(true, ethAddresses);
-      }
-    });
-    this.callbacks.on("disconnect", () => {
-      this.updateConnectionState(false, []);
-    });
-  }
-  syncInitialState() {
-    if (this.callbacks.isConnected()) {
-      const ethAddresses = this.callbacks.getAddresses().filter((addr) => addr.addressType === AddressType3.ethereum).map((addr) => addr.address);
-      if (ethAddresses.length > 0) {
-        this.updateConnectionState(true, ethAddresses);
-      }
-    }
-  }
-  updateConnectionState(connected, accounts) {
-    this._connected = connected;
-    this._accounts = accounts;
   }
   // Event methods for interface compliance
   on(event, listener) {
@@ -347,64 +1585,401 @@ var InjectedEthereumChain = class {
   }
 };
 
+// src/wallets/registry.ts
+function isPhantomWallet(wallet) {
+  return wallet !== void 0 && wallet.id === "phantom" && "isPhantom" in wallet && wallet.isPhantom === true;
+}
+var InjectedWalletRegistry = class {
+  constructor() {
+    this.wallets = /* @__PURE__ */ new Map();
+    this.discoveryPromise = null;
+  }
+  register(info) {
+    const wrappedProviders = {};
+    if (info.providers?.solana) {
+      const isWalletStandard = info.providers.solana && typeof info.providers.solana === "object" && "features" in info.providers.solana && typeof info.providers.solana.features === "object";
+      if (isWalletStandard) {
+        wrappedProviders.solana = new WalletStandardSolanaAdapter(info.providers.solana, info.id, info.name);
+        debug.log(DebugCategory.BROWSER_SDK, "Wrapped Wallet Standard Solana wallet with adapter", {
+          walletId: info.id,
+          walletName: info.name
+        });
+      } else {
+        wrappedProviders.solana = new InjectedWalletSolanaChain(info.providers.solana, info.id, info.name);
+        debug.log(DebugCategory.BROWSER_SDK, "Wrapped Solana provider with InjectedWalletSolanaChain", {
+          walletId: info.id,
+          walletName: info.name
+        });
+      }
+    }
+    if (info.providers?.ethereum) {
+      wrappedProviders.ethereum = new InjectedWalletEthereumChain(info.providers.ethereum, info.id, info.name);
+      debug.log(DebugCategory.BROWSER_SDK, "Wrapped Ethereum provider with InjectedWalletEthereumChain", {
+        walletId: info.id,
+        walletName: info.name
+      });
+    }
+    const wrappedInfo = {
+      ...info,
+      providers: Object.keys(wrappedProviders).length > 0 ? wrappedProviders : info.providers
+    };
+    this.wallets.set(info.id, wrappedInfo);
+  }
+  /**
+   * Register Phantom wallet with its instance
+   * This creates wrapped providers and stores the Phantom instance for auto-confirm access
+   */
+  registerPhantom(phantomInstance, addressTypes) {
+    const wrappedProviders = {};
+    if (addressTypes.includes(AddressType.solana) && phantomInstance.solana) {
+      wrappedProviders.solana = new PhantomSolanaChain(phantomInstance);
+      debug.log(DebugCategory.BROWSER_SDK, "Created PhantomSolanaChain wrapper", {
+        walletId: "phantom"
+      });
+    }
+    if (addressTypes.includes(AddressType.ethereum) && phantomInstance.ethereum) {
+      wrappedProviders.ethereum = new PhantomEthereumChain(phantomInstance);
+      debug.log(DebugCategory.BROWSER_SDK, "Created PhantomEthereumChain wrapper", {
+        walletId: "phantom"
+      });
+    }
+    const phantomWallet = {
+      id: "phantom",
+      name: "Phantom",
+      icon: "",
+      // Icon will be rendered from icons package in UI components
+      addressTypes,
+      providers: wrappedProviders,
+      isPhantom: true,
+      phantomInstance
+    };
+    this.wallets.set("phantom", phantomWallet);
+    debug.log(DebugCategory.BROWSER_SDK, "Registered Phantom wallet with chain wrappers", {
+      addressTypes,
+      hasSolana: !!wrappedProviders.solana,
+      hasEthereum: !!wrappedProviders.ethereum
+    });
+  }
+  unregister(id) {
+    this.wallets.delete(id);
+  }
+  has(id) {
+    return this.wallets.has(id);
+  }
+  getById(id) {
+    return this.wallets.get(id);
+  }
+  getAll() {
+    return Array.from(this.wallets.values());
+  }
+  getByAddressTypes(addressTypes) {
+    if (addressTypes.length === 0) {
+      return this.getAll();
+    }
+    const allowed = new Set(addressTypes);
+    return this.getAll().filter((wallet) => wallet.addressTypes.some((t) => allowed.has(t)));
+  }
+  discover(addressTypes) {
+    if (this.discoveryPromise) {
+      return this.discoveryPromise;
+    }
+    debug.log(DebugCategory.BROWSER_SDK, "Starting wallet discovery", { addressTypes });
+    this.discoveryPromise = discoverWallets(addressTypes).then((discoveredWallets) => {
+      const relevantWallets = addressTypes ? discoveredWallets.filter((wallet) => wallet.addressTypes.some((type) => addressTypes.includes(type))) : discoveredWallets;
+      for (const wallet of relevantWallets) {
+        if (wallet.id === "phantom" && isPhantomWallet(wallet)) {
+          this.registerPhantom(wallet.phantomInstance, wallet.addressTypes);
+        } else {
+          this.register(wallet);
+        }
+        debug.log(DebugCategory.BROWSER_SDK, "Registered discovered wallet", {
+          id: wallet.id,
+          name: wallet.name,
+          addressTypes: wallet.addressTypes
+        });
+      }
+      debug.info(DebugCategory.BROWSER_SDK, "Wallet discovery completed", {
+        totalDiscovered: discoveredWallets.length,
+        relevantWallets: relevantWallets.length
+      });
+    }).catch((error) => {
+      debug.warn(DebugCategory.BROWSER_SDK, "Wallet discovery failed", { error });
+      this.discoveryPromise = null;
+      throw error;
+    });
+    return this.discoveryPromise;
+  }
+};
+var walletRegistry = null;
+function getWalletRegistry() {
+  if (!walletRegistry) {
+    walletRegistry = new InjectedWalletRegistry();
+  }
+  return walletRegistry;
+}
+
 // src/providers/injected/index.ts
 var WAS_CONNECTED_KEY = "phantom-injected-was-connected";
 var WAS_CONNECTED_VALUE = "true";
+var LAST_WALLET_ID_KEY = "phantom-injected-last-wallet-id";
 var InjectedProvider = class {
+  // Track which wallets have event listeners set up
   constructor(config) {
-    this.connected = false;
-    this.addresses = [];
+    this.selectedWalletId = null;
+    this.walletStates = /* @__PURE__ */ new Map();
     // Event management
     this.eventListeners = /* @__PURE__ */ new Map();
     this.browserInjectedCleanupFunctions = [];
     this.eventsInitialized = false;
+    this.externalWalletEventListenersSetup = /* @__PURE__ */ new Set();
     debug.log(DebugCategory.INJECTED_PROVIDER, "Initializing InjectedProvider", { config });
     this.addressTypes = config.addressTypes;
+    this.walletRegistry = getWalletRegistry();
     debug.log(DebugCategory.INJECTED_PROVIDER, "Address types configured", { addressTypes: this.addressTypes });
-    const plugins = [createExtensionPlugin()];
-    if (this.addressTypes.includes(AddressType4.solana)) {
-      plugins.push(createSolanaPlugin());
-      debug.log(DebugCategory.INJECTED_PROVIDER, "Solana plugin added");
-    }
-    if (this.addressTypes.includes(AddressType4.ethereum)) {
-      plugins.push(createEthereumPlugin());
-      debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum plugin added");
-    }
-    plugins.push(createAutoConfirmPlugin());
-    debug.log(DebugCategory.INJECTED_PROVIDER, "AutoConfirm plugin added");
-    debug.log(DebugCategory.INJECTED_PROVIDER, "Creating Phantom instance with plugins", {
-      pluginCount: plugins.length
+    this.walletRegistry.discover(this.addressTypes).catch((error) => {
+      debug.warn(DebugCategory.INJECTED_PROVIDER, "Wallet discovery failed during initialization", { error });
     });
-    this.phantom = createPhantom({ plugins });
-    const callbacks = this.createCallbacks();
-    if (this.addressTypes.includes(AddressType4.solana)) {
-      this._solanaChain = new InjectedSolanaChain(this.phantom, callbacks);
+    debug.info(DebugCategory.INJECTED_PROVIDER, "InjectedProvider initialized");
+  }
+  /**
+   * Wait for wallet discovery to complete if the wallet is not yet in the registry
+   * This is needed for auto-connect when the last wallet was an external wallet
+   */
+  async waitForWalletDiscovery(walletId) {
+    if (this.walletRegistry.has(walletId)) {
+      return;
     }
-    if (this.addressTypes.includes(AddressType4.ethereum)) {
-      this._ethereumChain = new InjectedEthereumChain(this.phantom, callbacks);
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Wallet not found in registry, waiting for discovery", {
+      walletId
+    });
+    try {
+      await this.walletRegistry.discover(this.addressTypes);
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Wallet discovery completed", { walletId });
+    } catch (error) {
+      debug.warn(DebugCategory.INJECTED_PROVIDER, "Wallet discovery failed", {
+        walletId,
+        error: error instanceof Error ? error.message : String(error)
+      });
     }
-    debug.info(DebugCategory.INJECTED_PROVIDER, "InjectedProvider initialized");
   }
   get solana() {
-    if (!this.addressTypes.includes(AddressType4.solana)) {
+    if (!this.addressTypes.includes(AddressType2.solana)) {
       throw new Error("Solana not enabled for this provider");
     }
-    if (!this._solanaChain) {
-      throw new Error("Solana chain not initialized");
+    const walletId = this.selectedWalletId || "phantom";
+    const walletInfo = this.walletRegistry.getById(walletId);
+    if (!walletInfo) {
+      const registry = this.walletRegistry;
+      if (registry.discoveryPromise) {
+        throw new Error(
+          `Wallet "${walletId}" not found. Wallet discovery is still in progress. Please wait for sdk.discoverWallets() to complete before accessing chain properties.`
+        );
+      }
+      throw new Error(
+        `Wallet "${walletId}" not found. Please ensure wallet discovery has completed. Make sure you call sdk.discoverWallets() and await it before accessing chain properties.`
+      );
+    }
+    if (!walletInfo.providers?.solana) {
+      throw new Error(
+        `Selected wallet "${walletInfo.name}" does not support Solana. This wallet only supports: ${walletInfo.addressTypes.join(", ")}. Make sure your SDK config includes Solana in addressTypes.`
+      );
+    }
+    return walletInfo.providers.solana;
+  }
+  /**
+   * Access to Ethereum chain operations
+   */
+  get ethereum() {
+    if (!this.addressTypes.includes(AddressType2.ethereum)) {
+      throw new Error("Ethereum not enabled for this provider");
+    }
+    const walletId = this.selectedWalletId || "phantom";
+    const walletInfo = this.walletRegistry.getById(walletId);
+    if (!walletInfo) {
+      const registry = this.walletRegistry;
+      if (registry.discoveryPromise) {
+        throw new Error(
+          `Wallet "${walletId}" not found. Wallet discovery is still in progress. Please wait for sdk.discoverWallets() to complete before accessing chain properties.`
+        );
+      }
+      throw new Error(
+        `Wallet "${walletId}" not found. Please ensure wallet discovery has completed. Make sure you call sdk.discoverWallets() and await it before accessing chain properties.`
+      );
+    }
+    if (!walletInfo.providers?.ethereum) {
+      throw new Error(
+        `Selected wallet "${walletInfo.name}" does not support Ethereum. This wallet only supports: ${walletInfo.addressTypes.join(", ")}. Make sure your SDK config includes Ethereum in addressTypes.`
+      );
+    }
+    return walletInfo.providers.ethereum;
+  }
+  validateAndSelectWallet(requestedWalletId) {
+    if (!this.walletRegistry.has(requestedWalletId)) {
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Unknown injected wallet id requested", {
+        walletId: requestedWalletId
+      });
+      throw new Error(`Unknown injected wallet id: ${requestedWalletId}`);
+    }
+    const walletInfo = this.walletRegistry.getById(requestedWalletId);
+    if (!walletInfo || !walletInfo.providers) {
+      debug.warn(DebugCategory.INJECTED_PROVIDER, "Wallet not available for connection", {
+        walletId: requestedWalletId
+      });
+      throw new Error(`Wallet not available for connection: ${requestedWalletId}`);
+    }
+    this.selectedWalletId = requestedWalletId;
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Selected injected wallet for connection", {
+      walletId: requestedWalletId
+    });
+    return walletInfo;
+  }
+  async connectToWallet(walletInfo, options) {
+    if (!walletInfo.providers) {
+      const error = new Error(`Wallet adapter not available for wallet: ${this.selectedWalletId}`);
+      debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet adapter not available", { walletId: this.selectedWalletId });
+      this.emit("connect_error", {
+        error: error.message,
+        source: options?.skipEventListeners ? "auto-connect" : "manual-connect"
+      });
+      throw error;
+    }
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Connecting via wallet", {
+      walletId: this.selectedWalletId,
+      walletName: walletInfo.name,
+      options
+    });
+    if (!options?.skipEventListeners) {
+      this.setupExternalWalletEvents(walletInfo);
+      if (this.selectedWalletId === "phantom" && isPhantomWallet(walletInfo)) {
+        this.browserInjectedCleanupFunctions.forEach((cleanup) => cleanup());
+        this.browserInjectedCleanupFunctions = [];
+        this.setupBrowserInjectedEvents();
+        this.eventsInitialized = true;
+      }
+    }
+    const connectedAddresses = [];
+    if (this.addressTypes.includes(AddressType2.solana) && walletInfo.providers?.solana) {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Solana connection", {
+        walletId: this.selectedWalletId,
+        walletName: walletInfo.name,
+        onlyIfTrusted: options?.onlyIfTrusted
+      });
+      try {
+        const result = await walletInfo.providers.solana.connect(
+          options?.onlyIfTrusted ? { onlyIfTrusted: true } : void 0
+        );
+        const address = result.publicKey;
+        connectedAddresses.push({
+          addressType: AddressType2.solana,
+          address
+        });
+        debug.info(DebugCategory.INJECTED_PROVIDER, "Solana connected successfully", {
+          address,
+          walletId: this.selectedWalletId,
+          walletName: walletInfo.name
+        });
+      } catch (err) {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, stopping", {
+          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) {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Ethereum connection", {
+        walletId: this.selectedWalletId,
+        walletName: walletInfo.name,
+        silent: options?.silent
+      });
+      try {
+        let accounts;
+        if (options?.silent) {
+          accounts = await walletInfo.providers.ethereum.request({ method: "eth_accounts" });
+        } else {
+          accounts = await walletInfo.providers.ethereum.connect();
+        }
+        if (accounts.length > 0) {
+          connectedAddresses.push(
+            ...accounts.map((address) => ({
+              addressType: AddressType2.ethereum,
+              address
+            }))
+          );
+          debug.info(DebugCategory.INJECTED_PROVIDER, "Ethereum connected successfully", {
+            addresses: accounts,
+            walletId: this.selectedWalletId,
+            walletName: walletInfo.name
+          });
+        }
+      } catch (err) {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, stopping", {
+          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 this._solanaChain;
+    return connectedAddresses;
   }
-  /**
-   * Access to Ethereum chain operations
-   */
-  get ethereum() {
-    if (!this.addressTypes.includes(AddressType4.ethereum)) {
-      throw new Error("Ethereum not enabled for this provider");
+  async finalizeConnection(connectedAddresses, authProvider, walletId) {
+    if (connectedAddresses.length === 0) {
+      const error = new Error("Failed to connect to any supported wallet provider");
+      this.emit("connect_error", {
+        error: error.message,
+        source: "manual-connect"
+      });
+      throw error;
     }
-    if (!this._ethereumChain) {
-      throw new Error("Ethereum chain not initialized");
+    if (this.selectedWalletId) {
+      this.setWalletState(this.selectedWalletId, {
+        connected: true,
+        addresses: connectedAddresses
+      });
     }
-    return this._ethereumChain;
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Finalized connection with addresses", {
+      addressCount: connectedAddresses.length,
+      addresses: connectedAddresses.map((addr) => ({
+        type: addr.addressType,
+        address: addr.address.substring(0, 10) + "..."
+      }))
+    });
+    const authUserId = await this.getAuthUserId("manual-connect");
+    try {
+      localStorage.setItem(WAS_CONNECTED_KEY, WAS_CONNECTED_VALUE);
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Set was-connected flag - auto-reconnect enabled");
+      if (this.selectedWalletId) {
+        localStorage.setItem(LAST_WALLET_ID_KEY, this.selectedWalletId);
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Stored last injected wallet id", {
+          walletId: this.selectedWalletId
+        });
+      }
+    } catch (error) {
+      debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to persist injected provider state", { error });
+    }
+    const result = {
+      addresses: connectedAddresses,
+      status: "completed",
+      authUserId,
+      authProvider,
+      walletId
+    };
+    this.emit("connect", {
+      addresses: connectedAddresses,
+      source: "manual-connect",
+      authUserId
+    });
+    return result;
   }
   async connect(authOptions) {
     debug.info(DebugCategory.INJECTED_PROVIDER, "Starting injected provider connect", {
@@ -419,110 +1994,48 @@ var InjectedProvider = class {
       providerType: "injected"
     });
     try {
-      if (!this.phantom.extension?.isInstalled?.()) {
-        debug.error(DebugCategory.INJECTED_PROVIDER, "Phantom wallet extension not found");
-        const error = new Error("Phantom wallet not found");
-        this.emit("connect_error", {
-          error: error.message,
-          source: "manual-connect"
-        });
-        throw error;
-      }
-      debug.log(DebugCategory.INJECTED_PROVIDER, "Phantom extension detected");
-      const connectedAddresses = [];
-      if (this.addressTypes.includes(AddressType4.solana)) {
-        debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Solana connection");
+      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);
+    } catch (error) {
+      this.emit("connect_error", {
+        error: error instanceof Error ? error.message : "Failed to connect",
+        source: "manual-connect"
+      });
+      throw error;
+    }
+  }
+  async disconnect() {
+    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) {
         try {
-          const publicKey = await this.phantom.solana.connect();
-          if (publicKey) {
-            connectedAddresses.push({
-              addressType: AddressType4.solana,
-              address: publicKey
-            });
-            debug.info(DebugCategory.INJECTED_PROVIDER, "Solana connected successfully", { address: publicKey });
-          }
+          await walletInfo.providers.solana.disconnect();
+          debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnected successfully");
         } catch (err) {
-          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, stopping", { error: err });
-          this.emit("connect_error", {
-            error: err instanceof Error ? err.message : "Failed to connect",
-            source: "manual-connect"
-          });
-          throw err;
+          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to disconnect Solana", { error: err });
         }
       }
-      if (this.addressTypes.includes(AddressType4.ethereum)) {
+      if (this.addressTypes.includes(AddressType2.ethereum) && walletInfo.providers.ethereum) {
         try {
-          const accounts = await this.phantom.ethereum.connect();
-          if (accounts && accounts.length > 0) {
-            connectedAddresses.push(
-              ...accounts.map((address) => ({
-                addressType: AddressType4.ethereum,
-                address
-              }))
-            );
-            debug.info(DebugCategory.INJECTED_PROVIDER, "Ethereum connected successfully", { addresses: accounts });
-          }
+          await walletInfo.providers.ethereum.disconnect();
+          debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnected successfully");
         } catch (err) {
-          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, stopping", { error: err });
-          this.emit("connect_error", {
-            error: err instanceof Error ? err.message : "Failed to connect",
-            source: "manual-connect"
-          });
-          throw err;
+          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to disconnect Ethereum", { error: err });
         }
       }
-      if (connectedAddresses.length === 0) {
-        const error = new Error("Failed to connect to any supported wallet provider");
-        this.emit("connect_error", {
-          error: error.message,
-          source: "manual-connect"
-        });
-        throw error;
-      }
-      this.addresses = connectedAddresses;
-      this.connected = true;
-      const authUserId = await this.getAuthUserId("manual-connect");
-      try {
-        localStorage.setItem(WAS_CONNECTED_KEY, WAS_CONNECTED_VALUE);
-        debug.log(DebugCategory.INJECTED_PROVIDER, "Set was-connected flag - auto-reconnect enabled");
-      } catch (error) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to set was-connected flag", { error });
-      }
-      const result = {
-        addresses: this.addresses,
-        status: "completed",
-        authUserId
-      };
-      this.emit("connect", {
-        addresses: this.addresses,
-        source: "manual-connect",
-        authUserId
-      });
-      return result;
-    } catch (error) {
-      if (error instanceof Error && !error.message.includes("Phantom wallet not found") && !error.message.includes("Failed to connect to any supported wallet provider")) {
-        this.emit("connect_error", {
-          error: error.message,
-          source: "manual-connect"
-        });
-      }
-      throw error;
-    }
-  }
-  async disconnect() {
-    debug.info(DebugCategory.INJECTED_PROVIDER, "Starting injected provider disconnect");
-    if (this.addressTypes.includes(AddressType4.solana)) {
-      try {
-        await this.phantom.solana.disconnect();
-        debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnected successfully");
-      } catch (err) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to disconnect Solana", { error: err });
-      }
     }
     this.browserInjectedCleanupFunctions.forEach((cleanup) => cleanup());
     this.browserInjectedCleanupFunctions = [];
-    this.connected = false;
-    this.addresses = [];
+    if (this.selectedWalletId) {
+      this.externalWalletEventListenersSetup.delete(this.selectedWalletId);
+      this.setWalletState(this.selectedWalletId, {
+        connected: false,
+        addresses: []
+      });
+    }
     try {
       localStorage.removeItem(WAS_CONNECTED_KEY);
       debug.log(DebugCategory.INJECTED_PROVIDER, "Cleared was connected flag to prevent auto-reconnect");
@@ -541,13 +2054,17 @@ var InjectedProvider = class {
    */
   async autoConnect() {
     debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting auto-connect");
+    let lastWalletId = null;
     try {
       const wasConnected = localStorage.getItem(WAS_CONNECTED_KEY);
       if (wasConnected !== WAS_CONNECTED_VALUE) {
         debug.log(DebugCategory.INJECTED_PROVIDER, "Skipping auto-connect: user was not previously connected");
         return;
       }
-      debug.log(DebugCategory.INJECTED_PROVIDER, "User was previously connected, attempting auto-connect");
+      lastWalletId = localStorage.getItem(LAST_WALLET_ID_KEY);
+      debug.log(DebugCategory.INJECTED_PROVIDER, "User was previously connected, attempting auto-connect", {
+        lastWalletId: lastWalletId || "phantom"
+      });
     } catch (error) {
       debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to check was-connected flag", { error });
       return;
@@ -557,53 +2074,22 @@ var InjectedProvider = class {
       providerType: "injected"
     });
     try {
-      if (!this.phantom.extension?.isInstalled?.()) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Phantom wallet extension not found for auto-connect");
-        this.emit("connect_error", {
-          error: "Phantom wallet not found",
-          source: "auto-connect"
+      const walletId = lastWalletId || "phantom";
+      await this.waitForWalletDiscovery(walletId);
+      const walletInfo = this.validateAndSelectWallet(walletId);
+      let connectedAddresses = [];
+      try {
+        connectedAddresses = await this.connectToWallet(walletInfo, {
+          onlyIfTrusted: true,
+          silent: true,
+          skipEventListeners: true
+          // Set up listeners only if connection succeeds
+        });
+      } catch (err) {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Auto-connect failed (expected if not trusted)", {
+          error: err,
+          walletId: this.selectedWalletId
         });
-        return;
-      }
-      const connectedAddresses = [];
-      if (this.addressTypes.includes(AddressType4.solana)) {
-        debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Solana auto-connect");
-        try {
-          const publicKey = await this.phantom.solana.connect({ onlyIfTrusted: true });
-          if (publicKey) {
-            connectedAddresses.push({
-              addressType: AddressType4.solana,
-              address: publicKey
-            });
-            debug.info(DebugCategory.INJECTED_PROVIDER, "Solana auto-connected successfully", { address: publicKey });
-          }
-        } catch (err) {
-          debug.log(DebugCategory.INJECTED_PROVIDER, "Solana auto-connect failed (expected if not trusted)", {
-            error: err
-          });
-          throw err;
-        }
-      }
-      if (this.addressTypes.includes(AddressType4.ethereum)) {
-        debug.log(DebugCategory.INJECTED_PROVIDER, "Attempting Ethereum auto-connect");
-        try {
-          const accounts = await this.phantom.ethereum.connect({ onlyIfTrusted: true });
-          if (accounts && accounts.length > 0) {
-            connectedAddresses.push(
-              ...accounts.map((address) => ({
-                addressType: AddressType4.ethereum,
-                address
-              }))
-            );
-            debug.info(DebugCategory.INJECTED_PROVIDER, "Ethereum auto-connected successfully", {
-              addresses: accounts
-            });
-          }
-        } catch (err) {
-          debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum auto-connect failed (expected if not trusted)", {
-            error: err
-          });
-        }
       }
       if (connectedAddresses.length === 0) {
         debug.log(DebugCategory.INJECTED_PROVIDER, "Auto-connect failed: no trusted connections available");
@@ -613,11 +2099,22 @@ var InjectedProvider = class {
         });
         return;
       }
-      this.addresses = connectedAddresses;
-      this.connected = true;
+      this.setupExternalWalletEvents(walletInfo);
+      if (this.selectedWalletId === "phantom" && isPhantomWallet(walletInfo)) {
+        this.browserInjectedCleanupFunctions.forEach((cleanup) => cleanup());
+        this.browserInjectedCleanupFunctions = [];
+        this.setupBrowserInjectedEvents();
+        this.eventsInitialized = true;
+      }
+      if (this.selectedWalletId) {
+        this.setWalletState(this.selectedWalletId, {
+          connected: true,
+          addresses: connectedAddresses
+        });
+      }
       const authUserId = await this.getAuthUserId("auto-connect");
       this.emit("connect", {
-        addresses: this.addresses,
+        addresses: connectedAddresses,
         source: "auto-connect",
         authUserId
       });
@@ -627,6 +2124,7 @@ var InjectedProvider = class {
           type: addr.addressType,
           address: addr.address.substring(0, 8) + "..."
         })),
+        walletId: this.selectedWalletId,
         authUserId
       });
     } catch (error) {
@@ -639,34 +2137,80 @@ var InjectedProvider = class {
       });
     }
   }
+  getWalletState(walletId) {
+    if (!this.walletStates.has(walletId)) {
+      this.walletStates.set(walletId, { connected: false, addresses: [] });
+    }
+    return this.walletStates.get(walletId);
+  }
+  setWalletState(walletId, state) {
+    this.walletStates.set(walletId, state);
+  }
   getAddresses() {
-    return this.addresses;
+    const walletId = this.selectedWalletId || "phantom";
+    return this.getWalletState(walletId).addresses;
+  }
+  /**
+   * Get enabled address types for the current selected wallet
+   * - For Phantom: returns config.addressTypes
+   * - For external wallets: returns the wallet's addressTypes from registry
+   */
+  getEnabledAddressTypes() {
+    if (!this.selectedWalletId || this.selectedWalletId === "phantom") {
+      return this.addressTypes;
+    }
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId);
+    if (walletInfo) {
+      return walletInfo.addressTypes;
+    }
+    return this.addressTypes;
   }
   isConnected() {
-    return this.connected;
+    const walletId = this.selectedWalletId || "phantom";
+    return this.getWalletState(walletId).connected;
   }
-  // AutoConfirm methods - only available for injected providers
+  // AutoConfirm methods - only available for Phantom wallet
   async enableAutoConfirm(params) {
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      throw new Error("Auto-confirm is only available for Phantom wallet");
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Enabling autoConfirm", { params });
-    return await this.phantom.autoConfirm.autoConfirmEnable(params);
+    return await walletInfo.phantomInstance.autoConfirm.autoConfirmEnable(params);
   }
   async disableAutoConfirm() {
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      throw new Error("Auto-confirm is only available for Phantom wallet");
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Disabling autoConfirm");
-    await this.phantom.autoConfirm.autoConfirmDisable();
+    await walletInfo.phantomInstance.autoConfirm.autoConfirmDisable();
   }
   async getAutoConfirmStatus() {
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      throw new Error("Auto-confirm is only available for Phantom wallet");
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Getting autoConfirm status");
-    return await this.phantom.autoConfirm.autoConfirmStatus();
+    return await walletInfo.phantomInstance.autoConfirm.autoConfirmStatus();
   }
   async getSupportedAutoConfirmChains() {
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      throw new Error("Auto-confirm is only available for Phantom wallet");
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Getting supported autoConfirm chains");
-    return await this.phantom.autoConfirm.autoConfirmSupportedChains();
+    return await walletInfo.phantomInstance.autoConfirm.autoConfirmSupportedChains();
   }
   /**
    * Helper method to get authUserId from window.phantom.app.getUser()
-   * Returns undefined if the method is not available or fails
+   * Returns undefined if the method is not available or fails, or if wallet is not Phantom
    */
   async getAuthUserId(context) {
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      return void 0;
+    }
     try {
       if (window.phantom?.app?.getUser) {
         const userInfo = await window.phantom.app.getUser();
@@ -730,140 +2274,245 @@ var InjectedProvider = class {
     }
   }
   setupBrowserInjectedEvents() {
-    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up browser-injected-sdk event listeners");
-    if (this.addressTypes.includes(AddressType4.solana)) {
-      this.setupSolanaEvents();
+    const walletInfo = this.walletRegistry.getById(this.selectedWalletId || "phantom");
+    if (!isPhantomWallet(walletInfo)) {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Skipping browser-injected-sdk event setup - not Phantom wallet");
+      return;
     }
-    if (this.addressTypes.includes(AddressType4.ethereum)) {
-      this.setupEthereumEvents();
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up browser-injected-sdk event listeners");
+    if (this.selectedWalletId === "phantom" && isPhantomWallet(walletInfo)) {
+      if (this.addressTypes.includes(AddressType2.solana)) {
+        this.setupSolanaEvents(walletInfo.phantomInstance);
+      }
+      if (this.addressTypes.includes(AddressType2.ethereum)) {
+        this.setupEthereumEvents(walletInfo.phantomInstance);
+      }
     }
   }
-  setupSolanaEvents() {
+  setupSolanaEvents(phantom) {
     debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up Solana event listeners");
     const handleSolanaConnect = async (publicKey) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana connect event received", { publicKey });
-      const solanaAddress = { addressType: AddressType4.solana, address: publicKey };
-      if (!this.addresses.find((addr) => addr.addressType === AddressType4.solana)) {
-        this.addresses.push(solanaAddress);
-      }
-      this.connected = true;
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const solanaAddress = { addressType: AddressType2.solana, address: publicKey };
+      const hasSolana = state.addresses.some((addr) => addr.addressType === AddressType2.solana);
+      const newAddresses = hasSolana ? state.addresses.map((addr) => addr.addressType === AddressType2.solana ? solanaAddress : addr) : [...state.addresses, solanaAddress];
+      this.setWalletState(walletId, {
+        connected: true,
+        addresses: newAddresses
+      });
       const authUserId = await this.getAuthUserId("Solana connect event");
       this.emit("connect", {
-        addresses: this.addresses,
+        addresses: newAddresses,
         source: "injected-extension",
         authUserId
       });
     };
     const handleSolanaDisconnect = () => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnect event received");
-      this.addresses = this.addresses.filter((addr) => addr.addressType !== AddressType4.solana);
-      this.connected = false;
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.solana);
+      this.setWalletState(walletId, {
+        connected: filteredAddresses.length > 0,
+        addresses: filteredAddresses
+      });
       this.emit("disconnect", {
         source: "injected-extension"
       });
     };
     const handleSolanaAccountChanged = async (publicKey) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Solana account changed event received", { publicKey });
-      const solanaIndex = this.addresses.findIndex((addr) => addr.addressType === AddressType4.solana);
-      if (solanaIndex >= 0) {
-        this.addresses[solanaIndex] = { addressType: AddressType4.solana, address: publicKey };
-      } else {
-        this.addresses.push({ addressType: AddressType4.solana, address: publicKey });
-      }
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const solanaIndex = state.addresses.findIndex((addr) => addr.addressType === AddressType2.solana);
+      const newAddresses = solanaIndex >= 0 ? state.addresses.map(
+        (addr, idx) => idx === solanaIndex ? { addressType: AddressType2.solana, address: publicKey } : addr
+      ) : [...state.addresses, { addressType: AddressType2.solana, address: publicKey }];
+      this.setWalletState(walletId, {
+        connected: true,
+        addresses: newAddresses
+      });
       const authUserId = await this.getAuthUserId("Solana account changed event");
       this.emit("connect", {
-        addresses: this.addresses,
+        addresses: newAddresses,
         source: "injected-extension-account-change",
         authUserId
       });
     };
-    const cleanupConnect = this.phantom.solana.addEventListener("connect", handleSolanaConnect);
-    const cleanupDisconnect = this.phantom.solana.addEventListener("disconnect", handleSolanaDisconnect);
-    const cleanupAccountChanged = this.phantom.solana.addEventListener("accountChanged", handleSolanaAccountChanged);
+    const cleanupConnect = phantom.solana.addEventListener("connect", handleSolanaConnect);
+    const cleanupDisconnect = phantom.solana.addEventListener("disconnect", handleSolanaDisconnect);
+    const cleanupAccountChanged = phantom.solana.addEventListener("accountChanged", handleSolanaAccountChanged);
     this.browserInjectedCleanupFunctions.push(cleanupConnect, cleanupDisconnect, cleanupAccountChanged);
   }
-  setupEthereumEvents() {
+  setupEthereumEvents(phantom) {
     debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up Ethereum event listeners");
     const handleEthereumConnect = async (accounts) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum connect event received", { accounts });
-      this.addresses = this.addresses.filter((addr) => addr.addressType !== AddressType4.ethereum);
-      if (accounts && accounts.length > 0) {
-        this.addresses.push(
-          ...accounts.map((address) => ({
-            addressType: AddressType4.ethereum,
-            address
-          }))
-        );
-      }
-      this.connected = this.addresses.length > 0;
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const ethAddresses = accounts.map((address) => ({ addressType: AddressType2.ethereum, address }));
+      const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.ethereum);
+      const newAddresses = [...otherAddresses, ...ethAddresses];
+      this.setWalletState(walletId, {
+        connected: true,
+        addresses: newAddresses
+      });
       const authUserId = await this.getAuthUserId("Ethereum connect event");
       this.emit("connect", {
-        addresses: this.addresses,
+        addresses: newAddresses,
         source: "injected-extension",
         authUserId
       });
     };
     const handleEthereumDisconnect = () => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnect event received");
-      this.addresses = this.addresses.filter((addr) => addr.addressType !== AddressType4.ethereum);
-      this.connected = false;
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.ethereum);
+      this.setWalletState(walletId, {
+        connected: filteredAddresses.length > 0,
+        addresses: filteredAddresses
+      });
       this.emit("disconnect", {
         source: "injected-extension"
       });
     };
     const handleEthereumAccountsChanged = async (accounts) => {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum accounts changed event received", { accounts });
-      this.addresses = this.addresses.filter((addr) => addr.addressType !== AddressType4.ethereum);
+      const walletId = this.selectedWalletId || "phantom";
+      const state = this.getWalletState(walletId);
+      const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.ethereum);
       if (accounts && accounts.length > 0) {
-        this.addresses.push(
-          ...accounts.map((address) => ({
-            addressType: AddressType4.ethereum,
-            address
-          }))
-        );
+        const ethAddresses = accounts.map((address) => ({ addressType: AddressType2.ethereum, address }));
+        const newAddresses = [...otherAddresses, ...ethAddresses];
+        this.setWalletState(walletId, {
+          connected: true,
+          addresses: newAddresses
+        });
         const authUserId = await this.getAuthUserId("Ethereum accounts changed event");
         this.emit("connect", {
-          addresses: this.addresses,
+          addresses: newAddresses,
           source: "injected-extension-account-change",
           authUserId
         });
       } else {
-        this.connected = false;
+        this.setWalletState(walletId, {
+          connected: otherAddresses.length > 0,
+          addresses: otherAddresses
+        });
         this.emit("disconnect", {
           source: "injected-extension-account-change"
         });
       }
     };
-    const cleanupConnect = this.phantom.ethereum.addEventListener("connect", handleEthereumConnect);
-    const cleanupDisconnect = this.phantom.ethereum.addEventListener("disconnect", handleEthereumDisconnect);
-    const cleanupAccountsChanged = this.phantom.ethereum.addEventListener(
-      "accountsChanged",
-      handleEthereumAccountsChanged
-    );
+    const cleanupConnect = phantom.ethereum.addEventListener("connect", handleEthereumConnect);
+    const cleanupDisconnect = phantom.ethereum.addEventListener("disconnect", handleEthereumDisconnect);
+    const cleanupAccountsChanged = phantom.ethereum.addEventListener("accountsChanged", handleEthereumAccountsChanged);
     this.browserInjectedCleanupFunctions.push(cleanupConnect, cleanupDisconnect, cleanupAccountsChanged);
   }
-  createCallbacks() {
-    return {
-      connect: async () => {
-        const result = await this.connect({ provider: "injected" });
-        return result.addresses;
-      },
-      disconnect: async () => {
-        await this.disconnect();
-      },
-      isConnected: () => {
-        return this.isConnected();
-      },
-      getAddresses: () => {
-        return this.getAddresses();
-      },
-      on: (event, callback) => {
-        this.on(event, callback);
-      },
-      off: (event, callback) => {
-        this.off(event, callback);
+  setupExternalWalletEvents(walletInfo) {
+    if (isPhantomWallet(walletInfo)) {
+      return;
+    }
+    if (!this.selectedWalletId || this.externalWalletEventListenersSetup.has(this.selectedWalletId)) {
+      return;
+    }
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up external wallet event listeners", {
+      walletId: this.selectedWalletId
+    });
+    if (walletInfo.providers?.ethereum) {
+      const handleExternalEthereumAccountsChanged = async (accounts) => {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Ethereum accounts changed event received", {
+          walletId: this.selectedWalletId,
+          accounts
+        });
+        const walletId = this.selectedWalletId;
+        const state = this.getWalletState(walletId);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.ethereum);
+        if (accounts && accounts.length > 0) {
+          const ethAddresses = accounts.map((address) => ({ addressType: AddressType2.ethereum, address }));
+          const newAddresses = [...otherAddresses, ...ethAddresses];
+          this.setWalletState(walletId, {
+            connected: true,
+            addresses: newAddresses
+          });
+          debug.log(DebugCategory.INJECTED_PROVIDER, "Updated Ethereum addresses after account change", {
+            walletId,
+            oldCount: 0,
+            // We filtered them out
+            newCount: accounts.length,
+            addresses: newAddresses.filter((addr) => addr.addressType === AddressType2.ethereum)
+          });
+          const authUserId = await this.getAuthUserId("External wallet Ethereum accounts changed event");
+          this.emit("connect", {
+            addresses: newAddresses,
+            source: "external-wallet-account-change",
+            authUserId
+          });
+        } else {
+          this.setWalletState(walletId, {
+            connected: otherAddresses.length > 0,
+            addresses: otherAddresses
+          });
+          this.emit("disconnect", {
+            source: "external-wallet-account-change"
+          });
+        }
+      };
+      if (typeof walletInfo.providers.ethereum.on === "function") {
+        walletInfo.providers.ethereum.on("accountsChanged", handleExternalEthereumAccountsChanged);
+        this.browserInjectedCleanupFunctions.push(() => {
+          if (typeof walletInfo.providers?.ethereum?.off === "function") {
+            walletInfo.providers.ethereum.off("accountsChanged", handleExternalEthereumAccountsChanged);
+          }
+        });
       }
-    };
+    }
+    if (walletInfo.providers?.solana) {
+      const handleExternalSolanaAccountChanged = async (publicKey) => {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana account changed event received", {
+          walletId: this.selectedWalletId,
+          publicKey
+        });
+        const walletId = this.selectedWalletId;
+        const state = this.getWalletState(walletId);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== AddressType2.solana);
+        if (publicKey) {
+          const newAddresses = [...otherAddresses, { addressType: AddressType2.solana, address: publicKey }];
+          this.setWalletState(walletId, {
+            connected: true,
+            addresses: newAddresses
+          });
+          const authUserId = await this.getAuthUserId("External wallet Solana account changed event");
+          this.emit("connect", {
+            addresses: newAddresses,
+            source: "external-wallet-account-change",
+            authUserId
+          });
+        } else {
+          this.setWalletState(walletId, {
+            connected: otherAddresses.length > 0,
+            addresses: otherAddresses
+          });
+          this.emit("disconnect", {
+            source: "external-wallet-account-change"
+          });
+        }
+      };
+      if (typeof walletInfo.providers.solana.on === "function") {
+        walletInfo.providers.solana.on("accountChanged", handleExternalSolanaAccountChanged);
+        this.browserInjectedCleanupFunctions.push(() => {
+          if (typeof walletInfo.providers?.solana?.off === "function") {
+            walletInfo.providers.solana.off("accountChanged", handleExternalSolanaAccountChanged);
+          }
+        });
+      }
+    }
+    if (this.selectedWalletId) {
+      this.externalWalletEventListenersSetup.add(this.selectedWalletId);
+    }
   }
 };
 
@@ -1178,7 +2827,7 @@ 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.0-beta.22",
+        sdk_version: "1.0.0-beta.25",
         sdk_type: "browser",
         platform: detectBrowser().name
       });
@@ -1299,10 +2948,10 @@ var BrowserAuthProvider = class {
 };
 
 // src/providers/embedded/adapters/phantom-app.ts
-import { isPhantomExtensionInstalled as isPhantomExtensionInstalled2 } from "@phantom/browser-injected-sdk";
+import { isPhantomExtensionInstalled as isPhantomExtensionInstalled3 } from "@phantom/browser-injected-sdk";
 
 // src/isPhantomLoginAvailable.ts
-import { isPhantomExtensionInstalled } from "@phantom/browser-injected-sdk";
+import { isPhantomExtensionInstalled as isPhantomExtensionInstalled2 } from "@phantom/browser-injected-sdk";
 async function isPhantomLoginAvailable(timeoutMs = 3e3) {
   const extensionInstalled = await waitForExtension(timeoutMs);
   if (!extensionInstalled) {
@@ -1328,7 +2977,7 @@ async function waitForExtension(timeoutMs) {
     const checkInterval = 100;
     const checkForExtension = () => {
       try {
-        if (isPhantomExtensionInstalled()) {
+        if (isPhantomExtensionInstalled2()) {
           resolve(true);
           return;
         }
@@ -1351,7 +3000,7 @@ var BrowserPhantomAppProvider = class {
    * Check if the Phantom extension is installed in the browser
    */
   isAvailable() {
-    return isPhantomExtensionInstalled2();
+    return isPhantomExtensionInstalled3();
   }
   /**
    * Authenticate using the Phantom browser extension
@@ -1442,15 +3091,19 @@ var EmbeddedProvider = class extends CoreEmbeddedProvider {
         // Full user agent for more detailed info
         [ANALYTICS_HEADERS.APP_ID]: config.appId,
         [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.22"
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.25"
         // Replaced at build time
       }
     };
     debug.log(DebugCategory.EMBEDDED_PROVIDER, "Detected platform", { platformName });
     const logger = new BrowserLogger();
     super(config, platform, logger);
+    this.addressTypes = config.addressTypes;
     debug.info(DebugCategory.EMBEDDED_PROVIDER, "Browser EmbeddedProvider initialized");
   }
+  getEnabledAddressTypes() {
+    return this.addressTypes;
+  }
 };
 
 // src/ProviderManager.ts
@@ -1858,37 +3511,14 @@ var ProviderManager = class {
   }
 };
 
-// src/waitForPhantomExtension.ts
-import { isPhantomExtensionInstalled as isPhantomExtensionInstalled3 } 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 (isPhantomExtensionInstalled3()) {
-          resolve(true);
-          return;
-        }
-      } catch (error) {
-      }
-      const elapsed = Date.now() - startTime;
-      if (elapsed >= timeoutMs) {
-        resolve(false);
-        return;
-      }
-      setTimeout(checkForExtension, checkInterval);
-    };
-    checkForExtension();
-  });
-}
-
 // src/BrowserSDK.ts
 import { EMBEDDED_PROVIDER_AUTH_TYPES as EMBEDDED_PROVIDER_AUTH_TYPES2 } from "@phantom/embedded-provider-core";
 import { DEFAULT_EMBEDDED_WALLET_TYPE as DEFAULT_EMBEDDED_WALLET_TYPE2 } from "@phantom/constants";
 var BROWSER_SDK_PROVIDER_TYPES = [...EMBEDDED_PROVIDER_AUTH_TYPES2, "injected"];
 var BrowserSDK = class {
   constructor(config) {
+    this.walletRegistry = getWalletRegistry();
+    this.isLoading = true;
     debug.info(DebugCategory.BROWSER_SDK, "Initializing BrowserSDK", {
       providers: config.providers,
       embeddedWalletType: config.embeddedWalletType,
@@ -1924,7 +3554,14 @@ var BrowserSDK = class {
         `Invalid embeddedWalletType: ${config.embeddedWalletType}. Must be "app-wallet" or "user-wallet".`
       );
     }
+    this.config = config;
     this.providerManager = new ProviderManager(config);
+    void this.discoverWallets();
+  }
+  discoverWallets() {
+    return this.walletRegistry.discover(this.config.addressTypes).finally(() => {
+      this.isLoading = false;
+    });
   }
   // ===== CHAIN API =====
   /**
@@ -1997,13 +3634,20 @@ var BrowserSDK = class {
   getCurrentProviderInfo() {
     return this.providerManager.getCurrentProviderInfo();
   }
-  // ===== UTILITY METHODS =====
   /**
-   * Check if Phantom extension is installed
+   * Get enabled address types for the current provider
+   * - For embedded provider: returns config.addressTypes
+   * - For Phantom injected: returns config.addressTypes
+   * - For discovered wallets: returns the wallet's addressTypes from registry
    */
-  static async isPhantomInstalled(timeoutMs) {
-    return waitForPhantomExtension(timeoutMs);
+  getEnabledAddressTypes() {
+    const currentProvider = this.providerManager.getCurrentProvider();
+    if (!currentProvider) {
+      return [];
+    }
+    return currentProvider.getEnabledAddressTypes();
   }
+  // ===== UTILITY METHODS =====
   /**
    * Add event listener for provider events (connect, connect_start, connect_error, disconnect, error)
    * Works with both embedded and injected providers
@@ -2036,40 +3680,21 @@ var BrowserSDK = class {
       debug.log(DebugCategory.BROWSER_SDK, "Auto-connect failed for all providers");
     }
   }
-  /**
-   * Debug configuration methods
-   * These allow dynamic debug configuration without SDK reinstantiation
-   */
-  /**
-   * Enable debug logging
-   */
   enableDebug() {
     debug.enable();
     debug.info(DebugCategory.BROWSER_SDK, "Debug logging enabled");
   }
-  /**
-   * Disable debug logging
-   */
   disableDebug() {
     debug.disable();
   }
-  /**
-   * Set debug level
-   */
   setDebugLevel(level) {
     debug.setLevel(level);
     debug.info(DebugCategory.BROWSER_SDK, "Debug level updated", { level });
   }
-  /**
-   * Set debug callback function
-   */
   setDebugCallback(callback) {
     debug.setCallback(callback);
     debug.info(DebugCategory.BROWSER_SDK, "Debug callback updated");
   }
-  /**
-   * Configure debug settings all at once
-   */
   configureDebug(config) {
     if (config.enabled !== void 0) {
       if (config.enabled) {
@@ -2175,6 +3800,22 @@ var BrowserSDK = class {
       throw error;
     }
   }
+  getDiscoveredWallets() {
+    debug.log(DebugCategory.BROWSER_SDK, "Getting discovered wallets");
+    try {
+      const allWallets = this.walletRegistry.getByAddressTypes(this.config.addressTypes);
+      debug.log(DebugCategory.BROWSER_SDK, "Retrieved discovered wallets", {
+        count: allWallets.length,
+        walletIds: allWallets.map((w) => w.id)
+      });
+      return allWallets;
+    } catch (error) {
+      debug.error(DebugCategory.BROWSER_SDK, "Failed to get discovered wallets", {
+        error: error.message
+      });
+      return [];
+    }
+  }
 };
 
 // src/utils/deeplink.ts
@@ -2187,11 +3828,36 @@ function getDeeplinkToPhantom(ref) {
   return `https://phantom.app/ul/browse/${currentUrl}${refParam}`;
 }
 
+// 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 AddressType5 } from "@phantom/client";
+import { AddressType as AddressType3 } from "@phantom/client";
 export {
-  AddressType5 as AddressType,
+  AddressType3 as AddressType,
   BrowserSDK,
   DebugCategory,
   DebugLevel,