four-flap-meme-sdk 1.4.28 → 1.4.30

package/dist/dex/direct-router.js

@@ -748,23 +748,16 @@ export async function directV3BatchBuy(params) {
     const totalFlowWei = flowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const baseProfitWei = calculateProfitAmount(totalFlowWei);
     // ✅ 方案 B：并行获取 nonces、gasPrice 和 ERC20 报价
-    // ✅ 修复：ERC20 报价不传 fee 参数，让报价函数自动选择最佳费率
-    // 因为 quoteToken/WBNB 池的费率可能与交易池（tokenAddress）的费率不同
     const [nonces, gasPrice, nativeProfitWei] = await Promise.all([
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
         getGasPrice(provider, config),
-        // ERC20 报价（不传 fee，自动选择最佳费率）
+        // ERC20 报价（V3 买入用 V3 报价）
         (!useNative && baseProfitWei > 0n && quoteToken)
-            ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v3')
+            ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v3', fee)
             : Promise.resolve(baseProfitWei)
     ]);
-    // ✅ 添加详细日志
-    if (!useNative) {
-        console.log(`[V3 Buy Profit] quoteToken=${quoteToken}, baseProfitWei=${baseProfitWei} (${ethers.formatEther(baseProfitWei)} quoteToken)`);
-        console.log(`[V3 Buy Profit] nativeProfitWei=${nativeProfitWei} (${ethers.formatEther(nativeProfitWei)} BNB)`);
-    }
     const profitWei = nativeProfitWei > 0n ? nativeProfitWei : 0n;
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;

package/dist/pancake/bundle-buy-first.d.ts

@@ -14,7 +14,6 @@ export interface PancakeBuyFirstSignConfig {
     chainId?: number;
     reserveGasBNB?: number;
     skipQuoteOnError?: boolean;
-    skipApprovalCheck?: boolean;
     bribeAmount?: number;
 }
 export type SwapRouteType = 'v2' | 'v3-single' | 'v3-multi';
@@ -43,7 +42,6 @@ export interface PancakeBuyFirstConfig extends CommonBundleConfig {
     reserveGasBNB?: number;
     waitForConfirmation?: boolean;
     waitTimeoutMs?: number;
-    skipApprovalCheck?: boolean;
 }
 export interface PancakeBundleBuyFirstSignParams {
     buyerPrivateKey: string;
@@ -55,6 +53,7 @@ export interface PancakeBundleBuyFirstSignParams {
     config: PancakeBuyFirstSignConfig;
     quoteToken?: string;
     quoteTokenDecimals?: number;
+    startNonces?: number[];
 }
 export interface PancakeBundleBuyFirstParams {
     buyerPrivateKey: string;
@@ -73,7 +72,6 @@ export type PancakeBuyFirstResult = {
         sellerAddress: string;
         buyAmount: string;
         sellAmount: string;
-        hasApproval?: boolean;
         profitAmount?: string;
     };
 };

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

@@ -7,7 +7,7 @@ import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getDeadline } 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 { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI } from '../abis/common.js';
+import { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_BALANCE_ABI } from '../abis/common.js';
 /**
  * 获取 Gas Limit
  */
@@ -44,10 +44,9 @@ const PANCAKE_V3_ROUTER_ADDRESS = ADDRESSES.BSC.PancakeV3Router;
 // 常量
 const FLAT_FEE = 0n;
 const WBNB_ADDRESS = ADDRESSES.BSC.WBNB;
-// ✅ getDeadline 从 bundle-helpers.js 导入
-const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
 export async function pancakeBundleBuyFirstMerkle(params) {
-    const { buyerPrivateKey, sellerPrivateKey, tokenAddress, routeParams, buyerFunds, buyerFundsPercentage, config, quoteToken, quoteTokenDecimals = 18 } = params;
+    const { buyerPrivateKey, sellerPrivateKey, tokenAddress, routeParams, buyerFunds, buyerFundsPercentage, config, quoteToken, quoteTokenDecimals = 18, startNonces // ✅ 可选：前端预获取的 nonces
+     } = params;
     // ✅ 判断是否使用原生代币（BNB）或 ERC20 代币（如 USDT）
     const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
     const context = createPancakeContext(config);
@@ -69,7 +68,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         buyerFundsWei: buyerFundsInfo.buyerFundsWei,
         provider: context.provider
     });
-    const decimals = await getTokenDecimals(context.provider, tokenAddress);
     const swapUnsigned = await buildRouteTransactions({
         routeParams,
         buyerFundsWei: buyerFundsInfo.buyerFundsWei,
@@ -94,17 +92,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
     const gasPrice = await getGasPrice(context.provider, config);
     const txType = config.txType ?? 0;
     const nonceManager = new NonceManager(context.provider);
-    const approvalTx = await ensureSellerApproval({
-        tokenAddress,
-        seller,
-        provider: context.provider,
-        decimals,
-        chainId: context.chainId,
-        config,
-        nonceManager,
-        gasPrice,
-        txType
-    });
     // ✅ 修复：基于买入金额估算利润，而不是基于卖出预估（因为代币可能还没有流动性）
     // 在先买后卖的场景中，卖出收益 ≈ 买入金额（忽略滑点和手续费）
     const estimatedProfitFromSell = await estimateProfitAmount({
@@ -121,15 +108,17 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         ? ethers.parseEther(String(config.bribeAmount))
         : 0n;
     const needBribeTx = bribeAmount > 0n;
-    const noncePlan = await planNonces({
-        buyer,
-        seller,
-        sameAddress,
-        approvalExists: !!approvalTx,
-        extractProfit: profitAmount > 0n,
-        needBribeTx, // ✅ 新增
-        nonceManager
-    });
+    // ✅ 如果前端传入了 startNonces，直接使用（性能优化，避免 nonce 冲突）
+    const noncePlan = startNonces && startNonces.length >= (sameAddress ? 1 : 2)
+        ? buildNoncePlanFromStartNonces(startNonces, sameAddress, profitAmount > 0n, needBribeTx)
+        : await planNonces({
+            buyer,
+            seller,
+            sameAddress,
+            extractProfit: profitAmount > 0n,
+            needBribeTx,
+            nonceManager
+        });
     // ✅ 贿赂交易放在首位（由卖方发送，与利润交易同一钱包）
     let bribeTx = null;
     if (needBribeTx && noncePlan.bribeNonce !== undefined) {
@@ -183,12 +172,10 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         provider: context.provider,
         buyerAddress: buyer.address
     });
-    // ✅ 组装顺序：贿赂 → 授权 → 买入 → 卖出 → 利润
+    // ✅ 组装顺序：贿赂 → 买入 → 卖出 → 利润
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    if (approvalTx)
-        allTransactions.push(approvalTx);
     allTransactions.push(signedBuy, signedSell);
     if (profitTx)
         allTransactions.push(profitTx);
@@ -201,7 +188,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
                 ? ethers.formatEther(buyerFundsInfo.buyerFundsWei)
                 : ethers.formatUnits(buyerFundsInfo.buyerFundsWei, quoteTokenDecimals),
             sellAmount: quoteResult.quotedTokenOut.toString(),
-            hasApproval: !!approvalTx,
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
         }
     };
@@ -303,10 +289,6 @@ async function quoteTokenOutput({ routeParams, buyerFundsWei, provider }) {
     }
     return { quotedTokenOut: result.amountOut };
 }
-async function getTokenDecimals(provider, tokenAddress) {
-    const erc20 = new Contract(tokenAddress, ['function decimals() view returns (uint8)'], provider);
-    return await erc20.decimals();
-}
 /**
  * ✅ 使用 quote-helpers 统一报价（卖出 → 原生代币）
  */
@@ -328,30 +310,6 @@ function calculateBuyerNeed({ quotedNative, buyerBalance, reserveGas }) {
         : buyerBalance - reserveGas;
     return { buyerNeedTotal, maxBuyerValue };
 }
-async function ensureSellerApproval({ tokenAddress, seller, provider, decimals, chainId, config, nonceManager, gasPrice, txType }) {
-    if (config.skipApprovalCheck) {
-        return null;
-    }
-    const erc20Contract = new Contract(tokenAddress, ERC20_ALLOWANCE_ABI, provider);
-    // ✅ 使用官方 V2 Router 作为授权目标
-    const currentAllowance = await erc20Contract.allowance(seller.address, PANCAKE_V2_ROUTER_ADDRESS);
-    // ✅ 阈值：MaxUint256 / 2，如果授权额度超过这个值，认为是"无限授权"
-    const halfMaxUint = ethers.MaxUint256 / 2n;
-    if (currentAllowance >= halfMaxUint) {
-        return null;
-    }
-    const approvalNonce = await nonceManager.getNextNonce(seller);
-    return await seller.signTransaction({
-        to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [PANCAKE_V2_ROUTER_ADDRESS, ethers.MaxUint256]),
-        value: 0n,
-        nonce: approvalNonce,
-        gasLimit: 80000n,
-        gasPrice,
-        chainId,
-        type: txType
-    });
-}
 async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress, useNativeToken = true }) {
     const deadline = getDeadline();
     // ✅ ERC20 购买时，value 只需要 FLAT_FEE
@@ -421,25 +379,23 @@ async function estimateProfitAmount({ provider, tokenAddress, sellAmountToken, r
 }
 /**
  * ✅ 规划 nonce
- * 交易顺序：贿赂 → 授权 → 买入 → 卖出 → 利润
+ * 交易顺序：贿赂 → 买入 → 卖出 → 利润
  */
-async function planNonces({ buyer, seller, sameAddress, approvalExists, extractProfit, needBribeTx, nonceManager }) {
+async function planNonces({ buyer, seller, sameAddress, extractProfit, needBribeTx, nonceManager }) {
     if (sameAddress) {
-        // 同一地址：贿赂(可选) + 授权(可选) + 买入 + 卖出 + 利润(可选)
-        const txCount = countTruthy([needBribeTx, approvalExists, true, true, extractProfit]);
+        // 同一地址：贿赂(可选) + 买入 + 卖出 + 利润(可选)
+        const txCount = countTruthy([needBribeTx, true, true, extractProfit]);
         const nonces = await nonceManager.getNextNonceBatch(buyer, txCount);
         let idx = 0;
         const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
-        if (approvalExists)
-            idx++;
         const buyerNonce = nonces[idx++];
         const sellerNonce = nonces[idx++];
         const profitNonce = extractProfit ? nonces[idx] : undefined;
         return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
     }
-    if (needBribeTx || approvalExists || extractProfit) {
-        // 卖方需要多个 nonce：贿赂(可选) + 授权(可选) + 卖出 + 利润(可选)
-        const sellerTxCount = countTruthy([needBribeTx, approvalExists, true, extractProfit]);
+    if (needBribeTx || extractProfit) {
+        // 卖方需要多个 nonce：贿赂(可选) + 卖出 + 利润(可选)
+        const sellerTxCount = countTruthy([needBribeTx, true, extractProfit]);
         // ✅ 并行获取 seller 和 buyer 的 nonce
         const [sellerNonces, buyerNonce] = await Promise.all([
             nonceManager.getNextNonceBatch(seller, sellerTxCount),
@@ -447,8 +403,6 @@ async function planNonces({ buyer, seller, sameAddress, approvalExists, extractP
         ]);
         let idx = 0;
         const bribeNonce = needBribeTx ? sellerNonces[idx++] : undefined;
-        if (approvalExists)
-            idx++;
         const sellerNonce = sellerNonces[idx++];
         const profitNonce = extractProfit ? sellerNonces[idx] : undefined;
         return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
@@ -512,3 +466,27 @@ async function validateFinalBalances({ sameAddress, buyerFundsWei, buyerBalance,
 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 };
+}

package/package.json

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