four-flap-meme-sdk 1.2.21 → 1.2.23

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

@@ -345,12 +345,17 @@ export async function sweepWithBundleMerkle(params) {
         const txType = getTxType(config);
         const nonceManager = new NonceManager(provider);
         if (isNative) {
-            // ✅ 原生币：批量查询余额，扣除利润
+            // ✅ 原生币：批量查询余额，统一扣除利润
             const balances = await _batchGetBalances(provider, addresses);
-            const extraTxPerWallet = extractProfit ? 1 : 0; // 每个钱包需要额外1笔利润转账
-            const gasCostBase = nativeGasLimit * gasPrice; // 基础 gas 费
-            const gasCost = gasCostBase * BigInt(1 + extraTxPerWallet); // 总 gas 费（含利润转账）
-            const txPromises = wallets.map(async (w, i) => {
+            const gasCostBase = nativeGasLimit * gasPrice; // 主转账 gas 费
+            // ✅ 如果需要提取利润，预留利润转账的 gas（使用相同的 nativeGasLimit）
+            const profitTxGas = nativeGasLimit * gasPrice;
+            const gasCost = extractProfit ? (gasCostBase + profitTxGas) : gasCostBase;
+            // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
+            const sweepAmounts = [];
+            let maxSweepIndex = -1;
+            let maxSweepAmount = 0n;
+            for (let i = 0; i < wallets.length; i++) {
                 const bal = balances[i];
                 let toSend = 0n;
                 const ratioForI = (() => {
@@ -378,63 +383,76 @@ export async function sweepWithBundleMerkle(params) {
                     if (!skipIfInsufficient || bal >= need)
                         toSend = amt;
                 }
-                if (toSend <= 0n)
-                    return [];
+                sweepAmounts.push(toSend);
                 totalAmountBeforeProfit += toSend;
-                // ✅ 计算利润并扣除
+                // 找出归集金额最大的钱包
+                if (toSend > maxSweepAmount) {
+                    maxSweepAmount = toSend;
+                    maxSweepIndex = i;
+                }
+                // 累计总利润
+                if (extractProfit && toSend > 0n) {
+                    const { profit } = calculateProfit(toSend, config);
+                    totalProfit += profit;
+                }
+            }
+            // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            const txPromises = wallets.map(async (w, i) => {
+                const toSend = sweepAmounts[i];
+                if (toSend <= 0n)
+                    return null;
                 let actualToSend = toSend;
-                let profitAmount = 0n;
                 if (extractProfit) {
-                    const { profit, remaining } = calculateProfit(toSend, config);
+                    const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
-                    profitAmount = profit;
-                    totalProfit += profit;
                 }
                 const nonce = await nonceManager.getNextNonce(w);
-                const nonces = [nonce, nonce + 1];
-                const txs = [];
-                // 归集到target
                 const mainTx = await w.signTransaction({
                     to: target,
-                    value: actualToSend, // ✅ 扣除利润后的金额
-                    nonce: nonces[0],
+                    value: actualToSend,
+                    nonce,
                     gasPrice,
                     gasLimit: nativeGasLimit,
                     chainId: chainIdNum,
                     type: txType
                 });
-                txs.push(mainTx);
-                // ✅ 利润转账
-                if (extractProfit && profitAmount > 0n) {
-                    const profitTx = await w.signTransaction({
-                        to: config.profitRecipient,
-                        value: profitAmount,
-                        nonce: nonces[1],
-                        gasPrice,
-                        gasLimit: 21000n,
-                        chainId: chainIdNum,
-                        type: txType
-                    });
-                    txs.push(profitTx);
-                }
-                return txs;
+                return mainTx;
             });
-            const allTxs = (await Promise.all(txPromises)).flat().filter(tx => tx !== null);
+            const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
+            // ✅ 第三步：由归集金额最大的钱包统一支付所有利润
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+                const payerWallet = wallets[maxSweepIndex];
+                const profitNonce = await nonceManager.getNextNonce(payerWallet);
+                const profitTx = await payerWallet.signTransaction({
+                    to: config.profitRecipient,
+                    value: totalProfit,
+                    nonce: profitNonce,
+                    gasPrice,
+                    gasLimit: nativeGasLimit, // ✅ 使用用户配置的 gasLimit
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
         }
         else {
-            // ✅ ERC20：批量查询余额，扣除利润
+            // ✅ ERC20：批量查询余额，统一扣除利润
             const [decimals, balances, bnbBalances] = await Promise.all([
                 Promise.resolve(tokenDecimals ?? (await _getErc20DecimalsMerkle(provider, tokenAddress))),
                 _batchGetBalances(provider, addresses, tokenAddress),
                 config.checkBnbForErc20NoHop ? _batchGetBalances(provider, addresses) : Promise.resolve([])
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const extraTxPerWallet = extractProfit ? 1 : 0; // 每个钱包需要额外1笔利润转账
-            const txPromises = wallets.map(async (w, i) => {
+            // ✅ 如果需要提取利润，预留利润转账的 gas（使用相同的 finalGasLimit）
+            const profitTxGas = finalGasLimit * gasPrice;
+            // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
+            const sweepAmounts = [];
+            let maxSweepIndex = -1;
+            let maxSweepAmount = 0n;
+            for (let i = 0; i < wallets.length; i++) {
                 const bal = balances[i];
                 let toSend = 0n;
-                // 逐地址优先级：sources[i] > ratios[i]/amounts[i] > 全局 ratio/amount
                 const ratioForI = (() => {
                     if (sources && sources[i] && sources[i].ratioPct !== undefined)
                         return clamp(sources[i].ratioPct);
@@ -455,60 +473,75 @@ export async function sweepWithBundleMerkle(params) {
                 else if (amountStrForI && amountStrForI.trim().length > 0) {
                     toSend = ethers.parseUnits(amountStrForI, decimals);
                 }
-                if (toSend <= 0n || (skipIfInsufficient && bal < toSend))
-                    return [];
-                // ✅ 检查 BNB 余额（含利润转账的 gas）
-                const totalGasNeeded = finalGasLimit * gasPrice * BigInt(1 + extraTxPerWallet);
+                if (toSend <= 0n || (skipIfInsufficient && bal < toSend)) {
+                    sweepAmounts.push(0n);
+                    continue;
+                }
+                // ✅ 检查 BNB 余额（归集 + 可能的利润转账 gas）
+                const totalGasNeeded = extractProfit ? (finalGasLimit * gasPrice + profitTxGas) : (finalGasLimit * gasPrice);
                 if (config.checkBnbForErc20NoHop) {
                     const bnb = bnbBalances[i] ?? 0n;
-                    if (skipIfInsufficient && bnb < totalGasNeeded)
-                        return [];
+                    if (skipIfInsufficient && bnb < totalGasNeeded) {
+                        sweepAmounts.push(0n);
+                        continue;
+                    }
                 }
+                sweepAmounts.push(toSend);
                 totalAmountBeforeProfit += toSend;
-                // ✅ 计算利润并扣除
+                // 找出归集金额最大的钱包
+                if (toSend > maxSweepAmount) {
+                    maxSweepAmount = toSend;
+                    maxSweepIndex = i;
+                }
+                // 累计总利润
+                if (extractProfit && toSend > 0n) {
+                    const { profit } = calculateProfit(toSend, config);
+                    totalProfit += profit;
+                }
+            }
+            // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            const txPromises = wallets.map(async (w, i) => {
+                const toSend = sweepAmounts[i];
+                if (toSend <= 0n)
+                    return null;
                 let actualToSend = toSend;
-                let profitAmount = 0n;
                 if (extractProfit) {
-                    const { profit, remaining } = calculateProfit(toSend, config);
+                    const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
-                    profitAmount = profit;
-                    totalProfit += profit;
                 }
                 const nonce = await nonceManager.getNextNonce(w);
-                const nonces = [nonce, nonce + 1];
-                const txs = [];
-                // 归集到target
-                const data = iface.encodeFunctionData('transfer', [target, actualToSend]); // ✅ 扣除利润后的金额
+                const data = iface.encodeFunctionData('transfer', [target, actualToSend]);
                 const mainTx = await w.signTransaction({
                     to: tokenAddress,
                     data,
                     value: 0n,
-                    nonce: nonces[0],
+                    nonce,
                     gasPrice,
                     gasLimit: finalGasLimit,
                     chainId: chainIdNum,
                     type: txType
                 });
-                txs.push(mainTx);
-                // ✅ 利润转账
-                if (extractProfit && profitAmount > 0n) {
-                    const profitData = iface.encodeFunctionData('transfer', [config.profitRecipient, profitAmount]);
-                    const profitTx = await w.signTransaction({
-                        to: tokenAddress,
-                        data: profitData,
-                        value: 0n,
-                        nonce: nonces[1],
-                        gasPrice,
-                        gasLimit: 60000n,
-                        chainId: chainIdNum,
-                        type: txType
-                    });
-                    txs.push(profitTx);
-                }
-                return txs;
+                return mainTx;
             });
-            const allTxs = (await Promise.all(txPromises)).flat().filter(tx => tx !== null);
+            const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
+            // ✅ 第三步：由归集金额最大的钱包统一支付所有利润
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+                const payerWallet = wallets[maxSweepIndex];
+                const profitNonce = await nonceManager.getNextNonce(payerWallet);
+                const profitData = iface.encodeFunctionData('transfer', [config.profitRecipient, totalProfit]);
+                const profitTx = await payerWallet.signTransaction({
+                    to: tokenAddress,
+                    data: profitData,
+                    value: 0n,
+                    nonce: profitNonce,
+                    gasPrice,
+                    gasLimit: finalGasLimit, // ✅ 使用用户配置的 gasLimit
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
         }
     }
     else {

package/package.json

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