@bounded-sh/client 0.0.2 → 0.0.4

package/dist/{index-CqoP9udN.js → index-BMrN-6oK.js}

@@ -2,7 +2,7 @@
 
 var React = require('react');
 var axios = require('axios');
-var index_native = require('./index.native-NgHStPq0.js');
+var index_native = require('./index.native-D82ofFXB.js');
 var web3_js = require('@solana/web3.js');
 var jsxRuntime = require('react/jsx-runtime');
 require('@coral-xyz/anchor');
@@ -509,6 +509,50 @@ var GetAccountsMethodEnum;
     GetAccountsMethodEnum["getAccounts"] = "getAccounts";
 })(GetAccountsMethodEnum || (GetAccountsMethodEnum = {}));
 
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * kms-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.1.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * @export
+ * @enum {string}
+ */
+var GetOrCreatePhantomOrganizationMethodEnum;
+(function (GetOrCreatePhantomOrganizationMethodEnum) {
+    GetOrCreatePhantomOrganizationMethodEnum["getOrCreatePhantomOrganization"] = "getOrCreatePhantomOrganization";
+})(GetOrCreatePhantomOrganizationMethodEnum || (GetOrCreatePhantomOrganizationMethodEnum = {}));
+
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * kms-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.1.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * @export
+ * @enum {string}
+ */
+var GetOrganizationWalletsMethodEnum;
+(function (GetOrganizationWalletsMethodEnum) {
+    GetOrganizationWalletsMethodEnum["getOrganizationWallets"] = "getOrganizationWallets";
+})(GetOrganizationWalletsMethodEnum || (GetOrganizationWalletsMethodEnum = {}));
+
 /* tslint:disable */
 /* eslint-disable */
 /**
@@ -597,6 +641,13 @@ var UserPolicyOneOfTypeEnum;
     UserPolicyOneOfTypeEnum["root"] = "ROOT";
 })(UserPolicyOneOfTypeEnum || (UserPolicyOneOfTypeEnum = {}));
 
+// src/auth2.ts
+var TOKEN_REFRESH_BUFFER_MS = 15 * 60 * 1e3;
+var DEFAULT_AUTHENTICATOR_ALGORITHM = Algorithm.ed25519;
+
+// src/icons.ts
+var PHANTOM_ICON = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTA4IiBoZWlnaHQ9IjEwOCIgdmlld0JveD0iMCAwIDEwOCAxMDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxMDgiIGhlaWdodD0iMTA4IiByeD0iMjYiIGZpbGw9IiNBQjlGRjIiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik00Ni41MjY3IDY5LjkyMjlDNDIuMDA1NCA3Ni44NTA5IDM0LjQyOTIgODUuNjE4MiAyNC4zNDggODUuNjE4MkMxOS41ODI0IDg1LjYxODIgMTUgODMuNjU2MyAxNSA3NS4xMzQyQzE1IDUzLjQzMDUgNDQuNjMyNiAxOS44MzI3IDcyLjEyNjggMTkuODMyN0M4Ny43NjggMTkuODMyNyA5NCAzMC42ODQ2IDk0IDQzLjAwNzlDOTQgNTguODI1OCA4My43MzU1IDc2LjkxMjIgNzMuNTMyMSA3Ni45MTIyQzcwLjI5MzkgNzYuOTEyMiA2OC43MDUzIDc1LjEzNDIgNjguNzA1MyA3Mi4zMTRDNjguNzA1MyA3MS41NzgzIDY4LjgyNzUgNzAuNzgxMiA2OS4wNzE5IDY5LjkyMjlDNjUuNTg5MyA3NS44Njk5IDU4Ljg2ODUgODEuMzg3OCA1Mi41NzU0IDgxLjM4NzhDNDcuOTkzIDgxLjM4NzggNDUuNjcxMyA3OC41MDYzIDQ1LjY3MTMgNzQuNDU5OEM0NS42NzEzIDcyLjk4ODQgNDUuOTc2OCA3MS40NTU2IDQ2LjUyNjcgNjkuOTIyOVpNODMuNjc2MSA0Mi41Nzk0QzgzLjY3NjEgNDYuMTcwNCA4MS41NTc1IDQ3Ljk2NTggNzkuMTg3NSA0Ny45NjU4Qzc2Ljc4MTYgNDcuOTY1OCA3NC42OTg5IDQ2LjE3MDQgNzQuNjk4OSA0Mi41Nzk0Qzc0LjY5ODkgMzguOTg4NSA3Ni43ODE2IDM3LjE5MzEgNzkuMTg3NSAzNy4xOTMxQzgxLjU1NzUgMzcuMTkzMSA4My42NzYxIDM4Ljk4ODUgODMuNjc2MSA0Mi41Nzk0Wk03MC4yMTAzIDQyLjU3OTVDNzAuMjEwMyA0Ni4xNzA0IDY4LjA5MTYgNDcuOTY1OCA2NS43MjE2IDQ3Ljk2NThDNjMuMzE1NyA0Ny45NjU4IDYxLjIzMyA0Ni4xNzA0IDYxLjIzMyA0Mi41Nzk1QzYxLjIzMyAzOC45ODg1IDYzLjMxNTcgMzcuMTkzMSA2NS43MjE2IDM3LjE5MzFDNjguMDkxNiAzNy4xOTMxIDcwLjIxMDMgMzguOTg4NSA3MC4yMTAzIDQyLjU3OTVaIiBmaWxsPSIjRkZGREY4Ii8+Cjwvc3ZnPgo=";
+
 // src/network-ids.ts
 var NetworkId = /* @__PURE__ */ ((NetworkId2) => {
   NetworkId2["SOLANA_MAINNET"] = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
@@ -900,13 +951,15 @@ var ANALYTICS_HEADERS = {
   SDK_VERSION: "x-phantom-sdk-version",
   // SDK version, e.g. 1.0.0
   PLATFORM: "x-phantom-platform",
-  // firefox, chrome, safari, ios, android, etc.
+  // ext-sdk for all SDK requests
   WALLET_TYPE: "x-phantom-wallet-type",
   // app-wallet, user-wallet
   APP_ID: "x-app-id",
   // Your application ID for identifying your app in analytics
-  PLATFORM_VERSION: "x-phantom-platform-version"
+  PLATFORM_VERSION: "x-phantom-platform-version",
   // OS version, device model, etc.
+  CLIENT: "x-phantom-client"
+  // mcp, chrome, firefox, safari, node, ios, android, etc.
 };
 
 // src/environments.ts
@@ -1018,6 +1071,12 @@ function isSolanaChain(networkId) {
   return network === "solana";
 }
 
+// src/index.ts
+async function sha256$2(input) {
+  const digest = await crypto.subtle.digest("SHA-256", input);
+  return new Uint8Array(digest);
+}
+
 // src/PhantomClient.ts
 var CAIP2_NETWORK_MAPPINGS = {
   // Solana networks
@@ -1197,6 +1256,12 @@ function getErrorMessage(error, fallbackMessage = "An error occurred") {
   }
   return fallbackMessage;
 }
+function isAuthenticationError(error) {
+  if (axios.isAxiosError(error)) {
+    return error.response?.status === 401 || error.response?.status === 403;
+  }
+  return false;
+}
 function parseWalletServiceError(data) {
   if (!data || !data.type) {
     return null;
@@ -1231,6 +1296,7 @@ var PhantomClient = class {
       ...config,
       walletType: config.walletType || "user-wallet"
     };
+    this.logger = config.logger;
     this.axiosInstance = axios.create();
     const customHeaders = {};
     if (config.headers) {
@@ -1259,6 +1325,20 @@ var PhantomClient = class {
     }
     this.config.organizationId = organizationId;
   }
+  /**
+   * Gets the authenticator public key from the stamper if available.
+   * Returns undefined if the stamper doesn't support key info retrieval.
+   */
+  getAuthenticatorPublicKey() {
+    if (!this.stamper) {
+      return void 0;
+    }
+    if ("getKeyInfo" in this.stamper && typeof this.stamper.getKeyInfo === "function") {
+      const keyInfo = this.stamper.getKeyInfo();
+      return keyInfo?.publicKey;
+    }
+    return void 0;
+  }
   async createWallet(walletName) {
     try {
       if (!this.config.organizationId) {
@@ -1306,18 +1386,22 @@ var PhantomClient = class {
         }))
       };
     } catch (error) {
-      console.error("Failed to create wallet:", error.response?.data || error.message);
+      this.logger?.error(`Failed to create wallet: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to create wallet: ${error.response?.data?.message || error.message}`);
     }
   }
-  async prepare(transaction, organizationId, submissionConfig, account, methodName) {
+  async prepare(transaction, organizationId, submissionConfig, account, authenticatorPublicKey, methodName) {
     try {
       const request = {
         transaction,
         organizationId,
         submissionConfig,
-        simulationConfig: { account }
+        simulationConfig: { account },
+        authenticatorPublicKey
       };
+      this.logger?.debug(
+        `prepare request: submissionConfig=${JSON.stringify(submissionConfig)} account=${account} methodName=${methodName} txLength=${transaction.length} request=${JSON.stringify(request)}`
+      );
       const response = await this.axiosInstance.post(`${this.config.apiBaseUrl}/prepare`, request, {
         headers: {
           "Content-Type": "application/json",
@@ -1327,6 +1411,11 @@ var PhantomClient = class {
       return response.data;
     } catch (error) {
       const errorData = getAxiosErrorData(error);
+      const axiosStatus = error.response?.status;
+      const rawResponseData = error.response?.data;
+      this.logger?.error(
+        `[TX_DEBUG] prepare failed: status=${axiosStatus} methodName=${methodName} body=${JSON.stringify(rawResponseData)}`
+      );
       const walletServiceError = parseWalletServiceError(errorData);
       if (walletServiceError) {
         throw walletServiceError;
@@ -1336,7 +1425,7 @@ var PhantomClient = class {
     }
   }
   async getTransactionForSigning(params) {
-    const { encodedTransaction, networkId, submissionConfig, account } = params;
+    const { encodedTransaction, networkId, submissionConfig, account, authenticatorPublicKey } = params;
     const isEvmTransaction = isEthereumChain(networkId);
     const isSolanaTransaction = isSolanaChain(networkId);
     if (isEvmTransaction) {
@@ -1352,6 +1441,7 @@ var PhantomClient = class {
           this.config.organizationId,
           submissionConfig,
           account,
+          authenticatorPublicKey,
           params.methodName
         );
         return prepareResponse.transaction;
@@ -1375,7 +1465,7 @@ var PhantomClient = class {
   /**
    * Private method for shared signing logic
    */
-  async performTransactionSigning(params, includeSubmissionConfig) {
+  async performTransactionSigning(params, includeSubmissionConfig, presignTransaction) {
     const walletId = params.walletId;
     const encodedTransaction = params.transaction;
     const networkIdParam = params.networkId;
@@ -1398,13 +1488,25 @@ var PhantomClient = class {
         curve: networkConfig.curve,
         addressFormat: networkConfig.addressFormat
       };
-      const transactionForSigning = await this.getTransactionForSigning({
+      const authenticatorPublicKey = this.getAuthenticatorPublicKey();
+      let transactionForSigning = await this.getTransactionForSigning({
         encodedTransaction,
         networkId: networkIdParam,
         submissionConfig,
+        authenticatorPublicKey,
         account: params.account,
         methodName
       });
+      if (presignTransaction && typeof transactionForSigning === "string") {
+        try {
+          transactionForSigning = await presignTransaction(transactionForSigning, {
+            networkId: networkIdParam,
+            walletId
+          });
+        } catch (hookError) {
+          throw new Error(`presignTransaction hook failed: ${getErrorMessage(hookError, "unknown error")}`);
+        }
+      }
       const signRequest = {
         organizationId: this.config.organizationId,
         walletId,
@@ -1424,6 +1526,10 @@ var PhantomClient = class {
         params: signRequest,
         timestampMs: await getSecureTimestamp()
       };
+      this.logger?.debug(
+        `[TX_DEBUG] KMS request: methodName=${methodName} networkId=${networkIdParam} walletId=${walletId} account=${params.account}`
+      );
+      this.logger?.debug(`[TX_DEBUG] transactionForSigning=${JSON.stringify(transactionForSigning)}`);
       const response = await this.kmsApi.postKmsRpc(request, {
         headers: {
           "X-Rpc-Method": methodName
@@ -1431,7 +1537,29 @@ var PhantomClient = class {
       });
       const result = response.data.result;
       const rpcSubmissionResult = response.data["rpc_submission_result"];
-      const hash = includeSubmissionConfig && rpcSubmissionResult ? rpcSubmissionResult.result : null;
+      this.logger?.debug(
+        `[TX_DEBUG] KMS response: methodName=${methodName} hasResult=${!!result} rpcSubmissionResult=${JSON.stringify(rpcSubmissionResult)} fullResponse=${JSON.stringify(response.data)}`
+      );
+      let hash = void 0;
+      if (includeSubmissionConfig && rpcSubmissionResult) {
+        if (rpcSubmissionResult.error) {
+          const { error } = rpcSubmissionResult;
+          throw new Error(
+            `Transaction broadcast failed: ${error.data ?? error.message ?? JSON.stringify(rpcSubmissionResult)}`
+          );
+        }
+        const envelope = rpcSubmissionResult.result;
+        if (envelope != null) {
+          if (typeof envelope === "string") {
+            hash = envelope;
+          } else if (typeof envelope.result === "string") {
+            hash = envelope.result;
+          } else if (envelope.error) {
+            const { error } = envelope;
+            throw new Error(`Transaction broadcast failed: ${error.data ?? error.message ?? JSON.stringify(envelope)}`);
+          }
+        }
+      }
       return {
         signedTransaction: result.transaction,
         // Base64 encoded signed transaction
@@ -1442,6 +1570,11 @@ var PhantomClient = class {
       if (error instanceof WalletServiceError) {
         throw error;
       }
+      const axiosStatus = error.response?.status;
+      const axiosData = error.response?.data;
+      this.logger?.error(
+        `[TX_DEBUG] performTransactionSigning failed: methodName=${methodName} status=${axiosStatus} body=${JSON.stringify(axiosData)}`
+      );
       throw new Error(getErrorMessage(error, `Failed to ${actionType} transaction`));
     }
   }
@@ -1449,7 +1582,7 @@ var PhantomClient = class {
    * Sign a transaction
    */
   async signTransaction(params) {
-    const result = await this.performTransactionSigning(params, false);
+    const result = await this.performTransactionSigning(params, false, params.presignTransaction);
     return {
       rawTransaction: result.signedTransaction
     };
@@ -1458,7 +1591,7 @@ var PhantomClient = class {
    * Sign and send a transaction
    */
   async signAndSendTransaction(params) {
-    const result = await this.performTransactionSigning(params, true);
+    const result = await this.performTransactionSigning(params, true, params.presignTransaction);
     return {
       rawTransaction: result.signedTransaction,
       hash: result.hash
@@ -1490,7 +1623,7 @@ var PhantomClient = class {
       }));
       return addresses;
     } catch (error) {
-      console.error("Failed to get wallet addresses:", error.response?.data || error.message);
+      this.logger?.error(`Failed to get wallet addresses: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to get wallet addresses: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1530,7 +1663,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result.signature;
     } catch (error) {
-      console.error("Failed to sign Ethereum message:", error.response?.data || error.message);
+      this.logger?.error(`Failed to sign Ethereum message: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to sign Ethereum message: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1571,7 +1704,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result.signature;
     } catch (error) {
-      console.error("Failed to sign raw payload:", error.response?.data || error.message);
+      this.logger?.error(`Failed to sign raw payload: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to sign raw payload: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1610,7 +1743,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result.signature;
     } catch (error) {
-      console.error("Failed to sign typed data:", error.response?.data || error.message);
+      this.logger?.error(`Failed to sign typed data: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to sign typed data: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1637,7 +1770,7 @@ var PhantomClient = class {
         offset: result.offset
       };
     } catch (error) {
-      console.error("Failed to get wallets:", error.response?.data || error.message);
+      this.logger?.error(`Failed to get wallets: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to get wallets: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1657,7 +1790,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to get organization:", error.response?.data || error.message);
+      this.logger?.error(`Failed to get organization: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to get organization: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1711,7 +1844,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to create organization:", error.response?.data || error.message);
+      this.logger?.error(`Failed to create organization: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to create organization: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1745,7 +1878,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to create authenticator:", error.response?.data || error.message);
+      this.logger?.error(`Failed to create authenticator: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to create authenticator: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1768,7 +1901,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to delete authenticator:", error.response?.data || error.message);
+      this.logger?.error(`Failed to delete authenticator: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to delete authenticator: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1783,7 +1916,9 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to grant organization access:", error.response?.data || error.message);
+      this.logger?.error(
+        `Failed to grant organization access: ${JSON.stringify(error.response?.data) || error.message}`
+      );
       throw new Error(`Failed to grant organization access: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1799,7 +1934,9 @@ var PhantomClient = class {
       };
       await this.kmsApi.postKmsRpc(request);
     } catch (error) {
-      console.error("Failed to add user to organization:", error.response?.data || error.message);
+      this.logger?.error(
+        `Failed to add user to organization: ${JSON.stringify(error.response?.data) || error.message}`
+      );
       throw new Error(`Failed to add user to organization: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1821,7 +1958,7 @@ var PhantomClient = class {
       const result = response.data.result;
       return result;
     } catch (error) {
-      console.error("Failed to get wallet with tag:", error.response?.data || error.message);
+      this.logger?.error(`Failed to get wallet with tag: ${JSON.stringify(error.response?.data) || error.message}`);
       throw new Error(`Failed to get wallet with tag: ${error.response?.data?.message || error.message}`);
     }
   }
@@ -1854,6 +1991,22 @@ var __privateMethod = (obj, member, method) => {
   return method;
 };
 
+// src/extension/isInstalled.ts
+function isInstalled() {
+  try {
+    const phantom = window?.phantom;
+    return !!phantom;
+  } catch (error) {
+    return false;
+  }
+}
+
+// src/errors.ts
+var PHANTOM_NOT_DETECTED = "Phantom wallet not detected.";
+var ETHEREUM_PROVIDER_NOT_FOUND = "Ethereum provider not found on window.phantom.";
+var SOLANA_PROVIDER_NOT_FOUND = "Solana provider not found on window.phantom.";
+var APP_PROVIDER_NOT_FOUND = "App provider not found on window.phantom.";
+
 // 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})?$/;
@@ -1978,7 +2131,7 @@ function splitUri(value) {
 }
 
 // src/ethereum/strategies/injected.ts
-var MAX_RETRIES$1 = 4;
+var MAX_RETRIES$1 = 6;
 var BASE_DELAY$1 = 100;
 var _getProvider$1, getProvider_fn$1;
 var InjectedEthereumStrategy = class {
@@ -1997,7 +2150,11 @@ var InjectedEthereumStrategy = class {
         }
         retryCount++;
         if (retryCount >= MAX_RETRIES$1) {
-          reject();
+          if (!isInstalled()) {
+            reject(new Error(PHANTOM_NOT_DETECTED));
+          } else {
+            reject(new Error(ETHEREUM_PROVIDER_NOT_FOUND));
+          }
         } else {
           scheduleRetry(resolve, reject);
         }
@@ -2017,7 +2174,7 @@ var InjectedEthereumStrategy = class {
   async connect({ onlyIfTrusted }) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (provider.isConnected && provider.selectedAddress) {
       return this.getAccounts();
@@ -2049,7 +2206,7 @@ var InjectedEthereumStrategy = class {
   async signMessage(message, address) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2063,7 +2220,7 @@ var InjectedEthereumStrategy = class {
   async signPersonalMessage(message, address) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2077,7 +2234,7 @@ var InjectedEthereumStrategy = class {
   async signTypedData(typedData, address) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2091,7 +2248,7 @@ var InjectedEthereumStrategy = class {
   async signIn(signInData) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     const message = createSiweMessage(signInData);
     const address = provider.selectedAddress;
@@ -2108,7 +2265,7 @@ var InjectedEthereumStrategy = class {
   async sendTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2122,7 +2279,7 @@ var InjectedEthereumStrategy = class {
   async signTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2136,7 +2293,7 @@ var InjectedEthereumStrategy = class {
   async getChainId() {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     const chainId = await provider.request({ method: "eth_chainId" });
     return chainId;
@@ -2144,7 +2301,7 @@ var InjectedEthereumStrategy = class {
   async switchChain(chainId) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     await provider.request({
       method: "wallet_switchEthereumChain",
@@ -2154,29 +2311,25 @@ var InjectedEthereumStrategy = class {
   async request(args) {
     const provider = __privateMethod(this, _getProvider$1, getProvider_fn$1).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(ETHEREUM_PROVIDER_NOT_FOUND);
     }
     return await provider.request(args);
   }
 };
 _getProvider$1 = new WeakSet();
 getProvider_fn$1 = function() {
-  if (typeof window === "undefined") {
+  if (!isInstalled()) {
     return void 0;
   }
-  return window?.phantom?.ethereum;
+  return window.phantom.ethereum;
 };
 
 // src/ethereum/getProvider.ts
 async function getProvider$2(strategy = "injected" /* INJECTED */) {
   if (strategy === "injected") {
     const provider = new InjectedEthereumStrategy();
-    try {
-      await provider.load();
-      return provider;
-    } catch (error) {
-      throw new Error("Provider not found.");
-    }
+    await provider.load();
+    return provider;
   } else {
     throw new Error("Invalid provider type.");
   }
@@ -2214,9 +2367,6 @@ function triggerEvent$1(event, data) {
 // src/ethereum/connect.ts
 async function connect$1({ onlyIfTrusted = false } = {}) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (provider.isConnected) {
     const accounts = await provider.getAccounts();
     return accounts;
@@ -2246,9 +2396,6 @@ async function connect$1({ onlyIfTrusted = false } = {}) {
 // src/ethereum/disconnect.ts
 async function disconnect$1() {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   await provider.disconnect();
   triggerEvent$1("disconnect", []);
 }
@@ -2256,18 +2403,12 @@ async function disconnect$1() {
 // src/ethereum/getAccounts.ts
 async function getAccounts() {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   return provider.getAccounts();
 }
 
 // src/ethereum/signMessage.ts
 async function signPersonalMessage(message, address) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2275,9 +2416,6 @@ async function signPersonalMessage(message, address) {
 }
 async function signTypedData(typedData, address) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2287,9 +2425,6 @@ async function signTypedData(typedData, address) {
 // src/ethereum/sendTransaction.ts
 async function sendTransaction(transaction) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2297,9 +2432,6 @@ async function sendTransaction(transaction) {
 }
 async function signTransaction$1(transaction) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2309,16 +2441,10 @@ async function signTransaction$1(transaction) {
 // src/ethereum/chainUtils.ts
 async function getChainId() {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   return provider.getChainId();
 }
 async function switchChain(chainId) {
   const provider = await getProvider$2();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   return provider.switchChain(chainId);
 }
 
@@ -2329,9 +2455,6 @@ var Ethereum = class {
     this._accounts = [];
     this.bindProviderEvents();
   }
-  get connected() {
-    return this._accounts.length > 0;
-  }
   get chainId() {
     return this._chainId;
   }
@@ -2340,9 +2463,6 @@ var Ethereum = class {
   }
   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.");
@@ -2443,16 +2563,6 @@ function createEthereumPlugin() {
   };
 }
 
-// src/extension/isInstalled.ts
-function isInstalled() {
-  try {
-    const phantom = window?.phantom;
-    return !!phantom;
-  } catch (error) {
-    return false;
-  }
-}
-
 // src/extension/plugin.ts
 var extension = {
   isInstalled
@@ -2474,7 +2584,7 @@ function createPhantom({ plugins = [] }) {
 }
 
 // src/solana/strategies/injected.ts
-var MAX_RETRIES = 4;
+var MAX_RETRIES = 6;
 var BASE_DELAY = 100;
 var _getProvider, getProvider_fn;
 var InjectedSolanaStrategy = class {
@@ -2493,7 +2603,11 @@ var InjectedSolanaStrategy = class {
         }
         retryCount++;
         if (retryCount >= MAX_RETRIES) {
-          reject();
+          if (!isInstalled()) {
+            reject(new Error(PHANTOM_NOT_DETECTED));
+          } else {
+            reject(new Error(SOLANA_PROVIDER_NOT_FOUND));
+          }
         } else {
           scheduleRetry(resolve, reject);
         }
@@ -2513,7 +2627,7 @@ var InjectedSolanaStrategy = class {
   async connect({ onlyIfTrusted }) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (provider.isConnected && provider.publicKey) {
       return this.getAccount() ?? void 0;
@@ -2528,7 +2642,7 @@ var InjectedSolanaStrategy = class {
   async disconnect() {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     await provider.disconnect();
   }
@@ -2542,7 +2656,7 @@ var InjectedSolanaStrategy = class {
   async signMessage(message, display) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2556,7 +2670,7 @@ var InjectedSolanaStrategy = class {
   async signIn(signInData) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     const result = await provider.signIn(signInData);
     return {
@@ -2568,7 +2682,7 @@ var InjectedSolanaStrategy = class {
   async signAndSendTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2582,7 +2696,7 @@ var InjectedSolanaStrategy = class {
   async signAndSendAllTransactions(transactions) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2599,7 +2713,7 @@ var InjectedSolanaStrategy = class {
   async signTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2610,7 +2724,7 @@ var InjectedSolanaStrategy = class {
   async signAllTransactions(transactions) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -2621,22 +2735,18 @@ var InjectedSolanaStrategy = class {
 };
 _getProvider = new WeakSet();
 getProvider_fn = function() {
-  if (typeof window === "undefined") {
+  if (!isInstalled()) {
     return void 0;
   }
-  return window?.phantom?.solana;
+  return window.phantom.solana;
 };
 
 // src/solana/getProvider.ts
 async function getProvider$1(strategy = "injected" /* INJECTED */) {
   if (strategy === "injected") {
     const provider = new InjectedSolanaStrategy();
-    try {
-      await provider.load();
-      return provider;
-    } catch (error) {
-      throw new Error("Provider not found.");
-    }
+    await provider.load();
+    return provider;
   } else {
     throw new Error("Invalid provider type.");
   }
@@ -2676,9 +2786,6 @@ function triggerEvent(event, ...args) {
 // src/solana/connect.ts
 async function connect({ onlyIfTrusted = false } = {}) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (provider.isConnected) {
     return provider.getAccount();
   }
@@ -2707,25 +2814,13 @@ async function connect({ onlyIfTrusted = false } = {}) {
 // src/solana/disconnect.ts
 async function disconnect() {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   await provider.disconnect();
   triggerEvent("disconnect");
 }
 
-// src/solana/getAccount.ts
-async function getAccount() {
-  const provider = await getProvider$1();
-  return provider.getAccount();
-}
-
 // src/solana/signAndSendTransaction.ts
 async function signAndSendTransaction(transaction) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2735,9 +2830,6 @@ async function signAndSendTransaction(transaction) {
 // src/solana/signAndSendAllTransactions.ts
 async function signAndSendAllTransactions(transactions) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2747,9 +2839,6 @@ async function signAndSendAllTransactions(transactions) {
 // src/solana/signTransaction.ts
 async function signTransaction(transaction) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2759,9 +2848,6 @@ async function signTransaction(transaction) {
 // src/solana/signAllTransactions.ts
 async function signAllTransactions(transactions) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2771,9 +2857,6 @@ async function signAllTransactions(transactions) {
 // src/solana/signMessage.ts
 async function signMessage(message, display) {
   const provider = await getProvider$1();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -2789,7 +2872,7 @@ var Solana = class {
   get publicKey() {
     return this._publicKey;
   }
-  get connected() {
+  get isConnected() {
     return this._publicKey !== null;
   }
   async connect(options) {
@@ -2829,21 +2912,6 @@ var Solana = class {
   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);
   }
@@ -2893,20 +2961,17 @@ function createSolanaPlugin() {
 
 // src/auto-confirm/getProvider.ts
 function getProvider() {
-  if (typeof window === "undefined") {
-    return null;
+  if (!isInstalled()) {
+    throw new Error(PHANTOM_NOT_DETECTED);
   }
-  const provider = window?.phantom?.app;
+  const provider = window.phantom.app;
   if (!provider) {
-    return null;
+    throw new Error(APP_PROVIDER_NOT_FOUND);
   }
   return provider;
 }
 async function autoConfirmEnable(params) {
-  const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
+  const provider = getProvider();
   const transformedParams = params?.chains ? { chains: params.chains.map(networkIdToInternalCaip) } : {};
   const result = await provider.request({
     method: "phantom_auto_confirm_enable",
@@ -2918,10 +2983,7 @@ async function autoConfirmEnable(params) {
   };
 }
 async function autoConfirmDisable() {
-  const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
+  const provider = getProvider();
   const result = await provider.request({
     method: "phantom_auto_confirm_disable",
     params: {}
@@ -2932,10 +2994,7 @@ async function autoConfirmDisable() {
   };
 }
 async function autoConfirmStatus() {
-  const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
+  const provider = getProvider();
   const result = await provider.request({
     method: "phantom_auto_confirm_status",
     params: {}
@@ -2946,10 +3005,7 @@ async function autoConfirmStatus() {
   };
 }
 async function autoConfirmSupportedChains() {
-  const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
+  const provider = getProvider();
   const result = await provider.request({
     method: "phantom_auto_confirm_supported_chains",
     params: {}
@@ -3370,7 +3426,7 @@ function stringToBase64url(str) {
 /**
  *  The current version of Ethers.
  */
-const version = "6.16.0";
+const version = "6.17.0";
 
 /**
  *  Property helper functions.
@@ -8696,7 +8752,7 @@ function parseTransactionResponse(base64RawTransaction, networkId, hash) {
 function parseSolanaSignatureResponse(base64Response) {
   try {
     const signatureBytes = base64urlDecode(base64Response);
-    const signature = index_native.base58.encode(signatureBytes);
+    const signature = index_native.bs582.encode(signatureBytes);
     return {
       signature,
       rawSignature: base64Response
@@ -8766,8 +8822,6 @@ function deserializeSolanaTransaction(transactionBytes) {
     throw legacyError;
   }
 }
-
-// src/index.ts
 async function parseToKmsTransaction(transaction, networkId) {
   const networkPrefix = networkId.split(":")[0].toLowerCase();
   switch (networkPrefix) {
@@ -9289,27 +9343,25 @@ var EventEmitter2 = /*@__PURE__*/index_native.getDefaultExportFromCjs(eventemitt
 // src/embedded-provider.ts
 
 // src/constants.ts
-var AUTHENTICATOR_EXPIRATION_TIME_MS = 7 * 24 * 60 * 60 * 1e3;
+var AUTHENTICATOR_EXPIRATION_TIME_MS = 31 * 24 * 60 * 60 * 1e3;
 var EMBEDDED_PROVIDER_AUTH_TYPES = ["google", "apple", "phantom"];
 var EmbeddedSolanaChain = class {
   constructor(provider) {
     this.provider = provider;
     this.currentNetworkId = NetworkId.SOLANA_MAINNET;
-    this._connected = false;
     this._publicKey = null;
     this.eventEmitter = new EventEmitter2();
     this.setupEventListeners();
     this.syncInitialState();
   }
-  // Wallet adapter compliant properties
-  get connected() {
-    return this._connected;
-  }
   get publicKey() {
     return this._publicKey;
   }
+  get isConnected() {
+    return this._publicKey !== null;
+  }
   ensureConnected() {
-    if (!this.provider.isConnected()) {
+    if (!this.isConnected) {
       throw new Error("Solana chain not available. Ensure SDK is connected.");
     }
   }
@@ -9321,7 +9373,7 @@ var EmbeddedSolanaChain = class {
       message: messageStr,
       networkId: this.currentNetworkId
     });
-    const signature = typeof result.signature === "string" ? new Uint8Array(index_native.base58.decode(result.signature)) : result.signature;
+    const signature = typeof result.signature === "string" ? new Uint8Array(index_native.bs582.decode(result.signature)) : result.signature;
     return {
       signature,
       publicKey: this._publicKey || ""
@@ -9339,11 +9391,12 @@ var EmbeddedSolanaChain = class {
     }
     return signedTransaction;
   }
-  async signAndSendTransaction(transaction) {
+  async signAndSendTransaction(transaction, options) {
     this.ensureConnected();
     const result = await this.provider.signAndSendTransaction({
       transaction,
-      networkId: this.currentNetworkId
+      networkId: this.currentNetworkId,
+      presignTransaction: options?.presignTransaction
     });
     if (!result.hash) {
       throw new Error("Transaction not submitted");
@@ -9367,7 +9420,7 @@ var EmbeddedSolanaChain = class {
     const solanaAddr = addresses.find((a) => a.addressType === "Solana");
     if (!solanaAddr)
       throw new Error("No Solana address found");
-    this.updateConnectionState(true, solanaAddr.address);
+    this._publicKey = solanaAddr.address;
     return Promise.resolve({ publicKey: solanaAddr.address });
   }
   async disconnect() {
@@ -9377,41 +9430,25 @@ var EmbeddedSolanaChain = class {
     this.currentNetworkId = network === "mainnet" ? NetworkId.SOLANA_MAINNET : NetworkId.SOLANA_DEVNET;
     return Promise.resolve();
   }
-  getPublicKey() {
-    if (!this.provider.isConnected())
-      return Promise.resolve(null);
-    const addresses = this.provider.getAddresses();
-    const solanaAddr = addresses.find((a) => a.addressType === "Solana");
-    return Promise.resolve(solanaAddr?.address || null);
-  }
-  isConnected() {
-    return this._connected && this.provider.isConnected();
-  }
   setupEventListeners() {
     this.provider.on("connect", (data) => {
       const solanaAddress = data.addresses?.find((addr) => addr.addressType === "Solana");
       if (solanaAddress) {
-        this.updateConnectionState(true, solanaAddress.address);
+        this._publicKey = solanaAddress.address;
         this.eventEmitter.emit("connect", solanaAddress.address);
       }
     });
     this.provider.on("disconnect", () => {
-      this.updateConnectionState(false, null);
+      this._publicKey = null;
       this.eventEmitter.emit("disconnect");
     });
   }
   syncInitialState() {
-    if (this.provider.isConnected()) {
-      const addresses = this.provider.getAddresses();
-      const solanaAddress = addresses.find((a) => a.addressType === "Solana");
-      if (solanaAddress) {
-        this.updateConnectionState(true, solanaAddress.address);
-      }
-    }
-  }
-  updateConnectionState(connected, publicKey) {
-    this._connected = connected;
-    this._publicKey = publicKey;
+    if (!this.provider.isConnected())
+      return;
+    const addresses = this.provider.getAddresses();
+    const solanaAddr = addresses.find((a) => a.addressType === "Solana");
+    this._publicKey = solanaAddr?.address || null;
   }
   // Event methods for interface compliance
   on(event, listener) {
@@ -9425,16 +9462,11 @@ var EmbeddedEthereumChain = class {
   constructor(provider) {
     this.provider = provider;
     this.currentNetworkId = NetworkId.ETHEREUM_MAINNET;
-    this._connected = false;
     this._accounts = [];
     this.eventEmitter = new EventEmitter2();
     this.setupEventListeners();
     this.syncInitialState();
   }
-  // EIP-1193 compliant properties
-  get connected() {
-    return this._connected;
-  }
   get chainId() {
     const chainId = networkIdToChainId(this.currentNetworkId) || 1;
     return `0x${chainId.toString(16)}`;
@@ -9458,7 +9490,7 @@ var EmbeddedEthereumChain = class {
     }
     const addresses = this.provider.getAddresses();
     const ethAddresses = addresses.filter((a) => a.addressType === "Ethereum").map((a) => a.address);
-    this.updateConnectionState(true, ethAddresses);
+    this.updateConnectionState(ethAddresses);
     return Promise.resolve(ethAddresses);
   }
   async disconnect() {
@@ -9524,19 +9556,19 @@ var EmbeddedEthereumChain = class {
     return this.request({ method: "eth_accounts" });
   }
   isConnected() {
-    return this._connected && this.provider.isConnected();
+    return this.provider.isConnected() && this._accounts.length > 0;
   }
   setupEventListeners() {
     this.provider.on("connect", (data) => {
       const ethAddresses = data.addresses?.filter((addr) => addr.addressType === "Ethereum")?.map((addr) => addr.address) || [];
       if (ethAddresses.length > 0) {
-        this.updateConnectionState(true, ethAddresses);
+        this.updateConnectionState(ethAddresses);
         this.eventEmitter.emit("connect", { chainId: this.chainId });
         this.eventEmitter.emit("accountsChanged", ethAddresses);
       }
     });
     this.provider.on("disconnect", () => {
-      this.updateConnectionState(false, []);
+      this.updateConnectionState([]);
       this.eventEmitter.emit("disconnect", { code: 4900, message: "Provider disconnected" });
       this.eventEmitter.emit("accountsChanged", []);
     });
@@ -9546,12 +9578,11 @@ var EmbeddedEthereumChain = class {
       const addresses = this.provider.getAddresses();
       const ethAddresses = addresses.filter((a) => a.addressType === "Ethereum").map((a) => a.address);
       if (ethAddresses.length > 0) {
-        this.updateConnectionState(true, ethAddresses);
+        this.updateConnectionState(ethAddresses);
       }
     }
   }
-  updateConnectionState(connected, accounts) {
-    this._connected = connected;
+  updateConnectionState(accounts) {
     this._accounts = accounts;
   }
   async handleEmbeddedRequest(args) {
@@ -9627,7 +9658,7 @@ async function retryWithBackoff(operation, operationName, logger, maxRetries = 3
   let lastError;
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
-      logger.log("EMBEDDED_PROVIDER", `Attempting ${operationName}`, {
+      logger.debug("EMBEDDED_PROVIDER", `Attempting ${operationName}`, {
         attempt,
         maxRetries
       });
@@ -9646,7 +9677,7 @@ async function retryWithBackoff(operation, operationName, logger, maxRetries = 3
         break;
       }
       const delay = baseDelay * Math.pow(2, attempt - 1);
-      logger.log("EMBEDDED_PROVIDER", `Retrying ${operationName} in ${delay}ms`, {
+      logger.debug("EMBEDDED_PROVIDER", `Retrying ${operationName} in ${delay}ms`, {
         attempt: attempt + 1,
         delay
       });
@@ -9662,6 +9693,16 @@ function generateSessionId() {
 }
 
 // src/embedded-provider.ts
+var noopLogger = {
+  info: () => {
+  },
+  warn: () => {
+  },
+  error: () => {
+  },
+  debug: () => {
+  }
+};
 var EmbeddedProvider$1 = class EmbeddedProvider {
   constructor(config, platform, logger) {
     this.client = null;
@@ -9669,7 +9710,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     this.addresses = [];
     this.eventListeners = /* @__PURE__ */ new Map();
     this.logger = logger;
-    this.logger.log("EMBEDDED_PROVIDER", "Initializing EmbeddedProvider", { config });
+    this.logger.debug("EMBEDDED_PROVIDER", "Initializing EmbeddedProvider", { config });
     if (config.embeddedWalletType === "app-wallet") {
       throw new Error("app-wallet type is not currently supported. Please use 'user-wallet' instead.");
     }
@@ -9692,19 +9733,19 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       this.eventListeners.set(event, /* @__PURE__ */ new Set());
     }
     this.eventListeners.get(event)?.add(callback);
-    this.logger.log("EMBEDDED_PROVIDER", "Event listener added", { event });
+    this.logger.debug("EMBEDDED_PROVIDER", "Event listener added", { event });
   }
   off(event, callback) {
     const listeners = this.eventListeners.get(event);
     if (listeners) {
       listeners.delete(callback);
-      this.logger.log("EMBEDDED_PROVIDER", "Event listener removed", { event });
+      this.logger.debug("EMBEDDED_PROVIDER", "Event listener removed", { event });
     }
   }
   emit(event, data) {
     const listeners = this.eventListeners.get(event);
     if (listeners && listeners.size > 0) {
-      this.logger.log("EMBEDDED_PROVIDER", "Emitting event", { event, listenerCount: listeners.size, data });
+      this.logger.debug("EMBEDDED_PROVIDER", "Emitting event", { event, listenerCount: listeners.size, data });
       listeners.forEach((callback) => {
         try {
           callback(data);
@@ -9772,14 +9813,15 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
   async validateAndCleanSession(session) {
     if (!session)
       return null;
-    this.logger.log("EMBEDDED_PROVIDER", "Found existing session, validating", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Found existing session, validating", {
       sessionId: session.sessionId,
       status: session.status,
       walletId: session.walletId
     });
     if (session.status !== "completed") {
       const urlSessionId = this.urlParamsAccessor.getParam("session_id");
-      if (session.status === "pending" && !urlSessionId) {
+      const urlCode = this.urlParamsAccessor.getParam("code");
+      if (session.status === "pending" && !urlSessionId && !urlCode) {
         this.logger.warn("EMBEDDED_PROVIDER", "Session mismatch detected - pending session without redirect context", {
           sessionId: session.sessionId,
           status: session.status
@@ -9817,11 +9859,11 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
    * Returns ConnectResult if connection succeeds, null if should continue with new auth flow.
    */
   async tryExistingConnection(isAutoConnect) {
-    this.logger.log("EMBEDDED_PROVIDER", "Getting existing session");
+    this.logger.debug("EMBEDDED_PROVIDER", "Getting existing session");
     let session = await this.storage.getSession();
     session = await this.validateAndCleanSession(session);
     if (!session) {
-      this.logger.log("EMBEDDED_PROVIDER", "No existing session found");
+      this.logger.debug("EMBEDDED_PROVIDER", "No existing session found");
       return null;
     }
     if (session.status === "completed") {
@@ -9850,9 +9892,9 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       });
       return result;
     }
-    this.logger.log("EMBEDDED_PROVIDER", "No completed session found, checking for redirect resume");
+    this.logger.debug("EMBEDDED_PROVIDER", "No completed session found, checking for redirect resume");
     if (this.authProvider.resumeAuthFromRedirect) {
-      const authResult = this.authProvider.resumeAuthFromRedirect(session.authProvider);
+      const authResult = await this.authProvider.resumeAuthFromRedirect(session.authProvider);
       if (authResult) {
         this.logger.info("EMBEDDED_PROVIDER", "Resuming from redirect", {
           walletId: authResult.walletId,
@@ -9900,7 +9942,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       return false;
     }
     if (!session.walletId || !session.organizationId || !session.stamperInfo) {
-      this.logger.log("EMBEDDED_PROVIDER", "Session missing required fields", {
+      this.logger.debug("EMBEDDED_PROVIDER", "Session missing required fields", {
         hasWalletId: !!session.walletId,
         hasOrganizationId: !!session.organizationId,
         hasStamperInfo: !!session.stamperInfo
@@ -9908,23 +9950,23 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       return false;
     }
     if (session.status !== "completed") {
-      this.logger.log("EMBEDDED_PROVIDER", "Session not completed", { status: session.status });
+      this.logger.debug("EMBEDDED_PROVIDER", "Session not completed", { status: session.status });
       return false;
     }
     if (!session.authenticatorExpiresAt) {
-      this.logger.log("EMBEDDED_PROVIDER", "Session invalid - missing authenticator timing", {
+      this.logger.debug("EMBEDDED_PROVIDER", "Session invalid - missing authenticator timing", {
         sessionId: session.sessionId
       });
       return false;
     }
     if (Date.now() >= session.authenticatorExpiresAt) {
-      this.logger.log("EMBEDDED_PROVIDER", "Authenticator expired, session invalid", {
+      this.logger.debug("EMBEDDED_PROVIDER", "Authenticator expired, session invalid", {
         authenticatorExpiresAt: new Date(session.authenticatorExpiresAt).toISOString(),
         now: (/* @__PURE__ */ new Date()).toISOString()
       });
       return false;
     }
-    this.logger.log("EMBEDDED_PROVIDER", "Session is valid", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Session is valid", {
       sessionId: session.sessionId,
       walletId: session.walletId,
       authenticatorExpires: new Date(session.authenticatorExpiresAt).toISOString()
@@ -9938,7 +9980,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
    */
   async autoConnect() {
     try {
-      this.logger.log("EMBEDDED_PROVIDER", "Starting auto-connect attempt");
+      this.logger.debug("EMBEDDED_PROVIDER", "Starting auto-connect attempt");
       this.emit("connect_start", { source: "auto-connect" });
       const result = await this.tryExistingConnection(true);
       if (result) {
@@ -9952,7 +9994,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
         });
         return;
       }
-      this.logger.log("EMBEDDED_PROVIDER", "Auto-connect failed: no valid session found");
+      this.logger.debug("EMBEDDED_PROVIDER", "Auto-connect failed: no valid session found");
       this.emit("connect_error", {
         error: "No valid session found",
         source: "auto-connect"
@@ -9973,11 +10015,11 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
    * This is the first step when no existing session is found and we need to set up a new wallet.
    */
   async initializeStamper() {
-    this.logger.log("EMBEDDED_PROVIDER", "Initializing stamper");
+    this.logger.debug("EMBEDDED_PROVIDER", "Initializing stamper");
     await this.stamper.init();
-    this.logger.log("EMBEDDED_PROVIDER", "Resetting keypair to avoid conflicts with existing keypairs");
+    this.logger.debug("EMBEDDED_PROVIDER", "Resetting keypair to avoid conflicts with existing keypairs");
     const stamperInfo = await this.stamper.resetKeyPair();
-    this.logger.log("EMBEDDED_PROVIDER", "Stamper initialized with fresh keypair", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Stamper initialized with fresh keypair", {
       publicKey: stamperInfo.publicKey,
       keyId: stamperInfo.keyId,
       algorithm: this.stamper.algorithm
@@ -9994,17 +10036,18 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       apiBaseUrl: this.config.apiBaseUrl,
       headers: {
         ...this.platform.analyticsHeaders || {}
-      }
+      },
+      logger: noopLogger
     });
     const platformName = this.platform.name || "unknown";
     const shortPubKey = stamperInfo.publicKey.slice(0, 8);
     const organizationName = `${this.config.appId.substring(0, 8)}-${platformName}-${shortPubKey}`;
-    this.logger.log("EMBEDDED_PROVIDER", "Creating organization for app-wallet", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Creating organization for app-wallet", {
       organizationName,
       publicKey: stamperInfo.publicKey,
       platform: platformName
     });
-    const base64urlPublicKey = base64urlEncode(index_native.base58.decode(stamperInfo.publicKey));
+    const base64urlPublicKey = base64urlEncode(index_native.bs582.decode(stamperInfo.publicKey));
     const username = `user-${randomUUID()}`;
     const { organizationId } = await tempClient.createOrganization(organizationName, [
       {
@@ -10015,7 +10058,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
             authenticatorName: `auth-${shortPubKey}`,
             authenticatorKind: "keypair",
             publicKey: base64urlPublicKey,
-            algorithm: "Ed25519",
+            algorithm: this.stamper.algorithm,
             expiresInMs
           }
         ]
@@ -10119,7 +10162,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
   async disconnect(shouldClearPreviousSession = true) {
     const wasConnected = this.client !== null;
     await this.storage.setShouldClearPreviousSession(shouldClearPreviousSession);
-    this.logger.log("EMBEDDED_PROVIDER", "Set flag to clear previous session on next login");
+    this.logger.debug("EMBEDDED_PROVIDER", "Set flag to clear previous session on next login");
     await this.storage.clearSession();
     this.client = null;
     this.walletId = null;
@@ -10131,6 +10174,21 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       });
     }
   }
+  /**
+   * Handles errors from signing operations.
+   * Disconnects the user if the server returns a 401/403 (revoked or expired authenticator).
+   */
+  async handleSigningError(error) {
+    if (isAuthenticationError(error)) {
+      this.logger.warn("EMBEDDED_PROVIDER", "Authenticator rejected by server (401/403), disconnecting", { error });
+      await this.disconnect(false);
+      throw new Error("Authenticator revoked");
+    }
+    if (error instanceof SpendingLimitError) {
+      this.emit("spending_limit_reached", { error });
+    }
+    throw error;
+  }
   async signMessage(params) {
     if (!this.client || !this.walletId) {
       throw new Error("Not connected");
@@ -10147,7 +10205,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       message: params.message,
       networkId: params.networkId,
       derivationIndex
-    });
+    }).catch((error) => this.handleSigningError(error));
     this.logger.info("EMBEDDED_PROVIDER", "Message signed successfully", {
       walletId: this.walletId,
       message: params.message
@@ -10180,7 +10238,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       message: base64UrlMessage,
       networkId: params.networkId,
       derivationIndex
-    });
+    }).catch((error) => this.handleSigningError(error));
     this.logger.info("EMBEDDED_PROVIDER", "Message signed successfully", {
       walletId: this.walletId,
       message: params.message
@@ -10203,7 +10261,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       typedData: params.typedData,
       networkId: params.networkId,
       derivationIndex
-    });
+    }).catch((error) => this.handleSigningError(error));
     this.logger.info("EMBEDDED_PROVIDER", "Typed data signed successfully", {
       walletId: this.walletId
     });
@@ -10221,7 +10279,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     const parsedTransaction = await parseToKmsTransaction(params.transaction, params.networkId);
     const session = await this.storage.getSession();
     const derivationIndex = session?.accountDerivationIndex ?? 0;
-    this.logger.log("EMBEDDED_PROVIDER", "Parsed transaction for signing", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Parsed transaction for signing", {
       walletId: this.walletId,
       transaction: parsedTransaction,
       derivationIndex
@@ -10240,7 +10298,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       networkId: params.networkId,
       derivationIndex,
       account
-    });
+    }).catch((error) => this.handleSigningError(error));
     this.logger.info("EMBEDDED_PROVIDER", "Transaction signed successfully", {
       walletId: this.walletId,
       networkId: params.networkId,
@@ -10260,7 +10318,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     const parsedTransaction = await parseToKmsTransaction(params.transaction, params.networkId);
     const session = await this.storage.getSession();
     const derivationIndex = session?.accountDerivationIndex ?? 0;
-    this.logger.log("EMBEDDED_PROVIDER", "Parsed transaction for signing", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Parsed transaction for signing", {
       walletId: this.walletId,
       transaction: parsedTransaction,
       derivationIndex
@@ -10273,21 +10331,14 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     if (!account) {
       throw new Error(`No address found for network ${params.networkId}`);
     }
-    let rawResponse;
-    try {
-      rawResponse = await this.client.signAndSendTransaction({
-        walletId: this.walletId,
-        transaction: transactionPayload,
-        networkId: params.networkId,
-        derivationIndex,
-        account
-      });
-    } catch (error) {
-      if (error instanceof SpendingLimitError) {
-        this.emit("spending_limit_reached", { error });
-      }
-      throw error;
-    }
+    const rawResponse = await this.client.signAndSendTransaction({
+      walletId: this.walletId,
+      transaction: transactionPayload,
+      networkId: params.networkId,
+      derivationIndex,
+      account,
+      presignTransaction: params.presignTransaction
+    }).catch((error) => this.handleSigningError(error));
     this.logger.info("EMBEDDED_PROVIDER", "Transaction signed and sent successfully", {
       walletId: this.walletId,
       networkId: params.networkId,
@@ -10332,7 +10383,8 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
           organizationId,
           headers: {
             ...this.platform.analyticsHeaders || {}
-          }
+          },
+          logger: noopLogger
         },
         this.stamper
       );
@@ -10411,7 +10463,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       lastRenewalAttempt: void 0,
       authUserId: authResult.authUserId
     };
-    this.logger.log("EMBEDDED_PROVIDER", "Saving Phantom session");
+    this.logger.debug("EMBEDDED_PROVIDER", "Saving Phantom session");
     await this.storage.saveSession(session);
     return session;
   }
@@ -10446,7 +10498,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       authenticatorExpiresAt: now + AUTHENTICATOR_EXPIRATION_TIME_MS,
       lastRenewalAttempt: void 0
     };
-    this.logger.log("EMBEDDED_PROVIDER", "Saving temporary session before redirect", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Saving temporary session before redirect", {
       sessionId: tempSession.sessionId,
       tempWalletId: tempSession.walletId
     });
@@ -10471,8 +10523,9 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       // OAuth session management - defaults to allowing refresh unless user explicitly logged out
       clearPreviousSession: shouldClearPreviousSession,
       // true only after logout
-      allowRefresh: !shouldClearPreviousSession
+      allowRefresh: !shouldClearPreviousSession,
       // false only after logout
+      algorithm: this.stamper.algorithm
     });
     if (authResult && "walletId" in authResult) {
       this.logger.info("EMBEDDED_PROVIDER", "Authentication completed after redirect", {
@@ -10485,20 +10538,21 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       tempSession.authProvider = authResult.provider || tempSession.authProvider;
       tempSession.accountDerivationIndex = authResult.accountDerivationIndex;
       tempSession.authUserId = authResult.authUserId;
+      tempSession.bearerToken = authResult.bearerToken;
       tempSession.status = "completed";
       tempSession.lastUsed = Date.now();
       if (authResult.expiresInMs > 0) {
         const now2 = Date.now();
         tempSession.authenticatorCreatedAt = now2;
         tempSession.authenticatorExpiresAt = now2 + authResult.expiresInMs;
-        this.logger.log("EMBEDDED_PROVIDER", "Updated authenticator expiration from immediate auth response", {
+        this.logger.debug("EMBEDDED_PROVIDER", "Updated authenticator expiration from immediate auth response", {
           expiresInMs: authResult.expiresInMs,
           expiresAt: new Date(tempSession.authenticatorExpiresAt).toISOString()
         });
       }
       await this.storage.saveSession(tempSession);
       await this.storage.setShouldClearPreviousSession(false);
-      this.logger.log("EMBEDDED_PROVIDER", "Cleared logout flag after successful authentication");
+      this.logger.debug("EMBEDDED_PROVIDER", "Cleared logout flag after successful authentication");
       return tempSession;
     }
     this.logger.info("EMBEDDED_PROVIDER", "Redirect authentication initiated, waiting for redirect completion");
@@ -10514,20 +10568,21 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
     session.organizationId = authResult.organizationId;
     session.accountDerivationIndex = authResult.accountDerivationIndex;
     session.authUserId = authResult.authUserId;
+    session.bearerToken = authResult.bearerToken;
     session.status = "completed";
     session.lastUsed = Date.now();
     if (authResult.expiresInMs > 0) {
       const now = Date.now();
       session.authenticatorCreatedAt = now;
       session.authenticatorExpiresAt = now + authResult.expiresInMs;
-      this.logger.log("EMBEDDED_PROVIDER", "Updated authenticator expiration from auth response", {
+      this.logger.debug("EMBEDDED_PROVIDER", "Updated authenticator expiration from auth response", {
         expiresInMs: authResult.expiresInMs,
         expiresAt: new Date(session.authenticatorExpiresAt).toISOString()
       });
     }
     await this.storage.saveSession(session);
     await this.storage.setShouldClearPreviousSession(false);
-    this.logger.log("EMBEDDED_PROVIDER", "Cleared logout flag after successful authentication");
+    this.logger.debug("EMBEDDED_PROVIDER", "Cleared logout flag after successful authentication");
     await this.initializeClientFromSession(session);
     await this.ensureValidAuthenticator();
     return {
@@ -10554,7 +10609,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
       throw new Error("Invalid session - missing authenticator timing");
     }
     const timeUntilExpiry = session.authenticatorExpiresAt - now;
-    this.logger.log("EMBEDDED_PROVIDER", "Checking authenticator expiration", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Checking authenticator expiration", {
       expiresAt: new Date(session.authenticatorExpiresAt).toISOString(),
       timeUntilExpiry
     });
@@ -10569,7 +10624,7 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
    * This is the final step that sets up the provider's client state and retrieves available addresses.
    */
   async initializeClientFromSession(session) {
-    this.logger.log("EMBEDDED_PROVIDER", "Initializing PhantomClient from session", {
+    this.logger.debug("EMBEDDED_PROVIDER", "Initializing PhantomClient from session", {
       organizationId: session.organizationId,
       walletId: session.walletId,
       appId: session.appId
@@ -10583,7 +10638,8 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
         organizationId: session.organizationId,
         headers: {
           ...this.platform.analyticsHeaders || {},
-          ...session.authUserId ? { "x-auth-user-id": session.authUserId } : {}
+          ...session.authUserId ? { "x-auth-user-id": session.authUserId } : {},
+          ...session.bearerToken ? { Authorization: session.bearerToken } : {}
         }
       },
       this.stamper
@@ -10594,14 +10650,23 @@ var EmbeddedProvider$1 = class EmbeddedProvider {
 };
 
 // src/index.ts
+var WEB_CRYPTO_ALGORITHM_CONFIGS = {
+  [DEFAULT_AUTHENTICATOR_ALGORITHM]: {
+    generateParams: { name: "Ed25519" },
+    signParams: { name: "Ed25519" }
+  },
+  [Algorithm.secp256r1]: {
+    generateParams: { name: "ECDSA", namedCurve: "P-256" },
+    signParams: { name: "ECDSA", hash: "SHA-256" }
+  }
+};
 var IndexedDbStamper = class {
   // Optional for PKI, required for OIDC
   constructor(config = {}) {
     this.db = null;
     this.activeKeyPairRecord = null;
     this.pendingKeyPairRecord = null;
-    this.algorithm = Algorithm.ed25519;
-    // Use Ed25519 for maximum security and performance
+    this.algorithm = DEFAULT_AUTHENTICATOR_ALGORITHM;
     // The type of stamper, can be changed at any time
     this.type = "PKI";
     if (typeof window === "undefined" || !window.indexedDB) {
@@ -10615,17 +10680,34 @@ var IndexedDbStamper = class {
     this.salt = config.salt;
   }
   /**
-   * Initialize the stamper by opening IndexedDB and retrieving or generating keys
+   * Initialize the stamper by opening IndexedDB and retrieving or generating keys.
+   * Automatically selects the best supported algorithm.
    */
   async init() {
     await this.openDB();
     this.activeKeyPairRecord = await this.loadActiveKeyPairRecord();
-    if (!this.activeKeyPairRecord) {
+    if (this.activeKeyPairRecord) {
+      this.algorithm = this.activeKeyPairRecord.keyPair.privateKey.algorithm.name === "Ed25519" ? Algorithm.ed25519 : Algorithm.secp256r1;
+    } else {
+      this.algorithm = await this.getSupportedAlgorithm();
       this.activeKeyPairRecord = await this.generateAndStoreNewKeyPair("active");
     }
     this.pendingKeyPairRecord = await this.loadPendingKeyPairRecord();
     return this.activeKeyPairRecord.keyInfo;
   }
+  async getSupportedAlgorithm() {
+    for (const [algorithm, params] of Object.entries(WEB_CRYPTO_ALGORITHM_CONFIGS)) {
+      try {
+        await crypto.subtle.generateKey(params.generateParams, false, ["sign", "verify"]);
+        return algorithm;
+      } catch {
+        continue;
+      }
+    }
+    throw new Error(
+      "Your browser does not support the encryption needed for secure authentication. Please use a different browser or upgrade to a supported browser."
+    );
+  }
   /**
    * Get the public key information
    */
@@ -10653,10 +10735,7 @@ var IndexedDbStamper = class {
     }
     const dataBytes = new Uint8Array(data);
     const signature = await crypto.subtle.sign(
-      {
-        name: this.algorithm,
-        hash: "SHA-256"
-      },
+      WEB_CRYPTO_ALGORITHM_CONFIGS[this.algorithm].signParams,
       this.activeKeyPairRecord.keyPair.privateKey,
       dataBytes
     );
@@ -10666,14 +10745,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(index_native.base58.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
+      publicKey: base64urlEncode(index_native.bs582.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
       signature: signatureBase64url,
       kind: "PKI",
       algorithm: this.algorithm
     } : {
       kind: "OIDC",
       idToken,
-      publicKey: base64urlEncode(index_native.base58.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
+      publicKey: base64urlEncode(index_native.bs582.decode(this.activeKeyPairRecord.keyInfo.publicKey)),
       salt,
       algorithm: this.algorithm,
       signature: signatureBase64url
@@ -10768,15 +10847,13 @@ var IndexedDbStamper = class {
   }
   async generateAndStoreNewKeyPair(type) {
     const keyPair = await crypto.subtle.generateKey(
-      {
-        name: "Ed25519"
-      },
+      WEB_CRYPTO_ALGORITHM_CONFIGS[this.algorithm].generateParams,
       false,
       // non-extractable - private key can never be exported
       ["sign", "verify"]
     );
     const rawPublicKeyBuffer = await crypto.subtle.exportKey("raw", keyPair.publicKey);
-    const publicKeyBase58 = index_native.base58.encode(new Uint8Array(rawPublicKeyBuffer));
+    const publicKeyBase58 = index_native.bs582.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();
@@ -10846,15 +10923,301 @@ var IndexedDbStamper = class {
   }
 };
 
-// src/types.ts
-
-// src/debug.ts
-var DebugLevel = /* @__PURE__ */ ((DebugLevel2) => {
-  DebugLevel2[DebugLevel2["ERROR"] = 0] = "ERROR";
-  DebugLevel2[DebugLevel2["WARN"] = 1] = "WARN";
-  DebugLevel2[DebugLevel2["INFO"] = 2] = "INFO";
-  DebugLevel2[DebugLevel2["DEBUG"] = 3] = "DEBUG";
-  return DebugLevel2;
+// src/index.ts
+var AUTH2_JAR_ALGORITHM = "ES256";
+var AUTH2_JAR_TYP = "oauth-authz-req+jwt";
+var textEncoder = new TextEncoder();
+async function createAuth2RequestJar(input) {
+  const publicJwk = await globalThis.crypto.subtle.exportKey("jwk", input.keyPair.publicKey);
+  if (!_isValidPublicJwk(publicJwk)) {
+    throw new Error("Unable to export a valid P-256 public JWK for JAR header.");
+  }
+  const header = {
+    alg: AUTH2_JAR_ALGORITHM,
+    typ: AUTH2_JAR_TYP,
+    jwk: {
+      kty: "EC",
+      crv: "P-256",
+      x: publicJwk.x,
+      y: publicJwk.y
+    }
+  };
+  const encodedHeader = base64urlEncode(textEncoder.encode(JSON.stringify(header)));
+  const encodedPayload = base64urlEncode(textEncoder.encode(JSON.stringify(input.payload)));
+  const signingInput = `${encodedHeader}.${encodedPayload}`;
+  const signature = await globalThis.crypto.subtle.sign(
+    { name: "ECDSA", hash: "SHA-256" },
+    input.keyPair.privateKey,
+    textEncoder.encode(signingInput)
+  );
+  return `${signingInput}.${base64urlEncode(new Uint8Array(signature))}`;
+}
+function _isValidPublicJwk(jwk) {
+  return jwk.kty === "EC" && jwk.crv === "P-256" && typeof jwk.x === "string" && typeof jwk.y === "string";
+}
+var DEFAULT_KMS_API_VERSION = "2025-11-24";
+var Auth2KmsRpcClient = class {
+  constructor(stamper, options) {
+    this.stamper = stamper;
+    const axiosInstance = axios.create();
+    axiosInstance.interceptors.request.use(async (config) => {
+      config.headers = config.headers || {};
+      config.headers["x-app-id"] = options.appId;
+      config.headers["x-api-version"] = DEFAULT_KMS_API_VERSION;
+      const tokens = await this.stamper.getTokens();
+      if (tokens) {
+        config.headers["authorization"] = tokens.bearerToken;
+      }
+      const requestBody = typeof config.data === "string" ? config.data : config.data === void 0 ? "" : JSON.stringify(config.data);
+      const stamp = await this.stamper.stamp({ data: index_native.bufferExports.Buffer.from(requestBody, "utf-8") });
+      config.headers["x-phantom-stamp"] = stamp;
+      return config;
+    });
+    const configuration = new Configuration({ basePath: options.apiBaseUrl });
+    this.kmsApi = new KMSRPCApi(configuration, options.apiBaseUrl, axiosInstance);
+  }
+  async postKmsRpc(request, bearerToken, authUserId) {
+    const headers = { authorization: bearerToken };
+    if (authUserId) {
+      headers["x-auth-user-id"] = authUserId;
+    }
+    const response = await this.kmsApi.postKmsRpc(request, { headers });
+    const rpcBody = response.data;
+    if (rpcBody?.error) {
+      throw new Error(`KMS RPC error: ${JSON.stringify(rpcBody.error)}`);
+    }
+    return response.data;
+  }
+  extractOrganizationId(body) {
+    const result = body?.result;
+    return extractStringFromPath(result, "organizationId", "organization_id");
+  }
+  async discoverOrganizationAndWalletId(bearerToken, authUserId) {
+    const organizationId = await this.discoverOrganizationId(bearerToken, authUserId);
+    if (!organizationId) {
+      throw new Error("Unable to resolve organizationId. The Auth2 KMS did not return one.");
+    }
+    const walletId = await this.discoverWalletId(bearerToken, organizationId, authUserId);
+    if (!walletId) {
+      throw new Error("Unable to resolve walletId. The Auth2 KMS did not return or create one.");
+    }
+    return {
+      organizationId,
+      walletId
+    };
+  }
+  async discoverOrganizationId(bearerToken, authUserId) {
+    const keyInfo = this.stamper.getKeyInfo();
+    if (!keyInfo) {
+      throw new Error("Stamper not initialized");
+    }
+    const publicKey = base64urlEncode(index_native.bs582.decode(keyInfo.publicKey));
+    const created = await this.postKmsRpc(
+      {
+        method: GetOrCreatePhantomOrganizationMethodEnum.getOrCreatePhantomOrganization,
+        params: { publicKey },
+        timestampMs: Date.now()
+      },
+      bearerToken,
+      authUserId
+    );
+    return this.extractOrganizationId(created);
+  }
+  async discoverWalletId(bearerToken, organizationId, authUserId) {
+    const listResponse = await this.postKmsRpc(
+      {
+        method: GetOrganizationWalletsMethodEnum.getOrganizationWallets,
+        params: { organizationId, limit: 20, offset: 0 },
+        timestampMs: Date.now()
+      },
+      bearerToken,
+      authUserId
+    );
+    const result = listResponse?.result;
+    const wallets = result?.wallets;
+    if (Array.isArray(wallets) && wallets.length > 0) {
+      return extractStringFromPath(wallets[0], "walletId", "wallet_id");
+    }
+    const createResponse = await this.postKmsRpc(
+      {
+        method: CreateWalletMethodEnum.createWallet,
+        params: {
+          walletName: `Auth2 SDK Wallet ${Date.now()}`,
+          organizationId,
+          accounts: [
+            { curve: "Ed25519", derivationPath: "m/44'/501'/0'/0'", addressFormat: "Solana" },
+            { curve: "Secp256k1", derivationPath: "m/44'/60'/0'/0/0", addressFormat: "Ethereum" },
+            { curve: "Secp256k1", derivationPath: "m/84'/0'/0'/0", addressFormat: "BitcoinSegwit" },
+            { curve: "Ed25519", derivationPath: "m/44'/784'/0'/0'/0'", addressFormat: "Sui" }
+          ]
+        },
+        timestampMs: Date.now()
+      },
+      bearerToken,
+      authUserId
+    );
+    const createResult = createResponse?.result;
+    return extractStringFromPath(createResult, "walletId", "wallet_id");
+  }
+};
+function extractStringFromPath(obj, ...keys) {
+  if (!obj || typeof obj !== "object") {
+    return null;
+  }
+  for (const key of keys) {
+    const val = obj[key];
+    if (typeof val === "string" && val.trim().length > 0) {
+      return val.trim();
+    }
+  }
+  return null;
+}
+
+// src/index.ts
+var DEFAULT_SCOPE = "openid offline_access";
+function createCodeVerifier() {
+  const bytes = new Uint8Array(64);
+  crypto.getRandomValues(bytes);
+  return base64urlEncode(bytes).slice(0, 96);
+}
+async function createConnectStartUrl({
+  keyPair,
+  connectLoginUrl,
+  clientId,
+  redirectUri,
+  sessionId,
+  provider,
+  codeVerifier,
+  salt
+}) {
+  const nonce = await _deriveNonce(keyPair, salt);
+  const codeChallenge = await _createCodeChallenge(codeVerifier);
+  const nowSeconds = Math.floor(Date.now() / 1e3);
+  const jarPayload = {
+    aud: connectLoginUrl,
+    iat: nowSeconds,
+    exp: nowSeconds + 5 * 60,
+    // 5 minutes
+    client_id: clientId,
+    redirect_uri: redirectUri,
+    scope: DEFAULT_SCOPE,
+    nonce,
+    code_challenge: codeChallenge,
+    code_challenge_method: "S256",
+    ...provider && provider !== "phantom" && provider !== "device" && {
+      login_hint: `${provider}:auth2`
+    },
+    // Use session_id as the OAuth state so it comes back in the callback URL
+    // and can be validated without an extra sessionStorage entry.
+    state: sessionId
+  };
+  const jar = await createAuth2RequestJar({
+    payload: jarPayload,
+    keyPair
+  });
+  const url = new URL(connectLoginUrl);
+  url.hash = `jar=${jar}`;
+  return url.toString();
+}
+async function _createCodeChallenge(codeVerifier) {
+  return base64urlEncode(await sha256$2(new TextEncoder().encode(codeVerifier)));
+}
+async function _deriveNonce(keyPair, salt) {
+  const publicKey = await crypto.subtle.exportKey("raw", keyPair.publicKey);
+  const rawPublicKey = new Uint8Array(publicKey);
+  const saltBytes = new TextEncoder().encode(salt);
+  const combined = new Uint8Array(rawPublicKey.length + saltBytes.length);
+  combined.set(rawPublicKey);
+  combined.set(saltBytes, rawPublicKey.length);
+  return base64urlEncode(await sha256$2(combined));
+}
+async function exchangeAuthCode(options) {
+  return _postTokenRequest(
+    options.authApiBaseUrl,
+    new URLSearchParams({
+      grant_type: "authorization_code",
+      client_id: options.clientId,
+      redirect_uri: options.redirectUri,
+      code: options.code,
+      code_verifier: options.codeVerifier
+    })
+  );
+}
+async function refreshToken(options) {
+  const result = await _postTokenRequest(
+    options.authApiBaseUrl,
+    new URLSearchParams({
+      grant_type: "refresh_token",
+      client_id: options.clientId,
+      redirect_uri: options.redirectUri,
+      refresh_token: options.refreshToken
+    })
+  );
+  if (!result.refreshToken) {
+    throw new Error("Auth2 refresh token request did not return a refresh_token.");
+  }
+  return result;
+}
+async function _postTokenRequest(authApiBaseUrl, body) {
+  const tokenEndpoint = new URL("/oauth2/token", authApiBaseUrl).toString();
+  const tokenResponse = await fetch(tokenEndpoint, {
+    method: "POST",
+    headers: { "content-type": "application/x-www-form-urlencoded" },
+    body: body.toString()
+  });
+  if (!tokenResponse.ok) {
+    const text = await tokenResponse.text();
+    throw new Error(`Auth2 token request failed (${tokenResponse.status} ${tokenResponse.statusText}): ${text}`);
+  }
+  const tokens = await tokenResponse.json();
+  const accessToken = tokens.access_token;
+  if (!accessToken) {
+    throw new Error("Auth2 token request did not return an access_token.");
+  }
+  const idToken = tokens.id_token;
+  if (!idToken) {
+    throw new Error("Auth2 token request did not return an id_token.");
+  }
+  const bearerToken = `${tokens?.token_type ?? "Bearer"} ${accessToken}`;
+  const authUserId = _parseJwtClaim(accessToken, ["sub"]) ?? void 0;
+  const expiresInMs = tokens.expires_in != null ? tokens.expires_in * 1e3 : 0;
+  return {
+    idToken,
+    bearerToken,
+    authUserId,
+    expiresInMs,
+    refreshToken: tokens.refresh_token
+  };
+}
+function _parseJwtClaim(token, keys) {
+  try {
+    const parts = token.split(".");
+    if (parts.length < 2 || !parts[1]) {
+      return null;
+    }
+    const padded = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+    const payload = JSON.parse(atob(padded));
+    for (const key of keys) {
+      const val = payload[key];
+      if (typeof val === "string" && val.length > 0) {
+        return val;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+// src/types.ts
+
+// src/debug.ts
+var DebugLevel = /* @__PURE__ */ ((DebugLevel2) => {
+  DebugLevel2[DebugLevel2["ERROR"] = 0] = "ERROR";
+  DebugLevel2[DebugLevel2["WARN"] = 1] = "WARN";
+  DebugLevel2[DebugLevel2["INFO"] = 2] = "INFO";
+  DebugLevel2[DebugLevel2["DEBUG"] = 3] = "DEBUG";
+  return DebugLevel2;
 })(DebugLevel || {});
 var Debug = class {
   constructor() {
@@ -10921,6 +11284,17 @@ var DebugCategory = {
   STORAGE: "Storage",
   SESSION: "Session"
 };
+var CUSTOM_WALLET_CONFIGS = [
+  {
+    id: "coinbase-wallet",
+    name: "Coinbase Wallet",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNTYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTI4IDU2YzE1LjQ2NCAwIDI4LTEyLjUzNiAyOC0yOFM0My40NjQgMCAyOCAwIDAgMTIuNTM2IDAgMjhzMTIuNTM2IDI4IDI4IDI4WiIgZmlsbD0iIzFCNTNFNCIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNyAyOGMwIDExLjU5OCA5LjQwMiAyMSAyMSAyMXMyMS05LjQwMiAyMS0yMVMzOS41OTggNyAyOCA3IDcgMTYuNDAyIDcgMjhabTE3LjIzNC02Ljc2NmEzIDMgMCAwIDAtMyAzdjcuNTMzYTMgMyAwIDAgMCAzIDNoNy41MzNhMyAzIDAgMCAwIDMtM3YtNy41MzNhMyAzIDAgMCAwLTMtM2gtNy41MzNaIiBmaWxsPSIjZmZmIi8+PC9zdmc+",
+    windowProperty: "coinbaseSolana",
+    addressTypes: [exports.AddressType.solana]
+  }
+];
+
+// src/wallets/discovery.ts
 function generateWalletIdFromEIP6963(info) {
   if (info.rdns) {
     return info.rdns.split(".").reverse().join("-");
@@ -11184,6 +11558,51 @@ async function discoverSolanaWallets() {
     walletNames: wallets.map((w) => w.name)
   };
   debug.log(DebugCategory.BROWSER_SDK, "Wallet Standard Solana discovery completed", finalLogData);
+  const customWallets = discoverCustomSolanaWallets();
+  wallets.push(...customWallets);
+  return wallets;
+}
+function discoverCustomSolanaWallets() {
+  const wallets = [];
+  if (typeof window === "undefined") {
+    debug.log(DebugCategory.BROWSER_SDK, "Custom wallet discovery skipped (not in browser environment)");
+    return wallets;
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "Starting custom Solana wallet discovery", {
+    configCount: CUSTOM_WALLET_CONFIGS.length
+  });
+  for (const config of CUSTOM_WALLET_CONFIGS) {
+    if (!config.addressTypes.includes(exports.AddressType.solana)) {
+      continue;
+    }
+    const provider = window[config.windowProperty];
+    if (!provider) {
+      debug.log(DebugCategory.BROWSER_SDK, "Custom wallet not found", {
+        walletId: config.id,
+        windowProperty: config.windowProperty
+      });
+      continue;
+    }
+    debug.log(DebugCategory.BROWSER_SDK, "Discovered custom Solana wallet", {
+      walletId: config.id,
+      walletName: config.name,
+      windowProperty: config.windowProperty
+    });
+    wallets.push({
+      id: config.id,
+      name: config.name,
+      icon: config.icon,
+      addressTypes: config.addressTypes,
+      providers: {
+        solana: provider
+      },
+      discovery: "custom"
+    });
+  }
+  debug.log(DebugCategory.BROWSER_SDK, "Custom Solana wallet discovery completed", {
+    discoveredCount: wallets.length,
+    walletIds: wallets.map((w) => w.id)
+  });
   return wallets;
 }
 function discoverPhantomWallet(addressTypes) {
@@ -11205,8 +11624,7 @@ function discoverPhantomWallet(addressTypes) {
   return {
     id: "phantom",
     name: "Phantom",
-    icon: void 0,
-    // Icon will be rendered from icons package in UI components
+    icon: PHANTOM_ICON,
     addressTypes,
     providers: {
       solana: addressTypes.includes(exports.AddressType.solana) ? phantomInstance.solana : void 0,
@@ -11278,61 +11696,55 @@ var InjectedWalletSolanaChain = class {
   constructor(provider, walletId, walletName) {
     // Expose eventEmitter for testing - allows tests to trigger events directly
     this.eventEmitter = new EventEmitter3();
-    this._connected = false;
     this._publicKey = null;
     this.provider = provider;
     this.walletId = walletId;
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._connected;
-  }
   get publicKey() {
     return this._publicKey;
   }
+  get isConnected() {
+    return this.provider.isConnected || !!this._publicKey;
+  }
   async connect(options) {
-    debug.log(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connect", {
-      walletId: this.walletId,
-      walletName: this.walletName,
-      onlyIfTrusted: options?.onlyIfTrusted
-    });
     try {
-      const result = await this.provider.connect(options);
-      if (typeof result === "string") {
-        this._connected = true;
-        this._publicKey = result;
-        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+      await this.provider.connect(options);
+      const isConnected = this.provider.isConnected;
+      if (!isConnected || this.provider.publicKey === null) {
+        debug.error(DebugCategory.INJECTED_PROVIDER, "Provider not connected after connect() call", {
           walletId: this.walletId,
           walletName: this.walletName,
-          publicKey: result
+          providerConnected: isConnected,
+          providerPublicKey: this.provider.publicKey
         });
-        return { publicKey: result };
+        throw new Error("Provider not connected after connect() call");
       }
-      if (typeof result === "object" && result !== null && "publicKey" in result) {
-        this._connected = true;
-        this._publicKey = result.publicKey;
-        debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+      let publicKey;
+      const providerPublicKey = this.provider.publicKey;
+      if (typeof providerPublicKey === "string") {
+        publicKey = providerPublicKey;
+      } else if (providerPublicKey !== null && providerPublicKey !== void 0 && typeof providerPublicKey.toString === "function") {
+        publicKey = providerPublicKey.toString();
+      } else {
+        debug.error(DebugCategory.INJECTED_PROVIDER, "Invalid publicKey format in provider state", {
           walletId: this.walletId,
           walletName: this.walletName,
-          publicKey: result.publicKey
+          publicKeyType: typeof providerPublicKey
         });
-        return result;
+        throw new Error("Invalid publicKey format in provider state");
       }
-      if (Array.isArray(result) && result.length > 0) {
-        const firstAccount = result[0];
-        if (typeof firstAccount === "object" && firstAccount !== null && "address" in firstAccount) {
-          this._connected = true;
-          this._publicKey = firstAccount.address;
-          debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
-            walletId: this.walletId,
-            walletName: this.walletName,
-            publicKey: firstAccount.address
-          });
-          return { publicKey: firstAccount.address };
-        }
+      if (!publicKey || publicKey.length === 0) {
+        throw new Error("Empty publicKey from provider");
       }
-      throw new Error("Unexpected connect result format");
+      this._publicKey = publicKey;
+      debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connected", {
+        walletId: this.walletId,
+        walletName: this.walletName,
+        publicKey
+      });
+      return { publicKey };
     } catch (error) {
       debug.error(DebugCategory.INJECTED_PROVIDER, "External wallet Solana connect failed", {
         walletId: this.walletId,
@@ -11349,7 +11761,6 @@ var InjectedWalletSolanaChain = class {
     });
     try {
       await this.provider.disconnect();
-      this._connected = false;
       this._publicKey = null;
       debug.info(DebugCategory.INJECTED_PROVIDER, "External wallet Solana disconnected", {
         walletId: this.walletId,
@@ -11485,28 +11896,19 @@ var InjectedWalletSolanaChain = class {
   switchNetwork(_network) {
     return Promise.resolve();
   }
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
-  }
-  isConnected() {
-    return this._connected;
-  }
   setupEventListeners() {
     if (typeof this.provider.on === "function") {
       this.provider.on("connect", (publicKey) => {
-        this._connected = true;
         this._publicKey = publicKey;
         this.eventEmitter.emit("connect", publicKey);
       });
       this.provider.on("disconnect", () => {
-        this._connected = false;
         this._publicKey = null;
         this.eventEmitter.emit("disconnect");
       });
       this.provider.on("accountChanged", (publicKey) => {
-        this._publicKey = publicKey;
-        this._connected = publicKey != null && publicKey.length > 0;
-        this.eventEmitter.emit("accountChanged", publicKey);
+        this._publicKey = publicKey ? publicKey : null;
+        this.eventEmitter.emit("accountChanged", this._publicKey);
       });
     }
   }
@@ -11526,12 +11928,12 @@ var WalletStandardSolanaAdapter = class {
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._publicKey !== null;
-  }
   get publicKey() {
     return this._publicKey;
   }
+  get isConnected() {
+    return this._publicKey !== null;
+  }
   async connect(_options) {
     try {
       const connectFeature = this.wallet.features["standard:connect"];
@@ -11695,7 +12097,7 @@ var WalletStandardSolanaAdapter = class {
         throw new Error("No signature found in signAndSendTransaction result");
       }
       const signatureBytes = this.parseUint8Array(signatureOutput.signature);
-      const signature = index_native.base58.encode(signatureBytes);
+      const signature = index_native.bs582.encode(signatureBytes);
       return { signature };
     } catch (error) {
       debug.error(DebugCategory.INJECTED_PROVIDER, "Wallet Standard Solana signAndSendTransaction failed", {
@@ -11743,12 +12145,6 @@ var WalletStandardSolanaAdapter = class {
   async switchNetwork(_network) {
     return Promise.resolve();
   }
-  getPublicKey() {
-    return Promise.resolve(this._publicKey);
-  }
-  isConnected() {
-    return this._publicKey !== null;
-  }
   /**
    * Set up event listeners for Wallet Standard events
    * Maps Wallet Standard "change" events to "accountChanged" events
@@ -11880,9 +12276,6 @@ var InjectedWalletEthereumChain = class {
     this.walletName = walletName;
     this.setupEventListeners();
   }
-  get connected() {
-    return this._connected;
-  }
   get chainId() {
     return this._chainId;
   }
@@ -12012,7 +12405,8 @@ var InjectedWalletEthereumChain = class {
       address
     });
     try {
-      const providerConnected = this.provider.isConnected?.() || this.provider.connected || false;
+      const providerAny = this.provider;
+      const providerConnected = (typeof providerAny.isConnected === "function" ? providerAny.isConnected() : false) || (typeof providerAny.connected === "boolean" ? providerAny.connected : false);
       if (!this._connected || this._accounts.length === 0 || !providerConnected) {
         debug.log(DebugCategory.INJECTED_PROVIDER, "Not connected, attempting to connect before signing", {
           walletId: this.walletId,
@@ -12326,8 +12720,7 @@ var InjectedWalletRegistry = class {
     const phantomWallet = {
       id: "phantom",
       name: "Phantom",
-      icon: "",
-      // Icon will be rendered from icons package in UI components
+      icon: PHANTOM_ICON,
       addressTypes,
       providers: wrappedProviders,
       isPhantom: true,
@@ -12541,16 +12934,11 @@ var InjectedProvider = class {
           walletName: walletInfo.name
         });
       } catch (err) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, stopping", {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, continuing with other chains", {
           error: err,
           walletId: this.selectedWalletId,
           walletName: walletInfo.name
         });
-        this.emit("connect_error", {
-          error: err instanceof Error ? err.message : "Failed to connect",
-          source: options?.skipEventListeners ? "auto-connect" : "manual-connect"
-        });
-        throw err;
       }
     }
     if (this.addressTypes.includes(exports.AddressType.ethereum) && walletInfo.providers?.ethereum) {
@@ -12580,16 +12968,11 @@ var InjectedProvider = class {
           });
         }
       } catch (err) {
-        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, stopping", {
+        debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, continuing with other chains", {
           error: err,
           walletId: this.selectedWalletId,
           walletName: walletInfo.name
         });
-        this.emit("connect_error", {
-          error: err instanceof Error ? err.message : "Failed to connect",
-          source: options?.skipEventListeners ? "auto-connect" : "manual-connect"
-        });
-        throw err;
       }
     }
     return connectedAddresses;
@@ -12649,7 +13032,8 @@ var InjectedProvider = class {
     this.emit("connect", {
       addresses: connectedAddresses,
       source: "manual-connect",
-      authUserId
+      authUserId,
+      walletId
     });
     return result;
   }
@@ -12661,12 +13045,13 @@ var InjectedProvider = class {
     if (authOptions.provider !== "injected") {
       throw new Error(`Invalid provider for injected connection: ${authOptions.provider}. Must be "injected"`);
     }
+    const requestedWalletId = authOptions.walletId || "phantom";
     this.emit("connect_start", {
       source: "manual-connect",
-      providerType: "injected"
+      providerType: "injected",
+      walletId: requestedWalletId
     });
     try {
-      const requestedWalletId = authOptions.walletId || "phantom";
       const walletInfo = this.validateAndSelectWallet(requestedWalletId);
       const connectedAddresses = await this.connectToWallet(walletInfo);
       return await this.finalizeConnection(connectedAddresses, "injected", this.selectedWalletId || void 0);
@@ -12786,7 +13171,8 @@ var InjectedProvider = class {
       this.emit("connect", {
         addresses: connectedAddresses,
         source: "auto-connect",
-        authUserId
+        authUserId,
+        walletId: this.selectedWalletId
       });
       debug.info(DebugCategory.INJECTED_PROVIDER, "Auto-connect successful", {
         addressCount: connectedAddresses.length,
@@ -12852,7 +13238,8 @@ var InjectedProvider = class {
       this.emit("connect", {
         addresses: newAddresses,
         source,
-        authUserId
+        authUserId,
+        walletId: this.selectedWalletId
       });
     };
   }
@@ -12886,7 +13273,8 @@ var InjectedProvider = class {
         this.emit("connect", {
           addresses: newAddresses,
           source: this.getAccountChangeSource(source),
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       } else {
         const state = this.getWalletState(walletId);
@@ -12927,7 +13315,8 @@ var InjectedProvider = class {
         this.emit("connect", {
           addresses: newAddresses,
           source,
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       }
     };
@@ -12961,7 +13350,8 @@ var InjectedProvider = class {
         this.emit("connect", {
           addresses: newAddresses,
           source: this.getAccountChangeSource(source),
-          authUserId
+          authUserId,
+          walletId: this.selectedWalletId
         });
       } else {
         const state = this.getWalletState(walletId);
@@ -13159,7 +13549,9 @@ var InjectedProvider = class {
     this.eventListenerCleanups.set(walletId, [...existingCleanups, ...cleanups]);
   }
   /**
-   * Unified event listener setup for all wallet types (Phantom and external)
+   * Unified event listener setup for all wallet types (Phantom and external).
+   * Cleans up listeners for previously selected wallets to prevent stale events
+   * from causing walletId flicker during connections.
    */
   setupEventListeners(walletInfo) {
     const walletId = this.selectedWalletId || "phantom";
@@ -13167,6 +13559,17 @@ var InjectedProvider = class {
       debug.log(DebugCategory.INJECTED_PROVIDER, "Event listeners already set up for wallet", { walletId });
       return;
     }
+    for (const existingWalletId of this.eventListenersSetup) {
+      if (existingWalletId === walletId) {
+        continue;
+      }
+      const cleanups = this.eventListenerCleanups.get(existingWalletId);
+      if (cleanups) {
+        debug.log(DebugCategory.INJECTED_PROVIDER, "Cleaning up event listeners for wallet", { existingWalletId });
+        cleanups.forEach((cleanup) => cleanup());
+      }
+      this.eventListenersSetup.delete(existingWalletId);
+    }
     debug.log(DebugCategory.INJECTED_PROVIDER, "Setting up event listeners", { walletId });
     if (this.addressTypes.includes(exports.AddressType.solana) && walletInfo.providers?.solana) {
       this.setupSolanaEventListeners(walletInfo.providers.solana, walletId, "wallet");
@@ -13477,9 +13880,10 @@ var BrowserAuthProvider = class {
         // OAuth session management - defaults to allow refresh unless explicitly clearing after logout
         clear_previous_session: (phantomOptions.clearPreviousSession ?? false).toString(),
         allow_refresh: (phantomOptions.allowRefresh ?? true).toString(),
-        sdk_version: "1.0.2",
+        sdk_version: "1.0.7",
         sdk_type: "browser",
-        platform: detectBrowser().name
+        platform: detectBrowser().name,
+        algorithm: phantomOptions.algorithm || DEFAULT_AUTHENTICATOR_ALGORITHM
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -13507,7 +13911,7 @@ var BrowserAuthProvider = class {
       resolve();
     });
   }
-  resumeAuthFromRedirect(provider) {
+  async resumeAuthFromRedirect(provider) {
     try {
       const walletId = this.urlParamsAccessor.getParam("wallet_id");
       const sessionId = this.urlParamsAccessor.getParam("session_id");
@@ -13582,40 +13986,361 @@ var BrowserAuthProvider = class {
           }
         );
       }
-      return {
+      return Promise.resolve({
         walletId,
         organizationId,
         accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
         expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0,
         authUserId: authUserId || void 0,
         provider
-      };
+      });
     } catch (error) {
       sessionStorage.removeItem("phantom-auth-context");
       throw error;
     }
   }
 };
-async function isPhantomLoginAvailable(timeoutMs = 3e3) {
-  const extensionInstalled = await waitForExtension(timeoutMs);
-  if (!extensionInstalled) {
-    return false;
+var Auth2AuthProvider = class {
+  constructor(stamper, storage, urlParamsAccessor, auth2ProviderOptions, kmsClientOptions) {
+    this.stamper = stamper;
+    this.storage = storage;
+    this.urlParamsAccessor = urlParamsAccessor;
+    this.auth2ProviderOptions = auth2ProviderOptions;
+    this.kms = new Auth2KmsRpcClient(stamper, kmsClientOptions);
   }
-  try {
-    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
-      return false;
+  /** Redirect the browser. Extracted as a static method so tests can spy on it. */
+  static navigate(url) {
+    window.location.href = url;
+  }
+  /**
+   * Builds the Auth2 /login/start URL and redirects the browser.
+   *
+   * Called by EmbeddedProvider.handleRedirectAuth() after the stamper has
+   * already been initialized and a pending Session has been saved to storage.
+   * We store the PKCE code_verifier into that session so it survives the page
+   * redirect without ever touching sessionStorage.
+   */
+  async authenticate(options) {
+    if (!this.stamper.getKeyInfo()) {
+      await this.stamper.init();
     }
-    const response = await window.phantom.app.features();
-    if (!Array.isArray(response.features)) {
-      return false;
+    const keyPair = this.stamper.getCryptoKeyPair();
+    if (!keyPair) {
+      throw new Error("Stamper key pair not found.");
     }
-    return response.features.includes("phantom_login");
-  } catch (error) {
-    console.error("Error checking Phantom extension features", error);
-    return false;
+    const codeVerifier = createCodeVerifier();
+    const session = await this.storage.getSession();
+    if (!session) {
+      throw new Error("Session not found.");
+    }
+    await this.storage.saveSession({ ...session, pkceCodeVerifier: codeVerifier });
+    const url = await createConnectStartUrl({
+      keyPair,
+      connectLoginUrl: this.auth2ProviderOptions.connectLoginUrl,
+      clientId: this.auth2ProviderOptions.clientId,
+      redirectUri: this.auth2ProviderOptions.redirectUri,
+      sessionId: options.sessionId,
+      provider: options.provider,
+      codeVerifier,
+      // The P-256 ephemeral key is unique per wallet, so no additional salt is needed.
+      salt: ""
+    });
+    Auth2AuthProvider.navigate(url);
   }
-}
-async function waitForExtension(timeoutMs) {
+  /**
+   * Processes the Auth2 callback after the browser returns from /login/start.
+   *
+   * Exchanges the authorization code for tokens, discovers the organization
+   * and wallet via KMS RPC, then returns a completed AuthResult.
+   */
+  async resumeAuthFromRedirect(provider) {
+    const code = this.urlParamsAccessor.getParam("code");
+    if (!code) {
+      return null;
+    }
+    if (!this.stamper.getKeyInfo()) {
+      await this.stamper.init();
+    }
+    const session = await this.storage.getSession();
+    if (!session) {
+      throw new Error("Session not found.");
+    }
+    const codeVerifier = session?.pkceCodeVerifier;
+    if (!codeVerifier) {
+      return null;
+    }
+    const state = this.urlParamsAccessor.getParam("state");
+    if (!state || state !== session.sessionId) {
+      throw new Error("Missing or invalid Auth2 state parameter \u2014 possible CSRF attack.");
+    }
+    const error = this.urlParamsAccessor.getParam("error");
+    if (error) {
+      const description = this.urlParamsAccessor.getParam("error_description");
+      throw new Error(`Auth2 callback error: ${description ?? error}`);
+    }
+    const { idToken, bearerToken, authUserId, expiresInMs, refreshToken } = await exchangeAuthCode({
+      authApiBaseUrl: this.auth2ProviderOptions.authApiBaseUrl,
+      clientId: this.auth2ProviderOptions.clientId,
+      redirectUri: this.auth2ProviderOptions.redirectUri,
+      code,
+      codeVerifier
+    });
+    await this.stamper.setTokens({ idToken, bearerToken, refreshToken, expiresInMs });
+    await this.storage.saveSession({
+      ...session,
+      status: "completed",
+      bearerToken,
+      authUserId,
+      pkceCodeVerifier: void 0
+      // no longer needed after code exchange
+    });
+    const { organizationId, walletId } = await this.kms.discoverOrganizationAndWalletId(bearerToken, authUserId);
+    return {
+      walletId,
+      organizationId,
+      provider,
+      accountDerivationIndex: 0,
+      // discoverWalletId uses derivation index of 0.
+      expiresInMs,
+      authUserId,
+      bearerToken
+    };
+  }
+};
+var STORE_NAME = "crypto-keys";
+var ACTIVE_KEY = "auth2-p256-signing-key";
+var Auth2Stamper = class {
+  /**
+   * @param dbName - IndexedDB database name (use a unique name per app to
+   *   avoid key collisions with other stampers, e.g. `phantom-auth2-<appId>`).
+   * @param refreshConfig - When provided, the stamper will automatically refresh
+   *   the id_token using the refresh_token before it expires.
+   */
+  constructor(dbName, refreshConfig) {
+    this.dbName = dbName;
+    this.refreshConfig = refreshConfig;
+    this.db = null;
+    this._keyPair = null;
+    this._keyInfo = null;
+    this._idToken = null;
+    this._bearerToken = null;
+    this._refreshToken = null;
+    this._tokenExpiresAt = null;
+    this.algorithm = Algorithm.secp256r1;
+    this.type = "OIDC";
+  }
+  async init() {
+    await this.openDB();
+    const stored = await this.loadRecord();
+    if (stored) {
+      this._keyPair = stored.keyPair;
+      this._keyInfo = stored.keyInfo;
+      if (stored.idToken) {
+        this._idToken = stored.idToken;
+      }
+      if (stored.bearerToken) {
+        this._bearerToken = stored.bearerToken;
+      }
+      if (stored.refreshToken) {
+        this._refreshToken = stored.refreshToken;
+      }
+      if (stored.tokenExpiresAt) {
+        this._tokenExpiresAt = stored.tokenExpiresAt;
+      }
+      return this._keyInfo;
+    }
+    return this.generateAndStore();
+  }
+  getKeyInfo() {
+    return this._keyInfo;
+  }
+  getCryptoKeyPair() {
+    return this._keyPair;
+  }
+  /**
+   * Returns the current token state (refreshing proactively if near expiry),
+   * or null if no token has been set yet.
+   */
+  async getTokens() {
+    if (this.refreshConfig && this._refreshToken && this._tokenExpiresAt !== null && Date.now() >= this._tokenExpiresAt - TOKEN_REFRESH_BUFFER_MS) {
+      const refreshed = await refreshToken({
+        authApiBaseUrl: this.refreshConfig.authApiBaseUrl,
+        clientId: this.refreshConfig.clientId,
+        redirectUri: this.refreshConfig.redirectUri,
+        refreshToken: this._refreshToken
+      });
+      await this.setTokens(refreshed);
+    }
+    if (!this._idToken || !this._bearerToken) {
+      return null;
+    }
+    return {
+      idToken: this._idToken,
+      bearerToken: this._bearerToken,
+      refreshToken: this._refreshToken ?? void 0
+    };
+  }
+  /**
+   * Arms the stamper with the OIDC token data for subsequent KMS stamp() calls.
+   *
+   * Persists the tokens to IndexedDB alongside the key pair so that
+   * auto-connect can restore them on the next page load without a new login.
+   *
+   * @param refreshToken - When provided alongside a `refreshConfig`, enables
+   *   silent token refresh before the token expires.
+   * @param expiresInMs - Token lifetime in milliseconds (from `expires_in * 1000`).
+   *   Used to compute the absolute expiry time for proactive refresh.
+   */
+  async setTokens({
+    idToken,
+    bearerToken,
+    refreshToken,
+    expiresInMs
+  }) {
+    if (!this.db) {
+      await this.openDB();
+    }
+    this._idToken = idToken;
+    this._bearerToken = bearerToken;
+    this._refreshToken = refreshToken ?? null;
+    this._tokenExpiresAt = expiresInMs != null ? Date.now() + expiresInMs : null;
+    const existing = await this.loadRecord();
+    if (existing) {
+      await this.storeRecord({
+        ...existing,
+        idToken,
+        bearerToken,
+        refreshToken,
+        tokenExpiresAt: this._tokenExpiresAt ?? void 0
+      });
+    }
+  }
+  async stamp(params) {
+    if (!this._keyPair || !this._keyInfo || this._idToken === null) {
+      throw new Error("Auth2Stamper not initialized. Call init() first.");
+    }
+    const signatureRaw = await crypto.subtle.sign(
+      { name: "ECDSA", hash: "SHA-256" },
+      this._keyPair.privateKey,
+      new Uint8Array(params.data)
+    );
+    const rawPublicKey = index_native.bs582.decode(this._keyInfo.publicKey);
+    const stampData = {
+      kind: this.type,
+      idToken: this._idToken,
+      publicKey: base64urlEncode(rawPublicKey),
+      algorithm: this.algorithm,
+      // The P-256 ephemeral key is unique per wallet, so no additional salt is needed.
+      salt: "",
+      signature: base64urlEncode(new Uint8Array(signatureRaw))
+    };
+    return base64urlEncode(new TextEncoder().encode(JSON.stringify(stampData)));
+  }
+  async resetKeyPair() {
+    await this.clear();
+    return this.generateAndStore();
+  }
+  async clear() {
+    await this.clearStoredRecord();
+    this._keyPair = null;
+    this._keyInfo = null;
+    this._idToken = null;
+    this._bearerToken = null;
+    this._refreshToken = null;
+    this._tokenExpiresAt = null;
+  }
+  // Auth2 doesn't use key rotation; provide minimal no-op implementations.
+  async rotateKeyPair() {
+    return this.init();
+  }
+  // eslint-disable-next-line @typescript-eslint/require-await
+  async commitRotation(authenticatorId) {
+    if (this._keyInfo) {
+      this._keyInfo.authenticatorId = authenticatorId;
+    }
+  }
+  async rollbackRotation() {
+  }
+  async generateAndStore() {
+    const keyPair = await crypto.subtle.generateKey(
+      { name: "ECDSA", namedCurve: "P-256" },
+      false,
+      // non-extractable — private key never leaves Web Crypto
+      ["sign", "verify"]
+    );
+    const rawPublicKey = new Uint8Array(await crypto.subtle.exportKey("raw", keyPair.publicKey));
+    const publicKeyBase58 = index_native.bs582.encode(rawPublicKey);
+    const keyIdBuffer = await crypto.subtle.digest("SHA-256", rawPublicKey.buffer);
+    const keyId = base64urlEncode(new Uint8Array(keyIdBuffer)).substring(0, 16);
+    this._keyPair = keyPair;
+    this._keyInfo = {
+      keyId,
+      publicKey: publicKeyBase58,
+      createdAt: Date.now()
+    };
+    await this.storeRecord({ keyPair, keyInfo: this._keyInfo });
+    return this._keyInfo;
+  }
+  async openDB() {
+    return new Promise((resolve, reject) => {
+      const request = indexedDB.open(this.dbName, 1);
+      request.onsuccess = () => {
+        this.db = request.result;
+        resolve();
+      };
+      request.onerror = () => reject(request.error);
+      request.onupgradeneeded = (event) => {
+        const db = event.target.result;
+        if (!db.objectStoreNames.contains(STORE_NAME)) {
+          db.createObjectStore(STORE_NAME);
+        }
+      };
+    });
+  }
+  async loadRecord() {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readonly").objectStore(STORE_NAME).get(ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve(request.result ?? null);
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+  async storeRecord(record) {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readwrite").objectStore(STORE_NAME).put(record, ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve();
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+  async clearStoredRecord() {
+    return new Promise((resolve, reject) => {
+      if (!this.db) {
+        throw new Error("Database not initialized");
+      }
+      const request = this.db.transaction([STORE_NAME], "readwrite").objectStore(STORE_NAME).delete(ACTIVE_KEY);
+      request.onsuccess = () => {
+        resolve();
+      };
+      request.onerror = () => {
+        reject(request.error);
+      };
+    });
+  }
+};
+async function waitForPhantomExtension(timeoutMs = 3e3) {
   return new Promise((resolve) => {
     const startTime = Date.now();
     const checkInterval = 100;
@@ -13638,6 +14363,27 @@ async function waitForExtension(timeoutMs) {
   });
 }
 
+// src/isPhantomLoginAvailable.ts
+async function isPhantomLoginAvailable(timeoutMs = 3e3) {
+  const extensionInstalled = await waitForPhantomExtension(timeoutMs);
+  if (!extensionInstalled) {
+    return false;
+  }
+  try {
+    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
+      return false;
+    }
+    const response = await window.phantom.app.features();
+    if (!Array.isArray(response.features)) {
+      return false;
+    }
+    return response.features.includes("phantom_login");
+  } catch (error) {
+    console.error("Error checking Phantom extension features", error);
+    return false;
+  }
+}
+
 // src/providers/embedded/adapters/phantom-app.ts
 var BrowserPhantomAppProvider = class {
   /**
@@ -13692,33 +14438,53 @@ var BrowserPhantomAppProvider = class {
 
 // src/providers/embedded/adapters/logger.ts
 var BrowserLogger = class {
-  info(category, message, data) {
-    debug.info(category, message, data);
+  info(message, ...args) {
+    debug.info(message, args.length > 0 ? String(args[0]) : "", args[1]);
   }
-  warn(category, message, data) {
-    debug.warn(category, message, data);
+  warn(message, ...args) {
+    debug.warn(message, args.length > 0 ? String(args[0]) : "", args[1]);
   }
-  error(category, message, data) {
-    debug.error(category, message, data);
+  error(message, ...args) {
+    debug.error(message, args.length > 0 ? String(args[0]) : "", args[1]);
   }
-  log(category, message, data) {
-    debug.log(category, message, data);
+  debug(message, ...args) {
+    debug.log(message, args.length > 0 ? String(args[0]) : "", args[1]);
   }
 };
 var EmbeddedProvider = class extends EmbeddedProvider$1 {
   constructor(config) {
     debug.log(DebugCategory.EMBEDDED_PROVIDER, "Initializing Browser EmbeddedProvider", { config });
     const urlParamsAccessor = new BrowserURLParamsAccessor();
-    const stamper = new IndexedDbStamper({
+    const storage = new BrowserStorage();
+    const stamper = config.unstable__auth2Options ? new Auth2Stamper(`phantom-auth2-${config.appId}`, {
+      authApiBaseUrl: config.unstable__auth2Options.authApiBaseUrl,
+      clientId: config.unstable__auth2Options.clientId,
+      redirectUri: config.authOptions?.redirectUrl ?? ""
+    }) : new IndexedDbStamper({
       dbName: `phantom-embedded-sdk-${config.appId}`,
       storeName: "crypto-keys",
       keyName: "signing-key"
     });
     const platformName = getPlatformName();
     const { name: browserName, version } = detectBrowser();
+    const authProvider = config.unstable__auth2Options && config.authOptions?.authUrl && config.authOptions?.redirectUrl && stamper instanceof Auth2Stamper ? new Auth2AuthProvider(
+      stamper,
+      storage,
+      urlParamsAccessor,
+      {
+        redirectUri: config.authOptions.redirectUrl,
+        connectLoginUrl: config.authOptions.authUrl,
+        clientId: config.unstable__auth2Options.clientId,
+        authApiBaseUrl: config.unstable__auth2Options.authApiBaseUrl
+      },
+      {
+        apiBaseUrl: config.apiBaseUrl,
+        appId: config.appId
+      }
+    ) : new BrowserAuthProvider(urlParamsAccessor);
     const platform = {
-      storage: new BrowserStorage(),
-      authProvider: new BrowserAuthProvider(urlParamsAccessor),
+      storage,
+      authProvider,
       phantomAppProvider: new BrowserPhantomAppProvider(),
       urlParamsAccessor,
       stamper,
@@ -13726,13 +14492,12 @@ var EmbeddedProvider = class extends EmbeddedProvider$1 {
       // Use detected browser name and version for identification
       analyticsHeaders: {
         [ANALYTICS_HEADERS.SDK_TYPE]: "browser",
-        [ANALYTICS_HEADERS.PLATFORM]: browserName,
-        // firefox, chrome, safari, etc.
+        [ANALYTICS_HEADERS.PLATFORM]: "ext-sdk",
         [ANALYTICS_HEADERS.PLATFORM_VERSION]: version,
-        // Full user agent for more detailed info
+        [ANALYTICS_HEADERS.CLIENT]: browserName,
         [ANALYTICS_HEADERS.APP_ID]: config.appId,
         [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.2"
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.7"
         // Replaced at build time
       }
     };
@@ -13765,11 +14530,12 @@ function isAuthCallbackUrl(searchParams) {
 }
 
 // src/utils/deeplink.ts
-function getDeeplinkToPhantom(ref) {
-  if (!window.location.href.startsWith("http:") && !window.location.href.startsWith("https:")) {
+function getDeeplinkToPhantom(ref, currentHref) {
+  const resolvedHref = window.location.href;
+  if (!resolvedHref.startsWith("http:") && !resolvedHref.startsWith("https:")) {
     throw new Error("Invalid URL protocol - only HTTP/HTTPS URLs are supported for deeplinks");
   }
-  const currentUrl = encodeURIComponent(window.location.href);
+  const currentUrl = encodeURIComponent(resolvedHref);
   const refParam = "";
   return `https://phantom.app/ul/browse/${currentUrl}${refParam}`;
 }
@@ -13865,8 +14631,14 @@ var ProviderManager = class {
     } else if (requestedProvider === "deeplink") {
       try {
         const deeplinkUrl = getDeeplinkToPhantom();
-        if (typeof window !== "undefined") {
-          window.location.href = deeplinkUrl;
+        if (typeof window !== "undefined" && window.location) {
+          try {
+            window.location.href = deeplinkUrl;
+          } catch (error) {
+            debug.warn(DebugCategory.PROVIDER_MANAGER, "Failed to set deeplink location", {
+              error: error instanceof Error ? error.message : String(error)
+            });
+          }
         }
         return {
           addresses: [],
@@ -14139,6 +14911,7 @@ var ProviderManager = class {
           authUrl,
           redirectUrl: this.config.authOptions?.redirectUrl || this.getValidatedCurrentUrl()
         },
+        unstable__auth2Options: this.config.unstable__auth2Options,
         embeddedWalletType: embeddedWalletType || DEFAULT_EMBEDDED_WALLET_TYPE,
         addressTypes: this.config.addressTypes || [exports.AddressType.solana]
       });
@@ -14333,6 +15106,7 @@ var BrowserSDK = class {
    */
   async autoConnect() {
     debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect with fallback strategy");
+    await this.discoverWallets();
     const result = await this.providerManager.autoConnect();
     if (result) {
       debug.info(DebugCategory.BROWSER_SDK, "Auto-connect successful", {
@@ -14479,28 +15253,6 @@ var BrowserSDK = class {
     }
   }
 };
-async function waitForPhantomExtension(timeoutMs = 3e3) {
-  return new Promise((resolve) => {
-    const startTime = Date.now();
-    const checkInterval = 100;
-    const checkForExtension = () => {
-      try {
-        if (isInstalled()) {
-          resolve(true);
-          return;
-        }
-      } catch (error) {
-      }
-      const elapsed = Date.now() - startTime;
-      if (elapsed >= timeoutMs) {
-        resolve(false);
-        return;
-      }
-      setTimeout(checkForExtension, checkInterval);
-    };
-    checkForExtension();
-  });
-}
 
 // src/utils/index.ts
 var hexToRgba = (hex, opacity) => {
@@ -16127,4 +16879,4 @@ exports.useModal = useModal;
 exports.usePhantom = usePhantom;
 exports.useSolana = useSolana;
 exports.useTheme = useTheme;
-//# sourceMappingURL=index-CqoP9udN.js.map
+//# sourceMappingURL=index-BMrN-6oK.js.map