four-flap-meme-sdk 1.3.81 → 1.3.82

package/dist/contracts/tm-bundle.js

@@ -231,43 +231,54 @@ export async function createTokenWithBundleBuy(params) {
     // 4.2 购买交易
     const buyTxs = [];
     const profitTxs = [];
-    const buyAmountsWei = [];
+    const buyAmountsWei = buyAmounts.map(a => ethers.parseEther(a));
     // 🔍 找出买入金额最多的买家（由他支付所有利润）
     let maxBuyerIndex = 0;
-    let maxAmount = ethers.parseEther(buyAmounts[0]);
-    for (let i = 1; i < buyAmounts.length; i++) {
-        const amount = ethers.parseEther(buyAmounts[i]);
-        if (amount > maxAmount) {
-            maxAmount = amount;
+    let maxAmount = buyAmountsWei[0];
+    for (let i = 1; i < buyAmountsWei.length; i++) {
+        if (buyAmountsWei[i] > maxAmount) {
+            maxAmount = buyAmountsWei[i];
             maxBuyerIndex = i;
         }
     }
-    for (let i = 0; i < buyAmounts.length; i++) {
-        const buyerWallet = new Wallet(privateKeys[i + 1], provider);
-        const fundsWei = ethers.parseEther(buyAmounts[i]);
-        buyAmountsWei.push(fundsWei);
-        const minAmount = 0n;
+    // ✅ 并行构建所有购买交易
+    const buyerWallets = privateKeys.slice(1).map(pk => new Wallet(pk, provider));
+    // 并行获取所有买家的 nonce
+    const buyerNonces = await Promise.all(buyerWallets.map(w => getNextNonce(w)));
+    // 并行构建未签名交易和估算 gas
+    const buyTxDataList = await Promise.all(buyAmountsWei.map(async (fundsWei, i) => {
+        const buyerWallet = buyerWallets[i];
         const buyTm2 = new ethers.Contract(tmAddr, TM2Abi, buyerWallet);
-        const buyTxUnsigned = await buyTm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, minAmount, { value: fundsWei });
+        const buyTxUnsigned = await buyTm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, 0n, { value: fundsWei });
         // 估算 gas 并添加 20% 安全余量
-        const estimatedBuyGas = await provider.estimateGas({
-            ...buyTxUnsigned,
-            from: buyerWallet.address,
-            value: fundsWei
-        });
-        const buyGasLimit = (estimatedBuyGas * 120n) / 100n;
+        let buyGasLimit;
+        try {
+            const estimatedBuyGas = await provider.estimateGas({
+                ...buyTxUnsigned,
+                from: buyerWallet.address,
+                value: fundsWei
+            });
+            buyGasLimit = (estimatedBuyGas * 120n) / 100n;
+        }
+        catch {
+            buyGasLimit = 600000n; // 兜底值
+        }
+        return { buyTxUnsigned, buyGasLimit, buyerWallet, fundsWei };
+    }));
+    // 并行签名所有购买交易
+    const signedBuyTxList = await Promise.all(buyTxDataList.map(async (data, i) => {
         const buyTxRequest = {
-            ...buyTxUnsigned,
-            from: buyerWallet.address,
-            nonce: await getNextNonce(buyerWallet),
-            gasLimit: buyGasLimit,
+            ...data.buyTxUnsigned,
+            from: data.buyerWallet.address,
+            nonce: buyerNonces[i],
+            gasLimit: data.buyGasLimit,
             gasPrice: gasPrice,
             chainId: 56
         };
-        const signedBuyTx = await buyerWallet.signTransaction(buyTxRequest);
-        signedTxs.push(signedBuyTx);
-        buyTxs.push(signedBuyTx);
-    }
+        return data.buyerWallet.signTransaction(buyTxRequest);
+    }));
+    signedTxs.push(...signedBuyTxList);
+    buyTxs.push(...signedBuyTxList);
     // ✅ 聚合利润：由买入最多的人支付总利润
     const totalBuyAmount = buyAmountsWei.reduce((sum, amount) => sum + amount, 0n);
     const totalProfitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
@@ -404,13 +415,36 @@ export async function batchBuyWithBundle(params) {
         nextNonceMap.set(key, onchain + 1);
         return onchain;
     };
-    for (let i = 0; i < privateKeys.length; i++) {
-        const buyerWallet = new Wallet(privateKeys[i], provider);
-        const fundsWei = ethers.parseEther(buyAmounts[i]);
-        const minAmount = 0n; // TODO: 调用 tryBuy
+    // ✅ 并行处理所有买家
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const fundsWeiList = buyAmounts.map(a => ethers.parseEther(a));
+    // 找出买入最多的买家（由他支付所有利润）
+    let maxBuyerIndex = 0;
+    let maxFunds = fundsWeiList[0];
+    for (let i = 1; i < fundsWeiList.length; i++) {
+        if (fundsWeiList[i] > maxFunds) {
+            maxFunds = fundsWeiList[i];
+            maxBuyerIndex = i;
+        }
+    }
+    // 并行获取所有钱包的初始 nonce
+    const initialNonces = await Promise.all(wallets.map(w => w.getNonce()));
+    // 为每个钱包分配 nonce（普通钱包1个，利润支付者2个）
+    const nonceMap = new Map();
+    wallets.forEach((w, i) => {
+        nonceMap.set(w.address.toLowerCase(), initialNonces[i]);
+    });
+    const getNextNonceLocal = (w) => {
+        const key = w.address.toLowerCase();
+        const n = nonceMap.get(key);
+        nonceMap.set(key, n + 1);
+        return n;
+    };
+    // 并行构建未签名交易和估算 gas
+    const txDataList = await Promise.all(wallets.map(async (buyerWallet, i) => {
+        const fundsWei = fundsWeiList[i];
         const tm2 = new ethers.Contract(tmAddr, TM2Abi, buyerWallet);
-        const buyTxUnsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, minAmount, { value: fundsWei });
-        // 估算 gas 并添加 20% 安全余量；若预估回滚，使用保守兜底值
+        const buyTxUnsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyerWallet.address, fundsWei, 0n, { value: fundsWei });
         let gasLimit;
         try {
             const estimatedGas = await provider.estimateGas({
@@ -421,33 +455,38 @@ export async function batchBuyWithBundle(params) {
             gasLimit = (estimatedGas * 120n) / 100n;
         }
         catch {
-            // 与 Flap 一致的保守兜底：在 BSC 上对 buyTokenAMAP 采用 600000
             gasLimit = 600000n;
         }
+        return { buyTxUnsigned, gasLimit, buyerWallet, fundsWei };
+    }));
+    // 并行签名所有买入交易
+    const signedBuyTxList = await Promise.all(txDataList.map(async (data, i) => {
         const buyTxRequest = {
-            ...buyTxUnsigned,
-            from: buyerWallet.address,
-            nonce: await getNextNonce(buyerWallet),
-            gasLimit: gasLimit,
+            ...data.buyTxUnsigned,
+            from: data.buyerWallet.address,
+            nonce: getNextNonceLocal(data.buyerWallet),
+            gasLimit: data.gasLimit,
             gasPrice: gasPrice,
             chainId: 56
         };
-        const signedBuyTx = await buyerWallet.signTransaction(buyTxRequest);
-        signedTxs.push(signedBuyTx);
-        // ✅ 刮取利润：每个买家买入后，立即转账利润
-        const profitAmount = (fundsWei * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
-        if (profitAmount > 0n) {
-            const profitTx = await buyerWallet.signTransaction({
-                to: PROFIT_CONFIG.RECIPIENT,
-                value: profitAmount,
-                nonce: await getNextNonce(buyerWallet),
-                gasPrice,
-                gasLimit: 21000n,
-                chainId: 56,
-                type: 0 // Legacy transaction
-            });
-            signedTxs.push(profitTx);
-        }
+        return data.buyerWallet.signTransaction(buyTxRequest);
+    }));
+    signedTxs.push(...signedBuyTxList);
+    // ✅ 聚合利润：由买入最多的人支付总利润
+    const totalFunds = fundsWeiList.reduce((sum, f) => sum + f, 0n);
+    const totalProfit = (totalFunds * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
+    if (totalProfit > 0n) {
+        const payerWallet = wallets[maxBuyerIndex];
+        const profitTx = await payerWallet.signTransaction({
+            to: PROFIT_CONFIG.RECIPIENT,
+            value: totalProfit,
+            nonce: getNextNonceLocal(payerWallet),
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: 56,
+            type: 0
+        });
+        signedTxs.push(profitTx);
     }
     // 可选 tipTx（置前）
     if (config.tipAmountWei && config.tipAmountWei > 0n) {
@@ -505,54 +544,86 @@ export async function batchSellWithBundle(params) {
         nextNonceMap.set(key, onchain + 1);
         return onchain;
     };
-    for (let i = 0; i < privateKeys.length; i++) {
-        const sellerWallet = new Wallet(privateKeys[i], provider);
-        const amountWei = ethers.parseUnits(sellAmounts[i], 18);
-        // ✅ 预估卖出能获得的 BNB（用于计算利润）
-        let estimatedBnbOut = 0n;
+    // ✅ 并行处理所有卖家
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, 18));
+    // 并行预估所有卖出能获得的 BNB
+    const estimatedBnbOuts = await Promise.all(amountsWei.map(async (amountWei) => {
         try {
-            const trySellResult = await trySell('BSC', config.rpcUrl, tokenAddress, amountWei);
-            estimatedBnbOut = trySellResult.funds;
+            const result = await trySell('BSC', config.rpcUrl, tokenAddress, amountWei);
+            return result.funds;
         }
         catch {
-            // 如果预估失败，跳过利润计算（但仍然执行卖出）
-            estimatedBnbOut = 0n;
+            return 0n;
+        }
+    }));
+    // 找出收益最高的卖家（由他支付所有利润）
+    let maxSellerIndex = 0;
+    let maxBnbOut = estimatedBnbOuts[0];
+    for (let i = 1; i < estimatedBnbOuts.length; i++) {
+        if (estimatedBnbOuts[i] > maxBnbOut) {
+            maxBnbOut = estimatedBnbOuts[i];
+            maxSellerIndex = i;
         }
-        const minFunds = 0n;
+    }
+    // 并行获取所有钱包的初始 nonce
+    const initialNonces = await Promise.all(wallets.map(w => w.getNonce()));
+    const nonceMap = new Map();
+    wallets.forEach((w, i) => {
+        nonceMap.set(w.address.toLowerCase(), initialNonces[i]);
+    });
+    const getNextNonceLocal = (w) => {
+        const key = w.address.toLowerCase();
+        const n = nonceMap.get(key);
+        nonceMap.set(key, n + 1);
+        return n;
+    };
+    // 并行构建未签名交易和估算 gas
+    const txDataList = await Promise.all(wallets.map(async (sellerWallet, i) => {
+        const amountWei = amountsWei[i];
         const tm2 = new ethers.Contract(tmAddr, TM2Abi, sellerWallet);
-        const sellTxUnsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, minFunds);
-        // 估算 gas 并添加 20% 安全余量
-        const estimatedGas = await provider.estimateGas({
-            ...sellTxUnsigned,
-            from: sellerWallet.address
-        });
-        const gasLimit = (estimatedGas * 120n) / 100n;
+        const sellTxUnsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, 0n);
+        let gasLimit;
+        try {
+            const estimatedGas = await provider.estimateGas({
+                ...sellTxUnsigned,
+                from: sellerWallet.address
+            });
+            gasLimit = (estimatedGas * 120n) / 100n;
+        }
+        catch {
+            gasLimit = 600000n;
+        }
+        return { sellTxUnsigned, gasLimit, sellerWallet };
+    }));
+    // 并行签名所有卖出交易
+    const signedSellTxList = await Promise.all(txDataList.map(async (data, i) => {
         const sellTxRequest = {
-            ...sellTxUnsigned,
-            from: sellerWallet.address,
-            nonce: await getNextNonce(sellerWallet),
-            gasLimit: gasLimit,
+            ...data.sellTxUnsigned,
+            from: data.sellerWallet.address,
+            nonce: getNextNonceLocal(data.sellerWallet),
+            gasLimit: data.gasLimit,
             gasPrice: gasPrice,
             chainId: 56
         };
-        const signedSellTx = await sellerWallet.signTransaction(sellTxRequest);
-        signedTxs.push(signedSellTx);
-        // ✅ 刮取利润：基于预估的卖出收益
-        if (estimatedBnbOut > 0n) {
-            const profitAmount = (estimatedBnbOut * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
-            if (profitAmount > 0n) {
-                const profitTx = await sellerWallet.signTransaction({
-                    to: PROFIT_CONFIG.RECIPIENT,
-                    value: profitAmount,
-                    nonce: await getNextNonce(sellerWallet),
-                    gasPrice,
-                    gasLimit: 21000n,
-                    chainId: 56,
-                    type: 0 // Legacy transaction
-                });
-                signedTxs.push(profitTx);
-            }
-        }
+        return data.sellerWallet.signTransaction(sellTxRequest);
+    }));
+    signedTxs.push(...signedSellTxList);
+    // ✅ 聚合利润：由收益最高的人支付总利润
+    const totalBnbOut = estimatedBnbOuts.reduce((sum, b) => sum + b, 0n);
+    const totalProfit = (totalBnbOut * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
+    if (totalProfit > 0n) {
+        const payerWallet = wallets[maxSellerIndex];
+        const profitTx = await payerWallet.signTransaction({
+            to: PROFIT_CONFIG.RECIPIENT,
+            value: totalProfit,
+            nonce: getNextNonceLocal(payerWallet),
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: 56,
+            type: 0
+        });
+        signedTxs.push(profitTx);
     }
     // 可选 tipTx（置前）
     if (config.tipAmountWei && config.tipAmountWei > 0n) {
@@ -627,25 +698,42 @@ export async function fourBatchPrivateBuy(params) {
     const provider = new JsonRpcProvider(rpcUrl);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
     const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
-    const gasPrice = await club48.getMinGasPrice();
-    const signedTxs = [];
-    for (let i = 0; i < privateKeys.length; i++) {
-        const w = new Wallet(privateKeys[i], provider);
-        const fundsWei = ethers.parseEther(fundsList[i]);
+    // ✅ 并行处理
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const fundsWeiList = fundsList.map(f => ethers.parseEther(f));
+    // 并行获取 gasPrice 和所有 nonce
+    const [gasPrice, nonces] = await Promise.all([
+        club48.getMinGasPrice(),
+        Promise.all(wallets.map(w => w.getNonce()))
+    ]);
+    // 并行构建未签名交易和估算 gas
+    const txDataList = await Promise.all(wallets.map(async (w, i) => {
+        const fundsWei = fundsWeiList[i];
         const tm2 = new ethers.Contract(tmAddr, TM2Abi, w);
         const unsigned = await tm2.buyTokenAMAP.populateTransaction(0n, tokenAddress, w.address, fundsWei, 0n, { value: fundsWei });
-        // 估算 gas 并添加 20% 安全余量；预估失败则使用保守兜底
         let gasLimit;
         try {
             const estimatedGas = await provider.estimateGas({ ...unsigned, from: w.address, value: fundsWei });
             gasLimit = (estimatedGas * 120n) / 100n;
         }
         catch {
-            gasLimit = 600000n; // 兜底（BSC 上 buyTokenAMAP）
+            gasLimit = 600000n;
         }
-        const req = { ...unsigned, from: w.address, nonce: await w.getNonce(), gasLimit, gasPrice, chainId: 56, type: 0 };
-        signedTxs.push(await w.signTransaction(req));
-    }
+        return { unsigned, gasLimit, wallet: w, fundsWei };
+    }));
+    // 并行签名所有交易
+    const signedTxs = await Promise.all(txDataList.map(async (data, i) => {
+        const req = {
+            ...data.unsigned,
+            from: data.wallet.address,
+            nonce: nonces[i],
+            gasLimit: data.gasLimit,
+            gasPrice,
+            chainId: 56,
+            type: 0
+        };
+        return data.wallet.signTransaction(req);
+    }));
     if (spPrivateKey) {
         return await sendBatchPrivateTransactions(signedTxs, spPrivateKey, club48Endpoint || 'https://puissant-bsc.48.club');
     }
@@ -660,19 +748,42 @@ export async function fourBatchPrivateSell(params) {
     const provider = new JsonRpcProvider(rpcUrl);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
     const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
-    const gasPrice = await club48.getMinGasPrice();
     const minOut = minFundsEach ?? 0n;
-    const signedTxs = [];
-    for (let i = 0; i < privateKeys.length; i++) {
-        const w = new Wallet(privateKeys[i], provider);
-        const amountWei = ethers.parseUnits(amounts[i], 18);
+    // ✅ 并行处理
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const amountsWei = amounts.map(a => ethers.parseUnits(a, 18));
+    // 并行获取 gasPrice 和所有 nonce
+    const [gasPrice, nonces] = await Promise.all([
+        club48.getMinGasPrice(),
+        Promise.all(wallets.map(w => w.getNonce()))
+    ]);
+    // 并行构建未签名交易和估算 gas
+    const txDataList = await Promise.all(wallets.map(async (w, i) => {
+        const amountWei = amountsWei[i];
         const tm2 = new ethers.Contract(tmAddr, TM2Abi, w);
         const unsigned = await tm2.sellToken.populateTransaction(0n, tokenAddress, amountWei, minOut);
-        // 估算 gas 并添加 20% 安全余量
-        const estimatedGas = await provider.estimateGas({ ...unsigned, from: w.address });
-        const gasLimit = (estimatedGas * 120n) / 100n;
-        const req = { ...unsigned, from: w.address, nonce: await w.getNonce(), gasLimit, gasPrice, chainId: 56, type: 0 };
-        signedTxs.push(await w.signTransaction(req));
-    }
+        let gasLimit;
+        try {
+            const estimatedGas = await provider.estimateGas({ ...unsigned, from: w.address });
+            gasLimit = (estimatedGas * 120n) / 100n;
+        }
+        catch {
+            gasLimit = 600000n;
+        }
+        return { unsigned, gasLimit, wallet: w };
+    }));
+    // 并行签名所有交易
+    const signedTxs = await Promise.all(txDataList.map(async (data, i) => {
+        const req = {
+            ...data.unsigned,
+            from: data.wallet.address,
+            nonce: nonces[i],
+            gasLimit: data.gasLimit,
+            gasPrice,
+            chainId: 56,
+            type: 0
+        };
+        return data.wallet.signTransaction(req);
+    }));
     return await sendBatchPrivateTransactions(signedTxs, spPrivateKey, club48Endpoint || 'https://puissant-bsc.48.club');
 }