four-flap-meme-sdk 1.4.67 → 1.4.69

package/dist/contracts/tm-bundle-merkle/swap-buy-first.js

@@ -105,34 +105,26 @@ export async function fourBundleBuyFirstMerkle(params) {
     if (buyerFundsWei <= 0n) {
         throw new Error('buyerFunds 需要大于 0');
     }
-    // ✅ 优化：第二批并行 - buyQuote、sellerTokenBal、decimals、allowance
+    // ✅ 优化：第二批并行 - buyQuote、sellerTokenBal、decimals
     const helper3 = new Contract(ADDRESSES.BSC.TokenManagerHelper3, HELPER3_ABI, provider);
     const erc20 = new Contract(tokenAddress, [
         'function balanceOf(address) view returns (uint256)',
-        'function decimals() view returns (uint8)',
-        'function allowance(address,address) view returns (uint256)'
+        'function decimals() view returns (uint8)'
     ], provider);
-    const [buyQuote, sellerTokenBal, decimals, currentAllowance] = await Promise.all([
+    const [buyQuote, sellerTokenBal, decimals] = await Promise.all([
         helper3.tryBuy(tokenAddress, 0n, buyerFundsWei),
         erc20.balanceOf(seller.address),
-        erc20.decimals(),
-        erc20.allowance(seller.address, TM_ADDRESS)
+        erc20.decimals()
     ]);
-    // ✅ 检查是否需要授权（授权额度小于 10 亿代币时需要授权）
-    const APPROVAL_THRESHOLD = ethers.parseUnits('1000000000', decimals);
-    const needApproval = currentAllowance < APPROVAL_THRESHOLD;
     const estimatedTokenAmount = buyQuote.estimatedAmount ?? buyQuote[2];
     if (!estimatedTokenAmount || estimatedTokenAmount <= 0n) {
         throw new Error('报价失败：无法估算可买入的代币数量');
     }
-    // ✅ 多笔买入时减少卖出数量以应对滑点
-    // 原因：分批买入会推高价格，实际获得的代币 < 一次性买入的报价
-    // 每多一笔买入，减少 0.5% 的卖出数量（保守估计）
-    let sellAmountWei = estimatedTokenAmount;
-    if (buyCount > 1) {
-        const slippageReductionBps = BigInt((buyCount - 1) * 50); // 每多1笔减少 0.5% = 50 bps
-        sellAmountWei = estimatedTokenAmount * (10000n - slippageReductionBps) / 10000n;
-    }
+    // ✅ 添加安全系数：减少 2% 卖出数量以应对报价误差/税/滑点
+    // 原因：Four.meme 报价可能有误差，实际买入的代币可能少于报价
+    // 小金额时误差影响更大，需要安全余量
+    const SELL_SAFETY_BPS = 200n; // 2% = 200 bps
+    const sellAmountWei = estimatedTokenAmount * (10000n - SELL_SAFETY_BPS) / 10000n;
     // 卖方余额检查
     if (!sameAddress && sellerTokenBal < sellAmountWei) {
         throw new Error(`卖方代币余额不足: 需要 ${ethers.formatUnits(sellAmountWei, decimals)}，实际 ${ethers.formatUnits(sellerTokenBal, decimals)}`);
@@ -151,7 +143,7 @@ export async function fourBundleBuyFirstMerkle(params) {
     // ✅ 构建多笔买入和卖出交易
     const buyUnsignedPromises = buyAmountsWei.map(amount => tmBuyer.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyer.address, amount, 0n, { value: amount }));
     const sellUnsignedPromises = sellAmountsWei.map(amount => tmSeller.sellToken.populateTransaction(0n, tokenAddress, amount, 0n));
-    // ✅ 规划多笔交易 nonce（包含授权交易）
+    // ✅ 规划多笔交易 nonce（与 Flap 一致，不含授权）
     const multiNoncePlan = await planMultiNonces({
         buyer,
         seller,
@@ -159,7 +151,6 @@ export async function fourBundleBuyFirstMerkle(params) {
         sellCount,
         extractProfit,
         needBribeTx,
-        needApproval, // ✅ 新增
         sameAddress,
         nonceManager
     });
@@ -204,35 +195,16 @@ export async function fourBundleBuyFirstMerkle(params) {
         type: txType,
         value: 0n
     }));
-    // ✅ 授权交易（放在买入后、卖出前）
-    let approvalTx = null;
-    if (needApproval && multiNoncePlan.approvalNonce !== undefined) {
-        const approveInterface = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
-        const approveData = approveInterface.encodeFunctionData('approve', [TM_ADDRESS, ethers.MaxUint256]);
-        approvalTx = await seller.signTransaction({
-            to: tokenAddress,
-            data: approveData,
-            value: 0n,
-            nonce: multiNoncePlan.approvalNonce,
-            gasLimit: 80000n,
-            gasPrice,
-            chainId: chainIdNum,
-            type: txType
-        });
-    }
     const [signedBuys, signedSells] = await Promise.all([
         Promise.all(buySignPromises),
         Promise.all(sellSignPromises)
     ]);
     nonceManager.clearTemp();
-    // ✅ 组装交易列表：贿赂 → 买入(多笔) → 授权 → 卖出(多笔)
+    // ✅ 组装交易列表：贿赂 → 买入(多笔) → 卖出(多笔)（与 Flap 一致）
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    allTransactions.push(...signedBuys);
-    if (approvalTx)
-        allTransactions.push(approvalTx);
-    allTransactions.push(...signedSells);
+    allTransactions.push(...signedBuys, ...signedSells);
     // ✅ 利润多跳转账（强制 2 跳中转）
     let profitHopWallets;
     if (extractProfit && profitAmount > 0n && multiNoncePlan.profitNonce !== undefined) {
@@ -266,39 +238,38 @@ export async function fourBundleBuyFirstMerkle(params) {
     };
 }
 /**
- * ✅ 规划多笔交易 nonce
- * 交易顺序：贿赂 → 买入(多笔) → 授权 → 卖出(多笔) → 利润
+ * ✅ 规划多笔交易 nonce（与 Flap 一致）
+ * 交易顺序：贿赂 → 买入(多笔) → 卖出(多笔) → 利润
  */
-async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProfit, needBribeTx, needApproval, sameAddress, nonceManager }) {
+async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProfit, needBribeTx, sameAddress, nonceManager }) {
     const profitNonceCount = extractProfit ? 1 : 0;
-    const approvalTxCount = needApproval ? 1 : 0;
     if (sameAddress) {
-        // 同地址：贿赂 → 买入(多笔) → 授权 → 卖出(多笔) → 利润
+        // 同一地址：贿赂(可选) + 买入(多笔) + 卖出(多笔) + 利润(可选)
         const bribeTxCount = needBribeTx ? 1 : 0;
-        const totalTxCount = bribeTxCount + buyCount + approvalTxCount + sellCount + profitNonceCount;
+        const totalTxCount = bribeTxCount + buyCount + sellCount + profitNonceCount;
         const nonces = await nonceManager.getNextNonceBatch(buyer, totalTxCount);
         let idx = 0;
         const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
         const buyerNonces = nonces.slice(idx, idx + buyCount);
         idx += buyCount;
-        const approvalNonce = needApproval ? nonces[idx++] : undefined;
         const sellerNonces = nonces.slice(idx, idx + sellCount);
         idx += sellCount;
         const profitNonce = extractProfit ? nonces[idx] : undefined;
-        return { buyerNonces, sellerNonces, bribeNonce, approvalNonce, profitNonce };
+        return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
     }
-    // 不同地址：买方只负责买入，卖方负责贿赂+授权+卖出+利润
+    // 不同地址
+    // 买方：buyCount 个 nonce
+    // 卖方：贿赂(可选) + sellCount + 利润(可选) 个 nonce
     const bribeTxCount = needBribeTx ? 1 : 0;
-    const sellerTxCount = bribeTxCount + approvalTxCount + sellCount + profitNonceCount;
+    const sellerTxCount = bribeTxCount + sellCount + profitNonceCount;
     const [buyerNonces, sellerNoncesAll] = await Promise.all([
         nonceManager.getNextNonceBatch(buyer, buyCount),
         nonceManager.getNextNonceBatch(seller, sellerTxCount)
     ]);
     let idx = 0;
     const bribeNonce = needBribeTx ? sellerNoncesAll[idx++] : undefined;
-    const approvalNonce = needApproval ? sellerNoncesAll[idx++] : undefined;
     const sellerNonces = sellerNoncesAll.slice(idx, idx + sellCount);
     idx += sellCount;
     const profitNonce = extractProfit ? sellerNoncesAll[idx] : undefined;
-    return { buyerNonces, sellerNonces, bribeNonce, approvalNonce, profitNonce };
+    return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
 }

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

@@ -121,28 +121,11 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         buyerFundsWei: buyerFundsInfo.buyerFundsWei,
         provider: context.provider
     });
-    // ✅ 检查是否需要授权（卖出代币需要先授权给 Router）
-    const approvalTarget = routeParams.routeType === 'v2'
-        ? PANCAKE_V2_ROUTER_ADDRESS
-        : PANCAKE_V3_ROUTER_ADDRESS;
-    const erc20ForApproval = new Contract(tokenAddress, [
-        'function allowance(address,address) view returns (uint256)',
-        'function decimals() view returns (uint8)'
-    ], context.provider);
-    const [currentAllowance, tokenDecimals] = await Promise.all([
-        erc20ForApproval.allowance(seller.address, approvalTarget),
-        erc20ForApproval.decimals()
-    ]);
-    const APPROVAL_THRESHOLD = ethers.parseUnits('1000000000', tokenDecimals);
-    const needApproval = currentAllowance < APPROVAL_THRESHOLD;
-    // ✅ 多笔买入时减少卖出数量以应对滑点
-    // 原因：分批买入会推高价格，实际获得的代币 < 一次性买入的报价
-    // 每多一笔买入，减少 0.5% 的卖出数量（保守估计）
-    let adjustedSellAmount = quoteResult.quotedTokenOut;
-    if (buyCount > 1) {
-        const slippageReductionBps = BigInt((buyCount - 1) * 50); // 每多1笔减少 0.5% = 50 bps
-        adjustedSellAmount = quoteResult.quotedTokenOut * (10000n - slippageReductionBps) / 10000n;
-    }
+    // ✅ 添加安全系数：减少 2% 卖出数量以应对报价误差/税/滑点
+    // 原因：报价可能有误差，实际买入的代币可能少于报价
+    // 小金额时误差影响更大，需要安全余量
+    const SELL_SAFETY_BPS = 200n; // 2% = 200 bps
+    const adjustedSellAmount = quoteResult.quotedTokenOut * (10000n - SELL_SAFETY_BPS) / 10000n;
     // ✅ 拆分买入和卖出金额
     const buyAmountsWei = splitAmount(buyerFundsInfo.buyerFundsWei, buyCount);
     const sellAmountsWei = splitAmount(adjustedSellAmount, sellCount);
@@ -195,7 +178,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         sameAddress,
         extractProfit: profitAmount > 0n,
         needBribeTx,
-        needApproval, // ✅ 新增
         nonceManager
     });
     // ✅ 贿赂交易放在首位（由卖方发送，与利润交易同一钱包）
@@ -221,22 +203,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         chainId: context.chainId,
         type: txType
     })));
-    // ✅ 授权交易（放在买入后、卖出前）
-    let approvalTx = null;
-    if (needApproval && multiNoncePlan.approvalNonce !== undefined) {
-        const approveInterface = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
-        const approveData = approveInterface.encodeFunctionData('approve', [approvalTarget, ethers.MaxUint256]);
-        approvalTx = await seller.signTransaction({
-            to: tokenAddress,
-            data: approveData,
-            value: 0n,
-            nonce: multiNoncePlan.approvalNonce,
-            gasLimit: 80000n,
-            gasPrice,
-            chainId: context.chainId,
-            type: txType
-        });
-    }
     // ✅ 并行签名所有卖出交易
     const signedSells = await Promise.all(swapUnsignedArray.sellUnsignedArray.map((unsigned, i) => seller.signTransaction({
         ...unsigned,
@@ -260,14 +226,11 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         provider: context.provider,
         buyerAddress: buyer.address
     });
-    // ✅ 组装顺序：贿赂 → 买入(多笔) → 授权 → 卖出(多笔)
+    // ✅ 组装顺序：贿赂 → 买入(多笔) → 卖出(多笔)（与 Flap 一致）
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    allTransactions.push(...signedBuys);
-    if (approvalTx)
-        allTransactions.push(approvalTx);
-    allTransactions.push(...signedSells);
+    allTransactions.push(...signedBuys, ...signedSells);
     // ✅ 利润多跳转账（强制 2 跳中转）
     const profitResult = await buildProfitTransaction({
         provider: context.provider,
@@ -577,42 +540,40 @@ async function planNonces({ buyer, seller, sameAddress, extractProfit, needBribe
     return { buyerNonce, sellerNonce };
 }
 /**
- * ✅ 规划多笔交易 nonce
- * 交易顺序：贿赂 → 买入(多笔) → 授权 → 卖出(多笔) → 利润
+ * ✅ 规划多笔交易 nonce（与 Flap 一致）
+ * 交易顺序：贿赂 → 买入(多笔) → 卖出(多笔) → 利润
  */
-async function planMultiNonces({ buyer, seller, buyCount, sellCount, sameAddress, extractProfit, needBribeTx, needApproval, // ✅ 新增
-nonceManager }) {
+async function planMultiNonces({ buyer, seller, buyCount, sellCount, sameAddress, extractProfit, needBribeTx, nonceManager }) {
     const profitNonceCount = extractProfit ? 1 : 0;
-    const approvalTxCount = needApproval ? 1 : 0;
     if (sameAddress) {
-        // 同地址：贿赂 → 买入(多笔) → 授权 → 卖出(多笔) → 利润
+        // 同一地址：贿赂(可选) + 买入(多笔) + 卖出(多笔) + 利润(可选)
         const bribeTxCount = needBribeTx ? 1 : 0;
-        const totalTxCount = bribeTxCount + buyCount + approvalTxCount + sellCount + profitNonceCount;
+        const totalTxCount = bribeTxCount + buyCount + sellCount + profitNonceCount;
         const nonces = await nonceManager.getNextNonceBatch(buyer, totalTxCount);
         let idx = 0;
         const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
         const buyerNonces = nonces.slice(idx, idx + buyCount);
         idx += buyCount;
-        const approvalNonce = needApproval ? nonces[idx++] : undefined;
         const sellerNonces = nonces.slice(idx, idx + sellCount);
         idx += sellCount;
         const profitNonce = extractProfit ? nonces[idx] : undefined;
-        return { buyerNonces, sellerNonces, bribeNonce, approvalNonce, profitNonce };
+        return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
     }
-    // 不同地址：买方只负责买入，卖方负责贿赂+授权+卖出+利润
+    // 不同地址
+    // 买方：buyCount 个 nonce
+    // 卖方：贿赂(可选) + sellCount + 利润(可选) 个 nonce
     const bribeTxCount = needBribeTx ? 1 : 0;
-    const sellerTxCount = bribeTxCount + approvalTxCount + sellCount + profitNonceCount;
+    const sellerTxCount = bribeTxCount + sellCount + profitNonceCount;
     const [buyerNonces, sellerNoncesAll] = await Promise.all([
         nonceManager.getNextNonceBatch(buyer, buyCount),
         nonceManager.getNextNonceBatch(seller, sellerTxCount)
     ]);
     let idx = 0;
     const bribeNonce = needBribeTx ? sellerNoncesAll[idx++] : undefined;
-    const approvalNonce = needApproval ? sellerNoncesAll[idx++] : undefined;
     const sellerNonces = sellerNoncesAll.slice(idx, idx + sellCount);
     idx += sellCount;
     const profitNonce = extractProfit ? sellerNoncesAll[idx] : undefined;
-    return { buyerNonces, sellerNonces, bribeNonce, approvalNonce, profitNonce };
+    return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
 }
 /**
  * 构建利润多跳转账交易（强制 2 跳中转）

package/package.json

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