four-flap-meme-sdk 1.6.82 → 1.6.83

package/dist/xlayer/wash-ops.js

@@ -12,14 +12,15 @@
  * - 利润比例：PROFIT_CONFIG.RATE_BPS (40 bps = 0.4%)
  * - 利润接收者：PROFIT_CONFIG.RECIPIENT
  */
-import { ethers } from 'ethers';
+import { ethers, Contract, Interface } from 'ethers';
 import { createAAAccountManager, encodeExecute, createWallet } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, PortalQuery, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, DexQuery, } from './dex.js';
-import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, } from './constants.js';
+import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, MULTICALL3, } from './constants.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
-import { quoteV3 } from '../utils/quote-helpers.js';
+import { MULTICALL3_ABI, V3_QUOTER_ABI } from '../abis/common.js';
+import { QUOTE_CONFIG } from '../utils/quote-helpers.js';
 // ============================================================================
 // V3 报价工具函数
 // ============================================================================
@@ -83,6 +84,95 @@ async function quoteV3BuyViaSlot0(params) {
         return 0n;
     }
 }
+/**
+ * ✅ 使用 Multicall3 批量查询 V3 报价
+ * 将多个 quoteExactInputSingle 调用合并成一个 RPC 请求
+ */
+async function batchQuoteV3WithMulticall(params) {
+    const { rpcUrl, tokenIn, tokenOut, amountsIn, fee } = params;
+    // 过滤掉无效金额
+    if (!amountsIn.length)
+        return [];
+    const v3QuoterAddress = QUOTE_CONFIG.XLAYER.v3Quoter;
+    if (!v3QuoterAddress) {
+        console.warn('[batchQuoteV3WithMulticall] XLayer V3 Quoter 未配置');
+        return amountsIn.map(() => 0n);
+    }
+    const provider = new ethers.JsonRpcProvider(rpcUrl);
+    const quoterIface = new Interface(V3_QUOTER_ABI);
+    const multicallIface = new Interface(MULTICALL3_ABI);
+    // 构建所有报价调用
+    const calls = amountsIn.map((amountIn, idx) => {
+        if (amountIn <= 0n) {
+            // 对于无效金额，使用占位调用（会失败，但不影响其他调用）
+            return {
+                target: v3QuoterAddress,
+                allowFailure: true,
+                callData: quoterIface.encodeFunctionData('quoteExactInputSingle', [{
+                        tokenIn,
+                        tokenOut,
+                        amountIn: 0n,
+                        fee,
+                        sqrtPriceLimitX96: 0n
+                    }]),
+                originalIdx: idx,
+                originalAmount: amountIn,
+            };
+        }
+        return {
+            target: v3QuoterAddress,
+            allowFailure: true,
+            callData: quoterIface.encodeFunctionData('quoteExactInputSingle', [{
+                    tokenIn,
+                    tokenOut,
+                    amountIn,
+                    fee,
+                    sqrtPriceLimitX96: 0n
+                }]),
+            originalIdx: idx,
+            originalAmount: amountIn,
+        };
+    });
+    try {
+        const multicall3 = new Contract(MULTICALL3, MULTICALL3_ABI, provider);
+        const results = await multicall3.aggregate3.staticCall(calls.map(c => ({ target: c.target, allowFailure: c.allowFailure, callData: c.callData })));
+        // 解析结果
+        return results.map((result, idx) => {
+            if (!result.success || calls[idx].originalAmount <= 0n) {
+                return 0n;
+            }
+            try {
+                const decoded = quoterIface.decodeFunctionResult('quoteExactInputSingle', result.returnData);
+                return decoded[0];
+            }
+            catch {
+                return 0n;
+            }
+        });
+    }
+    catch (e) {
+        console.warn('[batchQuoteV3WithMulticall] Multicall3 失败，回退到串行查询:', e);
+        // 回退到串行查询
+        return await Promise.all(amountsIn.map(async (amountIn) => {
+            if (amountIn <= 0n)
+                return 0n;
+            try {
+                const quoter = new Contract(v3QuoterAddress, V3_QUOTER_ABI, provider);
+                const result = await quoter.quoteExactInputSingle.staticCall({
+                    tokenIn,
+                    tokenOut,
+                    amountIn,
+                    fee,
+                    sqrtPriceLimitX96: 0n
+                });
+                return (Array.isArray(result) ? result[0] : result);
+            }
+            catch {
+                return 0n;
+            }
+        }));
+    }
+}
 // ============================================================================
 // 工具函数
 // ============================================================================
@@ -169,24 +259,7 @@ export async function buildWashOps(params) {
     // ✅ 归一化配置，填充默认值（与前端 normalizeXLayerAAConfig 保持一致）
     const config = normalizeConfig(params.config);
     const aaManager = createAAAccountManager(config);
-    // ✅ V3 模式：直接从链上读取 lpFeeProfile 获取正确的 fee（与 bundleGraduateBuy 保持一致）
-    // 不再依赖前端传入的 v3Fee 参数，避免前端传入错误值导致交易失败
-    let v3Fee = params.v3Fee || 2500;
-    if (poolType === 'v3') {
-        try {
-            const portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
-            const tokenState = await portalQuery.getTokenV7(params.tokenAddress);
-            const correctV3Fee = lpFeeProfileToV3Fee(tokenState.lpFeeProfile);
-            if (correctV3Fee !== v3Fee) {
-                console.log(`[buildWashOps] V3 Fee 校正: 前端传入 ${v3Fee}, 链上 lpFeeProfile=${tokenState.lpFeeProfile} → 正确 fee=${correctV3Fee}`);
-            }
-            v3Fee = correctV3Fee;
-        }
-        catch (e) {
-            console.warn(`[buildWashOps] 读取 lpFeeProfile 失败，使用前端传入的 v3Fee=${v3Fee}:`, e);
-        }
-    }
-    // ✅ 预先过滤无效私钥并保持索引对应
+    // ✅ 预先过滤无效私钥并保持索引对应（同步操作，不需要等待）
     const validEntries = [];
     for (let i = 0; i < params.ownerPrivateKeys.length; i++) {
         const pk = String(params.ownerPrivateKeys[i] || '').trim();
@@ -206,8 +279,30 @@ export async function buildWashOps(params) {
     const ownerWallets = validEntries.map(e => createWallet(e.pk, config));
     const owners = ownerWallets.map(w => w.address);
     const buyAmountsOkb = validEntries.map(e => e.amount);
-    // 批量获取 accountInfo
-    const accounts = await aaManager.getMultipleAccountInfo(owners);
+    // ✅ 并行获取：账户信息 + V3 Fee（减少总等待时间）
+    let v3Fee = params.v3Fee || 2500;
+    const parallelTasks = [];
+    // 任务1：批量获取 accountInfo
+    const accountsPromise = aaManager.getMultipleAccountInfo(owners);
+    // 任务2：V3 模式下获取正确的 fee（与账户信息并行）
+    if (poolType === 'v3') {
+        parallelTasks.push((async () => {
+            try {
+                const portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
+                const tokenState = await portalQuery.getTokenV7(params.tokenAddress);
+                const correctV3Fee = lpFeeProfileToV3Fee(tokenState.lpFeeProfile);
+                if (correctV3Fee !== v3Fee) {
+                    console.log(`[buildWashOps] V3 Fee 校正: 前端传入 ${v3Fee}, 链上 lpFeeProfile=${tokenState.lpFeeProfile} → 正确 fee=${correctV3Fee}`);
+                }
+                v3Fee = correctV3Fee;
+            }
+            catch (e) {
+                console.warn(`[buildWashOps] 读取 lpFeeProfile 失败，使用前端传入的 v3Fee=${v3Fee}:`, e);
+            }
+        })());
+    }
+    // 等待所有并行任务完成
+    const [accounts] = await Promise.all([accountsPromise, ...parallelTasks]);
     // 确保 accounts 数量与 ownerWallets 匹配
     if (accounts.length !== ownerWallets.length) {
         console.error(`[buildWashOps] accounts 数量 (${accounts.length}) 与 ownerWallets 数量 (${ownerWallets.length}) 不匹配`);
@@ -267,19 +362,15 @@ export async function buildWashOps(params) {
         });
     }
     else if (poolType === 'v3') {
-        // ✅ V3 报价：使用 V3 Quoter（和 BSC 一样，考虑价格影响，获取准确报价）
+        // ✅ V3 报价：使用 Multicall3 批量查询（单次 RPC 请求获取所有钱包的报价）
         // PotatoSwap V3 QuoterV2: 0x5A6f3723346aF54a4D0693bfC1718D64d4915C3e
-        const provider = new ethers.JsonRpcProvider(config.rpcUrl, { chainId: config.chainId, name: 'xlayer' });
-        expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
-            if (buyWei <= 0n)
-                return 0n;
-            try {
-                const result = await quoteV3(provider, wokb, params.tokenAddress, buyWei, 'XLAYER', v3Fee);
-                return result.amountOut;
-            }
-            catch {
-                return 0n;
-            }
+        console.log(`[buildWashOps] V3 批量报价: ${buyWeiList.length} 个钱包, fee=${v3Fee}`);
+        expectedTokenAmounts = await batchQuoteV3WithMulticall({
+            rpcUrl: config.rpcUrl,
+            tokenIn: wokb,
+            tokenOut: params.tokenAddress,
+            amountsIn: buyWeiList,
+            fee: v3Fee,
         });
     }
     console.log(`[buildWashOps] 预测买入代币数量 (${poolType}):`, expectedTokenAmounts.map(a => a.toString()));

package/package.json

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