four-flap-meme-sdk 1.5.2 → 1.5.4

package/dist/abis/common.js

@@ -228,6 +228,8 @@ export const FLAP_PORTAL_ABI = [
     '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)) external payable returns (address)',
     // 交易
     'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData)) external payable returns (uint256)',
+    // ✅ V3：支持 extensionData（注意：这里的 V3 指“扩展交易接口版本”，不是“外盘 V3 池子”）
+    'function swapExactInputV3((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData,bytes extensionData)) external payable returns (uint256)',
     'function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external view returns (uint256)',
     // 旧版兼容
     'function buy(address token, uint256 minReceived) external payable returns (uint256)',

package/dist/flap/portal-bundle-merkle/create-to-dex.d.ts

@@ -57,9 +57,15 @@ export interface FlapCreateToDexParams {
     dexBuyers?: DexBuyerConfig[];
     /** 外盘总买入金额（用于自动分配） */
     dexTotalBuyAmount?: string;
-    /** 外盘池类型（V2 或 V3），默认 V3 */
+    /**
+     * 外盘池类型（V2 或 V3），默认 V3
+     * @deprecated 现在外盘买入统一改为走 Portal 的 swapExactInput/swapExactInputV3 进行自动路由，
+     *             不再需要手动指定池类型/fee；保留字段仅为兼容老调用方。
+     */
     dexPoolType?: DexPoolType;
-    /** V3 费率（100/500/2500/10000），默认 2500 */
+    /**
+     * @deprecated 同上：不再需要手动传 V3 fee；由合约记录的池子信息决定。
+     */
     v3Fee?: number;
     /** 发币扩展参数 */
     dexThresh?: number;

package/dist/flap/portal-bundle-merkle/create-to-dex.js

@@ -10,7 +10,7 @@
 import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES, FLAP_ORIGINAL_PORTAL_ADDRESSES } from '../constants.js';
-import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../../utils/constants.js';
 import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
 // ==================== ERC20 ABI ====================
 const ERC20_ABI = [
@@ -25,107 +25,64 @@ const ERC20_ABI = [
         stateMutability: "nonpayable"
     }
 ];
-// ==================== 链常量 ====================
-// BSC
-const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
-const BSC_PANCAKE_V3_ROUTER = ADDRESSES.BSC.PancakeV3Router;
-const BSC_WBNB = ADDRESSES.BSC.WBNB;
-// XLAYER
-const XLAYER_POTATOSWAP_V2_ROUTER = '0x881fb2f98c13d521009464e7d1cbf16e1b394e8e';
-const XLAYER_POTATOSWAP_V3_ROUTER = '0xB45D0149249488333E3F3f9F359807F4b810C1FC';
-const XLAYER_WOKB = '0xe538905cf8410324e03a5a23c1c177a474d59b2b';
-// 链 ID 映射
-const CHAIN_ID_MAP = {
-    bsc: 56,
-    xlayer: 196,
+// ==================== PancakeSwap Router ABI ====================
+const PANCAKE_ROUTER_ABI = [
+    {
+        type: "function",
+        name: "exactInputSingle",
+        inputs: [
+            {
+                name: "params",
+                type: "tuple",
+                components: [
+                    { name: "tokenIn", type: "address" },
+                    { name: "tokenOut", type: "address" },
+                    { name: "fee", type: "uint24" },
+                    { name: "recipient", type: "address" },
+                    { name: "amountIn", type: "uint256" },
+                    { name: "amountOutMinimum", type: "uint256" },
+                    { name: "sqrtPriceLimitX96", type: "uint160" }
+                ]
+            }
+        ],
+        outputs: [{ name: "amountOut", type: "uint256" }],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "multicall",
+        inputs: [{ name: "data", type: "bytes[]" }],
+        outputs: [{ name: "results", type: "bytes[]" }],
+        stateMutability: "payable"
+    }
+];
+// ==================== DEX 地址常量 ====================
+const DEX_ADDRESSES = {
+    BSC: {
+        PANCAKE_SMART_ROUTER: '0x13f4EA83D0bd40E75C8222255bc855a974568Dd4',
+        WBNB: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
+    },
+    XLAYER: {
+        // xLayer 使用 PotatoSwap
+        PANCAKE_SMART_ROUTER: '0x0000000000000000000000000000000000000000', // TODO: 添加 xLayer DEX 地址
+        WBNB: '0x0000000000000000000000000000000000000000',
+    }
 };
+// ==================== 链常量 ====================
 // 获取链配置
 function getChainConfig(chain) {
     if (chain === 'xlayer') {
         return {
             chainId: 196,
-            v2Router: XLAYER_POTATOSWAP_V2_ROUTER,
-            v3Router: XLAYER_POTATOSWAP_V3_ROUTER,
-            wrappedNative: XLAYER_WOKB,
             nativeSymbol: 'OKB',
         };
     }
     // 默认 BSC
     return {
         chainId: 56,
-        v2Router: BSC_PANCAKE_V2_ROUTER,
-        v3Router: BSC_PANCAKE_V3_ROUTER,
-        wrappedNative: BSC_WBNB,
         nativeSymbol: 'BNB',
     };
 }
-// PancakeSwap Router ABI
-const PANCAKE_V3_ROUTER_ABI = [
-    {
-        "type": "function",
-        "name": "exactInputSingle",
-        "inputs": [
-            {
-                "name": "params",
-                "type": "tuple",
-                "components": [
-                    { "name": "tokenIn", "type": "address" },
-                    { "name": "tokenOut", "type": "address" },
-                    { "name": "fee", "type": "uint24" },
-                    { "name": "recipient", "type": "address" },
-                    { "name": "amountIn", "type": "uint256" },
-                    { "name": "amountOutMinimum", "type": "uint256" },
-                    { "name": "sqrtPriceLimitX96", "type": "uint160" }
-                ]
-            }
-        ],
-        "outputs": [{ "name": "amountOut", "type": "uint256" }],
-        "stateMutability": "payable"
-    },
-    {
-        "type": "function",
-        "name": "multicall",
-        "inputs": [{ "name": "data", "type": "bytes[]" }],
-        "outputs": [{ "name": "results", "type": "bytes[]" }],
-        "stateMutability": "payable"
-    },
-    {
-        "type": "function",
-        "name": "swapExactTokensForTokens",
-        "inputs": [
-            { "name": "amountIn", "type": "uint256" },
-            { "name": "amountOutMin", "type": "uint256" },
-            { "name": "path", "type": "address[]" },
-            { "name": "to", "type": "address" }
-        ],
-        "outputs": [{ "name": "amountOut", "type": "uint256" }],
-        "stateMutability": "payable"
-    },
-];
-// ==================== V3 费率配置 ====================
-// USD1/USDT 使用 100 bps (0.01%)，其他使用 2500 bps (0.25%)
-const USD1_V3_FEE = 100;
-const DEFAULT_V3_FEE = 2500;
-const HIGH_V3_FEE = 10000;
-/**
- * 根据 lpFeeProfile 获取对应的 V3 费率
- * 参考 Flap 文档: https://docs.flap.sh/flap/developers/launch-a-token
- *
- * @param lpFeeProfile V3LPFeeProfile 枚举值
- *   - 0 (STANDARD) = 0.25% on PancakeSwap
- *   - 1 (LOW) = 0.01% on PancakeSwap
- *   - 2 (HIGH) = 1%
- */
-function lpFeeProfileToV3Fee(lpFeeProfile) {
-    if (lpFeeProfile === undefined)
-        return undefined;
-    switch (lpFeeProfile) {
-        case 0: return DEFAULT_V3_FEE; // STANDARD: 0.25%
-        case 1: return USD1_V3_FEE; // LOW: 0.01%
-        case 2: return HIGH_V3_FEE; // HIGH: 1%
-        default: return undefined;
-    }
-}
 // ==================== 工具函数 ====================
 /** 构建 ERC20 approve 交易 */
 async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType, chainId = 56 // ✅ 添加 chainId 参数
@@ -235,6 +192,32 @@ export async function flapBundleCreateToDex(params) {
     // 判断是否使用原生代币
     const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
     const inputToken = useNativeToken ? ZERO_ADDRESS : quoteToken;
+    // ✅ 计算实际使用的 V3 费率
+    // 优先级：lpFeeProfile > v3Fee > 默认值（根据 quoteToken）
+    // lpFeeProfile: 0=STANDARD(0.25%), 1=LOW(0.01%), 2=HIGH(1%)
+    let actualV3Fee;
+    if (params.lpFeeProfile !== undefined) {
+        // 从 lpFeeProfile 转换为 V3 费率
+        switch (params.lpFeeProfile) {
+            case 1:
+                actualV3Fee = 100;
+                break; // LOW: 0.01%
+            case 2:
+                actualV3Fee = 10000;
+                break; // HIGH: 1%
+            default:
+                actualV3Fee = 2500;
+                break; // STANDARD: 0.25%
+        }
+    }
+    else if (v3Fee !== undefined && v3Fee !== 2500) {
+        actualV3Fee = v3Fee;
+    }
+    else {
+        // 根据 quoteToken 使用默认值（参考 Flap 官方配置）
+        // BNB → 0.25% (2500), USD1/稳定币 → 0.01% (100)
+        actualV3Fee = useNativeToken ? 2500 : 100;
+    }
     // ✅ 获取链配置
     const chainConfig = getChainConfig(chain);
     const chainId = chainConfig.chainId;
@@ -414,12 +397,16 @@ export async function flapBundleCreateToDex(params) {
         const buyNonce = noncesMap.get(addr);
         noncesMap.set(addr, buyNonce + 1);
         const portal = new Contract(portalAddress, PORTAL_ABI, wallet);
-        const unsigned = await portal.swapExactInput.populateTransaction({
+        // ✅ 交易阶段统一优先使用 swapExactInputV3（支持 extensionData；无扩展时传 0x 即可）
+        // 说明：这里的 V3 指“交易接口版本（扩展支持）”，不是“外盘 V3 池子”
+        const extensionData = params.extensionData ?? '0x';
+        const unsigned = await portal.swapExactInputV3.populateTransaction({
             inputToken,
             outputToken: tokenAddress,
             inputAmount: curveBuyAmounts[i],
             minOutputAmount: 0n,
-            permitData: '0x' // 不使用 permit，使用链上 approve
+            permitData: '0x', // 不使用 permit，使用链上 approve
+            extensionData
         }, useNativeToken ? { value: curveBuyAmounts[i] } : {});
         // 最后一个买家触发毕业，需要更多 gas
         const isLastBuyer = i === curveWallets.length - 1;
@@ -447,70 +434,58 @@ export async function flapBundleCreateToDex(params) {
     const curveBuyResults = await Promise.all(curveBuyTxPromises);
     // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
     curveBuyResults.forEach(txs => allTransactions.push(...txs));
-    // 4. 外盘买入交易（PancakeSwap）
-    // ✅ ERC20 需要先 approve，再 swap
+    // 4. 外盘买入交易（直接调用 PancakeSwap Router）
+    // ✅ 重要修改：直接调用 PancakeSwap SmartRouter 的 exactInputSingle
+    // 参考官方代码: flap-bundle-release/app/v2/pvp/001_launch_buy.ts
+    // 
+    // 原因：之前使用 Portal 的 swapExactInputV3 进行"自动路由"，但这有风险：
+    // - 如果代币刚毕业，Portal 可能还没有正确记录池子信息
+    // - 导致路由失败或回退到内盘
+    // 
+    // 新方案：毕业后直接调用 PancakeSwap Router，确保外盘交易成功
     if (enableDexBuy && dexWallets.length > 0) {
+        // 获取 DEX 地址
+        const dexAddresses = chain === 'xlayer' ? DEX_ADDRESSES.XLAYER : DEX_ADDRESSES.BSC;
+        const smartRouterAddress = dexAddresses.PANCAKE_SMART_ROUTER;
+        const wbnbAddress = dexAddresses.WBNB;
+        // 获取 V3 费率
+        // 根据 lpFeeProfile 或 quoteToken 选择
+        const dexV3Fee = actualV3Fee;
         const dexBuyTxPromises = dexWallets.map(async ({ wallet }, i) => {
             const addr = wallet.address.toLowerCase();
             const signedTxs = [];
             const buyAmount = dexBuyAmounts[i];
-            // ✅ 使用动态 Router 地址
-            const smartRouter = dexPoolType === 'v3' ? chainConfig.v3Router : chainConfig.v2Router;
-            const wrappedNative = chainConfig.wrappedNative;
-            // ✅ 根据 lpFeeProfile 或 quoteToken 选择 V3 费率
-            // 优先级：
-            // 1. 如果传入了 lpFeeProfile，使用对应的费率（与 newTokenV4 创建的池子匹配）
-            // 2. 如果没传，根据 quoteToken 使用默认费率（参考 Flap 官方脚本）
-            //    - BNB (原生代币) → 0.25% (2500)
-            //    - USD1 等稳定币 → 0.01% (100)
-            const lpFeeBasedV3Fee = lpFeeProfileToV3Fee(params.lpFeeProfile);
-            const defaultV3Fee = useNativeToken ? DEFAULT_V3_FEE : USD1_V3_FEE;
-            const actualV3Fee = lpFeeBasedV3Fee ?? v3Fee ?? defaultV3Fee;
-            // ✅ ERC20: 先构建 approve 交易
+            // ✅ ERC20: 先构建 approve 交易（approve 给 PancakeSwap Router）
             if (!useNativeToken) {
                 const approveNonce = noncesMap.get(addr);
                 noncesMap.set(addr, approveNonce + 1);
-                const approveTx = await buildApproveTransaction(wallet, quoteToken, smartRouter, buyAmount, approveNonce, gasPrice, txType, chainId // ✅ 传递 chainId
-                );
+                const approveTx = await buildApproveTransaction(wallet, quoteToken, smartRouterAddress, // ✅ approve 给 PancakeSwap Router
+                buyAmount, approveNonce, gasPrice, txType, chainId);
                 signedTxs.push(approveTx);
             }
-            // 构建买入交易
+            // 构建 PancakeSwap exactInputSingle 交易
             const buyNonce = noncesMap.get(addr);
             noncesMap.set(addr, buyNonce + 1);
-            let multicallData = [];
-            let value;
-            const routerInterface = new ethers.Interface(PANCAKE_V3_ROUTER_ABI);
-            if (dexPoolType === 'v3') {
-                // V3: exactInputSingle
-                const params = {
-                    tokenIn: useNativeToken ? wrappedNative : quoteToken,
-                    tokenOut: tokenAddress,
-                    fee: actualV3Fee,
-                    recipient: wallet.address,
-                    amountIn: buyAmount,
-                    amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n
-                };
-                multicallData = [routerInterface.encodeFunctionData('exactInputSingle', [params])];
-                value = useNativeToken ? buyAmount : 0n;
-            }
-            else {
-                // V2: swapExactTokensForTokens
-                const path = useNativeToken ? [wrappedNative, tokenAddress] : [quoteToken, tokenAddress];
-                const swapData = routerInterface.encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, path, wallet.address]);
-                multicallData = [swapData];
-                value = useNativeToken ? buyAmount : 0n;
-            }
-            const calldata = routerInterface.encodeFunctionData('multicall', [multicallData]);
+            const router = new Contract(smartRouterAddress, PANCAKE_ROUTER_ABI, wallet);
+            // 对于 BNB，使用 WBNB 作为 tokenIn（Router 会自动 wrap）
+            const tokenIn = useNativeToken ? wbnbAddress : quoteToken;
+            const exactInputSingleParams = {
+                tokenIn,
+                tokenOut: tokenAddress,
+                fee: dexV3Fee, // ✅ 使用与 newTokenV4 创建池子匹配的费率
+                recipient: wallet.address,
+                amountIn: buyAmount,
+                amountOutMinimum: 0n, // 不设置滑点保护（Bundle 中可以接受）
+                sqrtPriceLimitX96: 0n
+            };
+            const unsigned = await router.exactInputSingle.populateTransaction(exactInputSingleParams, useNativeToken ? { value: buyAmount } : {});
             const tx = {
-                to: smartRouter,
-                data: calldata,
-                from: wallet.address,
+                ...unsigned,
                 nonce: buyNonce,
                 gasLimit: BigInt(500000),
                 chainId,
                 type: txType,
-                value
+                value: useNativeToken ? buyAmount : 0n
             };
             if (txType === 2) {
                 tx.maxFeePerGas = gasPrice;

package/package.json

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