four-flap-meme-sdk 1.5.1 → 1.5.3

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 = [
@@ -26,86 +26,20 @@ const ERC20_ABI = [
     }
 ];
 // ==================== 链常量 ====================
-// 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,
-};
 // 获取链配置
 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;
 // ==================== 工具函数 ====================
 /** 构建 ERC20 approve 交易 */
 async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType, chainId = 56 // ✅ 添加 chainId 参数
@@ -394,12 +328,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;
@@ -428,66 +366,44 @@ export async function flapBundleCreateToDex(params) {
     // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
     curveBuyResults.forEach(txs => allTransactions.push(...txs));
     // 4. 外盘买入交易（PancakeSwap）
-    // ✅ ERC20 需要先 approve，再 swap
+    // ✅ 改造：外盘买入不再直连 Router（避免 fee/池子不匹配），统一走 Portal 的 swapExactInputV3 自动路由：
+    // - 若 token 已毕业（DEX 状态）→ Portal 自动转发到 PortalDexRouter，按合约记录的 poolType/pool/fee 成交（V2/V3 自动）
+    // - 若尚未毕业（Tradable）→ 会回退走 bonding curve（这通常不是预期，所以仍依赖“最后一单触发毕业”的假设）
+    // ✅ ERC20 输入仍需先 approve 给 Portal
     if (enableDexBuy && dexWallets.length > 0) {
         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;
-            // ✅ 根据 quoteToken 强制选择 V3 费率（参考 Flap 官方配置）
-            // Flap 合约在毕业时创建的 V3 池子费率由 quoteToken 决定：
-            // - BNB (原生代币) → 0.25% (2500)
-            // - USD1 等稳定币 → 0.01% (100)
-            // 即使传入了 lpFeeProfile，Flap 合约也可能忽略，所以这里强制匹配
-            const actualV3Fee = useNativeToken ? DEFAULT_V3_FEE : USD1_V3_FEE;
+            const extensionData = params.extensionData ?? '0x';
             // ✅ ERC20: 先构建 approve 交易
             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, portalAddress, // ✅ approve 给 Portal，而不是外部 Router
+                buyAmount, approveNonce, gasPrice, txType, chainId // ✅ 传递 chainId
                 );
                 signedTxs.push(approveTx);
             }
             // 构建买入交易
             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 portal = new Contract(portalAddress, PORTAL_ABI, wallet);
+            const unsigned = await portal.swapExactInputV3.populateTransaction({
+                inputToken,
+                outputToken: tokenAddress,
+                inputAmount: buyAmount,
+                minOutputAmount: 0n,
+                permitData: '0x',
+                extensionData
+            }, 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.01",
+  "version": "1.5.3",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",