four-flap-meme-sdk 1.4.13 → 1.4.15

package/dist/pancake/bundle-swap.d.ts

@@ -8,7 +8,6 @@ export interface PancakeSwapSignConfig {
     txType?: 0 | 2;
     chainId?: number;
     reserveGasBNB?: number;
-    skipApprovalCheck?: boolean;
     bribeAmount?: number;
 }
 export type SwapRouteType = 'v2' | 'v3-single' | 'v3-multi';
@@ -19,7 +18,6 @@ export interface PancakeSwapConfig extends CommonBundleConfig {
     reserveGasBNB?: number;
     waitForConfirmation?: boolean;
     waitTimeoutMs?: number;
-    skipApprovalCheck?: boolean;
 }
 export interface V2RouteParams {
     routeType: 'v2';
@@ -67,7 +65,6 @@ export type PancakeSwapResult = {
         buyerAddress: string;
         sellAmount: string;
         buyAmount: string;
-        hasApproval?: boolean;
         profitAmount?: string;
     };
 };
@@ -102,7 +99,6 @@ export interface PancakeBatchSwapResult {
         buyerAddresses: string[];
         sellAmount: string;
         buyAmounts: string[];
-        hasApproval?: boolean;
         profitAmount?: string;
     };
 }

package/dist/pancake/bundle-swap.js

@@ -7,31 +7,6 @@ function createPancakeContext(config) {
     });
     return { chainId, provider };
 }
-async function ensureSellerApproval({ tokenAddress, seller, provider, decimals, chainId, config, nonceManager, gasPrice, txType }) {
-    if (config.skipApprovalCheck) {
-        return null;
-    }
-    const erc20 = new Contract(tokenAddress, ERC20_ALLOWANCE_ABI, provider);
-    const currentAllowance = await erc20.allowance(seller.address, PANCAKE_PROXY_ADDRESS);
-    // ✅ 阈值：MaxUint256 / 2，如果授权额度超过这个值，认为是"无限授权"
-    // 这样可以检测到用户之前的 MaxUint256 授权
-    const halfMaxUint = ethers.MaxUint256 / 2n;
-    if (currentAllowance >= halfMaxUint) {
-        return null;
-    }
-    // ✅ 使用共享的 NonceManager
-    const approvalNonce = await nonceManager.getNextNonce(seller);
-    return await seller.signTransaction({
-        to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [PANCAKE_PROXY_ADDRESS, ethers.MaxUint256]),
-        value: 0n,
-        nonce: approvalNonce,
-        gasLimit: 80000n,
-        gasPrice,
-        chainId,
-        type: txType
-    });
-}
 async function quoteSellOutput({ routeParams, sellAmountWei, provider }) {
     console.log(`[quoteSellOutput] 开始报价, routeType=${routeParams.routeType}, sellAmount=${sellAmountWei} wei`);
     // ==================== V2 报价 ====================
@@ -312,13 +287,6 @@ const PANCAKE_PROXY_ADDRESS = ADDRESSES.BSC.PancakeProxy;
 // 代理合约手续费
 const FLAT_FEE = 0n; // ✅ 已移除合约固定手续费
 const WBNB_ADDRESS = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-// ✅ STABLE_COINS 和 V3_FEE_TIERS 已移至 ../utils/quote-helpers.ts
-const ERC20_ALLOWANCE_ABI = [
-    'function allowance(address,address) view returns (uint256)',
-    'function approve(address spender,uint256 amount) returns (bool)',
-    'function decimals() view returns (uint8)'
-];
-const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
 const ERC20_BALANCE_OF_ABI = ['function balanceOf(address) view returns (uint256)'];
 /**
@@ -343,18 +311,6 @@ export async function pancakeBundleSwapMerkle(params) {
         calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage)
     ]);
     const { amount: sellAmountWei, decimals } = sellAmountResult;
-    // ✅ 先构建授权交易（会消耗 nonce）
-    const approvalTx = await ensureSellerApproval({
-        tokenAddress,
-        seller,
-        provider: context.provider,
-        decimals,
-        chainId: context.chainId,
-        config,
-        nonceManager, // ✅ 共享 NonceManager
-        gasPrice,
-        txType
-    });
     const quoteResult = await quoteSellOutput({
         routeParams,
         sellAmountWei,
@@ -401,14 +357,14 @@ export async function pancakeBundleSwapMerkle(params) {
         ? ethers.parseEther(String(config.bribeAmount))
         : 0n;
     const needBribeTx = bribeAmount > 0n;
-    // ✅ 使用共享的 NonceManager 规划 nonce（授权已消耗一个 nonce）
+    // ✅ 使用共享的 NonceManager 规划 nonce
     const noncePlan = await planNonces({
         seller,
         buyer,
         sameAddress,
-        approvalExists: !!approvalTx,
+        approvalExists: false, // ✅ 已移除授权
         profitNeeded: profitAmount > 0n,
-        needBribeTx, // ✅ 新增
+        needBribeTx,
         nonceManager
     });
     // ✅ 并行签名所有交易
@@ -477,12 +433,10 @@ export async function pancakeBundleSwapMerkle(params) {
         provider: context.provider,
         buyerAddress: buyer.address
     });
-    // ✅ 组装顺序：贿赂 → 授权 → 卖出 → 买入 → 利润
+    // ✅ 组装顺序：贿赂 → 卖出 → 买入 → 利润
     const signedTransactions = [];
     if (bribeTx)
         signedTransactions.push(bribeTx);
-    if (approvalTx)
-        signedTransactions.push(approvalTx);
     signedTransactions.push(signedSell, signedBuy);
     if (profitTx)
         signedTransactions.push(profitTx);
@@ -495,7 +449,6 @@ export async function pancakeBundleSwapMerkle(params) {
             buyAmount: useNativeToken
                 ? ethers.formatEther(buyerBudget.buyAmountBNB)
                 : ethers.formatUnits(buyerBudget.buyAmountBNB, quoteTokenDecimals),
-            hasApproval: !!approvalTx,
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
         }
     };
@@ -532,18 +485,6 @@ export async function pancakeBatchSwapMerkle(params) {
         calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount, sellPercentage)
     ]);
     const { amount: sellAmountWei, decimals } = sellAmountResult;
-    // ✅ 构建授权交易（如果需要）
-    const approvalTx = await ensureSellerApproval({
-        tokenAddress,
-        seller,
-        provider: context.provider,
-        decimals,
-        chainId: context.chainId,
-        config,
-        nonceManager,
-        gasPrice,
-        txType
-    });
     // ✅ 获取卖出报价
     const quoteResult = await quoteSellOutput({
         routeParams,
@@ -713,12 +654,10 @@ export async function pancakeBatchSwapMerkle(params) {
         signedSellPromise,
         ...signedBuyPromises
     ]);
-    // 4. 按顺序组装交易数组：贿赂 → 授权 → 卖出 → 买入 → 利润
+    // 4. 按顺序组装交易数组：贿赂 → 卖出 → 买入 → 利润
     const signedTransactions = [];
     if (bribeTx)
         signedTransactions.push(bribeTx); // 贿赂（首位）
-    if (approvalTx)
-        signedTransactions.push(approvalTx); // 授权（如果有）
     signedTransactions.push(signedSell); // 卖出
     signedTransactions.push(...signedBuys); // 多个买入
     if (profitTx)
@@ -732,7 +671,6 @@ export async function pancakeBatchSwapMerkle(params) {
             buyAmounts: buyAmountsWei.map(amt => useNativeToken
                 ? ethers.formatEther(amt)
                 : ethers.formatUnits(amt, quoteTokenDecimals)),
-            hasApproval: !!approvalTx,
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
         }
     };
@@ -755,12 +693,10 @@ export async function pancakeQuickBatchSwapMerkle(params) {
     // ✅ 判断是否使用原生代币
     const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
     const WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'.toLowerCase();
-    // ✅ 校验买方数量
+    // ✅ 校验买方数量（子钱包已预留 BNB，不需要主钱包转 Gas）
     // BNB 模式：贿赂(1) + 卖出(1) + 转账(N) + 买入(N) + 利润(1) ≤ 50 → 2N + 3 ≤ 50 → N ≤ 23
-    // ERC20 模式：贿赂(1) + 卖出(1) + ERC20转账(N) + BNB Gas转账(N) + 买入(N) + 利润(1) ≤ 50 → 3N + 3 ≤ 50 → N ≤ 15
-    const MAX_BUYERS_NATIVE = 23;
-    const MAX_BUYERS_ERC20 = 15;
-    const MAX_BUYERS = useNativeToken ? MAX_BUYERS_NATIVE : MAX_BUYERS_ERC20;
+    // ERC20 模式：贿赂(1) + 卖出(1) + ERC20转账(N) + 买入(N) + 利润(1) ≤ 50 → 2N + 3 ≤ 50 → N ≤ 23
+    const MAX_BUYERS = 23;
     if (buyerPrivateKeys.length === 0) {
         throw new Error('至少需要一个买方钱包');
     }
@@ -895,12 +831,10 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         sellerRequired = bribeAmount + sellerGasCost;
     }
     else {
-        // ERC20 模式：
-        // - 贿赂(21000) + 卖出(gasLimit) + N个ERC20转账(65000 each) + N个BNB Gas转账(21000 each) + 利润(21000)
-        // - 还需要给买家转 BNB 用于支付 FLAT_FEE 和买入 Gas
-        sellerGasCost = gasPrice * (21000n + finalGasLimit + (ERC20_TRANSFER_GAS + 21000n) * BigInt(buyers.length) + 21000n);
-        const buyerGasNeeded = (gasPrice * finalGasLimit + FLAT_FEE) * BigInt(buyers.length);
-        sellerRequired = bribeAmount + sellerGasCost + buyerGasNeeded;
+        // ERC20 模式：子钱包已预留 BNB，不需要主钱包转 Gas
+        // 卖方 Gas: 贿赂(21000) + 卖出(gasLimit) + N个ERC20转账(65000 each) + 利润(21000)
+        sellerGasCost = gasPrice * (21000n + finalGasLimit + ERC20_TRANSFER_GAS * BigInt(buyers.length) + 21000n);
+        sellerRequired = bribeAmount + sellerGasCost;
     }
     if (sellerBalance < sellerRequired) {
         throw new Error(`主钱包 BNB 余额不足: 需要约 ${ethers.formatEther(sellerRequired)} BNB (贿赂: ${ethers.formatEther(bribeAmount)}, Gas: ${ethers.formatEther(sellerGasCost)}), 实际 ${ethers.formatEther(sellerBalance)} BNB`);
@@ -967,7 +901,7 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         }
     }
     else {
-        // ✅ ERC20 模式：ERC20 transfer 调用
+        // ✅ ERC20 模式：ERC20 transfer 调用（子钱包已预留 BNB，不需要转 Gas）
         const erc20Interface = new ethers.Interface([
             'function transfer(address to, uint256 amount) returns (bool)'
         ]);
@@ -988,20 +922,6 @@ export async function pancakeQuickBatchSwapMerkle(params) {
             });
             transferTxs.push(transferTx);
         }
-        // ERC20 模式：额外转账 Gas 费用给买家（用于支付 FLAT_FEE 和买入 Gas）
-        for (let i = 0; i < buyers.length; i++) {
-            const buyerGasCost = gasPrice * finalGasLimit + FLAT_FEE;
-            const gasTx = await seller.signTransaction({
-                to: buyers[i].address,
-                value: buyerGasCost,
-                nonce: sellerNonce++,
-                gasPrice,
-                gasLimit: 21000n,
-                chainId: context.chainId,
-                type: txType
-            });
-            transferTxs.push(gasTx);
-        }
     }
     console.log(`[pancakeQuickBatchSwapMerkle] ${transferTxs.length} 笔转账交易已签名`);
     // ==================== 4. 买入交易 ====================
@@ -1010,7 +930,7 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         const buyAmount = transferAmountsWei[i];
         const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
         // BNB 模式：value = buyAmount + FLAT_FEE
-        // ERC20 模式：value = FLAT_FEE（买入金额是 ERC20，通过授权支付）
+        // ERC20 模式：value = FLAT_FEE（买入金额通过授权支付）
         const buyValue = useNativeToken ? buyAmount + FLAT_FEE : FLAT_FEE;
         let buyUnsigned;
         if (routeParams.routeType === 'v2') {
@@ -1053,6 +973,8 @@ export async function pancakeQuickBatchSwapMerkle(params) {
     }
     nonceManager.clearTemp();
     // ==================== 组装交易数组 ====================
+    // BNB 模式：贿赂 → 卖出 → 转账 → 买入 → 利润
+    // ERC20 模式：贿赂 → 卖出 → ERC20转账 → BNB Gas转账 → 买入 → 利润
     const signedTransactions = [];
     if (bribeTx)
         signedTransactions.push(bribeTx);

package/package.json

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