four-flap-meme-sdk 1.9.49 → 2.0.0

package/dist/shared/flap/portal-bundle-merkle/utils.js

@@ -1,180 +1,32 @@
-import { ethers, Wallet } from 'ethers';
-import { getOptimizedGasPrice, NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
-import { ADDRESSES } from '../../../utils/constants.js';
-import { GAS_LIMITS, PROFIT_CONFIG, calculateTransferFee } from '../../constants/index.js';
-import { MULTICALL3_ABI, ERC20_BALANCE_ABI } from '../../abis/common.js';
-import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient } from './config.js';
-// ==================== 链配置 ====================
-const CHAIN_ID_MAP = {
-    'BSC': 56,
-    'MONAD': 143,
-    'XLAYER': 196
-};
-// ==================== 链常量 ====================
-// ✅ 使用公共模块
-const MULTICALL3_ADDRESS = ADDRESSES.BSC.Multicall3;
-// ==================== 内部辅助函数 ====================
-const decimalsCache = new Map();
-async function getErc20Decimals(provider, token) {
-    const network = await provider.getNetwork();
-    const key = `${network.chainId}_${token.toLowerCase()}`;
-    if (decimalsCache.has(key))
-        return decimalsCache.get(key);
-    try {
-        const erc20 = new ethers.Contract(token, ['function decimals() view returns (uint8)'], provider);
-        const d = await erc20.decimals();
-        if (!Number.isFinite(d) || d < 0 || d > 36)
-            return 18;
-        decimalsCache.set(key, d);
-        return d;
-    }
-    catch {
-        return 18;
-    }
-}
-/**
- * ✅ 生成多跳中间钱包（返回完整钱包信息：地址 + 私钥）
- */
-function generateHopWallets(recipientCount, hopCount) {
-    const hopCounts = Array.isArray(hopCount) ? hopCount : new Array(recipientCount).fill(hopCount);
-    if (hopCounts.every(h => h <= 0))
-        return null;
-    const result = [];
-    for (let i = 0; i < recipientCount; i++) {
-        const chain = [];
-        for (let j = 0; j < hopCounts[i]; j++) {
-            const wallet = Wallet.createRandom();
-            chain.push({
-                address: wallet.address,
-                privateKey: wallet.privateKey
-            });
-        }
-        result.push(chain);
-    }
-    return result;
-}
-function normalizeAmounts(recipients, amount, amounts) {
-    if (amounts && amounts.length > 0) {
-        if (amounts.length !== recipients.length) {
-            throw new Error(`amounts length (${amounts.length}) must match recipients length (${recipients.length})`);
-        }
-        return amounts;
-    }
-    if (amount !== undefined && amount.trim().length > 0) {
-        return new Array(recipients.length).fill(amount);
-    }
-    throw new Error('Either amount or amounts must be provided');
-}
-async function batchGetBalances(provider, addresses, tokenAddress) {
-    if (addresses.length === 0)
-        return [];
-    if (!tokenAddress) {
-        return Promise.all(addresses.map(addr => provider.getBalance(addr).catch(() => 0n)));
-    }
-    else {
-        // ✅ 使用公共模块
-        const multicall = new ethers.Contract(MULTICALL3_ADDRESS, MULTICALL3_ABI, provider);
-        const iface = new ethers.Interface(ERC20_BALANCE_ABI);
-        const calls = addresses.map(addr => ({
-            target: tokenAddress,
-            allowFailure: true,
-            callData: iface.encodeFunctionData('balanceOf', [addr])
-        }));
-        try {
-            const results = await multicall.aggregate3(calls);
-            return results.map((result) => {
-                if (result.success) {
-                    return iface.decodeFunctionResult('balanceOf', result.returnData)[0];
-                }
-                return 0n;
-            });
-        }
-        catch {
-            const fallbackCalls = addresses.map(addr => provider
-                .call({ to: tokenAddress, data: iface.encodeFunctionData('balanceOf', [addr]) })
-                .then(raw => iface.decodeFunctionResult('balanceOf', raw)[0])
-                .catch(() => 0n));
-            return Promise.all(fallbackCalls);
-        }
-    }
-}
-/**
- * 计算 Gas Limit
- * - 原生代币转账：21000 gas（固定）
- * - ERC20 标准 transfer：约 45000-55000 gas，使用 55000 作为安全值
- *
- * ✅ 优化：降低 ERC20 gas limit，减少中转钱包 BNB 残留
- */
-function calculateGasLimit(config, isNative, hasHops, _hopCount = 0) {
-    if (config.gasLimit !== undefined) {
-        return BigInt(config.gasLimit);
-    }
-    // ✅ 原生代币: 21000, ERC20 标准 transfer: 48000（USDT 最低约 46815）
-    const baseGas = isNative ? 21000 : 48000;
-    // ✅ 多跳时每个中转钱包只执行一笔 transfer，使用较小的安全系数
-    const multiplier = config.gasLimitMultiplier ?? 1.1;
-    return BigInt(Math.ceil(baseGas * multiplier));
-}
-function isNativeTokenAddress(tokenAddress) {
-    if (!tokenAddress)
-        return true;
-    const v = tokenAddress.trim().toLowerCase();
-    if (!v)
-        return true;
-    if (v === 'native')
-        return true;
-    if (v === '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
-        return true;
-    return false;
-}
-// ==================== 分散函数 ====================
 /**
- * Flap Protocol: 分散（仅签名版本）
- * ✅ 支持利润提取（按地址数量收取固定费用）
- * ✅ 支持多跳
- * ✅ 支持 Multicall3 批量获取余额
+ * utils - 主函数
  */
+import { ethers, Wallet } from 'ethers';
+import { getOptimizedGasPrice, NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
+import { GAS_LIMITS, calculateTransferFee } from '../../constants/index.js';
+import { CHAIN_ID_MAP, getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient } from './config.js';
+import { batchGetBalances, calculateGasLimit, generateHopWallets, getErc20Decimals, isNativeTokenAddress, normalizeAmounts, } from '../../../bundle-core/internal.js';
+import { createSignProvider, createSignWallet, normalizeItemsOrRecipientsAmounts, resolveHopCountInput, resolveProvidedHops, } from '../../../bundle-core/sign-context-helpers.js';
 export async function flapDisperseWithBundleMerkle(params) {
-    const { chain, fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config, startNonce } = params;
+    const { chain, fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config, startNonce, } = params;
     if (!recipients || recipients.length === 0) {
         return { signedTransactions: [], hopWallets: undefined };
     }
     const chainIdNum = CHAIN_ID_MAP[chain] ?? 56;
-    const provider = new ethers.JsonRpcProvider(config.rpcUrl, { chainId: chainIdNum, name: chain });
-    const mainWallet = new Wallet(fromPrivateKey, provider);
+    const provider = createSignProvider(config.rpcUrl, chainIdNum, chain);
+    const mainWallet = createSignWallet(fromPrivateKey, provider);
     const isNative = isNativeTokenAddress(tokenAddress);
     const txType = getTxType(config);
-    // 预处理数据
-    const normalizedAmounts = items && items.length > 0
-        ? items.map(it => (typeof it.amount === 'bigint' ? it.amount.toString() : String(it.amount)))
-        : normalizeAmounts(recipients, amount, amounts);
-    const providedHops = (() => {
-        if (hopPrivateKeys && hopPrivateKeys.length > 0) {
-            if (hopPrivateKeys.length !== recipients.length) {
-                throw new Error(`hopPrivateKeys length (${hopPrivateKeys.length}) must match recipients length (${recipients.length})`);
-            }
-            return hopPrivateKeys.every(h => h.length === 0) ? null : hopPrivateKeys;
-        }
-        if (items && items.length > 0) {
-            const hops = items.map(it => it.hopPrivateKeys ?? []);
-            return hops.every(h => h.length === 0) ? null : hops;
-        }
-        return null;
-    })();
-    const hopCountInput = (() => {
-        if (items && items.length > 0) {
-            const baseArray = Array.isArray(hopCount) ? hopCount : new Array(recipients.length).fill(hopCount);
-            return items.map((it, i) => (typeof it.hopCount === 'number' ? it.hopCount : (baseArray[i] ?? 0)));
-        }
-        return hopCount;
-    })();
+    const normalizedAmounts = normalizeItemsOrRecipientsAmounts(recipients, items, amount, amounts, normalizeAmounts);
+    const providedHops = resolveProvidedHops(recipients.length, hopPrivateKeys, items);
+    const hopCountInput = resolveHopCountInput(recipients.length, hopCount, items);
     const preparedHops = providedHops ?? generateHopWallets(recipients.length, hopCountInput);
     const hasHops = preparedHops !== null;
-    const maxHopCount = hasHops ? Math.max(...preparedHops.map(h => h.length)) : 0;
+    const maxHopCount = hasHops ? Math.max(...preparedHops.map((h) => h.length)) : 0;
     const finalGasLimit = calculateGasLimit(config, isNative, hasHops, maxHopCount);
     const nativeGasLimit = GAS_LIMITS.BRIBE;
     const signedTxs = [];
-    const extractProfit = shouldExtractProfit(config);
+    const extractProfit = shouldExtractProfit();
     const profitAddr = getProfitRecipient();
     let totalProfit = 0n;
     let totalAmountBeforeProfit = 0n;
@@ -188,12 +40,11 @@ export async function flapDisperseWithBundleMerkle(params) {
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
             startNonce !== undefined
                 ? Promise.resolve(Array.from({ length: totalTxCount }, (_, i) => startNonce + i))
-                : nonceManager.getNextNonceBatch(mainWallet, totalTxCount)
+                : nonceManager.getNextNonceBatch(mainWallet, totalTxCount),
         ]);
         // ✅ 按地址数量收取固定费用（原生代币）
         if (extractProfit) {
             totalProfit = calculateTransferFee(chainIdNum, recipients.length);
-            console.log(`[flap disperse] 利润按地址数量收取: ${ethers.formatEther(totalProfit)} 原生币 (${recipients.length} 地址)`);
         }
         if (isNative) {
             const txDataList = recipients.map((to, i) => {
@@ -209,7 +60,7 @@ export async function flapDisperseWithBundleMerkle(params) {
                 gasPrice,
                 gasLimit: nativeGasLimit,
                 chainId: chainIdNum,
-                type: txType
+                type: txType,
             }));
             signedTxs.push(...(await Promise.all(txPromises)));
         }
@@ -231,7 +82,7 @@ export async function flapDisperseWithBundleMerkle(params) {
                 gasPrice,
                 gasLimit: finalGasLimit,
                 chainId: chainIdNum,
-                type: txType
+                type: txType,
             }));
             signedTxs.push(...(await Promise.all(txPromises)));
         }
@@ -246,7 +97,7 @@ export async function flapDisperseWithBundleMerkle(params) {
                 gasPrice,
                 chainId: chainIdNum,
                 txType,
-                startNonce: nonces[recipients.length]
+                startNonce: nonces[recipients.length],
             });
             signedTxs.push(...profitHopResult.signedTransactions);
             profitHopWallets = profitHopResult.hopWallets;
@@ -256,7 +107,9 @@ export async function flapDisperseWithBundleMerkle(params) {
         // ========== 有多跳：构建跳转链 ==========
         const [gasPrice, decimals] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await getErc20Decimals(provider, tokenAddress))
+            isNative
+                ? Promise.resolve(18)
+                : Promise.resolve(tokenDecimals ?? (await getErc20Decimals(provider, tokenAddress))),
         ]);
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
@@ -267,7 +120,7 @@ export async function flapDisperseWithBundleMerkle(params) {
                 mainWalletNonceCount += 1;
             }
             else {
-                const nonceNeed = isNative ? 1 : (hopChain.length + 1);
+                const nonceNeed = isNative ? 1 : hopChain.length + 1;
                 mainWalletNonceCount += nonceNeed;
             }
         }
@@ -281,7 +134,6 @@ export async function flapDisperseWithBundleMerkle(params) {
         // ✅ 按地址数量收取固定费用（原生代币）
         if (extractProfit) {
             totalProfit = calculateTransferFee(chainIdNum, recipients.length);
-            console.log(`[flap disperse hops] 利润按地址数量收取: ${ethers.formatEther(totalProfit)} 原生币 (${recipients.length} 地址)`);
         }
         for (let i = 0; i < recipients.length; i++) {
             const finalRecipient = recipients[i];
@@ -297,27 +149,55 @@ export async function flapDisperseWithBundleMerkle(params) {
                 if (isNative) {
                     txsToSign.push({
                         wallet: mainWallet,
-                        tx: { to: finalRecipient, value: amountWei, nonce, gasPrice, gasLimit: nativeGasLimit, chainId: chainIdNum, type: txType }
+                        tx: {
+                            to: finalRecipient,
+                            value: amountWei,
+                            nonce,
+                            gasPrice,
+                            gasLimit: nativeGasLimit,
+                            chainId: chainIdNum,
+                            type: txType,
+                        },
                     });
                 }
                 else {
                     const data = iface.encodeFunctionData('transfer', [finalRecipient, amountWei]);
                     txsToSign.push({
                         wallet: mainWallet,
-                        tx: { to: tokenAddress, data, value: 0n, nonce, gasPrice, gasLimit: finalGasLimit, chainId: chainIdNum, type: txType }
+                        tx: {
+                            to: tokenAddress,
+                            data,
+                            value: 0n,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType,
+                        },
                     });
                 }
                 continue;
             }
             // ✅ 支持 string 和 GeneratedWallet 两种类型
-            const fullChain = [mainWallet, ...hopChain.map(w => new Wallet(typeof w === 'string' ? w : w.privateKey, provider))];
-            const addresses = [...fullChain.map(w => w.address), finalRecipient];
+            const fullChain = [
+                mainWallet,
+                ...hopChain.map((w) => new Wallet(typeof w === 'string' ? w : w.privateKey, provider)),
+            ];
+            const addresses = [...fullChain.map((w) => w.address), finalRecipient];
             if (!isNative) {
                 for (let j = 0; j < hopChain.length; j++) {
                     const nonce = allMainNonces[mainNonceIdx++];
                     txsToSign.push({
                         wallet: mainWallet,
-                        tx: { to: fullChain[j + 1].address, value: gasFeePerHop, nonce, gasPrice, gasLimit: nativeGasLimit, chainId: chainIdNum, type: txType }
+                        tx: {
+                            to: fullChain[j + 1].address,
+                            value: gasFeePerHop,
+                            nonce,
+                            gasPrice,
+                            gasLimit: nativeGasLimit,
+                            chainId: chainIdNum,
+                            type: txType,
+                        },
                     });
                 }
             }
@@ -331,14 +211,31 @@ export async function flapDisperseWithBundleMerkle(params) {
                     const transferValue = amountWei + additionalGas;
                     txsToSign.push({
                         wallet: fromWallet,
-                        tx: { to: toAddress, value: transferValue, nonce, gasPrice, gasLimit: finalGasLimit, chainId: chainIdNum, type: txType }
+                        tx: {
+                            to: toAddress,
+                            value: transferValue,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType,
+                        },
                     });
                 }
                 else {
                     const data = iface.encodeFunctionData('transfer', [toAddress, amountWei]);
                     txsToSign.push({
                         wallet: fromWallet,
-                        tx: { to: tokenAddress, data, value: 0n, nonce, gasPrice, gasLimit: finalGasLimit, chainId: chainIdNum, type: txType }
+                        tx: {
+                            to: tokenAddress,
+                            data,
+                            value: 0n,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType,
+                        },
                     });
                 }
             }
@@ -347,7 +244,7 @@ export async function flapDisperseWithBundleMerkle(params) {
         signedTxs.push(...signedTxsResult);
         // ✅ 利润多跳转账（固定费用，原生代币）
         if (extractProfit && totalProfit > 0n) {
-            const profitNonce = allMainNonces[mainNonceIdx++];
+            const profitNonce = allMainNonces[mainNonceIdx];
             const profitHopResult = await buildProfitHopTransactions({
                 provider,
                 payerWallet: mainWallet,
@@ -357,7 +254,7 @@ export async function flapDisperseWithBundleMerkle(params) {
                 gasPrice,
                 chainId: chainIdNum,
                 txType,
-                startNonce: profitNonce
+                startNonce: profitNonce,
             });
             signedTxs.push(...profitHopResult.signedTransactions);
             profitHopWallets = profitHopResult.hopWallets;
@@ -367,14 +264,16 @@ export async function flapDisperseWithBundleMerkle(params) {
         signedTransactions: signedTxs,
         hopWallets: preparedHops || undefined,
         profitHopWallets, // ✅ 返回利润多跳钱包
-        metadata: extractProfit ? {
-            totalAmount: ethers.formatEther(totalAmountBeforeProfit),
-            profitAmount: ethers.formatEther(totalProfit),
-            profitRecipient: profitAddr,
-            recipientCount: recipients.length,
-            isNative,
-            tokenAddress: isNative ? undefined : tokenAddress
-        } : undefined
+        metadata: extractProfit
+            ? {
+                totalAmount: ethers.formatEther(totalAmountBeforeProfit),
+                profitAmount: ethers.formatEther(totalProfit),
+                profitRecipient: profitAddr,
+                recipientCount: recipients.length,
+                isNative,
+                tokenAddress: isNative ? undefined : tokenAddress,
+            }
+            : undefined,
     };
 }
 // ==================== 归集函数 ====================
@@ -386,71 +285,50 @@ export async function flapDisperseWithBundleMerkle(params) {
  * ✅ 支持 Multicall3 批量获取余额
  */
 export async function flapSweepWithBundleMerkle(params) {
-    const { chain, sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config } = params;
+    const { chain, sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, } = params;
     if (!sourcePrivateKeys || sourcePrivateKeys.length === 0) {
         return { signedTransactions: [], hopWallets: undefined };
     }
     const chainIdNum = CHAIN_ID_MAP[chain] ?? 56;
-    const provider = new ethers.JsonRpcProvider(config.rpcUrl, { chainId: chainIdNum, name: chain });
+    const provider = createSignProvider(config.rpcUrl, chainIdNum, chain);
     const isNative = isNativeTokenAddress(tokenAddress);
     const txType = getTxType(config);
-    const clamp = (n) => (typeof n === 'number' && Number.isFinite(n)
-        ? Math.max(0, Math.min(100, Math.floor(n)))
-        : undefined);
+    const clamp = (n) => typeof n === 'number' && Number.isFinite(n) ? Math.max(0, Math.min(100, Math.floor(n))) : undefined;
     const ratio = clamp(ratioPct);
     const actualKeys = (() => {
         if (sources && sources.length > 0)
-            return sources.map(s => s.privateKey);
+            return sources.map((s) => s.privateKey);
         return sourcePrivateKeys;
     })();
-    const providedHops = (() => {
-        if (hopPrivateKeys && hopPrivateKeys.length > 0) {
-            if (hopPrivateKeys.length !== actualKeys.length) {
-                throw new Error(`hopPrivateKeys length (${hopPrivateKeys.length}) must match sourcePrivateKeys length (${actualKeys.length})`);
-            }
-            return hopPrivateKeys.every(h => h.length === 0) ? null : hopPrivateKeys;
-        }
-        if (sources && sources.length > 0) {
-            const hops = sources.map(s => s.hopPrivateKeys ?? []);
-            return hops.every(h => h.length === 0) ? null : hops;
-        }
-        return null;
-    })();
-    const hopCountInput = (() => {
-        if (sources && sources.length > 0) {
-            const baseArray = Array.isArray(hopCount) ? hopCount : new Array(actualKeys.length).fill(hopCount);
-            return sources.map((s, i) => (typeof s.hopCount === 'number' ? s.hopCount : (baseArray[i] ?? 0)));
-        }
-        return hopCount;
-    })();
+    const providedHops = resolveProvidedHops(actualKeys.length, hopPrivateKeys, sources);
+    const hopCountInput = resolveHopCountInput(actualKeys.length, hopCount, sources);
     const preparedHops = providedHops ?? generateHopWallets(actualKeys.length, hopCountInput);
     const hasHops = preparedHops !== null;
-    const maxHopCount = hasHops ? Math.max(...preparedHops.map(h => h.length)) : 0;
+    const maxHopCount = hasHops ? Math.max(...preparedHops.map((h) => h.length)) : 0;
     const finalGasLimit = calculateGasLimit(config, isNative, hasHops, maxHopCount);
     const nativeGasLimit = GAS_LIMITS.BRIBE;
     const signedTxs = [];
-    const extractProfit = shouldExtractProfit(config);
+    const extractProfit = shouldExtractProfit();
     const profitAddr = getProfitRecipient();
     let totalProfit = 0n;
     let totalAmountBeforeProfit = 0n;
     let profitHopWallets; // ✅ 收集利润多跳钱包
     if (!preparedHops) {
         // ========== 无多跳：直接批量归集 ==========
-        const wallets = actualKeys.map(pk => new Wallet(pk, provider));
-        const addresses = wallets.map(w => w.address);
+        const wallets = actualKeys.map((pk) => new Wallet(pk, provider));
+        const addresses = wallets.map((w) => w.address);
         const nonceManager = new NonceManager(provider);
         // ✅ 按地址数量收取固定费用（原生代币）
         if (extractProfit) {
             totalProfit = calculateTransferFee(chainIdNum, wallets.length);
-            console.log(`[flap sweep] 利润按地址数量收取: ${ethers.formatEther(totalProfit)} 原生币 (${wallets.length} 地址)`);
         }
         if (isNative) {
             const [gasPrice, balances] = await Promise.all([
                 getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-                batchGetBalances(provider, addresses)
+                batchGetBalances(provider, addresses),
             ]);
             const gasCostBase = nativeGasLimit * gasPrice;
-            const profitTxGas = PROFIT_CONFIG.HOP.GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
+            const profitTxGas = GAS_LIMITS.NATIVE_TRANSFER * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // 第一步：计算所有钱包的归集金额，找出余额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;
@@ -475,7 +353,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 const gasCost = gasCostBase;
                 if (ratioForI !== undefined) {
                     const want = (bal * BigInt(ratioForI)) / 100n;
-                    const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
+                    const maxSendable = bal > gasCost ? bal - gasCost : 0n;
                     toSend = want > maxSendable ? maxSendable : want;
                 }
                 else if (amountStrForI && amountStrForI.trim().length > 0) {
@@ -499,7 +377,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 const payerNeedGas = gasCostBase + profitTxGas;
                 if (payerBalance < payerSweepAmount + payerNeedGas + totalProfit) {
                     // 余额不足支付利润，减少归集金额
-                    const maxPayerSweep = payerBalance > (payerNeedGas + totalProfit) ? payerBalance - payerNeedGas - totalProfit : 0n;
+                    const maxPayerSweep = payerBalance > payerNeedGas + totalProfit ? payerBalance - payerNeedGas - totalProfit : 0n;
                     sweepAmounts[maxSweepIndex] = maxPayerSweep;
                     totalAmountBeforeProfit = sweepAmounts.reduce((sum, amt) => sum + amt, 0n);
                 }
@@ -512,9 +390,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 payerProfitNonce = nonces[1];
             }
             const walletsToSweep = wallets.filter((_, i) => sweepAmounts[i] > 0n && i !== maxSweepIndex);
-            const nonces = walletsToSweep.length > 0
-                ? await nonceManager.getNextNoncesForWallets(walletsToSweep)
-                : [];
+            const nonces = walletsToSweep.length > 0 ? await nonceManager.getNextNoncesForWallets(walletsToSweep) : [];
             let nonceIdx = 0;
             const txPromises = wallets.map(async (w, i) => {
                 const toSend = sweepAmounts[i];
@@ -535,11 +411,11 @@ export async function flapSweepWithBundleMerkle(params) {
                     gasPrice,
                     gasLimit: nativeGasLimit,
                     chainId: chainIdNum,
-                    type: txType
+                    type: txType,
                 });
                 return mainTx;
             });
-            const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
+            const allTxs = (await Promise.all(txPromises)).filter((tx) => tx !== null);
             signedTxs.push(...allTxs);
             // ✅ 利润多跳转账（固定费用，原生代币）
             if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
@@ -553,7 +429,7 @@ export async function flapSweepWithBundleMerkle(params) {
                     gasPrice,
                     chainId: chainIdNum,
                     txType,
-                    startNonce: payerProfitNonce
+                    startNonce: payerProfitNonce,
                 });
                 signedTxs.push(...profitHopResult.signedTransactions);
                 profitHopWallets = profitHopResult.hopWallets;
@@ -563,12 +439,12 @@ export async function flapSweepWithBundleMerkle(params) {
             // ERC20 归集
             const [gasPrice, decimals, balances, nativeBalances] = await Promise.all([
                 getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-                Promise.resolve(tokenDecimals ?? await getErc20Decimals(provider, tokenAddress)),
+                Promise.resolve(tokenDecimals ?? (await getErc20Decimals(provider, tokenAddress))),
                 batchGetBalances(provider, addresses, tokenAddress),
-                batchGetBalances(provider, addresses)
+                batchGetBalances(provider, addresses),
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const profitTxGas = PROFIT_CONFIG.HOP.GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
+            const profitTxGas = GAS_LIMITS.NATIVE_TRANSFER * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             const sweepAmounts = [];
             let maxSweepIndex = -1;
             let maxSweepAmount = 0n;
@@ -629,9 +505,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 payerProfitNonce = nonces[1];
             }
             const walletsToSweepErc20 = wallets.filter((_, i) => sweepAmounts[i] > 0n && i !== maxSweepIndex);
-            const noncesErc20 = walletsToSweepErc20.length > 0
-                ? await nonceManager.getNextNoncesForWallets(walletsToSweepErc20)
-                : [];
+            const noncesErc20 = walletsToSweepErc20.length > 0 ? await nonceManager.getNextNoncesForWallets(walletsToSweepErc20) : [];
             let nonceIdxErc20 = 0;
             const txPromises = wallets.map(async (w, i) => {
                 const toSend = sweepAmounts[i];
@@ -654,11 +528,11 @@ export async function flapSweepWithBundleMerkle(params) {
                     gasPrice,
                     gasLimit: finalGasLimit,
                     chainId: chainIdNum,
-                    type: txType
+                    type: txType,
                 });
                 return mainTx;
             });
-            const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
+            const allTxs = (await Promise.all(txPromises)).filter((tx) => tx !== null);
             signedTxs.push(...allTxs);
             // ✅ 利润多跳转账（固定费用，原生代币）
             if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
@@ -672,7 +546,7 @@ export async function flapSweepWithBundleMerkle(params) {
                     gasPrice,
                     chainId: chainIdNum,
                     txType,
-                    startNonce: payerProfitNonce
+                    startNonce: payerProfitNonce,
                 });
                 signedTxs.push(...profitHopResult.signedTransactions);
                 profitHopWallets = profitHopResult.hopWallets;
@@ -681,11 +555,10 @@ export async function flapSweepWithBundleMerkle(params) {
     }
     else {
         // ========== 有多跳：构建跳转链归集 ==========
-        const sourceWallets = actualKeys.map(pk => new Wallet(pk, provider));
+        const sourceWallets = actualKeys.map((pk) => new Wallet(pk, provider));
         // ✅ 按地址数量收取固定费用（原生代币）
         if (extractProfit) {
             totalProfit = calculateTransferFee(chainIdNum, sourceWallets.length);
-            console.log(`[flap sweep hops] 利润按地址数量收取: ${ethers.formatEther(totalProfit)} 原生币 (${sourceWallets.length} 地址)`);
         }
         const withHopIndexes = [];
         const withoutHopIndexes = [];
@@ -697,12 +570,14 @@ export async function flapSweepWithBundleMerkle(params) {
                 withoutHopIndexes.push(i);
             }
         }
-        const sourceAddresses = sourceWallets.map(w => w.address);
+        const sourceAddresses = sourceWallets.map((w) => w.address);
         const [gasPrice, decimals, balances, nativeBalances] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await getErc20Decimals(provider, tokenAddress)),
+            isNative
+                ? Promise.resolve(18)
+                : Promise.resolve(tokenDecimals ?? (await getErc20Decimals(provider, tokenAddress))),
             batchGetBalances(provider, sourceAddresses, tokenAddress),
-            isNative ? Promise.resolve([]) : batchGetBalances(provider, sourceAddresses)
+            isNative ? Promise.resolve([]) : batchGetBalances(provider, sourceAddresses),
         ]);
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
@@ -731,7 +606,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 })();
                 if (ratioForI !== undefined) {
                     const want = (bal * BigInt(ratioForI)) / 100n;
-                    const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
+                    const maxSendable = bal > gasCost ? bal - gasCost : 0n;
                     toSend = want > maxSendable ? maxSendable : want;
                 }
                 else if (amountStrForI && amountStrForI.trim().length > 0) {
@@ -751,7 +626,7 @@ export async function flapSweepWithBundleMerkle(params) {
                         gasPrice,
                         gasLimit: nativeGasLimit,
                         chainId: chainIdNum,
-                        type: txType
+                        type: txType,
                     });
                     signedTxs.push(tx);
                 }
@@ -790,7 +665,7 @@ export async function flapSweepWithBundleMerkle(params) {
                         gasPrice,
                         gasLimit: finalGasLimit,
                         chainId: chainIdNum,
-                        type: txType
+                        type: txType,
                     });
                     signedTxs.push(tx);
                 }
@@ -820,7 +695,7 @@ export async function flapSweepWithBundleMerkle(params) {
                 })();
                 if (ratioForI !== undefined) {
                     const want = (bal * BigInt(ratioForI)) / 100n;
-                    const maxSendable = bal > totalGasCost ? (bal - totalGasCost) : 0n;
+                    const maxSendable = bal > totalGasCost ? bal - totalGasCost : 0n;
                     toSend = want > maxSendable ? maxSendable : want;
                 }
                 else if (amountStrForI && amountStrForI.trim().length > 0) {
@@ -832,7 +707,7 @@ export async function flapSweepWithBundleMerkle(params) {
             }
             else {
                 const nativeBal = nativeBalances[i];
-                const nativeNeeded = (gasFeePerHop * BigInt(hopChain.length)) + (finalGasLimit * gasPrice);
+                const nativeNeeded = gasFeePerHop * BigInt(hopChain.length) + finalGasLimit * gasPrice;
                 if (nativeBal < nativeNeeded && skipIfInsufficient)
                     continue;
                 const ratioForI = (() => {
@@ -863,8 +738,11 @@ export async function flapSweepWithBundleMerkle(params) {
             sweepAmounts[i] = toSend;
             totalAmountBeforeProfit += toSend;
             // ✅ 支持 string 和 GeneratedWallet 两种类型
-            const fullChain = [sourceWallet, ...hopChain.map(w => new Wallet(typeof w === 'string' ? w : w.privateKey, provider))];
-            const addresses = [...fullChain.map(w => w.address), target];
+            const fullChain = [
+                sourceWallet,
+                ...hopChain.map((w) => new Wallet(typeof w === 'string' ? w : w.privateKey, provider)),
+            ];
+            const addresses = [...fullChain.map((w) => w.address), target];
             if (!isNative) {
                 const gasNonces = await nonceManager.getNextNonceBatch(sourceWallet, hopChain.length);
                 for (let j = 0; j < hopChain.length; j++) {
@@ -875,7 +753,7 @@ export async function flapSweepWithBundleMerkle(params) {
                         gasPrice,
                         gasLimit: nativeGasLimit,
                         chainId: chainIdNum,
-                        type: txType
+                        type: txType,
                     });
                     signedTxs.push(tx);
                 }
@@ -883,9 +761,7 @@ export async function flapSweepWithBundleMerkle(params) {
             for (let j = 0; j < addresses.length - 1; j++) {
                 const fromWallet = fullChain[j];
                 const toAddress = addresses[j + 1];
-                const nonce = j === 0
-                    ? await nonceManager.getNextNonce(sourceWallet)
-                    : 0;
+                const nonce = j === 0 ? await nonceManager.getNextNonce(sourceWallet) : 0;
                 if (isNative) {
                     const remainingHops = addresses.length - 2 - j;
                     const additionalGas = gasFeePerHop * BigInt(remainingHops);
@@ -897,7 +773,7 @@ export async function flapSweepWithBundleMerkle(params) {
                         gasPrice,
                         gasLimit: finalGasLimit,
                         chainId: chainIdNum,
-                        type: txType
+                        type: txType,
                     });
                     signedTxs.push(tx);
                 }
@@ -911,7 +787,7 @@ export async function flapSweepWithBundleMerkle(params) {
                         gasPrice,
                         gasLimit: finalGasLimit,
                         chainId: chainIdNum,
-                        type: txType
+                        type: txType,
                     });
                     signedTxs.push(tx);
                 }
@@ -940,7 +816,7 @@ export async function flapSweepWithBundleMerkle(params) {
                     gasPrice,
                     chainId: chainIdNum,
                     txType,
-                    startNonce: profitNonce
+                    startNonce: profitNonce,
                 });
                 signedTxs.push(...profitHopResult.signedTransactions);
                 profitHopWallets = profitHopResult.hopWallets;
@@ -951,13 +827,17 @@ export async function flapSweepWithBundleMerkle(params) {
         signedTransactions: signedTxs,
         hopWallets: preparedHops || undefined,
         profitHopWallets, // ✅ 返回利润多跳钱包
-        metadata: extractProfit ? {
-            totalAmount: isNative ? ethers.formatEther(totalAmountBeforeProfit) : ethers.formatUnits(totalAmountBeforeProfit, tokenDecimals ?? 18),
-            profitAmount: ethers.formatEther(totalProfit),
-            profitRecipient: profitAddr,
-            sourceCount: actualKeys.length,
-            isNative,
-            tokenAddress: isNative ? undefined : tokenAddress
-        } : undefined
+        metadata: extractProfit
+            ? {
+                totalAmount: isNative
+                    ? ethers.formatEther(totalAmountBeforeProfit)
+                    : ethers.formatUnits(totalAmountBeforeProfit, tokenDecimals ?? 18),
+                profitAmount: ethers.formatEther(totalProfit),
+                profitRecipient: profitAddr,
+                sourceCount: actualKeys.length,
+                isNative,
+                tokenAddress: isNative ? undefined : tokenAddress,
+            }
+            : undefined,
     };
 }