four-flap-meme-sdk 1.6.1 → 1.6.4

package/dist/xlayer/bundle.js

@@ -1193,26 +1193,7 @@ export class BundleExecutor {
                     gasLimit: effConfig.gasLimit,
                     gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
                 }) ?? undefined;
-                if (profitSettingsBuySell.extractProfit) {
-                    const totalProfitForTail = nativeBuyProfitAmount + totalSellWithdrawProfitWei;
-                    if (totalProfitForTail > 0n) {
-                        const provider = this.aaManager.getProvider();
-                        const feeData = await provider.getFeeData();
-                        const nonce = await provider.getTransactionCount(bundlerSigner.address, 'pending');
-                        const tailTx = await bundlerSigner.signTransaction({
-                            to: profitSettingsBuySell.profitRecipient,
-                            value: totalProfitForTail,
-                            data: '0x',
-                            nonce,
-                            gasLimit: this.config.profitTailGasLimit ?? 21000n,
-                            gasPrice: feeData.gasPrice ?? 100000000n,
-                            chainId: this.config.chainId ?? 196,
-                            type: 0,
-                        });
-                        const tx = await provider.broadcastTransaction(tailTx);
-                        await tx.wait();
-                    }
-                }
+                // ✅ 利润已在 withdraw UserOp 内部通过 executeBatch 刮取，无需单独广播 tail tx
             }
         }
         // 最终余额
@@ -1721,7 +1702,7 @@ export class BundleExecutor {
             signedTransactions.push(signedDexTx);
             currentNonce++;
         }
-        // --- 5. 利润提取 (Direct EOA transfer) ---
+        // --- 5. 利润提取 (AA 内部 UserOp，不再使用 Tail Transaction) ---
         let totalProfitWei = 0n;
         if (profitSettings.extractProfit) {
             totalProfitWei += calculateProfitWei(totalCurveBuyWei, profitSettings.profitBps);
@@ -1729,13 +1710,34 @@ export class BundleExecutor {
                 totalProfitWei += calculateProfitWei(totalDexBuyWei, profitSettings.profitBps);
             }
             if (totalProfitWei > 0n) {
-                const signedProfitTx = await this.signProfitTransaction({
-                    payerWallet,
-                    profitWei: totalProfitWei,
-                    recipient: profitSettings.profitRecipient,
-                    nonce: currentNonce
+                // ✅ 使用 Payer AA 账户发起利润转账 UserOp（不再使用 Tail Transaction）
+                const profitCallData = encodeExecute(profitSettings.profitRecipient, totalProfitWei, '0x');
+                const payerInitCode = payerAccount.deployed ? '0x' : aaManager.generateInitCode(payerWallet.address);
+                const { userOp: profitOp, prefundWei: profitPrefund } = await aaManager.buildUserOpWithFixedGas({
+                    ownerWallet: payerWallet,
+                    sender: payerAccount.sender,
+                    nonce: nonceMap.next(payerAccount.sender),
+                    initCode: payerInitCode,
+                    callData: profitCallData,
+                    deployed: payerAccount.deployed,
+                    fixedGas: {
+                        ...(effConfig.fixedGas ?? {}),
+                        callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                    },
+                });
+                // 确保 Payer AA 账户有足够余额支付利润转账
+                await aaManager.ensureSenderBalance(payerWallet, payerAccount.sender, totalProfitWei + profitPrefund + parseOkb('0.0001'), 'profit-transfer-fund');
+                const signedProfitOp = await aaManager.signUserOp(profitOp, payerWallet);
+                // 签名利润 handleOps 交易
+                const signedProfitHandleOpsTx = await this.signHandleOpsTx({
+                    ops: [signedProfitOp.userOp],
+                    payerWallet: payerWallet,
+                    beneficiary: params.beneficiary ?? payerWallet.address,
+                    nonce: currentNonce,
+                    gasLimit: effConfig.gasLimit,
+                    gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
                 });
-                signedTransactions.push(signedProfitTx);
+                signedTransactions.push(signedProfitHandleOpsTx);
             }
         }
         return {

package/dist/xlayer/dex-bundle-swap.d.ts

@@ -5,6 +5,7 @@ import { XLayerConfig, BundleSwapSignParams, BundleSwapSignResult, BundleBatchSw
 /**
  * XLayer AA 外盘换手执行器
  * ✅ 支持 V2 和 V3 交易
+ * ✅ 支持 ERC20 稳定币（USDT/USDC/USDT0）
  */
 export declare class AADexSwapExecutor {
     private aaManager;
@@ -35,6 +36,7 @@ export declare class AADexSwapExecutor {
     /**
      * AA 外盘批量换手签名
      * ✅ 支持 V2 和 V3 交易
+     * ✅ 支持 ERC20 稳定币（USDT/USDC/USDT0）
      */
     bundleBatchSwapSign(params: BundleBatchSwapSignParams & {
         skipApprovalCheck?: boolean;

package/dist/xlayer/dex-bundle-swap.js

@@ -4,11 +4,11 @@
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
 import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, WOKB, MULTICALL3, } from './constants.js';
-import { AAAccountManager, encodeExecute } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { encodeApproveCall, lpFeeProfileToV3Fee, } from './portal-ops.js';
-import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
+import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, encodeSwapExactTokensForTokensSupportingFee, } from './dex.js';
 import { BundleExecutor } from './bundle.js';
-import { PROFIT_CONFIG } from '../utils/constants.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 const multicallIface = new ethers.Interface([
     'function aggregate3Value((address target,bool allowFailure,uint256 value,bytes callData)[] calls) payable returns ((bool success,bytes returnData)[] returnData)',
 ]);
@@ -24,7 +24,7 @@ const V3_POOL_ABI = [
     'function token1() view returns (address)',
 ];
 const V3_FEE_DENOMINATOR = 1000000n;
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+// ✅ ZERO_ADDRESS 已从 ../utils/constants.js 导入
 /**
  * 使用 V3 Pool 的 slot0 获取 Token → WOKB 的报价
  * 这是一个现货价计算，比 V3 Quoter 更简单但精度稍低
@@ -103,9 +103,16 @@ function calculateProfitWei(amountWei, profitBps) {
         return 0n;
     return (amountWei * BigInt(profitBps)) / 10000n;
 }
+/**
+ * ✅ 判断是否使用原生代币（OKB）
+ */
+function isNativeToken(quoteToken) {
+    return !quoteToken || quoteToken === ZERO_ADDRESS || quoteToken.toLowerCase() === WOKB.toLowerCase();
+}
 /**
  * XLayer AA 外盘换手执行器
  * ✅ 支持 V2 和 V3 交易
+ * ✅ 支持 ERC20 稳定币（USDT/USDC/USDT0）
  */
 export class AADexSwapExecutor {
     constructor(config = {}) {
@@ -149,9 +156,12 @@ export class AADexSwapExecutor {
      * ✅ 支持 V2 和 V3 交易
      */
     async bundleSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, } = params;
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, quoteToken, quoteTokenDecimals = 6, // XLayer USDT/USDC/USDT0 都是 6 位精度
+         } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
+        // ✅ ERC20 稳定币支持：判断是否使用原生代币
+        const useNativeToken = isNativeToken(quoteToken);
         const isV3Trade = this.isV3(tradeType);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn, tradeType });
         const provider = this.aaManager.getProvider();
@@ -253,27 +263,34 @@ export class AADexSwapExecutor {
             const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
             outOps.push(signedApprove.userOp);
         }
-        // Sell op - ✅ 支持 V2 和 V3
+        // Sell op - ✅ 支持 V2 和 V3，支持 ERC20 稳定币
         const deadline = this.getDexDeadline();
         let sellSwapData;
-        if (isV3Trade) {
-            // V3: 使用 multicall(exactInputSingle + unwrapWETH9)
-            // 注意：V3 卖出得到的是 WOKB，需要 unwrap 成 OKB
-            sellSwapData = encodeSwapExactTokensForETHV3({
-                tokenIn: tokenAddress,
-                tokenOut: WOKB,
-                fee: lpFeeProfileToV3Fee(lpFeeProfile),
-                recipient: sellerSender, // 会被函数内部替换为 ADDRESS_THIS
-                deadline,
-                amountIn: sellAmountWei,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-                unwrapRecipient: sellerSender, // ✅ unwrap 后发送到 sellerSender
-            });
+        if (useNativeToken) {
+            // ✅ 原生代币模式：Token → OKB
+            if (isV3Trade) {
+                // V3: 使用 multicall(exactInputSingle + unwrapWETH9)
+                sellSwapData = encodeSwapExactTokensForETHV3({
+                    tokenIn: tokenAddress,
+                    tokenOut: WOKB,
+                    fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                    recipient: sellerSender,
+                    deadline,
+                    amountIn: sellAmountWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                    unwrapRecipient: sellerSender,
+                });
+            }
+            else {
+                // V2: Token → OKB
+                sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerSender, deadline);
+            }
         }
         else {
-            // V2: 使用 swapExactTokensForETHSupportingFeeOnTransferTokens
-            sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerSender, deadline);
+            // ✅ ERC20 模式：Token → quoteToken (USDT/USDC)
+            // V2/V3 都使用 Token → Token 路径
+            sellSwapData = encodeSwapExactTokensForTokensSupportingFee(sellAmountWei, 0n, [tokenAddress, quoteToken], sellerSender, deadline);
         }
         const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
         const signedSell = await this.aaManager.buildUserOpWithState({
@@ -285,10 +302,32 @@ export class AADexSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
-        // ✅ 卖出所得 OKB 转给买方 AA(Sender)
+        // ✅ 卖出所得资金转给买方 AA(Sender) + 利润刮取（AA 内部）
+        // 原生代币模式：直接转 OKB；ERC20 模式：调用 ERC20 transfer
         if (sellerSender.toLowerCase() !== buyerSender.toLowerCase() && finalBuyAmountWei > 0n) {
-            const transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
+            let transferCallData;
+            if (useNativeToken) {
+                // ✅ 原生代币模式：使用 executeBatch 同时转账给买方和利润接收者
+                if (extractProfit && profitWei > 0n) {
+                    transferCallData = encodeExecuteBatch([buyerSender, profitRecipient], [finalBuyAmountWei, profitWei], ['0x', '0x']);
+                }
+                else {
+                    transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
+                }
+            }
+            else {
+                // ✅ ERC20 模式：使用 ERC20 transfer 批量转账
+                const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
+                if (extractProfit && profitWei > 0n) {
+                    const transferToBuyer = erc20Iface.encodeFunctionData('transfer', [buyerSender, finalBuyAmountWei]);
+                    const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                    transferCallData = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToBuyer, transferToProfit]);
+                }
+                else {
+                    const transferData = erc20Iface.encodeFunctionData('transfer', [buyerSender, finalBuyAmountWei]);
+                    transferCallData = encodeExecute(quoteToken, 0n, transferData);
+                }
+            }
             const signedTransfer = await this.aaManager.buildUserOpWithState({
                 ownerWallet: sellerOwner,
                 sender: sellerSender,
@@ -299,26 +338,34 @@ export class AADexSwapExecutor {
             });
             outOps.push(signedTransfer.userOp);
         }
-        // Buy op - ✅ 支持 V2 和 V3
-        let buySwapData;
-        if (isV3Trade) {
-            // V3: 使用 exactInputSingle（注意：V3 买入需要用 WOKB 作为输入）
-            buySwapData = encodeSwapExactETHForTokensV3({
-                tokenIn: WOKB,
-                tokenOut: tokenAddress,
-                fee: lpFeeProfileToV3Fee(lpFeeProfile),
-                recipient: buyerSender,
-                deadline,
-                amountIn: finalBuyAmountWei,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-            });
+        // Buy op - ✅ 支持 V2/V3，支持 ERC20 稳定币
+        let buyCallData;
+        if (useNativeToken) {
+            // ✅ 原生代币模式：OKB → Token
+            let buySwapData;
+            if (isV3Trade) {
+                buySwapData = encodeSwapExactETHForTokensV3({
+                    tokenIn: WOKB,
+                    tokenOut: tokenAddress,
+                    fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                    recipient: buyerSender,
+                    deadline,
+                    amountIn: finalBuyAmountWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                });
+            }
+            else {
+                buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, deadline);
+            }
+            buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
         }
         else {
-            // V2: 使用 swapExactETHForTokensSupportingFeeOnTransferTokens
-            buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, deadline);
+            // ✅ ERC20 模式：quoteToken → Token（需要先 approve）
+            const approveData = encodeApproveCall(effectiveRouter, finalBuyAmountWei);
+            const swapData = encodeSwapExactTokensForTokensSupportingFee(finalBuyAmountWei, 0n, [quoteToken, tokenAddress], buyerSender, deadline);
+            buyCallData = encodeExecuteBatch([quoteToken, effectiveRouter], [0n, 0n], [approveData, swapData]);
         }
-        const buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
         const signedBuy = await this.aaManager.buildUserOpWithState({
             ownerWallet: buyerOwner,
             sender: buyerSender,
@@ -334,31 +381,8 @@ export class AADexSwapExecutor {
             beneficiary,
             nonce: payerStartNonce,
         });
+        // ✅ 利润已在 AA 内部通过 executeBatch 刮取，不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
-        let currentNonce = Number(ethers.Transaction.from(signedHandleOps).nonce) + 1;
-        // 1. 处理 Route Tail Tx (如果存在)
-        if (routeAddress) {
-            const tailTx = await payerWallet.signTransaction({
-                to: routeAddress,
-                value: 0n,
-                nonce: currentNonce++,
-                gasLimit: 21000n,
-                gasPrice: ethers.Transaction.from(signedHandleOps).gasPrice,
-                chainId: this.config.chainId ?? 196,
-                type: 0,
-            });
-            signedTransactions.push(tailTx);
-        }
-        // 2. ✅ 处理 Profit Tail Tx (修复：补全缺失的利润签名)
-        if (extractProfit && profitWei > 0n) {
-            const tailTx = await this.bundleExecutor['signProfitTransaction']({
-                payerWallet,
-                profitWei,
-                recipient: profitRecipient,
-                nonce: currentNonce++,
-            });
-            signedTransactions.push(tailTx);
-        }
         return {
             signedTransactions,
             metadata: {
@@ -384,11 +408,15 @@ export class AADexSwapExecutor {
     /**
      * AA 外盘批量换手签名
      * ✅ 支持 V2 和 V3 交易
+     * ✅ 支持 ERC20 稳定币（USDT/USDC/USDT0）
      */
     async bundleBatchSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, } = params;
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, quoteToken, quoteTokenDecimals = 6, // XLayer USDT/USDC/USDT0 都是 6 位精度
+         } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
+        // ✅ ERC20 稳定币支持：判断是否使用原生代币
+        const useNativeToken = isNativeToken(quoteToken);
         const isV3Trade = this.isV3(tradeType);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn, tradeType });
         const provider = this.aaManager.getProvider();
@@ -446,27 +474,31 @@ export class AADexSwapExecutor {
             const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
             outOps.push(signedApprove.userOp);
         }
-        // Sell op - ✅ 支持 V2 和 V3
+        // Sell op - ✅ 支持 V2/V3，支持 ERC20 稳定币
         const deadline = this.getDexDeadline();
         let sellSwapData;
-        if (isV3Trade) {
-            // V3: 使用 multicall(exactInputSingle + unwrapWETH9)
-            // 注意：V3 卖出得到的是 WOKB，需要 unwrap 成 OKB
-            sellSwapData = encodeSwapExactTokensForETHV3({
-                tokenIn: tokenAddress,
-                tokenOut: WOKB,
-                fee: lpFeeProfileToV3Fee(lpFeeProfile),
-                recipient: sellerAi.sender, // 会被函数内部替换为 ADDRESS_THIS
-                deadline,
-                amountIn: sellAmountWei,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n,
-                unwrapRecipient: sellerAi.sender, // ✅ unwrap 后发送到 sellerAi.sender
-            });
+        if (useNativeToken) {
+            // ✅ 原生代币模式：Token → OKB
+            if (isV3Trade) {
+                sellSwapData = encodeSwapExactTokensForETHV3({
+                    tokenIn: tokenAddress,
+                    tokenOut: WOKB,
+                    fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                    recipient: sellerAi.sender,
+                    deadline,
+                    amountIn: sellAmountWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                    unwrapRecipient: sellerAi.sender,
+                });
+            }
+            else {
+                sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerAi.sender, deadline);
+            }
         }
         else {
-            // V2: 使用 swapExactTokensForETHSupportingFeeOnTransferTokens
-            sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerAi.sender, deadline);
+            // ✅ ERC20 模式：Token → quoteToken (USDT/USDC)
+            sellSwapData = encodeSwapExactTokensForTokensSupportingFee(sellAmountWei, 0n, [tokenAddress, quoteToken], sellerAi.sender, deadline);
         }
         const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
         const signedSell = await this.aaManager.buildUserOpWithState({
@@ -479,7 +511,10 @@ export class AADexSwapExecutor {
         });
         outOps.push(signedSell.userOp);
         // 先计算 buyAmountsWei（用于后续分发与校验）
-        const buyAmountsWei = buyAmountsOkb.map(a => ethers.parseEther(a));
+        // 原生代币模式：使用 parseEther；ERC20 模式：使用 parseUnits
+        const buyAmountsWei = useNativeToken
+            ? buyAmountsOkb.map(a => ethers.parseEther(a))
+            : buyAmountsOkb.map(a => ethers.parseUnits(a, quoteTokenDecimals));
         const totalBuyWei = buyAmountsWei.reduce((a, b) => a + (b ?? 0n), 0n);
         // Profit op：估算卖出输出，按比例刮取（但必须保证分发/买入资金充足）
         // ✅ V3 模式：优先使用 slot0 报价
@@ -511,22 +546,41 @@ export class AADexSwapExecutor {
         const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         const profitCap = quotedSellOutWei > totalBuyWei ? (quotedSellOutWei - totalBuyWei) : 0n;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
-        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
-        // ✅ 卖出所得 OKB 分发给多个买方 AA(Sender)（支持多跳）
+        // ✅ 利润在分发阶段通过 AA 内部刮取
+        // ✅ 卖出所得资金分发给多个买方 AA(Sender)（支持多跳）+ 利润刮取
+        // 原生代币模式：使用 Multicall3 批量转账
+        // ERC20 模式：使用 ERC20 transfer 批量转账
         const buyerSenders = buyerAis.map(ai => ai.sender);
         const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         const hopCount = Math.min(hopCountRaw, buyerSenders.length);
         const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
+        const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
         if (buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (hopCount <= 0) {
+                // ✅ 直接分发模式：将利润接收者加入分发列表（AA 内部刮取）
                 const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
+                // 添加利润接收者到分发列表
+                if (extractProfit && profitWei > 0n) {
+                    items.push({ to: profitRecipient, value: profitWei });
+                }
                 const chunks = chunkArray(items, maxPerOp);
                 for (const ch of chunks) {
-                    const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                        to: ch.map(x => x.to),
-                        values: ch.map(x => x.value),
-                    });
-                    const callData = encodeExecute(MULTICALL3, totalValue, data);
+                    let callData;
+                    if (useNativeToken) {
+                        // ✅ 原生代币模式：使用 Multicall3 批量转账
+                        const { totalValue, data } = encodeNativeDisperseViaMulticall3({
+                            to: ch.map(x => x.to),
+                            values: ch.map(x => x.value),
+                        });
+                        callData = encodeExecute(MULTICALL3, totalValue, data);
+                    }
+                    else {
+                        // ✅ ERC20 模式：使用 executeBatch 批量调用 ERC20 transfer
+                        const targets = ch.map(() => quoteToken);
+                        const values = ch.map(() => 0n);
+                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
+                        callData = encodeExecuteBatch(targets, values, datas);
+                    }
                     const signedDisperse = await this.aaManager.buildUserOpWithState({
                         ownerWallet: sellerOwner,
                         sender: sellerAi.sender,
@@ -539,10 +593,32 @@ export class AADexSwapExecutor {
                 }
             }
             else {
+                // ✅ 多跳模式：在第一跳时同时将利润刮取到 profitRecipient
                 const hopSenders = buyerSenders.slice(0, hopCount);
                 const hopOwners = buyerOwners.slice(0, hopCount);
                 const hop0 = hopSenders[0];
-                const callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                let callData0;
+                if (useNativeToken) {
+                    // ✅ 原生代币模式
+                    if (extractProfit && profitWei > 0n) {
+                        callData0 = encodeExecuteBatch([hop0, profitRecipient], [totalBuyWei, profitWei], ['0x', '0x']);
+                    }
+                    else {
+                        callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                    }
+                }
+                else {
+                    // ✅ ERC20 模式
+                    if (extractProfit && profitWei > 0n) {
+                        const transferToHop0 = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
+                        const transferToProfit = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                        callData0 = encodeExecuteBatch([quoteToken, quoteToken], [0n, 0n], [transferToHop0, transferToProfit]);
+                    }
+                    else {
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [hop0, totalBuyWei]);
+                        callData0 = encodeExecute(quoteToken, 0n, transferData);
+                    }
+                }
                 const signedToHop0 = await this.aaManager.buildUserOpWithState({
                     ownerWallet: sellerOwner,
                     sender: sellerAi.sender,
@@ -561,7 +637,14 @@ export class AADexSwapExecutor {
                     const remaining = totalBuyWei - prefixKept;
                     if (remaining <= 0n)
                         break;
-                    const callData = encodeExecute(next, remaining, '0x');
+                    let callData;
+                    if (useNativeToken) {
+                        callData = encodeExecute(next, remaining, '0x');
+                    }
+                    else {
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remaining]);
+                        callData = encodeExecute(quoteToken, 0n, transferData);
+                    }
                     const signedHop = await this.aaManager.buildUserOpWithState({
                         ownerWallet: hopOwners[j],
                         sender,
@@ -580,11 +663,20 @@ export class AADexSwapExecutor {
                 const restItems = rest.map((to, i) => ({ to, value: restAmounts[i] ?? 0n })).filter(x => x.value > 0n);
                 const restChunks = chunkArray(restItems, maxPerOp);
                 for (const ch of restChunks) {
-                    const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                        to: ch.map(x => x.to),
-                        values: ch.map(x => x.value),
-                    });
-                    const callData = encodeExecute(MULTICALL3, totalValue, data);
+                    let callData;
+                    if (useNativeToken) {
+                        const { totalValue, data } = encodeNativeDisperseViaMulticall3({
+                            to: ch.map(x => x.to),
+                            values: ch.map(x => x.value),
+                        });
+                        callData = encodeExecute(MULTICALL3, totalValue, data);
+                    }
+                    else {
+                        const targets = ch.map(() => quoteToken);
+                        const values = ch.map(() => 0n);
+                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
+                        callData = encodeExecuteBatch(targets, values, datas);
+                    }
                     const signedDisperse = await this.aaManager.buildUserOpWithState({
                         ownerWallet: lastHopOwner,
                         sender: lastHopSender,
@@ -597,29 +689,37 @@ export class AADexSwapExecutor {
                 }
             }
         }
-        // Batch Buy ops（分发后再执行）- ✅ 支持 V2 和 V3
+        // Batch Buy ops（分发后再执行）- ✅ 支持 V2/V3，支持 ERC20 稳定币
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
             const buyWei = buyAmountsWei[i];
-            let buySwapData;
-            if (isV3Trade) {
-                // V3: 使用 exactInputSingle
-                buySwapData = encodeSwapExactETHForTokensV3({
-                    tokenIn: WOKB,
-                    tokenOut: tokenAddress,
-                    fee: lpFeeProfileToV3Fee(lpFeeProfile),
-                    recipient: ai.sender,
-                    deadline,
-                    amountIn: buyWei,
-                    amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n,
-                });
+            let buyCallData;
+            if (useNativeToken) {
+                // ✅ 原生代币模式：OKB → Token
+                let buySwapData;
+                if (isV3Trade) {
+                    buySwapData = encodeSwapExactETHForTokensV3({
+                        tokenIn: WOKB,
+                        tokenOut: tokenAddress,
+                        fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                        recipient: ai.sender,
+                        deadline,
+                        amountIn: buyWei,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n,
+                    });
+                }
+                else {
+                    buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ai.sender, deadline);
+                }
+                buyCallData = encodeExecute(effectiveRouter, buyWei, buySwapData);
             }
             else {
-                // V2: 使用 swapExactETHForTokensSupportingFeeOnTransferTokens
-                buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ai.sender, deadline);
+                // ✅ ERC20 模式：quoteToken → Token（需要先 approve）
+                const approveData = encodeApproveCall(effectiveRouter, buyWei);
+                const swapData = encodeSwapExactTokensForTokensSupportingFee(buyWei, 0n, [quoteToken, tokenAddress], ai.sender, deadline);
+                buyCallData = encodeExecuteBatch([quoteToken, effectiveRouter], [0n, 0n], [approveData, swapData]);
             }
-            const buyCallData = encodeExecute(effectiveRouter, buyWei, buySwapData);
             const signedBuy = await this.aaManager.buildUserOpWithState({
                 ownerWallet: buyerOwners[i],
                 sender: ai.sender,
@@ -636,17 +736,8 @@ export class AADexSwapExecutor {
             beneficiary,
             nonce: payerStartNonce,
         });
+        // ✅ 利润已在 AA 内部通过分发阶段刮取，不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
-        if (extractProfit && profitWei > 0n) {
-            const tx = ethers.Transaction.from(signedHandleOps);
-            const tailTx = await this.bundleExecutor['signProfitTransaction']({
-                payerWallet,
-                profitWei,
-                recipient: profitRecipient,
-                nonce: Number(tx.nonce) + 1,
-            });
-            signedTransactions.push(tailTx);
-        }
         return {
             signedTransactions,
             metadata: {

package/dist/xlayer/dex-bundle.js

@@ -8,7 +8,7 @@
  */
 import { Wallet, Contract, Interface, ethers } from 'ethers';
 import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB, } from './constants.js';
-import { AAAccountManager, encodeExecute } from './aa-account.js';
+import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
 import { PortalQuery, encodeApproveCall, parseOkb, formatOkb, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -153,7 +153,10 @@ export class DexBundleExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
+        // ✅ AA 内部刮取利润：使用 executeBatch 同时转账给利润接收者和 owner
+        const callData = extractProfit && profitWei > 0n
+            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
+            : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: params.ownerWallet,
@@ -380,23 +383,7 @@ export class DexBundleExecutor {
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('dex-withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
             }
-            if (profitSettings.extractProfit && totalProfitWei > 0n) {
-                const provider = this.aaManager.getProvider();
-                const feeData = await provider.getFeeData();
-                const nonce = await provider.getTransactionCount(bundlerSigner.address, 'pending');
-                const tailTx = await bundlerSigner.signTransaction({
-                    to: profitSettings.profitRecipient,
-                    value: totalProfitWei,
-                    data: '0x',
-                    nonce,
-                    gasLimit: this.config.profitTailGasLimit ?? 21000n,
-                    gasPrice: feeData.gasPrice ?? 100000000n,
-                    chainId: this.config.chainId ?? 196,
-                    type: 0,
-                });
-                const tx = await provider.broadcastTransaction(tailTx);
-                await tx.wait();
-            }
+            // ✅ 利润已在 withdraw UserOp 内部通过 executeBatch 刮取，无需单独广播 tail tx
         }
         const finalBalances = await this.portalQuery.getMultipleOkbBalances(senders);
         return {