four-flap-meme-sdk 1.2.76 → 1.2.78

package/dist/contracts/tm-bundle-merkle/core.js

@@ -225,17 +225,12 @@ export async function batchBuyWithBundleMerkle(params) {
         throw new Error(getErrorMessage('KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(config.rpcUrl);
-    const buyers = createWallets(privateKeys, provider);
     const txType = getTxType(config);
-    // ✅ 优化：并行执行 gasPrice 获取和 nonce 预加载
-    const [gasPrice, nonceManager] = await Promise.all([
-        getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        (async () => {
-            const nm = new NonceManager(provider);
-            // 预加载所有钱包的 nonce（批量查询）
-            await Promise.all(buyers.map(w => nm.getNextNonce(w)));
-            return nm;
-        })()
+    const buyers = createWallets(privateKeys, provider);
+    // ✅ 优化：并行初始化 nonceManager 和获取 gasPrice
+    const [nonceManager, gasPrice] = await Promise.all([
+        Promise.resolve(new NonceManager(provider)),
+        getOptimizedGasPrice(provider, getGasPriceConfig(config))
     ]);
     const buyFlow = await executeBuyFlow({
         wallets: buyers,
@@ -261,17 +256,12 @@ export async function batchSellWithBundleMerkle(params) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(config.rpcUrl);
-    const sellers = createWallets(privateKeys, provider);
     const txType = getTxType(config);
-    // ✅ 优化：并行执行 gasPrice 获取和 nonce 预加载
-    const [gasPrice, nonceManager] = await Promise.all([
-        getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        (async () => {
-            const nm = new NonceManager(provider);
-            // 预加载所有钱包的 nonce（批量查询）
-            await Promise.all(sellers.map(w => nm.getNextNonce(w)));
-            return nm;
-        })()
+    const sellers = createWallets(privateKeys, provider);
+    // ✅ 优化：并行初始化 nonceManager 和获取 gasPrice
+    const [nonceManager, gasPrice] = await Promise.all([
+        Promise.resolve(new NonceManager(provider)),
+        getOptimizedGasPrice(provider, getGasPriceConfig(config))
     ]);
     const sellFlow = await executeSellFlow({
         wallets: sellers,

package/dist/flap/portal-bundle-merkle/core.js

@@ -128,21 +128,16 @@ export async function batchBuyWithBundleMerkle(params) {
         throw new Error(getErrorMessage('KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(chain, config.rpcUrl);
+    const nonceManager = new NonceManager(provider);
+    const signedTxs = [];
     const buyers = createWallets(privateKeys, provider);
     const extractProfit = shouldExtractProfit(config);
     const { fundsList, originalAmounts, totalBuyAmount, totalProfit } = analyzeBuyFunds(buyAmounts, config, extractProfit);
     const maxFundsIndex = findMaxIndex(originalAmounts);
     const gasLimits = buildGasLimitList(buyers.length, config);
-    const signedTxs = [];
-    // ✅ 优化：并行执行所有 RPC 调用（gasPrice + nonces + populateTransaction）
-    const [gasPrice, nonceManager, unsignedBuys] = await Promise.all([
+    // ✅ 优化：并行执行 gasPrice 和 populateBuyTransactions（最耗时的两个操作）
+    const [gasPrice, unsignedBuys] = await Promise.all([
         resolveGasPrice(provider, config),
-        (async () => {
-            const nm = new NonceManager(provider);
-            // 预加载所有钱包的 nonce（批量查询）
-            await Promise.all(buyers.map(w => nm.getNextNonce(w)));
-            return nm;
-        })(),
         populateBuyTransactions(buyers, FLAP_PORTAL_ADDRESSES[chain], tokenAddress, fundsList)
     ]);
     const buyerNonces = await allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager);
@@ -184,35 +179,28 @@ export async function batchSellWithBundleMerkle(params) {
         throw new Error(getErrorMessage('SELL_KEY_AMOUNT_MISMATCH'));
     }
     const { provider, chainId } = createChainContext(chain, config.rpcUrl);
+    const nonceManager = new NonceManager(provider);
+    const signedTxs = [];
     const wallets = createWallets(privateKeys, provider);
     const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, 18));
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const readOnlyPortal = new ethers.Contract(portalAddr, PORTAL_ABI, provider);
     const gasLimits = buildGasLimitList(wallets.length, config);
-    const signedTxs = [];
-    // ✅ 优化：并行执行所有 RPC 调用（gasPrice + nonces + quotes）
-    const [gasPrice, nonceManager, quotedOutputs] = await Promise.all([
+    // ✅ 优化：并行执行 gasPrice 和 quoteSellOutputs（最耗时的两个操作）
+    const [gasPrice, quotedOutputs] = await Promise.all([
         resolveGasPrice(provider, config),
-        (async () => {
-            const nm = new NonceManager(provider);
-            // 预加载所有钱包的 nonce（批量查询）
-            await Promise.all(wallets.map(w => nm.getNextNonce(w)));
-            return nm;
-        })(),
         quoteSellOutputs(readOnlyPortal, tokenAddress, amountsWei)
     ]);
     const minOuts = resolveMinOutputs(minOutputAmounts, wallets.length, quotedOutputs);
-    // ✅ 优化：使用单个 portal 实例生成所有 populateTransaction（避免重复创建合约实例）
-    const unsignedList = await Promise.all(wallets.map((_, i) => readOnlyPortal.swapExactInput.populateTransaction({
+    const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
+    const unsignedList = await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
         inputToken: tokenAddress,
         outputToken: ZERO_ADDRESS,
         inputAmount: amountsWei[i],
         minOutputAmount: minOuts[i],
         permitData: '0x'
     })));
-    // ✅ 优化：批量获取 nonces（已预加载，直接从缓存读取）
     const nonces = await Promise.all(wallets.map(w => nonceManager.getNextNonce(w)));
-    // ✅ 优化：批量签名交易
     const signedList = await Promise.all(unsignedList.map((unsigned, i) => wallets[i].signTransaction({
         ...unsigned,
         from: wallets[i].address,
@@ -288,15 +276,14 @@ function findMaxIndex(values) {
     return maxIndex;
 }
 async function populateBuyTransactions(buyers, portalAddr, tokenAddress, fundsList) {
-    // ✅ 优化：使用单个合约实例（避免重复创建）
-    const portal = new ethers.Contract(portalAddr, PORTAL_ABI, buyers[0]);
-    return await Promise.all(fundsList.map((funds) => portal.swapExactInput.populateTransaction({
+    const portals = buyers.map(wallet => new ethers.Contract(portalAddr, PORTAL_ABI, wallet));
+    return await Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
         inputToken: ZERO_ADDRESS,
         outputToken: tokenAddress,
-        inputAmount: funds,
+        inputAmount: fundsList[i],
         minOutputAmount: 0n,
         permitData: '0x'
-    }, { value: funds })));
+    }, { value: fundsList[i] })));
 }
 function buildGasLimitList(length, config) {
     const gasLimit = getGasLimit(config);

package/dist/utils/erc20.js

@@ -502,51 +502,56 @@ export async function approveTokenBatchRaw(params) {
     // 验证地址
     await validateContractAddress(provider, normalizedToken, 'Token');
     await validateContractAddress(provider, normalizedSpender, 'Spender');
-    const results = [];
-    let approvedCount = 0;
-    let errorCount = 0;
-    for (let i = 0; i < privateKeys.length; i++) {
-        const signer = new Wallet(privateKeys[i], provider);
-        const ownerAddress = signer.address;
-        const requiredAmount = amounts[i] === 'max'
-            ? BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
-            : amounts[i];
+    // ✅ 优化：批量创建钱包和合约实例
+    const wallets = privateKeys.map(key => new Wallet(key, provider));
+    const ownerAddresses = wallets.map(w => w.address);
+    const requiredAmounts = amounts.map(amount => amount === 'max'
+        ? BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
+        : amount);
+    // ✅ 优化：并行检查所有钱包的授权额度
+    const currentAllowances = await batchCheckAllowances(provider, normalizedToken, ownerAddresses, normalizedSpender);
+    // ✅ 优化：并行发送所有需要授权的交易
+    const approvalPromises = wallets.map(async (wallet, i) => {
+        const ownerAddress = ownerAddresses[i];
+        const currentAllowance = currentAllowances[i];
+        const requiredAmount = requiredAmounts[i];
         try {
-            const erc20 = new Contract(normalizedToken, ERC20_ABI, signer);
-            // 检查当前授权
-            const currentAllowance = await erc20.allowance(ownerAddress, normalizedSpender);
+            // 如果已经授权足够，跳过
             if (currentAllowance >= requiredAmount) {
-                results.push({
+                return {
                     owner: ownerAddress,
                     alreadyApproved: true,
                     currentAllowance,
                     requiredAllowance: requiredAmount
-                });
-                continue;
+                };
             }
             // 发送授权交易
+            const erc20 = new Contract(normalizedToken, ERC20_ABI, wallet);
             const tx = await erc20.approve(normalizedSpender, requiredAmount);
             const receipt = await tx.wait();
-            results.push({
+            return {
                 owner: ownerAddress,
                 alreadyApproved: false,
                 currentAllowance,
                 requiredAllowance: requiredAmount,
                 txHash: receipt.hash
-            });
-            approvedCount++;
+            };
         }
         catch (error) {
-            results.push({
+            return {
                 owner: ownerAddress,
                 alreadyApproved: false,
-                currentAllowance: 0n,
+                currentAllowance,
                 requiredAllowance: requiredAmount,
                 error: error.message
-            });
-            errorCount++;
+            };
         }
-    }
+    });
+    // ✅ 优化：并行等待所有授权交易完成
+    const results = await Promise.all(approvalPromises);
+    // 统计结果
+    const approvedCount = results.filter(r => !r.alreadyApproved && !r.error).length;
+    const errorCount = results.filter(r => r.error).length;
     // ✅ 只要没有错误，就算成功（包括所有钱包都已授权的情况）
     return {
         success: errorCount === 0,

package/package.json

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