four-flap-meme-sdk 2.2.18 → 2.2.20

package/dist/shared/flap/portal-bundle-merkle/swap-buy-first.js

@@ -1,117 +1,22 @@
 /**
- * Flap Protocol 内盘捆绑换手（Merkle Bundle）- 先买后卖
- *
- * 功能：钱包B先买入代币 → 钱包A卖出相同数量 → 原子执行
+ * swap-buy-first - 主函数
  */
 import { ethers, Contract, Wallet } from 'ethers';
-import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
-import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../../utils/constants.js';
-import { GAS_LIMITS, CHAINS } from '../../constants/index.js';
-import { ERC20_BALANCE_ABI, V2_ROUTER_QUOTE_ABI } from '../../abis/common.js';
-import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
-// ==================== 链常量 ====================
-const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
-const BSC_WBNB = ADDRESSES.BSC.WBNB;
-const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
-const MONAD_WMON = ADDRESSES.MONAD.WMON;
-const ROUTER_ABI = V2_ROUTER_QUOTE_ABI;
-/**
- * 获取 ERC20 代币 → 原生代币的报价
- * @param provider - Provider 实例
- * @param tokenAddress - ERC20 代币地址
- * @param tokenAmount - 代币数量（wei）
- * @param chainId - 链 ID（56=BSC, 143=Monad）
- * @returns 等值的原生代币数量（wei），失败返回 0n
- */
-async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chainId) {
-    if (tokenAmount <= 0n)
-        return 0n;
-    try {
-        if (chainId === CHAINS.BSC.chainId) {
-            // 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];
-        }
-        if (chainId === CHAINS.MONAD.chainId) {
-            // ✅ 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];
-        }
-        // ✅ Base (8453) / XLayer (196) 等链暂不支持 V2 报价，返回 0
-        return 0n;
-    }
-    catch {
-        // 报价失败返回 0（可能是流动性不足或路径不存在）
-        return 0n;
-    }
-}
-/**
- * 获取 Gas Limit（支持 FlapAnyConfig）
- */
-function getGasLimit(config, defaultGas = 800000) {
-    if (config.gasLimit !== undefined) {
-        return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
-    }
-    const multiplier = config.gasLimitMultiplier ?? 1.0;
-    return BigInt(Math.ceil(defaultGas * multiplier));
-}
-// ==================== 多笔买卖常量 ====================
-/** 最大 Bundle 签名数 */
-const MAX_BUNDLE_SIGNATURES = 50;
-/** 贿赂交易数 */
-const BRIBE_TX_COUNT = 1;
-/** 利润中转交易数（支付者 1 笔 + 中转钱包 PROFIT_HOP_COUNT 笔 + 最终接收 1 笔） */
-const PROFIT_TX_COUNT = PROFIT_HOP_COUNT + 2; // 2 + 2 = 4
-/** 最大买卖交易数 */
-const MAX_SWAP_TX_COUNT = MAX_BUNDLE_SIGNATURES - BRIBE_TX_COUNT - PROFIT_TX_COUNT; // 50 - 1 - 4 = 45
-/**
- * 根据 userType 获取每笔交易的利润率
- */
-function getProfitRatePerTxBps(userType) {
-    if (userType === 'v1') {
-        return PROFIT_CONFIG.RATE_BPS_V1_DOUBLE;
-    }
-    return PROFIT_CONFIG.RATE_BPS_V0_DOUBLE; // v0 或默认
-}
-/**
- * 验证买卖笔数
- */
-function validateSwapCounts(buyCount, sellCount) {
-    if (buyCount < 1) {
-        throw new Error(`买入笔数必须至少为 1，当前为 ${buyCount}`);
-    }
-    if (sellCount < 1) {
-        throw new Error(`卖出笔数必须至少为 1，当前为 ${sellCount}`);
-    }
-    const totalSwaps = buyCount + sellCount;
-    if (totalSwaps > MAX_SWAP_TX_COUNT) {
-        throw new Error(`买卖笔数总和 (${totalSwaps}) 超出限制 (${MAX_SWAP_TX_COUNT})，` +
-            `最大签名数为 ${MAX_BUNDLE_SIGNATURES}（${BRIBE_TX_COUNT} 贿赂 + ${PROFIT_TX_COUNT} 利润 + ${MAX_SWAP_TX_COUNT} 买卖）`);
-    }
-}
-function getChainId(chain) {
-    switch (chain) {
-        case 'bsc': return 56;
-        case 'xlayer': return 196;
-        case 'base': return 8453;
-    }
-}
-function getNativeTokenName(chain) {
-    switch (chain) {
-        case 'bsc': return 'BNB';
-        case 'xlayer': return 'OKB';
-        case 'base': return 'ETH';
-    }
-}
-// 使用公共工具的 getGasLimit，移除本地重复实现
+import { ZERO_ADDRESS } from '../../../shared/constants/index.js';
+import { GAS_LIMITS } from '../../constants/index.js';
+import { ERC20_BALANCE_ABI } from '../../abis/common.js';
+import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI, } from './config.js';
+import { createSignProvider } from '../../../bundle-core/sign-context-helpers.js';
+import { buildTransactionRequest } from '../../foundation/tx/build-request.js';
+import { getErrorMessageFromUnknown } from '../../foundation/index.js';
+import { splitAmountByWeight as splitAmount } from '../../foundation/amount/split-by-weight.js';
+import { getChainId, getGasLimit, getNativeTokenName, getProfitRatePerTxBps, getTokenToNativeQuote, validateSwapCounts, } from './swap-buy-first-helpers.js';
 export async function flapBundleBuyFirstMerkle(params) {
-    const { chain, buyerPrivateKey, buyerPrivateKeys, sellerPrivateKey, sellerPrivateKeys, tokenAddress, buyerFunds, buyerFundsPercentage, config, quoteToken, quoteTokenDecimals, buyCount: _buyCount, sellCount: _sellCount } = params;
+    const { chain, buyerPrivateKey, buyerPrivateKeys, sellerPrivateKey, sellerPrivateKeys, tokenAddress, buyerFunds, buyerFundsPercentage, config, quoteToken, quoteTokenDecimals, buyCount: _buyCount, sellCount: _sellCount, } = params;
     // ✅ 判断是否为多钱包模式
-    const isMultiWalletMode = !!(buyerPrivateKeys && buyerPrivateKeys.length > 0) ||
-        !!(sellerPrivateKeys && sellerPrivateKeys.length > 0);
+    const isMultiWalletMode = !!(buyerPrivateKeys && buyerPrivateKeys.length > 0) || !!(sellerPrivateKeys && sellerPrivateKeys.length > 0);
     const buyCount = _buyCount ?? 1;
     const sellCount = _sellCount ?? 1;
     // ✅ 多钱包模式：使用单独的处理逻辑
@@ -124,7 +29,7 @@ export async function flapBundleBuyFirstMerkle(params) {
             buyerFunds,
             config,
             quoteToken,
-            quoteTokenDecimals
+            quoteTokenDecimals,
         });
     }
     // ✅ 单钱包模式（向后兼容）
@@ -158,11 +63,11 @@ export async function flapBundleBuyFirstMerkle(params) {
             useNativeToken,
             quoteToken,
             quoteTokenDecimals,
-            provider: chainContext.provider
+            provider: chainContext.provider,
         }),
-        getOptimizedGasPrice(chainContext.provider, getGasPriceConfig(config))
+        getOptimizedGasPrice(chainContext.provider, getGasPriceConfig(config)),
     ]);
-    const { buyerFundsWei, buyerBalance } = buyerFundsResult;
+    const { buyerFundsWei } = buyerFundsResult;
     const priorityFee = gasPrice / 10n === 0n ? 1n : gasPrice / 10n;
     // ✅ 获取报价
     const quoteResult = await quoteBuyerOutput({
@@ -171,7 +76,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         buyerFundsWei,
         provider: chainContext.provider,
         skipQuoteOnError: config.skipQuoteOnError,
-        inputToken // ✅ 传递输入代币
+        inputToken, // ✅ 传递输入代币
     });
     const sellAmountWei = quoteResult.sellAmountWei;
     // ✅ 验证卖方余额
@@ -180,7 +85,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         provider: chainContext.provider,
         seller,
         sellAmountWei,
-        skipBalanceCheck: sameAddress
+        skipBalanceCheck: sameAddress,
     });
     const portalBuyer = new Contract(chainContext.portalAddress, PORTAL_ABI, buyer);
     const portalSeller = new Contract(chainContext.portalAddress, PORTAL_ABI, seller);
@@ -188,24 +93,24 @@ export async function flapBundleBuyFirstMerkle(params) {
     const buyAmountsWei = splitAmount(buyerFundsWei, buyCount);
     const sellAmountsWei = splitAmount(sellAmountWei, sellCount);
     // ✅ 第三批并行 - 构建多笔买入和卖出交易、estimatedSellFunds
-    const buyUnsignedPromises = buyAmountsWei.map(amount => portalBuyer.swapExactInput.populateTransaction({
+    const buyUnsignedPromises = buyAmountsWei.map((amount) => portalBuyer.swapExactInput.populateTransaction({
         inputToken,
         outputToken: tokenAddress,
         inputAmount: amount,
         minOutputAmount: 0n,
-        permitData: '0x'
+        permitData: '0x',
     }, useNativeToken ? { value: amount } : {}));
-    const sellUnsignedPromises = sellAmountsWei.map(amount => portalSeller.swapExactInput.populateTransaction({
+    const sellUnsignedPromises = sellAmountsWei.map((amount) => portalSeller.swapExactInput.populateTransaction({
         inputToken: tokenAddress,
         outputToken,
         inputAmount: amount,
         minOutputAmount: 0,
-        permitData: '0x'
+        permitData: '0x',
     }));
     const [buyUnsignedArray, sellUnsignedArray, estimatedSellFunds] = await Promise.all([
         Promise.all(buyUnsignedPromises),
         Promise.all(sellUnsignedPromises),
-        estimateSellFunds(portalSeller, tokenAddress, sellAmountWei, outputToken)
+        estimateSellFunds(portalSeller, tokenAddress, sellAmountWei, outputToken),
     ]);
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
@@ -219,7 +124,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         extractProfit: true,
         needBribeTx,
         sameAddress,
-        nonceManager
+        nonceManager,
     });
     // ✅ 修复：基于卖出收益估算利润（使用动态利润比例）
     const profitBase = estimatedSellFunds > 0n ? estimatedSellFunds : buyerFundsWei;
@@ -239,7 +144,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         priorityFee,
         chainId: chainContext.chainId,
         txType,
-        value: useNativeToken ? buyAmountsWei[i] : 0n
+        value: useNativeToken ? buyAmountsWei[i] : 0n,
     }));
     // ✅ 构建多笔卖出交易
     const sellTxs = sellUnsignedArray.map((unsigned, i) => buildTransactionRequest(unsigned, {
@@ -250,7 +155,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         priorityFee,
         chainId: chainContext.chainId,
         txType,
-        value: 0n
+        value: 0n,
     }));
     // ✅ 贿赂交易放在首位
     let bribeTx = null;
@@ -262,13 +167,13 @@ export async function flapBundleBuyFirstMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: chainContext.chainId,
-            type: txType
+            type: txType,
         });
     }
     // ✅ 并行签名所有买入和卖出交易
     const [signedBuys, signedSells] = await Promise.all([
-        Promise.all(buyTxs.map(tx => buyer.signTransaction(tx))),
-        Promise.all(sellTxs.map(tx => seller.signTransaction(tx)))
+        Promise.all(buyTxs.map((tx) => buyer.signTransaction(tx))),
+        Promise.all(sellTxs.map((tx) => seller.signTransaction(tx))),
     ]);
     nonceManager.clearTemp();
     // ✅ 组装顺序：贿赂 → 买入(多笔) → 卖出(多笔)
@@ -284,7 +189,7 @@ export async function flapBundleBuyFirstMerkle(params) {
         profitNonce: multiNoncePlan.profitNonce,
         gasPrice,
         chainId: chainContext.chainId,
-        txType
+        txType,
     });
     let profitHopWallets;
     if (profitResult) {
@@ -304,14 +209,14 @@ export async function flapBundleBuyFirstMerkle(params) {
             buyCount,
             sellCount,
             // ✅ 返回每笔交易的具体金额（随机分配后的数组）
-            buyAmounts: buyAmountsWei.map(amt => ethers.formatEther(amt)),
-            sellAmounts: sellAmountsWei.map(amt => ethers.formatUnits(amt, sellerInfo.decimals))
-        }
+            buyAmounts: buyAmountsWei.map((amt) => ethers.formatEther(amt)),
+            sellAmounts: sellAmountsWei.map((amt) => ethers.formatUnits(amt, sellerInfo.decimals)),
+        },
     };
 }
 // ✅ 使用公共模块中的 ERC20_BALANCE_ABI
 const ERC20_BALANCE_OF_ABI = ERC20_BALANCE_ABI;
-async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, reserveGasEth, nativeToken, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider }) {
+async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, reserveGasEth, nativeToken, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider, }) {
     const reserveGas = ethers.parseEther((reserveGasEth || 0.0005).toString());
     // ✅ 根据是否使用原生代币获取不同的余额
     let buyerBalance;
@@ -333,9 +238,7 @@ async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, re
     else if (buyerFundsPercentage !== undefined) {
         const pct = Math.max(0, Math.min(100, buyerFundsPercentage));
         // ✅ 原生代币需要预留 Gas，ERC20 不需要
-        const spendable = useNativeToken
-            ? (buyerBalance > reserveGas ? buyerBalance - reserveGas : 0n)
-            : buyerBalance;
+        const spendable = useNativeToken ? (buyerBalance > reserveGas ? buyerBalance - reserveGas : 0n) : buyerBalance;
         buyerFundsWei = (spendable * BigInt(Math.floor(pct * 100))) / 10000n;
     }
     else {
@@ -363,15 +266,15 @@ async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, re
     }
     return { buyerFundsWei, buyerBalance };
 }
-async function quoteBuyerOutput({ portalAddress, tokenAddress, buyerFundsWei, provider, skipQuoteOnError, inputToken = ZERO_ADDRESS // ✅ 默认使用原生代币
+async function quoteBuyerOutput({ portalAddress, tokenAddress, buyerFundsWei, provider, skipQuoteOnError, inputToken = ZERO_ADDRESS, // ✅ 默认使用原生代币
  }) {
-    let quotedToken = 0n;
+    let quotedToken;
     const portal = new Contract(portalAddress, PORTAL_ABI, provider);
     try {
         quotedToken = await portal.quoteExactInput.staticCall({
             inputToken, // ✅ 使用动态输入代币
             outputToken: tokenAddress,
-            inputAmount: buyerFundsWei
+            inputAmount: buyerFundsWei,
         });
     }
     catch (error) {
@@ -379,7 +282,7 @@ async function quoteBuyerOutput({ portalAddress, tokenAddress, buyerFundsWei, pr
             quotedToken = 0n;
         }
         else {
-            throw new Error(`买入报价失败: ${error}`);
+            throw new Error(`买入报价失败: ${getErrorMessageFromUnknown(error)}`);
         }
     }
     const sellAmountWei = quotedToken;
@@ -388,46 +291,26 @@ async function quoteBuyerOutput({ portalAddress, tokenAddress, buyerFundsWei, pr
     }
     return { quotedToken, sellAmountWei };
 }
-async function ensureSellerBalance({ tokenAddress, provider, seller, sellAmountWei, skipBalanceCheck }) {
+async function ensureSellerBalance({ tokenAddress, provider, seller, sellAmountWei, skipBalanceCheck, }) {
     const erc20 = new Contract(tokenAddress, ERC20_BALANCE_ABI, provider);
-    const [sellerTokenBal, decimals] = await Promise.all([
-        erc20.balanceOf(seller.address),
-        erc20.decimals()
-    ]);
+    const [sellerTokenBal, decimals] = await Promise.all([erc20.balanceOf(seller.address), erc20.decimals()]);
     if (!skipBalanceCheck && sellerTokenBal < sellAmountWei) {
         throw new Error(`卖方代币余额不足: 需要 ${ethers.formatUnits(sellAmountWei, decimals)}，实际 ${ethers.formatUnits(sellerTokenBal, decimals)}`);
     }
     return { decimals };
 }
-async function estimateSellFunds(portal, tokenAddress, sellAmountWei, outputToken = ZERO_ADDRESS // ✅ 新增：输出代币地址
-) {
+async function estimateSellFunds(portal, tokenAddress, sellAmountWei, outputToken = ZERO_ADDRESS) {
     try {
         return await portal.quoteExactInput.staticCall({
             inputToken: tokenAddress,
             outputToken, // ✅ 使用动态输出代币
-            inputAmount: sellAmountWei
+            inputAmount: sellAmountWei,
         });
     }
     catch {
         return 0n;
     }
 }
-/**
- * 根据 userType 获取利润率（基点）
- */
-function getProfitRateBps(userType) {
-    if (userType === 'v1') {
-        return PROFIT_CONFIG.RATE_BPS_V1; // 0.05%
-    }
-    return PROFIT_CONFIG.RATE_BPS_V0; // v0 或默认 0.06%
-}
-function calculateProfitAmount(expectedFunds, userType) {
-    if (expectedFunds <= 0n) {
-        return 0n;
-    }
-    const rateBps = getProfitRateBps(userType);
-    return (expectedFunds * BigInt(rateBps)) / 10000n;
-}
 /**
  * 计算多笔交易的利润金额
  * @param expectedFunds - 预期收益
@@ -439,88 +322,13 @@ function calculateMultiProfitAmount(expectedFunds, rateBps) {
     }
     return (expectedFunds * BigInt(rateBps)) / 10000n;
 }
-/**
- * ✅ 将金额随机拆分成多份（更自然，不像机器人）
- * @param totalAmount - 总金额
- * @param count - 拆分份数
- * @returns 拆分后的金额数组（随机分配，总和精确）
- */
-function splitAmount(totalAmount, count) {
-    if (count <= 0) {
-        throw new Error('拆分份数必须大于 0');
-    }
-    if (count === 1) {
-        return [totalAmount];
-    }
-    // 生成随机权重（0.5 - 1.5 之间）
-    const weights = [];
-    for (let i = 0; i < count; i++) {
-        // 随机值在 0.5 - 1.5 之间，使每份金额有 ±50% 的浮动
-        weights.push(0.5 + Math.random());
-    }
-    // 计算权重总和
-    const totalWeight = weights.reduce((a, b) => a + b, 0);
-    // 根据权重分配金额
-    const amounts = [];
-    let allocated = 0n;
-    for (let i = 0; i < count - 1; i++) {
-        // 按权重比例分配
-        const ratio = weights[i] / totalWeight;
-        const amount = BigInt(Math.floor(Number(totalAmount) * ratio));
-        amounts.push(amount);
-        allocated += amount;
-    }
-    // 最后一份分配剩余的全部（确保总和精确）
-    amounts.push(totalAmount - allocated);
-    // 随机打乱顺序（让大小金额交错出现）
-    for (let i = amounts.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
-        [amounts[i], amounts[j]] = [amounts[j], amounts[i]];
-    }
-    return amounts;
-}
-/**
- * ✅ 规划 nonce
- * 交易顺序：贿赂 → 买入 → 卖出 → 利润
- */
-async function planNonces({ buyer, seller, extractProfit, needBribeTx, sameAddress, nonceManager }) {
-    if (sameAddress) {
-        // 同一地址：贿赂(可选) + 买入 + 卖出 + 利润(可选)
-        const txCount = countTruthy([needBribeTx, true, true, extractProfit]);
-        const nonces = await nonceManager.getNextNonceBatch(buyer, txCount);
-        let idx = 0;
-        const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
-        const buyerNonce = nonces[idx++];
-        const sellerNonce = nonces[idx++];
-        const profitNonce = extractProfit ? nonces[idx] : undefined;
-        return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-    }
-    if (needBribeTx || extractProfit) {
-        // 卖方需要多个 nonce：贿赂(可选) + 卖出 + 利润(可选)
-        const sellerTxCount = countTruthy([needBribeTx, true, extractProfit]);
-        // ✅ 并行获取 buyer 和 seller 的 nonce
-        const [sellerNonces, buyerNonces] = await Promise.all([
-            nonceManager.getNextNonceBatch(seller, sellerTxCount),
-            nonceManager.getNextNoncesForWallets([buyer])
-        ]);
-        let idx = 0;
-        const bribeNonce = needBribeTx ? sellerNonces[idx++] : undefined;
-        const sellerNonce = sellerNonces[idx++];
-        const profitNonce = extractProfit ? sellerNonces[idx] : undefined;
-        const buyerNonce = buyerNonces[0];
-        return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-    }
-    // ✅ 使用 getNextNoncesForWallets 批量获取
-    const nonces = await nonceManager.getNextNoncesForWallets([buyer, seller]);
-    return { buyerNonce: nonces[0], sellerNonce: nonces[1] };
-}
 /**
  * ✅ 规划多笔交易 nonce
  * 交易顺序：贿赂 → 买入(多笔) → 卖出(多笔) → 利润
  *
  * 利润中转需要 PROFIT_HOP_COUNT + 1 个 nonce（支付者→跳1→跳2→利润地址）
  */
-async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProfit, needBribeTx, sameAddress, nonceManager }) {
+async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProfit, needBribeTx, sameAddress, nonceManager, }) {
     // 利润中转交易数（支付者只需要 1 个 nonce，中转钱包的 nonce 由 buildProfitHopTransactions 内部处理）
     const profitNonceCount = extractProfit ? 1 : 0;
     if (sameAddress) {
@@ -544,7 +352,7 @@ async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProf
     const sellerTxCount = bribeTxCount + sellCount + profitNonceCount;
     const [buyerNonces, sellerNoncesAll] = await Promise.all([
         nonceManager.getNextNonceBatch(buyer, buyCount),
-        nonceManager.getNextNonceBatch(seller, sellerTxCount)
+        nonceManager.getNextNonceBatch(seller, sellerTxCount),
     ]);
     let idx = 0;
     const bribeNonce = needBribeTx ? sellerNoncesAll[idx++] : undefined;
@@ -553,31 +361,10 @@ async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProf
     const profitNonce = extractProfit ? sellerNoncesAll[idx] : undefined;
     return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
 }
-function buildTransactionRequest(unsigned, { from, nonce, gasLimit, gasPrice, priorityFee, chainId, txType, value }) {
-    const tx = {
-        ...unsigned,
-        from,
-        nonce,
-        gasLimit,
-        chainId,
-        type: txType
-    };
-    if (value !== undefined) {
-        tx.value = value;
-    }
-    if (txType === 2) {
-        tx.maxFeePerGas = gasPrice;
-        tx.maxPriorityFeePerGas = priorityFee;
-    }
-    else {
-        tx.gasPrice = gasPrice;
-    }
-    return tx;
-}
 /**
  * 构建利润多跳转账交易（强制 2 跳中转）
  */
-async function buildProfitTransaction({ provider, seller, profitAmount, profitNonce, gasPrice, chainId, txType }) {
+async function buildProfitTransaction({ provider, seller, profitAmount, profitNonce, gasPrice, chainId, txType, }) {
     if (profitNonce === undefined || profitAmount === 0n) {
         return null;
     }
@@ -590,13 +377,10 @@ async function buildProfitTransaction({ provider, seller, profitAmount, profitNo
         gasPrice,
         chainId,
         txType,
-        startNonce: profitNonce
+        startNonce: profitNonce,
     });
     return { signedTransactions: profitHopResult.signedTransactions, hopWallets: profitHopResult.hopWallets };
 }
-function countTruthy(values) {
-    return values.filter(Boolean).length;
-}
 // ✅ Provider 缓存（复用连接，减少初始化开销）
 const providerCache = new Map();
 const PROVIDER_CACHE_TTL_MS = 60 * 1000; // 60秒缓存
@@ -613,10 +397,7 @@ function createChainContext(chain, rpcUrl) {
         provider = cached.provider;
     }
     else {
-        provider = new ethers.JsonRpcProvider(rpcUrl, {
-            chainId,
-            name: chain.toUpperCase()
-        });
+        provider = createSignProvider(rpcUrl, chainId, chain.toUpperCase());
         providerCache.set(cacheKey, { provider, expireAt: now + PROVIDER_CACHE_TTL_MS });
     }
     return { chainId, nativeToken, portalAddress, provider };
@@ -629,7 +410,7 @@ function createChainContext(chain, rpcUrl) {
  * - ✅ 优化：最大化并行操作
  */
 async function flapBundleBuyFirstMultiWallet(params) {
-    const { chain, buyerPrivateKeys, sellerPrivateKeys, tokenAddress, buyerFunds, config, quoteToken, quoteTokenDecimals = 18 } = params;
+    const { chain, buyerPrivateKeys, sellerPrivateKeys, tokenAddress, buyerFunds, config, quoteToken, quoteTokenDecimals = 18, } = params;
     const buyCount = buyerPrivateKeys.length;
     const sellCount = sellerPrivateKeys.length;
     if (buyCount === 0)
@@ -644,8 +425,8 @@ async function flapBundleBuyFirstMultiWallet(params) {
     const chainContext = createChainContext(chain, config.rpcUrl);
     const nonceManager = new NonceManager(chainContext.provider);
     // 创建所有钱包实例
-    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, chainContext.provider));
-    const sellers = sellerPrivateKeys.map(pk => new Wallet(pk, chainContext.provider));
+    const buyers = buyerPrivateKeys.map((pk) => new Wallet(pk, chainContext.provider));
+    const sellers = sellerPrivateKeys.map((pk) => new Wallet(pk, chainContext.provider));
     // 使用第一个卖方作为主卖方（支付贿赂和利润）
     const mainSeller = sellers[0];
     // ✅ 判断是否使用原生代币
@@ -671,7 +452,7 @@ async function flapBundleBuyFirstMultiWallet(params) {
     const allWallets = [...sellers, ...buyers];
     const uniqueWallets = allWallets.filter((w, i) => {
         const addr = w.address.toLowerCase();
-        const firstIdx = allWallets.findIndex(x => x.address.toLowerCase() === addr);
+        const firstIdx = allWallets.findIndex((x) => x.address.toLowerCase() === addr);
         return firstIdx === i;
     });
     const erc20 = new Contract(tokenAddress, ERC20_BALANCE_ABI, chainContext.provider);
@@ -682,11 +463,11 @@ async function flapBundleBuyFirstMultiWallet(params) {
             buyerFundsWei: totalFundsWei,
             provider: chainContext.provider,
             skipQuoteOnError: config.skipQuoteOnError,
-            inputToken
+            inputToken,
         }),
         getOptimizedGasPrice(chainContext.provider, getGasPriceConfig(config)),
         erc20.decimals(),
-        nonceManager.getNextNoncesForWallets(uniqueWallets)
+        nonceManager.getNextNoncesForWallets(uniqueWallets),
     ]);
     // 构建 nonces Map
     const noncesMap = new Map();
@@ -723,19 +504,19 @@ async function flapBundleBuyFirstMultiWallet(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: chainContext.chainId,
-            type: txType
+            type: txType,
         });
     }
     // 2. 预分配所有 nonces（同步操作，避免竞态）
     const buyerNonces = [];
     const sellerNonces = [];
-    buyers.forEach(buyer => {
+    buyers.forEach((buyer) => {
         const addr = buyer.address.toLowerCase();
         const nonce = noncesMap.get(addr);
         buyerNonces.push(nonce);
         noncesMap.set(addr, nonce + 1);
     });
-    sellers.forEach(seller => {
+    sellers.forEach((seller) => {
         const addr = seller.address.toLowerCase();
         const nonce = noncesMap.get(addr);
         sellerNonces.push(nonce);
@@ -749,7 +530,7 @@ async function flapBundleBuyFirstMultiWallet(params) {
             outputToken: tokenAddress,
             inputAmount: buyAmountsWei[i],
             minOutputAmount: 0n,
-            permitData: '0x'
+            permitData: '0x',
         }, useNativeToken ? { value: buyAmountsWei[i] } : {});
         return buyer.signTransaction(buildTransactionRequest(unsigned, {
             from: buyer.address,
@@ -759,7 +540,7 @@ async function flapBundleBuyFirstMultiWallet(params) {
             priorityFee,
             chainId: chainContext.chainId,
             txType,
-            value: useNativeToken ? buyAmountsWei[i] : 0n
+            value: useNativeToken ? buyAmountsWei[i] : 0n,
         }));
     });
     // 4. 并行构建所有卖出交易
@@ -770,7 +551,7 @@ async function flapBundleBuyFirstMultiWallet(params) {
             outputToken,
             inputAmount: sellAmountsWei[i],
             minOutputAmount: 0n,
-            permitData: '0x'
+            permitData: '0x',
         });
         return seller.signTransaction(buildTransactionRequest(unsigned, {
             from: seller.address,
@@ -780,14 +561,14 @@ async function flapBundleBuyFirstMultiWallet(params) {
             priorityFee,
             chainId: chainContext.chainId,
             txType,
-            value: 0n
+            value: 0n,
         }));
     });
     // ✅ 并行签名所有交易（贿赂 + 买入 + 卖出）
     const [bribeTx, signedBuys, signedSells] = await Promise.all([
         bribeTxPromise,
         Promise.all(buyTxPromises),
-        Promise.all(sellTxPromises)
+        Promise.all(sellTxPromises),
     ]);
     // 组装交易顺序：贿赂 → 买入 → 卖出
     if (bribeTx)
@@ -805,7 +586,7 @@ async function flapBundleBuyFirstMultiWallet(params) {
             profitNonce,
             gasPrice,
             chainId: chainContext.chainId,
-            txType
+            txType,
         });
         if (profitResult) {
             allTransactions.push(...profitResult.signedTransactions);
@@ -817,15 +598,15 @@ async function flapBundleBuyFirstMultiWallet(params) {
         signedTransactions: allTransactions,
         profitHopWallets,
         metadata: {
-            buyerAddress: buyers.map(b => b.address).join(','),
-            sellerAddress: sellers.map(s => s.address).join(','),
+            buyerAddress: buyers.map((b) => b.address).join(','),
+            sellerAddress: sellers.map((s) => s.address).join(','),
             buyAmount: ethers.formatEther(totalFundsWei),
             sellAmount: ethers.formatUnits(quoteResult.sellAmountWei, decimals),
             profitAmount: nativeProfitAmount > 0n ? ethers.formatEther(nativeProfitAmount) : undefined,
             buyCount,
             sellCount,
-            buyAmounts: buyAmountsWei.map(amt => ethers.formatEther(amt)),
-            sellAmounts: sellAmountsWei.map(amt => ethers.formatUnits(amt, decimals))
-        }
+            buyAmounts: buyAmountsWei.map((amt) => ethers.formatEther(amt)),
+            sellAmounts: sellAmountsWei.map((amt) => ethers.formatUnits(amt, decimals)),
+        },
     };
 }

package/dist/shared/flap/portal-bundle-merkle/swap-cross.d.ts

@@ -0,0 +1,9 @@
+import type { FlapCrossSwapParams, FlapCrossSwapResult } from './swap-types.js';
+/**
+ * Flap 交叉换手（多卖多买，循环执行）
+ * - 每个卖方单独卖出，买入金额由卖出所得等分分配给当轮买方
+ * - 利润刮取、转账多跳逻辑继承 flapQuickBatchSwapMerkle
+ * - 结果按顺序拼接 signedTransactions（可交由前端/后端顺序广播）
+ * - ✅ 正确处理 nonce：同一钱包在多轮中使用时 nonce 自动递增
+ */
+export declare function flapCrossSwapMerkle(params: FlapCrossSwapParams): Promise<FlapCrossSwapResult>;