four-flap-meme-sdk 1.3.32 → 1.3.34

package/dist/dex/direct-router.d.ts

@@ -15,7 +15,8 @@ export declare const DIRECT_ROUTERS: {
         readonly WBNB: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c";
     };
     readonly MONAD: {
-        readonly PANCAKESWAP_V2: "0xb1bc24c34e88f7d43d5923034e3a14b24daacff9";
+        readonly PANCAKESWAP_V2: "0xB1Bc24c34e88f7D43D5923034E3a14B24DaACfF9";
+        readonly PANCAKESWAP_V3: "0x1b81D678ffb9C0263b24A97847620C99d213eB14";
         readonly UNISWAP_V2: "0x4b2ab38dbf28d31d467aa8993f6c2585981d6804";
         readonly UNISWAP_V3: "0xd6145b2d3f379919e8cdeda7b97e37c4b2ca9c40";
         readonly WMON: "0x3bd359c1119da7da1d913d1c4d2b7c461115433a";
@@ -97,10 +98,18 @@ export declare function directV2BatchBuy(params: DirectV2BuyParams): Promise<Dir
 export declare function directV2BatchSell(params: DirectV2SellParams): Promise<DirectRouterResult>;
 /**
  * V3 批量买入（直接调用 Router）
+ *
+ * 自动识别 SwapRouter 版本：
+ * - SwapRouter02 (PancakeSwap V3): exactInputSingle 不含 deadline，multicall 含 deadline
+ * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export declare function directV3BatchBuy(params: DirectV3BuyParams): Promise<DirectRouterResult>;
 /**
  * V3 批量卖出（直接调用 Router）
+ *
+ * 自动识别 SwapRouter 版本：
+ * - SwapRouter02 (PancakeSwap V3): exactInputSingle 不含 deadline，multicall 含 deadline
+ * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export declare function directV3BatchSell(params: DirectV3SellParams): Promise<DirectRouterResult>;
 export type DexKey = 'PANCAKESWAP' | 'UNISWAP';

package/dist/dex/direct-router.js

@@ -24,9 +24,13 @@ export const DIRECT_ROUTERS = {
         WBNB: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
     },
     MONAD: {
-        PANCAKESWAP_V2: '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9',
+        // PancakeSwap
+        PANCAKESWAP_V2: '0xB1Bc24c34e88f7D43D5923034E3a14B24DaACfF9',
+        PANCAKESWAP_V3: '0x1b81D678ffb9C0263b24A97847620C99d213eB14', // ✅ SwapRouter
+        // Uniswap
         UNISWAP_V2: '0x4b2ab38dbf28d31d467aa8993f6c2585981d6804',
         UNISWAP_V3: '0xd6145b2d3f379919e8cdeda7b97e37c4b2ca9c40',
+        // Wrapped Native
         WMON: '0x3bd359c1119da7da1d913d1c4d2b7c461115433a',
     }
 };
@@ -61,16 +65,97 @@ const V2_ROUTER_ABI = [
     // 报价
     'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)',
 ];
-/** V3 SwapRouter ABI */
-const V3_ROUTER_ABI = [
-    // 单跳
-    'function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)',
-    // 多跳
-    'function exactInput((bytes path, address recipient, uint256 amountIn, uint256 amountOutMinimum)) external payable returns (uint256 amountOut)',
-    // Multicall (用于 refundETH)
+/**
+ * V3 SwapRouter02 ABI (PancakeSwap V3, 新版 Uniswap)
+ * - exactInputSingle: 不含 deadline（deadline 通过 multicall 传递）
+ * - multicall: 有两个版本，推荐使用带 deadline 的版本
+ */
+const V3_ROUTER02_ABI = [
+    // SwapRouter02 的 exactInputSingle - 不含 deadline
+    {
+        "inputs": [{
+                "components": [
+                    { "name": "tokenIn", "type": "address" },
+                    { "name": "tokenOut", "type": "address" },
+                    { "name": "fee", "type": "uint24" },
+                    { "name": "recipient", "type": "address" },
+                    { "name": "amountIn", "type": "uint256" },
+                    { "name": "amountOutMinimum", "type": "uint256" },
+                    { "name": "sqrtPriceLimitX96", "type": "uint160" }
+                ],
+                "name": "params",
+                "type": "tuple"
+            }],
+        "name": "exactInputSingle",
+        "outputs": [{ "name": "amountOut", "type": "uint256" }],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    // Multicall - 带 deadline 版本 (SwapRouter02)
+    'function multicall(uint256 deadline, bytes[] calldata data) external payable returns (bytes[] memory results)',
+    'function refundETH() external payable',
+    'function unwrapWETH9(uint256 amountMinimum, address recipient) external payable',
+];
+/**
+ * V3 SwapRouter（旧版）ABI (Monad Uniswap V3)
+ * - exactInputSingle: 包含 deadline 在 struct 内部
+ * - multicall: 只有 bytes[] 版本，不带 deadline
+ */
+const V3_ROUTER_LEGACY_ABI = [
+    // 旧版 SwapRouter 的 exactInputSingle - 包含 deadline
+    {
+        "inputs": [{
+                "components": [
+                    { "name": "tokenIn", "type": "address" },
+                    { "name": "tokenOut", "type": "address" },
+                    { "name": "fee", "type": "uint24" },
+                    { "name": "recipient", "type": "address" },
+                    { "name": "deadline", "type": "uint256" }, // ✅ 旧版包含 deadline
+                    { "name": "amountIn", "type": "uint256" },
+                    { "name": "amountOutMinimum", "type": "uint256" },
+                    { "name": "sqrtPriceLimitX96", "type": "uint160" }
+                ],
+                "name": "params",
+                "type": "tuple"
+            }],
+        "name": "exactInputSingle",
+        "outputs": [{ "name": "amountOut", "type": "uint256" }],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    // 旧版 Multicall - 只有 bytes[] 版本，不带 deadline
     'function multicall(bytes[] calldata data) external payable returns (bytes[] memory results)',
     'function refundETH() external payable',
+    'function unwrapWETH9(uint256 amountMinimum, address recipient) external payable',
 ];
+/**
+ * 判断是否使用旧版 SwapRouter
+ *
+ * 旧版特征：
+ * - exactInputSingle 包含 deadline 字段
+ * - multicall 只有 bytes[] 参数
+ *
+ * Monad 上的 V3 DEX 都使用旧版：
+ * - Uniswap V3: 0xd6145b2d3f379919e8cdeda7b97e37c4b2ca9c40
+ * - PancakeSwap V3: 0x1b81D678ffb9C0263b24A97847620C99d213eB14
+ *
+ * BSC PancakeSwap V3 使用新版 SwapRouter02
+ */
+function isLegacySwapRouter(chain, routerAddress) {
+    const chainUpper = chain.toUpperCase();
+    const routerLower = routerAddress.toLowerCase();
+    // ✅ Monad 上的所有 V3 Router 都是旧版
+    if (chainUpper === 'MONAD') {
+        if (routerLower === DIRECT_ROUTERS.MONAD.UNISWAP_V3.toLowerCase()) {
+            return true;
+        }
+        if (routerLower === DIRECT_ROUTERS.MONAD.PANCAKESWAP_V3.toLowerCase()) {
+            return true;
+        }
+    }
+    // BSC PancakeSwap V3 是 SwapRouter02（新版）
+    return false;
+}
 /** ERC20 ABI */
 const ERC20_ABI = [
     'function approve(address spender, uint256 amount) external returns (bool)',
@@ -346,6 +431,10 @@ export async function directV2BatchSell(params) {
 // ============================================================================
 /**
  * V3 批量买入（直接调用 Router）
+ *
+ * 自动识别 SwapRouter 版本：
+ * - SwapRouter02 (PancakeSwap V3): exactInputSingle 不含 deadline，multicall 含 deadline
+ * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export async function directV3BatchBuy(params) {
     const { chain, privateKeys, buyAmounts, tokenAddress, routerAddress, fee, quoteToken, quoteTokenDecimals = 18, config, } = params;
@@ -356,42 +445,73 @@ export async function directV3BatchBuy(params) {
     const provider = new JsonRpcProvider(config.rpcUrl, { chainId, name: chain });
     const useNative = isNativeToken(quoteToken);
     const wrappedNative = getWrappedNative(chain);
+    // ✅ 判断是否使用旧版 SwapRouter（Monad Uniswap V3）
+    const useLegacyRouter = isLegacySwapRouter(chain, routerAddress);
+    const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
+    console.log(`[V3 Buy] Router: ${routerAddress}, Legacy: ${useLegacyRouter}`);
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     const nonceManager = new NonceManager(provider);
     const nonces = await nonceManager.getNextNoncesForWallets(wallets);
     const gasPrice = await getGasPrice(provider, config);
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
-    const routerIface = new ethers.Interface(V3_ROUTER_ABI);
+    const routerIface = new ethers.Interface(routerAbi);
     const inputToken = useNative ? wrappedNative : quoteToken;
     const signedTxs = [];
     let totalFlowWei = 0n;
+    const deadline = getDeadline();
     for (let i = 0; i < wallets.length; i++) {
         const wallet = wallets[i];
         const amountWei = ethers.parseUnits(buyAmounts[i], quoteTokenDecimals);
         totalFlowWei += amountWei;
-        // V3 exactInputSingle 参数
-        const swapParams = {
-            tokenIn: inputToken,
-            tokenOut: tokenAddress,
-            fee: fee,
-            recipient: wallet.address,
-            amountIn: amountWei,
-            amountOutMinimum: 0n,
-            sqrtPriceLimitX96: 0n,
-        };
         let txData;
         let txValue;
-        if (useNative) {
-            // 使用 multicall 包装 exactInputSingle + refundETH
-            const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
-            const refundData = routerIface.encodeFunctionData('refundETH', []);
-            txData = routerIface.encodeFunctionData('multicall', [[swapData, refundData]]);
-            txValue = amountWei;
+        if (useLegacyRouter) {
+            // ✅ 旧版 SwapRouter: exactInputSingle 包含 deadline
+            const swapParams = {
+                tokenIn: inputToken,
+                tokenOut: tokenAddress,
+                fee: fee,
+                recipient: wallet.address,
+                deadline: deadline, // ✅ 旧版在 struct 内部
+                amountIn: amountWei,
+                amountOutMinimum: 0n, // 设为 0，依赖 MEV 保护
+                sqrtPriceLimitX96: 0n,
+            };
+            if (useNative) {
+                // 旧版 multicall 不带 deadline
+                const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                const refundData = routerIface.encodeFunctionData('refundETH', []);
+                txData = routerIface.encodeFunctionData('multicall(bytes[])', [[swapData, refundData]]);
+                txValue = amountWei;
+            }
+            else {
+                txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                txValue = 0n;
+            }
         }
         else {
-            txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
-            txValue = 0n;
+            // ✅ SwapRouter02: exactInputSingle 不含 deadline
+            const swapParams = {
+                tokenIn: inputToken,
+                tokenOut: tokenAddress,
+                fee: fee,
+                recipient: wallet.address,
+                amountIn: amountWei,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n,
+            };
+            if (useNative) {
+                // SwapRouter02 的 multicall 带 deadline
+                const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                const refundData = routerIface.encodeFunctionData('refundETH', []);
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [swapData, refundData]]);
+                txValue = amountWei;
+            }
+            else {
+                txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                txValue = 0n;
+            }
         }
         const tx = {
             to: routerAddress,
@@ -422,6 +542,10 @@ export async function directV3BatchBuy(params) {
 }
 /**
  * V3 批量卖出（直接调用 Router）
+ *
+ * 自动识别 SwapRouter 版本：
+ * - SwapRouter02 (PancakeSwap V3): exactInputSingle 不含 deadline，multicall 含 deadline
+ * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export async function directV3BatchSell(params) {
     const { chain, privateKeys, sellPercentages, sellAmounts, tokenAddress, tokenDecimals = 18, routerAddress, fee, quoteToken, config, } = params;
@@ -429,6 +553,10 @@ export async function directV3BatchSell(params) {
     const provider = new JsonRpcProvider(config.rpcUrl, { chainId, name: chain });
     const useNativeOutput = isNativeToken(quoteToken);
     const wrappedNative = getWrappedNative(chain);
+    // ✅ 判断是否使用旧版 SwapRouter（Monad Uniswap V3）
+    const useLegacyRouter = isLegacySwapRouter(chain, routerAddress);
+    const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
+    console.log(`[V3 Sell] Router: ${routerAddress}, Legacy: ${useLegacyRouter}`);
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     const tokenContract = new Contract(tokenAddress, ERC20_ABI, provider);
     // 获取余额
@@ -452,12 +580,13 @@ export async function directV3BatchSell(params) {
     const gasPrice = await getGasPrice(provider, config);
     const gasLimit = getGasLimit(config, 350000);
     const txType = config.txType ?? 0;
-    const routerIface = new ethers.Interface(V3_ROUTER_ABI);
+    const routerIface = new ethers.Interface(routerAbi);
     const approveIface = new ethers.Interface(ERC20_ABI);
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const signedTxs = [];
     let totalOutputEstimate = 0n;
     const currentNonceOffset = new Array(wallets.length).fill(0);
+    const deadline = getDeadline();
     for (let i = 0; i < wallets.length; i++) {
         const wallet = wallets[i];
         const sellAmount = sellAmountsWei[i];
@@ -481,25 +610,49 @@ export async function directV3BatchSell(params) {
                 currentNonceOffset[i]++;
             }
         }
-        // V3 卖出参数
-        const swapParams = {
-            tokenIn: tokenAddress,
-            tokenOut: outputToken,
-            fee: fee,
-            recipient: useNativeOutput ? routerAddress : wallet.address, // 如果输出是原生币，先发到 router
-            amountIn: sellAmount,
-            amountOutMinimum: 0n,
-            sqrtPriceLimitX96: 0n,
-        };
         let txData;
-        if (useNativeOutput) {
-            // 卖出后 unwrap WETH 并发送给用户
-            const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
-            // 注意：V3 Router 的 unwrapWETH9 需要额外处理，这里简化使用 multicall
-            txData = swapData; // 实际项目中可能需要 multicall 包装 unwrapWETH9
+        if (useLegacyRouter) {
+            // ✅ 旧版 SwapRouter: exactInputSingle 包含 deadline
+            const swapParams = {
+                tokenIn: tokenAddress,
+                tokenOut: outputToken,
+                fee: fee,
+                recipient: useNativeOutput ? routerAddress : wallet.address,
+                deadline: deadline, // ✅ 旧版在 struct 内部
+                amountIn: sellAmount,
+                amountOutMinimum: 0n, // 设为 0，依赖 MEV 保护
+                sqrtPriceLimitX96: 0n,
+            };
+            if (useNativeOutput) {
+                // 旧版 multicall 不带 deadline
+                const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                const unwrapData = routerIface.encodeFunctionData('unwrapWETH9', [0n, wallet.address]);
+                txData = routerIface.encodeFunctionData('multicall(bytes[])', [[swapData, unwrapData]]);
+            }
+            else {
+                txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            }
         }
         else {
-            txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            // ✅ SwapRouter02: exactInputSingle 不含 deadline
+            const swapParams = {
+                tokenIn: tokenAddress,
+                tokenOut: outputToken,
+                fee: fee,
+                recipient: useNativeOutput ? routerAddress : wallet.address,
+                amountIn: sellAmount,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n,
+            };
+            if (useNativeOutput) {
+                // SwapRouter02 的 multicall 带 deadline
+                const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+                const unwrapData = routerIface.encodeFunctionData('unwrapWETH9', [0n, wallet.address]);
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [swapData, unwrapData]]);
+            }
+            else {
+                txData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            }
         }
         const sellTx = {
             to: routerAddress,
@@ -547,8 +700,10 @@ export function getRouterAddress(chain, dexKey, version) {
                 return DIRECT_ROUTERS.MONAD.UNISWAP_V2;
             return DIRECT_ROUTERS.MONAD.UNISWAP_V3;
         }
-        // PancakeSwap on Monad
-        return DIRECT_ROUTERS.MONAD.PANCAKESWAP_V2;
+        // PancakeSwap on Monad - 支持 V2 和 V3
+        if (version === 'v2')
+            return DIRECT_ROUTERS.MONAD.PANCAKESWAP_V2;
+        return DIRECT_ROUTERS.MONAD.PANCAKESWAP_V3;
     }
     throw new Error(`Unsupported chain/dex combination: ${chain}/${dexKey}`);
 }

package/package.json

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