four-flap-meme-sdk 1.4.30 → 1.4.32

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

@@ -15,7 +15,6 @@ export interface FourBuyFirstConfig extends CommonBundleConfig {
     reserveGasBNB?: number;
     waitForConfirmation?: boolean;
     waitTimeoutMs?: number;
-    skipApprovalCheck?: boolean;
 }
 export interface FourBundleBuyFirstSignParams {
     buyerPrivateKey: string;
@@ -41,7 +40,6 @@ export type FourBuyFirstResult = {
         sellerAddress: string;
         buyAmount: string;
         sellAmount: string;
-        hasApproval?: boolean;
         profitAmount?: string;
     };
 };

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

@@ -52,18 +52,16 @@ 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()
     ]);
     const estimatedTokenAmount = buyQuote.estimatedAmount ?? buyQuote[2];
     if (!estimatedTokenAmount || estimatedTokenAmount <= 0n) {
@@ -74,14 +72,9 @@ export async function fourBundleBuyFirstMerkle(params) {
     if (!sameAddress && sellerTokenBal < sellAmountWei) {
         throw new Error(`卖方代币余额不足: 需要 ${ethers.formatUnits(sellAmountWei, decimals)}，实际 ${ethers.formatUnits(sellerTokenBal, decimals)}`);
     }
-    // ✅ 检查是否需要授权
-    const APPROVAL_THRESHOLD = ethers.parseUnits('1000000000', decimals);
-    const needApproval = currentAllowance < APPROVAL_THRESHOLD;
     // ✅ 优化：第三批并行 - trySell、构建交易、获取 nonces
     const tmBuyer = new Contract(TM_ADDRESS, TM_ABI, buyer);
     const tmSeller = new Contract(TM_ADDRESS, TM_ABI, seller);
-    // ✅ 已移除滑点保护：minBuyAmount 固定为 0
-    const minBuyAmount = 0n;
     // 预先规划 nonces
     const extractProfit = true;
     const profitRateBps = PROFIT_CONFIG.RATE_BPS_CAPITAL; // 万分之三
@@ -93,8 +86,6 @@ export async function fourBundleBuyFirstMerkle(params) {
     let sellerNonceCount = 1; // 卖出交易
     if (needBribeTx)
         sellerNonceCount++; // 贿赂交易（由卖方发送）
-    if (needApproval)
-        sellerNonceCount++; // 授权交易
     if (extractProfit)
         sellerNonceCount++; // 利润交易
     // ✅ 优化：使用批量 nonce 获取（单次网络往返）
@@ -110,31 +101,22 @@ export async function fourBundleBuyFirstMerkle(params) {
         }));
     const [sellResult, buyUnsigned, sellUnsigned, noncesResult] = await Promise.all([
         trySell('BSC', config.rpcUrl, tokenAddress, sellAmountWei),
-        tmBuyer.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyer.address, buyerFundsWei, minBuyAmount, { value: buyerFundsWei }),
-        tmSeller.sellToken.populateTransaction(0n, tokenAddress, sellAmountWei, 0n), // minSellFunds 后面更新
+        tmBuyer.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyer.address, buyerFundsWei, 0n, { value: buyerFundsWei }),
+        tmSeller.sellToken.populateTransaction(0n, tokenAddress, sellAmountWei, 0n),
         getNoncesPromise
     ]);
     const { buyerNonces, sellerNonces } = noncesResult;
     const estimatedSellFunds = sellResult.funds;
-    // ✅ 已移除滑点保护：minSellFunds 固定为 0
-    const minSellFunds = 0n;
     const profitAmount = extractProfit ? (estimatedSellFunds * BigInt(profitRateBps)) / 10000n : 0n;
-    // 更新卖出交易的 minSellFunds
-    sellUnsigned.data = tmSeller.interface.encodeFunctionData('sellToken', [
-        0n, tokenAddress, sellAmountWei, minSellFunds
-    ]);
     // 分配 nonces
     let buyerNonce;
     let sellerNonce;
     let bribeNonce;
-    let approvalNonce;
     let profitNonce;
     if (sameAddress) {
         let idx = 0;
         if (needBribeTx)
             bribeNonce = sellerNonces[idx++];
-        if (needApproval)
-            approvalNonce = sellerNonces[idx++];
         buyerNonce = sellerNonces[idx++];
         sellerNonce = sellerNonces[idx++];
         if (extractProfit)
@@ -145,8 +127,6 @@ export async function fourBundleBuyFirstMerkle(params) {
         let idx = 0;
         if (needBribeTx)
             bribeNonce = sellerNonces[idx++];
-        if (needApproval)
-            approvalNonce = sellerNonces[idx++];
         sellerNonce = sellerNonces[idx++];
         if (extractProfit)
             profitNonce = sellerNonces[idx];
@@ -166,22 +146,6 @@ export async function fourBundleBuyFirstMerkle(params) {
             type: txType
         }));
     }
-    // 授权交易
-    let approvalTx = null;
-    if (needApproval && approvalNonce !== undefined) {
-        const approveInterface = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
-        const approveData = approveInterface.encodeFunctionData('approve', [TM_ADDRESS, ethers.MaxUint256]);
-        signPromises.push(seller.signTransaction({
-            to: tokenAddress,
-            data: approveData,
-            value: 0n,
-            nonce: approvalNonce,
-            gasLimit: 80000n,
-            gasPrice,
-            chainId: chainIdNum,
-            type: txType
-        }));
-    }
     // 买入和卖出交易
     signPromises.push(buyer.signTransaction({
         ...buyUnsigned,
@@ -222,19 +186,15 @@ export async function fourBundleBuyFirstMerkle(params) {
     let idx = 0;
     if (needBribeTx)
         bribeTx = signedTxs[idx++];
-    if (needApproval)
-        approvalTx = signedTxs[idx++];
     const signedBuy = signedTxs[idx++];
     const signedSell = signedTxs[idx++];
     if (extractProfit && profitAmount > 0n)
         profitTx = signedTxs[idx];
     nonceManager.clearTemp();
-    // ✅ 组装交易列表：贿赂 → 授权 → 买入 → 卖出 → 利润
+    // ✅ 组装交易列表：贿赂 → 买入 → 卖出 → 利润
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    if (approvalTx)
-        allTransactions.push(approvalTx);
     allTransactions.push(signedBuy, signedSell);
     if (profitTx)
         allTransactions.push(profitTx);
@@ -245,7 +205,6 @@ export async function fourBundleBuyFirstMerkle(params) {
             sellerAddress: seller.address,
             buyAmount: ethers.formatEther(buyerFundsWei),
             sellAmount: ethers.formatUnits(sellAmountWei, decimals),
-            hasApproval: !!approvalTx,
             profitAmount: extractProfit ? ethers.formatEther(profitAmount) : undefined
         }
     };

package/dist/flap/portal-bundle-merkle/swap-buy-first.d.ts

@@ -18,7 +18,6 @@ export interface FlapBuyFirstConfig extends CommonBundleConfig {
     skipQuoteOnError?: boolean;
     waitForConfirmation?: boolean;
     waitTimeoutMs?: number;
-    skipApprovalCheck?: boolean;
 }
 export interface FlapBundleBuyFirstSignParams {
     chain: FlapChain;

package/dist/flap/portal-bundle-merkle/swap-buy-first.js

@@ -7,10 +7,8 @@ import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
 import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
-import { ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI, V2_ROUTER_QUOTE_ABI } from '../../abis/common.js';
+import { ERC20_BALANCE_ABI, V2_ROUTER_QUOTE_ABI } from '../../abis/common.js';
 import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
-// ✅ ABI 别名
-const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
 // ==================== 链常量 ====================
 const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
 const BSC_WBNB = ADDRESSES.BSC.WBNB;
@@ -105,7 +103,7 @@ export async function flapBundleBuyFirstMerkle(params) {
     ]);
     const { buyerFundsWei, buyerBalance } = buyerFundsResult;
     const priorityFee = gasPrice / 10n === 0n ? 1n : gasPrice / 10n;
-    // ✅ 获取报价（已移除滑点保护）
+    // ✅ 获取报价
     const quoteResult = await quoteBuyerOutput({
         portalAddress: chainContext.portalAddress,
         tokenAddress,
@@ -144,29 +142,15 @@ export async function flapBundleBuyFirstMerkle(params) {
         }),
         estimateSellFunds(portalSeller, tokenAddress, sellAmountWei, outputToken)
     ]);
-    // ✅ 修复：先构建授权交易（会消耗 nonce），再规划其他 nonce
-    const approvalTx = await buildApprovalTransaction({
-        tokenAddress,
-        provider: chainContext.provider,
-        seller,
-        decimals: sellerInfo.decimals,
-        portalAddress: chainContext.portalAddress,
-        chainId: chainContext.chainId,
-        config,
-        nonceManager,
-        gasPrice,
-        txType
-    });
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
-    // ✅ 修复：根据实际的授权情况规划 nonce（包含贿赂交易）
+    // ✅ 规划 nonce（已移除授权交易）
     const noncePlan = await planNonces({
         buyer,
         seller,
-        approvalExists: approvalTx !== null, // ✅ 使用实际值
         extractProfit: true,
-        needBribeTx, // ✅ 新增：是否需要贿赂交易
+        needBribeTx,
         sameAddress,
         nonceManager
     });
@@ -228,12 +212,10 @@ export async function flapBundleBuyFirstMerkle(params) {
         txType
     });
     nonceManager.clearTemp();
-    // ✅ 组装顺序：贿赂 → 授权 → 买入 → 卖出 → 利润
+    // ✅ 组装顺序：贿赂 → 买入 → 卖出 → 利润
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    if (approvalTx)
-        allTransactions.push(approvalTx);
     allTransactions.push(signedBuy, signedSell);
     if (profitTx)
         allTransactions.push(profitTx);
@@ -321,12 +303,11 @@ async function quoteBuyerOutput({ portalAddress, tokenAddress, buyerFundsWei, pr
             throw new Error(`买入报价失败: ${error}`);
         }
     }
-    // ✅ 已移除滑点保护：minOutToken 固定为 0
     const sellAmountWei = quotedToken;
     if (sellAmountWei <= 0n) {
         throw new Error('卖方卖出数量为 0：报价失败');
     }
-    return { quotedToken, minOutToken: 0n, sellAmountWei };
+    return { quotedToken, sellAmountWei };
 }
 async function ensureSellerBalance({ tokenAddress, provider, seller, sellAmountWei, skipBalanceCheck }) {
     const erc20 = new Contract(tokenAddress, ERC20_BALANCE_ABI, provider);
@@ -339,25 +320,6 @@ async function ensureSellerBalance({ tokenAddress, provider, seller, sellAmountW
     }
     return { decimals };
 }
-async function buildApprovalTransaction({ tokenAddress, provider, seller, decimals, portalAddress, chainId, config, nonceManager, gasPrice, txType }) {
-    const allowanceContract = new Contract(tokenAddress, ERC20_ALLOWANCE_ABI, provider);
-    const currentAllowance = await allowanceContract.allowance(seller.address, portalAddress);
-    const approvalThreshold = ethers.parseUnits('1000000000', decimals);
-    if (currentAllowance >= approvalThreshold) {
-        return null;
-    }
-    const approvalNonce = await nonceManager.getNextNonce(seller);
-    return await seller.signTransaction({
-        to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]),
-        value: 0n,
-        nonce: approvalNonce,
-        gasLimit: 80000n,
-        gasPrice,
-        chainId,
-        type: txType
-    });
-}
 async function estimateSellFunds(portal, tokenAddress, sellAmountWei, outputToken = ZERO_ADDRESS // ✅ 新增：输出代币地址
 ) {
     try {
@@ -379,41 +341,37 @@ function calculateProfitAmount(expectedFunds) {
     return (expectedFunds * BigInt(PROFIT_CONFIG.RATE_BPS_CAPITAL)) / 10000n;
 }
 /**
- * ✅ 优化：使用批量 nonce 获取
- * 交易顺序：贿赂 → 授权 → 买入 → 卖出 → 利润
+ * ✅ 规划 nonce
+ * 交易顺序：贿赂 → 买入 → 卖出 → 利润
  */
-async function planNonces({ buyer, seller, approvalExists, extractProfit, needBribeTx, sameAddress, nonceManager }) {
+async function planNonces({ buyer, seller, extractProfit, needBribeTx, sameAddress, nonceManager }) {
     if (sameAddress) {
-        // 同一地址：使用 getNextNonceBatch 获取连续 nonce
-        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]);
-        // ✅ 优化：并行获取 buyer 和 seller 的 nonce（JSON-RPC 批量请求）
+    if (needBribeTx || extractProfit) {
+        // 卖方需要多个 nonce：贿赂(可选) + 卖出 + 利润(可选)
+        const sellerTxCount = countTruthy([needBribeTx, true, extractProfit]);
+        // ✅ 并行获取 buyer 和 seller 的 nonce
         const [sellerNonces, buyerNonces] = await Promise.all([
             nonceManager.getNextNonceBatch(seller, sellerTxCount),
             nonceManager.getNextNoncesForWallets([buyer])
         ]);
         let idx = 0;
         const bribeNonce = needBribeTx ? sellerNonces[idx++] : undefined;
-        if (approvalExists)
-            idx++;
         const sellerNonce = sellerNonces[idx++];
         const profitNonce = extractProfit ? sellerNonces[idx] : undefined;
         const buyerNonce = buyerNonces[0];
         return { buyerNonce, sellerNonce, bribeNonce, profitNonce };
     }
-    // ✅ 优化：使用 getNextNoncesForWallets 批量获取（单次网络往返）
+    // ✅ 使用 getNextNoncesForWallets 批量获取
     const nonces = await nonceManager.getNextNoncesForWallets([buyer, seller]);
     return { buyerNonce: nonces[0], sellerNonce: nonces[1] };
 }

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

@@ -93,7 +93,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
     const txType = config.txType ?? 0;
     const nonceManager = new NonceManager(context.provider);
     // ✅ 修复：基于买入金额估算利润，而不是基于卖出预估（因为代币可能还没有流动性）
-    // 在先买后卖的场景中，卖出收益 ≈ 买入金额（忽略滑点和手续费）
     const estimatedProfitFromSell = await estimateProfitAmount({
         provider: context.provider,
         tokenAddress,
@@ -299,7 +298,6 @@ async function quoteSellerNative({ provider, tokenAddress, sellAmountToken, rout
     return await getTokenToNativeQuote(provider, tokenAddress, sellAmountToken, 'BSC', version, fee);
 }
 function calculateBuyerNeed({ quotedNative, buyerBalance, reserveGas }) {
-    // ✅ 已移除滑点保护：直接使用报价金额
     const estimatedBuyerNeed = quotedNative;
     const buyerNeedTotal = estimatedBuyerNeed + reserveGas;
     if (buyerBalance < buyerNeedTotal) {

package/dist/pancake/bundle-swap.js

@@ -57,18 +57,31 @@ async function quoteSellOutput({ routeParams, sellAmountWei, provider }) {
 }
 async function buildSwapTransactions({ routeParams, sellAmountWei, buyAmountBNB, buyer, seller, tokenAddress, useNativeToken = true }) {
     const deadline = getDeadline();
-    // ✅ ERC20 购买时，value 只需要 FLAT_FEE
-    const buyValue = useNativeToken ? buyAmountBNB + FLAT_FEE : FLAT_FEE;
+    // ✅ ERC20 购买时，value = 0（通过代币授权支付）
+    const buyValue = useNativeToken ? buyAmountBNB + FLAT_FEE : 0n;
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const reversePath = [...v2Path].reverse();
         // ✅ 使用官方 V2 Router
         const v2RouterSeller = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, seller);
         const v2RouterBuyer = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, buyer);
-        // 卖出：Token → BNB
-        const sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline);
-        // 买入：BNB → Token
-        const buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, reversePath, buyer.address, deadline, { value: buyValue });
+        let sellUnsigned;
+        let buyUnsigned;
+        if (useNativeToken) {
+            // ✅ 原生代币模式（BNB）
+            // 卖出：Token → WBNB → BNB
+            sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline);
+            // 买入：BNB → WBNB → Token
+            buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, reversePath, buyer.address, deadline, { value: buyValue });
+        }
+        else {
+            // ✅ ERC20 模式（如 USDT）
+            // 卖出：Token → USDT
+            sellUnsigned = await v2RouterSeller.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline);
+            // 买入：USDT → Token
+            buyUnsigned = await v2RouterBuyer.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(buyAmountBNB, // USDT 数量
+            0n, reversePath, buyer.address, deadline);
+        }
         return { sellUnsigned, buyUnsigned };
     }
     if (routeParams.routeType === 'v3-single') {

package/package.json

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