four-flap-meme-sdk 1.4.8 → 1.4.10

package/dist/dex/direct-router.js

@@ -48,9 +48,31 @@ const BLOCKRAZOR_BUILDER_EOA = '0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20';
 const QUOTE_ROUTER_ABI = [
     'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
 ];
-// ✅ V3 Quoter ABI（用于 V3 报价）
+// ✅ V3 QuoterV2 ABI（用于 V3 报价）
+// PancakeSwap V3 使用结构体参数版本
 const V3_QUOTER_ABI = [
-    'function quoteExactInputSingle(address tokenIn, address tokenOut, uint24 fee, uint256 amountIn, uint160 sqrtPriceLimitX96) external returns (uint256 amountOut)'
+    {
+        "inputs": [{
+                "components": [
+                    { "name": "tokenIn", "type": "address" },
+                    { "name": "tokenOut", "type": "address" },
+                    { "name": "amountIn", "type": "uint256" },
+                    { "name": "fee", "type": "uint24" },
+                    { "name": "sqrtPriceLimitX96", "type": "uint160" }
+                ],
+                "name": "params",
+                "type": "tuple"
+            }],
+        "name": "quoteExactInputSingle",
+        "outputs": [
+            { "name": "amountOut", "type": "uint256" },
+            { "name": "sqrtPriceX96After", "type": "uint160" },
+            { "name": "initializedTicksCrossed", "type": "uint32" },
+            { "name": "gasEstimate", "type": "uint256" }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
 ];
 // ✅ 各链的报价配置（V2 Router + V3 Quoter）
 const QUOTE_CONFIG = {
@@ -660,7 +682,16 @@ async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chain,
         console.log(`[getTokenToNativeQuote] 开始 V3 报价: token=${tokenAddress.slice(0, 10)}..., amount=${tokenAmount}, feesToTry=${feesToTry}`);
         for (const tryFee of feesToTry) {
             try {
-                const amountOut = await quoter.quoteExactInputSingle.staticCall(tokenAddress, config.wrappedNative, tryFee, tokenAmount, 0n);
+                // ✅ 使用结构体参数调用 QuoterV2
+                const result = await quoter.quoteExactInputSingle.staticCall({
+                    tokenIn: tokenAddress,
+                    tokenOut: config.wrappedNative,
+                    amountIn: tokenAmount,
+                    fee: tryFee,
+                    sqrtPriceLimitX96: 0n
+                });
+                // QuoterV2 返回多个值，第一个是 amountOut
+                const amountOut = result[0];
                 if (amountOut > 0n) {
                     console.log(`[getTokenToNativeQuote] V3 直接路径成功 (fee=${tryFee}): ${ethers.formatEther(amountOut)} BNB`);
                     return amountOut;
@@ -677,8 +708,15 @@ async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chain,
                 continue;
             for (const fee1 of feesToTry) {
                 try {
-                    // 第一跳：代币 → 稳定币
-                    const midAmount = await quoter.quoteExactInputSingle.staticCall(tokenAddress, stableCoin, fee1, tokenAmount, 0n);
+                    // 第一跳：代币 → 稳定币（使用结构体参数）
+                    const midResult = await quoter.quoteExactInputSingle.staticCall({
+                        tokenIn: tokenAddress,
+                        tokenOut: stableCoin,
+                        amountIn: tokenAmount,
+                        fee: fee1,
+                        sqrtPriceLimitX96: 0n
+                    });
+                    const midAmount = midResult[0];
                     if (midAmount <= 0n)
                         continue;
                     console.log(`[getTokenToNativeQuote] V3 第一跳成功: 代币 → ${stableCoin.slice(0, 10)}... = ${midAmount}`);
@@ -686,7 +724,14 @@ async function getTokenToNativeQuote(provider, tokenAddress, tokenAmount, chain,
                     const stableFees = [100, 500, 2500]; // 0.01%, 0.05%, 0.25%
                     for (const fee2 of stableFees) {
                         try {
-                            const amountOut = await quoter.quoteExactInputSingle.staticCall(stableCoin, config.wrappedNative, fee2, midAmount, 0n);
+                            const finalResult = await quoter.quoteExactInputSingle.staticCall({
+                                tokenIn: stableCoin,
+                                tokenOut: config.wrappedNative,
+                                amountIn: midAmount,
+                                fee: fee2,
+                                sqrtPriceLimitX96: 0n
+                            });
+                            const amountOut = finalResult[0];
                             if (amountOut > 0n) {
                                 console.log(`[getTokenToNativeQuote] V3 多跳路径成功 (${fee1}→${fee2}): ${ethers.formatEther(amountOut)} BNB`);
                                 return amountOut;

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);
@@ -291,6 +394,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)',

package/package.json

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