four-flap-meme-sdk 1.3.68 → 1.3.70

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

@@ -233,17 +233,16 @@ export async function batchBuyWithBundleMerkle(params) {
     }
     // ✅ 优化：如果前端传入了 nonces，需要调整以避免利润交易 nonce 冲突
     const presetNonces = config.nonces;
-    const isWhitelisted = config.isWhitelisted === true; // ✅ 获取白名单标识
     // ✅ 并行执行需要的 RPC 操作
     const [gasPrice, unsignedBuys, buyerNonces] = await Promise.all([
         resolveGasPrice(provider, config),
         populateBuyTransactionsWithQuote(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, adjustedFundsList, inputToken, useNativeToken),
         presetNonces && presetNonces.length === buyers.length
-            ? adjustNoncesForProfit(presetNonces, extractProfit, maxFundsIndex, nativeProfitAmount, isWhitelisted) // ✅ 传入白名单标识
+            ? adjustNoncesForProfit(presetNonces, extractProfit, maxFundsIndex, nativeProfitAmount) // ✅ 调整 nonces 避免冲突
             : allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, nativeProfitAmount, nonceManager)
     ]);
     if (presetNonces) {
-        console.log('🚀 SDK 使用前端传入的 nonces (调整后):', buyerNonces, isWhitelisted ? '(白名单，未调整)' : '');
+        console.log('🚀 SDK 使用前端传入的 nonces (调整后):', buyerNonces);
     }
     const signedBuys = await signBuyTransactions({
         unsignedBuys,
@@ -299,7 +298,6 @@ export async function batchSellWithBundleMerkle(params) {
     // ✅ 优化：如果前端传入了 nonces，直接使用（跳过 RPC 调用）
     const presetNonces = config.nonces;
     const extractProfit = shouldExtractProfit(config);
-    const isWhitelisted = config.isWhitelisted === true; // ✅ 获取白名单标识
     // ✅ 并行执行 gasPrice 和 quoteSellOutputs（Multicall3）
     const [gasPrice, quotedOutputs] = await Promise.all([
         resolveGasPrice(provider, config),
@@ -327,10 +325,10 @@ export async function batchSellWithBundleMerkle(params) {
     let nonces;
     let profitNonce;
     if (presetNonces && presetNonces.length === wallets.length) {
-        // ✅ 使用前端传入的 nonces，但需要调整避免利润交易冲突（白名单用户不调整）
-        nonces = adjustNoncesForProfit(presetNonces, extractProfit, maxRevenueIndex, totalTokenProfit, isWhitelisted);
+        // ✅ 使用前端传入的 nonces，但需要调整避免利润交易冲突
+        nonces = adjustNoncesForProfit(presetNonces, extractProfit, maxRevenueIndex, totalTokenProfit);
         profitNonce = needProfitTx ? presetNonces[maxRevenueIndex] + 1 : undefined;
-        console.log('🚀 SDK 使用前端传入的 nonces (调整后):', nonces, ', profitNonce:', profitNonce, isWhitelisted ? '(白名单，未调整)' : '');
+        console.log('🚀 SDK 使用前端传入的 nonces (调整后):', nonces, ', profitNonce:', profitNonce);
     }
     else if (needProfitTx) {
         // maxRevenueIndex 钱包需要 2 个连续 nonce（卖出 + 利润）
@@ -499,22 +497,12 @@ function buildGasLimitList(length, config) {
  * 问题：如果钱包 A 的 nonce=5，钱包 B 的 nonce=6，A 是利润支付者
  *       利润交易 nonce=5+1=6，与钱包 B 冲突！
  * 解决：检测冲突，将冲突钱包的 nonce +1
- *
- * ✅ 白名单用户特殊处理：
- * - 仍然生成利润交易签名（服务器需要记录）
- * - 但不调整 nonces（因为服务器会跳过利润交易，不会上链）
  */
-function adjustNoncesForProfit(presetNonces, extractProfit, maxIndex, totalProfit, isWhitelisted = false // ✅ 新增：白名单标识
-) {
+function adjustNoncesForProfit(presetNonces, extractProfit, maxIndex, totalProfit) {
     const needProfitTx = extractProfit && totalProfit > 0n && maxIndex >= 0 && maxIndex < presetNonces.length;
     if (!needProfitTx) {
         return presetNonces; // 不需要利润交易，直接返回
     }
-    // ✅ 白名单用户：利润交易不会上链，不需要调整 nonces
-    if (isWhitelisted) {
-        console.log('🔓 白名单用户：跳过 nonce 调整（利润交易不上链）');
-        return presetNonces;
-    }
     // 利润交易的 nonce = maxIndex 钱包的 nonce + 1
     const profitNonce = presetNonces[maxIndex] + 1;
     // 检查是否有其他钱包的 nonce 与利润交易冲突

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

@@ -7,7 +7,6 @@ export type FlapSignConfig = {
     minGasPriceGwei?: number;
     nonces?: number[];
     gasPrice?: bigint;
-    isWhitelisted?: boolean;
 };
 export type FlapBundleMerkleConfig = {
     apiKey: string;

package/dist/index.d.ts

@@ -37,7 +37,7 @@ export { inspectTokenLP, getFactoryFromRouter, registerDYORSwap, registerDex, ge
 export { disperseWithBundle, sweepWithBundle, type DisperseSignParams, type SweepSignParams, type SignedTransactionsResult, type DisperseParams, type SweepParams, type BundleSubmitResult } from './utils/airdrop-sweep.js';
 export { fourBundleSwapMerkle, type FourSwapSignConfig, type FourSwapConfig, type FourBundleSwapSignParams, type FourBundleSwapParams, type FourSwapResult } from './contracts/tm-bundle-merkle/swap.js';
 export { flapBundleSwapMerkle, type FlapSwapSignConfig, type FlapSwapConfig, type FlapBundleSwapSignParams, type FlapBundleSwapParams, type FlapSwapResult } from './flap/portal-bundle-merkle/swap.js';
-export { pancakeBundleSwapMerkle, type PancakeSwapSignConfig, type PancakeBundleSwapSignParams, type PancakeSwapConfig, type PancakeBundleSwapParams, type PancakeSwapResult, type SwapRouteType, type V2RouteParams, type V3SingleRouteParams, type V3MultiRouteParams, type RouteParams } from './pancake/bundle-swap.js';
+export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle, type PancakeSwapSignConfig, type PancakeBundleSwapSignParams, type PancakeSwapConfig, type PancakeBundleSwapParams, type PancakeSwapResult, type PancakeBatchSwapSignParams, type PancakeBatchSwapResult, type SwapRouteType, type V2RouteParams, type V3SingleRouteParams, type V3MultiRouteParams, type RouteParams } from './pancake/bundle-swap.js';
 export { fourBundleBuyFirstMerkle, type FourBuyFirstConfig, type FourBundleBuyFirstParams, type FourBuyFirstSignConfig, type FourBundleBuyFirstSignParams, type FourBuyFirstResult } from './contracts/tm-bundle-merkle/swap-buy-first.js';
 export { flapBundleBuyFirstMerkle, type FlapBuyFirstSignConfig, type FlapBuyFirstConfig, type FlapBundleBuyFirstSignParams, type FlapBundleBuyFirstParams, type FlapBuyFirstResult } from './flap/portal-bundle-merkle/swap-buy-first.js';
 export { pancakeBundleBuyFirstMerkle, type PancakeBuyFirstSignConfig, type PancakeBuyFirstConfig, type PancakeBundleBuyFirstSignParams, type PancakeBundleBuyFirstParams, type PancakeBuyFirstResult } from './pancake/bundle-buy-first.js';

package/dist/index.js

@@ -55,7 +55,7 @@ export { fourBundleSwapMerkle } from './contracts/tm-bundle-merkle/swap.js';
 // Flap内盘换手
 export { flapBundleSwapMerkle } from './flap/portal-bundle-merkle/swap.js';
 // PancakeSwap V2/V3通用换手
-export { pancakeBundleSwapMerkle } from './pancake/bundle-swap.js';
+export { pancakeBundleSwapMerkle, pancakeBatchSwapMerkle } from './pancake/bundle-swap.js';
 // 先买后卖（Buy-First）入口
 export { fourBundleBuyFirstMerkle } from './contracts/tm-bundle-merkle/swap-buy-first.js';
 export { flapBundleBuyFirstMerkle } from './flap/portal-bundle-merkle/swap-buy-first.js';

package/dist/pancake/bundle-swap.d.ts

@@ -78,3 +78,42 @@ export type PancakeSwapResult = {
  * ✅ 支持 quoteToken：传入 USDT 等地址时，卖出得到该代币，买入使用该代币
  */
 export declare function pancakeBundleSwapMerkle(params: PancakeBundleSwapSignParams): Promise<PancakeSwapResult>;
+/**
+ * 批量换手参数（一卖多买）
+ */
+export interface PancakeBatchSwapSignParams {
+    sellerPrivateKey: string;
+    sellAmount?: string;
+    sellPercentage?: number;
+    buyerPrivateKeys: string[];
+    buyerAmounts?: string[];
+    tokenAddress: string;
+    routeParams: RouteParams;
+    slippageTolerance?: number;
+    config: PancakeSwapSignConfig;
+    quoteToken?: string;
+    quoteTokenDecimals?: number;
+}
+/**
+ * 批量换手结果
+ */
+export interface PancakeBatchSwapResult {
+    signedTransactions: string[];
+    metadata?: {
+        sellerAddress: string;
+        buyerAddresses: string[];
+        sellAmount: string;
+        buyAmounts: string[];
+        hasApproval?: boolean;
+        profitAmount?: string;
+    };
+}
+/**
+ * PancakeSwap 批量换手（一卖多买）
+ *
+ * 功能：主钱包一次卖出 → 多个子钱包同时买入 → 在同一个区块中完成
+ * 限制：最多 24 个买方（服务器限制 25 笔交易，包含 1 笔利润交易）
+ *
+ * 交易顺序：[授权(可选)] → [卖出] → [买入1, 买入2, ..., 买入N] → [利润]
+ */
+export declare function pancakeBatchSwapMerkle(params: PancakeBatchSwapSignParams): Promise<PancakeBatchSwapResult>;

package/dist/pancake/bundle-swap.js

@@ -250,17 +250,6 @@ async function getGasPrice(provider, config) {
     }
     return gasPrice;
 }
-/**
- * 编码 V3 路径（用于报价）
- */
-function encodeV3Path(tokens, fees) {
-    let path = tokens[0];
-    for (let i = 0; i < fees.length; i++) {
-        const feeHex = fees[i].toString(16).padStart(6, '0');
-        path = ethers.solidityPacked(['bytes', 'uint24', 'address'], [path, fees[i], tokens[i + 1]]);
-    }
-    return path;
-}
 // PancakeSwapProxy ABI（只需要 ExactInput 方法）
 const PANCAKE_PROXY_ABI = [
     'function swapV2(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to, uint256 deadline) payable returns (uint256)',
@@ -276,33 +265,6 @@ const PANCAKE_V3_QUOTER_ABI = [
     'function quoteExactInputSingle((address tokenIn, address tokenOut, uint256 amountIn, uint24 fee, uint160 sqrtPriceLimitX96)) external returns (uint256 amountOut, uint160 sqrtPriceX96After, uint32 initializedTicksCrossed, uint256 gasEstimate)',
     'function quoteExactInput(bytes memory path, uint256 amountIn) external returns (uint256 amountOut, uint160[] memory sqrtPriceX96AfterList, uint32[] memory initializedTicksCrossedList, uint256 gasEstimate)'
 ];
-const PANCAKE_CHAIN_ADDRESSES = {
-    BSC: {
-        PancakeProxy: ADDRESSES.BSC.PancakeProxy,
-        V2Router: '0x10ED43C718714eb63d5aA57B78B54704E256024E',
-        V3Router: '0x13f4EA83D0bd40E75C8222255bc855a974568Dd4',
-        V3Quoter: '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997',
-        WETH: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
-        chainId: 56,
-    },
-    MONAD: {
-        PancakeProxy: '0x20B89e7e088db3e06e0893Ce23162E475b9d8c7c', // ✅ 已部署
-        V2Router: '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9',
-        V3Router: '0x1b81d678ffb9c0263b24a97847620c99d213eb14',
-        V3Quoter: '0xb048bbc1ee6b733fffcfb9e9cef7375518e25997',
-        WETH: '0x3bd359c1119da7da1d913d1c4d2b7c461115433a', // WMON
-        chainId: 143,
-    },
-};
-// ✅ 根据链获取地址
-function getChainAddresses(chainId) {
-    if (chainId === 56)
-        return PANCAKE_CHAIN_ADDRESSES.BSC;
-    if (chainId === 143)
-        return PANCAKE_CHAIN_ADDRESSES.MONAD;
-    // 默认返回 BSC
-    return PANCAKE_CHAIN_ADDRESSES.BSC;
-}
 // 兼容旧代码：默认使用 BSC 地址
 const PANCAKE_PROXY_ADDRESS = ADDRESSES.BSC.PancakeProxy;
 const PANCAKE_V2_ROUTER_ADDRESS = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
@@ -443,3 +405,217 @@ export async function pancakeBundleSwapMerkle(params) {
         }
     };
 }
+/**
+ * PancakeSwap 批量换手（一卖多买）
+ *
+ * 功能：主钱包一次卖出 → 多个子钱包同时买入 → 在同一个区块中完成
+ * 限制：最多 24 个买方（服务器限制 25 笔交易，包含 1 笔利润交易）
+ *
+ * 交易顺序：[授权(可选)] → [卖出] → [买入1, 买入2, ..., 买入N] → [利润]
+ */
+export async function pancakeBatchSwapMerkle(params) {
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, buyerAmounts, tokenAddress, routeParams, slippageTolerance = 0.5, config, quoteToken, quoteTokenDecimals = 18 } = params;
+    // ✅ 校验买方数量（最多 24 个）
+    const MAX_BUYERS = 24;
+    if (buyerPrivateKeys.length === 0) {
+        throw new Error('至少需要一个买方钱包');
+    }
+    if (buyerPrivateKeys.length > MAX_BUYERS) {
+        throw new Error(`买方钱包数量超过限制: ${buyerPrivateKeys.length} > ${MAX_BUYERS}`);
+    }
+    const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
+    console.log('🔍 PancakeSwap BatchSwap - 买方数量:', buyerPrivateKeys.length);
+    console.log('🔍 PancakeSwap BatchSwap - useNativeToken:', useNativeToken);
+    const context = createPancakeContext(config);
+    const seller = new Wallet(sellerPrivateKey, context.provider);
+    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    // ✅ 创建共享资源
+    const nonceManager = new NonceManager(context.provider);
+    const finalGasLimit = getGasLimit(config);
+    const gasPrice = await getGasPrice(context.provider, config);
+    const txType = config.txType ?? 0;
+    // ✅ 计算卖出数量
+    const { amount: sellAmountWei, decimals } = await calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage);
+    // ✅ 构建授权交易（如果需要）
+    const approvalTx = await ensureSellerApproval({
+        tokenAddress,
+        seller,
+        provider: context.provider,
+        decimals,
+        chainId: context.chainId,
+        config,
+        nonceManager,
+        gasPrice,
+        txType
+    });
+    // ✅ 获取卖出报价
+    const quoteResult = await quoteSellOutput({
+        routeParams,
+        sellAmountWei,
+        provider: context.provider
+    });
+    const estimatedBNBOut = quoteResult.estimatedBNBOut;
+    console.log('📊 预估卖出所得:', ethers.formatEther(estimatedBNBOut), 'BNB');
+    // ✅ 计算每个买方的买入金额
+    let buyAmountsWei;
+    if (buyerAmounts && buyerAmounts.length === buyers.length) {
+        // 使用指定的买入金额
+        buyAmountsWei = buyerAmounts.map(amt => useNativeToken
+            ? ethers.parseEther(amt)
+            : ethers.parseUnits(amt, quoteTokenDecimals));
+    }
+    else {
+        // 平均分配（考虑滑点）
+        const totalBuyAmount = applySlippage(estimatedBNBOut, slippageTolerance);
+        const amountPerBuyer = totalBuyAmount / BigInt(buyers.length);
+        buyAmountsWei = buyers.map(() => amountPerBuyer);
+    }
+    // ✅ 验证所有买方余额
+    const reserveGas = ethers.parseEther((config.reserveGasBNB ?? 0.0005).toString());
+    for (let i = 0; i < buyers.length; i++) {
+        const buyer = buyers[i];
+        const buyAmount = buyAmountsWei[i];
+        let buyerBalance;
+        if (useNativeToken) {
+            buyerBalance = await buyer.provider.getBalance(buyer.address);
+            const required = buyAmount + FLAT_FEE + reserveGas;
+            if (buyerBalance < required) {
+                throw new Error(`买方 ${i + 1} 余额不足: 需要 ${ethers.formatEther(required)} BNB, 实际 ${ethers.formatEther(buyerBalance)} BNB`);
+            }
+        }
+        else {
+            const erc20 = new Contract(quoteToken, ERC20_BALANCE_OF_ABI, context.provider);
+            buyerBalance = await erc20.balanceOf(buyer.address);
+            const required = buyAmount + FLAT_FEE;
+            if (buyerBalance < required) {
+                throw new Error(`买方 ${i + 1} 代币余额不足: 需要 ${ethers.formatUnits(required, quoteTokenDecimals)}, 实际 ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
+            }
+        }
+    }
+    // ✅ 构建卖出交易
+    const proxySeller = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, seller);
+    const deadline = Math.floor(Date.now() / 1000) + 600;
+    let sellUnsigned;
+    if (routeParams.routeType === 'v2') {
+        const { v2Path } = routeParams;
+        sellUnsigned = await proxySeller.swapV2.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline, { value: FLAT_FEE });
+    }
+    else if (routeParams.routeType === 'v3-single') {
+        const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+        sellUnsigned = await proxySeller.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
+    }
+    else {
+        const { v3LpAddresses, v3ExactTokenIn } = routeParams;
+        sellUnsigned = await proxySeller.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
+    }
+    // ✅ 构建多个买入交易
+    const buyUnsignedList = [];
+    for (let i = 0; i < buyers.length; i++) {
+        const buyer = buyers[i];
+        const buyAmount = buyAmountsWei[i];
+        const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
+        const buyValue = useNativeToken ? buyAmount + FLAT_FEE : FLAT_FEE;
+        let buyUnsigned;
+        if (routeParams.routeType === 'v2') {
+            const { v2Path } = routeParams;
+            const reversePath = [...v2Path].reverse();
+            buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyAmount, 0n, reversePath, buyer.address, deadline, { value: buyValue });
+        }
+        else if (routeParams.routeType === 'v3-single') {
+            const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+            buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenOut, // 买入时反向
+            v3TokenIn, v3Fee, buyAmount, 0n, buyer.address, { value: buyValue });
+        }
+        else {
+            const { v3LpAddresses } = routeParams;
+            const exactTokenOut = tokenAddress;
+            buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, exactTokenOut, buyAmount, 0n, buyer.address, { value: buyValue });
+        }
+        buyUnsignedList.push(buyUnsigned);
+    }
+    // ✅ 规划 Nonce
+    // 卖方: [授权(可选)] → [卖出]
+    const sellerNonces = [];
+    if (approvalTx) {
+        // 授权已经在 ensureSellerApproval 中消耗了一个 nonce
+    }
+    const sellNonce = await nonceManager.getNextNonce(seller);
+    sellerNonces.push(sellNonce);
+    // 买方: 每个买方一个 nonce
+    const buyerNonces = [];
+    for (const buyer of buyers) {
+        const nonce = await nonceManager.getNextNonce(buyer);
+        buyerNonces.push(nonce);
+    }
+    // 利润交易：从第一个买方发送（或卖方，取决于谁有足够余额）
+    const profitAmount = calculateProfitAmount(estimatedBNBOut);
+    let profitTx = null;
+    let profitPayerIndex = 0; // 默认第一个买方支付利润
+    if (profitAmount > 0n) {
+        // 选择第一个买方作为利润支付者
+        const profitPayer = buyers[0];
+        const profitNonce = await nonceManager.getNextNonce(profitPayer);
+        profitTx = await profitPayer.signTransaction({
+            to: PROFIT_CONFIG.RECIPIENT,
+            value: profitAmount,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: context.chainId,
+            type: txType
+        });
+    }
+    nonceManager.clearTemp();
+    // ✅ 签名所有交易
+    const signedTransactions = [];
+    // 1. 授权交易（如果有）
+    if (approvalTx) {
+        signedTransactions.push(approvalTx);
+    }
+    // 2. 卖出交易
+    const signedSell = await seller.signTransaction({
+        ...sellUnsigned,
+        from: seller.address,
+        nonce: sellNonce,
+        gasLimit: finalGasLimit,
+        gasPrice,
+        chainId: context.chainId,
+        type: txType
+    });
+    signedTransactions.push(signedSell);
+    // 3. 多个买入交易
+    for (let i = 0; i < buyers.length; i++) {
+        const buyer = buyers[i];
+        const buyUnsigned = buyUnsignedList[i];
+        const buyNonce = buyerNonces[i];
+        const signedBuy = await buyer.signTransaction({
+            ...buyUnsigned,
+            from: buyer.address,
+            nonce: buyNonce,
+            gasLimit: finalGasLimit,
+            gasPrice,
+            chainId: context.chainId,
+            type: txType
+        });
+        signedTransactions.push(signedBuy);
+    }
+    // 4. 利润交易（最后）
+    if (profitTx) {
+        signedTransactions.push(profitTx);
+    }
+    console.log(`✅ 批量换手签名完成: ${signedTransactions.length} 笔交易`);
+    console.log(`   - 授权: ${approvalTx ? 1 : 0}, 卖出: 1, 买入: ${buyers.length}, 利润: ${profitTx ? 1 : 0}`);
+    return {
+        signedTransactions,
+        metadata: {
+            sellerAddress: seller.address,
+            buyerAddresses: buyers.map(b => b.address),
+            sellAmount: ethers.formatUnits(sellAmountWei, decimals),
+            buyAmounts: buyAmountsWei.map(amt => useNativeToken
+                ? ethers.formatEther(amt)
+                : ethers.formatUnits(amt, quoteTokenDecimals)),
+            hasApproval: !!approvalTx,
+            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
+        }
+    };
+}

package/package.json

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