four-flap-meme-sdk 1.4.24 → 1.4.25

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

@@ -893,7 +893,7 @@ export async function sweepWithBundleMerkle(params) {
     }
     else {
         // ========== 有多跳：构建跳转链归集 ==========
-        // 分离有跳转和无跳转的地址（不需要 RPC）
+        // ✅ 优化版：批量计算 + 批量获取 nonce + 并行签名
         const sourceWallets = actualKeys.map(pk => new Wallet(pk, provider));
         const withHopIndexes = [];
         const withoutHopIndexes = [];
@@ -906,7 +906,7 @@ export async function sweepWithBundleMerkle(params) {
             }
         }
         const sourceAddresses = sourceWallets.map(w => w.address);
-        // ✅ 优化：并行获取 gasPrice、decimals、余额（传入 chainIdNum 避免 NETWORK_ERROR）
+        // ✅ 优化：并行获取 gasPrice、decimals、余额
         const [gasPrice, decimals, balances, bnbBalances] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
             isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum)),
@@ -916,122 +916,107 @@ export async function sweepWithBundleMerkle(params) {
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
         const nonceManager = new NonceManager(provider);
-        // ✅ 用于记录每个钱包的归集金额（用于计算利润）
+        // ✅ 用于记录每个钱包的归集金额
         const sweepAmounts = new Array(sourceWallets.length).fill(0n);
-        // 处理无跳转的地址（批量）
-        if (withoutHopIndexes.length > 0) {
-            for (let idx = 0; idx < withoutHopIndexes.length; idx++) {
-                const i = withoutHopIndexes[idx];
-                const sourceWallet = sourceWallets[i];
-                const bal = balances[i];
-                let toSend = 0n;
-                if (isNative) {
-                    const gasCost = nativeGasLimit * gasPrice;
-                    const ratioForI = (() => {
-                        if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                            return clamp(sources[i].ratioPct);
-                        if (ratios && ratios[i] !== undefined)
-                            return clamp(ratios[i]);
-                        return ratio;
-                    })();
-                    const amountStrForI = (() => {
-                        if (sources && sources[i] && sources[i].amount !== undefined)
-                            return String(sources[i].amount);
-                        if (amounts && amounts[i] !== undefined)
-                            return String(amounts[i]);
-                        return amount !== undefined ? String(amount) : undefined;
-                    })();
-                    if (ratioForI !== undefined) {
-                        const want = (bal * BigInt(ratioForI)) / 100n;
-                        const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
-                        toSend = want > maxSendable ? maxSendable : want;
-                    }
-                    else if (amountStrForI && amountStrForI.trim().length > 0) {
-                        const amt = ethers.parseEther(amountStrForI);
-                        const need = amt + gasCost;
-                        if (!skipIfInsufficient || bal >= need)
-                            toSend = amt;
-                    }
-                    if (toSend > 0n) {
-                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
-                        totalAmountBeforeProfit += toSend;
-                        const nonce = await nonceManager.getNextNonce(sourceWallet);
-                        const tx = await sourceWallet.signTransaction({
-                            to: target,
-                            value: toSend,
-                            nonce,
-                            gasPrice,
-                            gasLimit: nativeGasLimit,
-                            chainId: chainIdNum,
-                            type: txType
-                        });
-                        signedTxs.push(tx);
-                    }
+        // ✅ 辅助函数：获取比例和金额
+        const getRatioForI = (i) => {
+            if (sources && sources[i] && sources[i].ratioPct !== undefined)
+                return clamp(sources[i].ratioPct);
+            if (ratios && ratios[i] !== undefined)
+                return clamp(ratios[i]);
+            return ratio;
+        };
+        const getAmountStrForI = (i) => {
+            if (sources && sources[i] && sources[i].amount !== undefined)
+                return String(sources[i].amount);
+            if (amounts && amounts[i] !== undefined)
+                return String(amounts[i]);
+            return amount !== undefined ? String(amount) : undefined;
+        };
+        const noHopTxDataList = [];
+        for (const i of withoutHopIndexes) {
+            const bal = balances[i];
+            let toSend = 0n;
+            const ratioForI = getRatioForI(i);
+            const amountStrForI = getAmountStrForI(i);
+            if (isNative) {
+                const gasCost = nativeGasLimit * gasPrice;
+                if (ratioForI !== undefined) {
+                    const want = (bal * BigInt(ratioForI)) / 100n;
+                    const maxSendable = bal > gasCost ? (bal - gasCost) : 0n;
+                    toSend = want > maxSendable ? maxSendable : want;
                 }
-                else {
-                    const ratioForI = (() => {
-                        if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                            return clamp(sources[i].ratioPct);
-                        if (ratios && ratios[i] !== undefined)
-                            return clamp(ratios[i]);
-                        return ratio;
-                    })();
-                    const amountStrForI = (() => {
-                        if (sources && sources[i] && sources[i].amount !== undefined)
-                            return String(sources[i].amount);
-                        if (amounts && amounts[i] !== undefined)
-                            return String(amounts[i]);
-                        return amount !== undefined ? String(amount) : undefined;
-                    })();
-                    if (ratioForI !== undefined) {
-                        toSend = (bal * BigInt(ratioForI)) / 100n;
-                    }
-                    else if (amountStrForI && amountStrForI.trim().length > 0) {
-                        toSend = ethers.parseUnits(amountStrForI, decimals);
-                    }
-                    if (toSend > 0n && (!skipIfInsufficient || bal >= toSend)) {
-                        sweepAmounts[i] = toSend; // ✅ 记录归集金额
-                        totalAmountBeforeProfit += toSend;
-                        const nonce = await nonceManager.getNextNonce(sourceWallet);
-                        const data = iface.encodeFunctionData('transfer', [target, toSend]);
-                        const tx = await sourceWallet.signTransaction({
-                            to: tokenAddress,
-                            data,
-                            value: 0n,
-                            nonce,
-                            gasPrice,
-                            gasLimit: finalGasLimit,
-                            chainId: chainIdNum,
-                            type: txType
-                        });
-                        signedTxs.push(tx);
-                    }
+                else if (amountStrForI && amountStrForI.trim().length > 0) {
+                    const amt = ethers.parseEther(amountStrForI);
+                    const need = amt + gasCost;
+                    if (!skipIfInsufficient || bal >= need)
+                        toSend = amt;
                 }
             }
+            else {
+                if (ratioForI !== undefined) {
+                    toSend = (bal * BigInt(ratioForI)) / 100n;
+                }
+                else if (amountStrForI && amountStrForI.trim().length > 0) {
+                    toSend = ethers.parseUnits(amountStrForI, decimals);
+                }
+                if (skipIfInsufficient && bal < toSend)
+                    toSend = 0n;
+            }
+            if (toSend > 0n) {
+                sweepAmounts[i] = toSend;
+                totalAmountBeforeProfit += toSend;
+                noHopTxDataList.push({ index: i, wallet: sourceWallets[i], toSend });
+            }
+        }
+        // ========== 第2步：批量获取无跳转钱包的 nonces ==========
+        const noHopWallets = noHopTxDataList.map(d => d.wallet);
+        const noHopNonces = noHopWallets.length > 0
+            ? await nonceManager.getNextNoncesForWallets(noHopWallets)
+            : [];
+        // ========== 第3步：并行签名无跳转交易 ==========
+        const noHopTxPromises = noHopTxDataList.map((data, idx) => {
+            const { wallet, toSend } = data;
+            const nonce = noHopNonces[idx];
+            if (isNative) {
+                return wallet.signTransaction({
+                    to: target,
+                    value: toSend,
+                    nonce,
+                    gasPrice,
+                    gasLimit: nativeGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+            }
+            else {
+                const txData = iface.encodeFunctionData('transfer', [target, toSend]);
+                return wallet.signTransaction({
+                    to: tokenAddress,
+                    data: txData,
+                    value: 0n,
+                    nonce,
+                    gasPrice,
+                    gasLimit: finalGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+            }
+        });
+        if (noHopTxPromises.length > 0) {
+            const noHopSignedTxs = await Promise.all(noHopTxPromises);
+            signedTxs.push(...noHopSignedTxs);
         }
-        // 处理有跳转的地址
+        const hopTxDataList = [];
         for (const i of withHopIndexes) {
             const sourceWallet = sourceWallets[i];
             const hopChain = preparedHops[i];
-            // 计算要归集的金额
-            let toSend = 0n;
             const bal = balances[i];
+            let toSend = 0n;
+            const ratioForI = getRatioForI(i);
+            const amountStrForI = getAmountStrForI(i);
             if (isNative) {
                 const totalGasCost = finalGasLimit * gasPrice * BigInt(hopChain.length + 1);
-                const ratioForI = (() => {
-                    if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                        return clamp(sources[i].ratioPct);
-                    if (ratios && ratios[i] !== undefined)
-                        return clamp(ratios[i]);
-                    return ratio;
-                })();
-                const amountStrForI = (() => {
-                    if (sources && sources[i] && sources[i].amount !== undefined)
-                        return String(sources[i].amount);
-                    if (amounts && amounts[i] !== undefined)
-                        return String(amounts[i]);
-                    return amount !== undefined ? String(amount) : undefined;
-                })();
                 if (ratioForI !== undefined) {
                     const want = (bal * BigInt(ratioForI)) / 100n;
                     const maxSendable = bal > totalGasCost ? (bal - totalGasCost) : 0n;
@@ -1045,25 +1030,10 @@ export async function sweepWithBundleMerkle(params) {
                 }
             }
             else {
-                // ERC20：检查 BNB 余额是否足够支付 gas
                 const bnbBal = bnbBalances[i];
                 const bnbNeeded = (gasFeePerHop * BigInt(hopChain.length)) + (finalGasLimit * gasPrice);
                 if (bnbBal < bnbNeeded && skipIfInsufficient)
                     continue;
-                const ratioForI = (() => {
-                    if (sources && sources[i] && sources[i].ratioPct !== undefined)
-                        return clamp(sources[i].ratioPct);
-                    if (ratios && ratios[i] !== undefined)
-                        return clamp(ratios[i]);
-                    return ratio;
-                })();
-                const amountStrForI = (() => {
-                    if (sources && sources[i] && sources[i].amount !== undefined)
-                        return String(sources[i].amount);
-                    if (amounts && amounts[i] !== undefined)
-                        return String(amounts[i]);
-                    return amount !== undefined ? String(amount) : undefined;
-                })();
                 if (ratioForI !== undefined) {
                     toSend = (bal * BigInt(ratioForI)) / 100n;
                 }
@@ -1075,76 +1045,96 @@ export async function sweepWithBundleMerkle(params) {
             }
             if (toSend <= 0n)
                 continue;
-            // ✅ 记录归集金额
             sweepAmounts[i] = toSend;
             totalAmountBeforeProfit += toSend;
-            // 构建跳转链: 子钱包 -> 中转1 -> 中转2 -> ... -> 目标地址
             const fullChain = [sourceWallet, ...hopChain.map(pk => new Wallet(pk, provider))];
             const addresses = [...fullChain.map(w => w.address), target];
+            hopTxDataList.push({ index: i, sourceWallet, toSend, hopChain, fullChain, addresses });
+        }
+        // ========== 第5步：计算每个有跳转钱包需要的 nonce 数量并批量获取 ==========
+        // 每个源钱包需要的 nonce 数量：
+        // - ERC20: hopChain.length (gas费交易) + 1 (主转账)
+        // - Native: 1 (主转账)
+        const hopNonceNeeds = hopTxDataList.map(d => isNative ? 1 : d.hopChain.length + 1);
+        const hopSourceWallets = hopTxDataList.map(d => d.sourceWallet);
+        // ✅ 批量获取所有有跳转钱包的 nonces
+        const hopNoncesFlat = [];
+        if (hopSourceWallets.length > 0) {
+            const batchNoncePromises = hopSourceWallets.map((w, idx) => nonceManager.getNextNonceBatch(w, hopNonceNeeds[idx]));
+            const batchNonces = await Promise.all(batchNoncePromises);
+            batchNonces.forEach(nonces => hopNoncesFlat.push(...nonces));
+        }
+        const hopTxsToSign = [];
+        let nonceOffset = 0;
+        for (let dataIdx = 0; dataIdx < hopTxDataList.length; dataIdx++) {
+            const { sourceWallet, toSend, hopChain, fullChain, addresses } = hopTxDataList[dataIdx];
+            const nonceCount = hopNonceNeeds[dataIdx];
+            const nonces = hopNoncesFlat.slice(nonceOffset, nonceOffset + nonceCount);
+            nonceOffset += nonceCount;
+            let nonceIdx = 0;
             // ERC20 多跳：先给中转钱包转 gas 费
             if (!isNative) {
-                const gasNonces = await nonceManager.getNextNonceBatch(sourceWallet, hopChain.length);
-                const gasTxs = [];
                 for (let j = 0; j < hopChain.length; j++) {
-                    const tx = await sourceWallet.signTransaction({
-                        to: fullChain[j + 1].address,
-                        value: gasFeePerHop,
-                        nonce: gasNonces[j],
-                        gasPrice,
-                        gasLimit: nativeGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: sourceWallet,
+                        tx: {
+                            to: fullChain[j + 1].address,
+                            value: gasFeePerHop,
+                            nonce: nonces[nonceIdx++],
+                            gasPrice,
+                            gasLimit: nativeGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    gasTxs.push(tx);
                 }
-                signedTxs.push(...gasTxs);
             }
             // 执行主要的归集链
             for (let j = 0; j < addresses.length - 1; j++) {
                 const fromWallet = fullChain[j];
                 const toAddress = addresses[j + 1];
-                // 使用 NonceManager：源钱包查询，中转钱包从 0 开始
-                const nonce = j === 0
-                    ? await nonceManager.getNextNonce(sourceWallet)
-                    : 0;
+                const nonce = j === 0 ? nonces[nonceIdx++] : 0;
                 if (isNative) {
-                    // 原生币归集：每一跳需要附加后续跳数的gas费
-                    // toSend = 最终主钱包收到的净金额
-                    // 剩余跳数 = 还需要几跳才能到目标地址
                     const remainingHops = addresses.length - 2 - j;
                     const additionalGas = gasFeePerHop * BigInt(remainingHops);
                     const valueToTransfer = toSend + additionalGas;
-                    // 示例：hopCount=1（2跳），toSend=0.002874
-                    // j=0: 子钱包->中转1，剩余1跳，转 0.002874 + 1*gas = 0.002937
-                    // j=1: 中转1->主钱包，剩余0跳，转 0.002874 + 0 = 0.002874
-                    const tx = await fromWallet.signTransaction({
-                        to: toAddress,
-                        value: valueToTransfer,
-                        nonce,
-                        gasPrice,
-                        gasLimit: finalGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: fromWallet,
+                        tx: {
+                            to: toAddress,
+                            value: valueToTransfer,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    signedTxs.push(tx);
                 }
                 else {
                     const data = iface.encodeFunctionData('transfer', [toAddress, toSend]);
-                    const tx = await fromWallet.signTransaction({
-                        to: tokenAddress,
-                        data,
-                        value: 0n,
-                        nonce,
-                        gasPrice,
-                        gasLimit: finalGasLimit,
-                        chainId: chainIdNum,
-                        type: txType
+                    hopTxsToSign.push({
+                        wallet: fromWallet,
+                        tx: {
+                            to: tokenAddress,
+                            data,
+                            value: 0n,
+                            nonce,
+                            gasPrice,
+                            gasLimit: finalGasLimit,
+                            chainId: chainIdNum,
+                            type: txType
+                        }
                     });
-                    signedTxs.push(tx);
                 }
             }
         }
-        // ✅ 多跳模式：计算利润并添加利润转账
+        // ✅ 并行签名所有有跳转的交易
+        if (hopTxsToSign.length > 0) {
+            const hopSignedTxs = await Promise.all(hopTxsToSign.map(({ wallet, tx }) => wallet.signTransaction(tx)));
+            signedTxs.push(...hopSignedTxs);
+        }
+        // ========== 第7步：计算利润并添加利润转账 ==========
         if (extractProfit && totalAmountBeforeProfit > 0n) {
             // 找出归集金额最大的钱包作为支付者
             let maxSweepIndex = -1;
@@ -1161,26 +1151,26 @@ export async function sweepWithBundleMerkle(params) {
                 if (sweepAmounts[i] > 0n) {
                     const { profit } = calculateProfit(sweepAmounts[i]);
                     if (isNative) {
-                        totalProfit += profit; // 原生币直接累加
+                        totalProfit += profit;
                     }
                     else {
-                        totalTokenProfit += profit; // ERC20 累计代币利润
+                        totalTokenProfit += profit;
                     }
                 }
             }
-            // ✅ ERC20 多跳归集：获取代币利润等值的原生代币报价
+            // ✅ ERC20：获取代币利润等值的原生代币报价
             let nativeProfitAmount = isNative ? totalProfit : 0n;
             if (!isNative && totalTokenProfit > 0n) {
                 nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
-                totalProfit = nativeProfitAmount; // 更新为原生代币利润
+                totalProfit = nativeProfitAmount;
             }
-            // 由归集金额最大的钱包支付利润（转等值原生代币）
+            // 由归集金额最大的钱包支付利润
             if (nativeProfitAmount > 0n && maxSweepIndex >= 0) {
                 const payerWallet = sourceWallets[maxSweepIndex];
                 const profitNonce = await nonceManager.getNextNonce(payerWallet);
                 const profitTx = await payerWallet.signTransaction({
                     to: getProfitRecipient(),
-                    value: nativeProfitAmount, // ✅ 转等值原生代币
+                    value: nativeProfitAmount,
                     nonce: profitNonce,
                     gasPrice,
                     gasLimit: 21000n,

package/package.json

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