four-flap-meme-sdk 1.5.74 → 1.5.75

package/dist/xlayer/bundle.js

@@ -8,13 +8,12 @@
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
 import { Wallet, Interface, Contract, ethers } from 'ethers';
-import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, WOKB, POTATOSWAP_V2_ROUTER, } from './constants.js';
+import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
 import { AAAccountManager, encodeExecute, encodeExecuteBatch, createWallet } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { DexQuery } from './dex.js';
-import { encodeSwapExactETHForTokensSupportingFee, } from './dex.js';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -1470,9 +1469,11 @@ export class BundleExecutor {
             // ✅ 并行构建和签名所有外盘买入 UserOps
             const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
                 const { wallet, info, buyWei } = data;
-                // ✅ 外盘买入：用 OKB 买代币，不需要 approve，直接调用 Router 的 swap 方法
-                const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
-                const dexBuyCallData = encodeExecute(POTATOSWAP_V2_ROUTER, buyWei, swapData);
+                // ✅ 外盘买入：使用 Portal 的 swapExactInput 进行自动路由
+                // 优势：Portal 会自动识别代币的池子类型（V2/V3），无需手动指定
+                // 参考 BSC 版本的逻辑（create-to-dex.ts:604-616）
+                const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
+                const dexBuyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
                 const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
@@ -1480,7 +1481,7 @@ export class BundleExecutor {
                     nonce: nonceMap.next(info.sender),
                     initCode: '0x', // HandleOps1 已部署
                     deployed: true,
-                    fixedGas: { callGasLimit: 600000n }
+                    fixedGas: { callGasLimit: 800000n } // ✅ 提高到 800K，外盘买入可能需要更多 gas
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;
@@ -1634,23 +1635,24 @@ export class BundleExecutor {
                 nonceMap.init(info.sender, info.nonce);
                 return info;
             });
-            const deadline = Math.floor(Date.now() / 1000) + 3600; // ✅ 60 min (修复 DeadlineExceeded 错误)
-            console.log(`[DeadlineDebug] bundleGraduateBuy: current=${Math.floor(Date.now() / 1000)}, deadline=${deadline}, buffer=${3600}s`);
+            // ✅ 移除 deadline：Portal 的 swapExactInput 内部会处理 deadline
+            // console.log 也不再需要
             const signedDexBuyOps = await mapWithConcurrency(dexBuyers, 5, async (data, i) => {
                 const { wallet, amount } = data;
                 const info = dexBuyerInfos[i];
                 totalDexBuyWei += amount;
-                const approveData = encodeApproveCall(POTATOSWAP_V2_ROUTER);
-                const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
-                const batchCallData = encodeExecuteBatch([tokenAddress, POTATOSWAP_V2_ROUTER], [0n, amount], [approveData, swapData]);
+                // ✅ 使用 Portal 的 swapExactInput 进行自动路由（OKB -> 代币）
+                // 优势：自动识别池子类型（V2/V3），无需 approve（OKB 是原生币）
+                const buyData = encodeBuyCall(tokenAddress, amount, 0n);
+                const dexBuyCallData = encodeExecute(FLAP_PORTAL, amount, buyData);
                 const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
-                    callData: batchCallData,
+                    callData: dexBuyCallData,
                     nonce: nonceMap.next(info.sender),
                     initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
                     deployed: info.deployed,
-                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 600000n }
+                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 800000n } // ✅ 提高到 800K
                 });
                 const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
                 return signedDexBuyOp.userOp;

package/package.json

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