four-flap-meme-sdk 2.2.7 → 2.2.10

package/dist/chains/xlayer/eoa/eoa-bundle-swap.js

@@ -1,19 +1,244 @@
 /**
- * eoa-bundle-swap - 主函数
+ * XLayer EOA 模式批量换手
+ *
+ * 专门为 XLayer 链设计，不影响 BSC 链的逻辑
+ * - 使用 PotatoSwap V3 Quoter
+ * - 使用 WOKB 作为 Wrapped Native Token
+ * - 支持多跳转账和利润刮取
  */
 import { ethers, Contract, Wallet } from 'ethers';
 import { calculateSellAmount } from '../../../utils/swap-helpers.js';
-import { NonceManager, getDeadline, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
-import { BLOCKRAZOR_BUILDER_EOA, getProfitRecipient } from '../../../shared/constants/index.js';
-import { GAS_LIMITS } from '../../../shared/constants/index.js';
-import { V2_ROUTER_ABI, V3_ROUTER02_ABI } from '../../../abis/common.js';
-import { NATIVE_TRANSFER_GAS_LIMIT, POTATO_V2_ROUTER, POTATO_V3_ROUTER, WOKB_ADDRESS, XLAYER_CHAIN_ID, ZERO_ADDRESS, buildNativeHopChain, calculateProfitAmount, createXLayerContext, generateDisperseHopPaths, getERC20ToOkbQuote, getGasLimit, getGasPrice, quoteSellOutput, } from './eoa-bundle-swap-helpers.js';
+import { NonceManager, getDeadline, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
+import { PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA } from '../../../utils/constants.js';
+import { GAS_LIMITS, CHAINS } from '../../../shared/constants/index.js';
+import { quoteV2, quoteV3 } from '../../../utils/quote-helpers.js';
+import { V2_ROUTER_ABI, V3_ROUTER02_ABI } from '../../../shared/abis/common.js';
+import { generateWallets } from '../../../utils/wallet.js';
+// ✅ 从 XLayer 常量导入正确的路由地址
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_SWAP_ROUTER02, WOKB as WOKB_CONST } from './constants.js';
+// ==================== XLayer 专用常量 ====================
+const XLAYER_CHAIN_ID = CHAINS.XLAYER.chainId;
+const XLAYER_CHAIN_NAME = CHAINS.XLAYER.name;
+const WOKB_ADDRESS = ethers.getAddress(WOKB_CONST);
+// ✅ 强制校验和，避免大小写错误导致的 bad address checksum
+const POTATO_V2_ROUTER = ethers.getAddress(POTATOSWAP_V2_ROUTER);
+const POTATO_V3_ROUTER = ethers.getAddress(POTATOSWAP_SWAP_ROUTER02); // ✅ SwapRouter02 用于 V3 交易
+const NATIVE_TRANSFER_GAS_LIMIT = GAS_LIMITS.NATIVE_TRANSFER;
+const ERC20_TRANSFER_GAS_LIMIT = GAS_LIMITS.ERC20_TRANSFER;
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+// ==================== 工具函数 ====================
+function createXLayerContext(config) {
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId: XLAYER_CHAIN_ID,
+        name: 'XLayer'
+    });
+    return { chainId: XLAYER_CHAIN_ID, provider };
+}
+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));
+}
+async function getGasPrice(provider, config) {
+    const feeData = await provider.getFeeData();
+    let gasPrice = feeData.gasPrice || ethers.parseUnits('0.1', 'gwei');
+    if (config.minGasPriceGwei) {
+        const minGas = ethers.parseUnits(config.minGasPriceGwei.toString(), 'gwei');
+        if (gasPrice < minGas)
+            gasPrice = minGas;
+    }
+    if (config.maxGasPriceGwei) {
+        const maxGas = ethers.parseUnits(config.maxGasPriceGwei.toString(), 'gwei');
+        if (gasPrice > maxGas)
+            gasPrice = maxGas;
+    }
+    return gasPrice;
+}
+function getProfitRateBps(userType) {
+    if (userType === 'v0')
+        return PROFIT_CONFIG.RATE_BPS_V0;
+    if (userType === 'v1')
+        return PROFIT_CONFIG.RATE_BPS_V1;
+    return PROFIT_CONFIG.RATE_BPS_V0;
+}
+function calculateProfitAmount(estimatedOutput, userType) {
+    if (estimatedOutput <= 0n)
+        return 0n;
+    const rateBps = getProfitRateBps(userType);
+    return (estimatedOutput * BigInt(rateBps)) / 10000n;
+}
+// ==================== 报价函数 ====================
+async function quoteSellOutput(provider, routeParams, sellAmountWei) {
+    console.log(`[XLayer quoteSellOutput] 开始报价, routeType=${routeParams.routeType}`);
+    if (routeParams.routeType === 'v2') {
+        const { v2Path } = routeParams;
+        const tokenIn = v2Path[0];
+        const tokenOut = v2Path[v2Path.length - 1];
+        const result = await quoteV2(provider, tokenIn, tokenOut, sellAmountWei, XLAYER_CHAIN_NAME);
+        if (result.amountOut > 0n) {
+            console.log(`[XLayer quoteSellOutput] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+            return result.amountOut;
+        }
+        throw new Error('V2 报价失败');
+    }
+    if (routeParams.routeType === 'v3-single') {
+        const params = routeParams;
+        console.log(`[XLayer quoteSellOutput] V3 单跳: ${params.v3TokenIn} → ${params.v3TokenOut}, fee=${params.v3Fee}`);
+        const result = await quoteV3(provider, params.v3TokenIn, params.v3TokenOut, sellAmountWei, XLAYER_CHAIN_NAME, params.v3Fee);
+        if (result.amountOut > 0n) {
+            console.log(`[XLayer quoteSellOutput] V3 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+            return result.amountOut;
+        }
+        // ❗️兜底：如果 V3 报价失败且提供了 v2Path，则尝试 V2 报价（避免因为无对应费率池导致失败）
+        if (params.v2Path && params.v2Path.length >= 2) {
+            console.warn('[XLayer quoteSellOutput] V3 报价失败，尝试 V2 兜底');
+            const tokenIn = params.v2Path[0];
+            const tokenOut = params.v2Path[params.v2Path.length - 1];
+            const v2Result = await quoteV2(provider, tokenIn, tokenOut, sellAmountWei, XLAYER_CHAIN_NAME);
+            if (v2Result.amountOut > 0n) {
+                console.log(`[XLayer quoteSellOutput] V2 兜底报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                return v2Result.amountOut;
+            }
+        }
+        throw new Error(`V3 单跳报价失败: tokenIn=${params.v3TokenIn}, tokenOut=${params.v3TokenOut}, fee=${params.v3Fee}`);
+    }
+    if (routeParams.routeType === 'v3-multi') {
+        const params = routeParams;
+        const tokenIn = params.v3ExactTokenIn;
+        const result = await quoteV3(provider, tokenIn, WOKB_ADDRESS, sellAmountWei, XLAYER_CHAIN_NAME);
+        if (result.amountOut > 0n) {
+            console.log(`[XLayer quoteSellOutput] V3 多跳报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+            return result.amountOut;
+        }
+        // ❗️兜底：如果 V3 多跳失败且提供 v2Path，则尝试 V2 报价
+        if (params.v2Path && params.v2Path.length >= 2) {
+            console.warn('[XLayer quoteSellOutput] V3 多跳报价失败，尝试 V2 兜底');
+            const tokenInV2 = params.v2Path[0];
+            const tokenOutV2 = params.v2Path[params.v2Path.length - 1];
+            const v2Result = await quoteV2(provider, tokenInV2, tokenOutV2, sellAmountWei, XLAYER_CHAIN_NAME);
+            if (v2Result.amountOut > 0n) {
+                console.log(`[XLayer quoteSellOutput] V2 多跳兜底成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                return v2Result.amountOut;
+            }
+        }
+        throw new Error(`V3 多跳报价失败`);
+    }
+    throw new Error(`不支持的路由类型: ${routeParams.routeType}`);
+}
+async function getERC20ToOkbQuote(provider, tokenAddress, tokenAmount, version = 'v2', fee) {
+    if (tokenAmount <= 0n)
+        return 0n;
+    const tokenLower = tokenAddress.toLowerCase();
+    const wokbLower = WOKB_ADDRESS.toLowerCase();
+    if (tokenLower === wokbLower)
+        return tokenAmount;
+    if (version === 'v3') {
+        const result = await quoteV3(provider, tokenAddress, WOKB_ADDRESS, tokenAmount, XLAYER_CHAIN_NAME, fee);
+        if (result.amountOut > 0n) {
+            console.log(`[XLayer getERC20ToOkbQuote] V3 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+            return result.amountOut;
+        }
+        return 0n;
+    }
+    const result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, tokenAmount, XLAYER_CHAIN_NAME);
+    if (result.amountOut > 0n) {
+        console.log(`[XLayer getERC20ToOkbQuote] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+        return result.amountOut;
+    }
+    return 0n;
+}
+function generateDisperseHopPaths(targetAddresses, hopCount, provider) {
+    if (hopCount <= 0) {
+        return targetAddresses.map(addr => ({
+            targetAddress: addr,
+            hopWallets: [],
+            hopWalletsInfo: []
+        }));
+    }
+    return targetAddresses.map(targetAddress => {
+        const hopWalletsInfo = generateWallets(hopCount);
+        const hopWallets = hopWalletsInfo.map(w => new Wallet(w.privateKey, provider));
+        return { targetAddress, hopWallets, hopWalletsInfo };
+    });
+}
+async function buildNativeHopChain(payer, path, finalAmount, gasPrice, txType, payerNonce) {
+    const signedTxs = [];
+    const hopCount = path.hopWallets.length;
+    if (hopCount === 0) {
+        const tx = {
+            to: path.targetAddress,
+            value: finalAmount,
+            nonce: payerNonce,
+            gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
+            chainId: XLAYER_CHAIN_ID,
+            type: txType
+        };
+        if (txType === 2) {
+            tx.maxFeePerGas = gasPrice;
+            tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        }
+        else {
+            tx.gasPrice = gasPrice;
+        }
+        signedTxs.push(await payer.signTransaction(tx));
+        return signedTxs;
+    }
+    const hopGasCost = NATIVE_TRANSFER_GAS_LIMIT * gasPrice;
+    const amountsPerHop = [];
+    for (let i = 0; i < hopCount; i++) {
+        const remainingHops = hopCount - i;
+        amountsPerHop.push(finalAmount + hopGasCost * BigInt(remainingHops));
+    }
+    // payer → hop1
+    const firstTx = {
+        to: path.hopWallets[0].address,
+        value: amountsPerHop[0],
+        nonce: payerNonce,
+        gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
+        chainId: XLAYER_CHAIN_ID,
+        type: txType
+    };
+    if (txType === 2) {
+        firstTx.maxFeePerGas = gasPrice;
+        firstTx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+    }
+    else {
+        firstTx.gasPrice = gasPrice;
+    }
+    signedTxs.push(await payer.signTransaction(firstTx));
+    // hop1 → hop2 → ... → target
+    for (let i = 0; i < hopCount; i++) {
+        const fromWallet = path.hopWallets[i];
+        const toAddress = i === hopCount - 1 ? path.targetAddress : path.hopWallets[i + 1].address;
+        const amount = i === hopCount - 1 ? finalAmount : amountsPerHop[i + 1];
+        const tx = {
+            to: toAddress,
+            value: amount,
+            nonce: 0,
+            gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
+            chainId: XLAYER_CHAIN_ID,
+            type: txType
+        };
+        if (txType === 2) {
+            tx.maxFeePerGas = gasPrice;
+            tx.maxPriorityFeePerGas = gasPrice / 10n || 1n;
+        }
+        else {
+            tx.gasPrice = gasPrice;
+        }
+        signedTxs.push(await fromWallet.signTransaction(tx));
+    }
+    return signedTxs;
+}
+// ==================== XLayer 快捷批量换手 ====================
 export async function xlayerQuickBatchSwapMerkle(params) {
-    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, buyerRatios, buyerAmounts, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, disperseHopCount = 0, startNonces, } = params;
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, buyerRatios, buyerAmounts, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, disperseHopCount = 0, startNonces } = params;
     const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
     const context = createXLayerContext(config);
     const seller = new Wallet(sellerPrivateKey, context.provider);
-    const buyers = buyerPrivateKeys.map((pk) => new Wallet(pk, context.provider));
+    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
     // 校验卖出路径输出代币
     let sellOutputToken;
     if (routeParams.routeType === 'v2') {
@@ -42,9 +267,10 @@ export async function xlayerQuickBatchSwapMerkle(params) {
     const txType = config.txType ?? 0;
     const [gasPrice, sellAmountResult] = await Promise.all([
         getGasPrice(context.provider, config),
-        calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage),
+        calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage)
     ]);
     const { amount: sellAmountWei, decimals } = sellAmountResult;
+    console.log(`[xlayerQuickBatchSwapMerkle] 模式: ${useNativeToken ? 'OKB' : 'ERC20'}, 卖出: ${ethers.formatUnits(sellAmountWei, decimals)}`);
     // 获取卖出报价
     const estimatedOutput = await quoteSellOutput(context.provider, routeParams, sellAmountWei);
     // 计算利润
@@ -62,18 +288,22 @@ export async function xlayerQuickBatchSwapMerkle(params) {
     // 计算每个买方分到的金额
     let transferAmountsWei;
     if (buyerAmounts && buyerAmounts.length === buyers.length) {
-        transferAmountsWei = buyerAmounts.map((amt) => useNativeToken ? ethers.parseEther(amt) : ethers.parseUnits(amt, quoteTokenDecimals));
+        transferAmountsWei = buyerAmounts.map(amt => useNativeToken ? ethers.parseEther(amt) : ethers.parseUnits(amt, quoteTokenDecimals));
     }
     else if (buyerRatios && buyerRatios.length === buyers.length) {
-        transferAmountsWei = buyerRatios.map((ratio) => (distributableAmount * BigInt(Math.round(ratio * 10000))) / 10000n);
+        transferAmountsWei = buyerRatios.map(ratio => (distributableAmount * BigInt(Math.round(ratio * 10000))) / 10000n);
     }
     else {
         throw new Error('必须提供 buyerRatios 或 buyerAmounts');
     }
     // 获取贿赂金额
-    const bribeAmount = config.bribeAmount && config.bribeAmount > 0 ? ethers.parseEther(String(config.bribeAmount)) : 0n;
+    const bribeAmount = config.bribeAmount && config.bribeAmount > 0
+        ? ethers.parseEther(String(config.bribeAmount))
+        : 0n;
     // 规划 Nonce
-    let sellerNonce = startNonces && startNonces.length > 0 ? startNonces[0] : await nonceManager.getNextNonce(seller);
+    let sellerNonce = startNonces && startNonces.length > 0
+        ? startNonces[0]
+        : await nonceManager.getNextNonce(seller);
     const deadline = getDeadline();
     // 1. 贿赂交易
     let bribeTx = null;
@@ -85,7 +315,7 @@ export async function xlayerQuickBatchSwapMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId: XLAYER_CHAIN_ID,
-            type: txType,
+            type: txType
         });
     }
     // 2. 卖出交易
@@ -104,17 +334,15 @@ export async function xlayerQuickBatchSwapMerkle(params) {
     else if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
         const v3RouterSeller = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, seller);
-        const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [
-            {
+        const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
                 tokenIn: v3TokenIn,
                 tokenOut: v3TokenOut,
                 fee: v3Fee,
                 recipient: useNativeToken ? POTATO_V3_ROUTER : seller.address,
                 amountIn: sellAmountWei,
                 amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-            },
-        ]);
+                sqrtPriceLimitX96: 0n
+            }]);
         if (useNativeToken) {
             const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
             sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
@@ -133,14 +361,14 @@ export async function xlayerQuickBatchSwapMerkle(params) {
         gasLimit: finalGasLimit,
         gasPrice,
         chainId: XLAYER_CHAIN_ID,
-        type: txType,
+        type: txType
     });
     // 3. 转账交易
     const buyerGasCost = gasPrice * finalGasLimit;
-    const hopPaths = generateDisperseHopPaths(buyers.map((b) => b.address), disperseHopCount, context.provider);
+    const hopPaths = generateDisperseHopPaths(buyers.map(b => b.address), disperseHopCount, context.provider);
     const allHopWallets = [];
-    hopPaths.forEach((path) => allHopWallets.push(...path.hopWalletsInfo));
-    let transferTxs;
+    hopPaths.forEach(path => allHopWallets.push(...path.hopWalletsInfo));
+    let transferTxs = [];
     if (disperseHopCount === 0) {
         const transferNonces = buyers.map((_, i) => sellerNonce + i);
         sellerNonce += buyers.length;
@@ -153,7 +381,7 @@ export async function xlayerQuickBatchSwapMerkle(params) {
                 gasPrice,
                 gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
                 chainId: XLAYER_CHAIN_ID,
-                type: txType,
+                type: txType
             });
         }));
     }
@@ -169,7 +397,7 @@ export async function xlayerQuickBatchSwapMerkle(params) {
     // 4. 买入交易
     const buyerNonces = startNonces && startNonces.length > 1
         ? startNonces.slice(1)
-        : await Promise.all(buyers.map((buyer) => nonceManager.getNextNonce(buyer)));
+        : await Promise.all(buyers.map(buyer => nonceManager.getNextNonce(buyer)));
     const signedBuys = await Promise.all(buyers.map(async (buyer, i) => {
         const buyAmount = transferAmountsWei[i];
         const buyValue = useNativeToken ? buyAmount : 0n;
@@ -188,17 +416,15 @@ export async function xlayerQuickBatchSwapMerkle(params) {
         else if (routeParams.routeType === 'v3-single') {
             const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
             const v3RouterBuyer = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, buyer);
-            const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [
-                {
+            const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
                     tokenIn: v3TokenOut,
                     tokenOut: v3TokenIn,
                     fee: v3Fee,
                     recipient: buyer.address,
                     amountIn: buyAmount,
                     amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n,
-                },
-            ]);
+                    sqrtPriceLimitX96: 0n
+                }]);
             buyUnsigned = await v3RouterBuyer.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
         }
         else {
@@ -211,7 +437,7 @@ export async function xlayerQuickBatchSwapMerkle(params) {
             gasLimit: finalGasLimit,
             gasPrice,
             chainId: XLAYER_CHAIN_ID,
-            type: txType,
+            type: txType
         });
     }));
     nonceManager.clearTemp();
@@ -229,35 +455,36 @@ export async function xlayerQuickBatchSwapMerkle(params) {
             provider: context.provider,
             payerWallet: seller,
             profitAmount,
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: PROFIT_CONFIG.RECIPIENT,
             hopCount: PROFIT_HOP_COUNT,
             gasPrice,
             chainId: XLAYER_CHAIN_ID,
             txType,
-            startNonce: sellerNonce++,
+            startNonce: sellerNonce++
         });
         signedTransactions.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets;
     }
+    console.log(`[xlayerQuickBatchSwapMerkle] 完成: ${signedTransactions.length} 笔交易`);
     return {
         signedTransactions,
         disperseHopWallets: allHopWallets.length > 0 ? allHopWallets : undefined,
         profitHopWallets,
         metadata: {
             sellerAddress: seller.address,
-            buyerAddresses: buyers.map((b) => b.address),
+            buyerAddresses: buyers.map(b => b.address),
             sellAmount: ethers.formatUnits(sellAmountWei, decimals),
             estimatedOutput: ethers.formatEther(estimatedOutput),
-            transferAmounts: transferAmountsWei.map((amt) => ethers.formatEther(amt)),
+            transferAmounts: transferAmountsWei.map(amt => ethers.formatEther(amt)),
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined,
             useNativeToken,
-            disperseHopCount: disperseHopCount > 0 ? disperseHopCount : undefined,
-        },
+            disperseHopCount: disperseHopCount > 0 ? disperseHopCount : undefined
+        }
     };
 }
 // ==================== XLayer 交叉换手 ====================
 export async function xlayerCrossSwapMerkle(params) {
-    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, buyersPerSell, disperseHopCount = 0, startNonces: inputNonces, } = params;
+    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, tokenAddress, routeParams, config, quoteToken, quoteTokenDecimals = 18, buyersPerSell, disperseHopCount = 0, startNonces: inputNonces } = params;
     if (sellerPrivateKeys.length === 0)
         throw new Error('至少需要一个卖方');
     if (sellerPrivateKeys.length !== sellAmounts.length)
@@ -266,8 +493,8 @@ export async function xlayerCrossSwapMerkle(params) {
         throw new Error('至少需要一个买方');
     const context = createXLayerContext(config);
     const nonceManager = new NonceManager(context.provider);
-    const allSellerWallets = sellerPrivateKeys.map((pk) => new Wallet(pk, context.provider));
-    const allBuyerWallets = buyerPrivateKeys.map((pk) => new Wallet(pk, context.provider));
+    const allSellerWallets = sellerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    const allBuyerWallets = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
     // ✅ 优先使用前端传入的 nonce，避免 nonce 不同步
     const addressToNonce = new Map();
     for (const wallet of allSellerWallets) {
@@ -292,13 +519,17 @@ export async function xlayerCrossSwapMerkle(params) {
             }
         }
     }
+    console.log(`[xlayerCrossSwapMerkle] 初始化: ${sellerPrivateKeys.length} 卖方, ${buyerPrivateKeys.length} 买方`);
     const allSigned = [];
     const allDisperse = [];
     const allProfit = [];
     const rounds = [];
     let buyerCursor = 0;
     const buyerBatchSize = Math.max(1, buyersPerSell ?? buyerPrivateKeys.length);
-    const bribeAmount = config.bribeAmount && config.bribeAmount > 0 ? ethers.parseEther(String(config.bribeAmount)) : 0n;
+    const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
+    const bribeAmount = config.bribeAmount && config.bribeAmount > 0
+        ? ethers.parseEther(String(config.bribeAmount))
+        : 0n;
     const hasBribe = bribeAmount > 0n;
     for (let i = 0; i < sellerPrivateKeys.length; i++) {
         const sellerPk = sellerPrivateKeys[i];
@@ -313,7 +544,7 @@ export async function xlayerCrossSwapMerkle(params) {
             buyerCursor++;
         }
         const sellerNonce = addressToNonce.get(sellerWallet.address);
-        const roundBuyerNonces = roundBuyerWallets.map((w) => {
+        const roundBuyerNonces = roundBuyerWallets.map(w => {
             const nonce = addressToNonce.get(w.address);
             addressToNonce.set(w.address, nonce + 1);
             return nonce;
@@ -339,9 +570,10 @@ export async function xlayerCrossSwapMerkle(params) {
             quoteToken,
             quoteTokenDecimals,
             disperseHopCount,
-            startNonces,
+            startNonces
         });
         addressToNonce.set(sellerWallet.address, sellerNonce + sellerNonceConsumed);
+        console.log(`[xlayerCrossSwapMerkle] 轮次 ${i + 1}: 卖方=${sellerWallet.address.slice(0, 10)}..., 买方=${roundBuyerPks.length}, 交易=${res.signedTransactions.length}`);
         allSigned.push(...res.signedTransactions);
         if (res.disperseHopWallets)
             allDisperse.push(...res.disperseHopWallets);
@@ -351,15 +583,16 @@ export async function xlayerCrossSwapMerkle(params) {
             sellerAddress: res.metadata?.sellerAddress || '',
             buyerAddresses: res.metadata?.buyerAddresses || [],
             sellAmount,
-            bundleHash: undefined,
+            bundleHash: undefined
         });
     }
     nonceManager.clearTemp();
+    console.log(`[xlayerCrossSwapMerkle] 完成: ${rounds.length} 轮, ${allSigned.length} 笔交易`);
     return {
         signedTransactions: allSigned,
         rounds,
         disperseHopWallets: allDisperse.length > 0 ? allDisperse : undefined,
-        profitHopWallets: allProfit.length > 0 ? allProfit : undefined,
+        profitHopWallets: allProfit.length > 0 ? allProfit : undefined
     };
 }
 /**
@@ -373,7 +606,7 @@ export async function xlayerCrossSwapMerkle(params) {
  * 交易顺序：卖1 → 买1 → 卖2 → 买2 → ... (交替执行)
  */
 export async function xlayerPureCrossSwapMerkle(params) {
-    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, buyAmounts, tokenAddress, routeParams, config, quoteToken, startNonces: inputNonces, } = params;
+    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, buyAmounts, tokenAddress, routeParams, config, quoteToken, startNonces: inputNonces } = params;
     if (sellerPrivateKeys.length === 0)
         throw new Error('至少需要一个卖方');
     if (sellerPrivateKeys.length !== sellAmounts.length)
@@ -385,8 +618,8 @@ export async function xlayerPureCrossSwapMerkle(params) {
     const context = createXLayerContext(config);
     const nonceManager = new NonceManager(context.provider);
     const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
-    const sellers = sellerPrivateKeys.map((pk) => new Wallet(pk, context.provider));
-    const buyers = buyerPrivateKeys.map((pk) => new Wallet(pk, context.provider));
+    const sellers = sellerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
     // 获取 nonce
     const addressToNonce = new Map();
     for (const wallet of [...sellers, ...buyers]) {
@@ -402,12 +635,13 @@ export async function xlayerPureCrossSwapMerkle(params) {
     }
     const [gasPrice, finalGasLimit] = await Promise.all([
         getGasPrice(context.provider, config),
-        Promise.resolve(getGasLimit(config)),
+        Promise.resolve(getGasLimit(config))
     ]);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
     const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
     const signedTransactions = [];
+    console.log(`[xlayerPureCrossSwap] 真正的交叉换手: ${sellers.length} 卖方, ${buyers.length} 买方`);
     // ==================== 卖出交易 ====================
     for (let i = 0; i < sellers.length; i++) {
         const seller = sellers[i];
@@ -415,7 +649,8 @@ export async function xlayerPureCrossSwapMerkle(params) {
         const nonce = addressToNonce.get(seller.address);
         addressToNonce.set(seller.address, nonce + 1);
         // 计算卖出数量
-        const { amount: sellAmountWei } = await calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount);
+        const { amount: sellAmountWei, decimals } = await calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount);
+        console.log(`[xlayerPureCrossSwap] 卖方 ${i + 1}: ${seller.address.slice(0, 10)}... 卖出 ${ethers.formatUnits(sellAmountWei, decimals)}`);
         let sellUnsigned;
         if (routeParams.routeType === 'v2') {
             const { v2Path } = routeParams;
@@ -430,17 +665,15 @@ export async function xlayerPureCrossSwapMerkle(params) {
         else if (routeParams.routeType === 'v3-single') {
             const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
             const v3Router = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, seller);
-            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [
-                {
+            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
                     tokenIn: v3TokenIn,
                     tokenOut: v3TokenOut,
                     fee: v3Fee,
                     recipient: useNativeToken ? POTATO_V3_ROUTER : seller.address,
                     amountIn: sellAmountWei,
                     amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n,
-                },
-            ]);
+                    sqrtPriceLimitX96: 0n
+                }]);
             if (useNativeToken) {
                 const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
                 sellUnsigned = await v3Router.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
@@ -459,7 +692,7 @@ export async function xlayerPureCrossSwapMerkle(params) {
             gasLimit: finalGasLimit,
             gasPrice,
             chainId: XLAYER_CHAIN_ID,
-            type: txType,
+            type: txType
         });
         signedTransactions.push(signedSell);
     }
@@ -471,6 +704,7 @@ export async function xlayerPureCrossSwapMerkle(params) {
         addressToNonce.set(buyer.address, nonce + 1);
         const buyAmountWei = ethers.parseEther(buyAmount);
         const buyValue = useNativeToken ? buyAmountWei : 0n;
+        console.log(`[xlayerPureCrossSwap] 买方 ${i + 1}: ${buyer.address.slice(0, 10)}... 买入 ${buyAmount} OKB`);
         let buyUnsigned;
         if (routeParams.routeType === 'v2') {
             const { v2Path } = routeParams;
@@ -486,17 +720,15 @@ export async function xlayerPureCrossSwapMerkle(params) {
         else if (routeParams.routeType === 'v3-single') {
             const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
             const v3Router = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, buyer);
-            const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [
-                {
+            const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
                     tokenIn: v3TokenOut, // 买入时反过来
                     tokenOut: v3TokenIn,
                     fee: v3Fee,
                     recipient: buyer.address,
                     amountIn: buyAmountWei,
                     amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n,
-                },
-            ]);
+                    sqrtPriceLimitX96: 0n
+                }]);
             buyUnsigned = await v3Router.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
         }
         else {
@@ -509,17 +741,18 @@ export async function xlayerPureCrossSwapMerkle(params) {
             gasLimit: finalGasLimit,
             gasPrice,
             chainId: XLAYER_CHAIN_ID,
-            type: txType,
+            type: txType
         });
         signedTransactions.push(signedBuy);
     }
+    console.log(`[xlayerPureCrossSwap] 完成: ${signedTransactions.length} 笔交易 (${sellers.length} 卖 + ${buyers.length} 买)`);
     return {
         signedTransactions,
         metadata: {
-            sellerAddresses: sellers.map((s) => s.address),
-            buyerAddresses: buyers.map((b) => b.address),
+            sellerAddresses: sellers.map(s => s.address),
+            buyerAddresses: buyers.map(b => b.address),
             sellAmounts,
-            buyAmounts,
-        },
+            buyAmounts
+        }
     };
 }

package/dist/chains/xlayer/eoa/eoa-wash-volume.d.ts

@@ -11,7 +11,7 @@
  * 支持池子类型：V2, V3
  */
 import { Wallet } from 'ethers';
-import type { DirectRouterSignConfig } from '../../../dex/types.js';
+import type { DirectRouterSignConfig } from '../../../dex/direct-router.js';
 export type EoaWashPoolType = 'V2' | 'V3';
 export interface EoaWashVolumeParams {
     /** 代币地址 */