four-flap-meme-sdk 1.4.28 → 1.4.29

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

@@ -55,6 +55,7 @@ export interface PancakeBundleBuyFirstSignParams {
     config: PancakeBuyFirstSignConfig;
     quoteToken?: string;
     quoteTokenDecimals?: number;
+    startNonces?: number[];
 }
 export interface PancakeBundleBuyFirstParams {
     buyerPrivateKey: string;

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

@@ -47,7 +47,8 @@ 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);
@@ -121,15 +122,18 @@ 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, !!approvalTx, profitAmount > 0n, needBribeTx)
+        : await planNonces({
+            buyer,
+            seller,
+            sameAddress,
+            approvalExists: !!approvalTx,
+            extractProfit: profitAmount > 0n,
+            needBribeTx,
+            nonceManager
+        });
     // ✅ 贿赂交易放在首位（由卖方发送，与利润交易同一钱包）
     let bribeTx = null;
     if (needBribeTx && noncePlan.bribeNonce !== undefined) {
@@ -512,3 +516,31 @@ async function validateFinalBalances({ sameAddress, buyerFundsWei, buyerBalance,
 function countTruthy(values) {
     return values.filter(Boolean).length;
 }
+/**
+ * ✅ 从前端传入的 startNonces 构建 NoncePlan（用于性能优化，避免 nonce 冲突）
+ * 顺序：同地址时 [baseNonce]，不同地址时 [sellerNonce, buyerNonce]
+ */
+function buildNoncePlanFromStartNonces(startNonces, sameAddress, approvalExists, profitNeeded, needBribeTx) {
+    if (sameAddress) {
+        // 同一地址：所有交易使用递增 nonce
+        let idx = 0;
+        const baseNonce = startNonces[0];
+        const bribeNonce = needBribeTx ? baseNonce + idx++ : undefined;
+        if (approvalExists)
+            idx++;
+        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;
+    if (approvalExists)
+        sellerIdx++;
+    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.29",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",