four-flap-meme-sdk 1.4.9 → 1.4.11

package/dist/pancake/bundle-swap.js

@@ -33,34 +33,137 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
     });
 }
 async function quoteSellOutput({ routeParams, sellAmountWei, provider }) {
+    const tokenIn = routeParams.routeType === 'v2'
+        ? routeParams.v2Path[0]
+        : routeParams.v3TokenIn;
+    const tokenInLower = tokenIn.toLowerCase();
+    // ==================== V2 报价 ====================
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
-        const amounts = await v2Router.getAmountsOut(sellAmountWei, v2Path);
-        return { estimatedBNBOut: amounts[amounts.length - 1] };
+        // V2 策略 1：直接路径
+        try {
+            const amounts = await v2Router.getAmountsOut(sellAmountWei, v2Path);
+            const amountOut = amounts[amounts.length - 1];
+            if (amountOut > 0n) {
+                console.log(`[quoteSellOutput] V2 直接路径成功: ${ethers.formatEther(amountOut)} BNB`);
+                return { estimatedBNBOut: amountOut };
+            }
+        }
+        catch (err) {
+            console.log(`[quoteSellOutput] V2 直接路径失败: ${String(err).slice(0, 100)}`);
+        }
+        // V2 策略 2：多跳路径 (代币 → 稳定币 → WBNB)
+        for (const stableCoin of STABLE_COINS) {
+            if (tokenInLower === stableCoin.toLowerCase())
+                continue;
+            try {
+                const multiHopPath = [tokenIn, stableCoin, WBNB_ADDRESS];
+                const amounts = await v2Router.getAmountsOut(sellAmountWei, multiHopPath);
+                const amountOut = amounts[amounts.length - 1];
+                if (amountOut > 0n) {
+                    console.log(`[quoteSellOutput] V2 多跳路径成功 (via ${stableCoin.slice(0, 10)}...): ${ethers.formatEther(amountOut)} BNB`);
+                    return { estimatedBNBOut: amountOut };
+                }
+            }
+            catch (err) {
+                continue;
+            }
+        }
+        throw new Error('V2 报价失败: 所有路径均无效');
     }
+    // ==================== V3 报价 ====================
     if (routeParams.routeType === 'v3-single') {
         const params = routeParams;
         const quoter = new Contract(PANCAKE_V3_QUOTER_ADDRESS, PANCAKE_V3_QUOTER_ABI, provider);
-        try {
-            const result = await quoter.quoteExactInputSingle.staticCall({
-                tokenIn: params.v3TokenIn,
-                tokenOut: params.v3TokenOut,
-                amountIn: sellAmountWei,
-                fee: params.v3Fee,
-                sqrtPriceLimitX96: 0
-            });
-            return { estimatedBNBOut: result[0] };
+        // 如果指定了 fee，只用指定的 fee；否则尝试所有费率
+        const feesToTry = params.v3Fee ? [params.v3Fee] : V3_FEE_TIERS;
+        console.log(`[quoteSellOutput] 开始 V3 报价: tokenIn=${params.v3TokenIn.slice(0, 10)}..., tokenOut=${params.v3TokenOut.slice(0, 10)}..., feesToTry=${feesToTry}`);
+        // V3 策略 1：直接路径（尝试多个费率）
+        for (const fee of feesToTry) {
+            try {
+                const result = await quoter.quoteExactInputSingle.staticCall({
+                    tokenIn: params.v3TokenIn,
+                    tokenOut: params.v3TokenOut,
+                    amountIn: sellAmountWei,
+                    fee: fee,
+                    sqrtPriceLimitX96: 0n
+                });
+                const amountOut = Array.isArray(result) ? result[0] : result;
+                if (amountOut && amountOut > 0n) {
+                    console.log(`[quoteSellOutput] V3 直接路径成功 (fee=${fee}): ${ethers.formatEther(amountOut)} BNB`);
+                    return { estimatedBNBOut: amountOut };
+                }
+            }
+            catch (err) {
+                console.log(`[quoteSellOutput] V3 直接路径失败 (fee=${fee}): ${String(err).slice(0, 100)}`);
+                continue;
+            }
+        }
+        // V3 策略 2：多跳路径 (代币 → 稳定币 → WBNB)
+        for (const stableCoin of STABLE_COINS) {
+            if (tokenInLower === stableCoin.toLowerCase())
+                continue;
+            for (const fee1 of feesToTry) {
+                try {
+                    // 第一跳：代币 → 稳定币
+                    const midResult = await quoter.quoteExactInputSingle.staticCall({
+                        tokenIn: params.v3TokenIn,
+                        tokenOut: stableCoin,
+                        amountIn: sellAmountWei,
+                        fee: fee1,
+                        sqrtPriceLimitX96: 0n
+                    });
+                    const midAmount = Array.isArray(midResult) ? midResult[0] : midResult;
+                    if (!midAmount || midAmount <= 0n)
+                        continue;
+                    console.log(`[quoteSellOutput] V3 第一跳成功: 代币 → ${stableCoin.slice(0, 10)}... = ${midAmount}`);
+                    // 第二跳：稳定币 → WBNB（尝试多个费率）
+                    const stableFees = [100, 500, 2500];
+                    for (const fee2 of stableFees) {
+                        try {
+                            const finalResult = await quoter.quoteExactInputSingle.staticCall({
+                                tokenIn: stableCoin,
+                                tokenOut: WBNB_ADDRESS,
+                                amountIn: midAmount,
+                                fee: fee2,
+                                sqrtPriceLimitX96: 0n
+                            });
+                            const amountOut = Array.isArray(finalResult) ? finalResult[0] : finalResult;
+                            if (amountOut && amountOut > 0n) {
+                                console.log(`[quoteSellOutput] V3 多跳路径成功 (${fee1}→${fee2}): ${ethers.formatEther(amountOut)} BNB`);
+                                return { estimatedBNBOut: amountOut };
+                            }
+                        }
+                        catch {
+                            continue;
+                        }
+                    }
+                }
+                catch (err) {
+                    console.log(`[quoteSellOutput] V3 第一跳失败 (fee=${fee1}): ${String(err).slice(0, 100)}`);
+                    continue;
+                }
+            }
         }
-        catch (v3Error) {
-            if (params.v2Path && params.v2Path.length >= 2) {
+        // V3 全部失败，尝试 V2 fallback
+        if (params.v2Path && params.v2Path.length >= 2) {
+            try {
                 const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
                 const amounts = await v2Router.getAmountsOut(sellAmountWei, params.v2Path);
-                return { estimatedBNBOut: amounts[amounts.length - 1] };
+                const amountOut = amounts[amounts.length - 1];
+                if (amountOut > 0n) {
+                    console.log(`[quoteSellOutput] V3→V2 fallback 成功: ${ethers.formatEther(amountOut)} BNB`);
+                    return { estimatedBNBOut: amountOut };
+                }
+            }
+            catch (v2Error) {
+                console.log(`[quoteSellOutput] V3→V2 fallback 失败: ${String(v2Error).slice(0, 100)}`);
             }
-            throw new Error(`V3 QuoterV2 失败 (fee=${params.v3Fee}) 且未提供 v2Path 作为备选。可能的原因: 1. V3 池子不存在 2. 费率档位错误 3. 流动性不足`);
         }
+        throw new Error(`V3 QuoterV2 报价失败 (尝试费率: ${feesToTry.join(', ')}) 且 V2 路径无效`);
     }
+    // ==================== V3 多跳 ====================
     const params = routeParams;
     if (params.v2Path && params.v2Path.length >= 2) {
         const v2Router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
@@ -191,6 +294,132 @@ function calculateProfitAmount(estimatedBNBOut) {
     }
     return (estimatedBNBOut * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
 }
+/**
+ * ✅ 获取 ERC20 代币 → 原生代币（BNB）的报价
+ * 用于将 ERC20 利润转换为 BNB
+ *
+ * @param provider - Provider 实例
+ * @param tokenAddress - ERC20 代币地址（如 USDT）
+ * @param tokenAmount - 代币数量（wei）
+ * @param version - 'v2' | 'v3'，指定使用哪个版本的报价
+ * @param fee - V3 费率档位（仅 V3 时使用）
+ * @returns 等值的 BNB 数量（wei），失败返回 0n
+ */
+async function getERC20ToNativeQuote(provider, tokenAddress, tokenAmount, version = 'v2', fee) {
+    if (tokenAmount <= 0n)
+        return 0n;
+    const tokenLower = tokenAddress.toLowerCase();
+    const wbnbLower = WBNB_ADDRESS.toLowerCase();
+    // 如果代币本身就是 WBNB，直接返回
+    if (tokenLower === wbnbLower) {
+        return tokenAmount;
+    }
+    // ==================== V2 报价 ====================
+    if (version === 'v2') {
+        const router = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, provider);
+        // V2 策略 1：直接路径 代币 → WBNB
+        try {
+            const amounts = await router.getAmountsOut(tokenAmount, [tokenAddress, WBNB_ADDRESS]);
+            const nativeAmount = amounts[1];
+            if (nativeAmount > 0n) {
+                console.log(`[getERC20ToNativeQuote] V2 直接路径成功: ${ethers.formatEther(nativeAmount)} BNB`);
+                return nativeAmount;
+            }
+        }
+        catch {
+            // V2 直接路径失败，尝试多跳
+        }
+        // V2 策略 2：多跳路径 代币 → 稳定币 → WBNB
+        for (const stableCoin of STABLE_COINS) {
+            if (tokenLower === stableCoin.toLowerCase()) {
+                // 代币本身就是稳定币
+                try {
+                    const amounts = await router.getAmountsOut(tokenAmount, [stableCoin, WBNB_ADDRESS]);
+                    const nativeAmount = amounts[1];
+                    if (nativeAmount > 0n) {
+                        console.log(`[getERC20ToNativeQuote] V2 稳定币直接路径成功: ${ethers.formatEther(nativeAmount)} BNB`);
+                        return nativeAmount;
+                    }
+                }
+                catch {
+                    continue;
+                }
+            }
+        }
+        console.warn(`[getERC20ToNativeQuote] V2 所有报价路径均失败`);
+        return 0n;
+    }
+    // ==================== V3 报价 ====================
+    if (version === 'v3') {
+        const quoter = new Contract(PANCAKE_V3_QUOTER_ADDRESS, PANCAKE_V3_QUOTER_ABI, provider);
+        const feesToTry = fee ? [fee] : V3_FEE_TIERS;
+        // V3 策略 1：直接路径 代币 → WBNB
+        for (const tryFee of feesToTry) {
+            try {
+                const result = await quoter.quoteExactInputSingle.staticCall({
+                    tokenIn: tokenAddress,
+                    tokenOut: WBNB_ADDRESS,
+                    amountIn: tokenAmount,
+                    fee: tryFee,
+                    sqrtPriceLimitX96: 0n
+                });
+                const amountOut = Array.isArray(result) ? result[0] : result;
+                if (amountOut && amountOut > 0n) {
+                    console.log(`[getERC20ToNativeQuote] V3 直接路径成功 (fee=${tryFee}): ${ethers.formatEther(amountOut)} BNB`);
+                    return amountOut;
+                }
+            }
+            catch {
+                continue;
+            }
+        }
+        // V3 策略 2：多跳路径 代币 → 稳定币 → WBNB
+        for (const stableCoin of STABLE_COINS) {
+            if (tokenLower === stableCoin.toLowerCase())
+                continue;
+            for (const fee1 of feesToTry) {
+                try {
+                    const midResult = await quoter.quoteExactInputSingle.staticCall({
+                        tokenIn: tokenAddress,
+                        tokenOut: stableCoin,
+                        amountIn: tokenAmount,
+                        fee: fee1,
+                        sqrtPriceLimitX96: 0n
+                    });
+                    const midAmount = Array.isArray(midResult) ? midResult[0] : midResult;
+                    if (!midAmount || midAmount <= 0n)
+                        continue;
+                    const stableFees = [100, 500, 2500];
+                    for (const fee2 of stableFees) {
+                        try {
+                            const finalResult = await quoter.quoteExactInputSingle.staticCall({
+                                tokenIn: stableCoin,
+                                tokenOut: WBNB_ADDRESS,
+                                amountIn: midAmount,
+                                fee: fee2,
+                                sqrtPriceLimitX96: 0n
+                            });
+                            const amountOut = Array.isArray(finalResult) ? finalResult[0] : finalResult;
+                            if (amountOut && amountOut > 0n) {
+                                console.log(`[getERC20ToNativeQuote] V3 多跳路径成功 (${fee1}→${fee2}): ${ethers.formatEther(amountOut)} BNB`);
+                                return amountOut;
+                            }
+                        }
+                        catch {
+                            continue;
+                        }
+                    }
+                }
+                catch {
+                    continue;
+                }
+            }
+        }
+        console.warn(`[getERC20ToNativeQuote] V3 所有报价路径均失败`);
+        return 0n;
+    }
+    return 0n;
+}
 async function validateFinalBalances({ sameAddress, buyerBalance, buyAmountBNB, reserveGas, gasLimit, gasPrice, useNativeToken = true, quoteTokenDecimals = 18, provider, buyerAddress }) {
     const gasCost = gasLimit * gasPrice;
     if (sameAddress) {
@@ -291,6 +520,14 @@ const PANCAKE_V3_QUOTER_ADDRESS = '0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997';
 // 代理合约手续费
 const FLAT_FEE = 0n; // ✅ 已移除合约固定手续费
 const WBNB_ADDRESS = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
+// ✅ 常用稳定币地址（用于多跳报价）
+const STABLE_COINS = [
+    '0x55d398326f99059fF775485246999027B3197955', // USDT
+    '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d', // USDC
+    '0xe9e7CEA3DedcA5984780Bafc599bD69ADd087D56', // BUSD
+];
+// ✅ V3 常用费率档位
+const V3_FEE_TIERS = [100, 500, 2500, 10000]; // 0.01%, 0.05%, 0.25%, 1%
 const ERC20_ALLOWANCE_ABI = [
     'function allowance(address,address) view returns (uint256)',
     'function approve(address spender,uint256 amount) returns (bool)',
@@ -352,7 +589,24 @@ export async function pancakeBundleSwapMerkle(params) {
         tokenAddress,
         useNativeToken
     });
-    const profitAmount = calculateProfitAmount(quoteResult.estimatedBNBOut);
+    // ✅ 修复：利润计算应基于 BNB 数量，不是 ERC20 数量
+    // 如果输出是原生代币（BNB），直接使用报价结果
+    // 如果输出是 ERC20（如 USDT），需要先转换为 BNB 等值
+    let profitAmount;
+    if (useNativeToken) {
+        // 输出是 BNB，直接计算利润
+        profitAmount = calculateProfitAmount(quoteResult.estimatedBNBOut);
+        console.log(`[pancakeBundleSwapMerkle] 原生代币利润: ${ethers.formatEther(profitAmount)} BNB`);
+    }
+    else {
+        // 输出是 ERC20，需要先获取 ERC20 → BNB 的报价
+        const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
+        const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
+        const estimatedBNBValue = await getERC20ToNativeQuote(context.provider, quoteToken, quoteResult.estimatedBNBOut, // 这实际上是 ERC20 数量
+        version, fee);
+        profitAmount = calculateProfitAmount(estimatedBNBValue);
+        console.log(`[pancakeBundleSwapMerkle] ERC20→BNB 报价: ${ethers.formatUnits(quoteResult.estimatedBNBOut, quoteTokenDecimals)} ${quoteToken?.slice(0, 10)}... → ${ethers.formatEther(estimatedBNBValue)} BNB, 利润: ${ethers.formatEther(profitAmount)} BNB`);
+    }
     // ✅ 获取贿赂金额
     const bribeAmount = config.bribeAmount && config.bribeAmount > 0
         ? ethers.parseEther(String(config.bribeAmount))
@@ -600,8 +854,19 @@ export async function pancakeBatchSwapMerkle(params) {
             type: txType
         });
     }
-    // 利润交易放在末尾（由卖方发送，与贿赂交易一致）
-    const profitAmount = calculateProfitAmount(estimatedBNBOut);
+    // ✅ 修复：利润计算应基于 BNB 数量，不是 ERC20 数量
+    let profitAmount;
+    if (useNativeToken) {
+        profitAmount = calculateProfitAmount(estimatedBNBOut);
+        console.log(`[pancakeBatchSwapMerkle] 原生代币利润: ${ethers.formatEther(profitAmount)} BNB`);
+    }
+    else {
+        const version = routeParams.routeType === 'v2' ? 'v2' : 'v3';
+        const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
+        const estimatedBNBValue = await getERC20ToNativeQuote(context.provider, quoteToken, estimatedBNBOut, version, fee);
+        profitAmount = calculateProfitAmount(estimatedBNBValue);
+        console.log(`[pancakeBatchSwapMerkle] ERC20→BNB 报价: ${ethers.formatUnits(estimatedBNBOut, quoteTokenDecimals)} → ${ethers.formatEther(estimatedBNBValue)} BNB, 利润: ${ethers.formatEther(profitAmount)} BNB`);
+    }
     let profitTx = null;
     if (profitAmount > 0n) {
         // ✅ 利润由卖方发送（与贿赂交易同一钱包）

package/package.json

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