four-flap-meme-sdk 1.5.75 → 1.5.76

package/dist/xlayer/bundle.js

@@ -8,12 +8,13 @@
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
 import { Wallet, Interface, Contract, ethers } from 'ethers';
-import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
+import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, WOKB, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, } from './constants.js';
 import { AAAccountManager, encodeExecute, encodeExecuteBatch, createWallet } from './aa-account.js';
-import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
+import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, lpFeeProfileToV3Fee, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { DexQuery } from './dex.js';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactETHForTokensV3, } from './dex.js';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -1458,8 +1459,8 @@ export class BundleExecutor {
                 return info;
             });
             const ops2 = [];
-            const deadline = Math.floor(Date.now() / 1000) + 3600; // ✅ 60 min (修复 DeadlineExceeded 错误)
-            console.log(`[DeadlineDebug] bundleCreateToDexSign: current=${Math.floor(Date.now() / 1000)}, deadline=${deadline}, buffer=${3600}s`);
+            const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
+            const dexType = (params.lpFeeProfile !== undefined && params.lpFeeProfile >= 0) ? 'V3' : 'V2';
             // ✅ 预计算所有外盘买入金额
             const dexBuyData = dexBuyerWallets.map((wallet, i) => {
                 const buyWei = parseOkb(dexBuyAmounts[i]);
@@ -1469,11 +1470,26 @@ export class BundleExecutor {
             // ✅ 并行构建和签名所有外盘买入 UserOps
             const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
                 const { wallet, info, buyWei } = data;
-                // ✅ 外盘买入：使用 Portal 的 swapExactInput 进行自动路由
-                // 优势：Portal 会自动识别代币的池子类型（V2/V3），无需手动指定
-                // 参考 BSC 版本的逻辑（create-to-dex.ts:604-616）
-                const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
-                const dexBuyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
+                let swapData;
+                let routerAddress;
+                if (dexType === 'V3') {
+                    routerAddress = POTATOSWAP_V3_ROUTER;
+                    swapData = encodeSwapExactETHForTokensV3({
+                        tokenIn: WOKB,
+                        tokenOut: tokenAddress,
+                        fee: lpFeeProfileToV3Fee(params.lpFeeProfile ?? 0),
+                        recipient: info.sender,
+                        deadline,
+                        amountIn: buyWei,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    });
+                }
+                else {
+                    routerAddress = POTATOSWAP_V2_ROUTER;
+                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
+                }
+                const dexBuyCallData = encodeExecute(routerAddress, buyWei, swapData);
                 const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
@@ -1481,7 +1497,7 @@ export class BundleExecutor {
                     nonce: nonceMap.next(info.sender),
                     initCode: '0x', // HandleOps1 已部署
                     deployed: true,
-                    fixedGas: { callGasLimit: 800000n } // ✅ 提高到 800K，外盘买入可能需要更多 gas
+                    fixedGas: { callGasLimit: 600000n }
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
@@ -1539,13 +1555,24 @@ export class BundleExecutor {
         const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, config = {} } = params;
         const aaManager = this.getAAManager();
         const provider = aaManager.getProvider();
-        // 1. 获取代币状态，计算剩余毕业容量
-        const tokenState = await this.portalQuery.getTokenV5(tokenAddress);
+        // 1. 获取代币状态，动态计算毕业容量
+        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)
+        const graduationReserveWei = h * k / (10n ** 18n);
+        const graduationReserve = ethers.formatEther(graduationReserveWei);
         const poolReserveOkb = ethers.formatEther(tokenState.reserve);
-        const graduateCapacity = 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));
-        console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, Remaining: ${remainingToGraduate} OKB`);
+        console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, Graduation: ${graduationReserve} OKB, Remaining: ${remainingToGraduate.toFixed(4)} OKB`);
         // 2. 准备钱包
         const sharedProvider = this.aaManager.getProvider();
         const wallets = privateKeys.map(pk => new Wallet(pk, sharedProvider));
@@ -1635,16 +1662,33 @@ export class BundleExecutor {
                 nonceMap.init(info.sender, info.nonce);
                 return info;
             });
-            // ✅ 移除 deadline：Portal 的 swapExactInput 内部会处理 deadline
-            // console.log 也不再需要
+            const deadline = Math.floor(Date.now() / 1000) + 1200;
+            const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
             const signedDexBuyOps = await mapWithConcurrency(dexBuyers, 5, async (data, i) => {
                 const { wallet, amount } = data;
                 const info = dexBuyerInfos[i];
                 totalDexBuyWei += amount;
-                // ✅ 使用 Portal 的 swapExactInput 进行自动路由（OKB -> 代币）
-                // 优势：自动识别池子类型（V2/V3），无需 approve（OKB 是原生币）
-                const buyData = encodeBuyCall(tokenAddress, amount, 0n);
-                const dexBuyCallData = encodeExecute(FLAP_PORTAL, amount, buyData);
+                let swapData;
+                let routerAddress;
+                if (dexType === 'V3') {
+                    routerAddress = POTATOSWAP_V3_ROUTER;
+                    swapData = encodeSwapExactETHForTokensV3({
+                        tokenIn: WOKB,
+                        tokenOut: tokenAddress,
+                        fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                        recipient: info.sender,
+                        deadline,
+                        amountIn: amount,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    });
+                }
+                else {
+                    routerAddress = POTATOSWAP_V2_ROUTER;
+                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
+                }
+                // ✅ 简化为单次 execute，不需要 executeBatch
+                const dexBuyCallData = encodeExecute(routerAddress, amount, swapData);
                 const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
@@ -1652,7 +1696,7 @@ export class BundleExecutor {
                     nonce: nonceMap.next(info.sender),
                     initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
                     deployed: info.deployed,
-                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 800000n } // ✅ 提高到 800K
+                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 600000n }
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;

package/dist/xlayer/constants.d.ts

@@ -69,9 +69,11 @@ export declare const ENTRYPOINT_ABI: readonly ["function getNonce(address sender
 /** SimpleAccount ABI */
 export declare const SIMPLE_ACCOUNT_ABI: readonly ["function execute(address dest, uint256 value, bytes func) external", "function executeBatch(address[] calldata dest, bytes[] calldata func) external", "function executeBatch(address[] calldata dest, uint256[] calldata values, bytes[] calldata func) external"];
 /** Flap Portal ABI */
-export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) external payable returns (address)", "function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData) params) external payable returns (address)", "function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile) params) external payable returns (address)"];
+export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) external payable returns (address)", "function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData) params) external payable returns (address)", "function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile) params) external payable returns (address)"];
 /** ERC20 ABI */
 export declare const ERC20_ABI: readonly ["function balanceOf(address account) view returns (uint256)", "function allowance(address owner, address spender) view returns (uint256)", "function approve(address spender, uint256 amount) returns (bool)", "function transfer(address to, uint256 amount) returns (bool)", "function decimals() view returns (uint8)", "function symbol() view returns (string)", "function name() view returns (string)"];
 /** PotatoSwap V2 Router ABI */
 export declare const POTATOSWAP_V2_ROUTER_ABI: readonly ["function swapExactETHForTokens(uint amountOutMin, address[] calldata path, address to, uint deadline) external payable returns (uint[] memory amounts)", "function swapExactTokensForETH(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline) external returns (uint[] memory amounts)", "function swapExactTokensForTokens(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline) external returns (uint[] memory amounts)", "function swapExactETHForTokensSupportingFeeOnTransferTokens(uint amountOutMin, address[] calldata path, address to, uint deadline) external payable", "function swapExactTokensForETHSupportingFeeOnTransferTokens(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline) external", "function swapExactTokensForTokensSupportingFeeOnTransferTokens(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline) external", "function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)", "function getAmountsIn(uint amountOut, address[] calldata path) external view returns (uint[] memory amounts)", "function WETH() external pure returns (address)"];
+/** PotatoSwap V3 Router ABI (SwapRouter02) */
+export declare const POTATOSWAP_V3_ROUTER_ABI: readonly ["function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96) params) external payable returns (uint256 amountOut)", "function exactOutputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountOut, uint256 amountInMaximum, uint160 sqrtPriceLimitX96) params) external payable returns (uint256 amountIn)"];
 export type HexString = `0x${string}`;

package/dist/xlayer/constants.js

@@ -113,6 +113,7 @@ export const PORTAL_ABI = [
     'function previewBuy(address token, uint256 ethAmount) external view returns (uint256)',
     'function previewSell(address token, uint256 tokenAmount) external view returns (uint256)',
     'function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))',
+    'function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))',
     'function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) external payable returns (address)',
     'function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData) params) external payable returns (address)',
     'function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile) params) external payable returns (address)',
@@ -142,3 +143,8 @@ export const POTATOSWAP_V2_ROUTER_ABI = [
     'function getAmountsIn(uint amountOut, address[] calldata path) external view returns (uint[] memory amounts)',
     'function WETH() external pure returns (address)',
 ];
+/** PotatoSwap V3 Router ABI (SwapRouter02) */
+export const POTATOSWAP_V3_ROUTER_ABI = [
+    'function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96) params) external payable returns (uint256 amountOut)',
+    'function exactOutputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountOut, uint256 amountInMaximum, uint160 sqrtPriceLimitX96) params) external payable returns (uint256 amountIn)',
+];

package/dist/xlayer/dex-bundle.js

@@ -7,10 +7,10 @@
  * - ✅ 支持“刮取利润”：在归集时从可转出金额中按 bps 拆分转到 PROFIT_CONFIG.RECIPIENT
  */
 import { Wallet, Contract, Interface, ethers } from 'ethers';
-import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
+import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB, } from './constants.js';
 import { AAAccountManager, encodeExecute } from './aa-account.js';
-import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
-import { PortalQuery, encodeApproveCall, parseOkb, formatOkb } from './portal-ops.js';
+import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
+import { PortalQuery, encodeApproveCall, parseOkb, formatOkb, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
 import { AANonceMap } from './types.js';
@@ -48,6 +48,8 @@ export class DexBundleExecutor {
     getEffectiveRouter(params) {
         if (params.routerAddress)
             return params.routerAddress;
+        if (params.dexType === 'V3')
+            return POTATOSWAP_V3_ROUTER;
         if (params.dexKey === 'DYORSWAP') {
             return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
         }
@@ -196,7 +198,8 @@ export class DexBundleExecutor {
         if (privateKeys.length !== buyAmounts.length) {
             throw new Error('私钥数量和购买金额数量必须一致');
         }
-        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress });
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress, dexType: params.dexType });
+        const isV3 = params.dexType === 'V3';
         const deadline = getDexDeadline(this.getDeadlineMinutes({ deadlineMinutes }));
         const sharedProvider = this.aaManager.getProvider();
         const wallets = privateKeys.map((pk) => new Wallet(pk, sharedProvider));
@@ -204,7 +207,7 @@ export class DexBundleExecutor {
         const beneficiary = bundlerSigner.address;
         const reserveWei = parseOkb(withdrawReserve);
         console.log('=== XLayer DEX Bundle Buy -> Sell ===');
-        console.log('router:', effectiveRouter);
+        console.log('router:', effectiveRouter, isV3 ? '(V3)' : '(V2)');
         console.log('token:', tokenAddress);
         console.log('owners:', wallets.length);
         console.log('sellPercent:', sellPercent);
@@ -226,7 +229,22 @@ export class DexBundleExecutor {
         });
         const buyCallDatas = buyWeis.map((buyWei, i) => {
             const sender = senders[i];
-            const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], sender, deadline);
+            let swapData;
+            if (isV3) {
+                swapData = encodeSwapExactETHForTokensV3({
+                    tokenIn: WOKB,
+                    tokenOut: tokenAddress,
+                    fee: lpFeeProfileToV3Fee(params.lpFeeProfile ?? 0),
+                    recipient: sender,
+                    deadline,
+                    amountIn: buyWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                });
+            }
+            else {
+                swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], sender, deadline);
+            }
             return encodeExecute(effectiveRouter, buyWei, swapData);
         });
         const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
@@ -286,7 +304,22 @@ export class DexBundleExecutor {
             if (sellAmount === 0n)
                 return out;
             const sellNonce = nonceMap.next(sender);
-            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmount, 0n, [tokenAddress, WOKB], sender, deadline);
+            let sellSwapData;
+            if (isV3) {
+                sellSwapData = encodeSwapExactTokensForETHV3({
+                    tokenIn: tokenAddress,
+                    tokenOut: WOKB,
+                    fee: lpFeeProfileToV3Fee(params.lpFeeProfile ?? 0),
+                    recipient: sender,
+                    deadline,
+                    amountIn: sellAmount,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n,
+                });
+            }
+            else {
+                sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmount, 0n, [tokenAddress, WOKB], sender, deadline);
+            }
             const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
             const signedSell = await this.aaManager.buildUserOpWithState({
                 ownerWallet: w,

package/dist/xlayer/dex.d.ts

@@ -7,6 +7,30 @@
  * - 通过 AA 账户执行
  */
 import type { XLayerConfig, DexSwapResult } from './types.js';
+export declare function encodeSwapExactETHForTokensV3(params: {
+    tokenIn: string;
+    tokenOut: string;
+    fee: number;
+    recipient: string;
+    deadline: number;
+    amountIn: bigint;
+    amountOutMinimum: bigint;
+    sqrtPriceLimitX96: bigint;
+}): string;
+/**
+ * 编码 swapExactTokensForETHV3 调用
+ * 对齐 Uniswap V3 的 exactInputSingle 逻辑
+ */
+export declare function encodeSwapExactTokensForETHV3(params: {
+    tokenIn: string;
+    tokenOut: string;
+    fee: number;
+    recipient: string;
+    deadline: number;
+    amountIn: bigint;
+    amountOutMinimum: bigint;
+    sqrtPriceLimitX96: bigint;
+}): string;
 /**
  * 编码 swapExactETHForTokens 调用
  */

package/dist/xlayer/dex.js

@@ -7,13 +7,24 @@
  * - 通过 AA 账户执行
  */
 import { ethers, Contract, Interface, JsonRpcProvider } from 'ethers';
-import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V2_ROUTER_ABI, WOKB, DEFAULT_RPC_URL, XLAYER_CHAIN_ID, ERC20_ABI, } from './constants.js';
+import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V2_ROUTER_ABI, POTATOSWAP_V3_ROUTER_ABI, WOKB, DEFAULT_RPC_URL, XLAYER_CHAIN_ID, ERC20_ABI, } from './constants.js';
 import { AAAccountManager, encodeExecute, createWallet } from './aa-account.js';
 import { encodeApproveCall, parseOkb, formatOkb } from './portal-ops.js';
 // ============================================================================
 // DEX 交易编码器
 // ============================================================================
 const routerIface = new Interface(POTATOSWAP_V2_ROUTER_ABI);
+const v3RouterIface = new Interface(POTATOSWAP_V3_ROUTER_ABI);
+export function encodeSwapExactETHForTokensV3(params) {
+    return v3RouterIface.encodeFunctionData('exactInputSingle', [params]);
+}
+/**
+ * 编码 swapExactTokensForETHV3 调用
+ * 对齐 Uniswap V3 的 exactInputSingle 逻辑
+ */
+export function encodeSwapExactTokensForETHV3(params) {
+    return v3RouterIface.encodeFunctionData('exactInputSingle', [params]);
+}
 /**
  * 编码 swapExactETHForTokens 调用
  */

package/dist/xlayer/portal-ops.d.ts

@@ -165,6 +165,25 @@ export declare class PortalQuery {
         nativeToQuoteSwapEnabled: boolean;
         extensionID: string;
     }>;
+    /**
+     * 获取代币状态 V7 (包含 lpFeeProfile)
+     */
+    getTokenV7(tokenAddress: string): Promise<{
+        status: number;
+        reserve: bigint;
+        circulatingSupply: bigint;
+        price: bigint;
+        tokenVersion: number;
+        r: bigint;
+        h: bigint;
+        k: bigint;
+        dexSupplyThresh: bigint;
+        quoteTokenAddress: string;
+        nativeToQuoteSwapEnabled: boolean;
+        extensionID: string;
+        dexId: number;
+        lpFeeProfile: number;
+    }>;
     /**
      * 批量获取多个账户的代币余额
      */
@@ -185,6 +204,14 @@ export declare class PortalQuery {
  * @param slippageBps 滑点基点（如 100 = 1%）
  */
 export declare function applySlippage(expectedOutput: bigint, slippageBps: number): bigint;
+/**
+ * 将 Portal 的 lpFeeProfile 转换为 V3 Router 所需的 fee (100万分比)
+ *
+ * STANDARD = 0.25% (2500)
+ * LOW = 0.01% (100)
+ * HIGH = 1% (10000)
+ */
+export declare function lpFeeProfileToV3Fee(profile: number): number;
 /**
  * 创建 Portal 查询器
  */

package/dist/xlayer/portal-ops.js

@@ -198,6 +198,28 @@ export class PortalQuery {
             extensionID: raw[11],
         };
     }
+    /**
+     * 获取代币状态 V7 (包含 lpFeeProfile)
+     */
+    async getTokenV7(tokenAddress) {
+        const raw = await this.portal.getTokenV7(tokenAddress);
+        return {
+            status: Number(raw[0]),
+            reserve: raw[1],
+            circulatingSupply: raw[2],
+            price: raw[3],
+            tokenVersion: Number(raw[4]),
+            r: raw[5],
+            h: raw[6],
+            k: raw[7],
+            dexSupplyThresh: raw[8],
+            quoteTokenAddress: raw[9],
+            nativeToQuoteSwapEnabled: raw[10],
+            extensionID: raw[11],
+            dexId: Number(raw[12]),
+            lpFeeProfile: Number(raw[13]),
+        };
+    }
     /**
      * 批量获取多个账户的代币余额
      */
@@ -343,6 +365,22 @@ export function applySlippage(expectedOutput, slippageBps) {
     const keep = BigInt(10000 - Math.max(0, Math.min(5000, slippageBps)));
     return (expectedOutput * keep) / 10000n;
 }
+/**
+ * 将 Portal 的 lpFeeProfile 转换为 V3 Router 所需的 fee (100万分比)
+ *
+ * STANDARD = 0.25% (2500)
+ * LOW = 0.01% (100)
+ * HIGH = 1% (10000)
+ */
+export function lpFeeProfileToV3Fee(profile) {
+    switch (profile) {
+        case 1: return 100; // 0.01%
+        case 2: return 10000; // 1%
+        case 0:
+        default:
+            return 2500; // 0.25%
+    }
+}
 /**
  * 创建 Portal 查询器
  */

package/dist/xlayer/types.d.ts

@@ -203,7 +203,7 @@ export interface BundleBuySellParams {
     tokenAddress: string;
     /** Owner 私钥列表 */
     privateKeys: string[];
-    /** 每个 owner 的买入金额（OKB 或 quoteToken，取决于 quoteToken 参数） */
+    /** 每个 owner 的買入金额（OKB 或 quoteToken，取决于 quoteToken 参数） */
     buyAmounts: string[];
     /** 买入使用的代币地址（零地址表示使用原生代币 OKB，非零地址表示使用 ERC20 代币如 USDC） */
     quoteToken?: string;
@@ -217,6 +217,10 @@ export interface BundleBuySellParams {
     withdrawReserve?: string;
     /** 配置覆盖 */
     config?: Partial<XLayerConfig>;
+    /** LP 费率档位 (V3 专用): 0=STANDARD, 1=LOW, 2=HIGH */
+    lpFeeProfile?: number;
+    /** DEX 类型: 'V2' | 'V3' */
+    dexType?: 'V2' | 'V3';
 }
 /**
  * 捆绑发射签名参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.5.75",
+  "version": "1.5.76",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",
@@ -36,4 +36,4 @@
   "devDependencies": {
     "typescript": "^5.6.3"
   }
-}
+}

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -1,16 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
-/**
- * 验证公钥格式（Base64）
- */
-export declare function validatePublicKey(publicKeyBase64: string): boolean;

package/dist/flap/portal-bundle-merkle/encryption.js

@@ -1,146 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 获取全局 crypto 对象（最简单直接的方式）
- */
-function getCryptoAPI() {
-    // 尝试所有可能的全局对象，优先浏览器环境
-    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
-        (typeof self !== 'undefined' && self.crypto) ||
-        (typeof global !== 'undefined' && global.crypto) ||
-        (typeof globalThis !== 'undefined' && globalThis.crypto);
-    if (!cryptoObj) {
-        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
-            '请确保在 HTTPS 或 localhost 下运行');
-    }
-    return cryptoObj;
-}
-/**
- * 获取 SubtleCrypto（用于加密操作）
- */
-function getSubtleCrypto() {
-    const crypto = getCryptoAPI();
-    if (!crypto.subtle) {
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
-        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
-            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
-            '3) 不在无痕/隐私浏览模式下');
-    }
-    return crypto.subtle;
-}
-/**
- * Base64 转 ArrayBuffer（优先使用浏览器 API）
- */
-function base64ToArrayBuffer(base64) {
-    // 浏览器环境（优先）
-    if (typeof atob !== 'undefined') {
-        const binaryString = atob(base64);
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
-        }
-        return bytes.buffer;
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(base64, 'base64').buffer;
-    }
-    throw new Error('❌ Base64 解码不可用');
-}
-/**
- * ArrayBuffer 转 Base64（优先使用浏览器 API）
- */
-function arrayBufferToBase64(buffer) {
-    // 浏览器环境（优先）
-    if (typeof btoa !== 'undefined') {
-        const bytes = new Uint8Array(buffer);
-        let binary = '';
-        for (let i = 0; i < bytes.length; i++) {
-            binary += String.fromCharCode(bytes[i]);
-        }
-        return btoa(binary);
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(buffer).toString('base64');
-    }
-    throw new Error('❌ Base64 编码不可用');
-}
-/**
- * 生成随机 Hex 字符串
- */
-function randomHex(length) {
-    const crypto = getCryptoAPI();
-    const array = new Uint8Array(length);
-    crypto.getRandomValues(array);
-    return Array.from(array)
-        .map(b => b.toString(16).padStart(2, '0'))
-        .join('');
-}
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
-    try {
-        // 0. 获取 SubtleCrypto 和 Crypto API
-        const subtle = getSubtleCrypto();
-        const crypto = getCryptoAPI();
-        // 1. 准备数据
-        const payload = {
-            signedTransactions,
-            timestamp: Date.now(),
-            nonce: randomHex(8)
-        };
-        const plaintext = JSON.stringify(payload);
-        // 2. 生成临时 ECDH 密钥对
-        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
-        // 3. 导入服务器公钥
-        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
-        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
-        // 4. 派生共享密钥（AES-256）
-        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
-        // 5. AES-GCM 加密
-        const iv = crypto.getRandomValues(new Uint8Array(12));
-        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
-        // 6. 导出临时公钥
-        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
-        // 7. 返回加密包（JSON 格式）
-        return JSON.stringify({
-            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
-            i: arrayBufferToBase64(iv.buffer), // IV
-            d: arrayBufferToBase64(encrypted) // 密文
-        });
-    }
-    catch (error) {
-        throw new Error(`加密失败: ${error?.message || String(error)}`);
-    }
-}
-/**
- * 验证公钥格式（Base64）
- */
-export function validatePublicKey(publicKeyBase64) {
-    try {
-        if (!publicKeyBase64)
-            return false;
-        // Base64 字符集验证
-        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
-            return false;
-        // ECDH P-256 公钥固定长度 65 字节（未压缩）
-        // Base64 编码后约 88 字符
-        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
-            return false;
-        return true;
-    }
-    catch {
-        return false;
-    }
-}