@bounded-sh/client 0.0.17 → 0.0.18

package/dist/index.mjs

@@ -6673,6 +6673,50 @@ const MODAL_CSS = `
 #bounded-auth-modal .hidden{display:none;}
 @media (max-width:480px){#bounded-auth-modal .ba-card{max-width:none;border-radius:16px;}}`;
 
+const SURFNET_RPC_URL = "https://surfpool.fly.dev";
+const SUPPORTED_SOLANA_NETWORKS = new Set([
+    "solana_devnet",
+    "solana_mainnet",
+    "surfnet",
+]);
+function normalizeSolanaRpcUrl(rpcUrl) {
+    if (typeof rpcUrl !== "string")
+        return null;
+    const trimmed = rpcUrl.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+function isSupportedSolanaRpcNetwork(network) {
+    return typeof network === "string" && SUPPORTED_SOLANA_NETWORKS.has(network);
+}
+function resolveSolanaWalletStandardChain(network, context) {
+    switch (network) {
+        case "solana_devnet":
+            return "solana:devnet";
+        case "solana_mainnet":
+            return "solana:mainnet";
+        case "surfnet":
+            return "solana:localnet";
+        case undefined:
+        case null:
+        case "":
+            throw new Error(`${context} requires an explicit Solana network. ` +
+                `Provide one of: solana_devnet, solana_mainnet, surfnet.`);
+        default:
+            throw new Error(`${context} does not support Solana network "${network}". ` +
+                `Expected one of: solana_devnet, solana_mainnet, surfnet.`);
+    }
+}
+function resolveSolanaRpcUrl(explicitRpcUrl, network, context) {
+    if (network != null && network !== "" && !isSupportedSolanaRpcNetwork(network)) {
+        throw new Error(`${context} does not support Solana network "${network}". ` +
+            `Expected one of: solana_devnet, solana_mainnet, surfnet.`);
+    }
+    const rpcUrl = normalizeSolanaRpcUrl(explicitRpcUrl);
+    if (rpcUrl)
+        return rpcUrl;
+    throw new Error(`${context} requires an explicit Solana RPC URL. Pass config.rpcUrl before signing or submitting onchain transactions.`);
+}
+
 const PKCE_STORE_KEY = 'bounded.oidc.pkce';
 // Active session store (Web on web, RN on React Native) — selected by config,
 // not by `typeof window` (truthy on RN). OIDC redirect/popup is web-only, but the
@@ -6979,7 +7023,7 @@ async function exchangeCode(code, verifier, redirectUri) {
 let currentAuthProvider = null;
 let currentAuthMethod = null;
 let initConfig = null;
-// --- localStorage helpers: track which auth method the user last logged in with ---
+// --- localStorage helpers: track which auth method created the active session ---
 const STORED_AUTH_METHOD_KEY$1 = 'bounded_last_auth_method';
 function getStoredAuthMethod() {
     try {
@@ -7003,7 +7047,7 @@ function setStoredAuthMethod(method) {
     }
 }
 /**
- * Clears the session if it was created before auth method tracking (legacy session).
+ * Clears the session if it was created by a different auth method.
  * Returns true if the session was cleared, false if the session is compatible.
  *
  * Dispatches to the correct session manager based on the current auth method
@@ -7011,18 +7055,17 @@ function setStoredAuthMethod(method) {
  * are properly cleared.
  */
 function clearIncompatibleSession() {
-    if (getStoredAuthMethod() !== null) {
-        return false; // Auth method is tracked — session is compatible
+    if (getStoredAuthMethod() === currentAuthMethod) {
+        return false;
     }
-    // Legacy session (no stored auth method) — clear it so the user re-authenticates
-    // with the correct provider.
-    // Clear both managers — on web the RN manager is a no-op (not configured),
-    // on RN the web manager is a no-op (no localStorage).
+    // Clear both managers: on web the RN manager is a no-op (not configured),
+    // and on RN the web manager is a no-op (no localStorage).
     WebSessionManager.clearSession();
     try {
         ReactNativeSessionManager.clearSession();
     }
     catch ( /* not configured on web */_a) { /* not configured on web */ }
+    setStoredAuthMethod(null);
     return true;
 }
 // Lazy loaders for web-only providers.
@@ -7041,17 +7084,67 @@ async function loadSolanaMobileWalletProvider() {
     const mod = await Promise.resolve().then(function () { return solanaMobileWalletProvider; });
     return mod.SolanaMobileWalletProvider;
 }
+function requireWebPrivyConfig(config) {
+    if (!config.privyConfig || typeof config.privyConfig.appId !== 'string' || config.privyConfig.appId.trim() === '') {
+        throw new Error('Privy auth requires config.privyConfig.appId; no default Privy app is used.');
+    }
+    if (!config.privyConfig.config || typeof config.privyConfig.config !== 'object') {
+        throw new Error('Privy auth requires config.privyConfig.config for the app-scoped Privy provider.');
+    }
+    return config.privyConfig;
+}
+function getConfiguredSolanaNetwork(config) {
+    if (typeof config.chain !== 'string')
+        return null;
+    const chain = config.chain.trim();
+    if (chain === '' || chain === 'offchain')
+        return null;
+    return chain;
+}
+function mobileWalletClusterFromNetwork(network) {
+    switch (network) {
+        case "solana_devnet":
+            return "devnet";
+        case "solana_mainnet":
+            return "mainnet-beta";
+        case "surfnet":
+            return "localnet";
+        case null:
+            return null;
+        default:
+            resolveSolanaWalletStandardChain(network, "Mobile wallet auth");
+            return null;
+    }
+}
+function requireMobileWalletConfig(config) {
+    var _a, _b, _c;
+    const configuredNetwork = getConfiguredSolanaNetwork(config);
+    const cluster = (_b = (_a = config.mobileWalletConfig) === null || _a === void 0 ? void 0 : _a.cluster) !== null && _b !== void 0 ? _b : mobileWalletClusterFromNetwork(configuredNetwork);
+    if (!cluster) {
+        throw new Error("Mobile wallet auth requires an explicit Solana network. " +
+            "Pass config.chain as solana_devnet, solana_mainnet, or surfnet, " +
+            "or pass mobileWalletConfig.cluster.");
+    }
+    return Object.assign(Object.assign({}, ((_c = config.mobileWalletConfig) !== null && _c !== void 0 ? _c : {})), { cluster });
+}
 async function hotSwapToMWAProvider(config) {
-    var _a, _b;
-    const rpcUrl = (_a = config.rpcUrl) !== null && _a !== void 0 ? _a : null;
+    var _a;
+    const rpcUrl = normalizeSolanaRpcUrl(config.rpcUrl);
+    const configuredNetwork = getConfiguredSolanaNetwork(config);
     const SolanaMobileWalletProvider = await loadSolanaMobileWalletProvider();
-    const mwaConfig = (_b = config.mobileWalletConfig) !== null && _b !== void 0 ? _b : {
-        appIdentity: {
-            name: config.name || undefined,
-            uri: getPlatform().getLocationOrigin(),
-        },
-    };
-    const mwaProvider = new SolanaMobileWalletProvider(rpcUrl, mwaConfig);
+    const mwaConfig = config.mobileWalletConfig
+        ? requireMobileWalletConfig(config)
+        : {
+            appIdentity: {
+                name: config.name || undefined,
+                uri: getPlatform().getLocationOrigin(),
+            },
+            cluster: (_a = mobileWalletClusterFromNetwork(configuredNetwork)) !== null && _a !== void 0 ? _a : undefined,
+        };
+    if (!mwaConfig.cluster) {
+        throw new Error("Mobile wallet auth requires config.chain or mobileWalletConfig.cluster before switching providers.");
+    }
+    const mwaProvider = new SolanaMobileWalletProvider(rpcUrl, mwaConfig, configuredNetwork);
     let provider = mwaProvider;
     if (config.chain === "offchain") {
         provider = new OffchainAuthProvider(mwaProvider);
@@ -7066,11 +7159,8 @@ async function hotSwapToMWAProvider(config) {
     setAuthProviderInstance(provider);
     return provider;
 }
-const SOLANA_DEVNET_RPC_URL = "https://idelle-8nxsep-fast-devnet.helius-rpc.com";
-const SOLANA_MAINNET_RPC_URL = "https://celestia-cegncv-fast-mainnet.helius-rpc.com";
-const SURFNET_RPC_URL$2 = "https://surfpool.fly.dev";
 async function getAuthProvider(config) {
-    var _a, _b, _c;
+    var _a, _b;
     if (currentAuthProvider) {
         return currentAuthProvider;
     }
@@ -7084,17 +7174,12 @@ async function getAuthProvider(config) {
         currentAuthProvider = new MockAuthProvider();
         return currentAuthProvider;
     }
-    // If the user previously logged in with a specific method, use that instead
-    const validAuthMethods = ['email', 'phantom', 'wallet', 'rainbowkit', 'coinbase-smart-wallet', 'onboard', 'mobile-wallet-adapter', 'guest', 'privy', 'privy-expo', 'none'];
-    const storedMethod = getStoredAuthMethod();
-    const authMethod = (storedMethod && validAuthMethods.includes(storedMethod))
-        ? storedMethod
-        : (config.authMethod || "email");
-    if (storedMethod && !validAuthMethods.includes(storedMethod)) {
-        // Invalid stored value — clear it
-        setStoredAuthMethod(null);
-    }
-    const rpcUrl = (_a = config.rpcUrl) !== null && _a !== void 0 ? _a : null;
+    const authMethod = config.authMethod;
+    if (!authMethod) {
+        throw new Error("authMethod is required to initialize auth provider; configure the single intended auth method explicitly.");
+    }
+    const rpcUrl = normalizeSolanaRpcUrl(config.rpcUrl);
+    const configuredNetwork = getConfiguredSolanaNetwork(config);
     currentAuthMethod = authMethod;
     // Clear, actionable error when the BROWSER build (`bounded-sh`) is loaded in a
     // non-browser (Node) runtime. The wallet providers below need `window`; without
@@ -7124,7 +7209,7 @@ async function getAuthProvider(config) {
             break;
         case "phantom": {
             const { PhantomWalletProvider } = await loadPhantomWalletProvider();
-            currentAuthProvider = new PhantomWalletProvider(rpcUrl, config.phantomConfig);
+            currentAuthProvider = new PhantomWalletProvider(rpcUrl, config.phantomConfig, configuredNetwork);
             // MWA hot-swap is always available (custom modal shows MWA button on Android)
             currentAuthProvider.onSwitchToMWA =
                 () => hotSwapToMWAProvider(config);
@@ -7134,8 +7219,9 @@ async function getAuthProvider(config) {
             // Web Privy: a co-equal login route alongside email/phantom/guest. The
             // Privy embedded/external Solana wallet signs the SIWS challenge, so the
             // session is minted through the same wallet path as Phantom.
+            const privyConfig = requireWebPrivyConfig(config);
             const PrivyWalletProvider = await loadPrivyWalletProvider();
-            currentAuthProvider = new PrivyWalletProvider((_b = config.name) !== null && _b !== void 0 ? _b : null, (_c = config.logoUrl) !== null && _c !== void 0 ? _c : null, config.privyConfig, rpcUrl);
+            currentAuthProvider = new PrivyWalletProvider((_a = config.name) !== null && _a !== void 0 ? _a : null, (_b = config.logoUrl) !== null && _b !== void 0 ? _b : null, privyConfig, rpcUrl, configuredNetwork);
             break;
         }
         case "privy-expo":
@@ -7150,7 +7236,7 @@ async function getAuthProvider(config) {
             break;
         case "mobile-wallet-adapter": {
             const SolanaMobileWalletProvider = await loadSolanaMobileWalletProvider();
-            currentAuthProvider = new SolanaMobileWalletProvider(rpcUrl, config.mobileWalletConfig);
+            currentAuthProvider = new SolanaMobileWalletProvider(rpcUrl, requireMobileWalletConfig(config), configuredNetwork);
             break;
         }
         case "onboard":
@@ -7220,13 +7306,14 @@ async function signInAnonymously() {
  * (web localStorage / RN storage) and identity model. `init()` must have run first.
  */
 async function loginWithPrivy(options) {
-    var _a, _b, _c;
+    var _a, _b;
     assertBrowserAuthEnv('loginWithPrivy');
     const coreConfig = await getConfig();
     let provider;
     if (getPlatform().hasDOM) {
+        const privyConfig = requireWebPrivyConfig(coreConfig);
         const PrivyWalletProvider = await loadPrivyWalletProvider();
-        provider = new PrivyWalletProvider((_a = coreConfig.name) !== null && _a !== void 0 ? _a : null, (_b = coreConfig.logoUrl) !== null && _b !== void 0 ? _b : null, coreConfig.privyConfig, (_c = coreConfig.rpcUrl) !== null && _c !== void 0 ? _c : null);
+        provider = new PrivyWalletProvider((_a = coreConfig.name) !== null && _a !== void 0 ? _a : null, (_b = coreConfig.logoUrl) !== null && _b !== void 0 ? _b : null, privyConfig, normalizeSolanaRpcUrl(coreConfig.rpcUrl), getConfiguredSolanaNetwork(coreConfig));
         currentAuthMethod = 'privy';
     }
     else {
@@ -7372,15 +7459,13 @@ async function logout$1() {
         throw new Error("Auth provider not initialized. Please call init() first.");
     }
     // Revoke the refresh-token family server-side BEFORE the provider clears the
-    // local session (so we still have the token + issuer to revoke). Best-effort:
-    // revokeSession swallows errors so logout never hangs/fails on a network blip.
-    try {
-        const sm = getActiveSessionManager();
-        const refreshToken = sm.getRefreshToken();
-        if (refreshToken)
-            await revokeSession(refreshToken, (_a = sm.getIssuer()) !== null && _a !== void 0 ? _a : undefined);
-    }
-    catch ( /* proceed with local logout regardless */_b) { /* proceed with local logout regardless */ }
+    // local session (so we still have the token + issuer to revoke). If revoke
+    // fails, surface the error and leave local state intact so callers do not
+    // mistake a local-only logout for server revocation.
+    const sm = getActiveSessionManager();
+    const refreshToken = sm.getRefreshToken();
+    if (refreshToken)
+        await revokeSession(refreshToken, (_a = sm.getIssuer()) !== null && _a !== void 0 ? _a : undefined);
     await currentAuthProvider.logout();
     setStoredAuthMethod(null);
     currentAuthProvider = null;
@@ -7835,7 +7920,7 @@ class PhantomWalletProvider {
     setLoginOverrides(opts) {
         this.loginOverrides = opts;
     }
-    constructor(networkUrl = null, config = {}) {
+    constructor(networkUrl = null, config = {}, configuredNetwork = null) {
         this.containerElement = null;
         this.root = null;
         this.phantomMethods = null;
@@ -7848,6 +7933,7 @@ class PhantomWalletProvider {
         /** Callback to swap to a Mobile Wallet Adapter provider when the user clicks "Connect Mobile Wallet" */
         this.onSwitchToMWA = null;
         this.networkUrl = networkUrl;
+        this.configuredNetwork = configuredNetwork;
         this.config = config;
         if (typeof window === 'undefined') {
             throw new Error('PhantomWalletProvider can only be instantiated in a browser environment');
@@ -7874,9 +7960,9 @@ class PhantomWalletProvider {
     hasSocialProviders() {
         return this.resolvedProviders.some(p => p !== 'injected');
     }
-    static getInstance(networkUrl, config) {
+    static getInstance(networkUrl, config, configuredNetwork = null) {
         if (!PhantomWalletProvider.instance) {
-            new PhantomWalletProvider(networkUrl, config);
+            new PhantomWalletProvider(networkUrl, config, configuredNetwork);
         }
         return PhantomWalletProvider.instance;
     }
@@ -8778,7 +8864,7 @@ class PhantomWalletProvider {
         }
         const rpcUrl = this.getRpcUrl(solTransactionData.network);
         const connection = new Connection(rpcUrl, 'confirmed');
-        const isSurfnet = rpcUrl === SURFNET_RPC_URL$2;
+        const isSurfnet = rpcUrl === SURFNET_RPC_URL;
         try {
             const remainingAccounts = convertRemainingAccounts(solTransactionData.txArgs[0].remainingAccounts);
             const app_id = solTransactionData.appId;
@@ -9000,7 +9086,7 @@ class PhantomWalletProvider {
         }
         const rpcUrl = this.getRpcUrl();
         const connection = new Connection(rpcUrl, 'confirmed');
-        const isSurfnet = rpcUrl === SURFNET_RPC_URL$2;
+        const isSurfnet = rpcUrl === SURFNET_RPC_URL;
         try {
             // Get fresh blockhash and set it on the transaction before signing
             const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
@@ -9133,19 +9219,7 @@ class PhantomWalletProvider {
      * Private Helpers
      * ----------------------------------------------------------- */
     getRpcUrl(network) {
-        if (this.networkUrl) {
-            return this.networkUrl;
-        }
-        if (network === 'solana_devnet') {
-            return SOLANA_DEVNET_RPC_URL;
-        }
-        else if (network === 'solana_mainnet') {
-            return SOLANA_MAINNET_RPC_URL;
-        }
-        else if (network === 'surfnet') {
-            return SURFNET_RPC_URL$2;
-        }
-        return SOLANA_MAINNET_RPC_URL; // default to mainnet
+        return resolveSolanaRpcUrl(this.networkUrl, network !== null && network !== void 0 ? network : this.configuredNetwork, "Phantom wallet Solana transaction");
     }
     async signAndSendViaPhantom(transaction) {
         var _a, _b, _c;
@@ -9592,8 +9666,10 @@ async function signWithFreshActivation(theme, signFn, noResultError = 'MWA retur
  * normalized to `solana:mainnet`.
  */
 function mapChainToWalletStandard(input) {
-    if (!input)
-        return 'solana:mainnet';
+    if (!input) {
+        throw new Error("Solana mobile wallet auth requires an explicit cluster. " +
+            "Pass mobileWalletConfig.cluster or config.chain.");
+    }
     let s = String(input).toLowerCase();
     while (s.startsWith('solana:'))
         s = s.slice('solana:'.length);
@@ -9605,7 +9681,22 @@ function mapChainToWalletStandard(input) {
         return 'solana:testnet';
     if (s === 'localnet')
         return 'solana:localnet';
-    return 'solana:mainnet';
+    throw new Error(`Solana mobile wallet auth does not support cluster "${input}". ` +
+        "Expected mainnet-beta, devnet, testnet, or localnet.");
+}
+function mapClusterToRpcNetwork(input) {
+    if (!input)
+        return null;
+    let s = String(input).toLowerCase();
+    while (s.startsWith('solana:'))
+        s = s.slice('solana:'.length);
+    if (s === 'mainnet-beta' || s === 'mainnet')
+        return 'solana_mainnet';
+    if (s === 'devnet')
+        return 'solana_devnet';
+    if (s === 'localnet')
+        return 'surfnet';
+    return null;
 }
 /**
  * Serialize a Transaction/VersionedTransaction to a Uint8Array wire payload
@@ -9781,7 +9872,8 @@ async function registerMobileWalletAdapter(config) {
  * acceptable given the alternative was broken on Seeker.
  */
 class SolanaMobileWalletProvider {
-    constructor(networkUrl = null, config = {}) {
+    constructor(networkUrl = null, config = {}, configuredNetwork = null) {
+        var _a;
         /** LocalSolanaMobileWalletAdapterWallet, lazy-constructed in ensureWallet(). */
         this.wallet = null;
         /**
@@ -9795,6 +9887,7 @@ class SolanaMobileWalletProvider {
         /** Cached public key string for the connected MWA wallet (native). */
         this.nativeAddress = null;
         this.networkUrl = networkUrl;
+        this.configuredNetwork = configuredNetwork;
         this.config = config;
         // Allow construction in true React Native environments: getPlatform().hasDOM
         // is false there even though `typeof window === 'object'` (RN exposes a
@@ -9823,7 +9916,7 @@ class SolanaMobileWalletProvider {
             name: 'Bounded App',
             uri: fallbackUri,
         };
-        this.cluster = config.cluster || 'mainnet-beta';
+        this.cluster = (_a = config.cluster) !== null && _a !== void 0 ? _a : '';
         // Hydrate cached MWA auth_token from storage on native so we can
         // skip the wallet-pick popup after a cold-start when the underlying
         // wallet authorization is still valid. Sync storage call per the
@@ -9840,15 +9933,15 @@ class SolanaMobileWalletProvider {
                     }
                 }
             }
-            catch (_a) {
+            catch (_b) {
                 // Corrupt or unreadable cache — ignore. login() will re-auth.
             }
         }
         SolanaMobileWalletProvider.instance = this;
     }
-    static getInstance(networkUrl, config) {
+    static getInstance(networkUrl, config, configuredNetwork = null) {
         if (!SolanaMobileWalletProvider.instance) {
-            new SolanaMobileWalletProvider(networkUrl, config);
+            new SolanaMobileWalletProvider(networkUrl, config, configuredNetwork);
         }
         return SolanaMobileWalletProvider.instance;
     }
@@ -9903,7 +9996,13 @@ class SolanaMobileWalletProvider {
         return wallet.accounts[0];
     }
     /** Returns the active wallet-standard chain identifier (e.g. 'solana:mainnet'). */
-    getChain() {
+    getChain(network) {
+        if (network) {
+            return resolveSolanaWalletStandardChain(network, "Solana mobile wallet transaction");
+        }
+        if (this.configuredNetwork) {
+            return resolveSolanaWalletStandardChain(this.configuredNetwork, "Solana mobile wallet transaction");
+        }
         return mapChainToWalletStandard(this.cluster);
     }
     /**
@@ -10365,7 +10464,7 @@ class SolanaMobileWalletProvider {
             const connectedPubkey = new PublicKey(this.nativeAddress);
             const rpcUrl = this.getRpcUrl();
             const connection = new Connection(rpcUrl, 'confirmed');
-            const isSurfnet = rpcUrl === SURFNET_RPC_URL$2;
+            const isSurfnet = rpcUrl === SURFNET_RPC_URL;
             const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
             const isLegacyTransaction = 'recentBlockhash' in transaction && !('message' in transaction && 'staticAccountKeys' in transaction.message);
             if (isLegacyTransaction) {
@@ -10423,7 +10522,7 @@ class SolanaMobileWalletProvider {
         const chain = this.getChain();
         const rpcUrl = this.getRpcUrl();
         const connection = new Connection(rpcUrl, 'confirmed');
-        const isSurfnet = rpcUrl === SURFNET_RPC_URL$2;
+        const isSurfnet = rpcUrl === SURFNET_RPC_URL;
         try {
             // Preserve existing prep: refresh blockhash and set fee payer.
             const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
@@ -10503,10 +10602,10 @@ class SolanaMobileWalletProvider {
         const account = await this.ensureAuthorized();
         const connectedPubkey = new PublicKey(account.publicKey);
         const wallet = await this.ensureWallet();
-        const chain = this.getChain();
+        const chain = this.getChain(solTransactionData.network);
         const rpcUrl = this.getRpcUrl(solTransactionData.network);
         const connection = new Connection(rpcUrl, 'confirmed');
-        const isSurfnet = rpcUrl === SURFNET_RPC_URL$2;
+        const isSurfnet = rpcUrl === SURFNET_RPC_URL;
         try {
             const remainingAccounts = convertRemainingAccounts(solTransactionData.txArgs[0].remainingAccounts);
             const app_id = solTransactionData.appId;
@@ -10682,19 +10781,8 @@ class SolanaMobileWalletProvider {
      * Private Helpers
      * ----------------------------------------------------------- */
     getRpcUrl(network) {
-        if (this.networkUrl) {
-            return this.networkUrl;
-        }
-        if (network === 'solana_devnet') {
-            return SOLANA_DEVNET_RPC_URL;
-        }
-        else if (network === 'solana_mainnet') {
-            return SOLANA_MAINNET_RPC_URL;
-        }
-        else if (network === 'surfnet') {
-            return SURFNET_RPC_URL$2;
-        }
-        return SOLANA_MAINNET_RPC_URL;
+        var _a;
+        return resolveSolanaRpcUrl(this.networkUrl, (_a = network !== null && network !== void 0 ? network : this.configuredNetwork) !== null && _a !== void 0 ? _a : mapClusterToRpcNetwork(this.cluster), "Solana mobile wallet transaction");
     }
 }
 SolanaMobileWalletProvider.instance = null;
@@ -10706,7 +10794,6 @@ var solanaMobileWalletProvider = /*#__PURE__*/Object.freeze({
     registerMobileWalletAdapter: registerMobileWalletAdapter
 });
 
-const SURFNET_RPC_URL$1 = "https://surfpool.fly.dev";
 // @privy-io/react-auth(/solana) are OPTIONAL peer deps. They are loaded lazily
 // via dynamic import() rather than a static top-level import: a static import
 // would (a) in the ESM bundle still be a bare `import` the consumer resolves —
@@ -10739,31 +10826,28 @@ async function loadSolanaKit() {
     }
     return solanaKit;
 }
-const getDefaultPrivyConfig = () => ({
-    appId: "cm4ve714908o27dk2yurpnfhd",
-    config: {
-        embeddedWallets: {
-            solana: {
-                createOnLogin: "users-without-wallets"
-            }
-        },
-        appearance: {
-            walletChainType: 'solana-only'
-        },
-        externalWallets: { solana: { connectors: privySolana.toSolanaWalletConnectors() } }
+function requirePrivyWalletConfig(privyConfig) {
+    if (!privyConfig || typeof privyConfig.appId !== 'string' || privyConfig.appId.trim() === '') {
+        throw new Error('Privy auth requires config.privyConfig.appId; no default Privy app is used.');
     }
-});
+    if (!privyConfig.config || typeof privyConfig.config !== 'object') {
+        throw new Error('Privy auth requires config.privyConfig.config for the app-scoped Privy provider.');
+    }
+    return {
+        appId: privyConfig.appId,
+        config: privyConfig.config,
+    };
+}
 class PrivyWalletProvider {
-    constructor(appName, appLogoUrl, privyConfig, networkUrl = null) {
+    constructor(appName, appLogoUrl, privyConfig, networkUrl = null, configuredNetwork = null) {
         this.containerElement = null;
-        this.chainId = 'solana:mainnet';
+        this.chainId = null;
         this.root = null;
         this.privyMethods = null;
         this.pendingLogin = null;
         // Resolved Solana RPC URLs (computed in the constructor; consumed in
         // initialize() where @solana/kit is lazily loaded to build the transports).
-        this.rpcDevnetUrl = SOLANA_DEVNET_RPC_URL;
-        this.rpcMainnetUrl = SOLANA_MAINNET_RPC_URL;
+        this.configuredRpcUrl = null;
         // This is used to store the pending transaction until the wallet is connected for workaround for the wallet not being connected after login completion
         this.pendingTransaction = null;
         // This is used to store pending signTransaction calls until the wallet is connected
@@ -10772,41 +10856,37 @@ class PrivyWalletProvider {
         this.pendingSignMessage = null;
         // This is used to store pending signAndSubmitTransaction calls until the wallet is connected
         this.pendingSignAndSubmitTransaction = null;
-        this.networkUrl = networkUrl;
+        this.networkUrl = normalizeSolanaRpcUrl(networkUrl);
+        this.configuredNetwork = configuredNetwork;
         if (typeof window === 'undefined') {
             throw new Error('PrivyWalletProvider can only be instantiated in a browser environment');
         }
+        const requiredPrivyConfig = requirePrivyWalletConfig(privyConfig);
         if (PrivyWalletProvider.instance) {
             return PrivyWalletProvider.instance;
         }
         this.containerElement = null;
         this.root = null;
         this.privyMethods = null;
-        this.privyConfig = privyConfig !== null && privyConfig !== void 0 ? privyConfig : getDefaultPrivyConfig();
-        // Only use the appName and appLogoUrl if no privyConfig is provided
-        if (privyConfig == null) {
-            if (appName != null && appName != '') {
-                this.privyConfig.config.appearance.landingHeader = appName;
-            }
-            if (appLogoUrl != null && appLogoUrl != '') {
-                this.privyConfig.config.appearance.logo = appLogoUrl;
-            }
+        this.privyConfig = requiredPrivyConfig;
+        if (!this.privyConfig.config.appearance) {
+            this.privyConfig.config.appearance = {};
+        }
+        if (appName != null && appName != '' && !this.privyConfig.config.appearance.landingHeader) {
+            this.privyConfig.config.appearance.landingHeader = appName;
+        }
+        if (appLogoUrl != null && appLogoUrl != '' && !this.privyConfig.config.appearance.logo) {
+            this.privyConfig.config.appearance.logo = appLogoUrl;
         }
         // (externalWallets connectors are configured in initialize() once the
         // Privy SDK is lazily loaded — see loadPrivyModules.)
         // Resolve Solana RPC URLs for v3. The @solana/kit transports are built
         // lazily in initialize() so a non-Privy consumer never needs @solana/kit.
-        this.rpcDevnetUrl = SOLANA_DEVNET_RPC_URL;
-        this.rpcMainnetUrl = SOLANA_MAINNET_RPC_URL;
-        if (networkUrl != null) {
-            if (networkUrl.includes('mainnet')) {
-                this.rpcMainnetUrl = networkUrl;
-                this.chainId = 'solana:mainnet';
-            }
-            else if (networkUrl.includes('devnet')) {
-                this.rpcDevnetUrl = networkUrl;
-                this.chainId = 'solana:devnet';
-            }
+        if (this.networkUrl || configuredNetwork) {
+            this.configuredRpcUrl = resolveSolanaRpcUrl(this.networkUrl, configuredNetwork, "Privy Solana RPC");
+        }
+        if (configuredNetwork) {
+            this.chainId = resolveSolanaWalletStandardChain(configuredNetwork, "Privy Solana transaction");
         }
         const existingProviders = document.querySelectorAll('[data-privy-provider]');
         existingProviders.forEach(el => el.remove());
@@ -10821,9 +10901,9 @@ class PrivyWalletProvider {
         PrivyWalletProvider.instance = this;
     }
     // Optional: Provide a static method to get the instance
-    static getInstance(appName, appLogoUrl, privyConfig) {
+    static getInstance(appName, appLogoUrl, privyConfig, networkUrl = null, configuredNetwork = null) {
         if (!PrivyWalletProvider.instance) {
-            new PrivyWalletProvider(appName, appLogoUrl, privyConfig);
+            new PrivyWalletProvider(appName, appLogoUrl, privyConfig, networkUrl, configuredNetwork);
         }
         return PrivyWalletProvider.instance;
     }
@@ -10833,19 +10913,17 @@ class PrivyWalletProvider {
         // Build the Solana RPC transports now that we're on the async path, so
         // @solana/kit can be lazily imported (kept out of the entry bundle).
         const { createSolanaRpc, createSolanaRpcSubscriptions } = await loadSolanaKit();
-        if (!this.privyConfig.config.solana) {
+        if (this.configuredRpcUrl && this.chainId && !this.privyConfig.config.solana) {
             this.privyConfig.config.solana = {};
         }
-        this.privyConfig.config.solana.rpcs = {
-            'solana:devnet': {
-                rpc: createSolanaRpc(this.rpcDevnetUrl),
-                rpcSubscriptions: createSolanaRpcSubscriptions(this.rpcDevnetUrl.replace('https://', 'wss://'))
-            },
-            'solana:mainnet': {
-                rpc: createSolanaRpc(this.rpcMainnetUrl),
-                rpcSubscriptions: createSolanaRpcSubscriptions(this.rpcMainnetUrl.replace('https://', 'wss://'))
-            }
-        };
+        if (this.configuredRpcUrl && this.chainId) {
+            this.privyConfig.config.solana.rpcs = {
+                [this.chainId]: {
+                    rpc: createSolanaRpc(this.configuredRpcUrl),
+                    rpcSubscriptions: createSolanaRpcSubscriptions(this.configuredRpcUrl.replace('https://', 'wss://'))
+                }
+            };
+        }
         // Ensure externalWallets connectors are always configured — required for
         // useWallets().ready to resolve even when no browser extension is present.
         if (!this.privyConfig.config.externalWallets && privySolana) {
@@ -11181,7 +11259,7 @@ class PrivyWalletProvider {
         try {
             if ((options === null || options === void 0 ? void 0 : options.shouldSubmitTx) === false) {
                 // Just sign, don't submit - return raw signed bytes (same as original runTransaction)
-                const signedTx = await this.signTransactionRaw(tx, privyWallet);
+                const signedTx = await this.signTransactionRaw(tx, privyWallet, solTransactionData.network);
                 return {
                     signedTransaction: signedTx, // Raw Uint8Array from Privy
                     blockNumber: 0,
@@ -11190,7 +11268,7 @@ class PrivyWalletProvider {
                 };
             }
             // Sign and submit using shared helper
-            const { signature, txInfo } = await this.signAndSubmitInternal(tx, privyWallet, rpcUrl, connection);
+            const { signature, txInfo } = await this.signAndSubmitInternal(tx, privyWallet, rpcUrl, connection, solTransactionData.network);
             return {
                 transactionSignature: signature,
                 blockNumber: (txInfo === null || txInfo === void 0 ? void 0 : txInfo.slot) || 0,
@@ -11362,26 +11440,25 @@ class PrivyWalletProvider {
     }
     // ============ Private Helpers ============
     getRpcUrl(network) {
-        if (this.networkUrl) {
-            return this.networkUrl;
-        }
-        if (network === 'solana_devnet') {
-            return SOLANA_DEVNET_RPC_URL;
-        }
-        else if (network === 'solana_mainnet') {
-            return SOLANA_MAINNET_RPC_URL;
+        return resolveSolanaRpcUrl(this.networkUrl, network !== null && network !== void 0 ? network : this.configuredNetwork, "Privy Solana transaction");
+    }
+    getChainId(network) {
+        if (network) {
+            return resolveSolanaWalletStandardChain(network, "Privy Solana transaction");
         }
-        else if (network === 'surfnet') {
-            return SURFNET_RPC_URL$1;
+        if (this.chainId)
+            return this.chainId;
+        if (this.configuredNetwork) {
+            return resolveSolanaWalletStandardChain(this.configuredNetwork, "Privy Solana transaction");
         }
-        return SOLANA_MAINNET_RPC_URL; // default to mainnet
+        throw new Error("Privy Solana transaction requires config.chain as solana_devnet, solana_mainnet, or surfnet.");
     }
     /**
      * Internal sign transaction - serializes and signs via Privy
      * Returns the raw result from Privy (Uint8Array)
      * This mirrors exactly what runTransaction was doing
      */
-    async signTransactionRaw(transaction, privyWallet) {
+    async signTransactionRaw(transaction, privyWallet, network) {
         var _a;
         // Serialize the transaction
         // Use duck typing instead of instanceof to handle multiple @solana/web3.js versions
@@ -11397,7 +11474,7 @@ class PrivyWalletProvider {
         const result = await ((_a = this.privyMethods) === null || _a === void 0 ? void 0 : _a.signTransaction({
             transaction: serializedForSign,
             wallet: privyWallet,
-            chain: this.chainId
+            chain: this.getChainId(network)
         }));
         // Privy returns { signedTransaction: Uint8Array }, unwrap it
         const signedTx = (result === null || result === void 0 ? void 0 : result.signedTransaction) || result;
@@ -11442,13 +11519,13 @@ class PrivyWalletProvider {
      * For Surfnet: sign with signTransactionRaw, then sendRawTransaction
      * For non-Surfnet: use Privy's signAndSendTransaction (combined operation)
      */
-    async signAndSubmitInternal(transaction, privyWallet, rpcUrl, connection) {
+    async signAndSubmitInternal(transaction, privyWallet, rpcUrl, connection, network) {
         var _a;
-        const isSurfnet = rpcUrl === SURFNET_RPC_URL$1;
+        const isSurfnet = rpcUrl === SURFNET_RPC_URL;
         let signature;
         if (isSurfnet) {
             // For Surfnet: sign with signTransactionRaw, then sendRawTransaction
-            const signedTx = await this.signTransactionRaw(transaction, privyWallet);
+            const signedTx = await this.signTransactionRaw(transaction, privyWallet, network);
             signature = await connection.sendRawTransaction(signedTx);
         }
         else {
@@ -11466,7 +11543,7 @@ class PrivyWalletProvider {
             const result = await ((_a = this.privyMethods) === null || _a === void 0 ? void 0 : _a.useSendTransactionSolana.signAndSendTransaction({
                 transaction: serializedTx,
                 wallet: privyWallet,
-                chain: this.chainId
+                chain: this.getChainId(network)
             }));
             // Handle case where signature might be bytes instead of string
             const rawSig = result.signature;
@@ -11533,16 +11610,7 @@ class PrivyWalletProvider {
         }
         let privyWallet = this.privyMethods.wallets.find((wallet) => wallet.address === sessionAddress);
         if (!privyWallet) {
-            // Session address is not a privy wallet, just default to the first wallet
-            const accessToken = await this.privyMethods.getAccessToken();
-            await this.createSession(this.privyMethods.wallets[0].address, accessToken, this.privyMethods.identityToken);
-            setCurrentUser({ address: this.privyMethods.wallets[0].address, provider: this });
-            const session = await getActiveSessionManager().getSession();
-            sessionAddress = session === null || session === void 0 ? void 0 : session.address;
-            if (!sessionAddress) {
-                throw new Error('No wallet connected or logged in to sign message');
-            }
-            privyWallet = this.privyMethods.wallets[0];
+            throw new Error('Active Privy wallets do not include the authenticated session wallet; please log in again.');
         }
         // Use the Privy signMessage hook for Solana wallets
         // The message needs to be passed as a Uint8Array
@@ -11572,22 +11640,21 @@ class PrivyWalletProvider {
     // Privy-specific token verification — it arrives as a Solana signature and is
     // recorded server-side as authMethod 'phantom'.
     async createSession(address, _accessToken, _idToken) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        // Resolve the Privy wallet for this address (fall back to the first wallet).
-        const privyWallet = (_c = (_b = (_a = this.privyMethods) === null || _a === void 0 ? void 0 : _a.wallets) === null || _b === void 0 ? void 0 : _b.find((w) => w.address === address)) !== null && _c !== void 0 ? _c : (_e = (_d = this.privyMethods) === null || _d === void 0 ? void 0 : _d.wallets) === null || _e === void 0 ? void 0 : _e[0];
+        var _a, _b, _c, _d;
+        const privyWallet = (_b = (_a = this.privyMethods) === null || _a === void 0 ? void 0 : _a.wallets) === null || _b === void 0 ? void 0 : _b.find((w) => w.address === address);
         if (!privyWallet) {
-            throw new Error('No Privy Solana wallet available to mint a session.');
+            throw new Error('No Privy Solana wallet matching the requested session address is available.');
         }
         const nonce = await genAuthNonce();
         const message = await genSolanaMessage(address, nonce);
         const messageBytes = getPlatform().textEncode(message);
         // Low-level Privy sign hook — signs WITHOUT touching the session (the public
         // signMessage() bootstraps sessions, which would recurse here).
-        const signResult = await ((_f = this.privyMethods) === null || _f === void 0 ? void 0 : _f.signMessage({
+        const signResult = await ((_c = this.privyMethods) === null || _c === void 0 ? void 0 : _c.signMessage({
             message: messageBytes,
             wallet: privyWallet,
         }));
-        const signatureBytes = (_g = signResult === null || signResult === void 0 ? void 0 : signResult.signature) !== null && _g !== void 0 ? _g : signResult;
+        const signatureBytes = (_d = signResult === null || signResult === void 0 ? void 0 : signResult.signature) !== null && _d !== void 0 ? _d : signResult;
         // base64-encoded detached signature (matches Phantom + guest providers).
         const signature = bufferExports.Buffer.from(signatureBytes).toString('base64');
         const createSessionResult = await createSessionWithSignature(address, message, signature);
@@ -11669,7 +11736,6 @@ var privyWalletProvider = /*#__PURE__*/Object.freeze({
  * to host Privy's React context, this provider expects the RN app itself
  * to render <PrivyProvider> and then bridge the hooks via setPrivyMethods().
  */
-const SURFNET_RPC_URL = 'https://surfpool.fly.dev';
 // -----------------------------------------------------------------------
 // Provider implementation
 // -----------------------------------------------------------------------
@@ -11677,7 +11743,7 @@ class PrivyExpoProvider {
     constructor(appId, networkUrl = null) {
         this.privyMethods = null;
         this.appId = appId;
-        this.networkUrl = networkUrl;
+        this.networkUrl = normalizeSolanaRpcUrl(networkUrl);
     }
     /**
      * Bridge Privy hooks from the app's React tree into this provider.
@@ -11962,15 +12028,7 @@ class PrivyExpoProvider {
         return { signature, txInfo };
     }
     getRpcUrl(network) {
-        if (this.networkUrl)
-            return this.networkUrl;
-        if (network === 'solana_devnet')
-            return SOLANA_DEVNET_RPC_URL;
-        if (network === 'solana_mainnet')
-            return SOLANA_MAINNET_RPC_URL;
-        if (network === 'surfnet')
-            return SURFNET_RPC_URL;
-        return SOLANA_MAINNET_RPC_URL;
+        return resolveSolanaRpcUrl(this.networkUrl, network, "Privy Expo Solana transaction");
     }
     async ensureReady(timeoutMs = 15000) {
         if (!this.privyMethods) {