@flashnet/sdk 0.5.4 → 0.5.6

package/dist/esm/src/client/FlashnetClient.js

@@ -1,4 +1,5 @@
 import sha256 from 'fast-sha256';
+import { decode } from 'light-bolt11-decoder';
 import { ApiClient } from '../api/client.js';
 import { TypedAmmApi } from '../api/typed-endpoints.js';
 import { getClientEnvironmentName, resolveClientNetworkConfig, getClientNetworkConfig, BTC_ASSET_PUBKEY } from '../config/index.js';
@@ -9,6 +10,7 @@ import { getHexFromUint8Array } from '../utils/hex.js';
 import { generateConstantProductPoolInitializationIntentMessage, generatePoolInitializationIntentMessage, generatePoolConfirmInitialDepositIntentMessage, generatePoolSwapIntentMessage, generateRouteSwapIntentMessage, generateAddLiquidityIntentMessage, generateRemoveLiquidityIntentMessage, generateRegisterHostIntentMessage, generateWithdrawHostFeesIntentMessage, generateWithdrawIntegratorFeesIntentMessage, generateCreateEscrowIntentMessage, generateFundEscrowIntentMessage, generateClaimEscrowIntentMessage, generateClawbackIntentMessage, generateCreateConcentratedPoolIntentMessage, generateDecreaseLiquidityIntentMessage, generateCollectFeesIntentMessage, generateWithdrawBalanceIntentMessage, generateIncreaseLiquidityIntentMessage, generateRebalancePositionIntentMessage, generateDepositBalanceIntentMessage } from '../utils/intents.js';
 import { getSparkNetworkFromAddress, encodeSparkAddressNew } from '../utils/spark-address.js';
 import { encodeSparkHumanReadableTokenIdentifier, decodeSparkHumanReadableTokenIdentifier } from '../utils/tokenAddress.js';
+import { safeBigInt } from '../utils/bigint.js';
 import { FlashnetError } from '../types/errors.js';
 
 /**
@@ -239,7 +241,10 @@ class FlashnetClient {
                 const tokenIdentifierHex = getHexFromUint8Array(info.rawTokenIdentifier);
                 const tokenAddress = encodeSparkHumanReadableTokenIdentifier(info.rawTokenIdentifier, this.sparkNetwork);
                 tokenBalances.set(tokenPubkey, {
-                    balance: BigInt(tokenData.balance),
+                    balance: safeBigInt(tokenData.ownedBalance ?? tokenData.balance),
+                    availableToSendBalance: safeBigInt(tokenData.availableToSendBalance ??
+                        tokenData.ownedBalance ??
+                        tokenData.balance),
                     tokenInfo: {
                         tokenIdentifier: tokenIdentifierHex,
                         tokenAddress,
@@ -252,7 +257,7 @@ class FlashnetClient {
             }
         }
         return {
-            balance: BigInt(balance.balance),
+            balance: safeBigInt(balance.balance),
             tokenBalances,
         };
     }
@@ -260,7 +265,7 @@ class FlashnetClient {
      * Check if wallet has sufficient balance for an operation
      */
     async checkBalance(params) {
-        const balance = await this.getBalance();
+        const balance = params.walletBalance ?? (await this.getBalance());
         // Check balance
         const requirements = {
             tokens: new Map(),
@@ -284,11 +289,15 @@ class FlashnetClient {
         // Check token balances
         if (requirements.tokens) {
             for (const [tokenPubkey, requiredAmount,] of requirements.tokens.entries()) {
-                // If direct lookup fails (possible representation mismatch), try the human-readable form
+                // Support both hex and Bech32m token identifiers by trying all representations
                 const hrKey = this.toHumanReadableTokenIdentifier(tokenPubkey);
+                const hexKey = this.toHexTokenIdentifier(tokenPubkey);
                 const effectiveTokenBalance = balance.tokenBalances.get(tokenPubkey) ??
-                    balance.tokenBalances.get(hrKey);
-                const available = effectiveTokenBalance?.balance ?? 0n;
+                    balance.tokenBalances.get(hrKey) ??
+                    balance.tokenBalances.get(hexKey);
+                const available = params.useAvailableBalance
+                    ? (effectiveTokenBalance?.availableToSendBalance ?? 0n)
+                    : (effectiveTokenBalance?.balance ?? 0n);
                 if (available < requiredAmount) {
                     throw new Error([
                         params.errorPrefix ?? "",
@@ -350,6 +359,7 @@ class FlashnetClient {
                     },
                 ],
                 errorPrefix: "Insufficient balance for initial liquidity: ",
+                useAvailableBalance: params.useAvailableBalance,
             });
         }
         const poolOwnerPublicKey = params.poolOwnerPublicKey ?? this.publicKey;
@@ -479,6 +489,7 @@ class FlashnetClient {
                 },
             ],
             errorPrefix: "Insufficient balance for pool creation: ",
+            useAvailableBalance: params.useAvailableBalance,
         });
         const poolOwnerPublicKey = params.poolOwnerPublicKey ?? this.publicKey;
         // Generate intent
@@ -599,10 +610,14 @@ class FlashnetClient {
         });
         // If using free balance (V3 pools only), skip the Spark transfer
         if (params.useFreeBalance) {
-            return this.executeSwapIntent({
+            const swapResponse = await this.executeSwapIntent({
                 ...params,
                 // No transferId - triggers free balance mode
             });
+            return {
+                ...swapResponse,
+                inboundSparkTransferId: swapResponse.requestId,
+            };
         }
         // Transfer assets to pool using new address encoding
         const lpSparkAddress = encodeSparkAddressNew({
@@ -613,12 +628,13 @@ class FlashnetClient {
             receiverSparkAddress: lpSparkAddress,
             assetAddress: params.assetInAddress,
             amount: params.amountIn,
-        }, "Insufficient balance for swap: ");
+        }, "Insufficient balance for swap: ", params.useAvailableBalance);
         // Execute with auto-clawback on failure
-        return this.executeWithAutoClawback(() => this.executeSwapIntent({
+        const swapResponse = await this.executeWithAutoClawback(() => this.executeSwapIntent({
             ...params,
             transferId,
         }), [transferId], params.poolId);
+        return { ...swapResponse, inboundSparkTransferId: transferId };
     }
     /**
      * Execute a swap with a pre-created transfer or using free balance.
@@ -748,7 +764,7 @@ class FlashnetClient {
             receiverSparkAddress: lpSparkAddress,
             assetAddress: params.initialAssetAddress,
             amount: params.inputAmount,
-        }, "Insufficient balance for route swap: ");
+        }, "Insufficient balance for route swap: ", params.useAvailableBalance);
         // Execute with auto-clawback on failure
         return this.executeWithAutoClawback(async () => {
             // Prepare hops for validation
@@ -871,7 +887,7 @@ class FlashnetClient {
                 assetAddress: pool.assetBAddress,
                 amount: params.assetBAmount,
             },
-        ], "Insufficient balance for adding liquidity: ");
+        ], "Insufficient balance for adding liquidity: ", params.useAvailableBalance);
         // Execute with auto-clawback on failure
         return this.executeWithAutoClawback(async () => {
             // Generate add liquidity intent
@@ -1177,6 +1193,7 @@ class FlashnetClient {
             depositAddress: createResponse.depositAddress,
             assetId: params.assetId,
             assetAmount: params.assetAmount,
+            useAvailableBalance: params.useAvailableBalance,
         });
     }
     /**
@@ -1194,6 +1211,7 @@ class FlashnetClient {
                 { assetAddress: params.assetId, amount: params.assetAmount },
             ],
             errorPrefix: "Insufficient balance to fund escrow: ",
+            useAvailableBalance: params.useAvailableBalance,
         });
         // 2. Perform transfer
         const escrowSparkAddress = encodeSparkAddressNew({
@@ -1708,19 +1726,20 @@ class FlashnetClient {
     /**
      * Performs asset transfer using generalized asset address for both BTC and tokens.
      */
-    async transferAsset(recipient, checkBalanceErrorPrefix) {
-        const transferIds = await this.transferAssets([recipient], checkBalanceErrorPrefix);
+    async transferAsset(recipient, checkBalanceErrorPrefix, useAvailableBalance) {
+        const transferIds = await this.transferAssets([recipient], checkBalanceErrorPrefix, useAvailableBalance);
         return transferIds[0];
     }
     /**
      * Performs asset transfers using generalized asset addresses for both BTC and tokens.
      * Supports optional generic to hardcode recipients length so output list can be typed with same length.
      */
-    async transferAssets(recipients, checkBalanceErrorPrefix) {
+    async transferAssets(recipients, checkBalanceErrorPrefix, useAvailableBalance) {
         if (checkBalanceErrorPrefix) {
             await this.checkBalance({
                 balancesToCheck: recipients,
                 errorPrefix: checkBalanceErrorPrefix,
+                useAvailableBalance,
             });
         }
         const transferIds = [];
@@ -1869,7 +1888,7 @@ class FlashnetClient {
         const tokenHex = this.toHexTokenIdentifier(tokenAddress).toLowerCase();
         const tokenMinAmount = minAmounts.get(tokenHex);
         if (tokenMinAmount &&
-            BigInt(poolQuote.tokenAmountRequired) < tokenMinAmount) {
+            safeBigInt(poolQuote.tokenAmountRequired) < tokenMinAmount) {
             const msg = `Token amount too small. Minimum input is ${tokenMinAmount} units, but calculated amount is only ${poolQuote.tokenAmountRequired} units.`;
             throw new FlashnetError(msg, {
                 response: {
@@ -1886,7 +1905,7 @@ class FlashnetClient {
         }
         // BTC variable fee adjustment: difference between what the pool targets and unmasked base.
         // For V3 pools this is 0 (no masking). For V2 it's the rounding overhead.
-        const btcVariableFeeAdjustment = Number(BigInt(poolQuote.btcAmountUsed) - baseBtcNeeded);
+        const btcVariableFeeAdjustment = Number(safeBigInt(poolQuote.btcAmountUsed) - baseBtcNeeded);
         return {
             poolId: poolQuote.poolId,
             tokenAddress: this.toHexTokenIdentifier(tokenAddress),
@@ -1958,7 +1977,7 @@ class FlashnetClient {
                     amountIn: tokenAmount,
                     integratorBps: options?.integratorFeeRateBps,
                 });
-                const btcOut = BigInt(simulation.amountOut);
+                const btcOut = safeBigInt(simulation.amountOut);
                 if (btcOut > bestBtcOut) {
                     bestBtcOut = btcOut;
                     bestResult = {
@@ -2046,7 +2065,7 @@ class FlashnetClient {
         await this.ensureInitialized();
         const { invoice, tokenAddress, tokenAmount, maxSlippageBps = 500, // 5% default
         maxLightningFeeSats, preferSpark = true, integratorFeeRateBps, integratorPublicKey, transferTimeoutMs = 30000, // 30s default
-        rollbackOnFailure = false, useExistingBtcBalance = false, } = options;
+        rollbackOnFailure = false, useExistingBtcBalance = false, useAvailableBalance = false, } = options;
         try {
             // Step 1: Get a quote for the payment
             const quote = await this.getPayLightningWithTokenQuote(invoice, tokenAddress, {
@@ -2063,6 +2082,7 @@ class FlashnetClient {
                     },
                 ],
                 errorPrefix: "Insufficient token balance for Lightning payment: ",
+                useAvailableBalance,
             });
             // Step 3: Get pool details
             const pool = await this.getPool(quote.poolId);
@@ -2085,6 +2105,7 @@ class FlashnetClient {
                 minAmountOut: minBtcOut,
                 integratorFeeRateBps,
                 integratorPublicKey,
+                useAvailableBalance,
             });
             if (!swapResponse.accepted || !swapResponse.outboundTransferId) {
                 return {
@@ -2094,6 +2115,7 @@ class FlashnetClient {
                     btcAmountReceived: "0",
                     swapTransferId: swapResponse.outboundTransferId || "",
                     ammFeePaid: quote.estimatedAmmFee,
+                    sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                     error: swapResponse.error || "Swap was not accepted",
                 };
             }
@@ -2104,7 +2126,7 @@ class FlashnetClient {
                 const effectiveMaxLightningFee = maxLightningFeeSats ?? quote.estimatedLightningFee;
                 const btcNeededForPayment = invoiceAmountSats + effectiveMaxLightningFee;
                 const balance = await this.getBalance();
-                canPayImmediately = balance.balance >= BigInt(btcNeededForPayment);
+                canPayImmediately = balance.balance >= safeBigInt(btcNeededForPayment);
             }
             if (!canPayImmediately) {
                 const transferComplete = await this.waitForTransferCompletion(swapResponse.outboundTransferId, transferTimeoutMs);
@@ -2116,6 +2138,7 @@ class FlashnetClient {
                         btcAmountReceived: swapResponse.amountOut || "0",
                         swapTransferId: swapResponse.outboundTransferId,
                         ammFeePaid: quote.estimatedAmmFee,
+                        sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                         error: "Transfer did not complete within timeout",
                     };
                 }
@@ -2129,8 +2152,8 @@ class FlashnetClient {
                 let invoiceAmountPaid;
                 if (quote.isZeroAmountInvoice) {
                     // Zero-amount invoice: pay whatever BTC we received minus lightning fee
-                    const actualBtc = BigInt(btcReceived);
-                    const lnFee = BigInt(effectiveMaxLightningFee);
+                    const actualBtc = safeBigInt(btcReceived);
+                    const lnFee = safeBigInt(effectiveMaxLightningFee);
                     const amountToPay = actualBtc - lnFee;
                     if (amountToPay <= 0n) {
                         return {
@@ -2140,6 +2163,7 @@ class FlashnetClient {
                             btcAmountReceived: btcReceived,
                             swapTransferId: swapResponse.outboundTransferId,
                             ammFeePaid: quote.estimatedAmmFee,
+                            sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                             error: `BTC received (${btcReceived} sats) is not enough to cover lightning fee (${effectiveMaxLightningFee} sats).`,
                         };
                     }
@@ -2159,6 +2183,12 @@ class FlashnetClient {
                         preferSpark,
                     });
                 }
+                // Extract the Spark transfer ID from the lightning payment result.
+                // payLightningInvoice returns LightningSendRequest | WalletTransfer:
+                //   - LightningSendRequest has .transfer?.sparkId (the Sparkscan-visible transfer ID)
+                //   - WalletTransfer (Spark-to-Spark) has .id directly as the transfer ID
+                // Note: lightningPayment.id (the SSP request ID) is already returned as lightningPaymentId
+                const sparkLightningTransferId = lightningPayment.transfer?.sparkId;
                 return {
                     success: true,
                     poolId: quote.poolId,
@@ -2169,6 +2199,8 @@ class FlashnetClient {
                     ammFeePaid: quote.estimatedAmmFee,
                     lightningFeePaid: effectiveMaxLightningFee,
                     invoiceAmountPaid,
+                    sparkTokenTransferId: swapResponse.inboundSparkTransferId,
+                    sparkLightningTransferId,
                 };
             }
             catch (lightningError) {
@@ -2188,6 +2220,7 @@ class FlashnetClient {
                                 btcAmountReceived: "0",
                                 swapTransferId: swapResponse.outboundTransferId,
                                 ammFeePaid: quote.estimatedAmmFee,
+                                sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                                 error: `Lightning payment failed: ${lightningErrorMessage}. Funds rolled back to ${rollbackResult.tokenAmount} tokens.`,
                             };
                         }
@@ -2203,6 +2236,7 @@ class FlashnetClient {
                             btcAmountReceived: btcReceived,
                             swapTransferId: swapResponse.outboundTransferId,
                             ammFeePaid: quote.estimatedAmmFee,
+                            sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                             error: `Lightning payment failed: ${lightningErrorMessage}. Rollback also failed: ${rollbackErrorMessage}. BTC remains in wallet.`,
                         };
                     }
@@ -2214,6 +2248,7 @@ class FlashnetClient {
                     btcAmountReceived: btcReceived,
                     swapTransferId: swapResponse.outboundTransferId,
                     ammFeePaid: quote.estimatedAmmFee,
+                    sparkTokenTransferId: swapResponse.inboundSparkTransferId,
                     error: `Lightning payment failed: ${lightningErrorMessage}. BTC (${btcReceived} sats) remains in wallet.`,
                 };
             }
@@ -2376,7 +2411,7 @@ class FlashnetClient {
                         tokenIsAssetA: pool.tokenIsAssetA,
                         integratorBps: integratorFeeRateBps,
                     });
-                    tokenAmount = BigInt(v3Result.amountIn);
+                    tokenAmount = safeBigInt(v3Result.amountIn);
                     fee = v3Result.totalFee;
                     executionPrice = v3Result.simulation.executionPrice || "0";
                     priceImpactPct = v3Result.simulation.priceImpactPct || "0";
@@ -2385,7 +2420,7 @@ class FlashnetClient {
                 else {
                     // V2: constant product math + simulation verification
                     const calculation = this.calculateTokenAmountForBtcOutput(btcTarget.toString(), poolDetails.assetAReserve, poolDetails.assetBReserve, poolDetails.lpFeeBps, poolDetails.hostFeeBps, pool.tokenIsAssetA, integratorFeeRateBps);
-                    tokenAmount = BigInt(calculation.amountIn);
+                    tokenAmount = safeBigInt(calculation.amountIn);
                     // Verify with simulation
                     const simulation = await this.simulateSwap({
                         poolId: pool.lpPublicKey,
@@ -2394,7 +2429,7 @@ class FlashnetClient {
                         amountIn: calculation.amountIn,
                         integratorBps: integratorFeeRateBps,
                     });
-                    if (BigInt(simulation.amountOut) < btcTarget) {
+                    if (safeBigInt(simulation.amountOut) < btcTarget) {
                         const btcReserve = pool.tokenIsAssetA
                             ? poolDetails.assetBReserve
                             : poolDetails.assetAReserve;
@@ -2482,9 +2517,9 @@ class FlashnetClient {
      * @private
      */
     calculateTokenAmountForBtcOutput(btcAmountOut, reserveA, reserveB, lpFeeBps, hostFeeBps, tokenIsAssetA, integratorFeeBps) {
-        const amountOut = BigInt(btcAmountOut);
-        const resA = BigInt(reserveA);
-        const resB = BigInt(reserveB);
+        const amountOut = safeBigInt(btcAmountOut);
+        const resA = safeBigInt(reserveA);
+        const resB = safeBigInt(reserveB);
         const totalFeeBps = lpFeeBps + hostFeeBps + (integratorFeeBps || 0);
         const feeRate = Number(totalFeeBps) / 10000; // Convert bps to decimal
         // Token is the input asset
@@ -2582,7 +2617,7 @@ class FlashnetClient {
                 amountIn: upperBound.toString(),
                 integratorBps,
             });
-            if (BigInt(sim.amountOut) >= desiredBtcOut) {
+            if (safeBigInt(sim.amountOut) >= desiredBtcOut) {
                 upperSim = sim;
                 break;
             }
@@ -2593,7 +2628,7 @@ class FlashnetClient {
             throw new Error(`V3 pool ${poolId} has insufficient liquidity for ${desiredBtcOut} sats`);
         }
         // Step 3: Refine estimate via linear interpolation
-        const upperOut = BigInt(upperSim.amountOut);
+        const upperOut = safeBigInt(upperSim.amountOut);
         // Scale proportionally: if upperBound produced upperOut, we need roughly
         // (upperBound * desiredBtcOut / upperOut). Add +1 to avoid undershoot from truncation.
         let refined = (upperBound * desiredBtcOut) / upperOut + 1n;
@@ -2611,7 +2646,7 @@ class FlashnetClient {
                 amountIn: refined.toString(),
                 integratorBps,
             });
-            if (BigInt(refinedSim.amountOut) >= desiredBtcOut) {
+            if (safeBigInt(refinedSim.amountOut) >= desiredBtcOut) {
                 bestAmountIn = refined;
                 bestSim = refinedSim;
             }
@@ -2645,7 +2680,7 @@ class FlashnetClient {
                 amountIn: mid.toString(),
                 integratorBps,
             });
-            if (BigInt(midSim.amountOut) >= desiredBtcOut) {
+            if (safeBigInt(midSim.amountOut) >= desiredBtcOut) {
                 hi = mid;
                 bestAmountIn = mid;
                 bestSim = midSim;
@@ -2764,64 +2799,24 @@ class FlashnetClient {
     }
     /**
      * Decode the amount from a Lightning invoice (in sats)
+     * Uses light-bolt11-decoder (same library as Spark SDK) for reliable parsing.
      * @private
      */
     async decodeInvoiceAmount(invoice) {
-        // Extract amount from BOLT11 invoice
-        // Format: ln[network][amount][multiplier]...
-        // Amount multipliers: m = milli (0.001), u = micro (0.000001), n = nano, p = pico
-        const lowerInvoice = invoice.toLowerCase();
-        // Find where the amount starts (after network prefix)
-        let amountStart = 0;
-        if (lowerInvoice.startsWith("lnbc")) {
-            amountStart = 4;
-        }
-        else if (lowerInvoice.startsWith("lntb")) {
-            amountStart = 4;
-        }
-        else if (lowerInvoice.startsWith("lnbcrt")) {
-            amountStart = 6;
-        }
-        else if (lowerInvoice.startsWith("lntbs")) {
-            amountStart = 5;
+        try {
+            const decoded = decode(invoice);
+            const amountSection = decoded.sections.find((s) => s.name === "amount");
+            if (!amountSection?.value) {
+                return 0; // Zero-amount invoice
+            }
+            // The library returns amount in millisatoshis as a string
+            const amountMSats = BigInt(amountSection.value);
+            return Number(amountMSats / 1000n);
         }
-        else {
-            // Unknown format, try to find amount
-            const match = lowerInvoice.match(/^ln[a-z]+/);
-            if (match) {
-                amountStart = match[0].length;
-            }
-        }
-        // Extract amount and multiplier
-        const afterPrefix = lowerInvoice.substring(amountStart);
-        const amountMatch = afterPrefix.match(/^(\d+)([munp]?)/);
-        if (!amountMatch || !amountMatch[1]) {
-            return 0; // Zero-amount invoice
-        }
-        const amount = parseInt(amountMatch[1], 10);
-        const multiplier = amountMatch[2] ?? "";
-        // Convert to satoshis (1 BTC = 100,000,000 sats)
-        // Invoice amounts are in BTC by default
-        let btcAmount;
-        switch (multiplier) {
-            case "m": // milli-BTC (0.001 BTC)
-                btcAmount = amount * 0.001;
-                break;
-            case "u": // micro-BTC (0.000001 BTC)
-                btcAmount = amount * 0.000001;
-                break;
-            case "n": // nano-BTC (0.000000001 BTC)
-                btcAmount = amount * 0.000000001;
-                break;
-            case "p": // pico-BTC (0.000000000001 BTC)
-                btcAmount = amount * 0.000000000001;
-                break;
-            default: // BTC
-                btcAmount = amount;
-                break;
+        catch {
+            // Fallback: if library fails, return 0 (treated as zero-amount invoice)
+            return 0;
         }
-        // Convert BTC to sats
-        return Math.round(btcAmount * 100000000);
     }
     /**
      * Clean up wallet connections
@@ -2886,8 +2881,11 @@ class FlashnetClient {
         const map = new Map();
         for (const item of config) {
             if (item.enabled) {
+                if (item.min_amount == null) {
+                    continue;
+                }
                 const key = item.asset_identifier.toLowerCase();
-                const value = BigInt(String(item.min_amount));
+                const value = safeBigInt(item.min_amount);
                 map.set(key, value);
             }
         }
@@ -2909,8 +2907,8 @@ class FlashnetClient {
         const outHex = this.getHexAddress(params.assetOutAddress);
         const minIn = minMap.get(inHex);
         const minOut = minMap.get(outHex);
-        const amountIn = BigInt(String(params.amountIn));
-        const minAmountOut = BigInt(String(params.minAmountOut));
+        const amountIn = BigInt(params.amountIn);
+        const minAmountOut = BigInt(params.minAmountOut);
         if (minIn && minOut) {
             if (amountIn < minIn) {
                 throw new Error(`Minimum amount not met for input asset. Required \
@@ -2944,13 +2942,13 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
         const aMin = minMap.get(aHex);
         const bMin = minMap.get(bHex);
         if (aMin) {
-            const aAmt = BigInt(String(params.assetAAmount));
+            const aAmt = BigInt(params.assetAAmount);
             if (aAmt < aMin) {
                 throw new Error(`Minimum amount not met for Asset A. Required ${aMin.toString()}, provided ${aAmt.toString()}`);
             }
         }
         if (bMin) {
-            const bAmt = BigInt(String(params.assetBAmount));
+            const bAmt = BigInt(params.assetBAmount);
             if (bAmt < bMin) {
                 throw new Error(`Minimum amount not met for Asset B. Required ${bMin.toString()}, provided ${bAmt.toString()}`);
             }
@@ -2972,14 +2970,14 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
         const aMin = minMap.get(aHex);
         const bMin = minMap.get(bHex);
         if (aMin) {
-            const predictedAOut = BigInt(String(simulation.assetAAmount));
+            const predictedAOut = safeBigInt(simulation.assetAAmount);
             const relaxedA = aMin / 2n; // apply 50% relaxation for outputs
             if (predictedAOut < relaxedA) {
                 throw new Error(`Minimum amount not met for Asset A on withdrawal. Required at least ${relaxedA.toString()} (50% relaxed), predicted ${predictedAOut.toString()}`);
             }
         }
         if (bMin) {
-            const predictedBOut = BigInt(String(simulation.assetBAmount));
+            const predictedBOut = safeBigInt(simulation.assetBAmount);
             const relaxedB = bMin / 2n;
             if (predictedBOut < relaxedB) {
                 throw new Error(`Minimum amount not met for Asset B on withdrawal. Required at least ${relaxedB.toString()} (50% relaxed), predicted ${predictedBOut.toString()}`);
@@ -3097,7 +3095,7 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
                     receiverSparkAddress: lpSparkAddress,
                     assetAddress: pool.assetAAddress,
                     amount: params.amountADesired,
-                }, "Insufficient balance for adding V3 liquidity (Asset A): ");
+                }, "Insufficient balance for adding V3 liquidity (Asset A): ", params.useAvailableBalance);
                 transferIds.push(assetATransferId);
             }
             if (BigInt(params.amountBDesired) > 0n) {
@@ -3105,7 +3103,7 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
                     receiverSparkAddress: lpSparkAddress,
                     assetAddress: pool.assetBAddress,
                     amount: params.amountBDesired,
-                }, "Insufficient balance for adding V3 liquidity (Asset B): ");
+                }, "Insufficient balance for adding V3 liquidity (Asset B): ", params.useAvailableBalance);
                 transferIds.push(assetBTransferId);
             }
         }
@@ -3298,14 +3296,14 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
                 receiverSparkAddress: lpSparkAddress,
                 assetAddress: pool.assetAAddress,
                 amount: params.additionalAmountA,
-            }, "Insufficient balance for rebalance (Asset A): ");
+            }, "Insufficient balance for rebalance (Asset A): ", params.useAvailableBalance);
         }
         if (params.additionalAmountB && BigInt(params.additionalAmountB) > 0n) {
             assetBTransferId = await this.transferAsset({
                 receiverSparkAddress: lpSparkAddress,
                 assetAddress: pool.assetBAddress,
                 amount: params.additionalAmountB,
-            }, "Insufficient balance for rebalance (Asset B): ");
+            }, "Insufficient balance for rebalance (Asset B): ", params.useAvailableBalance);
         }
         // Collect transfer IDs for potential clawback
         const transferIds = [];
@@ -3502,7 +3500,7 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
                 receiverSparkAddress: lpSparkAddress,
                 assetAddress: pool.assetAAddress,
                 amount: params.amountA,
-            }, "Insufficient balance for depositing to V3 pool (Asset A): ");
+            }, "Insufficient balance for depositing to V3 pool (Asset A): ", params.useAvailableBalance);
             transferIds.push(assetATransferId);
         }
         if (BigInt(params.amountB) > 0n) {
@@ -3510,7 +3508,7 @@ ${relaxed.toString()} (50% relaxed), provided minAmountOut ${minAmountOut.toStri
                 receiverSparkAddress: lpSparkAddress,
                 assetAddress: pool.assetBAddress,
                 amount: params.amountB,
-            }, "Insufficient balance for depositing to V3 pool (Asset B): ");
+            }, "Insufficient balance for depositing to V3 pool (Asset B): ", params.useAvailableBalance);
             transferIds.push(assetBTransferId);
         }
         const executeDeposit = async () => {