@phantom/browser-sdk 1.0.0 → 1.0.2

package/dist/index.js

@@ -346,7 +346,7 @@ async function discoverSolanaWallets() {
         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");
+        return featureLower.startsWith("solana:");
       });
       if (!supportsSolana) {
         const featureKeys = wallet.features ? Object.keys(wallet.features) : [];
@@ -493,6 +493,7 @@ var import_eventemitter3 = require("eventemitter3");
 var import_buffer = require("buffer");
 var InjectedWalletSolanaChain = class {
   constructor(provider, walletId, walletName) {
+    // Expose eventEmitter for testing - allows tests to trigger events directly
     this.eventEmitter = new import_eventemitter3.EventEmitter();
     this._connected = false;
     this._publicKey = null;
@@ -721,6 +722,7 @@ var InjectedWalletSolanaChain = class {
       });
       this.provider.on("accountChanged", (publicKey) => {
         this._publicKey = publicKey;
+        this._connected = publicKey != null && publicKey.length > 0;
         this.eventEmitter.emit("accountChanged", publicKey);
       });
     }
@@ -734,26 +736,29 @@ var InjectedWalletSolanaChain = class {
 };
 
 // src/providers/injected/chains/WalletStandardSolanaAdapter.ts
+var import_eventemitter32 = require("eventemitter3");
 var import_parsers = require("@phantom/parsers");
+var import_buffer2 = require("buffer");
 var import_bs58 = __toESM(require("bs58"));
 var WalletStandardSolanaAdapter = class {
   constructor(wallet, walletId, walletName) {
-    this._connected = false;
+    this.eventEmitter = new import_eventemitter32.EventEmitter();
     this._publicKey = null;
     this.wallet = wallet;
     this.walletId = walletId;
     this.walletName = walletName;
+    this.setupEventListeners();
   }
   get connected() {
-    return this._connected;
+    return this._publicKey !== null;
   }
   get publicKey() {
     return this._publicKey;
   }
   async connect(_options) {
     try {
-      const connectFeature = this.wallet.features?.["standard:connect"];
-      if (!connectFeature || typeof connectFeature.connect !== "function") {
+      const connectFeature = this.wallet.features["standard:connect"];
+      if (!connectFeature) {
         throw new Error("Wallet Standard connect feature not available");
       }
       const connectResult = await connectFeature.connect();
@@ -774,14 +779,13 @@ var WalletStandardSolanaAdapter = class {
       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);
+        address = firstAccount.address || firstAccount.publicKey?.toString() || (firstAccount.publicKey instanceof Uint8Array ? import_buffer2.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) {
@@ -795,11 +799,10 @@ var WalletStandardSolanaAdapter = class {
   }
   async disconnect() {
     try {
-      const disconnectFeature = this.wallet.features?.["standard:disconnect"];
-      if (disconnectFeature && typeof disconnectFeature.disconnect === "function") {
+      const disconnectFeature = this.wallet.features["standard:disconnect"];
+      if (disconnectFeature) {
         await disconnectFeature.disconnect();
       }
-      this._connected = false;
       this._publicKey = null;
     } catch (error) {
       debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana disconnect failed", {
@@ -812,14 +815,14 @@ var WalletStandardSolanaAdapter = class {
   }
   async signMessage(message) {
     try {
-      const signMessageFeature = this.wallet.features?.["solana:signMessage"];
-      if (!signMessageFeature || typeof signMessageFeature.signMessage !== "function") {
+      const signMessageFeature = this.wallet.features["solana:signMessage"];
+      if (!signMessageFeature) {
         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]
+        account: this.wallet.accounts[0]
       });
       if (!Array.isArray(result) || result.length === 0) {
         throw new Error(`Expected array result from signMessage, got: ${typeof result}`);
@@ -832,7 +835,7 @@ var WalletStandardSolanaAdapter = class {
       if (signature.length === 0) {
         throw new Error(`Signature is empty`);
       }
-      const publicKey = signedMessageResult.account?.address || this.wallet.accounts?.[0]?.address || this._publicKey || "";
+      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", {
@@ -845,8 +848,8 @@ var WalletStandardSolanaAdapter = class {
   }
   async signTransaction(transaction) {
     try {
-      const signTransactionFeature = this.wallet.features?.["solana:signTransaction"];
-      if (!signTransactionFeature || typeof signTransactionFeature.signTransaction !== "function") {
+      const signTransactionFeature = this.wallet.features["solana:signTransaction"];
+      if (!signTransactionFeature) {
         throw new Error("Wallet Standard signTransaction feature not available");
       }
       if (!this.wallet.accounts || this.wallet.accounts.length === 0) {
@@ -865,7 +868,8 @@ var WalletStandardSolanaAdapter = class {
           transactionData = firstItem.signedTransaction || firstItem.transaction;
         }
       } else if (results && typeof results === "object" && !Array.isArray(results)) {
-        transactionData = results.transaction || results.signedTransaction;
+        const resultObj = results;
+        transactionData = resultObj.transaction || resultObj.signedTransaction;
       }
       if (!transactionData) {
         throw new Error("No transaction data found in Wallet Standard result");
@@ -887,8 +891,8 @@ var WalletStandardSolanaAdapter = class {
   }
   async signAndSendTransaction(transaction) {
     try {
-      const signAndSendTransactionFeature = this.wallet.features?.["solana:signAndSendTransaction"];
-      if (!signAndSendTransactionFeature || typeof signAndSendTransactionFeature.signAndSendTransaction !== "function") {
+      const signAndSendTransactionFeature = this.wallet.features["solana:signAndSendTransaction"];
+      if (!signAndSendTransactionFeature) {
         throw new Error("Wallet Standard signAndSendTransaction feature not available");
       }
       if (!this.wallet.accounts || this.wallet.accounts.length === 0) {
@@ -959,40 +963,93 @@ var WalletStandardSolanaAdapter = class {
       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;
-    }
+  async switchNetwork(_network) {
+    return Promise.resolve();
   }
   getPublicKey() {
     return Promise.resolve(this._publicKey);
   }
   isConnected() {
-    return this._connected;
+    return this._publicKey !== null;
   }
-  on(_event, _listener) {
-    const eventsFeature = this.wallet.features?.["standard:events"];
-    if (eventsFeature && typeof eventsFeature.on === "function") {
-      eventsFeature.on(_event, _listener);
+  /**
+   * Set up event listeners for Wallet Standard events
+   * Maps Wallet Standard "change" events to "accountChanged" events
+   *
+   * Note: Wallet Standard only has a "change" event. There are no "connect" or "disconnect" events.
+   * Connection/disconnection is indicated by the presence or absence of accounts in the change event.
+   */
+  setupEventListeners() {
+    const eventsFeature = this.wallet.features["standard:events"];
+    if (!eventsFeature) {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Wallet Standard events feature not available", {
+        walletId: this.walletId,
+        walletName: this.walletName
+      });
+      return;
     }
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up Wallet Standard event listeners", {
+      walletId: this.walletId,
+      walletName: this.walletName
+    });
+    eventsFeature.on("change", (properties) => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Wallet Standard change event received", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        hasAccounts: !!properties.accounts,
+        accountCount: properties.accounts?.length || 0
+      });
+      if (properties.accounts !== void 0) {
+        if (properties.accounts.length > 0) {
+          const firstAccount = properties.accounts[0];
+          const address = this.extractAccountAddress(firstAccount);
+          if (address) {
+            this._publicKey = address;
+            this.eventEmitter.emit("accountChanged", address);
+            this.eventEmitter.emit("connect", address);
+            debug.log(DebugCategory.INJECTED_PROVIDER, "Emitted accountChanged and connect events", {
+              walletId: this.walletId,
+              walletName: this.walletName,
+              address
+            });
+          } else {
+            this._publicKey = null;
+            this.eventEmitter.emit("accountChanged", null);
+            debug.log(DebugCategory.INJECTED_PROVIDER, "Emitted accountChanged event (null - invalid account)", {
+              walletId: this.walletId,
+              walletName: this.walletName
+            });
+          }
+        } else {
+          this._publicKey = null;
+          this.eventEmitter.emit("accountChanged", null);
+          this.eventEmitter.emit("disconnect");
+          debug.log(DebugCategory.INJECTED_PROVIDER, "Emitted accountChanged and disconnect events", {
+            walletId: this.walletId,
+            walletName: this.walletName
+          });
+        }
+      }
+    });
   }
-  off(_event, _listener) {
-    const eventsFeature = this.wallet.features?.["standard:events"];
-    if (eventsFeature && typeof eventsFeature.off === "function") {
-      eventsFeature.off(_event, _listener);
-    }
+  extractAccountAddress(account) {
+    return account.address;
+  }
+  on(event, listener) {
+    this.eventEmitter.on(event, listener);
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Added event listener", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      event
+    });
+  }
+  off(event, listener) {
+    this.eventEmitter.off(event, listener);
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Removed event listener", {
+      walletId: this.walletId,
+      walletName: this.walletName,
+      event
+    });
   }
   /**
    * Serialize a transaction to Uint8Array for Wallet Standard API
@@ -1036,10 +1093,11 @@ var WalletStandardSolanaAdapter = class {
 };
 
 // src/providers/injected/chains/InjectedWalletEthereumChain.ts
-var import_eventemitter32 = require("eventemitter3");
+var import_eventemitter33 = require("eventemitter3");
 var InjectedWalletEthereumChain = class {
   constructor(provider, walletId, walletName) {
-    this.eventEmitter = new import_eventemitter32.EventEmitter();
+    // Expose eventEmitter for testing - allows tests to trigger events directly
+    this.eventEmitter = new import_eventemitter33.EventEmitter();
     this._connected = false;
     this._chainId = "0x1";
     this._accounts = [];
@@ -1413,6 +1471,7 @@ var InjectedWalletEthereumChain = class {
       });
       this.provider.on("accountsChanged", (accounts) => {
         this._accounts = accounts;
+        this._connected = accounts.length > 0;
         this.eventEmitter.emit("accountsChanged", accounts);
       });
       this.provider.on("chainChanged", (chainId) => {
@@ -1429,218 +1488,13 @@ var InjectedWalletEthereumChain = class {
   }
 };
 
-// src/providers/injected/chains/SolanaChain.ts
-var import_eventemitter33 = require("eventemitter3");
-var import_buffer2 = require("buffer");
-var PhantomSolanaChain = class {
-  constructor(phantom) {
-    this._publicKey = null;
-    this.eventEmitter = new import_eventemitter33.EventEmitter();
-    this.phantom = phantom;
-    this.setupEventListeners();
-  }
-  // Wallet adapter compliant properties
-  get connected() {
-    return this._publicKey !== null;
-  }
-  get publicKey() {
-    return this._publicKey;
-  }
-  // Connection methods
-  async connect(options) {
-    const result = await this.phantom.solana.connect(options);
-    if (!result) {
-      throw new Error("Failed to connect to Solana wallet");
-    }
-    const publicKey = typeof result === "string" ? result : "";
-    this._publicKey = publicKey;
-    return { publicKey };
-  }
-  async 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(import_buffer2.Buffer.from(result.signature, "base64")),
-      publicKey: this._publicKey || ""
-    };
-  }
-  async signTransaction(transaction) {
-    if (!this.connected) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
-    }
-    try {
-      const result = await this.phantom.solana.signTransaction(transaction);
-      return result;
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  }
-  async signAndSendTransaction(transaction) {
-    const result = await this.phantom.solana.signAndSendTransaction(transaction);
-    return { signature: result.signature };
-  }
-  async signAllTransactions(transactions) {
-    if (!this.connected) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
-    }
-    try {
-      const result = await this.phantom.solana.signAllTransactions(transactions);
-      return result;
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  }
-  async signAndSendAllTransactions(transactions) {
-    if (!this.connected) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
-    }
-    try {
-      const result = await this.phantom.solana.signAndSendAllTransactions(transactions);
-      return { signatures: result.signatures };
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  }
-  switchNetwork(_network) {
-    return Promise.resolve();
-  }
-  // Legacy methods
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
-  }
-  isConnected() {
-    return this.connected;
-  }
-  setupEventListeners() {
-    this.phantom.solana.addEventListener("connect", (publicKey) => {
-      this._publicKey = publicKey;
-      this.eventEmitter.emit("connect", publicKey);
-    });
-    this.phantom.solana.addEventListener("disconnect", () => {
-      this._publicKey = null;
-      this.eventEmitter.emit("disconnect");
-    });
-    this.phantom.solana.addEventListener("accountChanged", (publicKey) => {
-      this._publicKey = publicKey;
-      this.eventEmitter.emit("accountChanged", publicKey);
-    });
-  }
-  // Event methods for interface compliance
-  on(event, listener) {
-    this.eventEmitter.on(event, listener);
-  }
-  off(event, listener) {
-    this.eventEmitter.off(event, listener);
-  }
-};
-
-// src/providers/injected/chains/EthereumChain.ts
-var import_eventemitter34 = require("eventemitter3");
-var PhantomEthereumChain = class {
-  constructor(phantom) {
-    this._chainId = "0x1";
-    this._accounts = [];
-    this.eventEmitter = new import_eventemitter34.EventEmitter();
-    this.phantom = phantom;
-    this.setupEventListeners();
-  }
-  // EIP-1193 compliant properties
-  get connected() {
-    return this._accounts.length > 0;
-  }
-  get chainId() {
-    return this._chainId;
-  }
-  get accounts() {
-    return this._accounts;
-  }
-  // EIP-1193 core method with eth_signTransaction support
-  async request(args) {
-    if (args.method === "eth_signTransaction") {
-      const [transaction] = args.params;
-      const result = await this.signTransaction(transaction);
-      return result;
-    }
-    const phantomProvider = await this.phantom.ethereum.getProvider();
-    return await phantomProvider.request(args);
-  }
-  // Connection methods
-  async connect() {
-    const accounts = await this.phantom.ethereum.getAccounts();
-    this._accounts = accounts;
-    return accounts;
-  }
-  async disconnect() {
-    await this.phantom.ethereum.disconnect();
-    this._accounts = [];
-  }
-  // Standard compliant methods (return raw values, not wrapped objects)
-  async signPersonalMessage(message, address) {
-    return await this.phantom.ethereum.signPersonalMessage(message, address);
-  }
-  async signTypedData(typedData, address) {
-    return await this.phantom.ethereum.signTypedData(typedData, address);
-  }
-  async signTransaction(transaction) {
-    return await this.phantom.ethereum.signTransaction(transaction);
-  }
-  async sendTransaction(transaction) {
-    return await this.phantom.ethereum.sendTransaction(transaction);
-  }
-  async switchChain(chainId) {
-    const hexChainId = typeof chainId === "string" ? chainId.toLowerCase().startsWith("0x") ? chainId : `0x${parseInt(chainId, 10).toString(16)}` : `0x${chainId.toString(16)}`;
-    await this.phantom.ethereum.switchChain(hexChainId);
-    this._chainId = hexChainId;
-    this.eventEmitter.emit("chainChanged", this._chainId);
-  }
-  async getChainId() {
-    const chainId = await this.phantom.ethereum.getChainId();
-    return parseInt(chainId, 16);
-  }
-  async getAccounts() {
-    return await this.phantom.ethereum.getAccounts();
-  }
-  isConnected() {
-    return this.connected;
-  }
-  setupEventListeners() {
-    this.phantom.ethereum.addEventListener("connect", (accounts) => {
-      this._accounts = accounts;
-      this.eventEmitter.emit("connect", { chainId: this._chainId });
-      this.eventEmitter.emit("accountsChanged", accounts);
-    });
-    this.phantom.ethereum.addEventListener("disconnect", () => {
-      this._accounts = [];
-      this.eventEmitter.emit("disconnect", { code: 4900, message: "Provider disconnected" });
-      this.eventEmitter.emit("accountsChanged", []);
-    });
-    this.phantom.ethereum.addEventListener("accountsChanged", (accounts) => {
-      this._accounts = accounts;
-      this.eventEmitter.emit("accountsChanged", accounts);
-    });
-    this.phantom.ethereum.addEventListener("chainChanged", (chainId) => {
-      this._chainId = chainId;
-      this.eventEmitter.emit("chainChanged", chainId);
-    });
-  }
-  // Event methods for interface compliance
-  on(event, listener) {
-    this.eventEmitter.on(event, listener);
-  }
-  off(event, listener) {
-    this.eventEmitter.off(event, listener);
-  }
-};
-
 // src/wallets/registry.ts
 function isPhantomWallet(wallet) {
   return wallet !== void 0 && wallet.id === "phantom" && "isPhantom" in wallet && wallet.isPhantom === true;
 }
+function isWalletStandardWallet(provider) {
+  return provider !== null && typeof provider === "object" && "features" in provider && typeof provider.features === "object";
+}
 var InjectedWalletRegistry = class {
   constructor() {
     this.wallets = /* @__PURE__ */ new Map();
@@ -1649,8 +1503,7 @@ var InjectedWalletRegistry = class {
   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) {
+      if (isWalletStandardWallet(info.providers.solana)) {
         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,
@@ -1680,18 +1533,19 @@ var InjectedWalletRegistry = class {
   /**
    * Register Phantom wallet with its instance
    * This creates wrapped providers and stores the Phantom instance for auto-confirm access
+   * Uses unified InjectedWallet chains for both Phantom and external wallets
    */
   registerPhantom(phantomInstance, addressTypes) {
     const wrappedProviders = {};
     if (addressTypes.includes(import_client.AddressType.solana) && phantomInstance.solana) {
-      wrappedProviders.solana = new PhantomSolanaChain(phantomInstance);
-      debug.log(DebugCategory.BROWSER_SDK, "Created PhantomSolanaChain wrapper", {
+      wrappedProviders.solana = new InjectedWalletSolanaChain(phantomInstance.solana, "phantom", "Phantom");
+      debug.log(DebugCategory.BROWSER_SDK, "Created InjectedWalletSolanaChain wrapper for Phantom", {
         walletId: "phantom"
       });
     }
     if (addressTypes.includes(import_client.AddressType.ethereum) && phantomInstance.ethereum) {
-      wrappedProviders.ethereum = new PhantomEthereumChain(phantomInstance);
-      debug.log(DebugCategory.BROWSER_SDK, "Created PhantomEthereumChain wrapper", {
+      wrappedProviders.ethereum = new InjectedWalletEthereumChain(phantomInstance.ethereum, "phantom", "Phantom");
+      debug.log(DebugCategory.BROWSER_SDK, "Created InjectedWalletEthereumChain wrapper for Phantom", {
         walletId: "phantom"
       });
     }
@@ -1776,15 +1630,16 @@ 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
+  // Store cleanups per walletId
   constructor(config) {
     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();
+    this.eventListenersSetup = /* @__PURE__ */ new Set();
+    // Track walletId that have listeners set up
+    this.eventListenerCleanups = /* @__PURE__ */ new Map();
     debug.log(DebugCategory.INJECTED_PROVIDER, "Initializing InjectedProvider", { config });
     this.addressTypes = config.addressTypes;
     this.walletRegistry = getWalletRegistry();
@@ -1815,9 +1670,12 @@ var InjectedProvider = class {
       });
     }
   }
-  get solana() {
-    if (!this.addressTypes.includes(import_client3.AddressType.solana)) {
-      throw new Error("Solana not enabled for this provider");
+  /**
+   * Helper method to get a chain provider with consistent error handling
+   */
+  getChainProvider(addressType, providerKey, chainName) {
+    if (!this.addressTypes.includes(addressType)) {
+      throw new Error(`${chainName} not enabled for this provider`);
     }
     const walletId = this.selectedWalletId || "phantom";
     const walletInfo = this.walletRegistry.getById(walletId);
@@ -1832,39 +1690,22 @@ var InjectedProvider = class {
         `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) {
+    const provider = walletInfo.providers?.[providerKey];
+    if (!provider) {
       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.`
+        `Selected wallet "${walletInfo.name}" does not support ${chainName}. This wallet only supports: ${walletInfo.addressTypes.join(", ")}. Make sure your SDK config includes ${chainName} in addressTypes.`
       );
     }
-    return walletInfo.providers.solana;
+    return provider;
+  }
+  get solana() {
+    return this.getChainProvider(import_client3.AddressType.solana, "solana", "Solana");
   }
   /**
    * Access to Ethereum chain operations
    */
   get ethereum() {
-    if (!this.addressTypes.includes(import_client3.AddressType.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;
+    return this.getChainProvider(import_client3.AddressType.ethereum, "ethereum", "Ethereum");
   }
   validateAndSelectWallet(requestedWalletId) {
     if (!this.walletRegistry.has(requestedWalletId)) {
@@ -1902,13 +1743,7 @@ var InjectedProvider = class {
       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;
-      }
+      this.setupEventListeners(walletInfo);
     }
     const connectedAddresses = [];
     if (this.addressTypes.includes(import_client3.AddressType.solana) && walletInfo.providers?.solana) {
@@ -2090,10 +1925,14 @@ var InjectedProvider = class {
         }
       }
     }
-    this.browserInjectedCleanupFunctions.forEach((cleanup) => cleanup());
-    this.browserInjectedCleanupFunctions = [];
+    const walletId = this.selectedWalletId || "phantom";
+    const cleanups = this.eventListenerCleanups.get(walletId);
+    if (cleanups) {
+      cleanups.forEach((cleanup) => cleanup());
+      this.eventListenerCleanups.delete(walletId);
+    }
+    this.eventListenersSetup.delete(walletId);
     if (this.selectedWalletId) {
-      this.externalWalletEventListenersSetup.delete(this.selectedWalletId);
       this.setWalletState(this.selectedWalletId, {
         connected: false,
         addresses: []
@@ -2162,13 +2001,7 @@ var InjectedProvider = class {
         });
         return;
       }
-      this.setupExternalWalletEvents(walletInfo);
-      if (this.selectedWalletId === "phantom" && isPhantomWallet(walletInfo)) {
-        this.browserInjectedCleanupFunctions.forEach((cleanup) => cleanup());
-        this.browserInjectedCleanupFunctions = [];
-        this.setupBrowserInjectedEvents();
-        this.eventsInitialized = true;
-      }
+      this.setupEventListeners(walletInfo);
       if (this.selectedWalletId) {
         this.setWalletState(this.selectedWalletId, {
           connected: true,
@@ -2209,6 +2042,166 @@ var InjectedProvider = class {
   setWalletState(walletId, state) {
     this.walletStates.set(walletId, state);
   }
+  /**
+   * Update wallet state with new addresses for a specific address type
+   * Replaces all existing addresses of the given type with the new addresses
+   * @param walletId - The wallet ID to update
+   * @param newAddresses - Array of new addresses (strings) for the address type
+   * @param addressType - The type of addresses being updated
+   * @returns The updated addresses array
+   */
+  updateWalletAddresses(walletId, newAddresses, addressType) {
+    const state = this.getWalletState(walletId);
+    const otherAddresses = state.addresses.filter((addr) => addr.addressType !== addressType);
+    const addressesOfType = newAddresses.map((address) => ({ addressType, address }));
+    const updatedAddresses = [...otherAddresses, ...addressesOfType];
+    this.setWalletState(walletId, {
+      connected: updatedAddresses.length > 0,
+      addresses: updatedAddresses
+    });
+    return updatedAddresses;
+  }
+  /**
+   * Helper to construct account change source string
+   */
+  getAccountChangeSource(source) {
+    return `${source}-account-change`;
+  }
+  /**
+   * Create a handler for Solana connect events
+   */
+  createSolanaConnectHandler(walletId, source) {
+    return async (publicKey) => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Solana connect event received", { publicKey, walletId });
+      const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client3.AddressType.solana);
+      const authUserId = await this.getAuthUserId("Solana connect event");
+      this.emit("connect", {
+        addresses: newAddresses,
+        source,
+        authUserId
+      });
+    };
+  }
+  /**
+   * Create a handler for Solana disconnect events
+   */
+  createSolanaDisconnectHandler(walletId, source) {
+    return () => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnect event received", { walletId });
+      const state = this.getWalletState(walletId);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.solana);
+      this.setWalletState(walletId, {
+        connected: filteredAddresses.length > 0,
+        addresses: filteredAddresses
+      });
+      this.emit("disconnect", {
+        source
+      });
+    };
+  }
+  /**
+   * Create a handler for Solana account change events
+   * Can receive string | null per Wallet Standard
+   */
+  createSolanaAccountChangeHandler(walletId, source) {
+    return async (publicKey) => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Solana account changed event received", { publicKey, walletId });
+      if (publicKey) {
+        const newAddresses = this.updateWalletAddresses(walletId, [publicKey], import_client3.AddressType.solana);
+        const authUserId = await this.getAuthUserId("Solana account changed event");
+        this.emit("connect", {
+          addresses: newAddresses,
+          source: this.getAccountChangeSource(source),
+          authUserId
+        });
+      } else {
+        const state = this.getWalletState(walletId);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.solana);
+        this.setWalletState(walletId, {
+          connected: otherAddresses.length > 0,
+          addresses: otherAddresses
+        });
+        this.emit("disconnect", {
+          source: this.getAccountChangeSource(source)
+        });
+      }
+    };
+  }
+  /**
+   * Create a handler for Ethereum connect events
+   * EIP-1193 connect event receives { chainId: string }, but we need to get accounts separately
+   */
+  createEthereumConnectHandler(walletId, source) {
+    return async (connectInfo) => {
+      let accounts = [];
+      if (Array.isArray(connectInfo)) {
+        accounts = connectInfo;
+      } else {
+        try {
+          const walletInfo = this.walletRegistry.getById(walletId);
+          if (walletInfo?.providers?.ethereum) {
+            accounts = await walletInfo.providers.ethereum.getAccounts();
+          }
+        } catch (error) {
+          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to get accounts on connect", { error });
+        }
+      }
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum connect event received", { accounts, walletId });
+      if (accounts.length > 0) {
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client3.AddressType.ethereum);
+        const authUserId = await this.getAuthUserId("Ethereum connect event");
+        this.emit("connect", {
+          addresses: newAddresses,
+          source,
+          authUserId
+        });
+      }
+    };
+  }
+  /**
+   * Create a handler for Ethereum disconnect events
+   */
+  createEthereumDisconnectHandler(walletId, source) {
+    return () => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnect event received", { walletId });
+      const state = this.getWalletState(walletId);
+      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
+      this.setWalletState(walletId, {
+        connected: filteredAddresses.length > 0,
+        addresses: filteredAddresses
+      });
+      this.emit("disconnect", {
+        source
+      });
+    };
+  }
+  /**
+   * Create a handler for Ethereum account change events
+   */
+  createEthereumAccountChangeHandler(walletId, source) {
+    return async (accounts) => {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum accounts changed event received", { accounts, walletId });
+      if (accounts && accounts.length > 0) {
+        const newAddresses = this.updateWalletAddresses(walletId, accounts, import_client3.AddressType.ethereum);
+        const authUserId = await this.getAuthUserId("Ethereum accounts changed event");
+        this.emit("connect", {
+          addresses: newAddresses,
+          source: this.getAccountChangeSource(source),
+          authUserId
+        });
+      } else {
+        const state = this.getWalletState(walletId);
+        const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
+        this.setWalletState(walletId, {
+          connected: otherAddresses.length > 0,
+          addresses: otherAddresses
+        });
+        this.emit("disconnect", {
+          source: this.getAccountChangeSource(source)
+        });
+      }
+    };
+  }
   getAddresses() {
     const walletId = this.selectedWalletId || "phantom";
     return this.getWalletState(walletId).addresses;
@@ -2302,19 +2295,22 @@ var InjectedProvider = class {
   on(event, callback) {
     debug.log(DebugCategory.INJECTED_PROVIDER, "Adding event listener", { event });
     if (!this.eventsInitialized) {
-      this.setupBrowserInjectedEvents();
-      this.eventsInitialized = true;
+      const walletId = this.selectedWalletId || "phantom";
+      const walletInfo = this.walletRegistry.getById(walletId);
+      if (walletInfo) {
+        this.setupEventListeners(walletInfo);
+      }
     }
     if (!this.eventListeners.has(event)) {
       this.eventListeners.set(event, /* @__PURE__ */ new Set());
     }
-    this.eventListeners.get(event).add(callback);
+    this.eventListeners.get(event)?.add(callback);
   }
   off(event, callback) {
     debug.log(DebugCategory.INJECTED_PROVIDER, "Removing event listener", { event });
     if (this.eventListeners.has(event)) {
-      this.eventListeners.get(event).delete(callback);
-      if (this.eventListeners.get(event).size === 0) {
+      this.eventListeners.get(event)?.delete(callback);
+      if (this.eventListeners.get(event)?.size === 0) {
         this.eventListeners.delete(event);
       }
     }
@@ -2336,246 +2332,76 @@ var InjectedProvider = class {
       });
     }
   }
-  setupBrowserInjectedEvents() {
-    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");
+  /**
+   * Set up Solana event listeners for any provider (Phantom or external)
+   */
+  setupSolanaEventListeners(provider, walletId, source) {
+    if (typeof provider.on !== "function")
       return;
-    }
-    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up browser-injected-sdk event listeners");
-    if (this.selectedWalletId === "phantom" && isPhantomWallet(walletInfo)) {
-      if (this.addressTypes.includes(import_client3.AddressType.solana)) {
-        this.setupSolanaEvents(walletInfo.phantomInstance);
-      }
-      if (this.addressTypes.includes(import_client3.AddressType.ethereum)) {
-        this.setupEthereumEvents(walletInfo.phantomInstance);
-      }
-    }
-  }
-  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 walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const solanaAddress = { addressType: import_client3.AddressType.solana, address: publicKey };
-      const hasSolana = state.addresses.some((addr) => addr.addressType === import_client3.AddressType.solana);
-      const newAddresses = hasSolana ? state.addresses.map((addr) => addr.addressType === import_client3.AddressType.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: newAddresses,
-        source: "injected-extension",
-        authUserId
-      });
-    };
-    const handleSolanaDisconnect = () => {
-      debug.log(DebugCategory.INJECTED_PROVIDER, "Solana disconnect event received");
-      const walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.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 walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const solanaIndex = state.addresses.findIndex((addr) => addr.addressType === import_client3.AddressType.solana);
-      const newAddresses = solanaIndex >= 0 ? state.addresses.map(
-        (addr, idx) => idx === solanaIndex ? { addressType: import_client3.AddressType.solana, address: publicKey } : addr
-      ) : [...state.addresses, { addressType: import_client3.AddressType.solana, address: publicKey }];
-      this.setWalletState(walletId, {
-        connected: true,
-        addresses: newAddresses
-      });
-      const authUserId = await this.getAuthUserId("Solana account changed event");
-      this.emit("connect", {
-        addresses: newAddresses,
-        source: "injected-extension-account-change",
-        authUserId
-      });
-    };
-    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(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 });
-      const walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const ethAddresses = accounts.map((address) => ({ addressType: import_client3.AddressType.ethereum, address }));
-      const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
-      const newAddresses = [...otherAddresses, ...ethAddresses];
-      this.setWalletState(walletId, {
-        connected: true,
-        addresses: newAddresses
-      });
-      const authUserId = await this.getAuthUserId("Ethereum connect event");
-      this.emit("connect", {
-        addresses: newAddresses,
-        source: "injected-extension",
-        authUserId
-      });
-    };
-    const handleEthereumDisconnect = () => {
-      debug.log(DebugCategory.INJECTED_PROVIDER, "Ethereum disconnect event received");
-      const walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const filteredAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.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 });
-      const walletId = this.selectedWalletId || "phantom";
-      const state = this.getWalletState(walletId);
-      const otherAddresses = state.addresses.filter((addr) => addr.addressType !== import_client3.AddressType.ethereum);
-      if (accounts && accounts.length > 0) {
-        const ethAddresses = accounts.map((address) => ({ addressType: import_client3.AddressType.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: newAddresses,
-          source: "injected-extension-account-change",
-          authUserId
-        });
-      } else {
-        this.setWalletState(walletId, {
-          connected: otherAddresses.length > 0,
-          addresses: otherAddresses
-        });
-        this.emit("disconnect", {
-          source: "injected-extension-account-change"
-        });
-      }
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up Solana event listeners", { walletId, source });
+    const handlers = {
+      connect: this.createSolanaConnectHandler(walletId, source),
+      disconnect: this.createSolanaDisconnectHandler(walletId, source),
+      accountChanged: this.createSolanaAccountChangeHandler(walletId, source)
     };
-    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);
+    provider.on("connect", handlers.connect);
+    provider.on("disconnect", handlers.disconnect);
+    provider.on("accountChanged", handlers.accountChanged);
+    const cleanups = [];
+    if (typeof provider.off === "function") {
+      cleanups.push(
+        () => provider.off("connect", handlers.connect),
+        () => provider.off("disconnect", handlers.disconnect),
+        () => provider.off("accountChanged", handlers.accountChanged)
+      );
+    }
+    const existingCleanups = this.eventListenerCleanups.get(walletId) || [];
+    this.eventListenerCleanups.set(walletId, [...existingCleanups, ...cleanups]);
   }
-  setupExternalWalletEvents(walletInfo) {
-    if (isPhantomWallet(walletInfo)) {
+  /**
+   * Set up Ethereum event listeners for any provider (Phantom or external)
+   */
+  setupEthereumEventListeners(provider, walletId, source) {
+    if (typeof provider.on !== "function")
       return;
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up Ethereum event listeners", { walletId, source });
+    const handlers = {
+      connect: this.createEthereumConnectHandler(walletId, source),
+      disconnect: this.createEthereumDisconnectHandler(walletId, source),
+      accountsChanged: this.createEthereumAccountChangeHandler(walletId, source)
+    };
+    provider.on("connect", handlers.connect);
+    provider.on("disconnect", handlers.disconnect);
+    provider.on("accountsChanged", handlers.accountsChanged);
+    const cleanups = [];
+    if (typeof provider.off === "function") {
+      cleanups.push(
+        () => provider.off("connect", handlers.connect),
+        () => provider.off("disconnect", handlers.disconnect),
+        () => provider.off("accountsChanged", handlers.accountsChanged)
+      );
     }
-    if (!this.selectedWalletId || this.externalWalletEventListenersSetup.has(this.selectedWalletId)) {
+    const existingCleanups = this.eventListenerCleanups.get(walletId) || [];
+    this.eventListenerCleanups.set(walletId, [...existingCleanups, ...cleanups]);
+  }
+  /**
+   * Unified event listener setup for all wallet types (Phantom and external)
+   */
+  setupEventListeners(walletInfo) {
+    const walletId = this.selectedWalletId || "phantom";
+    if (this.eventListenersSetup.has(walletId)) {
+      debug.log(DebugCategory.INJECTED_PROVIDER, "Event listeners already set up for wallet", { walletId });
       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 !== import_client3.AddressType.ethereum);
-        if (accounts && accounts.length > 0) {
-          const ethAddresses = accounts.map((address) => ({ addressType: import_client3.AddressType.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 === import_client3.AddressType.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 !== import_client3.AddressType.solana);
-        if (publicKey) {
-          const newAddresses = [...otherAddresses, { addressType: import_client3.AddressType.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);
-          }
-        });
-      }
+    debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up event listeners", { walletId });
+    if (this.addressTypes.includes(import_client3.AddressType.solana) && walletInfo.providers?.solana) {
+      this.setupSolanaEventListeners(walletInfo.providers.solana, walletId, "wallet");
     }
-    if (this.selectedWalletId) {
-      this.externalWalletEventListenersSetup.add(this.selectedWalletId);
+    if (this.addressTypes.includes(import_client3.AddressType.ethereum) && walletInfo.providers?.ethereum) {
+      this.setupEthereumEventListeners(walletInfo.providers.ethereum, walletId, "wallet");
     }
+    this.eventListenersSetup.add(walletId);
+    this.eventsInitialized = true;
   }
 };
 
@@ -2890,7 +2716,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",
+        sdk_version: "1.0.2",
         sdk_type: "browser",
         platform: detectBrowser().name
       });
@@ -3154,7 +2980,7 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
         // Full user agent for more detailed info
         [import_constants2.ANALYTICS_HEADERS.APP_ID]: config.appId,
         [import_constants2.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0"
+        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.2"
         // Replaced at build time
       }
     };
@@ -3437,7 +3263,7 @@ var ProviderManager = class {
     if (!this.eventListeners.has(event)) {
       this.eventListeners.set(event, /* @__PURE__ */ new Set());
     }
-    this.eventListeners.get(event).add(callback);
+    this.eventListeners.get(event)?.add(callback);
     this.ensureProviderEventForwarding();
   }
   /**
@@ -3446,8 +3272,8 @@ var ProviderManager = class {
   off(event, callback) {
     debug.log(DebugCategory.PROVIDER_MANAGER, "Removing event listener", { event });
     if (this.eventListeners.has(event)) {
-      this.eventListeners.get(event).delete(callback);
-      if (this.eventListeners.get(event).size === 0) {
+      this.eventListeners.get(event)?.delete(callback);
+      if (this.eventListeners.get(event)?.size === 0) {
         this.eventListeners.delete(event);
       }
     }