four-flap-meme-sdk 1.6.83 → 1.6.85

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

@@ -183,7 +183,7 @@ export class AADexSwapExecutor {
         const nonceMap = new AANonceMap();
         nonceMap.init(sellerSender, sellerAi.nonce);
         nonceMap.init(buyerSender, buyerAi.nonce);
-        // initCode：确保“同一 sender”只在第一笔 op 携带
+        // initCode：确保"同一 sender"只在第一笔 op 携带
         const initCodeBySenderLower = new Map();
         const initIfNeeded = (sender, deployed, ownerAddress) => {
             const k = sender.toLowerCase();
@@ -451,7 +451,12 @@ export class AADexSwapExecutor {
         const useNativeToken = isNativeToken(quoteToken);
         const isV3Trade = this.isV3(tradeType);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn, tradeType });
-        const provider = this.aaManager.getProvider();
+        // ✅ 关键修复：如果 effectiveConfig 有 paymaster，使用新的 AAAccountManager
+        // 否则使用构造函数中的 aaManager（性能优化：避免每次都创建新实例）
+        const aaManager = effectiveConfig.paymaster
+            ? new AAAccountManager(effectiveConfig)
+            : this.aaManager;
+        const provider = aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
         const buyerOwners = buyerPrivateKeys.map(pk => new Wallet(pk, provider));
         const payerWallet = new Wallet(payerPrivateKey || sellerPrivateKey, provider);
@@ -459,7 +464,7 @@ export class AADexSwapExecutor {
         // ✅ Gas 配置：优先使用前端传入的值，否则使用默认值
         const HOP_CALL_GAS_LIMIT = hopCallGasLimit ?? DEFAULT_HOP_CALL_GAS_LIMIT;
         const DEX_BUY_CALL_GAS_LIMIT = buyerCallGasLimit ?? DEFAULT_DEX_BUY_CALL_GAS_LIMIT;
-        const accountInfos = await this.aaManager.getMultipleAccountInfo([sellerOwner.address, ...buyerOwners.map(w => w.address)]);
+        const accountInfos = await aaManager.getMultipleAccountInfo([sellerOwner.address, ...buyerOwners.map(w => w.address)]);
         const sellerAi = accountInfos[0];
         const buyerAis = accountInfos.slice(1);
         const nonceMap = new AANonceMap();
@@ -471,7 +476,7 @@ export class AADexSwapExecutor {
             const k = sender.toLowerCase();
             if (initCodeBySenderLower.has(k))
                 return;
-            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+            initCodeBySenderLower.set(k, deployed ? '0x' : aaManager.generateInitCode(ownerAddress));
         };
         const consumeInitCode = (sender) => {
             const k = sender.toLowerCase();
@@ -487,13 +492,13 @@ export class AADexSwapExecutor {
             initIfNeeded(buyerAis[i].sender, buyerAis[i].deployed, buyerOwners[i].address);
         }
         const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
-        const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerAi.sender);
+        const sellerTokenBal = await aaManager.getErc20Balance(tokenAddress, sellerAi.sender);
         const sellAmountWei = sellAmount
             ? ethers.parseUnits(String(sellAmount), decimals)
             : (sellerTokenBal * BigInt(sellPercent)) / 100n;
         let needApprove = false;
         if (!skipApprovalCheck) {
-            const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerAi.sender, effectiveRouter);
+            const allowance = await aaManager.getErc20Allowance(tokenAddress, sellerAi.sender, effectiveRouter);
             needApprove = allowance < sellAmountWei;
         }
         // ✅ Gas 价格：优先使用前端传入的值，否则从链上获取
@@ -501,13 +506,13 @@ export class AADexSwapExecutor {
         const fixedGasPrice = gasPriceGwei
             ? BigInt(Math.floor(gasPriceGwei * 1e9)) // Gwei → wei
             : await (async () => {
-                const feeData = await this.aaManager.getFeeData();
+                const feeData = await aaManager.getFeeData();
                 return feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n;
             })();
         console.log(`[AA DEX 批量换手] Gas 配置: gasPrice=${fixedGasPrice.toString()} wei, buyerCallGasLimit=${DEX_BUY_CALL_GAS_LIMIT}, hopCallGasLimit=${HOP_CALL_GAS_LIMIT}`);
         const outOps = [];
         if (needApprove) {
-            const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+            const { userOp } = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: sellerOwner,
                 sender: sellerAi.sender,
                 nonce: nonceMap.next(sellerAi.sender),
@@ -516,7 +521,7 @@ export class AADexSwapExecutor {
                 deployed: sellerAi.deployed,
                 fixedGas: { gasPrice: fixedGasPrice }, // ✅ 使用统一的 gasPrice
             });
-            const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
+            const signedApprove = await aaManager.signUserOp(userOp, sellerOwner);
             outOps.push(signedApprove.userOp);
         }
         // Sell op - ✅ 支持 V2/V3，支持 ERC20 稳定币
@@ -546,7 +551,7 @@ export class AADexSwapExecutor {
             sellSwapData = encodeSwapExactTokensForTokensSupportingFee(sellAmountWei, 0n, [tokenAddress, quoteToken], sellerAi.sender, deadline);
         }
         const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
-        const signedSell = await this.aaManager.buildUserOpWithState({
+        const signedSell = await aaManager.buildUserOpWithState({
             ownerWallet: sellerOwner,
             sender: sellerAi.sender,
             nonce: nonceMap.next(sellerAi.sender),
@@ -689,7 +694,7 @@ export class AADexSwapExecutor {
         // 多跳可用的条件：
         // 1. 配置了 Paymaster（prefund = 0n，hop 钱包不需要余额）
         // 2. 传入了预充值好的 hop 钱包（hop 钱包已有余额支付 prefund）
-        const hasPaymaster = this.aaManager.hasPaymaster();
+        const hasPaymaster = aaManager.hasPaymaster();
         const hasPrefundedHops = Array.isArray(prefundedHopWallets) && prefundedHopWallets.length > 0;
         const canDoMultiHop = hasPaymaster || hasPrefundedHops;
         const effectiveHopCount = canDoMultiHop ? hopCount : 0;
@@ -710,50 +715,40 @@ export class AADexSwapExecutor {
         if (capitalMode && buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (effectiveHopCount <= 0) {
                 console.log('[AA DEX 批量换手] 进入直接分发模式 (effectiveHopCount <= 0)');
-                // ✅ 关键修复：使用开始时获取的 fixedGasPrice 计算 prefund
-                // 这样确保检查、分发和 UserOp 构建使用同一个 gasPrice，避免不一致
-                // 计算每个买方需要的 prefund（带 buffer，用于余额检查和分发）
-                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefundWithBuffer(ai.deployed));
+                // ✅ Paymaster 模式：不需要 prefund，buyer 钱包不需要预先持有 OKB
+                // 非 Paymaster 模式：需要检查 buyer 余额
+                const buyerPrefunds = buyerAis.map(ai => hasPaymaster ? 0n : estimateBuyerPrefundWithBuffer(ai.deployed));
                 const totalBuyerPrefund = buyerPrefunds.reduce((a, b) => a + b, 0n);
-                console.log(`[AA DEX 直接分发] 买方数量: ${buyerSenders.length}, 总 prefund 预估: ${ethers.formatEther(totalBuyerPrefund)} OKB, fixedGasPrice: ${fixedGasPrice.toString()}`);
-                // ✅ 关键修复：检查 buyer 钱包是否有足够的 OKB 支付 prefund
-                // ERC-4337 handleOps 执行顺序：先验证所有 UserOps（需要 prefund），再执行所有 UserOps
-                // 在 Validation 阶段，Disperse UserOp 还没执行，所以 Buyer 还没收到资金
-                // 因此 Buyer 必须预先持有足够的 OKB 来支付 prefund
-                const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
-                const insufficientBuyers = [];
-                const sufficientBuyers = [];
-                for (let i = 0; i < buyerSenders.length; i++) {
-                    const prefundNeeded = buyerPrefunds[i];
-                    const balance = buyerBalances[i];
-                    if (balance < prefundNeeded) {
-                        insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(balance)} OKB, 需要: ${ethers.formatEther(prefundNeeded)} OKB, 缺口: ${ethers.formatEther(prefundNeeded - balance)} OKB)`);
+                console.log(`[AA DEX 直接分发] 买方数量: ${buyerSenders.length}, Paymaster: ${hasPaymaster ? '✅ 启用' : '❌ 未启用'}, prefund: ${ethers.formatEther(totalBuyerPrefund)} OKB`);
+                // ✅ 只有无 Paymaster 时才检查 buyer 余额
+                if (!hasPaymaster) {
+                    const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
+                    const insufficientBuyers = [];
+                    for (let i = 0; i < buyerSenders.length; i++) {
+                        const prefundNeeded = buyerPrefunds[i];
+                        const balance = buyerBalances[i];
+                        if (balance < prefundNeeded) {
+                            insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(balance)} OKB, 需要: ${ethers.formatEther(prefundNeeded)} OKB)`);
+                        }
                     }
-                    else {
-                        sufficientBuyers.push(buyerSenders[i]);
+                    if (insufficientBuyers.length > 0) {
+                        console.error('[AA DEX 直接分发] ❌ Buyer 钱包 OKB 余额不足:', insufficientBuyers);
+                        throw new Error(`${insufficientBuyers.length}/${buyerSenders.length} 个 Buyer 钱包 OKB 余额不足！` +
+                            `请配置 Paymaster（全局设置 → AA Paymaster）或给 buyer 钱包充值 OKB。`);
                     }
+                    console.log('[AA DEX 直接分发] ✅ Buyer 钱包 prefund 检查通过');
                 }
-                if (insufficientBuyers.length > 0) {
-                    console.error('[AA DEX 直接分发] ❌ 以下 buyer 钱包 OKB 余额不足以支付 prefund:', insufficientBuyers);
-                    console.error('[AA DEX 直接分发] ⚠️ ERC-4337 限制：handleOps 在 Validation 阶段就需要 prefund，此时分发还没执行');
-                    console.error('[AA DEX 直接分发] 💡 解决方案：请先给这些 buyer 钱包充值少量 OKB (约 0.001-0.002 OKB/钱包) 用于支付 gas 费用');
-                    throw new Error(`${insufficientBuyers.length}/${buyerSenders.length} 个 Buyer 钱包 OKB 余额不足！` +
-                        `ERC-4337 限制：所有 UserOps 在 Validation 阶段就需要支付 prefund（gas 费用），此时卖出和分发还没执行。` +
-                        `请先给 buyer 钱包充值少量 OKB (约 0.001-0.002 OKB/钱包)。`);
-                }
-                console.log('[AA DEX 直接分发] ✅ Buyer 钱包 prefund 检查通过，所有钱包余额充足');
                 // ✅ 直接分发模式：
-                // - 原生代币模式：分发金额 = 买入金额 + 买方 prefund
-                // - ERC20 模式：只分发 ERC20 代币，prefund 需要 buyer 自己有 OKB
-                // ✅ 利润由 Payer EOA 独立交易刮取，不参与 AA 分发
+                // - Paymaster 模式：分发金额 = 买入金额（不含 prefund，gas 由 Paymaster 代付）
+                // - 非 Paymaster 模式：分发金额 = 买入金额 + prefund
                 const items = buyerSenders.map((to, i) => {
                     const buyAmount = buyAmountsWei[i] ?? 0n;
                     const prefund = buyerPrefunds[i] ?? 0n;
                     return {
                         to,
-                        buyAmount, // ERC20 代币金额
-                        prefund, // OKB prefund（仅原生代币模式使用）
-                        totalValue: buyAmount + prefund // 原生代币模式的总金额
+                        buyAmount,
+                        prefund,
+                        totalValue: buyAmount + prefund
                     };
                 }).filter(x => x.buyAmount > 0n);
                 const chunks = chunkArray(items, maxPerOp);
@@ -775,7 +770,7 @@ export class AADexSwapExecutor {
                         const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.buyAmount]));
                         callData = encodeExecuteBatch(targets, values, datas);
                     }
-                    const signedDisperse = await this.aaManager.buildUserOpWithState({
+                    const signedDisperse = await aaManager.buildUserOpWithState({
                         ownerWallet: sellerOwner,
                         sender: sellerAi.sender,
                         nonce: nonceMap.next(sellerAi.sender),
@@ -814,7 +809,7 @@ export class AADexSwapExecutor {
                     }
                     // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce 和部署状态
                     const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
-                    const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+                    const hopNonces = await aaManager.batchGetNonces(hopSenders);
                     // ✅ 直接检查链上 code 判断是否已部署（比 nonce 更可靠）
                     const hopCodes = await Promise.all(hopSenders.map(s => provider.getCode(s)));
                     const hopDeployed = hopCodes.map(code => code !== null && code !== '0x' && code.length > 2);
@@ -866,24 +861,28 @@ export class AADexSwapExecutor {
                         allGeneratedHopWallets.push(chainHops);
                     }
                     console.log(`[AA DEX 多跳] ✅ 使用预充值 hop 钱包: ${totalHopsNeeded} 个 (${buyerSenders.length} 条链 × ${effectiveHopCount} 跳)`);
-                    // ✅ 关键修复：检查 buyer 钱包是否有足够的 OKB 支付 prefund
-                    // ERC-4337 的 handleOps 会先验证所有 UserOps（需要 prefund），然后才执行
-                    // 所以 buyer 需要在交易前就有足够的 OKB，不能依赖 hop 链在 execution 阶段转入的资金
-                    const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
-                    const insufficientBuyers = [];
-                    for (let i = 0; i < buyerSenders.length; i++) {
-                        const buyerAi = buyerAis[i];
-                        const buyerPrefundNeeded = estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
-                        if (buyerBalances[i] < buyerPrefundNeeded) {
-                            insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(buyerBalances[i])} OKB, 需要: ${ethers.formatEther(buyerPrefundNeeded)} OKB, 缺口: ${ethers.formatEther(buyerPrefundNeeded - buyerBalances[i])} OKB)`);
+                    // ✅ 检查 buyer 钱包余额（仅预充值模式需要，Paymaster 模式不需要）
+                    // 预充值模式下，hop 会向 buyer 转入资金（用于买入），但 buyer 仍需要自己的 OKB 支付 prefund
+                    // 因为 ERC-4337 的 handleOps 会先验证所有 UserOps（需要 prefund），然后才执行
+                    if (!hasPaymaster) {
+                        const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
+                        const insufficientBuyers = [];
+                        for (let i = 0; i < buyerSenders.length; i++) {
+                            const buyerAi = buyerAis[i];
+                            const buyerPrefundNeeded = estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                            if (buyerBalances[i] < buyerPrefundNeeded) {
+                                insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(buyerBalances[i])} OKB, 需要: ${ethers.formatEther(buyerPrefundNeeded)} OKB, 缺口: ${ethers.formatEther(buyerPrefundNeeded - buyerBalances[i])} OKB)`);
+                            }
+                        }
+                        if (insufficientBuyers.length > 0) {
+                            console.error('[AA DEX 多跳] ❌ 以下 buyer 钱包 OKB 余额不足以支付 prefund:', insufficientBuyers);
+                            throw new Error(`Buyer 钱包 OKB 余额不足！请配置 Paymaster（全局设置 → AA Paymaster）或给 buyer 钱包充值 OKB。不足的钱包: ${insufficientBuyers.length} 个`);
                         }
+                        console.log('[AA DEX 多跳] ✅ Buyer 钱包 prefund 检查通过');
                     }
-                    if (insufficientBuyers.length > 0) {
-                        console.error('[AA DEX 多跳] ❌ 以下 buyer 钱包 OKB 余额不足以支付 prefund:', insufficientBuyers);
-                        throw new Error(`Buyer 钱包 OKB 余额不足！在 ERC-4337 的 handleOps 中，所有 UserOps 在 Validation 阶段就需要支付 prefund，此时 hop 链还没有执行。` +
-                            `请先给 buyer 钱包充值 OKB。不足的钱包: ${insufficientBuyers.length} 个`);
+                    else {
+                        console.log('[AA DEX 多跳] ✅ Paymaster 模式，跳过 buyer 余额检查');
                     }
-                    console.log('[AA DEX 多跳] ✅ Buyer 钱包 prefund 检查通过');
                 }
                 else {
                     // Paymaster 模式：生成新钱包（不需要预充值，prefund=0）
@@ -892,10 +891,10 @@ export class AADexSwapExecutor {
                         for (let h = 0; h < effectiveHopCount; h++) {
                             const randomWallet = ethers.Wallet.createRandom();
                             const wallet = new ethers.Wallet(randomWallet.privateKey, provider);
-                            const sender = await this.aaManager.predictSenderAddress(wallet.address);
+                            const sender = await aaManager.predictSenderAddress(wallet.address);
                             const code = await provider.getCode(sender);
                             const deployed = code !== null && code !== '0x';
-                            const initCode = deployed ? '0x' : this.aaManager.generateInitCode(wallet.address);
+                            const initCode = deployed ? '0x' : aaManager.generateInitCode(wallet.address);
                             chainHops.push({ wallet, sender, deployed, initCode });
                             // 初始化 nonce
                             nonceMap.init(sender, 0n);
@@ -913,13 +912,13 @@ export class AADexSwapExecutor {
                     const buyAmount = buyAmountsWei[buyerIdx] ?? 0n;
                     if (buyAmount <= 0n)
                         continue;
-                    // ✅ 计算 buyer 的 prefund（用于买入，使用常量）
-                    const buyerPrefund = estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                    // ✅ 计算 buyer 的 prefund（用于买入）
+                    // Paymaster 模式：prefund = 0（gas 由 Paymaster 代付）
+                    // 非 Paymaster 模式：需要预充值
+                    const buyerPrefund = hasPaymaster ? 0n : estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
                     // ✅ 计算分发金额：
-                    // - 预充值模式：hop 已有 prefund，分发金额 = 买入金额 + buyer prefund
-                    // - Paymaster 模式：prefund = 0，分发金额 = 买入金额 + buyer prefund
-                    // 注意：无论哪种模式，都不需要在分发中包含 hop 的 prefund
-                    //（预充值模式下 hop 已有余额，Paymaster 模式下 prefund=0）
+                    // - Paymaster 模式：分发金额 = 买入金额（不含 prefund，gas 由 Paymaster 代付）
+                    // - 预充值模式：分发金额 = 买入金额 + buyer prefund
                     const chainTotalAmount = buyAmount + buyerPrefund;
                     // 1) seller → hop0（不包含利润，利润由 Payer EOA 单独处理）
                     const hop0 = chainHops[0];
@@ -931,7 +930,7 @@ export class AADexSwapExecutor {
                         const transferData = erc20Iface.encodeFunctionData('transfer', [hop0.sender, buyAmount]);
                         callData0 = encodeExecute(quoteToken, 0n, transferData);
                     }
-                    const signedSellerToHop0 = await this.aaManager.buildUserOpWithState({
+                    const signedSellerToHop0 = await aaManager.buildUserOpWithState({
                         ownerWallet: sellerOwner,
                         sender: sellerAi.sender,
                         nonce: nonceMap.next(sellerAi.sender),
@@ -941,11 +940,12 @@ export class AADexSwapExecutor {
                     });
                     outOps.push(signedSellerToHop0.userOp);
                     // 2) hop[j] → hop[j+1] (中间跳)
-                    // ✅ 预充值模式下，hop 钱包自己有 prefund，只需要传递买入金额 + buyer prefund
+                    // Paymaster 模式：只传递买入金额（不含 prefund）
+                    // 预充值模式：传递买入金额 + buyer prefund（hop 自己的 gas 从预充值中支付）
                     for (let j = 0; j < chainHops.length - 1; j++) {
                         const currentHop = chainHops[j];
                         const nextHop = chainHops[j + 1];
-                        // 传递金额 = 买入金额 + buyer prefund（hop 自己的 gas 从预充值中支付）
+                        // 传递金额
                         const amountToTransfer = buyAmount + buyerPrefund;
                         let callData;
                         if (useNativeToken) {
@@ -958,7 +958,7 @@ export class AADexSwapExecutor {
                         // ✅ 关键修复：使用 buildUserOpWithFixedGas，确保 callGasLimit 与预充值时一致
                         // 预充值时使用 HOP_CALL_GAS_LIMIT (150,000)，这里也必须使用相同的值
                         // 否则 buildUserOpWithState 会动态估算，可能得到 500,000，导致 prefund 不足
-                        const { userOp: hopUserOp } = await this.aaManager.buildUserOpWithFixedGas({
+                        const { userOp: hopUserOp } = await aaManager.buildUserOpWithFixedGas({
                             ownerWallet: currentHop.wallet,
                             sender: currentHop.sender,
                             nonce: nonceMap.next(currentHop.sender),
@@ -970,7 +970,7 @@ export class AADexSwapExecutor {
                                 gasPrice: fixedGasPrice, // ✅ 使用统一的 gasPrice
                             },
                         });
-                        const signedHop = await this.aaManager.signUserOp(hopUserOp, currentHop.wallet);
+                        const signedHop = await aaManager.signUserOp(hopUserOp, currentHop.wallet);
                         outOps.push(signedHop.userOp);
                     }
                     // 3) lastHop → buyer
@@ -985,7 +985,7 @@ export class AADexSwapExecutor {
                         callDataLast = encodeExecute(quoteToken, 0n, transferData);
                     }
                     // ✅ 关键修复：同样使用 buildUserOpWithFixedGas
-                    const { userOp: lastHopUserOp } = await this.aaManager.buildUserOpWithFixedGas({
+                    const { userOp: lastHopUserOp } = await aaManager.buildUserOpWithFixedGas({
                         ownerWallet: lastHop.wallet,
                         sender: lastHop.sender,
                         nonce: nonceMap.next(lastHop.sender),
@@ -997,7 +997,7 @@ export class AADexSwapExecutor {
                             gasPrice: fixedGasPrice, // ✅ 使用统一的 gasPrice
                         },
                     });
-                    const signedLastHop = await this.aaManager.signUserOp(lastHopUserOp, lastHop.wallet);
+                    const signedLastHop = await aaManager.signUserOp(lastHopUserOp, lastHop.wallet);
                     outOps.push(signedLastHop.userOp);
                 }
                 // ✅ 保存所有动态生成的多跳钱包信息，用于后续导出
@@ -1023,7 +1023,7 @@ export class AADexSwapExecutor {
                 const transferData = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
                 profitCallData = encodeExecute(quoteToken, 0n, transferData);
             }
-            const signedProfitTransfer = await this.aaManager.buildUserOpWithState({
+            const signedProfitTransfer = await aaManager.buildUserOpWithState({
                 ownerWallet: sellerOwner,
                 sender: sellerAi.sender,
                 nonce: nonceMap.next(sellerAi.sender),
@@ -1077,7 +1077,7 @@ export class AADexSwapExecutor {
             // ✅ 关键修复：使用 buildUserOpWithFixedGas，确保 callGasLimit 和 gasPrice 与预检查时一致
             // 预检查使用 DEX_BUY_CALL_GAS_LIMIT (650,000) 和 fixedGasPrice
             // 这里必须使用相同的值，避免 gasPrice 不一致导致 prefund 不足
-            const { userOp: buyUserOp } = await this.aaManager.buildUserOpWithFixedGas({
+            const { userOp: buyUserOp } = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: buyerOwners[i],
                 sender: ai.sender,
                 nonce: nonceMap.next(ai.sender),
@@ -1089,32 +1089,58 @@ export class AADexSwapExecutor {
                     gasPrice: fixedGasPrice, // ✅ 使用统一的 gasPrice
                 },
             });
-            const signedBuy = await this.aaManager.signUserOp(buyUserOp, buyerOwners[i]);
+            const signedBuy = await aaManager.signUserOp(buyUserOp, buyerOwners[i]);
             outOps.push(signedBuy.userOp);
         }
-        // ✅ 获取 Payer 的 nonce（handleOps 使用 payerStartNonce，利润交易使用 +1）
+        // ✅ 获取 Payer 的 nonce
         const handleOpsNonce = payerStartNonce ?? await provider.getTransactionCount(payerWallet.address, 'pending');
-        const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
-            ops: outOps,
-            payerWallet,
-            beneficiary,
-            nonce: handleOpsNonce,
-        });
-        const signedTransactions = [signedHandleOps];
-        // ✅ 利润由 Payer EOA 独立交易刮取（capitalMode=true 时）
-        // 不参与 AA 分发，避免价格下跌导致买方资金不足
+        let signedTransactions;
+        // ✅ 利润刮取优化：使用 Multicall3 在同一个交易里执行 handleOps + 利润转账
+        // 好处：原子性执行，只需要一个交易，节省 gas
         if (capitalMode && extractProfit && profitWei > 0n) {
-            const profitTx = await payerWallet.signTransaction({
-                to: profitRecipient,
+            const entryPointAddress = aaManager.getEntryPointAddress();
+            const epIface = new ethers.Interface([
+                'function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external',
+            ]);
+            const handleOpsData = epIface.encodeFunctionData('handleOps', [outOps, beneficiary]);
+            // 使用 Multicall3 包装 handleOps + 利润转账
+            const multicallIface = new ethers.Interface([
+                'function aggregate3Value((address target, bool allowFailure, uint256 value, bytes callData)[] calls) payable returns ((bool success, bytes returnData)[] returnData)',
+            ]);
+            const calls = [
+                { target: entryPointAddress, allowFailure: false, value: 0n, callData: handleOpsData },
+                { target: profitRecipient, allowFailure: false, value: profitWei, callData: '0x' },
+            ];
+            const multicallData = multicallIface.encodeFunctionData('aggregate3Value', [calls]);
+            // 计算 handleOps 的 gasLimit
+            const sumOpsGasLimit = outOps.reduce((sum, op) => {
+                return sum + BigInt(op.callGasLimit) + BigInt(op.verificationGasLimit) + BigInt(op.preVerificationGas);
+            }, 0n);
+            const handleOpsOverhead = BigInt(outOps.length * 50000) + 100000n;
+            const minRequiredGas = sumOpsGasLimit + handleOpsOverhead + 50000n; // 额外 50k 给 Multicall3
+            const gasLimit = BigInt(Math.ceil(Number(minRequiredGas) * 1.1));
+            const signedMulticallTx = await payerWallet.signTransaction({
+                to: MULTICALL3,
+                data: multicallData,
                 value: profitWei,
-                nonce: handleOpsNonce + 1,
-                gasLimit: 21000n,
+                nonce: handleOpsNonce,
+                gasLimit,
                 gasPrice: fixedGasPrice,
                 chainId: this.config.chainId ?? 196,
                 type: 0,
             });
-            signedTransactions.push(profitTx);
-            console.log(`[AA DEX 批量换手] ✅ 利润由 Payer EOA 独立刮取: ${ethers.formatEther(profitWei)} OKB → ${profitRecipient}`);
+            signedTransactions = [signedMulticallTx];
+            console.log(`[AA DEX 批量换手] ✅ 利润刮取已合并到 handleOps（通过 Multicall3）: ${ethers.formatEther(profitWei)} OKB → ${profitRecipient}`);
+        }
+        else {
+            // 无利润刮取：直接签名 handleOps
+            const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
+                ops: outOps,
+                payerWallet,
+                beneficiary,
+                nonce: handleOpsNonce,
+            });
+            signedTransactions = [signedHandleOps];
         }
         // ✅ 收集动态生成的多跳钱包信息，用于交易失败时找回资金
         const hopWallets = this._generatedHopWallets || [];

package/dist/xlayer/index.d.ts

@@ -67,6 +67,7 @@ export { DexBundleExecutor, createDexBundleExecutor, dexBundleBuySell, type DexB
 export { AAPortalSwapExecutor, } from './portal-bundle-swap.js';
 export { AADexSwapExecutor, } from './dex-bundle-swap.js';
 export { HopWalletManager, createHopWalletManager, type HopWalletInfo, type PrefundProgressCallback, type PrefundConfig, type PrefundResult, type RefundResult, } from './hop-wallet-manager.js';
+export { PaymasterManager, createPaymasterManager, SIMPLE_PAYMASTER_ABI, SIMPLE_PAYMASTER_BYTECODE, type PaymasterConfig, type PaymasterDeployResult, type PaymasterDepositResult, } from './paymaster.js';
 export { AAPortalBuyFirstExecutor, createAAPortalBuyFirstExecutor, } from './portal-buy-first.js';
 export { AADexBuyFirstExecutor, createAADexBuyFirstExecutor, } from './dex-buy-first.js';
 export { BuyFirstVolumeExecutor, createBuyFirstVolumeExecutor, makeBuyFirstVolume, } from './buy-first-volume.js';

package/dist/xlayer/index.js

@@ -98,6 +98,10 @@ export { AADexSwapExecutor, } from './dex-bundle-swap.js';
 // ============================================================================
 export { HopWalletManager, createHopWalletManager, } from './hop-wallet-manager.js';
 // ============================================================================
+// Paymaster 管理器（免预充值）
+// ============================================================================
+export { PaymasterManager, createPaymasterManager, SIMPLE_PAYMASTER_ABI, SIMPLE_PAYMASTER_BYTECODE, } from './paymaster.js';
+// ============================================================================
 // AA Buy-First（刷量专用）
 // ============================================================================
 export { AAPortalBuyFirstExecutor, createAAPortalBuyFirstExecutor, } from './portal-buy-first.js';