four-flap-meme-sdk 1.3.56 → 1.3.57

package/dist/dex/direct-router.js

@@ -16,6 +16,27 @@ import { PROFIT_CONFIG } from '../utils/constants.js';
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
 const DEFAULT_GAS_LIMIT = 300000;
 const DEADLINE_MINUTES = 20;
+/**
+ * 截断小数位数，避免超过代币精度导致 parseUnits 报错
+ * 例如：truncateDecimals("21906.025000000000000000", 1) => "21906.0"
+ */
+function truncateDecimals(value, decimals) {
+    if (!value || decimals < 0)
+        return value;
+    const parts = value.split('.');
+    if (parts.length === 1)
+        return value; // 没有小数点
+    const integerPart = parts[0];
+    const decimalPart = parts[1];
+    if (decimals === 0)
+        return integerPart;
+    // 截断到指定小数位数
+    const truncatedDecimal = decimalPart.slice(0, decimals);
+    // 如果截断后没有小数部分，只返回整数部分
+    if (!truncatedDecimal || truncatedDecimal === '')
+        return integerPart;
+    return `${integerPart}.${truncatedDecimal}`;
+}
 /** Router 地址配置 */
 export const DIRECT_ROUTERS = {
     BSC: {
@@ -448,7 +469,9 @@ export async function directV2BatchSell(params) {
     const sellAmountsWei = [];
     for (let i = 0; i < wallets.length; i++) {
         if (sellAmounts && sellAmounts[i]) {
-            sellAmountsWei.push(ethers.parseUnits(sellAmounts[i], tokenDecimals));
+            // ✅ 截断小数位数，避免超过代币精度导致 parseUnits 报错
+            const truncatedAmount = truncateDecimals(sellAmounts[i], tokenDecimals);
+            sellAmountsWei.push(ethers.parseUnits(truncatedAmount, tokenDecimals));
         }
         else if (sellPercentages && sellPercentages[i]) {
             const pct = Math.min(100, Math.max(0, sellPercentages[i]));

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

@@ -300,15 +300,9 @@ async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, re
         }
     }
     else {
-        // ERC20 购买：检查代币余额
         if (buyerBalance < buyerFundsWei) {
             throw new Error(`买方代币余额不足: 需要 ${ethers.formatUnits(buyerFundsWei, quoteTokenDecimals)}，实际 ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
         }
-        // ✅ ERC20 购买时，还需要检查买方是否有足够 BNB 支付 Gas
-        const buyerBnbBalance = await buyer.provider.getBalance(buyer.address);
-        if (buyerBnbBalance < reserveGas) {
-            throw new Error(`买方 BNB 余额不足 (用于支付 Gas): 需要 ${ethers.formatEther(reserveGas)} ${nativeToken}，实际 ${ethers.formatEther(buyerBnbBalance)} ${nativeToken}`);
-        }
     }
     return { buyerFundsWei, buyerBalance };
 }

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

@@ -194,9 +194,7 @@ export async function flapBundleSwapMerkle(params) {
             portalGasCost: finalGasLimit * gasPrice,
             provider: chainContext.provider,
             chainContext,
-            seller,
-            useNativeToken, // ✅ 传递是否使用原生代币
-            quoteTokenDecimals // ✅ 传递代币精度
+            seller
         })
     ]);
     // 构建交易请求
@@ -366,21 +364,13 @@ async function calculateBuyerNeed({ buyer, quotedNative, reserveGasEth, slippage
         : (useNativeToken ? buyerBalance - reserveGas : buyerBalance);
     return { reserveGas, buyerBalance, buyerNeedTotal, maxBuyerValue };
 }
-async function validateBalances({ buyerNeed, buyerAddress, portalGasCost, provider, chainContext, seller, useNativeToken, quoteTokenDecimals = 18 }) {
+async function validateBalances({ buyerNeed, buyerAddress, portalGasCost, provider, chainContext, seller }) {
+    const buyerBalance = buyerNeed.buyerBalance;
     const sellerBalance = await provider.getBalance(seller.address);
-    // ✅ 修复：买方余额已在 calculateBuyerNeed 中检查过
-    // 这里只需要检查：
-    // 1. 使用原生代币时：buyerNeed.buyerBalance 已包含购买金额 + Gas
-    // 2. 使用 ERC20 时：需要额外检查买方是否有足够 BNB 支付 Gas
-    if (!useNativeToken) {
-        // ERC20 购买时，买方仍需要 BNB 支付 Gas
-        const buyerBnbBalance = await provider.getBalance(buyerAddress);
-        const buyerGasCost = portalGasCost; // 买方交易的 Gas 费用
-        if (buyerBnbBalance < buyerGasCost) {
-            throw new Error(`买方 BNB 余额不足 (用于支付 Gas):\n` +
-                `  - 需要: ${ethers.formatEther(buyerGasCost)} ${chainContext.nativeToken}\n` +
-                `  - 实际: ${ethers.formatEther(buyerBnbBalance)} ${chainContext.nativeToken}`);
-        }
+    if (buyerBalance < buyerNeed.buyerNeedTotal) {
+        throw new Error(`买方余额不足:\n` +
+            `  - 需要: ${ethers.formatEther(buyerNeed.buyerNeedTotal)} ${chainContext.nativeToken}\n` +
+            `  - 实际: ${ethers.formatEther(buyerBalance)} ${chainContext.nativeToken}`);
     }
     if (sellerBalance < portalGasCost) {
         throw new Error(`卖方余额不足: 需要 ${ethers.formatEther(portalGasCost)} ${chainContext.nativeToken} (Gas)，实际 ${ethers.formatEther(sellerBalance)} ${chainContext.nativeToken}`);

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

@@ -53,8 +53,6 @@ export interface PancakeBundleBuyFirstSignParams {
     buyerFunds?: string;
     buyerFundsPercentage?: number;
     config: PancakeBuyFirstSignConfig;
-    quoteToken?: string;
-    quoteTokenDecimals?: number;
 }
 export interface PancakeBundleBuyFirstParams {
     buyerPrivateKey: string;

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

@@ -49,8 +49,6 @@ const PANCAKE_V2_ROUTER_ADDRESS = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
 const PANCAKE_V3_QUOTER_ADDRESS = '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997';
 const FLAT_FEE = ethers.parseEther('0.0001');
 const WBNB_ADDRESS = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-const ERC20_BALANCE_OF_ABI = ['function balanceOf(address) view returns (uint256)'];
 const ERC20_ALLOWANCE_ABI = [
     'function allowance(address,address) view returns (uint256)',
     'function approve(address,uint256) returns (bool)',
@@ -58,11 +56,7 @@ const ERC20_ALLOWANCE_ABI = [
 ];
 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;
-    // ✅ 判断是否使用原生代币（BNB）或 ERC20 代币（如 USDT）
-    const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
-    console.log('🔍 PancakeSwap BuyFirst - quoteToken:', quoteToken);
-    console.log('🔍 PancakeSwap BuyFirst - useNativeToken:', useNativeToken);
+    const { buyerPrivateKey, sellerPrivateKey, tokenAddress, routeParams, buyerFunds, buyerFundsPercentage, config } = params;
     const context = createPancakeContext(config);
     const buyer = new Wallet(buyerPrivateKey, context.provider);
     const seller = new Wallet(sellerPrivateKey, context.provider);
@@ -71,11 +65,7 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         buyer,
         buyerFunds,
         buyerFundsPercentage,
-        reserveGas: config.reserveGasBNB,
-        useNativeToken,
-        quoteToken,
-        quoteTokenDecimals,
-        provider: context.provider
+        reserveGas: config.reserveGasBNB
     });
     const quoteResult = await quoteTokenOutput({
         routeParams,
@@ -89,8 +79,7 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         sellAmountToken: quoteResult.quotedTokenOut,
         buyer,
         seller,
-        tokenAddress,
-        useNativeToken
+        tokenAddress
     });
     const quotedNative = await quoteSellerNative({
         provider: context.provider,
@@ -168,11 +157,7 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         buyerBalance: buyerFundsInfo.buyerBalance,
         reserveGas: buyerFundsInfo.reserveGas,
         gasLimit: finalGasLimit,
-        gasPrice,
-        useNativeToken,
-        quoteTokenDecimals,
-        provider: context.provider,
-        buyerAddress: buyer.address
+        gasPrice
     });
     const allTransactions = [];
     if (approvalTx)
@@ -185,9 +170,7 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         metadata: {
             buyerAddress: buyer.address,
             sellerAddress: seller.address,
-            buyAmount: useNativeToken
-                ? ethers.formatEther(buyerFundsInfo.buyerFundsWei)
-                : ethers.formatUnits(buyerFundsInfo.buyerFundsWei, quoteTokenDecimals),
+            buyAmount: ethers.formatEther(buyerFundsInfo.buyerFundsWei),
             sellAmount: quoteResult.quotedTokenOut.toString(),
             hasApproval: !!approvalTx,
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
@@ -202,31 +185,16 @@ function createPancakeContext(config) {
     });
     return { chainId, provider };
 }
-async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, reserveGas, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider }) {
+async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, reserveGas }) {
+    const buyerBalance = await buyer.provider.getBalance(buyer.address);
     const reserveGasWei = ethers.parseEther((reserveGas ?? 0.0005).toString());
-    // ✅ 根据是否使用原生代币获取不同的余额
-    let buyerBalance;
-    if (useNativeToken) {
-        buyerBalance = await buyer.provider.getBalance(buyer.address);
-    }
-    else {
-        // ERC20 代币余额
-        const erc20 = new Contract(quoteToken, ERC20_BALANCE_OF_ABI, provider || buyer.provider);
-        buyerBalance = await erc20.balanceOf(buyer.address);
-    }
     let buyerFundsWei;
     if (buyerFunds !== undefined) {
-        // ✅ 根据代币精度解析金额
-        buyerFundsWei = useNativeToken
-            ? ethers.parseEther(String(buyerFunds))
-            : ethers.parseUnits(String(buyerFunds), quoteTokenDecimals);
+        buyerFundsWei = ethers.parseEther(String(buyerFunds));
     }
     else if (buyerFundsPercentage !== undefined) {
         const pct = Math.max(0, Math.min(100, buyerFundsPercentage));
-        // ✅ 原生代币需要预留 Gas，ERC20 不需要
-        const spendable = useNativeToken
-            ? (buyerBalance > reserveGasWei ? buyerBalance - reserveGasWei : 0n)
-            : buyerBalance;
+        const spendable = buyerBalance > reserveGasWei ? buyerBalance - reserveGasWei : 0n;
         buyerFundsWei = (spendable * BigInt(Math.floor(pct * 100))) / 10000n;
     }
     else {
@@ -235,23 +203,6 @@ async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, re
     if (buyerFundsWei <= 0n) {
         throw new Error('buyerFunds 需要大于 0');
     }
-    // ✅ 余额检查
-    if (useNativeToken) {
-        if (buyerBalance < buyerFundsWei + reserveGasWei) {
-            throw new Error(`买方余额不足: 需要 ${ethers.formatEther(buyerFundsWei + reserveGasWei)} BNB，实际 ${ethers.formatEther(buyerBalance)} BNB`);
-        }
-    }
-    else {
-        // ERC20 购买：检查代币余额
-        if (buyerBalance < buyerFundsWei) {
-            throw new Error(`买方代币余额不足: 需要 ${ethers.formatUnits(buyerFundsWei, quoteTokenDecimals)}，实际 ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
-        }
-        // ✅ ERC20 购买时，还需要检查买方是否有足够 BNB 支付 Gas
-        const buyerBnbBalance = await buyer.provider.getBalance(buyer.address);
-        if (buyerBnbBalance < reserveGasWei) {
-            throw new Error(`买方 BNB 余额不足 (用于支付 Gas): 需要 ${ethers.formatEther(reserveGasWei)} BNB，实际 ${ethers.formatEther(buyerBnbBalance)} BNB`);
-        }
-    }
     return { buyerFundsWei, buyerBalance, reserveGas: reserveGasWei };
 }
 async function quoteTokenOutput({ routeParams, buyerFundsWei, provider }) {
@@ -343,31 +294,26 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
         type: txType
     });
 }
-async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress, useNativeToken = true }) {
+async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress }) {
     const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
     const proxySeller = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, seller);
     const deadline = Math.floor(Date.now() / 1000) + 600;
-    // ✅ ERC20 购买时，value 只需要 FLAT_FEE
-    const buyValue = useNativeToken ? buyerFundsWei + FLAT_FEE : FLAT_FEE;
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const reversePath = [...v2Path].reverse();
-        const buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyerFundsWei, 0n, v2Path, buyer.address, deadline, { value: buyValue } // ✅ 使用动态 value
-        );
+        const buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyerFundsWei, 0n, v2Path, buyer.address, deadline, { value: buyerFundsWei + FLAT_FEE });
         const sellUnsigned = await proxySeller.swapV2.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline, { value: FLAT_FEE });
         return { buyUnsigned, sellUnsigned };
     }
     if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
-        const buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, buyerFundsWei, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-        );
+        const buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, buyerFundsWei, 0n, buyer.address, { value: buyerFundsWei + FLAT_FEE });
         const sellUnsigned = await proxySeller.swapV3Single.populateTransaction(v3TokenOut, v3TokenIn, v3Fee, sellAmountToken, 0n, seller.address, { value: FLAT_FEE });
         return { buyUnsigned, sellUnsigned };
     }
     const { v3LpAddresses, v3ExactTokenIn } = routeParams;
     const exactTokenOut = v3ExactTokenIn.toLowerCase() === WBNB_ADDRESS.toLowerCase() ? tokenAddress : WBNB_ADDRESS;
-    const buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, buyerFundsWei, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-    );
+    const buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, buyerFundsWei, 0n, buyer.address, { value: buyerFundsWei + FLAT_FEE });
     const sellUnsigned = await proxySeller.swapV3MultiHop.populateTransaction(v3LpAddresses, exactTokenOut, sellAmountToken, 0n, seller.address, { value: FLAT_FEE });
     return { buyUnsigned, sellUnsigned };
 }
@@ -425,41 +371,19 @@ async function buildProfitTransaction({ seller, profitAmount, profitNonce, gasPr
         type: txType
     });
 }
-async function validateFinalBalances({ sameAddress, buyerFundsWei, buyerBalance, reserveGas, gasLimit, gasPrice, useNativeToken = true, quoteTokenDecimals = 18, provider, buyerAddress }) {
-    const gasCost = gasLimit * gasPrice;
+function validateFinalBalances({ sameAddress, buyerFundsWei, buyerBalance, reserveGas, gasLimit, gasPrice }) {
     if (sameAddress) {
-        // 同一地址：需要足够的余额支付两笔交易
-        if (useNativeToken) {
-            const requiredCombined = buyerFundsWei + FLAT_FEE * 2n + gasCost * 2n;
-            if (buyerBalance < requiredCombined) {
-                throw new Error(`账户余额不足:\n  - 需要: ${ethers.formatEther(requiredCombined)} BNB（含两笔Gas与两笔手续费）\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
-            }
-        }
-        else {
-            // ERC20：检查代币余额 + BNB Gas 余额
-            const requiredToken = buyerFundsWei + FLAT_FEE * 2n;
-            if (buyerBalance < requiredToken) {
-                throw new Error(`账户代币余额不足:\n  - 需要: ${ethers.formatUnits(requiredToken, quoteTokenDecimals)}\n  - 实际: ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
-            }
-            // 检查 BNB Gas
-            if (provider && buyerAddress) {
-                const bnbBalance = await provider.getBalance(buyerAddress);
-                const requiredGas = gasCost * 2n;
-                if (bnbBalance < requiredGas) {
-                    throw new Error(`账户 BNB 余额不足 (用于支付 Gas):\n  - 需要: ${ethers.formatEther(requiredGas)} BNB\n  - 实际: ${ethers.formatEther(bnbBalance)} BNB`);
-                }
-            }
+        const gasCost = gasLimit * gasPrice;
+        const requiredCombined = buyerFundsWei + FLAT_FEE * 2n + gasCost * 2n;
+        if (buyerBalance < requiredCombined) {
+            throw new Error(`账户余额不足:\n  - 需要: ${ethers.formatEther(requiredCombined)} BNB（含两笔Gas与两笔手续费）\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
         }
         return;
     }
-    // 不同地址
-    if (useNativeToken) {
-        const requiredBuyer = buyerFundsWei + FLAT_FEE + reserveGas;
-        if (buyerBalance < requiredBuyer) {
-            throw new Error(`买方余额不足:\n  - 需要: ${ethers.formatEther(requiredBuyer)} BNB\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
-        }
+    const requiredBuyer = buyerFundsWei + FLAT_FEE + reserveGas;
+    if (buyerBalance < requiredBuyer) {
+        throw new Error(`买方余额不足:\n  - 需要: ${ethers.formatEther(requiredBuyer)} BNB\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
     }
-    // ERC20 余额已在 calculateBuyerFunds 中检查过
 }
 function countTruthy(values) {
     return values.filter(Boolean).length;

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

@@ -48,8 +48,6 @@ export interface PancakeBundleSwapSignParams {
     routeParams: RouteParams;
     slippageTolerance?: number;
     config: PancakeSwapSignConfig;
-    quoteToken?: string;
-    quoteTokenDecimals?: number;
 }
 export interface PancakeBundleSwapParams {
     sellerPrivateKey: string;
@@ -75,6 +73,5 @@ export type PancakeSwapResult = {
 };
 /**
  * PancakeSwap捆绑换手（V2/V3通用）
- * ✅ 支持 quoteToken：传入 USDT 等地址时，卖出得到该代币，买入使用该代币
  */
 export declare function pancakeBundleSwapMerkle(params: PancakeBundleSwapSignParams): Promise<PancakeSwapResult>;

package/dist/pancake/bundle-swap.js

@@ -69,25 +69,21 @@ async function quoteSellOutput({ routeParams, sellAmountWei, provider }) {
     }
     throw new Error('V3 多跳需要提供 v2Path 用于价格预估');
 }
-async function buildSwapTransactions({ routeParams, sellAmountWei, buyAmountBNB, buyer, seller, tokenAddress, useNativeToken = true }) {
+async function buildSwapTransactions({ routeParams, sellAmountWei, buyAmountBNB, buyer, seller, tokenAddress }) {
     const proxySeller = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, seller);
     const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
     const deadline = Math.floor(Date.now() / 1000) + 600;
-    // ✅ ERC20 购买时，value 只需要 FLAT_FEE
-    const buyValue = useNativeToken ? buyAmountBNB + FLAT_FEE : FLAT_FEE;
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const reversePath = [...v2Path].reverse();
         const sellUnsigned = await proxySeller.swapV2.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline, { value: FLAT_FEE });
-        const buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyAmountBNB, 0n, reversePath, buyer.address, deadline, { value: buyValue } // ✅ 使用动态 value
-        );
+        const buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyAmountBNB, 0n, reversePath, buyer.address, deadline, { value: buyAmountBNB + FLAT_FEE });
         return { sellUnsigned, buyUnsigned };
     }
     if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
         const sellUnsigned = await proxySeller.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
-        const buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenOut, v3TokenIn, v3Fee, buyAmountBNB, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-        );
+        const buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenOut, v3TokenIn, v3Fee, buyAmountBNB, 0n, buyer.address, { value: buyAmountBNB + FLAT_FEE });
         return { sellUnsigned, buyUnsigned };
     }
     const { v3LpAddresses, v3ExactTokenIn } = routeParams;
@@ -95,38 +91,18 @@ async function buildSwapTransactions({ routeParams, sellAmountWei, buyAmountBNB,
         ? tokenAddress
         : WBNB_ADDRESS;
     const sellUnsigned = await proxySeller.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, sellAmountWei, 0n, seller.address, { value: FLAT_FEE });
-    const buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, exactTokenOut, buyAmountBNB, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-    );
+    const buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, exactTokenOut, buyAmountBNB, 0n, buyer.address, { value: buyAmountBNB + FLAT_FEE });
     return { sellUnsigned, buyUnsigned };
 }
-async function calculateBuyerBudget({ buyer, quotedBNBOut, reserveGasBNB, slippageTolerance, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider }) {
+async function calculateBuyerBudget({ buyer, quotedBNBOut, reserveGasBNB, slippageTolerance }) {
+    const buyerBalance = await buyer.provider.getBalance(buyer.address);
     const reserveGas = ethers.parseEther((reserveGasBNB ?? 0.0005).toString());
     const buyAmountBNB = applySlippage(quotedBNBOut, slippageTolerance);
-    // ✅ 根据是否使用原生代币获取不同的余额
-    let buyerBalance;
-    if (useNativeToken) {
-        buyerBalance = await buyer.provider.getBalance(buyer.address);
-        const requiredBalance = buyAmountBNB + FLAT_FEE + reserveGas;
-        if (buyerBalance < requiredBalance) {
-            throw new Error(`买方余额不足: 需要 ${ethers.formatEther(requiredBalance)} BNB, 实际 ${ethers.formatEther(buyerBalance)} BNB`);
-        }
-        return { buyerBalance, reserveGas, requiredBalance, buyAmountBNB, useNativeToken };
-    }
-    else {
-        // ERC20 代币余额
-        const erc20 = new Contract(quoteToken, ERC20_BALANCE_OF_ABI, provider || buyer.provider);
-        buyerBalance = await erc20.balanceOf(buyer.address);
-        const requiredBalance = buyAmountBNB + FLAT_FEE; // ERC20 不需要预留 Gas 在代币余额中
-        if (buyerBalance < requiredBalance) {
-            throw new Error(`买方代币余额不足: 需要 ${ethers.formatUnits(requiredBalance, quoteTokenDecimals)}, 实际 ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
-        }
-        // ✅ ERC20 购买时，还需要检查买方是否有足够 BNB 支付 Gas
-        const buyerBnbBalance = await buyer.provider.getBalance(buyer.address);
-        if (buyerBnbBalance < reserveGas) {
-            throw new Error(`买方 BNB 余额不足 (用于支付 Gas): 需要 ${ethers.formatEther(reserveGas)} BNB, 实际 ${ethers.formatEther(buyerBnbBalance)} BNB`);
-        }
-        return { buyerBalance, reserveGas, requiredBalance, buyAmountBNB, useNativeToken };
+    const requiredBalance = buyAmountBNB + FLAT_FEE + reserveGas;
+    if (buyerBalance < requiredBalance) {
+        throw new Error(`买方余额不足: 需要 ${ethers.formatEther(requiredBalance)} BNB, 实际 ${ethers.formatEther(buyerBalance)} BNB`);
     }
+    return { buyerBalance, reserveGas, requiredBalance, buyAmountBNB };
 }
 function applySlippage(amount, tolerancePercent = 0.5) {
     if (amount === 0n) {
@@ -175,41 +151,19 @@ function calculateProfitAmount(estimatedBNBOut) {
     }
     return (estimatedBNBOut * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
 }
-async function validateFinalBalances({ sameAddress, buyerBalance, buyAmountBNB, reserveGas, gasLimit, gasPrice, useNativeToken = true, quoteTokenDecimals = 18, provider, buyerAddress }) {
-    const gasCost = gasLimit * gasPrice;
+function validateFinalBalances({ sameAddress, buyerBalance, buyAmountBNB, reserveGas, gasLimit, gasPrice }) {
     if (sameAddress) {
-        // 同一地址：需要足够的余额支付两笔交易
-        if (useNativeToken) {
-            const requiredCombined = buyAmountBNB + FLAT_FEE * 2n + gasCost * 2n;
-            if (buyerBalance < requiredCombined) {
-                throw new Error(`账户余额不足:\n  - 需要: ${ethers.formatEther(requiredCombined)} BNB（含两笔Gas与两笔手续费）\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
-            }
-        }
-        else {
-            // ERC20：检查代币余额 + BNB Gas 余额
-            const requiredToken = buyAmountBNB + FLAT_FEE * 2n;
-            if (buyerBalance < requiredToken) {
-                throw new Error(`账户代币余额不足:\n  - 需要: ${ethers.formatUnits(requiredToken, quoteTokenDecimals)}\n  - 实际: ${ethers.formatUnits(buyerBalance, quoteTokenDecimals)}`);
-            }
-            // 检查 BNB Gas
-            if (provider && buyerAddress) {
-                const bnbBalance = await provider.getBalance(buyerAddress);
-                const requiredGas = gasCost * 2n;
-                if (bnbBalance < requiredGas) {
-                    throw new Error(`账户 BNB 余额不足 (用于支付 Gas):\n  - 需要: ${ethers.formatEther(requiredGas)} BNB\n  - 实际: ${ethers.formatEther(bnbBalance)} BNB`);
-                }
-            }
+        const gasCost = gasLimit * gasPrice;
+        const requiredCombined = buyAmountBNB + FLAT_FEE * 2n + gasCost * 2n;
+        if (buyerBalance < requiredCombined) {
+            throw new Error(`账户余额不足:\n  - 需要: ${ethers.formatEther(requiredCombined)} BNB（含两笔Gas与两笔手续费）\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
         }
         return;
     }
-    // 不同地址
-    if (useNativeToken) {
-        const requiredBuyer = buyAmountBNB + FLAT_FEE + reserveGas;
-        if (buyerBalance < requiredBuyer) {
-            throw new Error(`买方余额不足:\n  - 需要: ${ethers.formatEther(requiredBuyer)} BNB\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
-        }
+    const requiredBuyer = buyAmountBNB + FLAT_FEE + reserveGas;
+    if (buyerBalance < requiredBuyer) {
+        throw new Error(`买方余额不足:\n  - 需要: ${ethers.formatEther(requiredBuyer)} BNB\n  - 实际: ${ethers.formatEther(buyerBalance)} BNB`);
     }
-    // ERC20 余额已在 calculateBuyerBudget 中检查过
 }
 function countTruthy(values) {
     return values.filter(Boolean).length;
@@ -316,18 +270,11 @@ const ERC20_ALLOWANCE_ABI = [
     '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)'];
 /**
  * PancakeSwap捆绑换手（V2/V3通用）
- * ✅ 支持 quoteToken：传入 USDT 等地址时，卖出得到该代币，买入使用该代币
  */
 export async function pancakeBundleSwapMerkle(params) {
-    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKey, tokenAddress, routeParams, slippageTolerance = 0.5, config, quoteToken, quoteTokenDecimals = 18 } = params;
-    // ✅ 判断是否使用原生代币（BNB）或 ERC20 代币（如 USDT）
-    const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
-    console.log('🔍 PancakeSwap Swap - quoteToken:', quoteToken);
-    console.log('🔍 PancakeSwap Swap - useNativeToken:', useNativeToken);
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKey, tokenAddress, routeParams, slippageTolerance = 0.5, config } = params;
     const context = createPancakeContext(config);
     const seller = new Wallet(sellerPrivateKey, context.provider);
     const buyer = new Wallet(buyerPrivateKey, context.provider);
@@ -350,11 +297,7 @@ export async function pancakeBundleSwapMerkle(params) {
         buyer,
         quotedBNBOut: quoteResult.estimatedBNBOut,
         reserveGasBNB: config.reserveGasBNB,
-        slippageTolerance,
-        useNativeToken,
-        quoteToken,
-        quoteTokenDecimals,
-        provider: context.provider
+        slippageTolerance
     });
     const swapUnsigned = await buildSwapTransactions({
         routeParams,
@@ -362,8 +305,7 @@ export async function pancakeBundleSwapMerkle(params) {
         buyAmountBNB: buyerBudget.buyAmountBNB,
         buyer,
         seller,
-        tokenAddress,
-        useNativeToken
+        tokenAddress
     });
     const finalGasLimit = getGasLimit(config);
     const gasPrice = await getGasPrice(context.provider, config);
@@ -411,11 +353,7 @@ export async function pancakeBundleSwapMerkle(params) {
         buyAmountBNB: buyerBudget.buyAmountBNB,
         reserveGas: buyerBudget.reserveGas,
         gasLimit: finalGasLimit,
-        gasPrice,
-        useNativeToken,
-        quoteTokenDecimals,
-        provider: context.provider,
-        buyerAddress: buyer.address
+        gasPrice
     });
     const signedTransactions = [];
     if (approvalTx)
@@ -429,9 +367,7 @@ export async function pancakeBundleSwapMerkle(params) {
             sellerAddress: seller.address,
             buyerAddress: buyer.address,
             sellAmount: ethers.formatUnits(sellAmountWei, decimals),
-            buyAmount: useNativeToken
-                ? ethers.formatEther(buyerBudget.buyAmountBNB)
-                : ethers.formatUnits(buyerBudget.buyAmountBNB, quoteTokenDecimals),
+            buyAmount: ethers.formatEther(buyerBudget.buyAmountBNB),
             hasApproval: !!approvalTx,
             profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
         }

package/package.json

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

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -1,16 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
-/**
- * 验证公钥格式（Base64）
- */
-export declare function validatePublicKey(publicKeyBase64: string): boolean;

package/dist/flap/portal-bundle-merkle/encryption.js

@@ -1,146 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 获取全局 crypto 对象（最简单直接的方式）
- */
-function getCryptoAPI() {
-    // 尝试所有可能的全局对象，优先浏览器环境
-    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
-        (typeof self !== 'undefined' && self.crypto) ||
-        (typeof global !== 'undefined' && global.crypto) ||
-        (typeof globalThis !== 'undefined' && globalThis.crypto);
-    if (!cryptoObj) {
-        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
-            '请确保在 HTTPS 或 localhost 下运行');
-    }
-    return cryptoObj;
-}
-/**
- * 获取 SubtleCrypto（用于加密操作）
- */
-function getSubtleCrypto() {
-    const crypto = getCryptoAPI();
-    if (!crypto.subtle) {
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
-        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
-            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
-            '3) 不在无痕/隐私浏览模式下');
-    }
-    return crypto.subtle;
-}
-/**
- * Base64 转 ArrayBuffer（优先使用浏览器 API）
- */
-function base64ToArrayBuffer(base64) {
-    // 浏览器环境（优先）
-    if (typeof atob !== 'undefined') {
-        const binaryString = atob(base64);
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
-        }
-        return bytes.buffer;
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(base64, 'base64').buffer;
-    }
-    throw new Error('❌ Base64 解码不可用');
-}
-/**
- * ArrayBuffer 转 Base64（优先使用浏览器 API）
- */
-function arrayBufferToBase64(buffer) {
-    // 浏览器环境（优先）
-    if (typeof btoa !== 'undefined') {
-        const bytes = new Uint8Array(buffer);
-        let binary = '';
-        for (let i = 0; i < bytes.length; i++) {
-            binary += String.fromCharCode(bytes[i]);
-        }
-        return btoa(binary);
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(buffer).toString('base64');
-    }
-    throw new Error('❌ Base64 编码不可用');
-}
-/**
- * 生成随机 Hex 字符串
- */
-function randomHex(length) {
-    const crypto = getCryptoAPI();
-    const array = new Uint8Array(length);
-    crypto.getRandomValues(array);
-    return Array.from(array)
-        .map(b => b.toString(16).padStart(2, '0'))
-        .join('');
-}
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
-    try {
-        // 0. 获取 SubtleCrypto 和 Crypto API
-        const subtle = getSubtleCrypto();
-        const crypto = getCryptoAPI();
-        // 1. 准备数据
-        const payload = {
-            signedTransactions,
-            timestamp: Date.now(),
-            nonce: randomHex(8)
-        };
-        const plaintext = JSON.stringify(payload);
-        // 2. 生成临时 ECDH 密钥对
-        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
-        // 3. 导入服务器公钥
-        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
-        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
-        // 4. 派生共享密钥（AES-256）
-        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
-        // 5. AES-GCM 加密
-        const iv = crypto.getRandomValues(new Uint8Array(12));
-        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
-        // 6. 导出临时公钥
-        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
-        // 7. 返回加密包（JSON 格式）
-        return JSON.stringify({
-            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
-            i: arrayBufferToBase64(iv.buffer), // IV
-            d: arrayBufferToBase64(encrypted) // 密文
-        });
-    }
-    catch (error) {
-        throw new Error(`加密失败: ${error?.message || String(error)}`);
-    }
-}
-/**
- * 验证公钥格式（Base64）
- */
-export function validatePublicKey(publicKeyBase64) {
-    try {
-        if (!publicKeyBase64)
-            return false;
-        // Base64 字符集验证
-        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
-            return false;
-        // ECDH P-256 公钥固定长度 65 字节（未压缩）
-        // Base64 编码后约 88 字符
-        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
-            return false;
-        return true;
-    }
-    catch {
-        return false;
-    }
-}