four-flap-meme-sdk 1.3.81 → 1.3.82

package/dist/utils/lp-inspect.js

@@ -103,18 +103,15 @@ export async function getFactoryFromRouter(routerAddress, rpcUrl, routerType = '
         else {
             // V3 SwapRouter02 可能同时有 V2 和 V3 Factory
             const router = new Contract(routerAddress, V3_ROUTER_ABI, provider);
-            // 尝试获取 V3 Factory
-            try {
-                result.v3Factory = await router.factory();
-            }
-            catch {
-            }
-            // 尝试获取 V2 Factory
-            try {
-                result.v2Factory = await router.factoryV2();
-            }
-            catch {
-            }
+            // ✅ 并行获取 V3 和 V2 Factory
+            const [v3Factory, v2Factory] = await Promise.all([
+                router.factory().catch(() => undefined),
+                router.factoryV2().catch(() => undefined)
+            ]);
+            if (v3Factory)
+                result.v3Factory = v3Factory;
+            if (v2Factory)
+                result.v2Factory = v2Factory;
         }
     }
     catch (error) {
@@ -590,35 +587,42 @@ async function queryV2Pairs(token, factoryAddress, quoteTokens, provider, multic
     return results;
 }
 async function queryV2PairsFallback(token, factoryAddress, quoteTokens, provider, tokenDecimals, shouldFormat) {
-    const results = [];
     const factory = new Contract(factoryAddress, I_UNIV2_FACTORY_ABI, provider);
-    for (const qt of quoteTokens) {
+    // ✅ 并行查询所有 quoteToken 的交易对
+    const pairResults = await Promise.all(quoteTokens.map(async (qt) => {
         try {
             const pairAddress = await factory.getPair(token, qt.address);
-            if (pairAddress && pairAddress.toLowerCase() !== ZERO_ADDRESS) {
-                const pair = new Contract(pairAddress, I_UNIV2_PAIR_ABI, provider);
-                const [token0, token1] = await Promise.all([pair.token0(), pair.token1()]);
-                const [r0, r1] = await pair.getReserves();
-                const isToken0 = token0.toLowerCase() === token.toLowerCase();
-                const reserveToken = isToken0 ? r0 : r1;
-                const reserveQuote = isToken0 ? r1 : r0;
-                results.push({
-                    quoteToken: qt.address,
-                    quoteSymbol: qt.symbol,
-                    quoteDecimals: qt.decimals,
-                    pairAddress,
-                    reserveToken: formatBalance(reserveToken, shouldFormat, tokenDecimals),
-                    reserveQuote: formatBalance(reserveQuote, shouldFormat, qt.decimals),
-                    reserveQuoteRaw: reserveQuote,
-                    reserveTokenRaw: reserveToken, // ✅ 新增
-                });
+            if (!pairAddress || pairAddress.toLowerCase() === ZERO_ADDRESS) {
+                return null;
             }
+            const pair = new Contract(pairAddress, I_UNIV2_PAIR_ABI, provider);
+            // ✅ 并行获取 token0、token1 和 reserves
+            const [token0, token1, reserves] = await Promise.all([
+                pair.token0(),
+                pair.token1(),
+                pair.getReserves()
+            ]);
+            const [r0, r1] = reserves;
+            const isToken0 = token0.toLowerCase() === token.toLowerCase();
+            const reserveToken = isToken0 ? r0 : r1;
+            const reserveQuote = isToken0 ? r1 : r0;
+            return {
+                quoteToken: qt.address,
+                quoteSymbol: qt.symbol,
+                quoteDecimals: qt.decimals,
+                pairAddress,
+                reserveToken: formatBalance(reserveToken, shouldFormat, tokenDecimals),
+                reserveQuote: formatBalance(reserveQuote, shouldFormat, qt.decimals),
+                reserveQuoteRaw: reserveQuote,
+                reserveTokenRaw: reserveToken,
+            };
         }
         catch {
-            // 跳过失败的查询
+            return null;
         }
-    }
-    return results;
+    }));
+    // 过滤掉 null 结果
+    return pairResults.filter((r) => r !== null);
 }
 // ============================================================================
 // V3 批量查询
@@ -715,43 +719,51 @@ async function queryV3Pools(token, factoryAddress, quoteTokens, feeTiers, provid
     return results;
 }
 async function queryV3PoolsFallback(token, factoryAddress, quoteTokens, feeTiers, provider, tokenDecimals, shouldFormat) {
-    const results = [];
     const factory = new Contract(factoryAddress, I_UNIV3_FACTORY_ABI, provider);
     const tokenContract = new Contract(token, I_ERC20_ABI, provider);
+    // ✅ 构建所有查询组合
+    const queries = [];
     for (const qt of quoteTokens) {
-        const quoteContract = new Contract(qt.address, I_ERC20_ABI, provider);
+        const tokenLower = token.toLowerCase();
+        const quoteLower = qt.address.toLowerCase();
+        const [token0, token1] = tokenLower < quoteLower
+            ? [tokenLower, quoteLower]
+            : [quoteLower, tokenLower];
         for (const fee of feeTiers) {
-            try {
-                const tokenLower = token.toLowerCase();
-                const quoteLower = qt.address.toLowerCase();
-                const [token0, token1] = tokenLower < quoteLower
-                    ? [tokenLower, quoteLower]
-                    : [quoteLower, tokenLower];
-                const poolAddress = await factory.getPool(token0, token1, fee);
-                if (poolAddress && poolAddress.toLowerCase() !== ZERO_ADDRESS) {
-                    const [tokenBalance, quoteBalance] = await Promise.all([
-                        tokenContract.balanceOf(poolAddress),
-                        quoteContract.balanceOf(poolAddress),
-                    ]);
-                    results.push({
-                        quoteToken: qt.address,
-                        quoteSymbol: qt.symbol,
-                        quoteDecimals: qt.decimals,
-                        pairAddress: poolAddress,
-                        reserveToken: formatBalance(tokenBalance, shouldFormat, tokenDecimals),
-                        reserveQuote: formatBalance(quoteBalance, shouldFormat, qt.decimals),
-                        reserveQuoteRaw: quoteBalance,
-                        reserveTokenRaw: tokenBalance, // ✅ 新增
-                        fee,
-                    });
-                }
-            }
-            catch {
-                // 跳过失败的查询
-            }
+            queries.push({ qt, fee, token0, token1 });
         }
     }
-    return results;
+    // ✅ 并行查询所有池子
+    const poolResults = await Promise.all(queries.map(async ({ qt, fee, token0, token1 }) => {
+        try {
+            const poolAddress = await factory.getPool(token0, token1, fee);
+            if (!poolAddress || poolAddress.toLowerCase() === ZERO_ADDRESS) {
+                return null;
+            }
+            const quoteContract = new Contract(qt.address, I_ERC20_ABI, provider);
+            // ✅ 并行获取余额
+            const [tokenBalance, quoteBalance] = await Promise.all([
+                tokenContract.balanceOf(poolAddress),
+                quoteContract.balanceOf(poolAddress),
+            ]);
+            return {
+                quoteToken: qt.address,
+                quoteSymbol: qt.symbol,
+                quoteDecimals: qt.decimals,
+                pairAddress: poolAddress,
+                reserveToken: formatBalance(tokenBalance, shouldFormat, tokenDecimals),
+                reserveQuote: formatBalance(quoteBalance, shouldFormat, qt.decimals),
+                reserveQuoteRaw: quoteBalance,
+                reserveTokenRaw: tokenBalance,
+                fee,
+            };
+        }
+        catch {
+            return null;
+        }
+    }));
+    // 过滤掉 null 结果
+    return poolResults.filter((r) => r !== null);
 }
 // ============================================================================
 // 平台类型判断

package/dist/utils/stealth-transfer.js

@@ -52,12 +52,9 @@ async function _stealthTransferInternal(params) {
     if (rootBal < needed) {
         throw new Error(`insufficient balance: need ${needed.toString()}, have ${rootBal.toString()}`);
     }
-    // 预取 nonce（pending）
-    const nonces = [];
-    nonces.push(await provider.getTransactionCount(rootAddr, 'pending'));
-    for (const w of hops) {
-        nonces.push(await provider.getTransactionCount(w.address, 'pending'));
-    }
+    // ✅ 并行预取所有 nonce
+    const allAddresses = [rootAddr, ...hops.map(w => w.address)];
+    const nonces = await Promise.all(allAddresses.map(addr => provider.getTransactionCount(addr, 'pending')));
     const signed = [];
     const hopAddresses = [];
     if (mode !== 'erc20') {
@@ -73,14 +70,14 @@ async function _stealthTransferInternal(params) {
             type: 0,
         });
         signed.push(fundTx);
-        // 2) 每一跳按顺序转发
-        for (let i = 0; i < hops.length; i++) {
+        // 2) ✅ 并行签名所有跳转交易
+        const hopTxs = await Promise.all(hops.map(async (hop, i) => {
             const isLast = i === hops.length - 1;
             const nextTo = isLast ? finalTo : hops[i + 1].address;
             const remain = BigInt(hops.length - 1 - i);
             const value = isLast ? amountWei : amountWei + perHopFee * remain;
-            hopAddresses.push(hops[i].address);
-            const tx = await hops[i].signTransaction({
+            hopAddresses.push(hop.address);
+            return hop.signTransaction({
                 to: nextTo,
                 value,
                 nonce: nonces[i + 1],
@@ -89,61 +86,61 @@ async function _stealthTransferInternal(params) {
                 chainId,
                 type: 0,
             });
-            signed.push(tx);
-        }
+        }));
+        signed.push(...hopTxs);
     }
     else {
         // ============== ERC20 代币多跳路径 ==============
-        // 为每个 hop 预先注入 gas 费（root -> hop[i]），每个 hop 只需要发送一笔 ERC20 transfer
-        let currNonce = nonces[0];
-        for (let i = 0; i < hops.length; i++) {
-            hopAddresses.push(hops[i].address);
-            const fund = await root.signTransaction({
-                to: hops[i].address,
-                value: (erc20?.transferGasLimit ?? 65000n) * gasPrice, // 覆盖该 hop 的代币转账 gas
-                nonce: currNonce++,
-                gasPrice,
-                gasLimit,
-                chainId,
-                type: 0,
-            });
-            signed.push(fund);
-        }
+        const erc20Iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
+        const transferGas = erc20?.transferGasLimit ?? 65000n;
+        // 填充 hopAddresses
+        hops.forEach(hop => hopAddresses.push(hop.address));
+        // ✅ 并行签名所有 gas 注资交易（root -> hop[i]）
+        const fundTxs = await Promise.all(hops.map((hop, i) => root.signTransaction({
+            to: hop.address,
+            value: transferGas * gasPrice,
+            nonce: nonces[0] + i,
+            gasPrice,
+            gasLimit,
+            chainId,
+            type: 0,
+        })));
+        signed.push(...fundTxs);
         // 代币持有者：可选独立私钥，未提供则用 root
         const tokenOwner = (erc20?.holderPrivateKey && erc20.holderPrivateKey.length > 0)
             ? new ethers.Wallet(erc20.holderPrivateKey, provider)
             : root;
-        // tokenOwner -> hop0: ERC20 transfer 全量 token（amountWei 解释为代币数量）
-        const erc20Iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
+        // tokenOwner -> hop0: ERC20 transfer 全量 token
         const callDataRoot = erc20Iface.encodeFunctionData('transfer', [hops[0].address, amountWei]);
+        const rootTokenNonce = nonces[0] + hops.length;
         const erc20TxRoot = await tokenOwner.signTransaction({
             to: erc20.address,
             data: callDataRoot,
             value: 0n,
-            nonce: currNonce++,
+            nonce: rootTokenNonce,
             gasPrice,
-            gasLimit: erc20?.transferGasLimit ?? 65000n,
+            gasLimit: transferGas,
             chainId,
             type: 0,
         });
         signed.push(erc20TxRoot);
-        // hop[i] -> next: ERC20 transfer，最后一跳 -> finalTo
-        for (let i = 0; i < hops.length; i++) {
+        // ✅ 并行签名所有 hop 的 ERC20 transfer
+        const hopTokenTxs = await Promise.all(hops.map((hop, i) => {
             const isLast = i === hops.length - 1;
             const nextTo = isLast ? finalTo : hops[i + 1].address;
             const callData = erc20Iface.encodeFunctionData('transfer', [nextTo, amountWei]);
-            const tx = await hops[i].signTransaction({
+            return hop.signTransaction({
                 to: erc20.address,
                 data: callData,
                 value: 0n,
                 nonce: nonces[i + 1],
                 gasPrice,
-                gasLimit: erc20?.transferGasLimit ?? 65000n,
+                gasLimit: transferGas,
                 chainId,
                 type: 0,
             });
-            signed.push(tx);
-        }
+        }));
+        signed.push(...hopTokenTxs);
     }
     // 3) Bundle 提交
     const club48 = new Club48Client({ endpoint: bundleEndpoint });

package/dist/utils/swap-helpers.js

@@ -112,20 +112,24 @@ export async function calculateSellAmount(provider, tokenAddress, walletAddress,
     if (sellAmount && sellPercentage) {
         throw new Error('sellAmount 和 sellPercentage 不能同时指定');
     }
-    const decimals = await getTokenDecimals(provider, tokenAddress);
-    // 精确数量
+    // 精确数量：只需要 decimals
     if (sellAmount) {
+        const decimals = await getTokenDecimals(provider, tokenAddress);
         return {
             amount: ethers.parseUnits(sellAmount, decimals),
             decimals
         };
     }
-    // 百分比
+    // 百分比：需要 decimals 和 balance
     if (sellPercentage !== undefined) {
         if (sellPercentage <= 0 || sellPercentage > 100) {
             throw new Error('sellPercentage 必须在 0-100 之间');
         }
-        const balance = await getTokenBalance(provider, tokenAddress, walletAddress);
+        // ✅ 并行获取 decimals 和 balance
+        const [decimals, balance] = await Promise.all([
+            getTokenDecimals(provider, tokenAddress),
+            getTokenBalance(provider, tokenAddress, walletAddress)
+        ]);
         const amount = (balance * BigInt(Math.floor(sellPercentage * 100))) / 10000n;
         return { amount, decimals };
     }

package/package.json

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