four-flap-meme-sdk 1.5.6 → 1.5.8

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/contracts/tm-bundle-merkle/config.d.ts

@@ -45,7 +45,6 @@ export declare function shouldExtractProfit(config?: FourAnyConfig): boolean;
 export declare function getProfitRateBps(config?: FourAnyConfig): number;
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export declare function getProfitRecipient(config?: FourAnyConfig): string;
 /**

package/dist/contracts/tm-bundle-merkle/config.js

@@ -74,7 +74,6 @@ export function getProfitRateBps(config) {
 }
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export function getProfitRecipient(config) {
     return PROFIT_CONFIG.RECIPIENT;

package/dist/contracts/tm-bundle-merkle/core.js

@@ -54,6 +54,9 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     const accessToken = await loginFourClient(devWallet, fourClient);
     const imgUrl = await resolveTokenImage(fourClient, tokenInfo, accessToken);
+    // ✅ 兼容：历史调用可能把 Dev 首买金额塞在 buyAmounts[0]，而不是 tokenInfo.preSale
+    // Four 官方 API/链上 createArg 使用 preSale 表达“创建者预购金额”
+    const effectivePreSaleStr = (tokenInfo.preSale && String(tokenInfo.preSale).trim().length > 0 ? String(tokenInfo.preSale) : String(buyAmounts[0] ?? '0'));
     const createResp = await fourClient.createToken(accessToken, {
         name: tokenInfo.name,
         shortName: tokenInfo.symbol,
@@ -64,7 +67,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
         webUrl: tokenInfo.webUrl,
         twitterUrl: tokenInfo.twitterUrl,
         telegramUrl: tokenInfo.telegramUrl,
-        preSale: tokenInfo.preSale || '0',
+        preSale: effectivePreSaleStr || '0',
         onlyMPC: false,
         lpTradingFee: 0.0025,
         symbol: 'BNB',
@@ -83,7 +86,8 @@ export async function createTokenWithBundleBuyMerkle(params) {
     // ✅ 单笔交易: 和 Four.meme 官网一样
     // 计算利润
     const extractProfit = shouldExtractProfit(config);
-    const originalBuyAmount = ethers.parseEther(buyAmounts[0]);
+    // ✅ 对 create 流程来说，“买入金额”就是 preSale（创建者预购）
+    const originalBuyAmount = ethers.parseEther(effectivePreSaleStr || '0');
     let actualBuyFunds;
     let profitAmount;
     if (extractProfit) {
@@ -99,13 +103,13 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
     const b0AmountWei = ethers.parseEther(params.b0Amount ?? '0');
-    const preSaleWei = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
-    // ✅ 关键: value = 创建费用 + b0Amount + preSale + 买入金额
-    // Four.meme 合约会自动处理: 如果 value > 创建费用,会自动用多余的金额买入
-    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei + actualBuyFunds;
+    const preSaleWei = effectivePreSaleStr ? ethers.parseEther(effectivePreSaleStr) : 0n;
+    // ✅ 关键修复：
+    // createToken 的预购金额由 createArg.preSale 决定；因此这里只需要支付：创建费 + b0Amount + preSale
+    // 不要把“其它买入金额”额外塞进 msg.value，否则会被合约退回，造成“看起来没买到”的误解。
+    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei;
     const tmCreate = new ethers.Contract(tmCreateAddr, TM2_ABI, devWallet);
-    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei } // ✅ 包含买入金额
-    );
+    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei });
     // ✅ 贿赂交易放在首位（由 devWallet 发送）
     let bribeNonce;
     if (needBribeTx) {
@@ -125,7 +129,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
         ...createTxUnsigned,
         from: devWallet.address,
         nonce: await nonceManager.getNextNonce(devWallet),
-        gasLimit: getGasLimit(config, 1500000), // ✅ 增加 gas limit (创建+买入)
+        gasLimit: getGasLimit(config, 1500000),
         gasPrice,
         chainId,
         type: getTxType(config),

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

@@ -46,7 +46,6 @@ export declare function shouldExtractProfit(config?: FlapAnyConfig): boolean;
 export declare function getProfitRateBps(config?: FlapAnyConfig): number;
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export declare function getProfitRecipient(config?: FlapAnyConfig): string;
 /**

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

@@ -82,7 +82,6 @@ export function getProfitRateBps(config) {
 }
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export function getProfitRecipient(config) {
     return PROFIT_CONFIG.RECIPIENT;

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,87 +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;
 // ==================== 工具函数 ====================
 /** 构建 ERC20 approve 交易 */
 async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType, chainId = 56 // ✅ 添加 chainId 参数
@@ -158,13 +135,43 @@ function splitAmount(totalAmount, count) {
         allocated += amount;
     }
     amounts.push(totalAmount - allocated);
-    // 随机打乱
-    for (let i = amounts.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
-        [amounts[i], amounts[j]] = [amounts[j], amounts[i]];
-    }
     return amounts;
 }
+/** 解析输入金额字符串为 bigint（按是否原生币选择 parseEther / parseUnits） */
+function parseQuoteAmount(amount, useNativeToken, quoteTokenDecimals) {
+    const v = String(amount ?? '').trim();
+    if (!v)
+        return 0n;
+    return useNativeToken ? ethers.parseEther(v) : ethers.parseUnits(v, quoteTokenDecimals);
+}
+/**
+ * 计算每个买家的买入金额（优先使用 params 传入的 buyAmount；否则 fallback 到按总额随机拆分）
+ * 说明：memeweb 前端已根据 average/random/custom 计算出每个钱包 buyAmount；
+ * 若 SDK 这里再次 splitAmount，会导致实际 buyAmount 与 UI/预期不一致，并引发余额不足（insufficient funds）。
+ */
+function resolveBuyerAmounts(buyers, totalAmountStr, useNativeToken, quoteTokenDecimals) {
+    const provided = buyers.map(b => b?.buyAmount).filter(v => v != null && String(v).trim() !== '');
+    const allProvided = provided.length === buyers.length;
+    if (allProvided) {
+        // ✅ 所有买家都显式提供了 buyAmount：按传入金额构建，但要修正“浮点/四舍五入导致总和偏差”
+        const amounts = buyers.map(b => parseQuoteAmount(String(b.buyAmount), useNativeToken, quoteTokenDecimals));
+        const totalWei = parseQuoteAmount(totalAmountStr, useNativeToken, quoteTokenDecimals);
+        const sum = amounts.reduce((a, b) => a + b, 0n);
+        const delta = totalWei - sum;
+        if (delta !== 0n && amounts.length > 0) {
+            // 优先修正最后一个金额（对应 create-to-dex 里“最后一单可能触发毕业”的假设）
+            const lastIdx = amounts.length - 1;
+            const next = amounts[lastIdx] + delta;
+            if (next <= 0n) {
+                throw new Error(`买入金额总和与总额不一致且无法修正：sum=${sum} total=${totalWei} delta=${delta}`);
+            }
+            amounts[lastIdx] = next;
+        }
+        return amounts;
+    }
+    const totalWei = parseQuoteAmount(totalAmountStr, useNativeToken, quoteTokenDecimals);
+    return splitAmount(totalWei, buyers.length);
+}
 // ==================== 主函数 ====================
 /**
  * Flap 发币 + 一键买到外盘捆绑交易
@@ -185,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;
@@ -231,17 +264,11 @@ export async function flapBundleCreateToDex(params) {
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
     // ✅ 计算内盘买入金额
-    const curveTotalWei = useNativeToken
-        ? ethers.parseEther(curveTotalBuyAmount)
-        : ethers.parseUnits(curveTotalBuyAmount, quoteTokenDecimals);
-    const curveBuyAmounts = splitAmount(curveTotalWei, curveBuyers.length);
+    const curveBuyAmounts = resolveBuyerAmounts(curveBuyers, curveTotalBuyAmount, useNativeToken, quoteTokenDecimals);
     // ✅ 计算外盘买入金额
     let dexBuyAmounts = [];
     if (enableDexBuy && dexBuyers.length > 0 && dexTotalBuyAmount) {
-        const dexTotalWei = useNativeToken
-            ? ethers.parseEther(dexTotalBuyAmount)
-            : ethers.parseUnits(dexTotalBuyAmount, quoteTokenDecimals);
-        dexBuyAmounts = splitAmount(dexTotalWei, dexBuyers.length);
+        dexBuyAmounts = resolveBuyerAmounts(dexBuyers, dexTotalBuyAmount, useNativeToken, quoteTokenDecimals);
     }
     // ✅ 计算利润
     const totalBuyAmount = curveBuyAmounts.reduce((a, b) => a + b, 0n)
@@ -249,7 +276,7 @@ export async function flapBundleCreateToDex(params) {
     const profitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     // ==================== 构建交易 ====================
     const allTransactions = [];
-    // 使用第一个内盘买家作为贿赂和利润支付者
+    // 使用第一个内盘买家作为贿赂支付者（提高 bundle 打包优先级）
     const mainBuyerWallet = curveWallets[0].wallet;
     // 1. 贿赂交易
     if (needBribeTx) {
@@ -370,16 +397,26 @@ 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;
-        const buyGasLimit = isLastBuyer ? BigInt(1500000) : finalGasLimit;
+        // ⚠️ 触发毕业（创建 Pancake V3 池 + Mint 初始流动性）会非常耗 gas。
+        // 链上成功样例 0x29b173... 的 gasLimit=8,000,000，gasUsed≈6,647,149。
+        // Flap 官方示例脚本也使用 last_buy=8_000_000。
+        const LAST_BUY_GAS_LIMIT = BigInt(8000000);
+        const buyGasLimit = isLastBuyer
+            ? (finalGasLimit > LAST_BUY_GAS_LIMIT ? finalGasLimit : LAST_BUY_GAS_LIMIT)
+            : finalGasLimit;
         const tx = {
             ...unsigned,
             from: wallet.address,
@@ -403,63 +440,66 @@ 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;
-            // ✅ 根据 quoteToken 选择 V3 费率
-            const actualV3Fee = v3Fee || (useNativeToken ? DEFAULT_V3_FEE : USD1_V3_FEE);
-            // ✅ 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 交易（使用 multicall 方式，与官方一致）
             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]);
+            // 对于 BNB，使用 WBNB 作为 tokenIn（Router 会自动 wrap）
+            const tokenIn = useNativeToken ? wbnbAddress : quoteToken;
+            // ✅ 使用官方方式：先编码 exactInputSingle，再用 multicall 包装
+            const routerInterface = new ethers.Interface(PANCAKE_ROUTER_ABI);
+            const exactInputSingleParams = {
+                tokenIn,
+                tokenOut: tokenAddress,
+                fee: dexV3Fee, // ✅ 使用与 newTokenV4 创建池子匹配的费率
+                recipient: wallet.address,
+                amountIn: buyAmount,
+                amountOutMinimum: 0n, // 不设置滑点保护（Bundle 中可以接受）
+                sqrtPriceLimitX96: 0n
+            };
+            // 编码 exactInputSingle 调用
+            const exactInputSingleData = routerInterface.encodeFunctionData('exactInputSingle', [exactInputSingleParams]);
+            // 用 multicall 包装（官方要求的调用方式）
+            const multicallData = routerInterface.encodeFunctionData('multicall', [[exactInputSingleData]]);
+            // ⚠️ Pancake SmartRouter 外盘买的 gas 不能太小，否则 bundle 预执行会直接失败。
+            // Flap 官方示例配置 dex_buy=5_000_000（flap-bundle-release/app/configs/global.ts）。
+            const DEX_BUY_GAS_LIMIT = BigInt(8000000);
             const tx = {
-                to: smartRouter,
-                data: calldata,
-                from: wallet.address,
+                to: smartRouterAddress,
+                data: multicallData,
                 nonce: buyNonce,
-                gasLimit: BigInt(500000),
+                gasLimit: DEX_BUY_GAS_LIMIT,
                 chainId,
                 type: txType,
-                value
+                value: useNativeToken ? buyAmount : 0n
             };
             if (txType === 2) {
                 tx.maxFeePerGas = gasPrice;
@@ -479,11 +519,13 @@ export async function flapBundleCreateToDex(params) {
     // 5. 利润多跳转账
     let profitHopWallets;
     if (profitAmount > 0n) {
-        const mainAddr = mainBuyerWallet.address.toLowerCase();
-        const profitNonce = noncesMap.get(mainAddr);
+        // ✅ 调整：利润从 Dev 钱包（devPrivateKey）支付，避免第一个内盘买家余额不足导致 want 过高
+        // 注意：利润交易会额外消耗原生币（profitAmount + gas），请确保 Dev 钱包留足余额
+        const devAddr = devWallet.address.toLowerCase();
+        const profitNonce = noncesMap.get(devAddr);
         const profitResult = await buildProfitHopTransactions({
             provider,
-            payerWallet: mainBuyerWallet,
+            payerWallet: devWallet,
             profitAmount,
             profitRecipient: getProfitRecipient(),
             hopCount: PROFIT_HOP_COUNT,

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

@@ -0,0 +1,16 @@
+/**
+ * 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;