@pooflabs/web 0.0.58 → 0.0.59

package/dist/{index-qEuONikY.esm.js → index-B1INQP2H.esm.js}

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useContext, createContext, useState, useMemo, useRef, useEffect, useCallback } from 'react';
 import globalAxios, { isAxiosError } from 'axios';
-import { b as bufferExports, g as getDefaultExportFromCjs } from './index-Dg6pd0nV.esm.js';
+import { b as bufferExports, a as bs58$1, E as EventEmitter3 } from './index-C9sapvtl.esm.js';
 import { Transaction as Transaction$1, VersionedTransaction } from '@solana/web3.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import '@coral-xyz/anchor';
@@ -1130,17 +1130,17 @@ function requireSrc () {
 	return src;
 }
 
-var bs58$3;
+var bs58;
 var hasRequiredBs58;
 
 function requireBs58 () {
-	if (hasRequiredBs58) return bs58$3;
+	if (hasRequiredBs58) return bs58;
 	hasRequiredBs58 = 1;
 	const basex = requireSrc();
 	const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 
-	bs58$3 = basex(ALPHABET);
-	return bs58$3;
+	bs58 = basex(ALPHABET);
+	return bs58;
 }
 
 requireBs58();
@@ -1437,7 +1437,7 @@ var PhantomClient = class {
       throw new Error(`Failed to create wallet: ${error.response?.data?.message || error.message}`);
     }
   }
-  async prepare(transaction, organizationId, submissionConfig, account) {
+  async prepare(transaction, organizationId, submissionConfig, account, methodName) {
     try {
       const request = {
         transaction,
@@ -1447,7 +1447,8 @@ var PhantomClient = class {
       };
       const response = await this.axiosInstance.post(`${this.config.apiBaseUrl}/prepare`, request, {
         headers: {
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          "X-Rpc-Method": methodName
         }
       });
       return response.data;
@@ -1477,7 +1478,8 @@ var PhantomClient = class {
           encodedTransaction,
           this.config.organizationId,
           submissionConfig,
-          account
+          account,
+          params.methodName
         );
         return prepareResponse.transaction;
       } catch (e) {
@@ -1490,6 +1492,13 @@ var PhantomClient = class {
     }
     return encodedTransaction;
   }
+  getRpcMethodName(networkId, includeSubmissionConfig) {
+    const isEvm = isEthereumChain(networkId);
+    if (isEvm) {
+      return includeSubmissionConfig ? "eth_sendTransaction" : "eth_signTransaction";
+    }
+    return includeSubmissionConfig ? "signAndSendTransaction" : "signTransaction";
+  }
   /**
    * Private method for shared signing logic
    */
@@ -1498,6 +1507,7 @@ var PhantomClient = class {
     const encodedTransaction = params.transaction;
     const networkIdParam = params.networkId;
     const derivationIndex = params.derivationIndex ?? 0;
+    const methodName = this.getRpcMethodName(networkIdParam, includeSubmissionConfig);
     try {
       if (!this.config.organizationId) {
         throw new Error("organizationId is required to sign a transaction");
@@ -1519,7 +1529,8 @@ var PhantomClient = class {
         encodedTransaction,
         networkId: networkIdParam,
         submissionConfig,
-        account: params.account
+        account: params.account,
+        methodName
       });
       const signRequest = {
         organizationId: this.config.organizationId,
@@ -1540,7 +1551,11 @@ var PhantomClient = class {
         params: signRequest,
         timestampMs: await getSecureTimestamp()
       };
-      const response = await this.kmsApi.postKmsRpc(request);
+      const response = await this.kmsApi.postKmsRpc(request, {
+        headers: {
+          "X-Rpc-Method": methodName
+        }
+      });
       const result = response.data.result;
       const rpcSubmissionResult = response.data["rpc_submission_result"];
       const hash = includeSubmissionConfig && rpcSubmissionResult ? rpcSubmissionResult.result : null;
@@ -1966,6 +1981,129 @@ var __privateMethod = (obj, member, method) => {
   return method;
 };
 
+// src/ethereum/siwe.ts
+var ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
+var DOMAIN_REGEX = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/;
+var IP_REGEX = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]{1,5})?$/;
+var LOCALHOST_REGEX = /^localhost(:[0-9]{1,5})?$/;
+var NONCE_REGEX = /^[a-zA-Z0-9]{8,}$/;
+var SCHEME_REGEX = /^([a-zA-Z][a-zA-Z0-9+-.]*)$/;
+function createSiweMessage({
+  address,
+  chainId,
+  domain,
+  nonce,
+  uri,
+  version,
+  scheme,
+  statement: _statement,
+  requestId,
+  resources,
+  issuedAt = /* @__PURE__ */ new Date(),
+  expirationTime,
+  notBefore
+}) {
+  if (!ADDRESS_REGEX.test(address)) {
+    throw new Error("address must be a hex value of 20 bytes (40 hex characters).");
+  }
+  if (chainId !== Math.floor(chainId)) {
+    throw new Error("chainId must be a EIP-155 chain ID.");
+  }
+  if (!(DOMAIN_REGEX.test(domain) || IP_REGEX.test(domain) || LOCALHOST_REGEX.test(domain))) {
+    throw new Error("domain must be an RFC 3986 authority.");
+  }
+  if (!NONCE_REGEX.test(nonce)) {
+    throw new Error("nonce must be at least 8 characters.");
+  }
+  if (!_isUri(uri)) {
+    throw new Error("uri must be a RFC 3986 URI referring to the resource that is the subject of the signing.");
+  }
+  if (version !== "1") {
+    throw new Error("version must be '1'.");
+  }
+  if (scheme && !SCHEME_REGEX.test(scheme)) {
+    throw new Error("scheme must be an RFC 3986 URI scheme.");
+  }
+  if (_statement?.includes("\n")) {
+    throw new Error("statement must not include '\\n'.");
+  }
+  const origin = scheme ? `${scheme}://${domain}` : domain;
+  const statement = _statement ? `${_statement}
+` : "";
+  const prefix = `${origin} wants you to sign in with your Ethereum account:
+${address}
+
+${statement}`;
+  let suffix = `URI: ${uri}
+Version: ${version}
+Chain ID: ${chainId}
+Nonce: ${nonce}
+Issued At: ${issuedAt.toISOString()}`;
+  if (expirationTime) {
+    suffix += `
+Expiration Time: ${expirationTime.toISOString()}`;
+  }
+  if (notBefore) {
+    suffix += `
+Not Before: ${notBefore.toISOString()}`;
+  }
+  if (requestId) {
+    suffix += `
+Request ID: ${requestId}`;
+  }
+  if (resources) {
+    let content = "\nResources:";
+    for (const resource of resources) {
+      if (!_isUri(resource)) {
+        throw new Error("resources must be RFC 3986 URIs.");
+      }
+      content += `
+- ${resource}`;
+    }
+    suffix += content;
+  }
+  return `${prefix}
+${suffix}`;
+}
+function _isUri(value) {
+  if (/[^a-z0-9:/?#[\]@!$&'()*+,;=.\-_~%]/i.test(value))
+    return false;
+  if (/%[^0-9a-f]/i.test(value))
+    return false;
+  if (/%[0-9a-f](:?[^0-9a-f]|$)/i.test(value))
+    return false;
+  const splitted = splitUri(value);
+  const scheme = splitted[1];
+  const authority = splitted[2];
+  const path = splitted[3];
+  const query = splitted[4];
+  const fragment = splitted[5];
+  if (!(scheme?.length && path.length >= 0))
+    return false;
+  if (authority?.length) {
+    if (!(path.length === 0 || /^\//.test(path)))
+      return false;
+  } else {
+    if (/^\/\//.test(path))
+      return false;
+  }
+  if (!/^[a-z][a-z0-9+\-.]*$/.test(scheme.toLowerCase()))
+    return false;
+  let out = "";
+  out += `${scheme}:`;
+  if (authority?.length)
+    out += `//${authority}`;
+  out += path;
+  if (query?.length)
+    out += `?${query}`;
+  if (fragment?.length)
+    out += `#${fragment}`;
+  return out;
+}
+function splitUri(value) {
+  return value.match(/(?:([^:/?#]+):)?(?:\/\/([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?/);
+}
+
 // src/ethereum/strategies/injected.ts
 var MAX_RETRIES$1 = 4;
 var BASE_DELAY$1 = 100;
@@ -2082,7 +2220,7 @@ var InjectedEthereumStrategy = class {
     if (!provider) {
       throw new Error("Provider not found.");
     }
-    const message = `Sign in to ${signInData.domain || "this application"}`;
+    const message = createSiweMessage(signInData);
     const address = provider.selectedAddress;
     if (!address) {
       throw new Error("No address available.");
@@ -2178,7 +2316,7 @@ function addEventListener$1(event, callback) {
     eventListeners.set(event, /* @__PURE__ */ new Set());
   }
   const listeners = eventListeners.get(event);
-  listeners.add(callback);
+  listeners?.add(callback);
   return () => removeEventListener$1(event, callback);
 }
 function removeEventListener$1(event, callback) {
@@ -2252,16 +2390,6 @@ async function getAccounts() {
 }
 
 // src/ethereum/signMessage.ts
-async function signMessage$1(message, address) {
-  const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
-  if (!provider.isConnected) {
-    await provider.connect({ onlyIfTrusted: false });
-  }
-  return provider.signMessage(message, address);
-}
 async function signPersonalMessage(message, address) {
   const provider = await getProvider$2();
   if (!provider) {
@@ -2283,18 +2411,6 @@ async function signTypedData(typedData, address) {
   return provider.signTypedData(typedData, address);
 }
 
-// src/ethereum/signIn.ts
-async function signIn$1(signInData) {
-  const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
-  if (!provider.isConnected) {
-    await provider.connect({ onlyIfTrusted: false });
-  }
-  return provider.signIn(signInData);
-}
-
 // src/ethereum/sendTransaction.ts
 async function sendTransaction(transaction) {
   const provider = await getProvider$2();
@@ -2334,47 +2450,122 @@ async function switchChain(chainId) {
 }
 
 // src/ethereum/plugin.ts
-var ethereum = {
-  connect: connect$1,
-  disconnect: disconnect$1,
-  getAccounts,
-  signMessage: signMessage$1,
-  signPersonalMessage,
-  signTypedData,
-  signIn: signIn$1,
-  sendTransaction,
-  signTransaction: signTransaction$1,
-  getChainId,
-  switchChain,
-  getProvider: getProvider$2,
-  addEventListener: addEventListener$1,
-  removeEventListener: removeEventListener$1
-};
-async function bindProviderEvents$1() {
-  try {
-    const strategy = await getProvider$2();
-    const provider = strategy.getProvider();
-    if (provider) {
-      provider.on("connect", () => {
-        provider.request({ method: "eth_accounts" }).then((accounts) => {
-          if (accounts?.length > 0)
+var Ethereum = class {
+  constructor() {
+    this._chainId = "0x1";
+    this._accounts = [];
+    this.bindProviderEvents();
+  }
+  get connected() {
+    return this._accounts.length > 0;
+  }
+  get chainId() {
+    return this._chainId;
+  }
+  get accounts() {
+    return this._accounts;
+  }
+  async request(args) {
+    const provider = await getProvider$2();
+    if (!provider) {
+      throw new Error("Provider not found.");
+    }
+    const providerInstance = provider.getProvider();
+    if (!providerInstance) {
+      throw new Error("Provider instance not found.");
+    }
+    return providerInstance.request(args);
+  }
+  async connect() {
+    const accounts = await connect$1();
+    this._accounts = accounts;
+    return accounts;
+  }
+  async disconnect() {
+    await disconnect$1();
+    this._accounts = [];
+  }
+  signPersonalMessage(message, address) {
+    return signPersonalMessage(message, address);
+  }
+  signTypedData(data, address) {
+    return signTypedData(data, address);
+  }
+  signTransaction(transaction) {
+    return signTransaction$1(transaction);
+  }
+  sendTransaction(transaction) {
+    return sendTransaction(transaction);
+  }
+  async switchChain(chainId) {
+    const hexChainId = typeof chainId === "string" ? chainId.toLowerCase().startsWith("0x") ? chainId.toLowerCase() : `0x${parseInt(chainId, 10).toString(16)}` : `0x${chainId.toString(16)}`;
+    await switchChain(hexChainId);
+    this._chainId = hexChainId;
+  }
+  async getChainId() {
+    const chainId = await getChainId();
+    const parsed = parseInt(chainId, 16);
+    this._chainId = chainId;
+    return parsed;
+  }
+  async getAccounts() {
+    const accounts = await getAccounts();
+    this._accounts = accounts;
+    return accounts;
+  }
+  isConnected() {
+    return this._accounts.length > 0;
+  }
+  on(event, listener) {
+    addEventListener$1(event, listener);
+  }
+  off(event, listener) {
+    removeEventListener$1(event, listener);
+  }
+  async bindProviderEvents() {
+    try {
+      const strategy = await getProvider$2();
+      const provider = strategy.getProvider();
+      if (provider) {
+        provider.on("connect", async () => {
+          try {
+            const accounts = await provider.request({ method: "eth_accounts" });
+            if (accounts?.length > 0) {
+              this._accounts = accounts;
+              triggerEvent$1("connect", accounts);
+            }
+          } catch {
+          }
+        });
+        provider.on("disconnect", () => {
+          this._accounts = [];
+          const error = {
+            code: 4900,
+            message: "Provider disconnected"
+          };
+          triggerEvent$1("disconnect", error);
+        });
+        provider.on("accountsChanged", (accounts) => {
+          this._accounts = accounts;
+          triggerEvent$1("accountsChanged", accounts);
+          if (accounts && accounts.length > 0) {
             triggerEvent$1("connect", accounts);
-        }).catch(() => {
+          }
         });
-      });
-      provider.on("disconnect", () => triggerEvent$1("disconnect", []));
-      provider.on("accountsChanged", (accounts) => triggerEvent$1("accountsChanged", accounts));
-      provider.on("chainChanged", (chainId) => triggerEvent$1("chainChanged", chainId));
+        provider.on("chainChanged", (chainId) => {
+          this._chainId = chainId;
+          triggerEvent$1("chainChanged", chainId);
+        });
+      }
+    } catch (error) {
     }
-  } catch (error) {
   }
-}
+};
 function createEthereumPlugin() {
   return {
     name: "ethereum",
     create: () => {
-      bindProviderEvents$1();
-      return ethereum;
+      return new Ethereum();
     }
   };
 }
@@ -2584,28 +2775,26 @@ function addEventListener(event, callback) {
   if (!eventCallbacks.has(event)) {
     eventCallbacks.set(event, /* @__PURE__ */ new Set());
   }
-  eventCallbacks.get(event).add(callback);
+  eventCallbacks.get(event)?.add(callback);
   return () => {
     removeEventListener(event, callback);
   };
 }
 function removeEventListener(event, callback) {
   if (eventCallbacks.has(event)) {
-    eventCallbacks.get(event).delete(callback);
-    if (eventCallbacks.get(event).size === 0) {
+    eventCallbacks.get(event)?.delete(callback);
+    if (eventCallbacks.get(event)?.size === 0) {
       eventCallbacks.delete(event);
     }
   }
 }
 function triggerEvent(event, ...args) {
   if (eventCallbacks.has(event)) {
-    eventCallbacks.get(event).forEach((cb) => {
-      if (event === "connect" && args[0] && typeof args[0] === "string") {
-        cb(args[0]);
-      } else if (event === "disconnect") {
-        cb();
-      } else if (event === "accountChanged" && args[0] && typeof args[0] === "string") {
-        cb(args[0]);
+    eventCallbacks.get(event)?.forEach((cb) => {
+      try {
+        cb(...args);
+      } catch (error) {
+        console.error(`Error in ${event} event listener:`, error);
       }
     });
   }
@@ -2706,19 +2895,6 @@ async function signAllTransactions(transactions) {
   return provider.signAllTransactions(transactions);
 }
 
-// src/solana/signIn.ts
-async function signIn(signInData) {
-  const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
-  const result = await provider.signIn(signInData);
-  if (result.address) {
-    triggerEvent("connect", result.address);
-  }
-  return result;
-}
-
 // src/solana/signMessage.ts
 async function signMessage(message, display) {
   const provider = await getProvider$1();
@@ -2732,43 +2908,112 @@ async function signMessage(message, display) {
 }
 
 // src/solana/plugin.ts
-var solana = {
-  connect,
-  disconnect,
-  getAccount,
-  signMessage,
-  signIn,
-  signTransaction,
-  signAllTransactions,
-  signAndSendTransaction,
-  signAndSendAllTransactions,
-  addEventListener,
-  removeEventListener
-};
-async function bindProviderEvents() {
-  try {
-    const strategy = await getProvider$1();
-    const provider = strategy.getProvider();
-    if (provider) {
-      provider.on("connect", (publicKey) => {
-        if (publicKey)
-          triggerEvent("connect", publicKey.toString());
-      });
-      provider.on("disconnect", () => triggerEvent("disconnect"));
-      provider.on("accountChanged", (publicKey) => {
-        if (publicKey)
-          triggerEvent("accountChanged", publicKey.toString());
-      });
+var Solana = class {
+  constructor() {
+    this._publicKey = null;
+    this.bindProviderEvents();
+  }
+  get publicKey() {
+    return this._publicKey;
+  }
+  get connected() {
+    return this._publicKey !== null;
+  }
+  async connect(options) {
+    const address = await connect(options);
+    if (!address) {
+      throw new Error("Failed to connect to Solana wallet");
     }
-  } catch (error) {
+    this._publicKey = address;
+    return { publicKey: address };
   }
-}
+  async disconnect() {
+    await disconnect();
+    this._publicKey = null;
+  }
+  async signMessage(message) {
+    const messageBytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
+    const result = await signMessage(messageBytes);
+    return {
+      signature: result.signature instanceof Uint8Array ? result.signature : new Uint8Array(result.signature),
+      publicKey: result.address || this._publicKey || ""
+    };
+  }
+  signTransaction(transaction) {
+    return signTransaction(transaction);
+  }
+  async signAndSendTransaction(transaction) {
+    const result = await signAndSendTransaction(transaction);
+    return { signature: result.signature };
+  }
+  signAllTransactions(transactions) {
+    return signAllTransactions(transactions);
+  }
+  async signAndSendAllTransactions(transactions) {
+    const result = await signAndSendAllTransactions(transactions);
+    return { signatures: result.signatures };
+  }
+  async switchNetwork(_network) {
+    return Promise.resolve();
+  }
+  async getPublicKey() {
+    if (this._publicKey) {
+      return this._publicKey;
+    }
+    try {
+      const account = await getAccount();
+      this._publicKey = account || null;
+      return this._publicKey;
+    } catch {
+      return null;
+    }
+  }
+  isConnected() {
+    return this._publicKey !== null;
+  }
+  on(event, listener) {
+    addEventListener(event, listener);
+  }
+  off(event, listener) {
+    removeEventListener(event, listener);
+  }
+  async bindProviderEvents() {
+    try {
+      const strategy = await getProvider$1();
+      const provider = strategy.getProvider();
+      if (provider) {
+        provider.on("connect", (publicKey) => {
+          if (publicKey) {
+            const pubKey = publicKey.toString();
+            this._publicKey = pubKey;
+            triggerEvent("connect", pubKey);
+          }
+        });
+        provider.on("disconnect", () => {
+          this._publicKey = null;
+          triggerEvent("disconnect");
+        });
+        provider.on("accountChanged", (publicKey) => {
+          if (publicKey) {
+            const pubKey = publicKey.toString();
+            this._publicKey = pubKey;
+            triggerEvent("accountChanged", pubKey);
+            triggerEvent("connect", pubKey);
+          } else {
+            this._publicKey = null;
+            triggerEvent("accountChanged", null);
+          }
+        });
+      }
+    } catch (error) {
+    }
+  }
+};
 function createSolanaPlugin() {
   return {
     name: "solana",
     create: () => {
-      bindProviderEvents();
-      return solana;
+      return new Solana();
     }
   };
 }
@@ -2855,356 +3100,6 @@ function createAutoConfirmPlugin() {
   };
 }
 
-var eventemitter3$1 = {exports: {}};
-
-var hasRequiredEventemitter3$1;
-
-function requireEventemitter3$1 () {
-	if (hasRequiredEventemitter3$1) return eventemitter3$1.exports;
-	hasRequiredEventemitter3$1 = 1;
-	(function (module) {
-
-		var has = Object.prototype.hasOwnProperty
-		  , prefix = '~';
-
-		/**
-		 * Constructor to create a storage for our `EE` objects.
-		 * An `Events` instance is a plain object whose properties are event names.
-		 *
-		 * @constructor
-		 * @private
-		 */
-		function Events() {}
-
-		//
-		// We try to not inherit from `Object.prototype`. In some engines creating an
-		// instance in this way is faster than calling `Object.create(null)` directly.
-		// If `Object.create(null)` is not supported we prefix the event names with a
-		// character to make sure that the built-in object properties are not
-		// overridden or used as an attack vector.
-		//
-		if (Object.create) {
-		  Events.prototype = Object.create(null);
-
-		  //
-		  // This hack is needed because the `__proto__` property is still inherited in
-		  // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
-		  //
-		  if (!new Events().__proto__) prefix = false;
-		}
-
-		/**
-		 * Representation of a single event listener.
-		 *
-		 * @param {Function} fn The listener function.
-		 * @param {*} context The context to invoke the listener with.
-		 * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
-		 * @constructor
-		 * @private
-		 */
-		function EE(fn, context, once) {
-		  this.fn = fn;
-		  this.context = context;
-		  this.once = once || false;
-		}
-
-		/**
-		 * Add a listener for a given event.
-		 *
-		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} context The context to invoke the listener with.
-		 * @param {Boolean} once Specify if the listener is a one-time listener.
-		 * @returns {EventEmitter}
-		 * @private
-		 */
-		function addListener(emitter, event, fn, context, once) {
-		  if (typeof fn !== 'function') {
-		    throw new TypeError('The listener must be a function');
-		  }
-
-		  var listener = new EE(fn, context || emitter, once)
-		    , evt = prefix ? prefix + event : event;
-
-		  if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;
-		  else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
-		  else emitter._events[evt] = [emitter._events[evt], listener];
-
-		  return emitter;
-		}
-
-		/**
-		 * Clear event by name.
-		 *
-		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
-		 * @param {(String|Symbol)} evt The Event name.
-		 * @private
-		 */
-		function clearEvent(emitter, evt) {
-		  if (--emitter._eventsCount === 0) emitter._events = new Events();
-		  else delete emitter._events[evt];
-		}
-
-		/**
-		 * Minimal `EventEmitter` interface that is molded against the Node.js
-		 * `EventEmitter` interface.
-		 *
-		 * @constructor
-		 * @public
-		 */
-		function EventEmitter() {
-		  this._events = new Events();
-		  this._eventsCount = 0;
-		}
-
-		/**
-		 * Return an array listing the events for which the emitter has registered
-		 * listeners.
-		 *
-		 * @returns {Array}
-		 * @public
-		 */
-		EventEmitter.prototype.eventNames = function eventNames() {
-		  var names = []
-		    , events
-		    , name;
-
-		  if (this._eventsCount === 0) return names;
-
-		  for (name in (events = this._events)) {
-		    if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
-		  }
-
-		  if (Object.getOwnPropertySymbols) {
-		    return names.concat(Object.getOwnPropertySymbols(events));
-		  }
-
-		  return names;
-		};
-
-		/**
-		 * Return the listeners registered for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Array} The registered listeners.
-		 * @public
-		 */
-		EventEmitter.prototype.listeners = function listeners(event) {
-		  var evt = prefix ? prefix + event : event
-		    , handlers = this._events[evt];
-
-		  if (!handlers) return [];
-		  if (handlers.fn) return [handlers.fn];
-
-		  for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
-		    ee[i] = handlers[i].fn;
-		  }
-
-		  return ee;
-		};
-
-		/**
-		 * Return the number of listeners listening to a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Number} The number of listeners.
-		 * @public
-		 */
-		EventEmitter.prototype.listenerCount = function listenerCount(event) {
-		  var evt = prefix ? prefix + event : event
-		    , listeners = this._events[evt];
-
-		  if (!listeners) return 0;
-		  if (listeners.fn) return 1;
-		  return listeners.length;
-		};
-
-		/**
-		 * Calls each of the listeners registered for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Boolean} `true` if the event had listeners, else `false`.
-		 * @public
-		 */
-		EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
-		  var evt = prefix ? prefix + event : event;
-
-		  if (!this._events[evt]) return false;
-
-		  var listeners = this._events[evt]
-		    , len = arguments.length
-		    , args
-		    , i;
-
-		  if (listeners.fn) {
-		    if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
-
-		    switch (len) {
-		      case 1: return listeners.fn.call(listeners.context), true;
-		      case 2: return listeners.fn.call(listeners.context, a1), true;
-		      case 3: return listeners.fn.call(listeners.context, a1, a2), true;
-		      case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;
-		      case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
-		      case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
-		    }
-
-		    for (i = 1, args = new Array(len -1); i < len; i++) {
-		      args[i - 1] = arguments[i];
-		    }
-
-		    listeners.fn.apply(listeners.context, args);
-		  } else {
-		    var length = listeners.length
-		      , j;
-
-		    for (i = 0; i < length; i++) {
-		      if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
-
-		      switch (len) {
-		        case 1: listeners[i].fn.call(listeners[i].context); break;
-		        case 2: listeners[i].fn.call(listeners[i].context, a1); break;
-		        case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;
-		        case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;
-		        default:
-		          if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {
-		            args[j - 1] = arguments[j];
-		          }
-
-		          listeners[i].fn.apply(listeners[i].context, args);
-		      }
-		    }
-		  }
-
-		  return true;
-		};
-
-		/**
-		 * Add a listener for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} [context=this] The context to invoke the listener with.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.on = function on(event, fn, context) {
-		  return addListener(this, event, fn, context, false);
-		};
-
-		/**
-		 * Add a one-time listener for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} [context=this] The context to invoke the listener with.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.once = function once(event, fn, context) {
-		  return addListener(this, event, fn, context, true);
-		};
-
-		/**
-		 * Remove the listeners of a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn Only remove the listeners that match this function.
-		 * @param {*} context Only remove the listeners that have this context.
-		 * @param {Boolean} once Only remove one-time listeners.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
-		  var evt = prefix ? prefix + event : event;
-
-		  if (!this._events[evt]) return this;
-		  if (!fn) {
-		    clearEvent(this, evt);
-		    return this;
-		  }
-
-		  var listeners = this._events[evt];
-
-		  if (listeners.fn) {
-		    if (
-		      listeners.fn === fn &&
-		      (!once || listeners.once) &&
-		      (!context || listeners.context === context)
-		    ) {
-		      clearEvent(this, evt);
-		    }
-		  } else {
-		    for (var i = 0, events = [], length = listeners.length; i < length; i++) {
-		      if (
-		        listeners[i].fn !== fn ||
-		        (once && !listeners[i].once) ||
-		        (context && listeners[i].context !== context)
-		      ) {
-		        events.push(listeners[i]);
-		      }
-		    }
-
-		    //
-		    // Reset the array, or remove it completely if we have no more listeners.
-		    //
-		    if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
-		    else clearEvent(this, evt);
-		  }
-
-		  return this;
-		};
-
-		/**
-		 * Remove all listeners, or those of the specified event.
-		 *
-		 * @param {(String|Symbol)} [event] The event name.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
-		  var evt;
-
-		  if (event) {
-		    evt = prefix ? prefix + event : event;
-		    if (this._events[evt]) clearEvent(this, evt);
-		  } else {
-		    this._events = new Events();
-		    this._eventsCount = 0;
-		  }
-
-		  return this;
-		};
-
-		//
-		// Alias methods names because people roll like that.
-		//
-		EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
-		EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-		//
-		// Expose the prefix.
-		//
-		EventEmitter.prefixed = prefix;
-
-		//
-		// Allow `EventEmitter` to be imported as module namespace.
-		//
-		EventEmitter.EventEmitter = EventEmitter;
-
-		//
-		// Expose the module.
-		//
-		{
-		  module.exports = EventEmitter;
-		} 
-	} (eventemitter3$1));
-	return eventemitter3$1.exports;
-}
-
-var eventemitter3Exports$1 = requireEventemitter3$1();
-var EventEmitter4 = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports$1);
-
 // src/index.ts
 var isBrowser = typeof window !== "undefined" && typeof window.btoa !== "undefined";
 function base64urlEncode(data) {
@@ -8368,133 +8263,6 @@ class Transaction {
     }
 }
 
-// base-x encoding / decoding
-// Copyright (c) 2018 base-x contributors
-// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
-// Distributed under the MIT software license, see the accompanying
-// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-function base$3 (ALPHABET) {
-  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
-  const BASE_MAP = new Uint8Array(256);
-  for (let j = 0; j < BASE_MAP.length; j++) {
-    BASE_MAP[j] = 255;
-  }
-  for (let i = 0; i < ALPHABET.length; i++) {
-    const x = ALPHABET.charAt(i);
-    const xc = x.charCodeAt(0);
-    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
-    BASE_MAP[xc] = i;
-  }
-  const BASE = ALPHABET.length;
-  const LEADER = ALPHABET.charAt(0);
-  const FACTOR = Math.log(BASE) / Math.log(256); // log(BASE) / log(256), rounded up
-  const iFACTOR = Math.log(256) / Math.log(BASE); // log(256) / log(BASE), rounded up
-  function encode (source) {
-    // eslint-disable-next-line no-empty
-    if (source instanceof Uint8Array) ; else if (ArrayBuffer.isView(source)) {
-      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
-    } else if (Array.isArray(source)) {
-      source = Uint8Array.from(source);
-    }
-    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
-    if (source.length === 0) { return '' }
-    // Skip & count leading zeroes.
-    let zeroes = 0;
-    let length = 0;
-    let pbegin = 0;
-    const pend = source.length;
-    while (pbegin !== pend && source[pbegin] === 0) {
-      pbegin++;
-      zeroes++;
-    }
-    // Allocate enough space in big-endian base58 representation.
-    const size = ((pend - pbegin) * iFACTOR + 1) >>> 0;
-    const b58 = new Uint8Array(size);
-    // Process the bytes.
-    while (pbegin !== pend) {
-      let carry = source[pbegin];
-      // Apply "b58 = b58 * 256 + ch".
-      let i = 0;
-      for (let it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
-        carry += (256 * b58[it1]) >>> 0;
-        b58[it1] = (carry % BASE) >>> 0;
-        carry = (carry / BASE) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      pbegin++;
-    }
-    // Skip leading zeroes in base58 result.
-    let it2 = size - length;
-    while (it2 !== size && b58[it2] === 0) {
-      it2++;
-    }
-    // Translate the result into a string.
-    let str = LEADER.repeat(zeroes);
-    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]); }
-    return str
-  }
-  function decodeUnsafe (source) {
-    if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    if (source.length === 0) { return new Uint8Array() }
-    let psz = 0;
-    // Skip and count leading '1's.
-    let zeroes = 0;
-    let length = 0;
-    while (source[psz] === LEADER) {
-      zeroes++;
-      psz++;
-    }
-    // Allocate enough space in big-endian base256 representation.
-    const size = (((source.length - psz) * FACTOR) + 1) >>> 0; // log(58) / log(256), rounded up.
-    const b256 = new Uint8Array(size);
-    // Process the characters.
-    while (psz < source.length) {
-      // Find code of next character
-      const charCode = source.charCodeAt(psz);
-      // Base map can not be indexed using char code
-      if (charCode > 255) { return }
-      // Decode character
-      let carry = BASE_MAP[charCode];
-      // Invalid character
-      if (carry === 255) { return }
-      let i = 0;
-      for (let it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
-        carry += (BASE * b256[it3]) >>> 0;
-        b256[it3] = (carry % 256) >>> 0;
-        carry = (carry / 256) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      psz++;
-    }
-    // Skip leading zeroes in b256.
-    let it4 = size - length;
-    while (it4 !== size && b256[it4] === 0) {
-      it4++;
-    }
-    const vch = new Uint8Array(zeroes + (size - it4));
-    let j = zeroes;
-    while (it4 !== size) {
-      vch[j++] = b256[it4++];
-    }
-    return vch
-  }
-  function decode (string) {
-    const buffer = decodeUnsafe(string);
-    if (buffer) { return buffer }
-    throw new Error('Non-base' + BASE + ' character')
-  }
-  return {
-    encode,
-    decodeUnsafe,
-    decode
-  }
-}
-
-var ALPHABET$3 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-var bs58$2 = base$3(ALPHABET$3);
-
 // src/index.ts
 function parseSignMessageResponse(base64Response, networkId) {
   const networkPrefix = networkId.split(":")[0].toLowerCase();
@@ -8541,7 +8309,7 @@ function parseTransactionResponse(base64RawTransaction, networkId, hash) {
 function parseSolanaSignatureResponse(base64Response) {
   try {
     const signatureBytes = base64urlDecode(base64Response);
-    const signature = bs58$2.encode(signatureBytes);
+    const signature = bs58$1.encode(signatureBytes);
     return {
       signature,
       rawSignature: base64Response
@@ -8781,610 +8549,6 @@ function parseBitcoinTransactionToBase64Url(transaction) {
   throw new Error("Unsupported Bitcoin transaction format");
 }
 
-// base-x encoding / decoding
-// Copyright (c) 2018 base-x contributors
-// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
-// Distributed under the MIT software license, see the accompanying
-// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-function base$2 (ALPHABET) {
-  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
-  const BASE_MAP = new Uint8Array(256);
-  for (let j = 0; j < BASE_MAP.length; j++) {
-    BASE_MAP[j] = 255;
-  }
-  for (let i = 0; i < ALPHABET.length; i++) {
-    const x = ALPHABET.charAt(i);
-    const xc = x.charCodeAt(0);
-    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
-    BASE_MAP[xc] = i;
-  }
-  const BASE = ALPHABET.length;
-  const LEADER = ALPHABET.charAt(0);
-  const FACTOR = Math.log(BASE) / Math.log(256); // log(BASE) / log(256), rounded up
-  const iFACTOR = Math.log(256) / Math.log(BASE); // log(256) / log(BASE), rounded up
-  function encode (source) {
-    // eslint-disable-next-line no-empty
-    if (source instanceof Uint8Array) ; else if (ArrayBuffer.isView(source)) {
-      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
-    } else if (Array.isArray(source)) {
-      source = Uint8Array.from(source);
-    }
-    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
-    if (source.length === 0) { return '' }
-    // Skip & count leading zeroes.
-    let zeroes = 0;
-    let length = 0;
-    let pbegin = 0;
-    const pend = source.length;
-    while (pbegin !== pend && source[pbegin] === 0) {
-      pbegin++;
-      zeroes++;
-    }
-    // Allocate enough space in big-endian base58 representation.
-    const size = ((pend - pbegin) * iFACTOR + 1) >>> 0;
-    const b58 = new Uint8Array(size);
-    // Process the bytes.
-    while (pbegin !== pend) {
-      let carry = source[pbegin];
-      // Apply "b58 = b58 * 256 + ch".
-      let i = 0;
-      for (let it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
-        carry += (256 * b58[it1]) >>> 0;
-        b58[it1] = (carry % BASE) >>> 0;
-        carry = (carry / BASE) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      pbegin++;
-    }
-    // Skip leading zeroes in base58 result.
-    let it2 = size - length;
-    while (it2 !== size && b58[it2] === 0) {
-      it2++;
-    }
-    // Translate the result into a string.
-    let str = LEADER.repeat(zeroes);
-    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]); }
-    return str
-  }
-  function decodeUnsafe (source) {
-    if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    if (source.length === 0) { return new Uint8Array() }
-    let psz = 0;
-    // Skip and count leading '1's.
-    let zeroes = 0;
-    let length = 0;
-    while (source[psz] === LEADER) {
-      zeroes++;
-      psz++;
-    }
-    // Allocate enough space in big-endian base256 representation.
-    const size = (((source.length - psz) * FACTOR) + 1) >>> 0; // log(58) / log(256), rounded up.
-    const b256 = new Uint8Array(size);
-    // Process the characters.
-    while (psz < source.length) {
-      // Find code of next character
-      const charCode = source.charCodeAt(psz);
-      // Base map can not be indexed using char code
-      if (charCode > 255) { return }
-      // Decode character
-      let carry = BASE_MAP[charCode];
-      // Invalid character
-      if (carry === 255) { return }
-      let i = 0;
-      for (let it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
-        carry += (BASE * b256[it3]) >>> 0;
-        b256[it3] = (carry % 256) >>> 0;
-        carry = (carry / 256) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      psz++;
-    }
-    // Skip leading zeroes in b256.
-    let it4 = size - length;
-    while (it4 !== size && b256[it4] === 0) {
-      it4++;
-    }
-    const vch = new Uint8Array(zeroes + (size - it4));
-    let j = zeroes;
-    while (it4 !== size) {
-      vch[j++] = b256[it4++];
-    }
-    return vch
-  }
-  function decode (string) {
-    const buffer = decodeUnsafe(string);
-    if (buffer) { return buffer }
-    throw new Error('Non-base' + BASE + ' character')
-  }
-  return {
-    encode,
-    decodeUnsafe,
-    decode
-  }
-}
-
-var ALPHABET$2 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-var bs58$1 = base$2(ALPHABET$2);
-
-// base-x encoding / decoding
-// Copyright (c) 2018 base-x contributors
-// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
-// Distributed under the MIT software license, see the accompanying
-// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-function base$1 (ALPHABET) {
-  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
-  const BASE_MAP = new Uint8Array(256);
-  for (let j = 0; j < BASE_MAP.length; j++) {
-    BASE_MAP[j] = 255;
-  }
-  for (let i = 0; i < ALPHABET.length; i++) {
-    const x = ALPHABET.charAt(i);
-    const xc = x.charCodeAt(0);
-    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
-    BASE_MAP[xc] = i;
-  }
-  const BASE = ALPHABET.length;
-  const LEADER = ALPHABET.charAt(0);
-  const FACTOR = Math.log(BASE) / Math.log(256); // log(BASE) / log(256), rounded up
-  const iFACTOR = Math.log(256) / Math.log(BASE); // log(256) / log(BASE), rounded up
-  function encode (source) {
-    // eslint-disable-next-line no-empty
-    if (source instanceof Uint8Array) ; else if (ArrayBuffer.isView(source)) {
-      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
-    } else if (Array.isArray(source)) {
-      source = Uint8Array.from(source);
-    }
-    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
-    if (source.length === 0) { return '' }
-    // Skip & count leading zeroes.
-    let zeroes = 0;
-    let length = 0;
-    let pbegin = 0;
-    const pend = source.length;
-    while (pbegin !== pend && source[pbegin] === 0) {
-      pbegin++;
-      zeroes++;
-    }
-    // Allocate enough space in big-endian base58 representation.
-    const size = ((pend - pbegin) * iFACTOR + 1) >>> 0;
-    const b58 = new Uint8Array(size);
-    // Process the bytes.
-    while (pbegin !== pend) {
-      let carry = source[pbegin];
-      // Apply "b58 = b58 * 256 + ch".
-      let i = 0;
-      for (let it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
-        carry += (256 * b58[it1]) >>> 0;
-        b58[it1] = (carry % BASE) >>> 0;
-        carry = (carry / BASE) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      pbegin++;
-    }
-    // Skip leading zeroes in base58 result.
-    let it2 = size - length;
-    while (it2 !== size && b58[it2] === 0) {
-      it2++;
-    }
-    // Translate the result into a string.
-    let str = LEADER.repeat(zeroes);
-    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]); }
-    return str
-  }
-  function decodeUnsafe (source) {
-    if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    if (source.length === 0) { return new Uint8Array() }
-    let psz = 0;
-    // Skip and count leading '1's.
-    let zeroes = 0;
-    let length = 0;
-    while (source[psz] === LEADER) {
-      zeroes++;
-      psz++;
-    }
-    // Allocate enough space in big-endian base256 representation.
-    const size = (((source.length - psz) * FACTOR) + 1) >>> 0; // log(58) / log(256), rounded up.
-    const b256 = new Uint8Array(size);
-    // Process the characters.
-    while (psz < source.length) {
-      // Find code of next character
-      const charCode = source.charCodeAt(psz);
-      // Base map can not be indexed using char code
-      if (charCode > 255) { return }
-      // Decode character
-      let carry = BASE_MAP[charCode];
-      // Invalid character
-      if (carry === 255) { return }
-      let i = 0;
-      for (let it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
-        carry += (BASE * b256[it3]) >>> 0;
-        b256[it3] = (carry % 256) >>> 0;
-        carry = (carry / 256) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      psz++;
-    }
-    // Skip leading zeroes in b256.
-    let it4 = size - length;
-    while (it4 !== size && b256[it4] === 0) {
-      it4++;
-    }
-    const vch = new Uint8Array(zeroes + (size - it4));
-    let j = zeroes;
-    while (it4 !== size) {
-      vch[j++] = b256[it4++];
-    }
-    return vch
-  }
-  function decode (string) {
-    const buffer = decodeUnsafe(string);
-    if (buffer) { return buffer }
-    throw new Error('Non-base' + BASE + ' character')
-  }
-  return {
-    encode,
-    decodeUnsafe,
-    decode
-  }
-}
-
-var ALPHABET$1 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-var bs582 = base$1(ALPHABET$1);
-
-var eventemitter3 = {exports: {}};
-
-var hasRequiredEventemitter3;
-
-function requireEventemitter3 () {
-	if (hasRequiredEventemitter3) return eventemitter3.exports;
-	hasRequiredEventemitter3 = 1;
-	(function (module) {
-
-		var has = Object.prototype.hasOwnProperty
-		  , prefix = '~';
-
-		/**
-		 * Constructor to create a storage for our `EE` objects.
-		 * An `Events` instance is a plain object whose properties are event names.
-		 *
-		 * @constructor
-		 * @private
-		 */
-		function Events() {}
-
-		//
-		// We try to not inherit from `Object.prototype`. In some engines creating an
-		// instance in this way is faster than calling `Object.create(null)` directly.
-		// If `Object.create(null)` is not supported we prefix the event names with a
-		// character to make sure that the built-in object properties are not
-		// overridden or used as an attack vector.
-		//
-		if (Object.create) {
-		  Events.prototype = Object.create(null);
-
-		  //
-		  // This hack is needed because the `__proto__` property is still inherited in
-		  // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
-		  //
-		  if (!new Events().__proto__) prefix = false;
-		}
-
-		/**
-		 * Representation of a single event listener.
-		 *
-		 * @param {Function} fn The listener function.
-		 * @param {*} context The context to invoke the listener with.
-		 * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
-		 * @constructor
-		 * @private
-		 */
-		function EE(fn, context, once) {
-		  this.fn = fn;
-		  this.context = context;
-		  this.once = once || false;
-		}
-
-		/**
-		 * Add a listener for a given event.
-		 *
-		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} context The context to invoke the listener with.
-		 * @param {Boolean} once Specify if the listener is a one-time listener.
-		 * @returns {EventEmitter}
-		 * @private
-		 */
-		function addListener(emitter, event, fn, context, once) {
-		  if (typeof fn !== 'function') {
-		    throw new TypeError('The listener must be a function');
-		  }
-
-		  var listener = new EE(fn, context || emitter, once)
-		    , evt = prefix ? prefix + event : event;
-
-		  if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;
-		  else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
-		  else emitter._events[evt] = [emitter._events[evt], listener];
-
-		  return emitter;
-		}
-
-		/**
-		 * Clear event by name.
-		 *
-		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
-		 * @param {(String|Symbol)} evt The Event name.
-		 * @private
-		 */
-		function clearEvent(emitter, evt) {
-		  if (--emitter._eventsCount === 0) emitter._events = new Events();
-		  else delete emitter._events[evt];
-		}
-
-		/**
-		 * Minimal `EventEmitter` interface that is molded against the Node.js
-		 * `EventEmitter` interface.
-		 *
-		 * @constructor
-		 * @public
-		 */
-		function EventEmitter() {
-		  this._events = new Events();
-		  this._eventsCount = 0;
-		}
-
-		/**
-		 * Return an array listing the events for which the emitter has registered
-		 * listeners.
-		 *
-		 * @returns {Array}
-		 * @public
-		 */
-		EventEmitter.prototype.eventNames = function eventNames() {
-		  var names = []
-		    , events
-		    , name;
-
-		  if (this._eventsCount === 0) return names;
-
-		  for (name in (events = this._events)) {
-		    if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
-		  }
-
-		  if (Object.getOwnPropertySymbols) {
-		    return names.concat(Object.getOwnPropertySymbols(events));
-		  }
-
-		  return names;
-		};
-
-		/**
-		 * Return the listeners registered for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Array} The registered listeners.
-		 * @public
-		 */
-		EventEmitter.prototype.listeners = function listeners(event) {
-		  var evt = prefix ? prefix + event : event
-		    , handlers = this._events[evt];
-
-		  if (!handlers) return [];
-		  if (handlers.fn) return [handlers.fn];
-
-		  for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
-		    ee[i] = handlers[i].fn;
-		  }
-
-		  return ee;
-		};
-
-		/**
-		 * Return the number of listeners listening to a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Number} The number of listeners.
-		 * @public
-		 */
-		EventEmitter.prototype.listenerCount = function listenerCount(event) {
-		  var evt = prefix ? prefix + event : event
-		    , listeners = this._events[evt];
-
-		  if (!listeners) return 0;
-		  if (listeners.fn) return 1;
-		  return listeners.length;
-		};
-
-		/**
-		 * Calls each of the listeners registered for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @returns {Boolean} `true` if the event had listeners, else `false`.
-		 * @public
-		 */
-		EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
-		  var evt = prefix ? prefix + event : event;
-
-		  if (!this._events[evt]) return false;
-
-		  var listeners = this._events[evt]
-		    , len = arguments.length
-		    , args
-		    , i;
-
-		  if (listeners.fn) {
-		    if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
-
-		    switch (len) {
-		      case 1: return listeners.fn.call(listeners.context), true;
-		      case 2: return listeners.fn.call(listeners.context, a1), true;
-		      case 3: return listeners.fn.call(listeners.context, a1, a2), true;
-		      case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;
-		      case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
-		      case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
-		    }
-
-		    for (i = 1, args = new Array(len -1); i < len; i++) {
-		      args[i - 1] = arguments[i];
-		    }
-
-		    listeners.fn.apply(listeners.context, args);
-		  } else {
-		    var length = listeners.length
-		      , j;
-
-		    for (i = 0; i < length; i++) {
-		      if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
-
-		      switch (len) {
-		        case 1: listeners[i].fn.call(listeners[i].context); break;
-		        case 2: listeners[i].fn.call(listeners[i].context, a1); break;
-		        case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;
-		        case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;
-		        default:
-		          if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {
-		            args[j - 1] = arguments[j];
-		          }
-
-		          listeners[i].fn.apply(listeners[i].context, args);
-		      }
-		    }
-		  }
-
-		  return true;
-		};
-
-		/**
-		 * Add a listener for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} [context=this] The context to invoke the listener with.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.on = function on(event, fn, context) {
-		  return addListener(this, event, fn, context, false);
-		};
-
-		/**
-		 * Add a one-time listener for a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn The listener function.
-		 * @param {*} [context=this] The context to invoke the listener with.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.once = function once(event, fn, context) {
-		  return addListener(this, event, fn, context, true);
-		};
-
-		/**
-		 * Remove the listeners of a given event.
-		 *
-		 * @param {(String|Symbol)} event The event name.
-		 * @param {Function} fn Only remove the listeners that match this function.
-		 * @param {*} context Only remove the listeners that have this context.
-		 * @param {Boolean} once Only remove one-time listeners.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
-		  var evt = prefix ? prefix + event : event;
-
-		  if (!this._events[evt]) return this;
-		  if (!fn) {
-		    clearEvent(this, evt);
-		    return this;
-		  }
-
-		  var listeners = this._events[evt];
-
-		  if (listeners.fn) {
-		    if (
-		      listeners.fn === fn &&
-		      (!once || listeners.once) &&
-		      (!context || listeners.context === context)
-		    ) {
-		      clearEvent(this, evt);
-		    }
-		  } else {
-		    for (var i = 0, events = [], length = listeners.length; i < length; i++) {
-		      if (
-		        listeners[i].fn !== fn ||
-		        (once && !listeners[i].once) ||
-		        (context && listeners[i].context !== context)
-		      ) {
-		        events.push(listeners[i]);
-		      }
-		    }
-
-		    //
-		    // Reset the array, or remove it completely if we have no more listeners.
-		    //
-		    if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
-		    else clearEvent(this, evt);
-		  }
-
-		  return this;
-		};
-
-		/**
-		 * Remove all listeners, or those of the specified event.
-		 *
-		 * @param {(String|Symbol)} [event] The event name.
-		 * @returns {EventEmitter} `this`.
-		 * @public
-		 */
-		EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
-		  var evt;
-
-		  if (event) {
-		    evt = prefix ? prefix + event : event;
-		    if (this._events[evt]) clearEvent(this, evt);
-		  } else {
-		    this._events = new Events();
-		    this._eventsCount = 0;
-		  }
-
-		  return this;
-		};
-
-		//
-		// Alias methods names because people roll like that.
-		//
-		EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
-		EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-		//
-		// Expose the prefix.
-		//
-		EventEmitter.prefixed = prefix;
-
-		//
-		// Allow `EventEmitter` to be imported as module namespace.
-		//
-		EventEmitter.EventEmitter = EventEmitter;
-
-		//
-		// Expose the module.
-		//
-		{
-		  module.exports = EventEmitter;
-		} 
-	} (eventemitter3));
-	return eventemitter3.exports;
-}
-
-var eventemitter3Exports = requireEventemitter3();
-var EventEmitter2 = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
-
 // src/embedded-provider.ts
 
 // src/constants.ts
@@ -9396,7 +8560,7 @@ var EmbeddedSolanaChain = class {
     this.currentNetworkId = NetworkId.SOLANA_MAINNET;
     this._connected = false;
     this._publicKey = null;
-    this.eventEmitter = new EventEmitter2();
+    this.eventEmitter = new EventEmitter3();
     this.setupEventListeners();
     this.syncInitialState();
   }
@@ -9420,7 +8584,7 @@ var EmbeddedSolanaChain = class {
       message: messageStr,
       networkId: this.currentNetworkId
     });
-    const signature = typeof result.signature === "string" ? new Uint8Array(bs582.decode(result.signature)) : result.signature;
+    const signature = typeof result.signature === "string" ? new Uint8Array(bs58$1.decode(result.signature)) : result.signature;
     return {
       signature,
       publicKey: this._publicKey || ""
@@ -9526,7 +8690,7 @@ var EmbeddedEthereumChain = class {
     this.currentNetworkId = NetworkId.ETHEREUM_MAINNET;
     this._connected = false;
     this._accounts = [];
-    this.eventEmitter = new EventEmitter2();
+    this.eventEmitter = new EventEmitter3();
     this.setupEventListeners();
     this.syncInitialState();
   }
@@ -9790,7 +8954,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     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.logger.log("EMBEDDED_PROVIDER", "Event listener added", { event });
   }
   off(event, callback) {
@@ -10103,7 +9267,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       publicKey: stamperInfo.publicKey,
       platform: platformName
     });
-    const base64urlPublicKey = base64urlEncode(bs582.decode(stamperInfo.publicKey));
+    const base64urlPublicKey = base64urlEncode(bs58$1.decode(stamperInfo.publicKey));
     const username = `user-${randomUUID()}`;
     const { organizationId } = await tempClient.createOrganization(organizationName, [
       {
@@ -10681,7 +9845,8 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
         apiBaseUrl: this.config.apiBaseUrl,
         organizationId: session.organizationId,
         headers: {
-          ...this.platform.analyticsHeaders || {}
+          ...this.platform.analyticsHeaders || {},
+          ...session.authUserId ? { "x-auth-user-id": session.authUserId } : {}
         }
       },
       this.stamper
@@ -10691,133 +9856,6 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
   }
 };
 
-// base-x encoding / decoding
-// Copyright (c) 2018 base-x contributors
-// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
-// Distributed under the MIT software license, see the accompanying
-// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-function base (ALPHABET) {
-  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
-  const BASE_MAP = new Uint8Array(256);
-  for (let j = 0; j < BASE_MAP.length; j++) {
-    BASE_MAP[j] = 255;
-  }
-  for (let i = 0; i < ALPHABET.length; i++) {
-    const x = ALPHABET.charAt(i);
-    const xc = x.charCodeAt(0);
-    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
-    BASE_MAP[xc] = i;
-  }
-  const BASE = ALPHABET.length;
-  const LEADER = ALPHABET.charAt(0);
-  const FACTOR = Math.log(BASE) / Math.log(256); // log(BASE) / log(256), rounded up
-  const iFACTOR = Math.log(256) / Math.log(BASE); // log(256) / log(BASE), rounded up
-  function encode (source) {
-    // eslint-disable-next-line no-empty
-    if (source instanceof Uint8Array) ; else if (ArrayBuffer.isView(source)) {
-      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
-    } else if (Array.isArray(source)) {
-      source = Uint8Array.from(source);
-    }
-    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
-    if (source.length === 0) { return '' }
-    // Skip & count leading zeroes.
-    let zeroes = 0;
-    let length = 0;
-    let pbegin = 0;
-    const pend = source.length;
-    while (pbegin !== pend && source[pbegin] === 0) {
-      pbegin++;
-      zeroes++;
-    }
-    // Allocate enough space in big-endian base58 representation.
-    const size = ((pend - pbegin) * iFACTOR + 1) >>> 0;
-    const b58 = new Uint8Array(size);
-    // Process the bytes.
-    while (pbegin !== pend) {
-      let carry = source[pbegin];
-      // Apply "b58 = b58 * 256 + ch".
-      let i = 0;
-      for (let it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
-        carry += (256 * b58[it1]) >>> 0;
-        b58[it1] = (carry % BASE) >>> 0;
-        carry = (carry / BASE) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      pbegin++;
-    }
-    // Skip leading zeroes in base58 result.
-    let it2 = size - length;
-    while (it2 !== size && b58[it2] === 0) {
-      it2++;
-    }
-    // Translate the result into a string.
-    let str = LEADER.repeat(zeroes);
-    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]); }
-    return str
-  }
-  function decodeUnsafe (source) {
-    if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    if (source.length === 0) { return new Uint8Array() }
-    let psz = 0;
-    // Skip and count leading '1's.
-    let zeroes = 0;
-    let length = 0;
-    while (source[psz] === LEADER) {
-      zeroes++;
-      psz++;
-    }
-    // Allocate enough space in big-endian base256 representation.
-    const size = (((source.length - psz) * FACTOR) + 1) >>> 0; // log(58) / log(256), rounded up.
-    const b256 = new Uint8Array(size);
-    // Process the characters.
-    while (psz < source.length) {
-      // Find code of next character
-      const charCode = source.charCodeAt(psz);
-      // Base map can not be indexed using char code
-      if (charCode > 255) { return }
-      // Decode character
-      let carry = BASE_MAP[charCode];
-      // Invalid character
-      if (carry === 255) { return }
-      let i = 0;
-      for (let it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
-        carry += (BASE * b256[it3]) >>> 0;
-        b256[it3] = (carry % 256) >>> 0;
-        carry = (carry / 256) >>> 0;
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i;
-      psz++;
-    }
-    // Skip leading zeroes in b256.
-    let it4 = size - length;
-    while (it4 !== size && b256[it4] === 0) {
-      it4++;
-    }
-    const vch = new Uint8Array(zeroes + (size - it4));
-    let j = zeroes;
-    while (it4 !== size) {
-      vch[j++] = b256[it4++];
-    }
-    return vch
-  }
-  function decode (string) {
-    const buffer = decodeUnsafe(string);
-    if (buffer) { return buffer }
-    throw new Error('Non-base' + BASE + ' character')
-  }
-  return {
-    encode,
-    decodeUnsafe,
-    decode
-  }
-}
-
-var ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-var bs58 = base(ALPHABET);
-
 // src/index.ts
 var IndexedDbStamper = class {
   // Optional for PKI, required for OIDC
@@ -10891,14 +9929,14 @@ var IndexedDbStamper = class {
     const salt = params.type === "OIDC" ? params.salt : this.salt;
     const stampData = stampType === "PKI" ? {
       // Decode base58 public key to bytes, then encode as base64url (consistent with ApiKeyStamper)
-      publicKey: base64urlEncode(bs58.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
+      publicKey: base64urlEncode(bs58$1.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
       signature: signatureBase64url,
       kind: "PKI",
       algorithm: this.algorithm
     } : {
       kind: "OIDC",
       idToken,
-      publicKey: base64urlEncode(bs58.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
+      publicKey: base64urlEncode(bs58$1.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
       salt,
       algorithm: this.algorithm,
       signature: signatureBase64url
@@ -11001,7 +10039,7 @@ var IndexedDbStamper = class {
       ["sign", "verify"]
     );
     const rawPublicKeyBuffer = await crypto.subtle.exportKey("raw", keyPair.publicKey);
-    const publicKeyBase58 = bs58.encode(new Uint8Array(rawPublicKeyBuffer));
+    const publicKeyBase58 = bs58$1.encode(new Uint8Array(rawPublicKeyBuffer));
     const keyIdBuffer = await crypto.subtle.digest("SHA-256", rawPublicKeyBuffer);
     const keyId = base64urlEncode(new Uint8Array(keyIdBuffer)).substring(0, 16);
     const now = Date.now();
@@ -11358,7 +10396,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) : [];
@@ -11501,7 +10539,8 @@ async function discoverWallets(addressTypes) {
 }
 var InjectedWalletSolanaChain = class {
   constructor(provider, walletId, walletName) {
-    this.eventEmitter = new EventEmitter4();
+    // Expose eventEmitter for testing - allows tests to trigger events directly
+    this.eventEmitter = new EventEmitter3();
     this._connected = false;
     this._publicKey = null;
     this.provider = provider;
@@ -11729,6 +10768,7 @@ var InjectedWalletSolanaChain = class {
       });
       this.provider.on("accountChanged", (publicKey) => {
         this._publicKey = publicKey;
+        this._connected = publicKey != null && publicKey.length > 0;
         this.eventEmitter.emit("accountChanged", publicKey);
       });
     }
@@ -11742,22 +10782,23 @@ var InjectedWalletSolanaChain = class {
 };
 var WalletStandardSolanaAdapter = class {
   constructor(wallet, walletId, walletName) {
-    this._connected = false;
+    this.eventEmitter = new EventEmitter3();
     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();
@@ -11778,14 +10819,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 ? bufferExports.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) {
@@ -11799,11 +10839,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", {
@@ -11816,14 +10855,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}`);
@@ -11836,7 +10875,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", {
@@ -11849,8 +10888,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) {
@@ -11869,7 +10908,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");
@@ -11891,8 +10931,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) {
@@ -11963,40 +11003,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
@@ -12040,7 +11133,8 @@ var WalletStandardSolanaAdapter = class {
 };
 var InjectedWalletEthereumChain = class {
   constructor(provider, walletId, walletName) {
-    this.eventEmitter = new EventEmitter4();
+    // Expose eventEmitter for testing - allows tests to trigger events directly
+    this.eventEmitter = new EventEmitter3();
     this._connected = false;
     this._chainId = "0x1";
     this._accounts = [];
@@ -12414,6 +11508,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) => {
@@ -12429,295 +11524,97 @@ var InjectedWalletEthereumChain = class {
     this.eventEmitter.off(event, listener);
   }
 };
-var PhantomSolanaChain = class {
-  constructor(phantom) {
-    this._publicKey = null;
-    this.eventEmitter = new EventEmitter4();
-    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(bufferExports.Buffer.from(result.signature, "base64")),
-      publicKey: this._publicKey || ""
-    };
+
+// 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();
+    this.discoveryPromise = null;
   }
-  async signTransaction(transaction) {
-    if (!this.connected) {
-      return Promise.reject(new Error("Provider not connected. Call provider connect first."));
+  register(info) {
+    const wrappedProviders = {};
+    if (info.providers?.solana) {
+      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,
+          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
+        });
+      }
     }
-    try {
-      const result = await this.phantom.solana.signTransaction(transaction);
-      return result;
-    } catch (error) {
-      return Promise.reject(error);
+    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);
   }
-  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."));
+  /**
+   * 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(DerivationInfoAddressFormatEnum.solana) && phantomInstance.solana) {
+      wrappedProviders.solana = new InjectedWalletSolanaChain(phantomInstance.solana, "phantom", "Phantom");
+      debug.log(DebugCategory.BROWSER_SDK, "Created InjectedWalletSolanaChain wrapper for Phantom", {
+        walletId: "phantom"
+      });
     }
-    try {
-      const result = await this.phantom.solana.signAllTransactions(transactions);
-      return result;
-    } catch (error) {
-      return Promise.reject(error);
+    if (addressTypes.includes(DerivationInfoAddressFormatEnum.ethereum) && phantomInstance.ethereum) {
+      wrappedProviders.ethereum = new InjectedWalletEthereumChain(phantomInstance.ethereum, "phantom", "Phantom");
+      debug.log(DebugCategory.BROWSER_SDK, "Created InjectedWalletEthereumChain wrapper for Phantom", {
+        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,
+      discovery: "phantom"
+    };
+    this.wallets.set("phantom", phantomWallet);
+    debug.log(DebugCategory.BROWSER_SDK, "Registered Phantom wallet with chain wrappers", {
+      addressTypes,
+      hasSolana: !!wrappedProviders.solana,
+      hasEthereum: !!wrappedProviders.ethereum
+    });
   }
-  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);
-    }
+  unregister(id) {
+    this.wallets.delete(id);
   }
-  switchNetwork(_network) {
-    return Promise.resolve();
+  has(id) {
+    return this.wallets.has(id);
   }
-  // Legacy methods
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
+  getById(id) {
+    return this.wallets.get(id);
   }
-  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);
-  }
-};
-var PhantomEthereumChain = class {
-  constructor(phantom) {
-    this._chainId = "0x1";
-    this._accounts = [];
-    this.eventEmitter = new EventEmitter4();
-    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;
-}
-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(DerivationInfoAddressFormatEnum.solana) && phantomInstance.solana) {
-      wrappedProviders.solana = new PhantomSolanaChain(phantomInstance);
-      debug.log(DebugCategory.BROWSER_SDK, "Created PhantomSolanaChain wrapper", {
-        walletId: "phantom"
-      });
-    }
-    if (addressTypes.includes(DerivationInfoAddressFormatEnum.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,
-      discovery: "phantom"
-    };
-    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());
+  getAll() {
+    return Array.from(this.wallets.values());
   }
   getByAddressTypes(addressTypes) {
     if (addressTypes.length === 0) {
@@ -12770,15 +11667,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();
@@ -12809,9 +11707,12 @@ var InjectedProvider = class {
       });
     }
   }
-  get solana() {
-    if (!this.addressTypes.includes(DerivationInfoAddressFormatEnum.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);
@@ -12826,39 +11727,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(DerivationInfoAddressFormatEnum.solana, "solana", "Solana");
   }
   /**
    * Access to Ethereum chain operations
    */
   get ethereum() {
-    if (!this.addressTypes.includes(DerivationInfoAddressFormatEnum.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(DerivationInfoAddressFormatEnum.ethereum, "ethereum", "Ethereum");
   }
   validateAndSelectWallet(requestedWalletId) {
     if (!this.walletRegistry.has(requestedWalletId)) {
@@ -12896,13 +11780,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(DerivationInfoAddressFormatEnum.solana) && walletInfo.providers?.solana) {
@@ -13084,10 +11962,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: []
@@ -13156,13 +12038,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,
@@ -13203,6 +12079,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], DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.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], DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.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, DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.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, DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.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;
@@ -13296,19 +12332,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);
       }
     }
@@ -13330,246 +12369,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(DerivationInfoAddressFormatEnum.solana)) {
-        this.setupSolanaEvents(walletInfo.phantomInstance);
-      }
-      if (this.addressTypes.includes(DerivationInfoAddressFormatEnum.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: DerivationInfoAddressFormatEnum.solana, address: publicKey };
-      const hasSolana = state.addresses.some((addr) => addr.addressType === DerivationInfoAddressFormatEnum.solana);
-      const newAddresses = hasSolana ? state.addresses.map((addr) => addr.addressType === DerivationInfoAddressFormatEnum.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
-      });
+    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 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 !== DerivationInfoAddressFormatEnum.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 === DerivationInfoAddressFormatEnum.solana);
-      const newAddresses = solanaIndex >= 0 ? state.addresses.map(
-        (addr, idx) => idx === solanaIndex ? { addressType: DerivationInfoAddressFormatEnum.solana, address: publicKey } : addr
-      ) : [...state.addresses, { addressType: DerivationInfoAddressFormatEnum.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: DerivationInfoAddressFormatEnum.ethereum, address }));
-      const otherAddresses = state.addresses.filter((addr) => addr.addressType !== DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.ethereum);
-      if (accounts && accounts.length > 0) {
-        const ethAddresses = accounts.map((address) => ({ addressType: DerivationInfoAddressFormatEnum.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"
-        });
-      }
-    };
-    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 !== DerivationInfoAddressFormatEnum.ethereum);
-        if (accounts && accounts.length > 0) {
-          const ethAddresses = accounts.map((address) => ({ addressType: DerivationInfoAddressFormatEnum.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 === DerivationInfoAddressFormatEnum.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 !== DerivationInfoAddressFormatEnum.solana);
-        if (publicKey) {
-          const newAddresses = [...otherAddresses, { addressType: DerivationInfoAddressFormatEnum.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(DerivationInfoAddressFormatEnum.solana) && walletInfo.providers?.solana) {
+      this.setupSolanaEventListeners(walletInfo.providers.solana, walletId, "wallet");
     }
-    if (this.selectedWalletId) {
-      this.externalWalletEventListenersSetup.add(this.selectedWalletId);
+    if (this.addressTypes.includes(DerivationInfoAddressFormatEnum.ethereum) && walletInfo.providers?.ethereum) {
+      this.setupEthereumEventListeners(walletInfo.providers.ethereum, walletId, "wallet");
     }
+    this.eventListenersSetup.add(walletId);
+    this.eventsInitialized = true;
   }
 };
 
@@ -13871,7 +12740,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
       });
@@ -14126,7 +12995,7 @@ var EmbeddedProvider = class extends EmbeddedProvider$1 {
         // 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"
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.2"
         // Replaced at build time
       }
     };
@@ -14405,7 +13274,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();
   }
   /**
@@ -14414,8 +13283,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);
       }
     }
@@ -15672,7 +14541,8 @@ function ConnectModalContent({
   const isConnectingState = baseConnect.isConnecting || isConnecting;
   const errorState = baseConnect.error ? baseConnect.error.message : error;
   const showDivider = !(allowedProviders.length === 1 && allowedProviders.includes("injected"));
-  const shouldShowOtherWalletsButton = discoveredWallets.length > 2;
+  const isInjectedOnly = allowedProviders.length === 1 && allowedProviders.includes("injected");
+  const shouldShowOtherWalletsButton = !isInjectedOnly && discoveredWallets.length > 2;
   const walletsToShowInline = shouldShowOtherWalletsButton ? [] : discoveredWallets;
   const connectWithAuthProvider = useCallback(
     async (provider, walletId) => {
@@ -15941,7 +14811,7 @@ function ConnectModalContent({
             ] })
           }
         ),
-        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && (!isMobile || isExtensionInstalled.isInstalled) && /* @__PURE__ */ jsxs(Fragment, { children: [
+        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && /* @__PURE__ */ jsxs(Fragment, { children: [
           showDivider && /* @__PURE__ */ jsxs("div", { style: dividerStyle, children: [
             /* @__PURE__ */ jsx("div", { style: dividerLineStyle }),
             /* @__PURE__ */ jsx("span", { style: dividerTextStyle, children: "OR" }),
@@ -16499,4 +15369,4 @@ function ConnectBox({ maxWidth = "350px", transparent = false, appIcon, appName
 }
 
 export { DerivationInfoAddressFormatEnum as AddressType, ConnectBox, ConnectButton, DebugLevel, NetworkId, PhantomProvider, darkTheme, debug, isMobileDevice, lightTheme, mergeTheme, useAccounts, useAutoConfirm, useConnect, useDisconnect, useDiscoveredWallets, useEthereum, useIsExtensionInstalled, useIsPhantomLoginAvailable, useModal, usePhantom, useSolana, useTheme };
-//# sourceMappingURL=index-qEuONikY.esm.js.map
+//# sourceMappingURL=index-B1INQP2H.esm.js.map