@abstraxn/signer-react 3.3.10 → 4.0.0

package/dist/src/hooks.d.ts

@@ -1,4 +1,5 @@
 import type { WhoamiResponse, TransactionRequest, EnableMfaResponse, VerifySetupMfaResponse, DisableMfaResponse, SupportedAuthMethod, LinkedAuthMethod } from '@abstraxn/signer-core';
+import type { TokenData } from './components/WalletModal/components/TokenSelectorModal';
 import type { Chain, PublicClient, Address, Abi, GetContractReturnType, TransactionReceipt } from 'viem';
 import { Connection as SolanaConnection, Transaction as SolanaTransaction, TransactionInstruction, type Commitment, type SendOptions } from '@solana/web3.js';
 import { SolanaRelayer } from '@abstraxn/solana-relayer';
@@ -308,6 +309,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             request?: (parameters: import("viem").CcipRequestParameters) => Promise<import("viem/_types/utils/ccip").CcipRequestReturnType>;
         } | undefined;
         chain: Chain | undefined;
+        dataSuffix?: import("viem").DataSuffix | undefined;
         experimental_blockTag?: import("viem").BlockTag | undefined;
         key: string;
         name: string;
@@ -366,6 +368,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
                 hash: import("viem").Hash;
                 type: "legacy";
                 yParity?: undefined | undefined;
+                blockTimestamp?: bigint | undefined;
                 gas: bigint;
                 nonce: number;
                 r: import("viem").Hex;
@@ -391,6 +394,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
                 hash: import("viem").Hash;
                 type: "eip2930";
                 yParity: number;
+                blockTimestamp?: bigint | undefined;
                 gas: bigint;
                 nonce: number;
                 r: import("viem").Hex;
@@ -416,6 +420,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
                 hash: import("viem").Hash;
                 type: "eip1559";
                 yParity: number;
+                blockTimestamp?: bigint | undefined;
                 gas: bigint;
                 nonce: number;
                 r: import("viem").Hex;
@@ -441,6 +446,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
                 hash: import("viem").Hash;
                 type: "eip4844";
                 yParity: number;
+                blockTimestamp?: bigint | undefined;
                 gas: bigint;
                 nonce: number;
                 r: import("viem").Hex;
@@ -466,6 +472,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
                 hash: import("viem").Hash;
                 type: "eip7702";
                 yParity: number;
+                blockTimestamp?: bigint | undefined;
                 gas: bigint;
                 nonce: number;
                 r: import("viem").Hex;
@@ -490,6 +497,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
         getChainId: () => Promise<import("viem").GetChainIdReturnType>;
         getCode: (args: import("viem").GetBytecodeParameters) => Promise<import("viem").GetBytecodeReturnType>;
         getContractEvents: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi> | undefined = undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetContractEventsParameters<abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetContractEventsReturnType<abi, eventName, strict, fromBlock, toBlock>>;
+        getDelegation: (args: import("viem").GetDelegationParameters) => Promise<import("viem").GetDelegationReturnType>;
         getEip712Domain: (args: import("viem").GetEip712DomainParameters) => Promise<import("viem").GetEip712DomainReturnType>;
         getEnsAddress: (args: import("viem").GetEnsAddressParameters) => Promise<import("viem").GetEnsAddressReturnType>;
         getEnsAvatar: (args: import("viem").GetEnsAvatarParameters) => Promise<import("viem").GetEnsAvatarReturnType>;
@@ -516,6 +524,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             hash: import("viem").Hash;
             type: "legacy";
             yParity?: undefined | undefined;
+            blockTimestamp?: bigint | undefined;
             gas: bigint;
             nonce: number;
             r: import("viem").Hex;
@@ -541,6 +550,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             hash: import("viem").Hash;
             type: "eip2930";
             yParity: number;
+            blockTimestamp?: bigint | undefined;
             gas: bigint;
             nonce: number;
             r: import("viem").Hex;
@@ -566,6 +576,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             hash: import("viem").Hash;
             type: "eip1559";
             yParity: number;
+            blockTimestamp?: bigint | undefined;
             gas: bigint;
             nonce: number;
             r: import("viem").Hex;
@@ -591,6 +602,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             hash: import("viem").Hash;
             type: "eip4844";
             yParity: number;
+            blockTimestamp?: bigint | undefined;
             gas: bigint;
             nonce: number;
             r: import("viem").Hex;
@@ -616,6 +628,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             hash: import("viem").Hash;
             type: "eip7702";
             yParity: number;
+            blockTimestamp?: bigint | undefined;
             gas: bigint;
             nonce: number;
             r: import("viem").Hex;
@@ -3889,7 +3902,11 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
         } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
             chainId?: number | undefined;
-        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
+        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) & {
+            _capabilities?: {
+                [x: string]: any;
+            } | undefined;
+        } extends infer T ? { [K in keyof T]: T[K]; } : never>;
         readContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "pure" | "view">, const args extends import("viem").ContractFunctionArgs<abi, "pure" | "view", functionName>>(args: import("viem").ReadContractParameters<abi, functionName, args>) => Promise<import("viem").ReadContractReturnType<abi, functionName, args>>;
         sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<import("viem").SendRawTransactionReturnType>;
         sendRawTransactionSync: (args: import("viem").SendRawTransactionSyncParameters) => Promise<TransactionReceipt>;
@@ -3915,6 +3932,7 @@ export declare function usePublicClient(chain: Chain, rpcUrl: string): {
             cacheTime?: undefined;
             ccipRead?: undefined;
             chain?: undefined;
+            dataSuffix?: undefined;
             experimental_blockTag?: undefined;
             key?: undefined;
             name?: undefined;
@@ -3964,6 +3982,7 @@ export declare function useWalletClient(chain: any, rpcUrl?: string): {
             request?: (parameters: import("viem").CcipRequestParameters) => Promise<import("viem/_types/utils/ccip").CcipRequestReturnType>;
         } | undefined;
         chain: Chain | undefined;
+        dataSuffix?: import("viem").DataSuffix | undefined;
         experimental_blockTag?: import("viem").BlockTag | undefined;
         key: string;
         name: string;
@@ -7233,7 +7252,11 @@ export declare function useWalletClient(chain: any, rpcUrl?: string): {
             authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
         } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
             chainId?: number | undefined;
-        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
+        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) & {
+            _capabilities?: {
+                [x: string]: any;
+            } | undefined;
+        } extends infer T ? { [K in keyof T]: T[K]; } : never>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: import("viem").RequestPermissionsParameters) => Promise<import("viem").RequestPermissionsReturnType>;
         sendCalls: <const calls extends readonly unknown[], chainOverride extends Chain | undefined = undefined>(parameters: import("viem").SendCallsParameters<Chain | undefined, import("viem").Account | undefined, chainOverride, calls>) => Promise<{
@@ -8375,6 +8398,7 @@ export declare function useWalletClient(chain: any, rpcUrl?: string): {
             cacheTime?: undefined;
             ccipRead?: undefined;
             chain?: undefined;
+            dataSuffix?: undefined;
             experimental_blockTag?: undefined;
             key?: undefined;
             name?: undefined;
@@ -8413,6 +8437,31 @@ export declare function useSolanaBalance(): {
     loading: boolean;
     error: Error | null;
 };
+/**
+ * Hook to get the full non-zero token list (native + SPL) for the active embedded
+ * Solana address, sourced from Turnkey with an RPC-derived native-only fallback.
+ * Mirrors useSolanaBalance()'s shape. Safe to call unconditionally regardless of the
+ * current chain type - no-ops (returns an empty, non-loading result) when the current
+ * chain isn't Solana or there's no embedded Solana address.
+ */
+export declare function useSolanaTokenBalances(): {
+    tokens: TokenData[];
+    loading: boolean;
+    error: Error | null;
+};
+/**
+ * Hook to get the full non-zero token list (native + ERC-20) for the current EVM
+ * chain, sourced from AbstraxnProvider's centralized state (Turnkey-first with an
+ * RPC-derived native-only fallback - see AbstraxnProviderInner's refetchWalletBalance).
+ * Safe to call unconditionally regardless of the current chain type - no-ops (returns
+ * an empty, non-loading result) when the current chain isn't EVM.
+ */
+export declare function useTokenBalances(): {
+    tokens: TokenData[];
+    loading: boolean;
+    error: Error | null;
+    refetch: () => Promise<void>;
+};
 interface PrepareSolanaTransferParams {
     fromPubkey: string;
     toPubkey: string;
@@ -8945,6 +8994,7 @@ export declare function useExternalWalletClient(): {
             request?: (parameters: import("viem").CcipRequestParameters) => Promise<import("viem/_types/utils/ccip").CcipRequestReturnType>;
         } | undefined;
         chain: Chain;
+        dataSuffix?: import("viem").DataSuffix | undefined;
         experimental_blockTag?: import("viem").BlockTag | undefined;
         key: string;
         name: string;
@@ -12214,7 +12264,11 @@ export declare function useExternalWalletClient(): {
             authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
         } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
             chainId?: number | undefined;
-        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
+        }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "fees" | "gas" | "nonce" | "blobVersionedHashes" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) & {
+            _capabilities?: {
+                [x: string]: any;
+            } | undefined;
+        } extends infer T ? { [K in keyof T]: T[K]; } : never>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: import("viem").RequestPermissionsParameters) => Promise<import("viem").RequestPermissionsReturnType>;
         sendCalls: <const calls extends readonly unknown[], chainOverride extends Chain | undefined = undefined>(parameters: import("viem").SendCallsParameters<Chain, import("viem").Account, chainOverride, calls>) => Promise<{
@@ -13356,6 +13410,7 @@ export declare function useExternalWalletClient(): {
             cacheTime?: undefined;
             ccipRead?: undefined;
             chain?: undefined;
+            dataSuffix?: undefined;
             experimental_blockTag?: undefined;
             key?: undefined;
             name?: undefined;

package/dist/src/hooks.js

@@ -4,6 +4,8 @@
 import { useState, useCallback, useEffect, useMemo } from 'react';
 import { useAbstraxnWallet } from './AbstraxnProvider';
 import { InvalidDeviceIdError, SignMfaRequiredError } from '@abstraxn/signer-core';
+import { requestSignMfaCode } from './signMfaBridge';
+import { TURNKEY_SUPPORTED_CAIP2, NATIVE_ASSET_SENTINEL, chainIdToCaip2, isNativeAssetEntry, extractAssetAddress, } from '@abstraxn/signer-core';
 import { createPublicClient, createWalletClient, http, getContract, serializeTransaction, encodeFunctionData, hashTypedData, hashMessage, parseSignature } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { Connection as SolanaConnection, Transaction as SolanaTransaction, SystemProgram, PublicKey, LAMPORTS_PER_SOL, TransactionInstruction, } from '@solana/web3.js';
@@ -233,15 +235,8 @@ function isInvalidDeviceIdError(error) {
         candidate?.name === 'InvalidDeviceIdError' ||
         (typeof candidate?.message === 'string' && candidate.message.includes('INVALID_DEVICE_ID')));
 }
-function promptForSignMfaCode() {
-    if (typeof window === 'undefined' || typeof window.prompt !== 'function') {
-        throw new Error('MFA step-up is required to sign, but no prompt UI is available in this environment.');
-    }
-    const code = window.prompt('Enter your MFA code to approve this signing request');
-    if (!code || code.trim() === '') {
-        throw new Error('MFA code is required to continue signing.');
-    }
-    return code.trim().toUpperCase();
+async function requestSignMfaCodeFromUi() {
+    return requestSignMfaCode();
 }
 async function runWithSignStepUpRetry(performSign, verifySignMfa) {
     try {
@@ -257,7 +252,7 @@ async function runWithSignStepUpRetry(performSign, verifySignMfa) {
         if (!verifySignMfa) {
             throw new Error('MFA step-up is required, but sign verification is not available.');
         }
-        const code = promptForSignMfaCode();
+        const code = await requestSignMfaCodeFromUi();
         let verifyResponse;
         try {
             verifyResponse = await verifySignMfa(code);
@@ -399,11 +394,11 @@ export function useEnableMfa() {
  * auth (otp/recovery) -> confirm disable.
  */
 export function useDisableMfa() {
-    const { verifyMfa, disableMfaWithSignedPayload } = useAbstraxnWallet();
+    const { verifySignMfa, disableMfaWithSignedPayload } = useAbstraxnWallet();
     const [disableState, setDisableState] = useState(null);
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
-    const canDisableMfaFlow = !!verifyMfa && !!disableMfaWithSignedPayload;
+    const canDisableMfaFlow = !!verifySignMfa && !!disableMfaWithSignedPayload;
     const reset = useCallback(() => {
         setDisableState(null);
         setIsLoading(false);
@@ -420,7 +415,8 @@ export function useDisableMfa() {
         setDisableState({ step: 'auth', method });
     }, []);
     const verifyCode = useCallback(async (code) => {
-        if (!verifyMfa || disableState?.step !== 'auth')
+        // Sign step-up is required: disable MFA signs a payload via /sign/transaction.
+        if (!verifySignMfa || disableState?.step !== 'auth')
             return false;
         const { method } = disableState;
         const trimmed = method === 'recovery' ? code.trim().toUpperCase() : code.trim();
@@ -434,7 +430,7 @@ export function useDisableMfa() {
         setIsLoading(true);
         setError(null);
         try {
-            await verifyMfa(trimmed);
+            await verifySignMfa(trimmed);
             setDisableState({ step: 'confirm' });
             return true;
         }
@@ -446,7 +442,7 @@ export function useDisableMfa() {
         finally {
             setIsLoading(false);
         }
-    }, [verifyMfa, disableState]);
+    }, [verifySignMfa, disableState]);
     const confirmDisable = useCallback(async () => {
         if (!disableMfaWithSignedPayload)
             return null;
@@ -1049,7 +1045,7 @@ export function useSolanaPublicKey() {
  * RPC endpoint is taken from the current Solana ChainData (configured in AbstraxnProvider).
  */
 export function useSolanaBalance() {
-    const { currentChain, whoami, solanaWallet, solanaConnection } = useAbstraxnWallet();
+    const { currentChain, whoami, solanaWallet, solanaConnection, wallet } = useAbstraxnWallet();
     const [lamports, setLamports] = useState(null);
     const [formattedBalance, setFormattedBalance] = useState('0');
     const [loading, setLoading] = useState(false);
@@ -1062,6 +1058,9 @@ export function useSolanaBalance() {
         : null) ||
         // Fallback to provider connection endpoint
         (providerConnection && providerConnection.rpcEndpoint) || null;
+    // An external wallet (Phantom) address isn't a Turnkey wallet-account - only try
+    // Turnkey when using the embedded wallet's own address.
+    const isExternalSolanaWallet = !!solanaWallet?.publicKey;
     const address = (solanaWallet?.publicKey && solanaWallet.publicKey.toBase58()) ||
         whoami?.solanaAddress ||
         null;
@@ -1074,14 +1073,35 @@ export function useSolanaBalance() {
             return;
         }
         let cancelled = false;
+        const fetchViaRpc = async () => {
+            const connection = new SolanaConnection(rpcUrl, 'confirmed');
+            const balance = await connection.getBalance(new PublicKey(address), 'confirmed');
+            return BigInt(balance);
+        };
         const fetchBalance = async () => {
             setLoading(true);
             try {
-                const connection = new SolanaConnection(rpcUrl, 'confirmed');
-                const balance = await connection.getBalance(new PublicKey(address), 'confirmed');
+                let asBigInt = null;
+                if (!isExternalSolanaWallet && wallet && currentChain) {
+                    const caip2 = chainIdToCaip2(currentChain.id, TURNKEY_SUPPORTED_CAIP2);
+                    if (caip2) {
+                        try {
+                            const entries = await wallet.getTurnkeyBalances(caip2, address);
+                            const nativeEntry = entries.find((entry) => isNativeAssetEntry({ caip19: entry.caip19, symbol: entry.symbol, decimals: entry.decimals }, currentChain.nativeCurrency));
+                            if (nativeEntry?.balance !== undefined) {
+                                asBigInt = BigInt(nativeEntry.balance);
+                            }
+                        }
+                        catch (turnkeyError) {
+                            console.warn('Turnkey Solana balance fetch failed, falling back to RPC:', turnkeyError);
+                        }
+                    }
+                }
+                if (asBigInt === null) {
+                    asBigInt = await fetchViaRpc();
+                }
                 if (cancelled)
                     return;
-                const asBigInt = BigInt(balance);
                 setLamports(asBigInt);
                 const sol = Number(asBigInt) / LAMPORTS_PER_SOL;
                 setFormattedBalance(sol.toFixed(6));
@@ -1101,7 +1121,7 @@ export function useSolanaBalance() {
         return () => {
             cancelled = true;
         };
-    }, [providerConnection, rpcUrl, address]);
+    }, [providerConnection, rpcUrl, address, isExternalSolanaWallet, wallet, currentChain]);
     return {
         address,
         lamports,
@@ -1110,6 +1130,124 @@ export function useSolanaBalance() {
         error,
     };
 }
+/**
+ * Hook to get the full non-zero token list (native + SPL) for the active embedded
+ * Solana address, sourced from Turnkey with an RPC-derived native-only fallback.
+ * Mirrors useSolanaBalance()'s shape. Safe to call unconditionally regardless of the
+ * current chain type - no-ops (returns an empty, non-loading result) when the current
+ * chain isn't Solana or there's no embedded Solana address.
+ */
+export function useSolanaTokenBalances() {
+    const { currentChain, whoami, solanaWallet, wallet } = useAbstraxnWallet();
+    const [tokens, setTokens] = useState([]);
+    const [loading, setLoading] = useState(false);
+    const [error, setError] = useState(null);
+    const isSolanaChain = currentChain && currentChain.type === 'solana';
+    const isExternalSolanaWallet = !!solanaWallet?.publicKey;
+    const address = !isExternalSolanaWallet ? whoami?.solanaAddress ?? null : null;
+    useEffect(() => {
+        setTokens([]);
+        setError(null);
+        if (!isSolanaChain || !address || !wallet || !currentChain) {
+            return;
+        }
+        const caip2 = chainIdToCaip2(currentChain.id, TURNKEY_SUPPORTED_CAIP2);
+        if (!caip2) {
+            return;
+        }
+        let cancelled = false;
+        const fetchTokens = async () => {
+            setLoading(true);
+            try {
+                const entries = await wallet.getTurnkeyBalances(caip2, address);
+                if (cancelled)
+                    return;
+                const nextTokens = [];
+                for (const entry of entries) {
+                    try {
+                        const isNative = isNativeAssetEntry({ caip19: entry.caip19, symbol: entry.symbol, decimals: entry.decimals }, currentChain.nativeCurrency);
+                        const tokenAddress = isNative
+                            ? NATIVE_ASSET_SENTINEL
+                            : extractAssetAddress({ caip19: entry.caip19 });
+                        if (!isNative && tokenAddress === undefined) {
+                            console.warn('Skipping unrecognized Solana asset in balance list:', entry.caip19);
+                            continue;
+                        }
+                        nextTokens.push({
+                            address: tokenAddress,
+                            symbol: entry.symbol ?? '',
+                            name: entry.name ?? entry.symbol ?? '',
+                            decimals: entry.decimals ?? 9,
+                            balance: entry.balance !== undefined ? BigInt(entry.balance) : 0n,
+                            isNative,
+                        });
+                    }
+                    catch (entryError) {
+                        console.warn('Skipping malformed Solana balance entry:', entryError);
+                    }
+                }
+                setTokens(nextTokens);
+                setError(null);
+            }
+            catch (turnkeyError) {
+                console.warn('Turnkey Solana token list fetch failed, falling back to RPC native-only:', turnkeyError);
+                // Fall back to a single native-only entry via RPC, so the list stays
+                // consistent with useSolanaBalance()'s own RPC fallback rather than going
+                // empty on a Turnkey outage.
+                try {
+                    const connection = new SolanaConnection(currentChain.rpcUrl, 'confirmed');
+                    const lamports = await connection.getBalance(new PublicKey(address), 'confirmed');
+                    if (cancelled)
+                        return;
+                    setTokens([
+                        {
+                            address: NATIVE_ASSET_SENTINEL,
+                            symbol: currentChain.nativeCurrency.symbol,
+                            name: currentChain.nativeCurrency.name,
+                            decimals: currentChain.nativeCurrency.decimals,
+                            balance: BigInt(lamports),
+                            isNative: true,
+                        },
+                    ]);
+                    setError(null);
+                }
+                catch (rpcError) {
+                    if (cancelled)
+                        return;
+                    setTokens([]);
+                    setError(rpcError instanceof Error ? rpcError : new Error('Failed to load Solana token balances'));
+                }
+            }
+            finally {
+                if (!cancelled) {
+                    setLoading(false);
+                }
+            }
+        };
+        fetchTokens();
+        return () => {
+            cancelled = true;
+        };
+    }, [isSolanaChain, address, wallet, currentChain]);
+    return { tokens, loading, error };
+}
+/**
+ * Hook to get the full non-zero token list (native + ERC-20) for the current EVM
+ * chain, sourced from AbstraxnProvider's centralized state (Turnkey-first with an
+ * RPC-derived native-only fallback - see AbstraxnProviderInner's refetchWalletBalance).
+ * Safe to call unconditionally regardless of the current chain type - no-ops (returns
+ * an empty, non-loading result) when the current chain isn't EVM.
+ */
+export function useTokenBalances() {
+    const { currentChain, tokenBalances, tokenBalancesLoading, tokenBalancesError, refetchTokenBalances } = useAbstraxnWallet();
+    const isEvmChain = currentChain && currentChain.type === 'evm';
+    return {
+        tokens: isEvmChain ? tokenBalances : [],
+        loading: isEvmChain ? tokenBalancesLoading : false,
+        error: isEvmChain ? tokenBalancesError : null,
+        refetch: refetchTokenBalances,
+    };
+}
 function base64ToUint8Array(base64) {
     if (typeof atob !== 'function') {
         throw new Error('Base64 decoding is not available in this environment');
@@ -1794,18 +1932,20 @@ export function useSignTxn(provider) {
             value: valueInWei,
             nonce,
         };
-        // Add gas properties if they exist
+        // Add gas properties if they exist. Never set both legacy and EIP-1559 —
+        // viem serializes as type-2 whenever maxFeePerGas is present, which can
+        // underpay Ethermint minimum-global-fee when gasPrice was the real floor.
         const unsignedTx = { ...baseTx };
         if (gas?.gasLimit !== undefined) {
             unsignedTx.gas = gas.gasLimit;
         }
-        if (gas?.gasPrice !== undefined) {
+        const hasEip1559 = gas?.maxFeePerGas !== undefined && gas?.maxPriorityFeePerGas !== undefined;
+        const hasLegacy = gas?.gasPrice !== undefined;
+        if (hasLegacy && (!hasEip1559 || gas.gasPrice >= gas.maxFeePerGas)) {
             unsignedTx.gasPrice = gas.gasPrice;
         }
-        if (gas?.maxFeePerGas !== undefined) {
+        else if (hasEip1559) {
             unsignedTx.maxFeePerGas = gas.maxFeePerGas;
-        }
-        if (gas?.maxPriorityFeePerGas !== undefined) {
             unsignedTx.maxPriorityFeePerGas = gas.maxPriorityFeePerGas;
         }
         // Serialize transaction
@@ -1999,18 +2139,20 @@ export function useSignAndSendTxn(provider) {
             value: valueInWei,
             nonce,
         };
-        // Add gas properties if they exist
+        // Add gas properties if they exist. Never set both legacy and EIP-1559 —
+        // viem serializes as type-2 whenever maxFeePerGas is present, which can
+        // underpay Ethermint minimum-global-fee when gasPrice was the real floor.
         const unsignedTx = { ...baseTx };
         if (gas?.gasLimit !== undefined) {
             unsignedTx.gas = gas.gasLimit;
         }
-        if (gas?.gasPrice !== undefined) {
+        const hasEip1559 = gas?.maxFeePerGas !== undefined && gas?.maxPriorityFeePerGas !== undefined;
+        const hasLegacy = gas?.gasPrice !== undefined;
+        if (hasLegacy && (!hasEip1559 || gas.gasPrice >= gas.maxFeePerGas)) {
             unsignedTx.gasPrice = gas.gasPrice;
         }
-        if (gas?.maxFeePerGas !== undefined) {
+        else if (hasEip1559) {
             unsignedTx.maxFeePerGas = gas.maxFeePerGas;
-        }
-        if (gas?.maxPriorityFeePerGas !== undefined) {
             unsignedTx.maxPriorityFeePerGas = gas.maxPriorityFeePerGas;
         }
         // Serialize transaction

package/dist/src/index.d.ts

@@ -4,7 +4,7 @@
  * when used in a React project
  */
 export { AbstraxnProvider, useAbstraxnWallet } from './AbstraxnProvider';
-export { useIsConnected, useAddress, useAuthContext, useChainId, useError, useEnableMfa, useDisableMfa, useAuthMethodLinking, useEmailForOtp, useWallet, useSmartAccountOwner, useExportWallet, useWhoami, useExternalWallet, useExternalWalletBalance, useExternalWalletChain, useExternalWalletInfo, usePublicClient, useWalletClient, useContract, usePrepareRawTxn, useSignTxn, useSignTypedTx, useSignAndSendTxn, useWaitForTxnReceipt, useReadContract, useExternalWalletClient, useWriteContract, useConnectionType, useSwitchChain, useSignMessage, useEstimateGas, useGetGasPrice, useSolanaConnection, useSolanaPublicKey, useSolanaBalance, usePrepareSolanaTxn, useSolanaExternalWallet, usePrepareSolanaProgramTxn, useSolanaProgramTransaction, useSignSolanaTxn, useSignAndSendSolanaTxn, useSolanaGasless, useSignAndSendSolanaGaslessTxn, useWaitForSolanaConfirmation, usePolicies, usePolicy, useCreatePolicy, useUpdatePolicy, useDeletePolicy, usePublishPolicy, useUnpublishPolicy, usePolicyTemplates, } from './hooks';
+export { useIsConnected, useAddress, useAuthContext, useChainId, useError, useEnableMfa, useDisableMfa, useAuthMethodLinking, useEmailForOtp, useWallet, useSmartAccountOwner, useExportWallet, useWhoami, useExternalWallet, useExternalWalletBalance, useExternalWalletChain, useExternalWalletInfo, usePublicClient, useWalletClient, useContract, usePrepareRawTxn, useSignTxn, useSignTypedTx, useSignAndSendTxn, useWaitForTxnReceipt, useReadContract, useExternalWalletClient, useWriteContract, useConnectionType, useSwitchChain, useSignMessage, useEstimateGas, useGetGasPrice, useSolanaConnection, useSolanaPublicKey, useSolanaBalance, useSolanaTokenBalances, useTokenBalances, usePrepareSolanaTxn, useSolanaExternalWallet, usePrepareSolanaProgramTxn, useSolanaProgramTransaction, useSignSolanaTxn, useSignAndSendSolanaTxn, useSolanaGasless, useSignAndSendSolanaGaslessTxn, useWaitForSolanaConfirmation, usePolicies, usePolicy, useCreatePolicy, useUpdatePolicy, useDeletePolicy, usePublishPolicy, useUnpublishPolicy, usePolicyTemplates, } from './hooks';
 export { ConnectButton } from './ConnectButton';
 export type { ConnectButtonProps, ConnectButtonVariant, ConnectButtonSize } from './ConnectButton';
 export { WalletModal } from './WalletModal';

package/dist/src/index.js

@@ -4,7 +4,7 @@
  * when used in a React project
  */
 export { AbstraxnProvider, useAbstraxnWallet } from './AbstraxnProvider';
-export { useIsConnected, useAddress, useAuthContext, useChainId, useError, useEnableMfa, useDisableMfa, useAuthMethodLinking, useEmailForOtp, useWallet, useSmartAccountOwner, useExportWallet, useWhoami, useExternalWallet, useExternalWalletBalance, useExternalWalletChain, useExternalWalletInfo, usePublicClient, useWalletClient, useContract, usePrepareRawTxn, useSignTxn, useSignTypedTx, useSignAndSendTxn, useWaitForTxnReceipt, useReadContract, useExternalWalletClient, useWriteContract, useConnectionType, useSwitchChain, useSignMessage, useEstimateGas, useGetGasPrice, useSolanaConnection, useSolanaPublicKey, useSolanaBalance, usePrepareSolanaTxn, useSolanaExternalWallet, usePrepareSolanaProgramTxn, useSolanaProgramTransaction, useSignSolanaTxn, useSignAndSendSolanaTxn, useSolanaGasless, useSignAndSendSolanaGaslessTxn, useWaitForSolanaConfirmation, usePolicies, usePolicy, useCreatePolicy, useUpdatePolicy, useDeletePolicy, usePublishPolicy, useUnpublishPolicy, usePolicyTemplates, } from './hooks';
+export { useIsConnected, useAddress, useAuthContext, useChainId, useError, useEnableMfa, useDisableMfa, useAuthMethodLinking, useEmailForOtp, useWallet, useSmartAccountOwner, useExportWallet, useWhoami, useExternalWallet, useExternalWalletBalance, useExternalWalletChain, useExternalWalletInfo, usePublicClient, useWalletClient, useContract, usePrepareRawTxn, useSignTxn, useSignTypedTx, useSignAndSendTxn, useWaitForTxnReceipt, useReadContract, useExternalWalletClient, useWriteContract, useConnectionType, useSwitchChain, useSignMessage, useEstimateGas, useGetGasPrice, useSolanaConnection, useSolanaPublicKey, useSolanaBalance, useSolanaTokenBalances, useTokenBalances, usePrepareSolanaTxn, useSolanaExternalWallet, usePrepareSolanaProgramTxn, useSolanaProgramTransaction, useSignSolanaTxn, useSignAndSendSolanaTxn, useSolanaGasless, useSignAndSendSolanaGaslessTxn, useWaitForSolanaConfirmation, usePolicies, usePolicy, useCreatePolicy, useUpdatePolicy, useDeletePolicy, usePublishPolicy, useUnpublishPolicy, usePolicyTemplates, } from './hooks';
 export { ConnectButton } from './ConnectButton';
 export { WalletModal } from './WalletModal';
 export { OnboardingUIComponent as OnboardingUI } from './OnboardingUI';

package/dist/src/signMfaBridge.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Bridge so non-React signing helpers can request an MFA code via the
+ * provider-mounted MfaVerifyModal (replaces window.prompt).
+ */
+export type SignMfaCodeRequester = () => Promise<string>;
+export declare function registerSignMfaCodeRequester(requester: SignMfaCodeRequester | null): () => void;
+export declare function requestSignMfaCode(): Promise<string>;

package/dist/src/signMfaBridge.js

@@ -0,0 +1,20 @@
+let signMfaCodeRequester = null;
+export function registerSignMfaCodeRequester(requester) {
+    signMfaCodeRequester = requester;
+    return () => {
+        if (signMfaCodeRequester === requester) {
+            signMfaCodeRequester = null;
+        }
+    };
+}
+export async function requestSignMfaCode() {
+    if (!signMfaCodeRequester) {
+        throw new Error("MFA step-up is required to sign, but no MFA UI is available. Ensure AbstraxnProvider is mounted.");
+    }
+    const code = await signMfaCodeRequester();
+    if (!code || code.trim() === "") {
+        throw new Error("MFA code is required to continue signing.");
+    }
+    return code.trim().toUpperCase();
+}
+//# sourceMappingURL=signMfaBridge.js.map

package/dist/src/types.d.ts

@@ -313,6 +313,10 @@ export interface AbstraxnContextValue {
     walletBalance?: bigint | null;
     /** Refetch wallet balance from RPC (Abstraxn or external). Call when UI screen changes (e.g. back button, modal open/close). */
     refetchBalance?: () => Promise<void>;
+    tokenBalances: import("./components/WalletModal/components/TokenSelectorModal").TokenData[];
+    tokenBalancesLoading: boolean;
+    tokenBalancesError: Error | null;
+    refetchTokenBalances: () => Promise<void>;
     connectionType?: string | null;
     emailForOtp?: string;
     setEmailForOtp?: (email: string) => void;

package/dist/src/utils/shadowFocus.d.ts

@@ -0,0 +1,8 @@
+/**
+ * document.activeElement returns the shadow HOST element when focus is
+ * actually on a descendant inside its shadow tree, not the focused element
+ * itself. Tab-trap logic comparing `document.activeElement === someElement`
+ * silently breaks once that element lives inside a shadow root — this walks
+ * down through nested shadow roots to find the real focused element.
+ */
+export declare function getDeepActiveElement(): Element | null;

package/dist/src/utils/shadowFocus.js

@@ -0,0 +1,15 @@
+/**
+ * document.activeElement returns the shadow HOST element when focus is
+ * actually on a descendant inside its shadow tree, not the focused element
+ * itself. Tab-trap logic comparing `document.activeElement === someElement`
+ * silently breaks once that element lives inside a shadow root — this walks
+ * down through nested shadow roots to find the real focused element.
+ */
+export function getDeepActiveElement() {
+    let active = document.activeElement;
+    while (active && active.shadowRoot && active.shadowRoot.activeElement) {
+        active = active.shadowRoot.activeElement;
+    }
+    return active;
+}
+//# sourceMappingURL=shadowFocus.js.map

package/dist/src/utils/shadowRegistry.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Shared registry of every currently-mounted shadow root (both React
+ * ShadowHost instances and the vanilla OnboardingUIWeb instances). Plain TS,
+ * no framework dependency, so both sides can use it.
+ *
+ * Invariant: every registerShadowRoot() call must be paired with exactly one
+ * call to its returned unregister function when — and only when — that
+ * specific shadow root is torn down. Violating this either leaks a reference
+ * to a detached shadow root (memory leak) or silently drops an active
+ * boundary from cross-boundary queries (correctness bug).
+ */
+export declare function registerShadowRoot(root: ShadowRoot): () => void;
+/**
+ * Unions document.querySelectorAll(selector) with the same query run against
+ * every currently-registered shadow root. Restores the pre-shadow-DOM
+ * cross-boundary "hide the other open modal overlay" behavior without
+ * requiring the separate shadow roots to nest inside one another.
+ *
+ * One-directional in practice today: only OnboardingUIWeb.showLoadingModal()
+ * calls this (to hide an open WalletModal). No symmetric call exists on the
+ * WalletModal/React side, matching pre-migration behavior exactly.
+ */
+export declare function queryAllAcrossShadowRoots(selector: string): Element[];