four-flap-meme-sdk 2.2.7 → 2.2.10

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

@@ -9,10 +9,10 @@
  * 支持 FLAP 内盘、V2 和 V3 三种交易类型
  * 只生成签名，由调用方决定如何提交
  */
-import { ethers, Contract } from 'ethers';
+import { ethers, Contract, JsonRpcProvider } from 'ethers';
 import { quoteV2, quoteV3 } from '../../../utils/quote-helpers.js';
 import { getCachedProvider, createWallet, signAuthorization, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByUserType, calculateProfitAmountByTxCount, getProfitRecipient, generateRandomWallets, } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, } from './constants.js';
+import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
 // ========================================
 // 路由地址获取
 // ========================================
@@ -50,7 +50,7 @@ function truncateDecimals(value, decimals = 18) {
 async function quoteSellOutput(sellAmount, tokenAddress, tradeType, fee, rpcUrl) {
     if (sellAmount <= 0n)
         return 0n;
-    const provider = getCachedProvider(rpcUrl || XLAYER_RPC_URL);
+    const provider = new JsonRpcProvider(rpcUrl || XLAYER_RPC_URL, { chainId: XLAYER_CHAIN_ID, name: 'xlayer', ensAddress: undefined });
     try {
         switch (tradeType) {
             case 'FLAP': {
@@ -63,22 +63,25 @@ async function quoteSellOutput(sellAmount, tokenAddress, tradeType, fee, rpcUrl)
                         outputToken: ethers.ZeroAddress,
                         inputAmount: sellAmount,
                     });
+                    console.log(`[Bundle Swap] FLAP quoteExactInput 成功: ${ethers.formatEther(okbOut)} OKB`);
                     return BigInt(okbOut.toString());
                 }
-                catch {
-                    // fallback to previewSell
+                catch (e) {
+                    console.warn(`[Bundle Swap] FLAP quoteExactInput 失败:`, e);
                 }
                 // 回退到 previewSell
                 try {
                     const okbOut = await portalContract.previewSell(tokenAddress, sellAmount);
+                    console.log(`[Bundle Swap] FLAP previewSell 成功: ${ethers.formatEther(okbOut)} OKB`);
                     return BigInt(okbOut.toString());
                 }
                 catch {
-                    // fallback to V2
+                    console.warn(`[Bundle Swap] FLAP previewSell 失败，尝试 V2...`);
                 }
                 // 回退到 V2
                 const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
                 if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] FLAP 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
                     return v2Result.amountOut;
                 }
                 break;
@@ -86,6 +89,7 @@ async function quoteSellOutput(sellAmount, tokenAddress, tradeType, fee, rpcUrl)
             case 'V2': {
                 const result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
                 if (result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
                     return result.amountOut;
                 }
                 break;
@@ -93,22 +97,199 @@ async function quoteSellOutput(sellAmount, tokenAddress, tradeType, fee, rpcUrl)
             case 'V3': {
                 const result = await quoteV3(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER', fee);
                 if (result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V3 报价成功 (fee=${result.fee}): ${ethers.formatEther(result.amountOut)} OKB`);
                     return result.amountOut;
                 }
                 // 回退到 V2
                 const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
                 if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V3 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
                     return v2Result.amountOut;
                 }
                 break;
             }
         }
     }
-    catch {
-        // quote failed, return 0
+    catch (error) {
+        console.error(`[Bundle Swap] 报价失败:`, error);
     }
+    console.warn(`[Bundle Swap] 无法获取报价，利润计算可能不准确`);
     return 0n;
 }
+// ========================================
+// 构建卖出并转账调用
+// ========================================
+function buildSellAndTransferCall(sellerWallet, sellAmount, tokenAddress, recipient, tradeType, routerAddress, fee) {
+    const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
+    const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
+    switch (tradeType) {
+        case 'FLAP': {
+            // ✅ FLAP: 使用 swapExactInput 卖出（与 AA 模式保持一致）
+            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
+                    inputToken: tokenAddress,
+                    outputToken: ethers.ZeroAddress, // 0x0 = OKB
+                    inputAmount: sellAmount,
+                    minOutputAmount: 0n,
+                    permitData: '0x',
+                }]);
+            // 通过 executeBatch 让 seller 钱包调用 Portal
+            const batchCalls = [{ target: FLAP_PORTAL_ADDRESS, value: 0n, data: portalCallData }];
+            const callData = delegateInterface.encodeFunctionData('executeBatch', [batchCalls]);
+            return {
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            };
+        }
+        case 'V2': {
+            // V2: 使用 executeSellAndTransferV2
+            const path = [tokenAddress, WOKB_ADDRESS];
+            const callData = delegateInterface.encodeFunctionData('executeSellAndTransferV2', [
+                routerAddress,
+                path,
+                sellAmount,
+                recipient,
+            ]);
+            return {
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            };
+        }
+        case 'V3': {
+            // V3: 使用 executeSellAndTransfer
+            const callData = delegateInterface.encodeFunctionData('executeSellAndTransfer', [
+                routerAddress,
+                tokenAddress,
+                WOKB_ADDRESS,
+                fee,
+                sellAmount,
+                recipient,
+            ]);
+            return {
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            };
+        }
+    }
+}
+// ========================================
+// 构建买入调用
+// ========================================
+function buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee, buyAmount // ✅ 新增：买入金额（防止使用全部余额导致问题）
+) {
+    const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
+    const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
+    switch (tradeType) {
+        case 'FLAP': {
+            // ✅ FLAP: 使用 swapExactInput 买入（与 AA 模式保持一致）
+            // 原 buy(address token) ABI 与 Portal 不匹配，改用 swapExactInput
+            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
+                    inputToken: ethers.ZeroAddress, // 0x0 = OKB (原生代币)
+                    outputToken: tokenAddress,
+                    inputAmount: buyAmount,
+                    minOutputAmount: 0n,
+                    permitData: '0x',
+                }]);
+            const batchCalls = [{ target: FLAP_PORTAL_ADDRESS, value: buyAmount, data: portalCallData }];
+            return {
+                target: buyerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('executeBatch', [batchCalls]),
+            };
+        }
+        case 'V2': {
+            // ✅ V2: 使用 executeBuyV2，传入指定金额
+            const path = [WOKB_ADDRESS, tokenAddress];
+            const callData = delegateInterface.encodeFunctionData('executeBuyV2', [
+                routerAddress,
+                path,
+                buyAmount, // ✅ 使用指定金额，不是 0
+            ]);
+            return {
+                target: buyerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            };
+        }
+        case 'V3': {
+            // ✅ V3: 使用 executeBuy，传入指定金额
+            const callData = delegateInterface.encodeFunctionData('executeBuy', [
+                routerAddress,
+                WOKB_ADDRESS,
+                tokenAddress,
+                fee,
+                buyAmount, // ✅ 使用指定金额，不是 0
+            ]);
+            return {
+                target: buyerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            };
+        }
+    }
+}
+/**
+ * 构建捆绑换手交易
+ */
+async function buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmount, buyAmount, // ✅ 新增：买入金额（防止使用全部余额）
+tokenAddress, tradeType, routerAddress, fee) {
+    const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
+    const calls = [];
+    // 第一步：卖家卖币并转账给第一个中间钱包
+    const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallet.address;
+    const sellCall = buildSellAndTransferCall(sellerWallet, sellAmount, tokenAddress, firstRecipient, tradeType, routerAddress, fee);
+    calls.push(sellCall);
+    // FLAP 模式需要额外的转账调用（因为 sell 函数不支持直接转账）
+    if (tradeType === 'FLAP') {
+        const transferData = delegateInterface.encodeFunctionData('transferTo', [firstRecipient]);
+        calls.push({
+            target: sellerWallet.address,
+            allowFailure: false,
+            value: 0n,
+            callData: transferData,
+        });
+    }
+    // 中间钱包之间的转账
+    for (let i = 0; i < hopWallets.length; i++) {
+        const nextRecipient = i < hopWallets.length - 1 ? hopWallets[i + 1].address : buyerWallet.address;
+        const transferData = delegateInterface.encodeFunctionData('transferTo', [nextRecipient]);
+        calls.push({
+            target: hopWallets[i].address,
+            allowFailure: false,
+            value: 0n,
+            callData: transferData,
+        });
+    }
+    // ✅ 最后一步：买家买币（使用指定金额）
+    const buyCall = buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee, buyAmount);
+    calls.push(buyCall);
+    return calls;
+}
+/**
+ * 捆绑换手 - 生成签名后的交易
+ *
+ * @param params 换手参数
+ * @returns 签名后的交易和元数据
+ *
+ * @example
+ * // FLAP 内盘换手
+ * const result = await bundleSwap({
+ *   sellerPrivateKey: '0x...',
+ *   buyerPrivateKey: '0x...',
+ *   tokenAddress: '0x...',
+ *   sellAmount: '100',
+ *   tradeType: 'FLAP',
+ *   hopCount: 2,
+ * });
+ */
 export async function bundleSwap(params) {
     const { sellerPrivateKey, buyerPrivateKey, tokenAddress, tokenDecimals = 18, sellAmount, hopCount = 0, tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, userType = 'v0', useFundUtilization = false, // ✅ 默认普通模式
     config, } = params;
@@ -125,15 +306,25 @@ export async function bundleSwap(params) {
     // 资金利用率模式才需要中间钱包
     const actualHopCount = useFundUtilization ? hopCount : 0;
     const hopWalletInfos = actualHopCount > 0 ? generateRandomWallets(actualHopCount) : [];
-    const hopWallets = hopWalletInfos.map((info) => createWallet(info.privateKey, provider));
+    const hopWallets = hopWalletInfos.map(info => createWallet(info.privateKey, provider));
     const sellAmountWei = ethers.parseUnits(truncateDecimals(sellAmount, tokenDecimals), tokenDecimals);
     // 获取卖出报价
     const estimatedOkbOut = await quoteSellOutput(sellAmountWei, tokenAddress, tradeType, fee, config?.rpcUrl);
     // 使用双边费率计算利润（换手 = 卖 + 买）
-    const profitAmount = estimatedOkbOut > 0n ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true) : 0n;
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true)
+        : 0n;
     const profitRecipient = getProfitRecipient(config);
     // 计算买入金额
-    const buyAmountAfterProfit = estimatedOkbOut > profitAmount ? estimatedOkbOut - profitAmount : 0n;
+    const buyAmountAfterProfit = estimatedOkbOut > profitAmount
+        ? estimatedOkbOut - profitAmount
+        : 0n;
+    const modeLabel = useFundUtilization ? '资金利用率' : '普通';
+    console.log(`[Bundle Swap] 模式: ${modeLabel}`);
+    console.log(`[Bundle Swap] 卖出数量: ${sellAmount} Token`);
+    console.log(`[Bundle Swap] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Swap] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
+    console.log(`[Bundle Swap] 买入金额: ${ethers.formatEther(buyAmountAfterProfit)} OKB`);
     // ========================================
     // 并行获取数据
     // ========================================
@@ -183,6 +374,7 @@ export async function bundleSwap(params) {
         // 4. 分发者按比例转账给买家
         // 5. 买家买入
         // ========================================
+        console.log(`[Bundle Swap] 资金利用率模式，hopCount=${actualHopCount}`);
         // 1. 卖家卖出
         const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
@@ -235,6 +427,7 @@ export async function bundleSwap(params) {
         // 2. 买家用自己预存的 OKB 买入代币
         // 3. 利润从买家的 OKB 中扣除
         // ========================================
+        console.log(`[Bundle Swap] 普通模式`);
         // 1. 卖家卖出（OKB 留在卖家账户）
         const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
@@ -299,18 +492,28 @@ export async function bundleBatchSwap(params) {
     // 创建钱包
     // ========================================
     const sellerWallet = createWallet(sellerPrivateKey, provider);
-    const buyerWallets = buyerPrivateKeys.map((pk) => createWallet(pk, provider));
+    const buyerWallets = buyerPrivateKeys.map(pk => createWallet(pk, provider));
     // 资金利用率模式才需要中间钱包
     const actualHopCount = useFundUtilization ? hopCount : 0;
     const hopWalletInfos = actualHopCount > 0 ? generateRandomWallets(actualHopCount) : [];
-    const hopWallets = hopWalletInfos.map((info) => createWallet(info.privateKey, provider));
+    const hopWallets = hopWalletInfos.map(info => createWallet(info.privateKey, provider));
     const sellAmountWei = ethers.parseUnits(truncateDecimals(sellAmount, tokenDecimals), tokenDecimals);
     // 获取卖出报价
     const estimatedOkbOut = await quoteSellOutput(sellAmountWei, tokenAddress, tradeType, fee, config?.rpcUrl);
     // 计算利润和买入金额
-    const profitAmount = estimatedOkbOut > 0n ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true) : 0n;
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true)
+        : 0n;
     const profitRecipient = getProfitRecipient(config);
-    const totalBuyAmountAfterProfit = estimatedOkbOut > profitAmount ? estimatedOkbOut - profitAmount : 0n;
+    const totalBuyAmountAfterProfit = estimatedOkbOut > profitAmount
+        ? estimatedOkbOut - profitAmount
+        : 0n;
+    const modeLabel = useFundUtilization ? '资金利用率' : '普通';
+    console.log(`[Bundle Batch Swap] 模式: ${modeLabel}`);
+    console.log(`[Bundle Batch Swap] 卖出数量: ${sellAmount} Token`);
+    console.log(`[Bundle Batch Swap] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Batch Swap] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
+    console.log(`[Bundle Batch Swap] 买入金额: ${ethers.formatEther(totalBuyAmountAfterProfit)} OKB`);
     // 验证报价
     if (tradeType === 'FLAP' && totalBuyAmountAfterProfit <= 0n) {
         throw new Error('FLAP 内盘模式需要有效的报价，请检查代币地址或稍后重试');
@@ -318,11 +521,11 @@ export async function bundleBatchSwap(params) {
     // ========================================
     // 并行获取数据
     // ========================================
-    const addressesToQuery = [sellerWallet.address, ...buyerWallets.map((w) => w.address)];
+    const addressesToQuery = [sellerWallet.address, ...buyerWallets.map(w => w.address)];
     const [nonces, feeData, ...buyerBalances] = await Promise.all([
         batchGetNonces(addressesToQuery, provider),
         provider.getFeeData(),
-        ...buyerWallets.map((w) => provider.getBalance(w.address)),
+        ...buyerWallets.map(w => provider.getBalance(w.address)),
     ]);
     const sellerNonce = nonces[0];
     const buyerNonces = nonces.slice(1);
@@ -375,6 +578,7 @@ export async function bundleBatchSwap(params) {
         const remainder = totalBuyAmountAfterProfit % BigInt(buyerWallets.length);
         buyAmountsPerBuyer = buyerWallets.map((_, i) => i === buyerWallets.length - 1 ? avgAmount + remainder : avgAmount);
     }
+    console.log(`[bundleBatchSwap] 买入金额分配:`, buyAmountsPerBuyer.map(a => ethers.formatEther(a)));
     if (useFundUtilization) {
         // ========================================
         // ✅ 资金利用率模式（一卖多买）
@@ -383,6 +587,7 @@ export async function bundleBatchSwap(params) {
         // 3. 卖家（或最后一个 hop）按比例转账给各买家
         // 4. 各买家用收到的 OKB 买入
         // ========================================
+        console.log(`[Bundle Batch Swap] 资金利用率模式，hopCount=${actualHopCount}`);
         // 1. 卖家卖出
         const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
@@ -405,10 +610,7 @@ export async function bundleBatchSwap(params) {
                 target: sellerWallet.address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferAmount', [
-                    hopWallets[0].address,
-                    totalBuyAmountAfterProfit,
-                ]),
+                callData: delegateInterface.encodeFunctionData('transferAmount', [hopWallets[0].address, totalBuyAmountAfterProfit]),
             });
             // 中间钱包之间转账（到最后一个 hop）：使用 transferTo（全部余额）
             for (let i = 0; i < hopWallets.length - 1; i++) {
@@ -449,6 +651,7 @@ export async function bundleBatchSwap(params) {
         // 2. 利润从第一个买家 OKB 中扣除
         // 3. 各买家用自己预存的 OKB 买入
         // ========================================
+        console.log(`[Bundle Batch Swap] 普通模式`);
         // 1. 卖家卖出（OKB 留在卖家账户）
         const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
@@ -476,7 +679,7 @@ export async function bundleBatchSwap(params) {
         hopWallets: hopWalletInfos,
         metadata: {
             sellerAddress: sellerWallet.address,
-            buyerAddresses: buyerWallets.map((w) => w.address),
+            buyerAddresses: buyerWallets.map(w => w.address),
             sellAmount: ethers.formatUnits(sellAmountWei, tokenDecimals),
             estimatedOkbOut: ethers.formatEther(estimatedOkbOut),
             estimatedBuyAmount: ethers.formatEther(totalBuyAmountAfterProfit),
@@ -520,15 +723,18 @@ export async function bundleMultiSwap(params) {
         throw new Error('必须提供有效的 mainPrivateKey（Payer 钱包私钥）');
     }
     // ✅ 验证卖家私钥
-    const validSellerPrivateKeys = sellerPrivateKeys.filter((pk) => isValidPrivateKey(pk));
+    const validSellerPrivateKeys = sellerPrivateKeys.filter(pk => isValidPrivateKey(pk));
     if (validSellerPrivateKeys.length === 0) {
         throw new Error('没有有效的卖家私钥');
     }
     // ✅ 验证买家私钥
-    const validBuyerPrivateKeys = buyerPrivateKeys.filter((pk) => isValidPrivateKey(pk));
+    const validBuyerPrivateKeys = buyerPrivateKeys.filter(pk => isValidPrivateKey(pk));
     if (validBuyerPrivateKeys.length === 0) {
         throw new Error('没有有效的买家私钥');
     }
+    if (validSellerPrivateKeys.length !== sellerPrivateKeys.length || validBuyerPrivateKeys.length !== buyerPrivateKeys.length) {
+        console.warn(`[bundleMultiSwap] 跳过无效私钥: 卖家 ${sellerPrivateKeys.length - validSellerPrivateKeys.length} 个, 买家 ${buyerPrivateKeys.length - validBuyerPrivateKeys.length} 个`);
+    }
     const provider = getCachedProvider(config?.rpcUrl);
     // ✅ 空字符串也使用默认值
     const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
@@ -538,16 +744,16 @@ export async function bundleMultiSwap(params) {
     // ✅ 创建 Payer 钱包（支付 Gas 费）
     const mainWallet = createWallet(mainPrivateKey, provider);
     // 创建钱包
-    const sellerWallets = validSellerPrivateKeys.map((pk) => createWallet(pk, provider));
-    const buyerWallets = validBuyerPrivateKeys.map((pk) => createWallet(pk, provider));
+    const sellerWallets = validSellerPrivateKeys.map(pk => createWallet(pk, provider));
+    const buyerWallets = validBuyerPrivateKeys.map(pk => createWallet(pk, provider));
     // 合并所有钱包（去重，包括 mainWallet）
     const allWalletsMap = new Map();
     allWalletsMap.set(mainWallet.address.toLowerCase(), mainWallet);
-    sellerWallets.forEach((w) => allWalletsMap.set(w.address.toLowerCase(), w));
-    buyerWallets.forEach((w) => allWalletsMap.set(w.address.toLowerCase(), w));
+    sellerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
+    buyerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
     const allWallets = Array.from(allWalletsMap.values());
     // 找出 mainWallet 在 allWallets 中的索引
-    const mainWalletIndex = allWallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    const mainWalletIndex = allWallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
     // 计算买入金额
     const totalBuyAmountWei = ethers.parseEther(truncateDecimals(totalBuyAmount));
     const buyAmountPerWallet = totalBuyAmountWei / BigInt(buyerWallets.length);
@@ -558,13 +764,13 @@ export async function bundleMultiSwap(params) {
     // ========================================
     // 并行获取数据
     // ========================================
-    const allAddresses = allWallets.map((w) => w.address);
+    const allAddresses = allWallets.map(w => w.address);
     // 获取卖出钱包的代币余额
     const tokenContract = new ethers.Contract(tokenAddress, ERC20_ABI, provider);
     const [nonces, feeData, sellerBalances] = await Promise.all([
         batchGetNonces(allAddresses, provider),
         provider.getFeeData(),
-        Promise.all(sellerWallets.map((w) => tokenContract.balanceOf(w.address))),
+        Promise.all(sellerWallets.map(w => tokenContract.balanceOf(w.address))),
     ]);
     // 计算每个卖家的卖出金额（按百分比）
     const percentBigInt = BigInt(Math.min(100, Math.max(1, sellPercent)));
@@ -609,8 +815,8 @@ export async function bundleMultiSwap(params) {
         signedTransaction,
         metadata: {
             payerAddress: mainWallet.address,
-            sellerAddresses: sellerWallets.map((w) => w.address),
-            buyerAddresses: buyerWallets.map((w) => w.address),
+            sellerAddresses: sellerWallets.map(w => w.address),
+            buyerAddresses: buyerWallets.map(w => w.address),
             sellerCount: sellerWallets.filter((_, i) => sellAmountsWei[i] > 0n).length,
             buyerCount: buyerWallets.length,
             totalBuyAmount: ethers.formatEther(totalBuyAmountWei),
@@ -629,15 +835,13 @@ function buildBuyCallInternal(wallet, amount, tokenAddress, tradeType, routerAdd
         case 'FLAP': {
             // ✅ FLAP: 使用 swapExactInput 买入（与 AA 模式保持一致）
             // 原 buy(address token) ABI 与 Portal 不匹配，改用 swapExactInput
-            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [
-                {
+            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
                     inputToken: ethers.ZeroAddress, // 0x0 = OKB (原生代币)
                     outputToken: tokenAddress,
                     inputAmount: amount,
                     minOutputAmount: 0n,
                     permitData: '0x',
-                },
-            ]);
+                }]);
             const batchCalls = [{ target: FLAP_PORTAL_ADDRESS, value: amount, data: portalCallData }];
             return {
                 target: wallet.address,
@@ -663,11 +867,7 @@ function buildBuyCallInternal(wallet, amount, tokenAddress, tradeType, routerAdd
                 allowFailure: false,
                 value: 0n,
                 callData: delegateInterface.encodeFunctionData('executeBuy', [
-                    routerAddress,
-                    WOKB_ADDRESS,
-                    tokenAddress,
-                    fee,
-                    amount,
+                    routerAddress, WOKB_ADDRESS, tokenAddress, fee, amount
                 ]),
             };
         }
@@ -677,15 +877,13 @@ function buildSellCallWithAmountInternal(wallet, amount, tokenAddress, tradeType
     switch (tradeType) {
         case 'FLAP': {
             // ✅ 使用 swapExactInput 卖出（与 AA 模式保持一致）
-            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [
-                {
+            const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
                     inputToken: tokenAddress,
                     outputToken: ethers.ZeroAddress, // 0x0 = OKB
                     inputAmount: amount,
                     minOutputAmount: 0n,
                     permitData: '0x',
-                },
-            ]);
+                }]);
             const batchCalls = [{ target: FLAP_PORTAL_ADDRESS, value: 0n, data: portalCallData }];
             return {
                 target: wallet.address,
@@ -711,11 +909,7 @@ function buildSellCallWithAmountInternal(wallet, amount, tokenAddress, tradeType
                 value: 0n,
                 // ✅ 修复：传入实际数量，避免卖出全部
                 callData: delegateInterface.encodeFunctionData('executeSell', [
-                    routerAddress,
-                    tokenAddress,
-                    WOKB_ADDRESS,
-                    fee,
-                    amount,
+                    routerAddress, tokenAddress, WOKB_ADDRESS, fee, amount
                 ]),
             };
         }

package/dist/chains/xlayer/eip7702/constants.d.ts

@@ -23,7 +23,22 @@ export declare const USDT_ADDRESS = "0x1e4a5963abfd975d8c9021ce480b42188849d41d"
 export declare const USDC_ADDRESS = "0x74b7f16337b8972027f6196a17a631ac6de26d22";
 /** USDT0 地址 (6 位精度) */
 export declare const USDT0_ADDRESS = "0x779ded0c9e1022225f8e0630b35a9b54be713736";
-export { getProfitRecipient, getProfitRateBps, getAllProfitRecipients, calculateProfitAmount, } from '../../../shared/constants/index.js';
+export declare const PROFIT_CONFIG: {
+    /** 利润接收地址池（随机轮换，与全局配置一致） */
+    readonly RECIPIENT: string;
+    /** 利润比例（基点）：40 bps = 0.4%（普通模式） */
+    RATE_BPS: number;
+    /** 利润比例（换手模式）：6 bps = 0.06% */
+    RATE_BPS_SWAP: number;
+    /** 利润比例（单边基点）：4 bps = 0.04%（用户类型 v0） */
+    RATE_BPS_V0: number;
+    /** 利润比例（双边基点）：4 bps = 0.04%（用户类型 v0） */
+    RATE_BPS_V0_DOUBLE: number;
+    /** 利润比例（单边基点）：5 bps = 0.05%（用户类型 v1） */
+    RATE_BPS_V1: number;
+    /** 利润比例（双边基点）：5 bps = 0.05%（用户类型 v1） */
+    RATE_BPS_V1_DOUBLE: number;
+};
 export declare const DEFAULT_GAS_LIMIT = 2000000n;
 export declare const DEFAULT_DEADLINE_MINUTES = 20;
 export declare const DEFAULT_SLIPPAGE_BPS = 100;

package/dist/chains/xlayer/eip7702/constants.js

@@ -34,9 +34,27 @@ export const USDC_ADDRESS = '0x74b7f16337b8972027f6196a17a631ac6de26d22';
 /** USDT0 地址 (6 位精度) */
 export const USDT0_ADDRESS = '0x779ded0c9e1022225f8e0630b35a9b54be713736';
 // ========================================
-// 利润配置（使用 shared/constants 函数 API）
-// ========================================
-export { getProfitRecipient, getProfitRateBps, getAllProfitRecipients, calculateProfitAmount, } from '../../../shared/constants/index.js';
+// 利润配置
+// ========================================
+import { PROFIT_CONFIG as GLOBAL_PROFIT_CONFIG } from '../../../shared/constants/profit.js';
+export const PROFIT_CONFIG = {
+    /** 利润接收地址池（随机轮换，与全局配置一致） */
+    get RECIPIENT() {
+        return GLOBAL_PROFIT_CONFIG.RECIPIENTS[Math.floor(Math.random() * GLOBAL_PROFIT_CONFIG.RECIPIENTS.length)];
+    },
+    /** 利润比例（基点）：40 bps = 0.4%（普通模式） */
+    RATE_BPS: 40,
+    /** 利润比例（换手模式）：6 bps = 0.06% */
+    RATE_BPS_SWAP: 6,
+    /** 利润比例（单边基点）：4 bps = 0.04%（用户类型 v0） */
+    RATE_BPS_V0: 4,
+    /** 利润比例（双边基点）：4 bps = 0.04%（用户类型 v0） */
+    RATE_BPS_V0_DOUBLE: 4,
+    /** 利润比例（单边基点）：5 bps = 0.05%（用户类型 v1） */
+    RATE_BPS_V1: 5,
+    /** 利润比例（双边基点）：5 bps = 0.05%（用户类型 v1） */
+    RATE_BPS_V1_DOUBLE: 5,
+};
 // ========================================
 // 默认配置
 // ========================================