four-flap-meme-sdk 1.5.51 → 1.5.53

package/dist/xlayer/account-fetcher.d.ts

@@ -0,0 +1,27 @@
+/**
+ * XLayer AA 账户信息批量获取器
+ */
+import type { Wallet } from 'ethers';
+import type { AAAccountManager } from './aa-account.js';
+import type { AAAccount } from './types.js';
+export interface AccountInfoBatch {
+    buyerAis: AAAccount[];
+    sellerAis: AAAccount[];
+    sellerSenders: string[];
+    sellerTokenBalances: Map<string, bigint>;
+    sellerAllowances: Map<string, bigint>;
+}
+/**
+ * ✅ 优化 1: 并行获取所有账户信息
+ */
+export declare function fetchAccountInfoBatch(params: {
+    buyers: Wallet[];
+    sellers: Wallet[];
+    tokenAddress: string;
+    effectiveRouter: string;
+    aaManager: AAAccountManager;
+    portalQuery: {
+        getMultipleTokenBalances: (token: string, addresses: string[]) => Promise<Map<string, bigint>>;
+        getMultipleAllowances: (token: string, owners: string[], spender: string) => Promise<Map<string, bigint>>;
+    };
+}): Promise<AccountInfoBatch>;

package/dist/xlayer/account-fetcher.js

@@ -0,0 +1,27 @@
+/**
+ * XLayer AA 账户信息批量获取器
+ */
+/**
+ * ✅ 优化 1: 并行获取所有账户信息
+ */
+export async function fetchAccountInfoBatch(params) {
+    const { buyers, sellers, tokenAddress, effectiveRouter, aaManager, portalQuery } = params;
+    // ✅ 并行获取买方和卖方的账户信息
+    const [buyerAis, sellerAis] = await Promise.all([
+        aaManager.getMultipleAccountInfo(buyers.map((w) => w.address)),
+        aaManager.getMultipleAccountInfo(sellers.map((w) => w.address))
+    ]);
+    const sellerSenders = sellerAis.map((ai) => ai.sender);
+    // ✅ 并行获取卖方的代币余额和授权额度
+    const [sellerTokenBalances, sellerAllowances] = await Promise.all([
+        portalQuery.getMultipleTokenBalances(tokenAddress, sellerSenders),
+        portalQuery.getMultipleAllowances(tokenAddress, sellerSenders, effectiveRouter)
+    ]);
+    return {
+        buyerAis,
+        sellerAis,
+        sellerSenders,
+        sellerTokenBalances,
+        sellerAllowances
+    };
+}

package/dist/xlayer/bundle.js

@@ -648,7 +648,7 @@ export class BundleExecutor {
                 // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
             }
         });
-        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要先 approve
         const buyCallDatas = buyWeis.map((buyWei) => {
             // 使用 portal 的 swapExactInput，支持 inputToken 参数
             const portalIface = new Interface([
@@ -663,8 +663,16 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
-            // 如果使用原生代币，value 为买入金额；否则为 0
-            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            if (useNativeToken) {
+                // 原生代币：直接 swap
+                return encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                // ERC20 代币：approve + swap 批量调用
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                return encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
         });
         const initCodes = accountInfos.map((ai, i) => ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -977,7 +985,7 @@ export class BundleExecutor {
                 // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
             }
         });
-        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要先 approve
         const buyCallDatas = buyWeis.map((buyWei) => {
             // 使用 portal 的 swapExactInput，支持 inputToken 参数
             const portalIface = new Interface([
@@ -992,8 +1000,16 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
-            // 如果使用原生代币，value 为买入金额；否则为 0
-            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            if (useNativeToken) {
+                // 原生代币：直接 swap
+                return encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                // ERC20 代币：approve + swap 批量调用
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                return encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
         });
         const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -1252,12 +1268,15 @@ export class BundleExecutor {
         const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
         const useNativeToken = inputToken === ZERO_ADDRESS;
         const quoteDecimals = 18;
-        let totalBuyWei = 0n;
-        let totalBuyProfitWei = 0n;
-        const buyerSenders = [];
         const portalIface = new Interface(PORTAL_ABI);
-        for (let i = 0; i < buyerWallets.length; i++) {
-            const buyer = buyerWallets[i];
+        // ✅ 批量获取所有买家的账户信息（并行优化）
+        const buyerAccountInfos = await this.aaManager.getMultipleAccountInfo(buyerWallets.map(w => w.address));
+        const buyerSenders = buyerAccountInfos.map(ai => ai.sender);
+        for (const ai of buyerAccountInfos) {
+            nonceMap.init(ai.sender, ai.nonce);
+        }
+        // ✅ 预计算所有买家的金额和利润
+        const buyerData = buyerWallets.map((buyer, i) => {
             const amountStr = buyAmounts[i] || '0';
             const originalWei = useNativeToken ? parseOkb(amountStr) : ethers.parseUnits(amountStr, quoteDecimals);
             let buyWei = originalWei;
@@ -1267,11 +1286,13 @@ export class BundleExecutor {
                 buyWei = res.remaining;
                 profitWei = res.profit;
             }
-            totalBuyWei += buyWei;
-            totalBuyProfitWei += profitWei;
-            const buyerAccount = await this.aaManager.getAccountInfo(buyer.address);
-            buyerSenders.push(buyerAccount.sender);
-            nonceMap.init(buyerAccount.sender, buyerAccount.nonce);
+            return { buyer, buyWei, profitWei, accountInfo: buyerAccountInfos[i] };
+        });
+        const totalBuyWei = buyerData.reduce((sum, d) => sum + d.buyWei, 0n);
+        const totalBuyProfitWei = buyerData.reduce((sum, d) => sum + d.profitWei, 0n);
+        // ✅ 并行构建和签名所有买家的 UserOps
+        const signedBuyOps = await mapWithConcurrency(buyerData, 5, async (data) => {
+            const { buyer, buyWei, accountInfo } = data;
             const swapData = portalIface.encodeFunctionData('swapExactInput', [
                 {
                     inputToken,
@@ -1281,17 +1302,28 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            let buyCallData;
+            if (useNativeToken) {
+                buyCallData = encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                buyCallData = encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
             const buyOp = await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: buyer,
-                sender: buyerAccount.sender,
-                callData: encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData),
-                nonce: nonceMap.next(buyerAccount.sender),
-                initCode: buyerAccount.deployed ? '0x' : this.aaManager.generateInitCode(buyer.address),
-                deployed: buyerAccount.deployed
+                sender: accountInfo.sender,
+                callData: buyCallData,
+                nonce: nonceMap.next(accountInfo.sender),
+                initCode: accountInfo.deployed ? '0x' : this.aaManager.generateInitCode(buyer.address),
+                deployed: accountInfo.deployed
             });
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
-            ops.push(signedBuyOp.userOp);
-        }
+            return signedBuyOp.userOp;
+        });
+        // 将所有签名的买入 UserOps 添加到操作列表
+        ops.push(...signedBuyOps);
         // 利润由尾笔交易处理（不再在买入阶段追加利润转账 UserOp）
         // === 计算利润金额 ===
         let nativeProfitAmount = 0n;
@@ -1425,17 +1457,20 @@ export class BundleExecutor {
         });
         const signedCreateOp = await aaManager.signUserOp(createOpRes.userOp, payerWallet);
         ops1.push(signedCreateOp.userOp);
-        // --- 3. 构建内盘买入 Ops ---
-        for (let i = 0; i < curveBuyerWallets.length; i++) {
-            const wallet = curveBuyerWallets[i];
-            const info = curveBuyerInfos[i];
+        // --- 3. 构建内盘买入 Ops（并行优化）---
+        // ✅ 预计算所有买入金额
+        const curveBuyData = curveBuyerWallets.map((wallet, i) => {
             const buyWei = parseOkb(curveBuyAmounts[i]);
-            totalCurveBuyWei += buyWei;
+            const isLast = i === curveBuyerWallets.length - 1;
+            const gasLimit = isLast ? 8000000n : 800000n; // 最后一笔触发毕业，给大一点
+            return { wallet, info: curveBuyerInfos[i], buyWei, gasLimit };
+        });
+        totalCurveBuyWei = curveBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
+        // ✅ 并行构建和签名所有内盘买入 UserOps
+        const signedCurveBuyOps = await mapWithConcurrency(curveBuyData, 5, async (data) => {
+            const { wallet, info, buyWei, gasLimit } = data;
             const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
             const buyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
-            // 最后一笔买入通常触发毕业，GasLimit 给大一点 (8M)
-            const isLast = i === curveBuyerWallets.length - 1;
-            const gasLimit = isLast ? 8000000n : 800000n;
             const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
                 sender: info.sender,
@@ -1446,8 +1481,9 @@ export class BundleExecutor {
                 fixedGas: { callGasLimit: gasLimit }
             });
             const signedBuyOp = await aaManager.signUserOp(buyOpRes.userOp, wallet);
-            ops1.push(signedBuyOp.userOp);
-        }
+            return signedBuyOp.userOp;
+        });
+        ops1.push(...signedCurveBuyOps);
         // 签名第一个 handleOps
         const startNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
         const signedMainTx = await this.signHandleOpsTx({
@@ -1467,40 +1503,32 @@ export class BundleExecutor {
             });
             const ops2 = [];
             const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
-            for (let i = 0; i < dexBuyerWallets.length; i++) {
-                const wallet = dexBuyerWallets[i];
-                const info = dexBuyerInfos[i];
+            // ✅ 预计算所有外盘买入金额
+            const dexBuyData = dexBuyerWallets.map((wallet, i) => {
                 const buyWei = parseOkb(dexBuyAmounts[i]);
-                totalDexBuyWei += buyWei;
-                // AA 模式外盘：Approve + Swap
-                // 1. Approve (PotatoSwap Router)
+                return { wallet, info: dexBuyerInfos[i], buyWei };
+            });
+            totalDexBuyWei = dexBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
+            // ✅ 并行构建和签名所有外盘买入 UserOps
+            const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
+                const { wallet, info, buyWei } = data;
+                // AA 模式外盘：使用 executeBatch 将 Approve + Swap 合并为一个 UserOp
                 const approveData = encodeApproveCall(POTATOSWAP_V2_ROUTER);
-                const approveCallData = encodeExecute(tokenAddress, 0n, approveData);
-                const approveOpRes = await aaManager.buildUserOpWithFixedGas({
-                    ownerWallet: wallet,
-                    sender: info.sender,
-                    callData: approveCallData,
-                    nonce: nonceMap.next(info.sender),
-                    initCode: '0x', // HandleOps1 已部署
-                    deployed: true,
-                    fixedGas: { callGasLimit: 100000n }
-                });
-                const signedApprove = await aaManager.signUserOp(approveOpRes.userOp, wallet);
-                ops2.push(signedApprove.userOp);
-                // 2. Swap (PotatoSwap V2)
                 const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
-                const swapCallData = encodeExecute(POTATOSWAP_V2_ROUTER, buyWei, swapData);
-                const swapOpRes = await aaManager.buildUserOpWithFixedGas({
+                const batchCallData = encodeExecuteBatch([tokenAddress, POTATOSWAP_V2_ROUTER], [0n, buyWei], [approveData, swapData]);
+                const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
-                    callData: swapCallData,
+                    callData: batchCallData,
                     nonce: nonceMap.next(info.sender),
+                    initCode: '0x', // HandleOps1 已部署
                     deployed: true,
-                    fixedGas: { callGasLimit: 500000n }
+                    fixedGas: { callGasLimit: 600000n }
                 });
-                const signedSwap = await aaManager.signUserOp(swapOpRes.userOp, wallet);
-                ops2.push(signedSwap.userOp);
-            }
+                const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
+                return signedDexBuyOp.userOp;
+            });
+            ops2.push(...signedDexBuyOps);
             const signedDexTx = await this.signHandleOpsTx({
                 ops: ops2,
                 payerWallet: payerWallet,

package/dist/xlayer/constants.d.ts

@@ -24,6 +24,10 @@ export declare const FLAP_PORTAL = "0xb30D8c4216E1f21F27444D2FfAee3ad577808678";
 export declare const FLAP_TOKEN_IMPL = "0x12Dc83157Bf1cfCB8Db5952b3ba5bb56Cc38f8C9";
 /** WOKB 原生包装代币 */
 export declare const WOKB = "0xe538905cf8410324e03a5a23c1c177a474d59b2b";
+/** ✅ USDT 代币地址（XLayer，6 位精度） */
+export declare const USDT = "0x1e4a5963abfd975d8c9021ce480b42188849d41d";
+/** ✅ 零地址（表示原生代币） */
+export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 /** Multicall3 合约 */
 export declare const MULTICALL3 = "0xca11bde05977b3631167028862be2a173976ca11";
 /** PotatoSwap V2 Router */
@@ -34,14 +38,10 @@ export declare const POTATOSWAP_SWAP_ROUTER02 = "0xB45D0149249488333E3F3f9F35980
 export declare const POTATOSWAP_V3_ROUTER = "0xBB069e9465BcabC4F488d21e793BDEf0F2d41D41";
 /** PotatoSwap V3 Factory */
 export declare const POTATOSWAP_V3_FACTORY = "0xa1415fAe79c4B196d087F02b8aD5a622B8A827E5";
-/** USDT (6位精度) */
-export declare const USDT = "0x1e4a5963abfd975d8c9021ce480b42188849d41d";
 /** USDC (6位精度) */
 export declare const USDC = "0x74b7f16337b8972027f6196a17a631ac6de26d22";
 /** USD₮0 / USDT0 (6位精度) - Flap xLayer 支持的稳定币计价 */
 export declare const USDT0 = "0x779ded0c9e1022225f8e0630b35a9b54be713736";
-/** 零地址（表示原生代币 OKB） */
-export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 /** 默认 Gas Price 兜底值（0.1 gwei） */
 export declare const DEFAULT_GAS_PRICE = 100000000n;
 /** 默认 Salt（用于 AA 账户派生） */

package/dist/xlayer/constants.js

@@ -36,6 +36,10 @@ export const FLAP_TOKEN_IMPL = '0x12Dc83157Bf1cfCB8Db5952b3ba5bb56Cc38f8C9';
 // ============================================================================
 /** WOKB 原生包装代币 */
 export const WOKB = '0xe538905cf8410324e03a5a23c1c177a474d59b2b';
+/** ✅ USDT 代币地址（XLayer，6 位精度） */
+export const USDT = '0x1e4a5963abfd975d8c9021ce480b42188849d41d';
+/** ✅ 零地址（表示原生代币） */
+export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
 /** Multicall3 合约 */
 export const MULTICALL3 = '0xca11bde05977b3631167028862be2a173976ca11';
 /** PotatoSwap V2 Router */
@@ -46,21 +50,11 @@ export const POTATOSWAP_SWAP_ROUTER02 = '0xB45D0149249488333E3F3f9F359807F4b810C
 export const POTATOSWAP_V3_ROUTER = '0xBB069e9465BcabC4F488d21e793BDEf0F2d41D41';
 /** PotatoSwap V3 Factory */
 export const POTATOSWAP_V3_FACTORY = '0xa1415fAe79c4B196d087F02b8aD5a622B8A827E5';
-// ============================================================================
-// 稳定币地址
-// ============================================================================
-/** USDT (6位精度) */
-export const USDT = '0x1e4a5963abfd975d8c9021ce480b42188849d41d';
 /** USDC (6位精度) */
 export const USDC = '0x74b7f16337b8972027f6196a17a631ac6de26d22';
 /** USD₮0 / USDT0 (6位精度) - Flap xLayer 支持的稳定币计价 */
 export const USDT0 = '0x779ded0c9e1022225f8e0630b35a9b54be713736';
 // ============================================================================
-// 零地址
-// ============================================================================
-/** 零地址（表示原生代币 OKB） */
-export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-// ============================================================================
 // Gas 配置
 // ============================================================================
 /** 默认 Gas Price 兜底值（0.1 gwei） */

package/dist/xlayer/dex-buy-first.d.ts

@@ -1,10 +1,6 @@
 /**
  * XLayer AA Buy-First（外盘 / PotatoSwap V2）
- *
- * 对齐 BSC buy-first 思路：
- * - 买方先买入（OKB -> token）
- * - 卖方再卖出等值 token（token -> OKB，卖方需要预持仓）
- * - ✅ 利润：在卖出后归集阶段刮取
+ * ✅ 优化版本：并行化 RPC、批量签名、合并 approve+sell
  */
 import type { XLayerConfig } from './types.js';
 import type { BuyFirstParams, BuyFirstResult } from './types.js';
@@ -14,11 +10,11 @@ export declare class AADexBuyFirstExecutor {
     private dexQuery;
     private config;
     constructor(config?: XLayerConfig);
-    private getEffectiveRouter;
     private runHandleOps;
     private pickWallets;
     private buildWithdrawUserOp;
     private safeQuoteBuy;
+    private initNonceAndInitCode;
     execute(params: BuyFirstParams): Promise<BuyFirstResult>;
 }
 export declare function createAADexBuyFirstExecutor(config?: XLayerConfig): AADexBuyFirstExecutor;

package/dist/xlayer/dex-buy-first.js

@@ -1,72 +1,21 @@
 /**
  * XLayer AA Buy-First（外盘 / PotatoSwap V2）
- *
- * 对齐 BSC buy-first 思路：
- * - 买方先买入（OKB -> token）
- * - 卖方再卖出等值 token（token -> OKB，卖方需要预持仓）
- * - ✅ 利润：在卖出后归集阶段刮取
+ * ✅ 优化版本：并行化 RPC、批量签名、合并 approve+sell
  */
 import { Contract, Interface, Wallet, ethers } from 'ethers';
 import { AANonceMap } from './types.js';
-import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
+import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, ZERO_ADDRESS, } from './constants.js';
 import { AAAccountManager, encodeExecute } from './aa-account.js';
-import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
-import { PortalQuery, encodeApproveCall, parseOkb } from './portal-ops.js';
+import { DexQuery } from './dex.js';
+import { PortalQuery, parseOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
-import { PROFIT_CONFIG } from '../utils/constants.js';
-// 固定 gas（用于减少 RPC 与提高可控性）
+import { getDexDeadline, resolveProfitSettings, calculateProfitWei, splitAmount, getEffectiveRouter } from './dex-helpers.js';
+import { fetchAccountInfoBatch } from './account-fetcher.js';
+import { buildBuyUserOps, buildSellUserOps } from './userOp-builder.js';
 const DEFAULT_CALL_GAS_LIMIT_BUY = 450000n;
 const DEFAULT_CALL_GAS_LIMIT_SELL = 450000n;
 const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
 const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
-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;
-}
-function shuffle(arr) {
-    const a = arr.slice();
-    for (let i = a.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
-        [a[i], a[j]] = [a[j], a[i]];
-    }
-    return a;
-}
-function splitAmount(totalAmount, count) {
-    if (count <= 0)
-        throw new Error('拆分份数必须大于 0');
-    if (count === 1)
-        return [totalAmount];
-    if (totalAmount <= 0n)
-        return new Array(count).fill(0n);
-    const weights = [];
-    for (let i = 0; i < count; i++) {
-        const w = BigInt(500000 + Math.floor(Math.random() * 1000000)); // [0.5,1.5)
-        weights.push(w);
-    }
-    const totalWeight = weights.reduce((a, b) => a + b, 0n);
-    const amounts = [];
-    let allocated = 0n;
-    for (let i = 0; i < count - 1; i++) {
-        const amt = (totalAmount * weights[i]) / totalWeight;
-        amounts.push(amt);
-        allocated += amt;
-    }
-    amounts.push(totalAmount - allocated);
-    return shuffle(amounts);
-}
 export class AADexBuyFirstExecutor {
     constructor(config = {}) {
         this.config = config;
@@ -74,14 +23,6 @@ export class AADexBuyFirstExecutor {
         this.portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
         this.dexQuery = new DexQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
     }
-    getEffectiveRouter(params) {
-        if (params.routerAddress)
-            return params.routerAddress;
-        if (params.dexKey === 'DYORSWAP') {
-            return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
-        }
-        return POTATOSWAP_V2_ROUTER;
-    }
     async runHandleOps(label, ops, bundlerSigner, beneficiary) {
         const provider = this.aaManager.getProvider();
         const entryPointAddress = this.aaManager.getEntryPointAddress();
@@ -153,9 +94,8 @@ export class AADexBuyFirstExecutor {
             : 0n;
         if (withdrawAmount <= 0n)
             return null;
-        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
+        const { extractProfit, profitBps } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
-        const toOwnerWei = withdrawAmount - profitWei;
         const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
@@ -189,12 +129,49 @@ export class AADexBuyFirstExecutor {
             return 0n;
         }
     }
+    initNonceAndInitCode(params) {
+        const { buyers, sellers, buyerAis, sellerAis } = params;
+        const nonceMap = new AANonceMap();
+        // ✅ 使用 Set 去重，避免重复初始化
+        const uniqueSenders = new Set();
+        for (const ai of [...buyerAis, ...sellerAis]) {
+            const senderLower = ai.sender.toLowerCase();
+            if (!uniqueSenders.has(senderLower)) {
+                nonceMap.init(ai.sender, ai.nonce);
+                uniqueSenders.add(senderLower);
+            }
+        }
+        const initCodeBySenderLower = new Map();
+        const initIfNeeded = (sender, deployed, ownerAddress) => {
+            const k = sender.toLowerCase();
+            if (initCodeBySenderLower.has(k))
+                return;
+            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+        };
+        const consumeInitCode = (sender) => {
+            const k = sender.toLowerCase();
+            const cur = initCodeBySenderLower.get(k);
+            if (cur === undefined)
+                throw new Error(`initCode not initialized for sender: ${sender}`);
+            if (cur !== '0x')
+                initCodeBySenderLower.set(k, '0x');
+            return cur;
+        };
+        for (let i = 0; i < buyers.length; i++)
+            initIfNeeded(buyerAis[i].sender, buyerAis[i].deployed, buyers[i].address);
+        for (let i = 0; i < sellers.length; i++)
+            initIfNeeded(sellerAis[i].sender, sellerAis[i].deployed, sellers[i].address);
+        return { nonceMap, consumeInitCode };
+    }
     async execute(params) {
-        const { tradeType = 'V2', dexKey, routerAddress, deadlineMinutes = 20, tokenAddress, buyerPrivateKeys, sellerPrivateKeys, buyerFunds, buyCount, sellCount, slippageBps = 0, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, } = params;
+        const { tradeType = 'V2', routerVersion = 'V2', // ✅ 新增
+        dexKey, routerAddress, deadlineMinutes = 20, tokenAddress, buyerPrivateKeys, sellerPrivateKeys, buyerFunds, buyCount, sellCount, slippageBps = 0, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, quoteToken, // ✅ 新增
+        quoteTokenDecimals = 18, // ✅ 新增
+         } = params;
         if (tradeType !== 'V2') {
             throw new Error('AADexBuyFirstExecutor 仅支持 tradeType=V2（外盘）');
         }
-        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress });
+        const effectiveRouter = getEffectiveRouter({ dexKey, routerAddress, routerVersion }, POTATOSWAP_V2_ROUTER);
         const deadline = getDexDeadline(deadlineMinutes);
         const buyers = this.pickWallets(buyerPrivateKeys, buyCount);
         const sellers = this.pickWallets(sellerPrivateKeys, sellCount);
@@ -204,49 +181,60 @@ export class AADexBuyFirstExecutor {
             throw new Error('sellCount=0 或 sellerPrivateKeys 为空');
         const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
         const profitSettings = resolveProfitSettings(effConfig);
-        const totalBuyWei = parseOkb(String(buyerFunds));
+        const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
+        // ✅ 解析买入金额（根据 quoteToken 精度）
+        const totalBuyWei = useNativeToken
+            ? parseOkb(String(buyerFunds))
+            : ethers.parseUnits(String(buyerFunds), quoteTokenDecimals);
         if (totalBuyWei <= 0n)
             throw new Error('buyerFunds 需要 > 0');
         const buyAmountsWei = splitAmount(totalBuyWei, buyers.length);
-        const quotedPerBuy = await mapWithConcurrency(buyAmountsWei, 6, async (amt) => this.safeQuoteBuy(tokenAddress, amt));
+        // ✅ 并行报价（支持 OKB 或 USDT）
+        const quotedPerBuy = await mapWithConcurrency(buyAmountsWei, 6, async (amt) => {
+            if (useNativeToken) {
+                return await this.safeQuoteBuy(tokenAddress, amt);
+            }
+            else {
+                // USDT → Token 报价
+                try {
+                    return await this.dexQuery.quoteTokenToToken(quoteToken, tokenAddress, amt);
+                }
+                catch {
+                    return 0n;
+                }
+            }
+        });
         const quotedTotalTokenOut = quotedPerBuy.reduce((a, b) => a + (b ?? 0n), 0n);
         const estimatedTokenOutWei = (quotedTotalTokenOut * BigInt(10000 - Math.max(0, Math.min(10000, slippageBps)))) / 10000n;
         if (estimatedTokenOutWei <= 0n) {
             throw new Error('买入报价为 0，无法规划 sellAmount（可能无流动性）');
         }
         const sellAmountsWei = splitAmount(estimatedTokenOutWei, sellers.length);
-        // account infos
-        const buyerAis = await this.aaManager.getMultipleAccountInfo(buyers.map((w) => w.address));
-        const sellerAis = await this.aaManager.getMultipleAccountInfo(sellers.map((w) => w.address));
-        const nonceMap = new AANonceMap();
-        for (const ai of buyerAis)
-            nonceMap.init(ai.sender, ai.nonce);
-        for (const ai of sellerAis)
-            nonceMap.init(ai.sender, ai.nonce);
-        // initCode：确保同一 sender 只在第一笔 op 携带
-        const initCodeBySenderLower = new Map();
-        const initIfNeeded = (sender, deployed, ownerAddress) => {
-            const k = sender.toLowerCase();
-            if (initCodeBySenderLower.has(k))
-                return;
-            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
-        };
-        const consumeInitCode = (sender) => {
-            const k = sender.toLowerCase();
-            const cur = initCodeBySenderLower.get(k);
-            if (cur === undefined)
-                throw new Error(`initCode not initialized for sender: ${sender}`);
-            if (cur !== '0x')
-                initCodeBySenderLower.set(k, '0x');
-            return cur;
-        };
-        for (let i = 0; i < buyers.length; i++)
-            initIfNeeded(buyerAis[i].sender, buyerAis[i].deployed, buyers[i].address);
-        for (let i = 0; i < sellers.length; i++)
-            initIfNeeded(sellerAis[i].sender, sellerAis[i].deployed, sellers[i].address);
-        // 卖方预持仓检查
-        const sellerSenders = sellerAis.map((ai) => ai.sender);
-        const sellerTokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, sellerSenders);
+        // ✅ 优化 1: 并行获取所有账户信息
+        const accountInfo = await fetchAccountInfoBatch({
+            buyers,
+            sellers,
+            tokenAddress,
+            effectiveRouter,
+            aaManager: this.aaManager,
+            portalQuery: this.portalQuery
+        });
+        const { buyerAis, sellerAis, sellerSenders, sellerTokenBalances, sellerAllowances } = accountInfo;
+        // ✅ 验证买方余额（OKB 或 USDT）
+        if (!useNativeToken) {
+            const buyerSenders = buyerAis.map(ai => ai.sender);
+            const buyerQuoteBalances = await this.portalQuery.getMultipleTokenBalances(quoteToken, buyerSenders);
+            for (let i = 0; i < buyers.length; i++) {
+                const sender = buyerSenders[i];
+                const needBuy = buyAmountsWei[i] ?? 0n;
+                const bal = buyerQuoteBalances.get(sender) ?? 0n;
+                if (needBuy > bal) {
+                    const tokenName = quoteTokenDecimals === 6 ? 'USDT' : 'ERC20';
+                    throw new Error(`买方 ${tokenName} 余额不足: sender=${sender} need=${needBuy.toString()} bal=${bal.toString()}`);
+                }
+            }
+        }
+        // 验证卖方余额
         for (let i = 0; i < sellers.length; i++) {
             const sender = sellerSenders[i];
             const needSell = sellAmountsWei[i] ?? 0n;
@@ -255,80 +243,41 @@ export class AADexBuyFirstExecutor {
                 throw new Error(`卖方预持仓不足: sender=${sender} need=${needSell.toString()} bal=${bal.toString()}`);
             }
         }
-        // allowance（spender=router）
-        const sellerAllowances = await this.portalQuery.getMultipleAllowances(tokenAddress, sellerSenders, effectiveRouter);
-        const ops = [];
-        // buy ops
-        for (let i = 0; i < buyers.length; i++) {
-            const w = buyers[i];
-            const ai = buyerAis[i];
-            const sender = ai.sender;
-            const buyWei = buyAmountsWei[i] ?? 0n;
-            if (buyWei <= 0n)
-                continue;
-            const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], sender, deadline);
-            const callData = encodeExecute(effectiveRouter, buyWei, swapData);
-            const { userOp, prefundWei } = await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet: w,
-                sender,
-                nonce: nonceMap.next(sender),
-                initCode: consumeInitCode(sender),
-                callData,
-                deployed: ai.deployed,
-                fixedGas: {
-                    ...(effConfig.fixedGas ?? {}),
-                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
-                },
-            });
-            await this.aaManager.ensureSenderBalance(w, sender, buyWei + prefundWei + parseOkb('0.0001'), `buyFirstDex/buyer${i + 1}/fund`);
-            const signed = await this.aaManager.signUserOp(userOp, w);
-            ops.push(signed.userOp);
-        }
-        // seller approve + sell ops
-        for (let i = 0; i < sellers.length; i++) {
-            const w = sellers[i];
-            const ai = sellerAis[i];
-            const sender = ai.sender;
-            const sellWei = sellAmountsWei[i] ?? 0n;
-            if (sellWei <= 0n)
-                continue;
-            const allowance = sellerAllowances.get(sender) ?? 0n;
-            if (allowance < sellWei) {
-                const approveCallData = encodeExecute(tokenAddress, 0n, encodeApproveCall(effectiveRouter, ethers.MaxUint256));
-                const { userOp: approveOp, prefundWei } = await this.aaManager.buildUserOpWithFixedGas({
-                    ownerWallet: w,
-                    sender,
-                    nonce: nonceMap.next(sender),
-                    initCode: consumeInitCode(sender),
-                    callData: approveCallData,
-                    deployed: ai.deployed,
-                    fixedGas: {
-                        ...(effConfig.fixedGas ?? {}),
-                        callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_APPROVE,
-                    },
-                });
-                await this.aaManager.ensureSenderBalance(w, sender, prefundWei + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/approve-fund`);
-                const signedApprove = await this.aaManager.signUserOp(approveOp, w);
-                ops.push(signedApprove.userOp);
-            }
-            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellWei, 0n, [tokenAddress, WOKB], sender, deadline);
-            const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
-            const { userOp: sellOp, prefundWei: sellPrefund } = await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet: w,
-                sender,
-                nonce: nonceMap.next(sender),
-                initCode: consumeInitCode(sender),
-                callData: sellCallData,
-                deployed: ai.deployed,
-                fixedGas: {
-                    ...(effConfig.fixedGas ?? {}),
-                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_SELL,
-                },
-            });
-            await this.aaManager.ensureSenderBalance(w, sender, sellPrefund + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/sell-fund`);
-            const signedSell = await this.aaManager.signUserOp(sellOp, w);
-            ops.push(signedSell.userOp);
-        }
+        const { nonceMap, consumeInitCode } = this.initNonceAndInitCode({ buyers, sellers, buyerAis, sellerAis });
+        // ✅ 优化 2 + 3: 并行构建买入和卖出 UserOp（卖出合并 approve+sell）
+        const [buyOps, sellOps] = await Promise.all([
+            buildBuyUserOps({
+                buyers,
+                buyerAis,
+                buyAmountsWei,
+                tokenAddress,
+                effectiveRouter,
+                deadline,
+                wokbAddress: WOKB,
+                nonceMap,
+                consumeInitCode,
+                aaManager: this.aaManager,
+                config: effConfig,
+                defaultCallGasLimit: DEFAULT_CALL_GAS_LIMIT_BUY
+            }),
+            buildSellUserOps({
+                sellers,
+                sellerAis,
+                sellAmountsWei,
+                tokenAddress,
+                effectiveRouter,
+                deadline,
+                wokbAddress: WOKB,
+                sellerAllowances,
+                nonceMap,
+                consumeInitCode,
+                aaManager: this.aaManager,
+                config: effConfig,
+                defaultApproveGasLimit: DEFAULT_CALL_GAS_LIMIT_APPROVE,
+                defaultSellGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL
+            })
+        ]);
+        const ops = [...buyOps, ...sellOps];
         if (ops.length === 0)
             throw new Error('本轮没有生成任何 UserOp');
         const payerWallet = buyers[0];

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

@@ -0,0 +1,20 @@
+/**
+ * XLayer AA DEX 工具函数
+ */
+export declare function getDexDeadline(minutes?: number): number;
+export declare function calculateProfitWei(amountWei: bigint, profitBps: number): bigint;
+export declare function resolveProfitSettings(config?: {
+    extractProfit?: boolean;
+    profitBps?: number;
+    profitRecipient?: string;
+}): {
+    extractProfit: boolean;
+    profitBps: number;
+    profitRecipient: string;
+};
+export declare function splitAmount(totalAmount: bigint, count: number): bigint[];
+export declare function getEffectiveRouter(params: {
+    dexKey?: string;
+    routerAddress?: string;
+    routerVersion?: 'V2' | 'V3';
+}, defaultRouter: string): string;

package/dist/xlayer/dex-helpers.js

@@ -0,0 +1,67 @@
+/**
+ * XLayer AA DEX 工具函数
+ */
+import { PROFIT_CONFIG } from '../utils/constants.js';
+export function getDexDeadline(minutes = 20) {
+    return Math.floor(Date.now() / 1000) + minutes * 60;
+}
+export function calculateProfitWei(amountWei, profitBps) {
+    if (amountWei <= 0n)
+        return 0n;
+    if (!Number.isFinite(profitBps) || profitBps <= 0)
+        return 0n;
+    return (amountWei * BigInt(profitBps)) / 10000n;
+}
+export function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false;
+    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 shuffle(arr) {
+    const a = arr.slice();
+    for (let i = a.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [a[i], a[j]] = [a[j], a[i]];
+    }
+    return a;
+}
+export function splitAmount(totalAmount, count) {
+    if (count <= 0)
+        throw new Error('拆分份数必须大于 0');
+    if (count === 1)
+        return [totalAmount];
+    if (totalAmount <= 0n)
+        return new Array(count).fill(0n);
+    const weights = [];
+    for (let i = 0; i < count; i++) {
+        const w = BigInt(500000 + Math.floor(Math.random() * 1000000));
+        weights.push(w);
+    }
+    const totalWeight = weights.reduce((a, b) => a + b, 0n);
+    const amounts = [];
+    let allocated = 0n;
+    for (let i = 0; i < count - 1; i++) {
+        const amt = (totalAmount * weights[i]) / totalWeight;
+        amounts.push(amt);
+        allocated += amt;
+    }
+    amounts.push(totalAmount - allocated);
+    return shuffle(amounts);
+}
+export function getEffectiveRouter(params, defaultRouter) {
+    // 优先使用显式指定的地址
+    if (params.routerAddress)
+        return params.routerAddress;
+    // 根据 dexKey 选择
+    if (params.dexKey === 'DYORSWAP') {
+        return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
+    }
+    // 根据 routerVersion 选择
+    if (params.routerVersion === 'V3') {
+        return '0xBB069e9465BcabC4F488d21e793BDEf0F2d41D41'; // POTATOSWAP_V3_ROUTER
+    }
+    // 默认使用传入的 defaultRouter（通常是 V2）
+    return defaultRouter;
+}

package/dist/xlayer/dex.d.ts

@@ -64,6 +64,10 @@ export declare class DexQuery {
      * 获取 Token -> OKB 的预期输出
      */
     quoteTokenToOkb(tokenAmount: bigint, tokenAddress: string): Promise<bigint>;
+    /**
+     * ✅ 获取 Token → Token 的预期输出（支持 USDT → Token）
+     */
+    quoteTokenToToken(inputToken: string, outputToken: string, inputAmount: bigint): Promise<bigint>;
     /**
      * 获取 WOKB 地址
      */

package/dist/xlayer/dex.js

@@ -129,6 +129,14 @@ export class DexQuery {
         const amounts = await this.getAmountsOut(tokenAmount, path);
         return amounts[amounts.length - 1];
     }
+    /**
+     * ✅ 获取 Token → Token 的预期输出（支持 USDT → Token）
+     */
+    async quoteTokenToToken(inputToken, outputToken, inputAmount) {
+        const path = [inputToken, outputToken];
+        const amounts = await this.getAmountsOut(inputAmount, path);
+        return amounts[amounts.length - 1];
+    }
     /**
      * 获取 WOKB 地址
      */

package/dist/xlayer/router-manager.d.ts

@@ -0,0 +1,38 @@
+/**
+ * XLayer Router 管理器
+ * 统一管理 V2/V3 Router 地址和授权目标选择逻辑
+ */
+import type { RouterVersion, ApprovalTarget } from './types.js';
+/**
+ * ✅ 获取 Router 地址
+ * @param params.routerVersion - Router 版本（V2 或 V3）
+ * @param params.dexKey - DEX 标识（如 DYORSWAP）
+ * @param params.routerAddress - 显式指定的 Router 地址（优先级最高）
+ * @returns Router 地址
+ */
+export declare function getRouterAddress(params: {
+    routerVersion?: RouterVersion;
+    dexKey?: string;
+    routerAddress?: string;
+}): string;
+/**
+ * ✅ 获取授权目标地址
+ * @param target - 授权目标类型
+ * @returns 目标合约地址
+ */
+export declare function getApprovalTargetAddress(target: ApprovalTarget): string;
+/**
+ * ✅ 获取所有授权目标地址
+ * @param targets - 授权目标类型数组
+ * @returns 目标信息数组
+ */
+export declare function getAllApprovalTargets(targets: ApprovalTarget[]): Array<{
+    target: ApprovalTarget;
+    address: string;
+}>;
+/**
+ * ✅ 根据交易类型推断授权目标
+ * @param tradeType - 交易类型（FLAP/V2/V3）
+ * @returns 授权目标类型
+ */
+export declare function inferApprovalTarget(tradeType: string): ApprovalTarget;

package/dist/xlayer/router-manager.js

@@ -0,0 +1,69 @@
+/**
+ * XLayer Router 管理器
+ * 统一管理 V2/V3 Router 地址和授权目标选择逻辑
+ */
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL, } from './constants.js';
+/**
+ * ✅ 获取 Router 地址
+ * @param params.routerVersion - Router 版本（V2 或 V3）
+ * @param params.dexKey - DEX 标识（如 DYORSWAP）
+ * @param params.routerAddress - 显式指定的 Router 地址（优先级最高）
+ * @returns Router 地址
+ */
+export function getRouterAddress(params) {
+    // 1. 优先使用显式指定的地址
+    if (params.routerAddress)
+        return params.routerAddress;
+    // 2. 根据 dexKey 选择
+    if (params.dexKey === 'DYORSWAP') {
+        return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
+    }
+    // 3. 根据 routerVersion 选择
+    const version = params.routerVersion ?? 'V2';
+    if (version === 'V3') {
+        return POTATOSWAP_V3_ROUTER;
+    }
+    // 4. 默认 V2
+    return POTATOSWAP_V2_ROUTER;
+}
+/**
+ * ✅ 获取授权目标地址
+ * @param target - 授权目标类型
+ * @returns 目标合约地址
+ */
+export function getApprovalTargetAddress(target) {
+    switch (target) {
+        case 'FLAP_PORTAL':
+            return FLAP_PORTAL;
+        case 'V2_ROUTER':
+            return POTATOSWAP_V2_ROUTER;
+        case 'V3_ROUTER':
+            return POTATOSWAP_V3_ROUTER;
+        default:
+            throw new Error(`Unknown approval target: ${target}`);
+    }
+}
+/**
+ * ✅ 获取所有授权目标地址
+ * @param targets - 授权目标类型数组
+ * @returns 目标信息数组
+ */
+export function getAllApprovalTargets(targets) {
+    return targets.map(target => ({
+        target,
+        address: getApprovalTargetAddress(target)
+    }));
+}
+/**
+ * ✅ 根据交易类型推断授权目标
+ * @param tradeType - 交易类型（FLAP/V2/V3）
+ * @returns 授权目标类型
+ */
+export function inferApprovalTarget(tradeType) {
+    const type = String(tradeType || '').toUpperCase();
+    if (type === 'V2')
+        return 'V2_ROUTER';
+    if (type === 'V3')
+        return 'V3_ROUTER';
+    return 'FLAP_PORTAL'; // 默认内盘
+}

package/dist/xlayer/types.d.ts

@@ -661,8 +661,14 @@ export interface VolumeResult {
     totalVolume: bigint;
 }
 export type BuyFirstTradeType = 'FLAP' | 'V2';
+/** ✅ Router 版本类型 */
+export type RouterVersion = 'V2' | 'V3';
+/** ✅ 授权目标类型 */
+export type ApprovalTarget = 'FLAP_PORTAL' | 'V2_ROUTER' | 'V3_ROUTER';
 export interface BuyFirstParams {
     tradeType?: BuyFirstTradeType;
+    /** ✅ 新增：Router 版本（V2 或 V3，默认 V2） */
+    routerVersion?: RouterVersion;
     /** DEX 标识（仅 V2 时使用，用于选择 Router） */
     dexKey?: string;
     /** 显式指定 Router 地址（仅 V2 时使用） */
@@ -672,10 +678,14 @@ export interface BuyFirstParams {
     tokenAddress: string;
     buyerPrivateKeys: string[];
     sellerPrivateKeys: string[];
-    /** 本轮总买入资金（OKB） */
+    /** 本轮总买入资金（OKB 或 quoteToken） */
     buyerFunds: string;
     buyCount?: number;
     sellCount?: number;
+    /** ✅ 新增：买入使用的代币地址（零地址或不传表示使用 OKB，非零地址表示使用 ERC20 如 USDT） */
+    quoteToken?: string;
+    /** ✅ 新增：quoteToken 的精度（默认 18，USDT 在 XLayer 上是 6 位） */
+    quoteTokenDecimals?: number;
     /** 报价滑点（仅用于估算 sellAmount），默认 0 */
     slippageBps?: number;
     withdrawToOwner?: boolean;

package/dist/xlayer/userOp-builder.d.ts

@@ -0,0 +1,51 @@
+/**
+ * XLayer AA UserOp 批量构建器
+ */
+import type { Wallet } from 'ethers';
+import type { AAAccountManager } from './aa-account.js';
+import type { AANonceMap } from './types.js';
+import type { UserOperation, XLayerConfig } from './types.js';
+export interface BuildBuyOpsParams {
+    buyers: Wallet[];
+    buyerAis: Array<{
+        sender: string;
+        deployed: boolean;
+    }>;
+    buyAmountsWei: bigint[];
+    tokenAddress: string;
+    effectiveRouter: string;
+    deadline: number;
+    wokbAddress: string;
+    nonceMap: AANonceMap;
+    consumeInitCode: (sender: string) => string;
+    aaManager: AAAccountManager;
+    config: XLayerConfig;
+    defaultCallGasLimit: bigint;
+}
+export interface BuildSellOpsParams {
+    sellers: Wallet[];
+    sellerAis: Array<{
+        sender: string;
+        deployed: boolean;
+    }>;
+    sellAmountsWei: bigint[];
+    tokenAddress: string;
+    effectiveRouter: string;
+    deadline: number;
+    wokbAddress: string;
+    sellerAllowances: Map<string, bigint>;
+    nonceMap: AANonceMap;
+    consumeInitCode: (sender: string) => string;
+    aaManager: AAAccountManager;
+    config: XLayerConfig;
+    defaultApproveGasLimit: bigint;
+    defaultSellGasLimit: bigint;
+}
+/**
+ * ✅ 优化 1: 并行构建所有买入 UserOp
+ */
+export declare function buildBuyUserOps(params: BuildBuyOpsParams): Promise<UserOperation[]>;
+/**
+ * ✅ 优化 3: 合并 Approve 和 Sell
+ */
+export declare function buildSellUserOps(params: BuildSellOpsParams): Promise<UserOperation[]>;

package/dist/xlayer/userOp-builder.js

@@ -0,0 +1,97 @@
+/**
+ * XLayer AA UserOp 批量构建器
+ */
+import { ethers } from 'ethers';
+import { encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
+import { encodeApproveCall, parseOkb } from './portal-ops.js';
+/**
+ * ✅ 优化 1: 并行构建所有买入 UserOp
+ */
+export async function buildBuyUserOps(params) {
+    const { buyers, buyerAis, buyAmountsWei, tokenAddress, effectiveRouter, deadline, wokbAddress, nonceMap, consumeInitCode, aaManager, config, defaultCallGasLimit } = params;
+    const buyOpPromises = buyers.map(async (w, i) => {
+        const ai = buyerAis[i];
+        const sender = ai.sender;
+        const buyWei = buyAmountsWei[i] ?? 0n;
+        if (buyWei <= 0n)
+            return null;
+        const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [wokbAddress, tokenAddress], sender, deadline);
+        const callData = encodeExecute(effectiveRouter, buyWei, swapData);
+        const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+            ownerWallet: w,
+            sender,
+            nonce: nonceMap.next(sender),
+            initCode: consumeInitCode(sender),
+            callData,
+            deployed: ai.deployed,
+            fixedGas: {
+                ...(config.fixedGas ?? {}),
+                callGasLimit: config.fixedGas?.callGasLimit ?? defaultCallGasLimit,
+            },
+        });
+        await aaManager.ensureSenderBalance(w, sender, buyWei + prefundWei + parseOkb('0.0001'), `buyFirstDex/buyer${i + 1}/fund`);
+        const signed = await aaManager.signUserOp(userOp, w);
+        return signed.userOp;
+    });
+    const ops = await Promise.all(buyOpPromises);
+    return ops.filter((op) => op !== null);
+}
+/**
+ * ✅ 优化 3: 合并 Approve 和 Sell
+ */
+export async function buildSellUserOps(params) {
+    const { sellers, sellerAis, sellAmountsWei, tokenAddress, effectiveRouter, deadline, wokbAddress, sellerAllowances, nonceMap, consumeInitCode, aaManager, config, defaultApproveGasLimit, defaultSellGasLimit } = params;
+    const sellOpPromises = sellers.map(async (w, i) => {
+        const ai = sellerAis[i];
+        const sender = ai.sender;
+        const sellWei = sellAmountsWei[i] ?? 0n;
+        if (sellWei <= 0n)
+            return null;
+        const allowance = sellerAllowances.get(sender) ?? 0n;
+        const needApprove = allowance < sellWei;
+        if (needApprove) {
+            // ✅ 合并 approve + sell 到一个 UserOp
+            const approveData = encodeApproveCall(effectiveRouter, ethers.MaxUint256);
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellWei, 0n, [tokenAddress, wokbAddress], sender, deadline);
+            const batchCallData = encodeExecuteBatch([tokenAddress, effectiveRouter], [0n, 0n], [approveData, sellSwapData]);
+            const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: w,
+                sender,
+                nonce: nonceMap.next(sender),
+                initCode: consumeInitCode(sender),
+                callData: batchCallData,
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(config.fixedGas ?? {}),
+                    callGasLimit: config.fixedGas?.callGasLimit ?? (defaultApproveGasLimit + defaultSellGasLimit),
+                },
+            });
+            await aaManager.ensureSenderBalance(w, sender, prefundWei + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/batch-fund`);
+            const signed = await aaManager.signUserOp(userOp, w);
+            return signed.userOp;
+        }
+        else {
+            // 只需要 sell
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellWei, 0n, [tokenAddress, wokbAddress], sender, deadline);
+            const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
+            const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: w,
+                sender,
+                nonce: nonceMap.next(sender),
+                initCode: consumeInitCode(sender),
+                callData: sellCallData,
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(config.fixedGas ?? {}),
+                    callGasLimit: config.fixedGas?.callGasLimit ?? defaultSellGasLimit,
+                },
+            });
+            await aaManager.ensureSenderBalance(w, sender, prefundWei + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/sell-fund`);
+            const signed = await aaManager.signUserOp(userOp, w);
+            return signed.userOp;
+        }
+    });
+    const ops = await Promise.all(sellOpPromises);
+    return ops.filter((op) => op !== null);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.5.51",
+  "version": "1.5.53",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",