four-flap-meme-sdk 1.5.91 → 1.5.93

package/dist/xlayer/bundle.js

@@ -14,7 +14,7 @@ import { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, enco
 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';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactTokensForETHV3, } from './dex.js';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -557,6 +557,10 @@ export class BundleExecutor {
         if (profitSettings.extractProfit && nativeProfitAmount > 0n) {
             console.log(`[利润提取] 总利润: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
         }
+        // ✅ 获取代币状态，判断是走内盘 Portal 还是外盘 DEX
+        const tokenState = await this.portalQuery.getTokenV7(tokenAddress);
+        const isGraduated = tokenState.status === 4; // DEX = 4 表示已毕业
+        console.log(`[BundleBuy] Token status: ${tokenState.status} (${isGraduated ? 'DEX/已毕业' : '内盘'})`);
         // 1. 预取账户信息（并行），并批量估算 gas（减少对 bundler 的 N 次请求）
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const nonceMap = new AANonceMap();
@@ -575,30 +579,62 @@ export class BundleExecutor {
                 // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
             }
         });
-        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要先 approve
-        const buyCallDatas = buyWeis.map((buyWei) => {
-            // 使用 portal 的 swapExactInput，支持 inputToken 参数
-            const portalIface = new Interface([
-                'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)',
-            ]);
-            const swapData = portalIface.encodeFunctionData('swapExactInput', [
-                {
-                    inputToken,
-                    outputToken: tokenAddress,
-                    inputAmount: buyWei,
-                    minOutputAmount: 0n,
-                    permitData: '0x',
-                },
-            ]);
-            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
-            if (useNativeToken) {
-                // 原生代币：直接 swap
-                return encodeExecute(this.portalAddress, buyWei, swapData);
+        // ✅ 构建买入 callData：根据代币状态选择 Portal（内盘）或 DEX（外盘）
+        const buyCallDatas = buyWeis.map((buyWei, i) => {
+            if (isGraduated) {
+                // ✅ 已毕业：使用 DEX Router 买入
+                const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
+                const dexType = (tokenState.lpFeeProfile !== undefined && tokenState.lpFeeProfile >= 0) ? 'V3' : 'V2';
+                const recipient = accountInfos[i].sender;
+                let swapData;
+                let routerAddress;
+                if (dexType === 'V3') {
+                    routerAddress = POTATOSWAP_V3_ROUTER;
+                    const v3Fee = lpFeeProfileToV3Fee(tokenState.lpFeeProfile);
+                    swapData = encodeSwapExactETHForTokensV3({
+                        tokenIn: WOKB,
+                        tokenOut: tokenAddress,
+                        fee: v3Fee,
+                        recipient,
+                        deadline,
+                        amountIn: buyWei,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    });
+                }
+                else {
+                    routerAddress = POTATOSWAP_V2_ROUTER;
+                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], recipient, deadline);
+                }
+                if (i < 3) {
+                    console.log(`[BundleBuy] Wallet[${i}]: 使用 ${dexType} DEX Router 买入, fee=${dexType === 'V3' ? lpFeeProfileToV3Fee(tokenState.lpFeeProfile) : 'N/A'}`);
+                }
+                return encodeExecute(routerAddress, buyWei, swapData);
             }
             else {
-                // ERC20 代币：approve + swap 批量调用
-                const approveData = encodeApproveCall(this.portalAddress, buyWei);
-                return encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+                // ✅ 未毕业：使用 Portal 的 swapExactInput
+                const portalIface = new Interface([
+                    'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)',
+                ]);
+                const swapData = portalIface.encodeFunctionData('swapExactInput', [
+                    {
+                        inputToken,
+                        outputToken: tokenAddress,
+                        inputAmount: buyWei,
+                        minOutputAmount: 0n,
+                        permitData: '0x',
+                    },
+                ]);
+                // ✅ 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));
@@ -730,6 +766,10 @@ export class BundleExecutor {
         console.log('token:', tokenAddress);
         console.log('owners:', wallets.length);
         console.log('sellPercent:', sellPercent);
+        // ✅ 获取代币状态，判断是走内盘 Portal 还是外盘 DEX
+        const tokenState = await this.portalQuery.getTokenV7(tokenAddress);
+        const isGraduated = tokenState.status === 4; // DEX = 4 表示已毕业
+        console.log(`[BundleSell] Token status: ${tokenState.status} (${isGraduated ? 'DEX/已毕业' : '内盘'})`);
         // ✅ 批量获取 accountInfo（含 sender/nonce/deployed），避免循环内重复 getAccountInfo
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const senders = accountInfos.map((ai) => ai.sender);
@@ -757,18 +797,71 @@ export class BundleExecutor {
             touched[i] = true;
         }
         if (sellItems.length > 0) {
-            const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
-                const i = it.i;
-                const signed = await this.buildSellUserOp(wallets[i], tokenAddress, it.sellAmount, it.sender, it.nonce, it.initCode, false, // needApprove=false，假设已预先授权
-                `owner${i + 1}`);
-                return signed.userOp;
-            });
-            sellOps.push(...signedSells);
+            const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+            if (isGraduated) {
+                // ✅ 已毕业：使用 DEX Router 卖出
+                const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
+                const dexType = (tokenState.lpFeeProfile !== undefined && tokenState.lpFeeProfile >= 0) ? 'V3' : 'V2';
+                const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
+                    const i = it.i;
+                    let swapData;
+                    let routerAddress;
+                    if (dexType === 'V3') {
+                        routerAddress = POTATOSWAP_V3_ROUTER;
+                        const v3Fee = lpFeeProfileToV3Fee(tokenState.lpFeeProfile);
+                        swapData = encodeSwapExactTokensForETHV3({
+                            tokenIn: tokenAddress,
+                            tokenOut: WOKB,
+                            fee: v3Fee,
+                            recipient: it.sender,
+                            deadline,
+                            amountIn: it.sellAmount,
+                            amountOutMinimum: 0n,
+                            sqrtPriceLimitX96: 0n
+                        });
+                    }
+                    else {
+                        routerAddress = POTATOSWAP_V2_ROUTER;
+                        swapData = encodeSwapExactTokensForETHSupportingFee(it.sellAmount, 0n, [tokenAddress, WOKB], it.sender, deadline);
+                    }
+                    if (i < 3) {
+                        console.log(`[BundleSell] Wallet[${i}]: 使用 ${dexType} DEX Router 卖出, fee=${dexType === 'V3' ? lpFeeProfileToV3Fee(tokenState.lpFeeProfile) : 'N/A'}`);
+                    }
+                    const sellCallData = encodeExecute(routerAddress, 0n, swapData);
+                    // 确保有足够余额
+                    await this.aaManager.ensureSenderBalance(wallets[i], it.sender, parseOkb('0.0003'), `owner${i + 1}/sell-prefund`);
+                    const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                        ownerWallet: wallets[i],
+                        sender: it.sender,
+                        callData: sellCallData,
+                        nonce: it.nonce,
+                        initCode: it.initCode,
+                        deployed: it.initCode === '0x',
+                        fixedGas: {
+                            ...(effConfig.fixedGas ?? {}),
+                            callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_SELL,
+                        },
+                    });
+                    const signed = await this.aaManager.signUserOp(userOp, wallets[i]);
+                    return signed.userOp;
+                });
+                sellOps.push(...signedSells);
+            }
+            else {
+                // ✅ 未毕业：使用 Portal 卖出
+                const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
+                    const i = it.i;
+                    const signed = await this.buildSellUserOp(wallets[i], tokenAddress, it.sellAmount, it.sender, it.nonce, it.initCode, false, // needApprove=false，假设已预先授权
+                    `owner${i + 1}`);
+                    return signed.userOp;
+                });
+                sellOps.push(...signedSells);
+            }
         }
-        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const effConfigForSell = { ...(this.config ?? {}), ...(config ?? {}) };
         const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary, {
-            gasLimit: effConfig.gasLimit,
-            gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+            gasLimit: effConfigForSell.gasLimit,
+            gasPrice: effConfigForSell.minGasPriceGwei ? ethers.parseUnits(effConfigForSell.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         if (!sellResult) {
             throw new Error('卖出交易失败');
@@ -819,8 +912,8 @@ export class BundleExecutor {
             }
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary, {
-                    gasLimit: effConfig.gasLimit,
-                    gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
+                    gasLimit: effConfigForSell.gasLimit,
+                    gasPrice: effConfigForSell.minGasPriceGwei ? ethers.parseUnits(effConfigForSell.minGasPriceGwei.toString(), 'gwei') : undefined
                 }) ?? undefined;
             }
         }
@@ -1736,7 +1829,7 @@ export class BundleExecutor {
             // ✅ 判断是否是最后一笔内盘买入（触发毕业的那笔）
             const isGraduationTrigger = (i === curveBuyers.length - 1);
             const callGasLimit = isGraduationTrigger
-                ? 6500000n // 毕业触发交易需要更高 gas
+                ? 8000000n // 毕业触发交易需要更高 gas
                 : (effConfig.fixedGas?.callGasLimit ?? 500000n); // 其他买入使用前端配置或默认值
             const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
@@ -1773,10 +1866,13 @@ export class BundleExecutor {
                 let routerAddress;
                 if (dexType === 'V3') {
                     routerAddress = POTATOSWAP_V3_ROUTER;
+                    // ✅ 使用 getTokenV7 获取的 lpFeeProfile 动态计算 V3 fee
+                    // lpFeeProfile: 0 → 2500 (0.25%), 1 → 100 (0.01%), 2 → 10000 (1%)
+                    const v3Fee = lpFeeProfileToV3Fee(tokenState.lpFeeProfile);
                     swapData = encodeSwapExactETHForTokensV3({
                         tokenIn: WOKB,
                         tokenOut: tokenAddress,
-                        fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                        fee: v3Fee,
                         recipient: info.sender,
                         deadline,
                         amountIn: amount,

package/dist/xlayer/constants.d.ts

@@ -69,7 +69,7 @@ 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 swapExactInputV3((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData,bytes extensionData)) external 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)"];
+export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function swapExactInputV3((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData,bytes extensionData)) external 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,uint16,address,uint256,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 */

package/dist/xlayer/constants.js

@@ -115,7 +115,8 @@ 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))',
+    // ✅ 修复：getTokenV7 返回 16 个字段，与 BSC portal.ts 一致
+    'function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint16,address,uint256,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)',

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

@@ -180,6 +180,8 @@ export declare class PortalQuery {
     }>;
     /**
      * 获取代币状态 V7 (包含 lpFeeProfile)
+     *
+     * ✅ 修复：与 BSC portal.ts 对齐，使用 16 字段结构
      */
     getTokenV7(tokenAddress: string): Promise<{
         status: number;
@@ -194,7 +196,9 @@ export declare class PortalQuery {
         quoteTokenAddress: string;
         nativeToQuoteSwapEnabled: boolean;
         extensionID: string;
-        dexId: number;
+        taxRate: number;
+        pool: string;
+        progress: bigint;
         lpFeeProfile: number;
     }>;
     /**

package/dist/xlayer/portal-ops.js

@@ -224,6 +224,8 @@ export class PortalQuery {
     }
     /**
      * 获取代币状态 V7 (包含 lpFeeProfile)
+     *
+     * ✅ 修复：与 BSC portal.ts 对齐，使用 16 字段结构
      */
     async getTokenV7(tokenAddress) {
         const raw = await this.portal.getTokenV7(tokenAddress);
@@ -240,8 +242,10 @@ export class PortalQuery {
             quoteTokenAddress: raw[9],
             nativeToQuoteSwapEnabled: raw[10],
             extensionID: raw[11],
-            dexId: Number(raw[12]),
-            lpFeeProfile: Number(raw[13]),
+            taxRate: Number(raw[12]),
+            pool: raw[13],
+            progress: raw[14],
+            lpFeeProfile: Number(raw[15]),
         };
     }
     /**

package/package.json

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