four-flap-meme-sdk 1.5.32 → 1.5.34

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

@@ -3,15 +3,37 @@
  */
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
-import { POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
+import { POTATOSWAP_V2_ROUTER, WOKB, MULTICALL3, } from './constants.js';
 import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { encodeApproveCall, } from './portal-ops.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, } from './dex.js';
 import { BundleExecutor } from './bundle.js';
 import { PROFIT_CONFIG } 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)',
+]);
+function chunkArray(arr, size) {
+    const out = [];
+    const n = Math.max(1, Math.floor(size));
+    for (let i = 0; i < arr.length; i += n)
+        out.push(arr.slice(i, i + n));
+    return out;
+}
+function encodeNativeDisperseViaMulticall3(params) {
+    const calls = params.to.map((target, idx) => ({
+        target,
+        allowFailure: false,
+        value: params.values[idx] ?? 0n,
+        callData: '0x',
+    }));
+    const totalValue = params.values.reduce((a, b) => a + (b ?? 0n), 0n);
+    const data = multicallIface.encodeFunctionData('aggregate3Value', [calls]);
+    return { totalValue, data };
+}
 function resolveProfitSettings(config) {
     const extractProfit = config?.extractProfit !== false; // 默认 true（对齐 BSC）
-    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS;
+    // ✅ 对齐 BSC “捆绑换手模式”默认费率
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS_SWAP;
     const profitBps = Math.max(0, Math.min(10000, Number(profitBpsRaw)));
     const profitRecipient = config?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT;
     return { extractProfit, profitBps, profitRecipient };
@@ -54,7 +76,7 @@ export class AADexSwapExecutor {
      * AA 外盘单钱包换手签名
      */
     async bundleSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
@@ -101,16 +123,7 @@ export class AADexSwapExecutor {
             const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerSender, effectiveRouter);
             needApprove = allowance < sellAmountWei;
         }
-        // 报价
-        let finalBuyAmountWei;
-        if (buyAmountOkb) {
-            finalBuyAmountWei = ethers.parseEther(String(buyAmountOkb));
-        }
-        else {
-            const quoted = await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
-            finalBuyAmountWei = (quoted * BigInt(10000 - slippageBps)) / 10000n;
-        }
-        // 用 quoteTokenToOkb 估算卖出输出（用于利润提取）
+        // 估算卖出输出（用于利润提取与 buy 预算）
         const quotedSellOutWei = await (async () => {
             try {
                 return await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
@@ -119,7 +132,18 @@ export class AADexSwapExecutor {
                 return 0n;
             }
         })();
-        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        // buyAmount：若未传则按 quotedSellOut 计算；利润从 quotedSellOut 中刮取，但要保证买入资金充足
+        const requestedBuyWei = buyAmountOkb
+            ? ethers.parseEther(String(buyAmountOkb))
+            : (quotedSellOutWei * BigInt(10000 - slippageBps)) / 10000n;
+        if (quotedSellOutWei > 0n && requestedBuyWei > quotedSellOutWei) {
+            throw new Error('AA 捆绑换手：buyAmountOkb 超过预估卖出输出（quotedSellOut）');
+        }
+        const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        const profitCap = quotedSellOutWei > requestedBuyWei ? (quotedSellOutWei - requestedBuyWei) : 0n;
+        const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
+        const finalBuyAmountWei = requestedBuyWei;
+        const hopCount = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         const outOps = [];
         if (needApprove) {
             const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
@@ -158,6 +182,19 @@ export class AADexSwapExecutor {
             });
             outOps.push(signedProfit.userOp);
         }
+        // ✅ 卖出所得 OKB 转给买方 AA(Sender)
+        if (sellerSender.toLowerCase() !== buyerSender.toLowerCase() && finalBuyAmountWei > 0n) {
+            const transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
+            const signedTransfer = await this.aaManager.buildUserOpWithState({
+                ownerWallet: sellerOwner,
+                sender: sellerSender,
+                nonce: nonceMap.next(sellerSender),
+                initCode: consumeInitCode(sellerSender),
+                callData: transferCallData,
+                signOnly: true,
+            });
+            outOps.push(signedTransfer.userOp);
+        }
         // Buy op
         const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, getDexDeadline());
         const buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
@@ -208,6 +245,7 @@ export class AADexSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }
@@ -215,7 +253,7 @@ export class AADexSwapExecutor {
      * AA 外盘批量换手签名
      */
     async bundleBatchSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
@@ -286,7 +324,10 @@ export class AADexSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Profit op：估算卖出输出，按比例刮取
+        // 先计算 buyAmountsWei（用于后续分发与校验）
+        const buyAmountsWei = buyAmountsOkb.map(a => ethers.parseEther(a));
+        const totalBuyWei = buyAmountsWei.reduce((a, b) => a + (b ?? 0n), 0n);
+        // Profit op：估算卖出输出，按比例刮取（但必须保证分发/买入资金充足）
         const quotedSellOutWei = await (async () => {
             try {
                 return await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
@@ -295,7 +336,12 @@ export class AADexSwapExecutor {
                 return 0n;
             }
         })();
-        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        if (quotedSellOutWei > 0n && totalBuyWei > quotedSellOutWei) {
+            throw new Error('AA 批量换手：buyAmountsOkb 总和超过预估卖出输出（quotedSellOut）');
+        }
+        const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        const profitCap = quotedSellOutWei > totalBuyWei ? (quotedSellOutWei - totalBuyWei) : 0n;
+        const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
         if (extractProfit && profitWei > 0n) {
             const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
             const signedProfit = await this.aaManager.buildUserOpWithState({
@@ -308,8 +354,92 @@ export class AADexSwapExecutor {
             });
             outOps.push(signedProfit.userOp);
         }
-        // Batch Buy ops
-        const buyAmountsWei = buyAmountsOkb.map(a => ethers.parseEther(a));
+        // ✅ 卖出所得 OKB 分发给多个买方 AA(Sender)（支持多跳）
+        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)));
+        if (buyerSenders.length > 0 && totalBuyWei > 0n) {
+            if (hopCount <= 0) {
+                const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
+                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);
+                    const signedDisperse = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: sellerOwner,
+                        sender: sellerAi.sender,
+                        nonce: nonceMap.next(sellerAi.sender),
+                        initCode: consumeInitCode(sellerAi.sender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedDisperse.userOp);
+                }
+            }
+            else {
+                const hopSenders = buyerSenders.slice(0, hopCount);
+                const hopOwners = buyerOwners.slice(0, hopCount);
+                const hop0 = hopSenders[0];
+                const callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                const signedToHop0 = await this.aaManager.buildUserOpWithState({
+                    ownerWallet: sellerOwner,
+                    sender: sellerAi.sender,
+                    nonce: nonceMap.next(sellerAi.sender),
+                    initCode: consumeInitCode(sellerAi.sender),
+                    callData: callData0,
+                    signOnly: true,
+                });
+                outOps.push(signedToHop0.userOp);
+                let prefixKept = 0n;
+                for (let j = 0; j < hopSenders.length - 1; j++) {
+                    const sender = hopSenders[j];
+                    const next = hopSenders[j + 1];
+                    const keep = buyAmountsWei[j] ?? 0n;
+                    prefixKept += keep;
+                    const remaining = totalBuyWei - prefixKept;
+                    if (remaining <= 0n)
+                        break;
+                    const callData = encodeExecute(next, remaining, '0x');
+                    const signedHop = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: hopOwners[j],
+                        sender,
+                        nonce: nonceMap.next(sender),
+                        initCode: consumeInitCode(sender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedHop.userOp);
+                }
+                const lastHopIdx = hopSenders.length - 1;
+                const lastHopSender = hopSenders[lastHopIdx];
+                const lastHopOwner = hopOwners[lastHopIdx];
+                const rest = buyerSenders.slice(hopSenders.length);
+                const restAmounts = buyAmountsWei.slice(hopSenders.length);
+                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);
+                    const signedDisperse = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: lastHopOwner,
+                        sender: lastHopSender,
+                        nonce: nonceMap.next(lastHopSender),
+                        initCode: consumeInitCode(lastHopSender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedDisperse.userOp);
+                }
+            }
+        }
+        // Batch Buy ops（分发后再执行）
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
             const buyWei = buyAmountsWei[i];
@@ -363,6 +493,7 @@ export class AADexSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }

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

@@ -0,0 +1,42 @@
+/**
+ * XLayer 外盘（PotatoSwap/DEX）捆绑交易 SDK（AA / ERC-4337）
+ *
+ * 目标：对齐内盘 `bundle.ts` 的能力，但 Router/报价/授权逻辑走 DEX。
+ * - 捆绑买卖（买入 ->（可选授权）-> 卖出 ->（可选归集））
+ * - 自动归集 OKB 到 owner
+ * - ✅ 支持“刮取利润”：在归集时从可转出金额中按 bps 拆分转到 PROFIT_CONFIG.RECIPIENT
+ */
+import type { XLayerConfig, BundleBuySellResult, BundleBuySellParams } from './types.js';
+export interface DexBundleConfig extends XLayerConfig {
+    dexKey?: string;
+    routerAddress?: string;
+    deadlineMinutes?: number;
+}
+export interface DexBundleBuySellParams extends BundleBuySellParams {
+    dexKey?: string;
+    routerAddress?: string;
+    deadlineMinutes?: number;
+}
+/**
+ * 外盘捆绑交易执行器
+ */
+export declare class DexBundleExecutor {
+    private aaManager;
+    private portalQuery;
+    private dexQuery;
+    private config;
+    constructor(config?: DexBundleConfig);
+    private getEffectiveRouter;
+    private getDeadlineMinutes;
+    /**
+     * 执行 handleOps 并解析结果
+     */
+    private runHandleOps;
+    private buildWithdrawUserOpWithState;
+    /**
+     * 外盘捆绑买卖（先买后卖）
+     */
+    bundleBuySell(params: DexBundleBuySellParams): Promise<BundleBuySellResult>;
+}
+export declare function createDexBundleExecutor(config?: DexBundleConfig): DexBundleExecutor;
+export declare function dexBundleBuySell(params: DexBundleBuySellParams): Promise<BundleBuySellResult>;

package/dist/xlayer/dex-bundle.js

@@ -0,0 +1,378 @@
+/**
+ * XLayer 外盘（PotatoSwap/DEX）捆绑交易 SDK（AA / ERC-4337）
+ *
+ * 目标：对齐内盘 `bundle.ts` 的能力，但 Router/报价/授权逻辑走 DEX。
+ * - 捆绑买卖（买入 ->（可选授权）-> 卖出 ->（可选归集））
+ * - 自动归集 OKB 到 owner
+ * - ✅ 支持“刮取利润”：在归集时从可转出金额中按 bps 拆分转到 PROFIT_CONFIG.RECIPIENT
+ */
+import { Wallet, Contract, Interface, ethers } from 'ethers';
+import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
+import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
+import { PortalQuery, encodeApproveCall, parseOkb, formatOkb } from './portal-ops.js';
+import { mapWithConcurrency } from '../utils/concurrency.js';
+import { PROFIT_CONFIG } from '../utils/constants.js';
+import { AANonceMap } from './types.js';
+function getDexDeadline(minutes = 20) {
+    return Math.floor(Date.now() / 1000) + minutes * 60;
+}
+function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false; // 默认 true
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS_SWAP;
+    const profitBps = Math.max(0, Math.min(10000, Number(profitBpsRaw)));
+    const profitRecipient = config?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT;
+    return { extractProfit, profitBps, profitRecipient };
+}
+function calculateProfitWei(amountWei, profitBps) {
+    if (amountWei <= 0n)
+        return 0n;
+    if (!Number.isFinite(profitBps) || profitBps <= 0)
+        return 0n;
+    return (amountWei * BigInt(profitBps)) / 10000n;
+}
+// 固定 gas（用于大规模减少 RPC）；具体值允许通过 config.fixedGas 覆盖
+const DEFAULT_CALL_GAS_LIMIT_BUY = DEFAULT_CALL_GAS_LIMIT_SELL;
+const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
+const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
+/**
+ * 外盘捆绑交易执行器
+ */
+export class DexBundleExecutor {
+    constructor(config = {}) {
+        this.config = config;
+        this.aaManager = new AAAccountManager(config);
+        this.portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
+        this.dexQuery = new DexQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId, routerAddress: config.routerAddress });
+    }
+    getEffectiveRouter(params) {
+        if (params.routerAddress)
+            return params.routerAddress;
+        if (params.dexKey === 'DYORSWAP') {
+            return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
+        }
+        return POTATOSWAP_V2_ROUTER;
+    }
+    getDeadlineMinutes(params) {
+        return params.deadlineMinutes ?? this.config.deadlineMinutes ?? 20;
+    }
+    /**
+     * 执行 handleOps 并解析结果
+     */
+    async runHandleOps(label, ops, bundlerSigner, beneficiary) {
+        if (ops.length === 0) {
+            console.log(`\n[${label}] 没有 ops，跳过`);
+            return null;
+        }
+        const provider = this.aaManager.getProvider();
+        const entryPointAddress = this.aaManager.getEntryPointAddress();
+        const feeData = await provider.getFeeData();
+        console.log(`\n[${label}] 发送 handleOps，ops=${ops.length} ...`);
+        const entryPointWithSigner = new Contract(entryPointAddress, ENTRYPOINT_ABI, bundlerSigner);
+        const tx = await entryPointWithSigner.handleOps(ops, beneficiary, { gasPrice: feeData.gasPrice ?? 100000000n });
+        console.log(`[${label}] txHash:`, tx.hash);
+        const receipt = await tx.wait();
+        console.log(`[${label}] mined block=${receipt.blockNumber} status=${receipt.status}`);
+        const epIface = new Interface(ENTRYPOINT_ABI);
+        const userOpEvents = [];
+        for (const log of receipt.logs) {
+            try {
+                const parsed = epIface.parseLog(log);
+                if (parsed?.name === 'UserOperationEvent') {
+                    const e = parsed.args;
+                    userOpEvents.push({
+                        userOpHash: e.userOpHash,
+                        sender: e.sender,
+                        paymaster: e.paymaster,
+                        success: e.success,
+                        actualGasCost: e.actualGasCost,
+                        actualGasUsed: e.actualGasUsed,
+                    });
+                }
+            }
+            catch { }
+        }
+        return {
+            txHash: tx.hash,
+            blockNumber: receipt.blockNumber,
+            status: receipt.status,
+            userOpEvents,
+        };
+    }
+    async buildWithdrawUserOpWithState(params) {
+        const senderBalance = params.senderBalance;
+        if (senderBalance <= params.reserveWei) {
+            console.log(`\n[${params.ownerName ?? 'owner'}] sender OKB 太少，跳过归集：${formatOkb(senderBalance)} OKB`);
+            return null;
+        }
+        // 先估算 prefund（使用空调用）
+        const tempCallData = encodeExecute(params.ownerWallet.address, 0n, '0x');
+        if (!params.signOnly) {
+            await this.aaManager.ensureSenderBalance(params.ownerWallet, params.sender, parseOkb('0.0002'), `${params.ownerName ?? 'owner'}/withdraw-prefund`);
+        }
+        const effConfig = { ...(this.config ?? {}), ...(params.configOverride ?? {}) };
+        const gasPolicyRaw = effConfig.gasPolicy ?? 'bundlerEstimate';
+        const gasPolicy = params.signOnly && gasPolicyRaw === 'bundlerEstimate' ? 'fixed' : gasPolicyRaw;
+        const { prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: params.ownerWallet,
+                sender: params.sender,
+                callData: tempCallData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+                deployed: params.initCode === '0x',
+                fixedGas: {
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            })
+            : gasPolicy === 'localEstimate'
+                ? await this.aaManager.buildUserOpWithLocalEstimate({
+                    ownerWallet: params.ownerWallet,
+                    sender: params.sender,
+                    callData: tempCallData,
+                    nonce: params.nonce,
+                    initCode: params.initCode,
+                })
+                : await this.aaManager.buildUserOpWithBundlerEstimate({
+                    ownerWallet: params.ownerWallet,
+                    sender: params.sender,
+                    callData: tempCallData,
+                    nonce: params.nonce,
+                    initCode: params.initCode,
+                });
+        const withdrawAmount = senderBalance > prefundWei + params.reserveWei
+            ? senderBalance - prefundWei - params.reserveWei
+            : 0n;
+        if (withdrawAmount <= 0n) {
+            console.log(`\n[${params.ownerName ?? 'owner'}] 归集后可转出=0（余额不足以覆盖 prefund+reserve）`);
+            return null;
+        }
+        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
+        const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
+        const toOwnerWei = withdrawAmount - profitWei;
+        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,
+                sender: params.sender,
+                callData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+                deployed: params.initCode === '0x',
+                fixedGas: {
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            })
+            : gasPolicy === 'localEstimate'
+                ? await this.aaManager.buildUserOpWithLocalEstimate({
+                    ownerWallet: params.ownerWallet,
+                    sender: params.sender,
+                    callData,
+                    nonce: params.nonce,
+                    initCode: params.initCode,
+                })
+                : await this.aaManager.buildUserOpWithBundlerEstimate({
+                    ownerWallet: params.ownerWallet,
+                    sender: params.sender,
+                    callData,
+                    nonce: params.nonce,
+                    initCode: params.initCode,
+                });
+        if (extractProfit && profitWei > 0n) {
+            console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(toOwnerWei)} OKB (profit: ${formatOkb(profitWei)} OKB -> ${profitRecipient})`);
+        }
+        else {
+            console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(withdrawAmount)} OKB`);
+        }
+        return { userOp, prefundWei };
+    }
+    /**
+     * 外盘捆绑买卖（先买后卖）
+     */
+    async bundleBuySell(params) {
+        const { tokenAddress, privateKeys, buyAmounts, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, dexKey, routerAddress, deadlineMinutes, } = params;
+        if (privateKeys.length !== buyAmounts.length) {
+            throw new Error('私钥数量和购买金额数量必须一致');
+        }
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress });
+        const deadline = getDexDeadline(this.getDeadlineMinutes({ deadlineMinutes }));
+        const sharedProvider = this.aaManager.getProvider();
+        const wallets = privateKeys.map((pk) => new Wallet(pk, sharedProvider));
+        const bundlerSigner = wallets[0];
+        const beneficiary = bundlerSigner.address;
+        const reserveWei = parseOkb(withdrawReserve);
+        console.log('=== XLayer DEX Bundle Buy -> Sell ===');
+        console.log('router:', effectiveRouter);
+        console.log('token:', tokenAddress);
+        console.log('owners:', wallets.length);
+        console.log('sellPercent:', sellPercent);
+        const effCfg = { ...(this.config ?? {}), ...(config ?? {}) };
+        const profitSettings = resolveProfitSettings(effCfg);
+        // 1) accountInfos / nonceMap
+        const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
+        const senders = accountInfos.map((ai) => ai.sender);
+        const nonceMap = new AANonceMap();
+        for (const ai of accountInfos)
+            nonceMap.init(ai.sender, ai.nonce);
+        // 2) 买入（批量估算 + 补余额 + 并发签名）
+        const buyWeis = buyAmounts.map((a) => parseOkb(a));
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            const buyWei = buyWeis[i] ?? 0n;
+            if (buyWei <= 0n)
+                return;
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + parseOkb('0.0003'), `owner${i + 1}/dex-buy-prefund-before-estimate`);
+        });
+        const buyCallDatas = buyWeis.map((buyWei, i) => {
+            const sender = senders[i];
+            const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], sender, deadline);
+            return encodeExecute(effectiveRouter, buyWei, swapData);
+        });
+        const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
+        const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
+            ops: accountInfos.map((ai, i) => ({
+                sender: ai.sender,
+                nonce: nonceMap.next(ai.sender),
+                callData: buyCallDatas[i],
+                initCode: initCodes[i],
+            })),
+        });
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            const buyWei = buyWeis[i] ?? 0n;
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + (prefundWeis[i] ?? 0n) + parseOkb('0.0002'), `owner${i + 1}/dex-buy-fund`);
+        });
+        const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
+        const buyOps = signedBuy.map((s) => s.userOp);
+        const buyResult = await this.runHandleOps('dex-buyBundle', buyOps, bundlerSigner, beneficiary);
+        if (!buyResult) {
+            throw new Error('买入交易失败');
+        }
+        // 3) 授权 + 卖出（同一笔 handleOps）
+        const tokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, senders);
+        const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders, effectiveRouter);
+        const sellOps = [];
+        const sellPerWallet = await mapWithConcurrency(wallets, 4, async (w, i) => {
+            const sender = senders[i];
+            const balance = tokenBalances.get(sender) ?? 0n;
+            if (balance === 0n) {
+                console.log(`[owner${i + 1}] 没买到代币，跳过卖出`);
+                return [];
+            }
+            const allowance = allowances.get(sender) ?? 0n;
+            const needApprove = allowance < balance;
+            const out = [];
+            // buy 已经用过一次，因此 initCode = 0x（且 nonce 已更新过）
+            const initCode = '0x';
+            if (needApprove) {
+                const approveNonce = nonceMap.next(sender);
+                const approveCallData = encodeExecute(tokenAddress, 0n, encodeApproveCall(effectiveRouter, ethers.MaxUint256));
+                const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                    ownerWallet: w,
+                    sender,
+                    nonce: approveNonce,
+                    initCode,
+                    callData: approveCallData,
+                    deployed: true,
+                    fixedGas: {
+                        ...(effCfg.fixedGas ?? {}),
+                        callGasLimit: effCfg.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_APPROVE,
+                    },
+                });
+                const signed = await this.aaManager.signUserOp(userOp, w);
+                out.push(signed.userOp);
+            }
+            const sellAmount = (balance * BigInt(sellPercent)) / 100n;
+            if (sellAmount === 0n)
+                return out;
+            const sellNonce = nonceMap.next(sender);
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmount, 0n, [tokenAddress, WOKB], sender, deadline);
+            const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
+            const signedSell = await this.aaManager.buildUserOpWithState({
+                ownerWallet: w,
+                sender,
+                nonce: sellNonce,
+                initCode,
+                callData: sellCallData,
+                signOnly: false,
+            });
+            out.push(signedSell.userOp);
+            return out;
+        });
+        for (const ops of sellPerWallet)
+            sellOps.push(...ops);
+        const sellResult = await this.runHandleOps('dex-sellBundle', sellOps, bundlerSigner, beneficiary);
+        if (!sellResult) {
+            throw new Error('卖出交易失败');
+        }
+        // 4) 归集 OKB（sell 后状态）
+        let withdrawResult;
+        let totalProfitWei = 0n;
+        if (withdrawToOwner) {
+            const withdrawOps = [];
+            const okbBalances = await this.portalQuery.getMultipleOkbBalances(senders);
+            const withdrawItems = wallets.map((w, i) => ({
+                i,
+                ownerWallet: w,
+                sender: senders[i],
+                senderBalance: okbBalances.get(senders[i]) ?? 0n,
+                nonce: nonceMap.peek(senders[i]),
+                initCode: '0x',
+            }));
+            const signedWithdraws = await mapWithConcurrency(withdrawItems, 3, async (it) => {
+                const built = await this.buildWithdrawUserOpWithState({
+                    ownerWallet: it.ownerWallet,
+                    sender: it.sender,
+                    nonce: it.nonce,
+                    initCode: it.initCode,
+                    senderBalance: it.senderBalance,
+                    reserveWei,
+                    ownerName: `owner${it.i + 1}`,
+                    configOverride: config,
+                });
+                if (built) {
+                    nonceMap.commit(it.sender, it.nonce);
+                    withdrawOps.push(built.userOp);
+                    if (profitSettings.extractProfit) {
+                        const withdrawAmount = it.senderBalance > built.prefundWei + reserveWei
+                            ? it.senderBalance - built.prefundWei - reserveWei
+                            : 0n;
+                        totalProfitWei += calculateProfitWei(withdrawAmount, profitSettings.profitBps);
+                    }
+                }
+            });
+            void signedWithdraws; // silence unused (build is applied in loop)
+            if (withdrawOps.length > 0) {
+                withdrawResult = await this.runHandleOps('dex-withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
+            }
+        }
+        const finalBalances = await this.portalQuery.getMultipleOkbBalances(senders);
+        return {
+            buyResult,
+            sellResult,
+            withdrawResult,
+            finalBalances,
+            profit: withdrawToOwner
+                ? {
+                    extractProfit: profitSettings.extractProfit,
+                    profitBps: profitSettings.profitBps,
+                    profitRecipient: profitSettings.profitRecipient,
+                    totalProfitWei: totalProfitWei.toString(),
+                }
+                : undefined,
+            // approveResult: 这里我们把 approve 合并进 sellBundle 了，不单独返回
+        };
+    }
+}
+// ============================================================================
+// 便捷函数
+// ============================================================================
+export function createDexBundleExecutor(config) {
+    return new DexBundleExecutor(config);
+}
+export async function dexBundleBuySell(params) {
+    const executor = createDexBundleExecutor(params.config);
+    return executor.bundleBuySell(params);
+}