four-flap-meme-sdk 1.6.53 → 1.6.54

package/dist/utils/holders-maker.js

@@ -10,7 +10,7 @@ import { generateWallets } from './wallet.js';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, getDeadline } from './bundle-helpers.js';
 import { ADDRESSES, BLOCKRAZOR_BUILDER_EOA, PROFIT_CONFIG } from './constants.js';
 import { FLAP_PORTAL_ADDRESSES } from '../flap/constants.js';
-import { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_ABI } from '../abis/common.js';
+import { V2_ROUTER_ABI, V3_ROUTER02_ABI, V3_ROUTER_LEGACY_ABI, ERC20_ABI } from '../abis/common.js';
 // Four 内盘 ABI
 const FOUR_TM2_ABI = [
     'function buyTokenAMAP(uint256 origin, address token, address to, uint256 funds, uint256 minAmount) payable'
@@ -423,32 +423,59 @@ async function buildV2BuyTx(wallet, tokenAddress, buyAmount, nonce, gasPrice, ga
  * 构建 V3 单跳买入交易
  * BNB/OKB → Token (使用 exactInputSingle + multicall)
  *
- * ✅ 修复：使用 ethers.Interface 手动编码 calldata，避免 multicall 重载问题
+ * ✅ 修复：根据链类型选择正确的 Router ABI 版本
+ * - XLayer/Monad: 旧版 Router（exactInputSingle 包含 deadline，multicall(bytes[])）
+ * - BSC: 新版 SwapRouter02（exactInputSingle 不含 deadline，multicall(uint256,bytes[])）
  */
 async function buildV3BuyTx(wallet, tokenAddress, buyAmount, nonce, gasPrice, gasLimit, chainId, txType, v3Fee = 2500, // 默认 0.25% 手续费
 chain) {
     const deadline = getDeadline();
-    const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
     const wrappedNative = getWrappedNativeAddress(chain);
     const routerAddress = chain === 'XLAYER' ? XLAYER_V3_ROUTER_ADDRESS : PANCAKE_V3_ROUTER_ADDRESS;
-    // 构建 exactInputSingle calldata
-    const swapParams = {
-        tokenIn: wrappedNative,
-        tokenOut: tokenAddress,
-        fee: v3Fee,
-        recipient: wallet.address,
-        amountIn: buyAmount,
-        amountOutMinimum: 0n,
-        sqrtPriceLimitX96: 0n
-    };
-    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [swapParams]);
-    // ✅ 添加 refundETH，退还多余的 ETH/OKB
-    const refundETHData = v3RouterIface.encodeFunctionData('refundETH', []);
-    // ✅ 使用明确的函数签名编码 multicall，避免重载问题
-    const multicallData = v3RouterIface.encodeFunctionData('multicall(uint256,bytes[])', [
-        deadline,
-        [exactInputSingleData, refundETHData]
-    ]);
+    // ✅ 根据链类型选择正确的 ABI 版本
+    // XLayer/Monad 使用旧版 Router（exactInputSingle 包含 deadline）
+    // BSC 使用新版 SwapRouter02（exactInputSingle 不含 deadline）
+    const useLegacyRouter = chain === 'XLAYER' || chain === 'MONAD';
+    const v3RouterIface = new ethers.Interface(useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI);
+    let multicallData;
+    if (useLegacyRouter) {
+        // ✅ 旧版 Router：swapParams 包含 deadline，multicall(bytes[])
+        const swapParams = {
+            tokenIn: wrappedNative,
+            tokenOut: tokenAddress,
+            fee: v3Fee,
+            recipient: wallet.address,
+            deadline, // ✅ 旧版包含 deadline
+            amountIn: buyAmount,
+            amountOutMinimum: 0n,
+            sqrtPriceLimitX96: 0n
+        };
+        const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [swapParams]);
+        const refundETHData = v3RouterIface.encodeFunctionData('refundETH', []);
+        // ✅ 旧版 multicall：只有 bytes[] 参数
+        multicallData = v3RouterIface.encodeFunctionData('multicall(bytes[])', [
+            [exactInputSingleData, refundETHData]
+        ]);
+    }
+    else {
+        // ✅ 新版 SwapRouter02：swapParams 不含 deadline，multicall(uint256,bytes[])
+        const swapParams = {
+            tokenIn: wrappedNative,
+            tokenOut: tokenAddress,
+            fee: v3Fee,
+            recipient: wallet.address,
+            amountIn: buyAmount,
+            amountOutMinimum: 0n,
+            sqrtPriceLimitX96: 0n
+        };
+        const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [swapParams]);
+        const refundETHData = v3RouterIface.encodeFunctionData('refundETH', []);
+        // ✅ 新版 multicall：deadline 作为第一个参数
+        multicallData = v3RouterIface.encodeFunctionData('multicall(uint256,bytes[])', [
+            deadline,
+            [exactInputSingleData, refundETHData]
+        ]);
+    }
     const tx = {
         to: routerAddress,
         data: multicallData,

package/package.json

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