four-flap-meme-sdk 1.5.93 → 1.5.95

package/dist/xlayer/bundle.js

@@ -73,7 +73,6 @@ class AANonceMap {
 // 固定 gas（用于大规模减少 RPC）；具体值允许通过 config.fixedGas 覆盖
 const DEFAULT_CALL_GAS_LIMIT_BUY = DEFAULT_CALL_GAS_LIMIT_SELL; // buy 与 sell 共享一个保守值
 const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
-const DEFAULT_CALL_GAS_LIMIT_TRANSFER = 150000n;
 const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
 function resolveProfitSettings(config) {
     const extractProfit = config?.extractProfit !== false; // 默认 true
@@ -1350,17 +1349,31 @@ export class BundleExecutor {
         const totalBuyWei = buyerData.reduce((sum, d) => sum + d.buyWei, 0n);
         const totalBuyProfitWei = buyerData.reduce((sum, d) => sum + d.profitWei, 0n);
         // ✅ 并行构建和签名所有买家的 UserOps
+        // ✅ V3/V4 代币使用 swapExactInputV3（支持 extensionData），与 bundleGraduateBuy 保持一致
+        const extensionData = params.extensionData ?? '0x';
         const signedBuyOps = await mapWithConcurrency(buyerData, 5, async (data) => {
             const { buyer, buyWei, accountInfo } = data;
-            const swapData = portalIface.encodeFunctionData('swapExactInput', [
-                {
-                    inputToken,
-                    outputToken: tokenAddress,
-                    inputAmount: buyWei,
-                    minOutputAmount: 0n,
-                    permitData: '0x',
-                },
-            ]);
+            // ✅ V3/V4 代币使用 swapExactInputV3，否则使用旧版 swapExactInput
+            const swapData = (useV3 || useV4)
+                ? portalIface.encodeFunctionData('swapExactInputV3', [
+                    {
+                        inputToken,
+                        outputToken: tokenAddress,
+                        inputAmount: buyWei,
+                        minOutputAmount: 0n,
+                        permitData: '0x',
+                        extensionData,
+                    },
+                ])
+                : portalIface.encodeFunctionData('swapExactInput', [
+                    {
+                        inputToken,
+                        outputToken: tokenAddress,
+                        inputAmount: buyWei,
+                        minOutputAmount: 0n,
+                        permitData: '0x',
+                    },
+                ]);
             // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
             let buyCallData;
             if (useNativeToken) {
@@ -1666,7 +1679,6 @@ export class BundleExecutor {
         const tokenState = await this.portalQuery.getTokenV7(tokenAddress);
         // ✅ 内联曲线公式计算毕业容量
         // 公式：graduationReserve = h * k（曲线参数从合约读取）
-        const r = tokenState.r; // 衰减因子
         const h = tokenState.h; // 初始高度
         const k = tokenState.k; // 缩放系数
         // 毕业储备 = h * k (wei)
@@ -1677,9 +1689,6 @@ export class BundleExecutor {
         const graduateCapacity = graduationAmount ?? 73.38;
         const remainingToGraduate = Math.max(0, graduateCapacity - parseFloat(poolReserveOkb));
         // const graduateCapacity = parseFloat(graduationReserve);
-        // 剩余毕业金额 = 毕业阈值 - 当前储备（加 0.5% 手续费缓冲）
-        const remaining = Math.max(0, graduateCapacity - parseFloat(poolReserveOkb));
-        const remainingWithFee = remaining * 1.005; // 0.5% 手续费缓冲
         // const remainingToGraduate = remainingWithFee;
         const remainingToGraduateWei = ethers.parseEther(remainingToGraduate.toFixed(18));
         //

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

@@ -4,6 +4,7 @@
 import { XLayerConfig, BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
 /**
  * XLayer AA 外盘换手执行器
+ * ✅ 支持 V2 和 V3 交易
  */
 export declare class AADexSwapExecutor {
     private aaManager;
@@ -13,16 +14,27 @@ export declare class AADexSwapExecutor {
     constructor(config?: XLayerConfig);
     /**
      * 获取 Router 地址
+     * @param tradeType - 交易类型：'V2' 或 'V3'
      */
     private getEffectiveRouter;
+    /**
+     * 判断是否使用 V3
+     */
+    private isV3;
+    /**
+     * 获取 V3 swap 的 deadline
+     */
+    private getDexDeadline;
     /**
      * AA 外盘单钱包换手签名
+     * ✅ 支持 V2 和 V3 交易
      */
     bundleSwapSign(params: BundleSwapSignParams & {
         skipApprovalCheck?: boolean;
     }): Promise<BundleSwapSignResult>;
     /**
      * AA 外盘批量换手签名
+     * ✅ 支持 V2 和 V3 交易
      */
     bundleBatchSwapSign(params: BundleBatchSwapSignParams & {
         skipApprovalCheck?: boolean;

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

@@ -3,10 +3,10 @@
  */
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
-import { POTATOSWAP_V2_ROUTER, WOKB, MULTICALL3, } from './constants.js';
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_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 { encodeApproveCall, lpFeeProfileToV3Fee, } from './portal-ops.js';
+import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
 import { BundleExecutor } from './bundle.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
 const multicallIface = new ethers.Interface([
@@ -45,11 +45,9 @@ function calculateProfitWei(amountWei, profitBps) {
         return 0n;
     return (amountWei * BigInt(profitBps)) / 10000n;
 }
-function getDexDeadline(minutes = 20) {
-    return Math.floor(Date.now() / 1000) + minutes * 60;
-}
 /**
  * XLayer AA 外盘换手执行器
+ * ✅ 支持 V2 和 V3 交易
  */
 export class AADexSwapExecutor {
     constructor(config = {}) {
@@ -63,23 +61,41 @@ export class AADexSwapExecutor {
     }
     /**
      * 获取 Router 地址
+     * @param tradeType - 交易类型：'V2' 或 'V3'
      */
     getEffectiveRouter(params) {
         if (params.routerAddress)
             return params.routerAddress;
+        // ✅ 支持 V3 Router
+        if (params.tradeType === 'V3')
+            return POTATOSWAP_V3_ROUTER;
         if (params.dexKey === 'DYORSWAP') {
             return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
         }
         return POTATOSWAP_V2_ROUTER;
     }
+    /**
+     * 判断是否使用 V3
+     */
+    isV3(tradeType) {
+        return tradeType === 'V3';
+    }
+    /**
+     * 获取 V3 swap 的 deadline
+     */
+    getDexDeadline(minutes = 20) {
+        return Math.floor(Date.now() / 1000) + minutes * 60;
+    }
     /**
      * AA 外盘单钱包换手签名
+     * ✅ 支持 V2 和 V3 交易
      */
     async bundleSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
-        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
+        const isV3Trade = this.isV3(tradeType);
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn, tradeType });
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
         const buyerOwner = new Wallet(buyerPrivateKey, provider);
@@ -157,8 +173,26 @@ export class AADexSwapExecutor {
             const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
             outOps.push(signedApprove.userOp);
         }
-        // Sell op
-        const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerSender, getDexDeadline());
+        // Sell op - ✅ 支持 V2 和 V3
+        const deadline = this.getDexDeadline();
+        let sellSwapData;
+        if (isV3Trade) {
+            // V3: 使用 exactInputSingle
+            sellSwapData = encodeSwapExactTokensForETHV3({
+                tokenIn: tokenAddress,
+                tokenOut: WOKB,
+                fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                recipient: sellerSender,
+                deadline,
+                amountIn: sellAmountWei,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n,
+            });
+        }
+        else {
+            // V2: 使用 swapExactTokensForETHSupportingFeeOnTransferTokens
+            sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerSender, deadline);
+        }
         const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
         const signedSell = await this.aaManager.buildUserOpWithState({
             ownerWallet: sellerOwner,
@@ -183,8 +217,25 @@ export class AADexSwapExecutor {
             });
             outOps.push(signedTransfer.userOp);
         }
-        // Buy op
-        const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, getDexDeadline());
+        // Buy op - ✅ 支持 V2 和 V3
+        let buySwapData;
+        if (isV3Trade) {
+            // V3: 使用 exactInputSingle（注意：V3 买入需要用 WOKB 作为输入）
+            buySwapData = encodeSwapExactETHForTokensV3({
+                tokenIn: WOKB,
+                tokenOut: tokenAddress,
+                fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                recipient: buyerSender,
+                deadline,
+                amountIn: finalBuyAmountWei,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n,
+            });
+        }
+        else {
+            // V2: 使用 swapExactETHForTokensSupportingFeeOnTransferTokens
+            buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, deadline);
+        }
         const buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
         const signedBuy = await this.aaManager.buildUserOpWithState({
             ownerWallet: buyerOwner,
@@ -250,12 +301,14 @@ export class AADexSwapExecutor {
     }
     /**
      * AA 外盘批量换手签名
+     * ✅ 支持 V2 和 V3 交易
      */
     async bundleBatchSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, 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, tradeType, lpFeeProfile = 0, } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
-        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
+        const isV3Trade = this.isV3(tradeType);
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn, tradeType });
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
         const buyerOwners = buyerPrivateKeys.map(pk => new Wallet(pk, provider));
@@ -311,8 +364,26 @@ export class AADexSwapExecutor {
             const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
             outOps.push(signedApprove.userOp);
         }
-        // Sell op
-        const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerAi.sender, getDexDeadline());
+        // Sell op - ✅ 支持 V2 和 V3
+        const deadline = this.getDexDeadline();
+        let sellSwapData;
+        if (isV3Trade) {
+            // V3: 使用 exactInputSingle
+            sellSwapData = encodeSwapExactTokensForETHV3({
+                tokenIn: tokenAddress,
+                tokenOut: WOKB,
+                fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                recipient: sellerAi.sender,
+                deadline,
+                amountIn: sellAmountWei,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n,
+            });
+        }
+        else {
+            // V2: 使用 swapExactTokensForETHSupportingFeeOnTransferTokens
+            sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerAi.sender, deadline);
+        }
         const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
         const signedSell = await this.aaManager.buildUserOpWithState({
             ownerWallet: sellerOwner,
@@ -427,11 +498,28 @@ export class AADexSwapExecutor {
                 }
             }
         }
-        // Batch Buy ops（分发后再执行）
+        // Batch Buy ops（分发后再执行）- ✅ 支持 V2 和 V3
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
             const buyWei = buyAmountsWei[i];
-            const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ai.sender, getDexDeadline());
+            let buySwapData;
+            if (isV3Trade) {
+                // V3: 使用 exactInputSingle
+                buySwapData = encodeSwapExactETHForTokensV3({
+                    tokenIn: WOKB,
+                    tokenOut: tokenAddress,
+                    fee: lpFeeProfileToV3Fee(lpFeeProfile),
+                    recipient: ai.sender,
+                    deadline,
+                    amountIn: buyWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                });
+            }
+            else {
+                // V2: 使用 swapExactETHForTokensSupportingFeeOnTransferTokens
+                buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ai.sender, deadline);
+            }
             const buyCallData = encodeExecute(effectiveRouter, buyWei, buySwapData);
             const signedBuy = await this.aaManager.buildUserOpWithState({
                 ownerWallet: buyerOwners[i],

package/dist/xlayer/types.d.ts

@@ -361,6 +361,8 @@ export interface BundleSwapParams {
     dexKey?: string;
     /** 显式指定 Router 地址（若不传则由 SDK 根据 dexKey 自动决定） */
     routerAddress?: string;
+    /** LP 费率档位 (V3 专用): 0=STANDARD (0.25%), 1=LOW (0.01%), 2=HIGH (1%) */
+    lpFeeProfile?: number;
     /** 代币地址 */
     tokenAddress: string;
     /** 卖方 Owner 私钥 */
@@ -480,6 +482,8 @@ export interface BundleBatchSwapParams {
     dexKey?: string;
     /** 显式指定 Router 地址（若不传则由 SDK 根据 dexKey 自动决定） */
     routerAddress?: string;
+    /** LP 费率档位 (V3 专用): 0=STANDARD (0.25%), 1=LOW (0.01%), 2=HIGH (1%) */
+    lpFeeProfile?: number;
     /** 代币地址 */
     tokenAddress: string;
     /** 卖方 Owner 私钥 */

package/package.json

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