four-flap-meme-sdk 1.4.23 → 1.4.25

package/dist/contracts/tm-bundle-merkle/types.d.ts

@@ -236,6 +236,10 @@ export type DisperseMerkleParams = {
     config: FourBundleMerkleConfig;
 };
 /** ✅ 分发参数（仅签名版本 - 精简） */
+/** 代币池子类型 */
+export type TokenPoolType = 'flap' | 'four' | 'v2' | 'v3';
+/** 报价代币类型（池子的计价代币） */
+export type QuoteTokenType = 'native' | 'usdt' | 'usdc';
 export type DisperseSignParams = {
     fromPrivateKey: string;
     recipients: string[];
@@ -254,6 +258,10 @@ export type DisperseSignParams = {
     config: FourSignConfig;
     /** ✅ 新增：起始 nonce（用于并行调用时避免 nonce 冲突） */
     startNonce?: number;
+    /** ✅ 新增：代币池子类型（用于利润报价），默认 'v2' */
+    tokenPoolType?: TokenPoolType;
+    /** ✅ 新增：报价代币类型（池子的计价代币），默认 'native'（BNB/MON） */
+    quoteToken?: QuoteTokenType;
 };
 /**
  * ✅ 分发结果（简化版）
@@ -305,6 +313,10 @@ export type SweepSignParams = {
     config: FourSignConfig;
     /** ✅ 新增：起始 nonce（用于并行调用时避免 nonce 冲突，仅对第一个源钱包生效） */
     startNonce?: number;
+    /** ✅ 新增：代币池子类型（用于利润报价），默认 'v2' */
+    tokenPoolType?: TokenPoolType;
+    /** ✅ 新增：报价代币类型（池子的计价代币），默认 'native'（BNB/MON） */
+    quoteToken?: QuoteTokenType;
 };
 /**
  * ✅ 归集结果（简化版）

package/dist/contracts/tm-bundle-merkle/utils.js

@@ -1,5 +1,4 @@
-import { ethers, Wallet, Contract } from 'ethers';
-// import { MerkleClient } from '../../clients/merkle.js';
+import { ethers, Wallet } from 'ethers';
 import { getOptimizedGasPrice, NonceManager } from '../../utils/bundle-helpers.js';
 import { PROFIT_CONFIG } from '../../utils/constants.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient } from './config.js';
@@ -15,46 +14,182 @@ function calculateProfit(amount) {
     return { profit, remaining };
 }
 // ==================== ERC20 → 原生代币报价 ====================
-// BSC 链常量
-const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
-const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-// ✅ Monad 链常量
-const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
-const MONAD_WMON = '0x3bd359c1119da7da1d913d1c4d2b7c461115433a';
-const ROUTER_ABI = [
-    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
-];
+import { quote, QUOTE_CONFIG } from '../../utils/quote-helpers.js';
+import { Helper3 } from '../helper3.js';
+import { FlapPortal } from '../../flap/portal.js';
+/** 最低利润（Wei）：无法获取报价时使用，0.0001 BNB */
+const MIN_PROFIT_WEI = 100000000000000n; // 0.0001 BNB = 10^14 wei
+/** 链 ID → 链名称 映射 */
+const CHAIN_ID_TO_NAME = {
+    56: 'BSC',
+    143: 'MONAD',
+    196: 'XLAYER',
+};
+/** 各链的稳定币地址 */
+const STABLE_COINS = {
+    BSC: {
+        usdt: '0x55d398326f99059fF775485246999027B3197955',
+        usdc: '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d',
+    },
+    MONAD: {
+    // TODO: 添加 Monad 链的稳定币地址
+    },
+    XLAYER: {
+        usdt: '0x1E4a5963aBFD975d8c9021ce480b42188849D41d',
+    },
+};
+/**
+ * 获取 FOUR 内盘代币 → BNB 的报价
+ */
+async function getFourInnerQuote(rpcUrl, tokenAddress, tokenAmount) {
+    try {
+        const helper = Helper3.connectByChain('BSC', rpcUrl);
+        const result = await helper.trySell(tokenAddress, tokenAmount);
+        // result = { tokenManager, quote, funds, fee }
+        // funds 是卖出代币能获得的 BNB 数量
+        const funds = result.funds;
+        console.log(`[getFourInnerQuote] FOUR 内盘报价成功: ${funds} wei`);
+        return funds;
+    }
+    catch (error) {
+        console.warn(`[getFourInnerQuote] FOUR 内盘报价失败:`, error);
+        return 0n;
+    }
+}
+/** 零地址（原生代币） */
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+/**
+ * 获取 FLAP 内盘代币 → 原生代币的报价
+ * ✅ 与 portal-bundle-merkle/core.ts 使用相同的 quoteExactInput 方法
+ */
+async function getFlapInnerQuote(rpcUrl, chainId, tokenAddress, tokenAmount) {
+    try {
+        // 根据链 ID 确定链名称
+        const chainName = chainId === 56 ? 'BSC' : chainId === 143 ? 'MONAD' : chainId === 196 ? 'XLAYER' : null;
+        if (!chainName) {
+            console.warn(`[getFlapInnerQuote] 不支持的链 ID: ${chainId}`);
+            return 0n;
+        }
+        const portal = new FlapPortal({ chain: chainName, rpcUrl });
+        // ✅ 使用 quoteExactInput 与 core.ts 保持一致
+        const funds = await portal.quoteExactInput({
+            inputToken: tokenAddress,
+            outputToken: ZERO_ADDRESS, // 输出原生代币
+            inputAmount: tokenAmount
+        });
+        console.log(`[getFlapInnerQuote] FLAP 内盘报价成功: ${funds} wei`);
+        return funds;
+    }
+    catch (error) {
+        console.warn(`[getFlapInnerQuote] FLAP 内盘报价失败:`, error);
+        return 0n;
+    }
+}
 /**
  * 获取 ERC20 代币 → 原生代币的报价
+ *
  * @param provider - Provider 实例
  * @param tokenAddress - ERC20 代币地址
  * @param tokenAmount - 代币数量（wei）
  * @param chainId - 链 ID（56=BSC, 143=Monad）
- * @returns 等值的原生代币数量（wei），失败返回 0n
+ * @param poolType - 池子类型：'flap'/'four' 内盘，'v2'/'v3' 外盘
+ * @param quoteToken - 报价代币：'native'（BNB/MON），'usdt'，'usdc'
+ * @param rpcUrl - RPC URL（内盘报价需要）
+ * @returns 等值的原生代币数量（wei），失败返回 MIN_PROFIT_WEI
  */
-async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainId) {
+async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainId, poolType = 'v2', quoteToken = 'native', rpcUrl) {
     if (tokenAmount <= 0n)
-        return 0n;
+        return MIN_PROFIT_WEI;
+    // ✅ FOUR 内盘：通过 Helper3.trySell 获取真实报价
+    if (poolType === 'four') {
+        const url = rpcUrl || provider._getConnection?.()?.url || '';
+        if (!url) {
+            console.warn(`[getTokenToNativeQuote] FOUR 内盘需要 rpcUrl，使用最低利润`);
+            return MIN_PROFIT_WEI;
+        }
+        const funds = await getFourInnerQuote(url, tokenAddress, tokenAmount);
+        return funds > 0n ? funds : MIN_PROFIT_WEI;
+    }
+    // ✅ FLAP 内盘：通过 FlapPortal.previewSell 获取真实报价
+    if (poolType === 'flap') {
+        const url = rpcUrl || provider._getConnection?.()?.url || '';
+        if (!url) {
+            console.warn(`[getTokenToNativeQuote] FLAP 内盘需要 rpcUrl，使用最低利润`);
+            return MIN_PROFIT_WEI;
+        }
+        const funds = await getFlapInnerQuote(url, chainId, tokenAddress, tokenAmount);
+        return funds > 0n ? funds : MIN_PROFIT_WEI;
+    }
+    const chainName = CHAIN_ID_TO_NAME[chainId];
+    if (!chainName) {
+        console.warn(`[getTokenToNativeQuote] 不支持的链 ID: ${chainId}，使用最低利润`);
+        return MIN_PROFIT_WEI;
+    }
+    const chainConfig = QUOTE_CONFIG[chainName];
+    if (!chainConfig) {
+        console.warn(`[getTokenToNativeQuote] 不支持的链: ${chainName}，使用最低利润`);
+        return MIN_PROFIT_WEI;
+    }
     try {
-        if (chainId === 56) {
-            // BSC: 使用 PancakeSwap V2 Router
-            const router = new Contract(BSC_PANCAKE_V2_ROUTER, ROUTER_ABI, provider);
-            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, BSC_WBNB]);
-            return amounts[1];
+        const version = poolType === 'v3' ? 'v3' : 'v2';
+        let nativeAmount = 0n;
+        if (quoteToken === 'native') {
+            // ✅ 直接路径：TOKEN → WBNB
+            console.log(`[getTokenToNativeQuote] 使用 ${version} 直接路径报价 (TOKEN → WBNB)`);
+            const result = await quote({
+                provider,
+                tokenIn: tokenAddress,
+                tokenOut: chainConfig.wrappedNative,
+                amountIn: tokenAmount,
+                chain: chainName,
+                version
+            });
+            nativeAmount = result.amountOut;
+        }
+        else {
+            // ✅ 稳定币路径：TOKEN → USDT/USDC → WBNB（两步报价）
+            const stableCoins = STABLE_COINS[chainName];
+            const stableCoinAddress = stableCoins?.[quoteToken];
+            if (!stableCoinAddress) {
+                console.warn(`[getTokenToNativeQuote] 链 ${chainName} 不支持 ${quoteToken}，使用最低利润`);
+                return MIN_PROFIT_WEI;
+            }
+            console.log(`[getTokenToNativeQuote] 使用 ${version} 稳定币路径报价 (TOKEN → ${quoteToken.toUpperCase()} → WBNB)`);
+            // 第一步：TOKEN → USDT/USDC
+            const step1 = await quote({
+                provider,
+                tokenIn: tokenAddress,
+                tokenOut: stableCoinAddress,
+                amountIn: tokenAmount,
+                chain: chainName,
+                version
+            });
+            if (step1.amountOut <= 0n) {
+                console.warn(`[getTokenToNativeQuote] TOKEN → ${quoteToken.toUpperCase()} 报价失败`);
+                return MIN_PROFIT_WEI;
+            }
+            // 第二步：USDT/USDC → WBNB
+            const step2 = await quote({
+                provider,
+                tokenIn: stableCoinAddress,
+                tokenOut: chainConfig.wrappedNative,
+                amountIn: step1.amountOut,
+                chain: chainName,
+                version
+            });
+            nativeAmount = step2.amountOut;
         }
-        if (chainId === 143) {
-            // ✅ Monad: 使用 PancakeSwap V2 Router
-            const router = new Contract(MONAD_PANCAKE_V2_ROUTER, ROUTER_ABI, provider);
-            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, MONAD_WMON]);
-            return amounts[1];
+        if (nativeAmount > 0n) {
+            console.log(`[getTokenToNativeQuote] 报价成功: ${nativeAmount} wei`);
+            return nativeAmount;
         }
-        // 其他链暂不支持报价，返回 0
-        return 0n;
     }
-    catch {
-        // 报价失败返回 0（可能是流动性不足或路径不存在）
-        return 0n;
+    catch (error) {
+        console.warn(`[getTokenToNativeQuote] 报价失败:`, error);
     }
+    // ✅ 报价失败，返回最低利润（0.0001 BNB）
+    console.log(`[getTokenToNativeQuote] 无法获取报价，使用最低利润: ${MIN_PROFIT_WEI}`);
+    return MIN_PROFIT_WEI;
 }
 /**
  * 分发（仅签名版本 - 不依赖 Merkle）
@@ -62,7 +197,7 @@ async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainI
  * ✅ 优化版：支持 startNonce 参数避免并行调用时的 nonce 冲突
  */
 export async function disperseWithBundleMerkle(params) {
-    const { fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config, startNonce } = params;
+    const { fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config, startNonce, tokenPoolType = 'v2', quoteToken = 'native' } = params;
     // 快速返回空结果
     if (!recipients || recipients.length === 0) {
         return {
@@ -184,7 +319,7 @@ export async function disperseWithBundleMerkle(params) {
             // ✅ 获取 ERC20 利润等值的原生代币（BNB）报价
             let nativeProfitAmount = 0n;
             if (extractProfit && totalTokenProfit > 0n) {
-                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
                 totalProfit = nativeProfitAmount; // 更新为原生代币利润
             }
             // ✅ 并行签名所有交易
@@ -368,7 +503,7 @@ export async function disperseWithBundleMerkle(params) {
         }
         // ✅ ERC20 多跳：获取代币利润等值的原生代币报价
         if (!isNative && extractProfit && totalTokenProfit > 0n) {
-            const nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
+            const nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
             totalProfit = nativeProfitAmount; // 更新为原生代币利润
         }
         // 利润转账（转等值原生代币）
@@ -411,7 +546,7 @@ export async function disperseWithBundleMerkle(params) {
  * ✅ 优化版：支持 startNonce 参数避免并行调用时的 nonce 冲突
  */
 export async function sweepWithBundleMerkle(params) {
-    const { sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce } = params;
+    const { sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce, tokenPoolType = 'v2', quoteToken = 'native' } = params;
     // 快速返回空结果
     if (!sourcePrivateKeys || sourcePrivateKeys.length === 0) {
         return {
@@ -684,7 +819,7 @@ export async function sweepWithBundleMerkle(params) {
             // ✅ ERC20 归集：获取代币利润等值的原生代币（BNB）报价
             let nativeProfitAmount = 0n;
             if (extractProfit && totalProfit > 0n) {
-                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalProfit, chainIdNum);
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
             }
             // ✅ 如果需要提取利润，检查支付者是否有足够 BNB 支付利润转账的额外 gas
             if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0 && config.checkBnbForErc20NoHop) {
@@ -758,7 +893,7 @@ export async function sweepWithBundleMerkle(params) {
     }
     else {
         // ========== 有多跳：构建跳转链归集 ==========
-        // 分离有跳转和无跳转的地址（不需要 RPC）
+        // ✅ 优化版：批量计算 + 批量获取 nonce + 并行签名
         const sourceWallets = actualKeys.map(pk => new Wallet(pk, provider));
         const withHopIndexes = [];
         const withoutHopIndexes = [];
@@ -771,7 +906,7 @@ export async function sweepWithBundleMerkle(params) {
             }
         }
         const sourceAddresses = sourceWallets.map(w => w.address);
-        // ✅ 优化：并行获取 gasPrice、decimals、余额（传入 chainIdNum 避免 NETWORK_ERROR）
+        // ✅ 优化：并行获取 gasPrice、decimals、余额
         const [gasPrice, decimals, balances, bnbBalances] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
             isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum)),
@@ -781,122 +916,107 @@ export async function sweepWithBundleMerkle(params) {
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
         const nonceManager = new NonceManager(provider);
-        // ✅ 用于记录每个钱包的归集金额（用于计算利润）
+        // ✅ 用于记录每个钱包的归集金额
         const sweepAmounts = new Array(sourceWallets.length).fill(0n);
-        // 处理无跳转的地址（批量）
-        if (withoutHopIndexes.length > 0) {
-            for (let idx = 0; idx < withoutHopIndexes.length; idx++) {
-                const i = withoutHopIndexes[idx];
-                const sourceWallet = sourceWallets[i];
-                const bal = balances[i];
-                let toSend = 0n;
-                if (isNative) {
-                    const gasCost = nativeGasLimit * gasPrice;
-                    const ratioForI = (() => {
-                        if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                            return clamp(sources[i].ratioPct);
-                        if (ratios && ratios[i] !== undefined)
-                            return clamp(ratios[i]);
-                        return ratio;
-                    })();
-                    const amountStrForI = (() => {
-                        if (sources && sources[i] && sources[i].amount !== undefined)
-                            return String(sources[i].amount);
-                        if (amounts && amounts[i] !== undefined)
-                            return String(amounts[i]);
-                        return amount !== undefined ? String(amount) : undefined;
-                    })();
-                    if (ratioForI !== undefined) {
-                        const want = (bal * BigInt(ratioForI)) / 100n;
-                        const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
-                        toSend = want > maxSendable ? maxSendable : want;
-                    }
-                    else if (amountStrForI && amountStrForI.trim().length > 0) {
-                        const amt = ethers.parseEther(amountStrForI);
-                        const need = amt + gasCost;
-                        if (!skipIfInsufficient || bal >= need)
-                            toSend = amt;
-                    }
-                    if (toSend > 0n) {
-                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
-                        totalAmountBeforeProfit += toSend;
-                        const nonce = await nonceManager.getNextNonce(sourceWallet);
-                        const tx = await sourceWallet.signTransaction({
-                            to: target,
-                            value: toSend,
-                            nonce,
-                            gasPrice,
-                            gasLimit: nativeGasLimit,
-                            chainId: chainIdNum,
-                            type: txType
-                        });
-                        signedTxs.push(tx);
-                    }
+        // ✅ 辅助函数：获取比例和金额
+        const getRatioForI = (i) => {
+            if (sources && sources[i] && sources[i].ratioPct !== undefined)
+                return clamp(sources[i].ratioPct);
+            if (ratios && ratios[i] !== undefined)
+                return clamp(ratios[i]);
+            return ratio;
+        };
+        const getAmountStrForI = (i) => {
+            if (sources && sources[i] && sources[i].amount !== undefined)
+                return String(sources[i].amount);
+            if (amounts && amounts[i] !== undefined)
+                return String(amounts[i]);
+            return amount !== undefined ? String(amount) : undefined;
+        };
+        const noHopTxDataList = [];
+        for (const i of withoutHopIndexes) {
+            const bal = balances[i];
+            let toSend = 0n;
+            const ratioForI = getRatioForI(i);
+            const amountStrForI = getAmountStrForI(i);
+            if (isNative) {
+                const gasCost = nativeGasLimit * gasPrice;
+                if (ratioForI !== undefined) {
+                    const want = (bal * BigInt(ratioForI)) / 100n;
+                    const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
+                    toSend = want > maxSendable ? maxSendable : want;
                 }
-                else {
-                    const ratioForI = (() => {
-                        if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                            return clamp(sources[i].ratioPct);
-                        if (ratios && ratios[i] !== undefined)
-                            return clamp(ratios[i]);
-                        return ratio;
-                    })();
-                    const amountStrForI = (() => {
-                        if (sources && sources[i] && sources[i].amount !== undefined)
-                            return String(sources[i].amount);
-                        if (amounts && amounts[i] !== undefined)
-                            return String(amounts[i]);
-                        return amount !== undefined ? String(amount) : undefined;
-                    })();
-                    if (ratioForI !== undefined) {
-                        toSend = (bal * BigInt(ratioForI)) / 100n;
-                    }
-                    else if (amountStrForI && amountStrForI.trim().length > 0) {
-                        toSend = ethers.parseUnits(amountStrForI, decimals);
-                    }
-                    if (toSend > 0n && (!skipIfInsufficient || bal >= toSend)) {
-                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
-                        totalAmountBeforeProfit += toSend;
-                        const nonce = await nonceManager.getNextNonce(sourceWallet);
-                        const data = iface.encodeFunctionData('transfer', [target, toSend]);
-                        const tx = await sourceWallet.signTransaction({
-                            to: tokenAddress,
-                            data,
-                            value: 0n,
-                            nonce,
-                            gasPrice,
-                            gasLimit: finalGasLimit,
-                            chainId: chainIdNum,
-                            type: txType
-                        });
-                        signedTxs.push(tx);
-                    }
+                else if (amountStrForI && amountStrForI.trim().length > 0) {
+                    const amt = ethers.parseEther(amountStrForI);
+                    const need = amt + gasCost;
+                    if (!skipIfInsufficient || bal >= need)
+                        toSend = amt;
+                }
+            }
+            else {
+                if (ratioForI !== undefined) {
+                    toSend = (bal * BigInt(ratioForI)) / 100n;
                 }
+                else if (amountStrForI && amountStrForI.trim().length > 0) {
+                    toSend = ethers.parseUnits(amountStrForI, decimals);
+                }
+                if (skipIfInsufficient && bal < toSend)
+                    toSend = 0n;
+            }
+            if (toSend > 0n) {
+                sweepAmounts[i] = toSend;
+                totalAmountBeforeProfit += toSend;
+                noHopTxDataList.push({ index: i, wallet: sourceWallets[i], toSend });
+            }
+        }
+        // ========== 第2步：批量获取无跳转钱包的 nonces ==========
+        const noHopWallets = noHopTxDataList.map(d => d.wallet);
+        const noHopNonces = noHopWallets.length > 0
+            ? await nonceManager.getNextNoncesForWallets(noHopWallets)
+            : [];
+        // ========== 第3步：并行签名无跳转交易 ==========
+        const noHopTxPromises = noHopTxDataList.map((data, idx) => {
+            const { wallet, toSend } = data;
+            const nonce = noHopNonces[idx];
+            if (isNative) {
+                return wallet.signTransaction({
+                    to: target,
+                    value: toSend,
+                    nonce,
+                    gasPrice,
+                    gasLimit: nativeGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
             }
+            else {
+                const txData = iface.encodeFunctionData('transfer', [target, toSend]);
+                return wallet.signTransaction({
+                    to: tokenAddress,
+                    data: txData,
+                    value: 0n,
+                    nonce,
+                    gasPrice,
+                    gasLimit: finalGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+            }
+        });
+        if (noHopTxPromises.length > 0) {
+            const noHopSignedTxs = await Promise.all(noHopTxPromises);
+            signedTxs.push(...noHopSignedTxs);
         }
-        // 处理有跳转的地址
+        const hopTxDataList = [];
         for (const i of withHopIndexes) {
             const sourceWallet = sourceWallets[i];
             const hopChain = preparedHops[i];
-            // 计算要归集的金额
-            let toSend = 0n;
             const bal = balances[i];
+            let toSend = 0n;
+            const ratioForI = getRatioForI(i);
+            const amountStrForI = getAmountStrForI(i);
             if (isNative) {
                 const totalGasCost = finalGasLimit * gasPrice * BigInt(hopChain.length + 1);
-                const ratioForI = (() => {
-                    if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                        return clamp(sources[i].ratioPct);
-                    if (ratios && ratios[i] !== undefined)
-                        return clamp(ratios[i]);
-                    return ratio;
-                })();
-                const amountStrForI = (() => {
-                    if (sources && sources[i] && sources[i].amount !== undefined)
-                        return String(sources[i].amount);
-                    if (amounts && amounts[i] !== undefined)
-                        return String(amounts[i]);
-                    return amount !== undefined ? String(amount) : undefined;
-                })();
                 if (ratioForI !== undefined) {
                     const want = (bal * BigInt(ratioForI)) / 100n;
                     const maxSendable = bal > totalGasCost ? (bal - totalGasCost) : 0n;
@@ -910,25 +1030,10 @@ export async function sweepWithBundleMerkle(params) {
                 }
             }
             else {
-                // ERC20：检查 BNB 余额是否足够支付 gas
                 const bnbBal = bnbBalances[i];
                 const bnbNeeded = (gasFeePerHop * BigInt(hopChain.length)) + (finalGasLimit * gasPrice);
                 if (bnbBal < bnbNeeded && skipIfInsufficient)
                     continue;
-                const ratioForI = (() => {
-                    if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                        return clamp(sources[i].ratioPct);
-                    if (ratios && ratios[i] !== undefined)
-                        return clamp(ratios[i]);
-                    return ratio;
-                })();
-                const amountStrForI = (() => {
-                    if (sources && sources[i] && sources[i].amount !== undefined)
-                        return String(sources[i].amount);
-                    if (amounts && amounts[i] !== undefined)
-                        return String(amounts[i]);
-                    return amount !== undefined ? String(amount) : undefined;
-                })();
                 if (ratioForI !== undefined) {
                     toSend = (bal * BigInt(ratioForI)) / 100n;
                 }
@@ -940,76 +1045,96 @@ export async function sweepWithBundleMerkle(params) {
             }
             if (toSend <= 0n)
                 continue;
-            // ✅ 记录归集金额
             sweepAmounts[i] = toSend;
             totalAmountBeforeProfit += toSend;
-            // 构建跳转链: 子钱包 -> 中转1 -> 中转2 -> ... -> 目标地址
             const fullChain = [sourceWallet, ...hopChain.map(pk => new Wallet(pk, provider))];
             const addresses = [...fullChain.map(w => w.address), target];
+            hopTxDataList.push({ index: i, sourceWallet, toSend, hopChain, fullChain, addresses });
+        }
+        // ========== 第5步：计算每个有跳转钱包需要的 nonce 数量并批量获取 ==========
+        // 每个源钱包需要的 nonce 数量：
+        // - ERC20: hopChain.length (gas费交易) + 1 (主转账)
+        // - Native: 1 (主转账)
+        const hopNonceNeeds = hopTxDataList.map(d => isNative ? 1 : d.hopChain.length + 1);
+        const hopSourceWallets = hopTxDataList.map(d => d.sourceWallet);
+        // ✅ 批量获取所有有跳转钱包的 nonces
+        const hopNoncesFlat = [];
+        if (hopSourceWallets.length > 0) {
+            const batchNoncePromises = hopSourceWallets.map((w, idx) => nonceManager.getNextNonceBatch(w, hopNonceNeeds[idx]));
+            const batchNonces = await Promise.all(batchNoncePromises);
+            batchNonces.forEach(nonces => hopNoncesFlat.push(...nonces));
+        }
+        const hopTxsToSign = [];
+        let nonceOffset = 0;
+        for (let dataIdx = 0; dataIdx < hopTxDataList.length; dataIdx++) {
+            const { sourceWallet, toSend, hopChain, fullChain, addresses } = hopTxDataList[dataIdx];
+            const nonceCount = hopNonceNeeds[dataIdx];
+            const nonces = hopNoncesFlat.slice(nonceOffset, nonceOffset + nonceCount);
+            nonceOffset += nonceCount;
+            let nonceIdx = 0;
             // ERC20 多跳：先给中转钱包转 gas 费
             if (!isNative) {
-                const gasNonces = await nonceManager.getNextNonceBatch(sourceWallet, hopChain.length);
-                const gasTxs = [];
                 for (let j = 0; j < hopChain.length; j++) {
-                    const tx = await sourceWallet.signTransaction({
-                        to: fullChain[j + 1].address,
-                        value: gasFeePerHop,
-                        nonce: gasNonces[j],
-                        gasPrice,
-                        gasLimit: nativeGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: sourceWallet,
+                        tx: {
+                            to: fullChain[j + 1].address,
+                            value: gasFeePerHop,
+                            nonce: nonces[nonceIdx++],
+                            gasPrice,
+                            gasLimit: nativeGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    gasTxs.push(tx);
                 }
-                signedTxs.push(...gasTxs);
             }
             // 执行主要的归集链
             for (let j = 0; j < addresses.length - 1; j++) {
                 const fromWallet = fullChain[j];
                 const toAddress = addresses[j + 1];
-                // 使用 NonceManager：源钱包查询，中转钱包从 0 开始
-                const nonce = j === 0
-                    ? await nonceManager.getNextNonce(sourceWallet)
-                    : 0;
+                const nonce = j === 0 ? nonces[nonceIdx++] : 0;
                 if (isNative) {
-                    // 原生币归集：每一跳需要附加后续跳数的gas费
-                    // toSend = 最终主钱包收到的净金额
-                    // 剩余跳数 = 还需要几跳才能到目标地址
                     const remainingHops = addresses.length - 2 - j;
                     const additionalGas = gasFeePerHop * BigInt(remainingHops);
                     const valueToTransfer = toSend + additionalGas;
-                    // 示例：hopCount=1（2跳），toSend=0.002874
-                    // j=0: 子钱包->中转1，剩余1跳，转 0.002874 + 1*gas = 0.002937
-                    // j=1: 中转1->主钱包，剩余0跳，转 0.002874 + 0 = 0.002874
-                    const tx = await fromWallet.signTransaction({
-                        to: toAddress,
-                        value: valueToTransfer,
-                        nonce,
-                        gasPrice,
-                        gasLimit: finalGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: fromWallet,
+                        tx: {
+                            to: toAddress,
+                            value: valueToTransfer,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    signedTxs.push(tx);
                 }
                 else {
                     const data = iface.encodeFunctionData('transfer', [toAddress, toSend]);
-                    const tx = await fromWallet.signTransaction({
-                        to: tokenAddress,
-                        data,
-                        value: 0n,
-                        nonce,
-                        gasPrice,
-                        gasLimit: finalGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: fromWallet,
+                        tx: {
+                            to: tokenAddress,
+                            data,
+                            value: 0n,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    signedTxs.push(tx);
                 }
             }
         }
-        // ✅ 多跳模式：计算利润并添加利润转账
+        // ✅ 并行签名所有有跳转的交易
+        if (hopTxsToSign.length > 0) {
+            const hopSignedTxs = await Promise.all(hopTxsToSign.map(({ wallet, tx }) => wallet.signTransaction(tx)));
+            signedTxs.push(...hopSignedTxs);
+        }
+        // ========== 第7步：计算利润并添加利润转账 ==========
         if (extractProfit && totalAmountBeforeProfit > 0n) {
             // 找出归集金额最大的钱包作为支付者
             let maxSweepIndex = -1;
@@ -1026,26 +1151,26 @@ export async function sweepWithBundleMerkle(params) {
                 if (sweepAmounts[i] > 0n) {
                     const { profit } = calculateProfit(sweepAmounts[i]);
                     if (isNative) {
-                        totalProfit += profit; // 原生币直接累加
+                        totalProfit += profit;
                     }
                     else {
-                        totalTokenProfit += profit; // ERC20 累计代币利润
+                        totalTokenProfit += profit;
                     }
                 }
             }
-            // ✅ ERC20 多跳归集：获取代币利润等值的原生代币报价
+            // ✅ ERC20：获取代币利润等值的原生代币报价
             let nativeProfitAmount = isNative ? totalProfit : 0n;
             if (!isNative && totalTokenProfit > 0n) {
-                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum);
-                totalProfit = nativeProfitAmount; // 更新为原生代币利润
+                nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
+                totalProfit = nativeProfitAmount;
             }
-            // 由归集金额最大的钱包支付利润（转等值原生代币）
+            // 由归集金额最大的钱包支付利润
             if (nativeProfitAmount > 0n && maxSweepIndex >= 0) {
                 const payerWallet = sourceWallets[maxSweepIndex];
                 const profitNonce = await nonceManager.getNextNonce(payerWallet);
                 const profitTx = await payerWallet.signTransaction({
                     to: getProfitRecipient(),
-                    value: nativeProfitAmount, // ✅ 转等值原生代币
+                    value: nativeProfitAmount,
                     nonce: profitNonce,
                     gasPrice,
                     gasLimit: 21000n,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.4.23",
+  "version": "1.4.25",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",