four-flap-meme-sdk 1.4.85 → 1.4.86

package/dist/pancake/bundle-buy-first.js

@@ -6,7 +6,7 @@
 import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getDeadline, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../utils/bundle-helpers.js';
 import { ADDRESSES, PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA, ZERO_ADDRESS } from '../utils/constants.js';
-import { quoteV2, quoteV3, getTokenToNativeQuote, getWrappedNativeAddress } from '../utils/quote-helpers.js';
+import { quoteV2, quoteV3, getTokenToNativeQuote } from '../utils/quote-helpers.js';
 import { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_BALANCE_ABI } from '../abis/common.js';
 /**
  * 获取 Gas Limit
@@ -180,31 +180,22 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         tokenAddress,
         useNativeToken
     });
-    const quotedNative = await quoteSellerNative({
-        provider: context.provider,
-        tokenAddress,
-        sellAmountToken: quoteResult.quotedTokenOut,
-        routeParams // ✅ 传递路由参数
-    });
-    const buyerNeed = calculateBuyerNeed({
-        quotedNative,
-        buyerBalance: buyerFundsInfo.buyerBalance,
-        reserveGas: buyerFundsInfo.reserveGas
-    });
     const finalGasLimit = getGasLimit(config);
     const gasPrice = await getGasPrice(context.provider, config);
     const txType = config.txType ?? 0;
     const nonceManager = new NonceManager(context.provider);
-    // ✅ 修复：基于买入金额估算利润（使用动态利润比例）
-    const estimatedProfitFromSell = await estimateProfitAmount({
-        provider: context.provider,
-        tokenAddress,
-        sellAmountToken: quoteResult.quotedTokenOut,
-        routeParams
-    });
-    // 使用动态利润比例
-    const profitBase = estimatedProfitFromSell > 0n ? estimatedProfitFromSell : buyerFundsInfo.buyerFundsWei;
-    const profitAmount = (profitBase * BigInt(profitRateBps)) / 10000n;
+    // ✅ 直接使用买入金额作为利润基础（先买后卖模式）
+    // profitRateBps = 每笔交易利润率(bps) * 交易笔数
+    // 例如：v1用户，1买1卖 → 5 * 2 = 10 bps = 0.1%
+    const tokenProfitAmount = (buyerFundsInfo.buyerFundsWei * BigInt(profitRateBps)) / 10000n;
+    // ✅ ERC20 购买：将代币利润转换为等值 BNB（因为利润是用 BNB 转账的）
+    let profitAmount = tokenProfitAmount;
+    if (!useNativeToken && tokenProfitAmount > 0n && quoteToken) {
+        const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
+        const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
+        profitAmount = await getTokenToNativeQuote(context.provider, quoteToken, tokenProfitAmount, 'BSC', version, fee);
+        console.log(`[pancakeBundleBuyFirstMerkle] ERC20→BNB 利润转换: ${ethers.formatUnits(tokenProfitAmount, quoteTokenDecimals)} → ${ethers.formatEther(profitAmount)} BNB`);
+    }
     // ✅ 获取贿赂金额
     const bribeAmount = config.bribeAmount && config.bribeAmount > 0
         ? ethers.parseEther(String(config.bribeAmount))
@@ -406,100 +397,6 @@ async function quoteTokenOutput({ routeParams, buyerFundsWei, provider }) {
     }
     return { quotedTokenOut: result.amountOut };
 }
-/**
- * ✅ 使用 quote-helpers 统一报价（卖出 → 原生代币）
- */
-async function quoteSellerNative({ provider, tokenAddress, sellAmountToken, routeParams }) {
-    const wbnb = getWrappedNativeAddress('BSC');
-    const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
-    const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
-    return await getTokenToNativeQuote(provider, tokenAddress, sellAmountToken, 'BSC', version, fee);
-}
-function calculateBuyerNeed({ quotedNative, buyerBalance, reserveGas }) {
-    const estimatedBuyerNeed = quotedNative;
-    const buyerNeedTotal = estimatedBuyerNeed + reserveGas;
-    if (buyerBalance < buyerNeedTotal) {
-        throw new Error(`买方余额不足:\n  - 需要: ${ethers.formatEther(buyerNeedTotal)} BNB\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
-    }
-    const maxBuyerValue = estimatedBuyerNeed > 0n
-        ? estimatedBuyerNeed
-        : buyerBalance - reserveGas;
-    return { buyerNeedTotal, maxBuyerValue };
-}
-async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress, useNativeToken = true }) {
-    const deadline = getDeadline();
-    if (routeParams.routeType === 'v2') {
-        const { v2Path } = routeParams;
-        const reversePath = [...v2Path].reverse();
-        // ✅ 使用官方 V2 Router
-        const v2RouterBuyer = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, buyer);
-        const v2RouterSeller = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, seller);
-        if (useNativeToken) {
-            // ✅ BNB 池子：使用 swapExactETHForTokens / swapExactTokensForETH
-            const buyValue = buyerFundsWei + FLAT_FEE;
-            const buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
-            const sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
-            return { buyUnsigned, sellUnsigned };
-        }
-        else {
-            // ✅ ERC20 池子（如 USDT）：使用 swapExactTokensForTokens
-            const buyUnsigned = await v2RouterBuyer.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(buyerFundsWei, 0n, v2Path, buyer.address, deadline);
-            const sellUnsigned = await v2RouterSeller.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
-            return { buyUnsigned, sellUnsigned };
-        }
-    }
-    if (routeParams.routeType === 'v3-single') {
-        const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
-        const v3RouterIface = new ethers.Interface(PANCAKE_V3_ROUTER_ABI);
-        const v3RouterBuyer = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, buyer);
-        const v3RouterSeller = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, seller);
-        // ✅ V3 池子的处理（ERC20 模式 value = 0，因为通过代币授权支付）
-        const buyValue = useNativeToken ? buyerFundsWei + FLAT_FEE : 0n;
-        // 买入交易
-        const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-                tokenIn: v3TokenIn,
-                tokenOut: v3TokenOut,
-                fee: v3Fee,
-                recipient: buyer.address,
-                amountIn: buyerFundsWei,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n
-            }]);
-        const buyUnsigned = await v3RouterBuyer.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
-        // 卖出交易
-        if (useNativeToken) {
-            // ✅ BNB 池子：卖出后 unwrap WBNB 为 BNB
-            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-                    tokenIn: v3TokenOut,
-                    tokenOut: v3TokenIn,
-                    fee: v3Fee,
-                    recipient: PANCAKE_V3_ROUTER_ADDRESS,
-                    amountIn: sellAmountToken,
-                    amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n
-                }]);
-            const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
-            const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
-            return { buyUnsigned, sellUnsigned };
-        }
-        else {
-            // ✅ ERC20 池子：卖出后直接获得 ERC20
-            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-                    tokenIn: v3TokenOut,
-                    tokenOut: v3TokenIn,
-                    fee: v3Fee,
-                    recipient: seller.address, // 直接发送到卖方地址
-                    amountIn: sellAmountToken,
-                    amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n
-                }]);
-            const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData]);
-            return { buyUnsigned, sellUnsigned };
-        }
-    }
-    // V3 多跳暂不支持官方合约
-    throw new Error('V3 多跳路由暂不支持官方合约，请使用 V2 路由或 V3 单跳');
-}
 /**
  * ✅ 构建多笔买入和卖出交易
  */
@@ -583,60 +480,6 @@ async function buildMultiRouteTransactions({ routeParams, buyAmountsWei, sellAmo
     }
     throw new Error('V3 多跳路由暂不支持官方合约，请使用 V2 路由或 V3 单跳');
 }
-/**
- * ✅ 使用 quote-helpers 统一报价（估算利润）
- */
-async function estimateProfitAmount({ provider, tokenAddress, sellAmountToken, routeParams }) {
-    try {
-        const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
-        const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
-        const estimatedSellFunds = await getTokenToNativeQuote(provider, tokenAddress, sellAmountToken, 'BSC', version, fee);
-        if (estimatedSellFunds <= 0n) {
-            return 0n;
-        }
-        // 万分之六
-        return (estimatedSellFunds * BigInt(PROFIT_CONFIG.RATE_BPS_SWAP)) / 10000n;
-    }
-    catch {
-        return 0n;
-    }
-}
-/**
- * ✅ 规划 nonce
- * 交易顺序：贿赂 → 买入 → 卖出 → 利润
- */
-async function planNonces({ buyer, seller, sameAddress, extractProfit, needBribeTx, nonceManager }) {
-    if (sameAddress) {
-        // 同一地址：贿赂(可选) + 买入 + 卖出 + 利润(可选)
-        const txCount = countTruthy([needBribeTx, true, true, extractProfit]);
-        const nonces = await nonceManager.getNextNonceBatch(buyer, txCount);
-        let idx = 0;
-        const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
-        const buyerNonce = nonces[idx++];
-        const sellerNonce = nonces[idx++];
-        const profitNonce = extractProfit ? nonces[idx] : undefined;
-        return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-    }
-    if (needBribeTx || extractProfit) {
-        // 卖方需要多个 nonce：贿赂(可选) + 卖出 + 利润(可选)
-        const sellerTxCount = countTruthy([needBribeTx, true, extractProfit]);
-        // ✅ 并行获取 seller 和 buyer 的 nonce
-        const [sellerNonces, buyerNonce] = await Promise.all([
-            nonceManager.getNextNonceBatch(seller, sellerTxCount),
-            nonceManager.getNextNonce(buyer)
-        ]);
-        let idx = 0;
-        const bribeNonce = needBribeTx ? sellerNonces[idx++] : undefined;
-        const sellerNonce = sellerNonces[idx++];
-        const profitNonce = extractProfit ? sellerNonces[idx] : undefined;
-        return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-    }
-    const [buyerNonce, sellerNonce] = await Promise.all([
-        nonceManager.getNextNonce(buyer),
-        nonceManager.getNextNonce(seller)
-    ]);
-    return { buyerNonce, sellerNonce };
-}
 /**
  * ✅ 规划多笔交易 nonce（与 Flap 一致）
  * 交易顺序：贿赂 → 买入(多笔) → 卖出(多笔) → 利润
@@ -729,33 +572,6 @@ async function validateFinalBalances({ sameAddress, buyerFundsWei, buyerBalance,
     }
     // ERC20 余额已在 calculateBuyerFunds 中检查过
 }
-function countTruthy(values) {
-    return values.filter(Boolean).length;
-}
-/**
- * ✅ 从前端传入的 startNonces 构建 NoncePlan（用于性能优化，避免 nonce 冲突）
- * 顺序：同地址时 [baseNonce]，不同地址时 [sellerNonce, buyerNonce]
- */
-function buildNoncePlanFromStartNonces(startNonces, sameAddress, profitNeeded, needBribeTx) {
-    if (sameAddress) {
-        // 同一地址：贿赂(可选) + 买入 + 卖出 + 利润(可选)
-        let idx = 0;
-        const baseNonce = startNonces[0];
-        const bribeNonce = needBribeTx ? baseNonce + idx++ : undefined;
-        const buyerNonce = baseNonce + idx++;
-        const sellerNonce = baseNonce + idx++;
-        const profitNonce = profitNeeded ? baseNonce + idx : undefined;
-        return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-    }
-    // 不同地址
-    let sellerIdx = 0;
-    const sellerBaseNonce = startNonces[0];
-    const bribeNonce = needBribeTx ? sellerBaseNonce + sellerIdx++ : undefined;
-    const sellerNonce = sellerBaseNonce + sellerIdx++;
-    const profitNonce = profitNeeded ? sellerBaseNonce + sellerIdx : undefined;
-    const buyerNonce = startNonces[1];
-    return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
-}
 /**
  * ✅ 多钱包捆绑换手
  * - 多个买方钱包执行买入（每个钱包1笔）
@@ -831,15 +647,17 @@ async function pancakeBundleBuyFirstMultiWallet(params) {
     const buyAmountsWei = splitAmount(totalFundsWei, buyCount);
     // ✅ 将代币平均分配给卖方
     const sellAmountsWei = splitAmount(quoteResult.quotedTokenOut, sellCount);
-    // ✅ 第二批并行：估算利润（可以和交易构建并行，但需要先获取报价）
-    const estimatedProfitFromSell = await estimateProfitAmount({
-        provider: context.provider,
-        tokenAddress,
-        sellAmountToken: quoteResult.quotedTokenOut,
-        routeParams
-    });
-    const profitBase = estimatedProfitFromSell > 0n ? estimatedProfitFromSell : totalFundsWei;
-    const profitAmount = (profitBase * BigInt(profitRateBps)) / 10000n;
+    // ✅ 直接使用总交易金额作为利润基础（多钱包模式）
+    // profitRateBps = 每笔交易利润率(bps) * 交易笔数
+    const tokenProfitAmount = (totalFundsWei * BigInt(profitRateBps)) / 10000n;
+    // ✅ ERC20 购买：将代币利润转换为等值 BNB（因为利润是用 BNB 转账的）
+    let profitAmount = tokenProfitAmount;
+    if (!useNativeToken && tokenProfitAmount > 0n && quoteToken) {
+        const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
+        const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
+        profitAmount = await getTokenToNativeQuote(context.provider, quoteToken, tokenProfitAmount, 'BSC', version, fee);
+        console.log(`[pancakeBundleBuyFirstMultiWallet] ERC20→BNB 利润转换: ${ethers.formatUnits(tokenProfitAmount, quoteTokenDecimals)} → ${ethers.formatEther(profitAmount)} BNB`);
+    }
     // ✅ 第三批并行：构建并签名所有交易
     const allTransactions = [];
     // 1. 贿赂交易（由主卖方支付）- 先处理以确定 nonce 偏移

package/package.json

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