four-flap-meme-sdk 1.3.44 → 1.3.46

package/dist/dex/direct-router.js

@@ -82,30 +82,31 @@ const V2_ROUTER_ABI = [
 /**
  * SwapRouter02 的 V2 方法 ABI (PotatoSwap)
  *
- * 重要：SwapRouter02 的 V2 方法只有：
+ * 根据官方文档，SwapRouter02 支持完整的 V2 方法：
  * - swapExactTokensForTokens(amountIn, amountOutMin, path[], to)
+ * - swapExactETHForTokens(amountOutMin, path[], to) - ETH 换代币，自动 wrap
+ * - swapExactTokensForETH(amountIn, amountOutMin, path[], to) - 代币换 ETH，自动 unwrap
  * - swapTokensForExactTokens(amountOut, amountInMax, path[], to)
- *
- * 没有 swapExactETHForTokens / swapExactTokensForETH！
- * 需要手动处理 ETH/WETH 转换：
- * - 买入(ETH->Token): wrapETH + swapExactTokensForTokens
- * - 卖出(Token->ETH): swapExactTokensForTokens(to=ADDRESS_THIS) + unwrapWETH9
+ * - swapTokensForExactETH(amountOut, amountInMax, path[], to)
+ * - swapETHForExactTokens(amountOut, path[], to)
  */
 const SWAP_ROUTER02_V2_ABI = [
-    // V2 交换方法（只有 token-to-token）
+    // V2 交换方法 - 精确输入
     'function swapExactTokensForTokens(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to) external payable returns (uint256 amountOut)',
+    'function swapExactETHForTokens(uint256 amountOutMin, address[] calldata path, address to) external payable returns (uint256 amountOut)',
+    'function swapExactTokensForETH(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to) external payable returns (uint256 amountOut)',
+    // V2 交换方法 - 精确输出
     'function swapTokensForExactTokens(uint256 amountOut, uint256 amountInMax, address[] calldata path, address to) external payable returns (uint256 amountIn)',
+    'function swapTokensForExactETH(uint256 amountOut, uint256 amountInMax, address[] calldata path, address to) external payable returns (uint256 amountIn)',
+    'function swapETHForExactTokens(uint256 amountOut, address[] calldata path, address to) external payable returns (uint256 amountIn)',
     // Multicall - 多种重载
     'function multicall(uint256 deadline, bytes[] calldata data) external payable returns (bytes[] memory results)',
     'function multicall(bytes[] calldata data) external payable returns (bytes[] memory results)',
-    // 辅助方法 - ETH/WETH 转换
+    // 辅助方法
     'function wrapETH(uint256 value) external payable',
     'function unwrapWETH9(uint256 amountMinimum, address recipient) external payable',
     'function unwrapWETH9(uint256 amountMinimum) external payable',
     'function refundETH() external payable',
-    // pull 方法 - 从用户拉取代币到 Router
-    'function pull(address token, uint256 value) external payable',
-    // sweepToken - 将 Router 中的代币发送给用户
     'function sweepToken(address token, uint256 amountMinimum, address recipient) external payable',
     'function sweepToken(address token, uint256 amountMinimum) external payable',
 ];
@@ -326,25 +327,22 @@ export async function directV2BatchBuy(params) {
         let txData;
         let txValue;
         if (useSwapRouter02) {
-            // ✅ SwapRouter02: 只有 swapExactTokensForTokens，需要手动处理 ETH wrap
-            // 文档：没有 swapExactETHForTokens / swapExactTokensForETH
-            const multicallData = [];
+            // ✅ SwapRouter02: 使用官方文档的 V2 方法
             if (useNative) {
-                // ETH -> 代币：
-                // 1. wrapETH(msg.value) - 将 ETH 转为 WETH
-                // 2. swapExactTokensForTokens(WETH -> Token)
-                const wrapData = routerIface.encodeFunctionData('wrapETH', [amountWei]);
-                multicallData.push(wrapData);
-                const swapData = routerIface.encodeFunctionData('swapExactTokensForTokens', [
-                    amountWei,
+                // ETH -> 代币：使用 swapExactETHForTokens
+                // msg.value 的 ETH 会自动包装为 WETH
+                // path 第一个元素必须是 WETH
+                const swapData = routerIface.encodeFunctionData('swapExactETHForTokens', [
                     0n, // amountOutMin
                     path, // path: [WETH, ..., tokenOut]
                     wallet.address, // to
                 ]);
-                multicallData.push(swapData);
-                // refundETH - 退回多余的 ETH（如果有）
-                const refundData = routerIface.encodeFunctionData('refundETH', []);
-                multicallData.push(refundData);
+                // 使用 multicall 包装，传递 deadline
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [
+                    deadline,
+                    [swapData],
+                ]);
+                txValue = amountWei;
             }
             else {
                 // 代币 -> 代币：直接 swapExactTokensForTokens
@@ -354,14 +352,12 @@ export async function directV2BatchBuy(params) {
                     path,
                     wallet.address, // to
                 ]);
-                multicallData.push(swapData);
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [
+                    deadline,
+                    [swapData],
+                ]);
+                txValue = 0n;
             }
-            // 使用 multicall 包装，传递 deadline
-            txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [
-                deadline,
-                multicallData,
-            ]);
-            txValue = useNative ? amountWei : 0n;
         }
         else if (useNative) {
             // 传统 V2 Router: 原生币 → Token
@@ -488,46 +484,36 @@ export async function directV2BatchSell(params) {
         // 卖出交易
         let txData;
         if (useSwapRouter02) {
-            // ✅ SwapRouter02: 只有 swapExactTokensForTokens，需要手动处理 ETH unwrap
-            const router02Iface = new ethers.Interface(SWAP_ROUTER02_V2_ABI);
-            const multicallData = [];
-            // SwapRouter02 特殊地址约定：
-            // address(1) = ADDRESS_THIS = Router 合约自己
-            // address(2) = MSG_SENDER = 调用者
-            const ADDRESS_THIS = '0x0000000000000000000000000000000000000001'; // Router 自己
+            // ✅ SwapRouter02: 使用官方文档的 V2 方法
             if (useNativeOutput) {
-                // 代币 -> ETH：
-                // 1. swapExactTokensForTokens(token -> WETH, to = ADDRESS_THIS)
-                // 2. unwrapWETH9(WETH -> ETH, to = 用户)
-                const swapData = router02Iface.encodeFunctionData('swapExactTokensForTokens', [
+                // 代币 -> ETH：使用 swapExactTokensForETH
+                // path 最后一个元素必须是 WETH
+                // 最终 WETH 会自动解包为 ETH 发送给 to
+                const swapData = routerIface.encodeFunctionData('swapExactTokensForETH', [
                     sellAmount,
                     0n, // amountOutMin
                     path, // path: [token, ..., WETH]
-                    ADDRESS_THIS, // to = Router 自己，WETH 留在 Router 中
+                    wallet.address, // to
                 ]);
-                multicallData.push(swapData);
-                // unwrap WETH -> ETH 发送给用户
-                const unwrapData = router02Iface.encodeFunctionData('unwrapWETH9(uint256,address)', [
-                    0n, // amountMinimum
-                    wallet.address, // recipient = 用户
+                // 使用 multicall 包装，传递 deadline
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [
+                    deadline,
+                    [swapData],
                 ]);
-                multicallData.push(unwrapData);
             }
             else {
                 // 代币 -> 代币：直接 swapExactTokensForTokens
-                const swapData = router02Iface.encodeFunctionData('swapExactTokensForTokens', [
+                const swapData = routerIface.encodeFunctionData('swapExactTokensForTokens', [
                     sellAmount,
                     0n, // amountOutMin
                     path,
                     wallet.address, // to
                 ]);
-                multicallData.push(swapData);
+                txData = routerIface.encodeFunctionData('multicall(uint256,bytes[])', [
+                    deadline,
+                    [swapData],
+                ]);
             }
-            // 使用 multicall 包装，传递 deadline
-            txData = router02Iface.encodeFunctionData('multicall(uint256,bytes[])', [
-                deadline,
-                multicallData,
-            ]);
         }
         else if (useNativeOutput) {
             txData = routerIface.encodeFunctionData('swapExactTokensForETHSupportingFeeOnTransferTokens', [

package/package.json

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