four-flap-meme-sdk 1.2.24 → 1.2.25

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

@@ -397,49 +397,53 @@ export async function sweepWithBundleMerkle(params) {
                 }
             }
             // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            // ✅ 先为支付者预留 nonce，确保 nonce 连续
+            let payerProfitNonce;
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+                const payerWallet = wallets[maxSweepIndex];
+                const nonces = await nonceManager.getNextNonceBatch(payerWallet, 2);
+                payerProfitNonce = nonces[1]; // 利润交易的 nonce
+            }
             const txPromises = wallets.map(async (w, i) => {
                 const toSend = sweepAmounts[i];
                 if (toSend <= 0n)
-                    return [];
+                    return null;
                 let actualToSend = toSend;
                 if (extractProfit) {
                     const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
                 }
-                // ✅ 如果是支付利润的钱包，需要预留 2 个 nonce
-                const isPayerWallet = extractProfit && totalProfit > 0n && i === maxSweepIndex;
-                const nonces = isPayerWallet
-                    ? await nonceManager.getNextNonceBatch(w, 2)
-                    : [await nonceManager.getNextNonce(w)];
-                const txs = [];
-                // 归集交易
+                // ✅ 支付者使用预留的第一个 nonce，其他钱包正常获取
+                const nonce = (i === maxSweepIndex && payerProfitNonce !== undefined)
+                    ? payerProfitNonce - 1 // 使用预留的第一个 nonce
+                    : await nonceManager.getNextNonce(w);
                 const mainTx = await w.signTransaction({
                     to: target,
                     value: actualToSend,
-                    nonce: nonces[0],
+                    nonce,
                     gasPrice,
                     gasLimit: nativeGasLimit,
                     chainId: chainIdNum,
                     type: txType
                 });
-                txs.push(mainTx);
-                // ✅ 如果是支付者，立即生成利润转账（确保 nonce 连续）
-                if (isPayerWallet) {
-                    const profitTx = await w.signTransaction({
-                        to: config.profitRecipient,
-                        value: totalProfit,
-                        nonce: nonces[1],
-                        gasPrice,
-                        gasLimit: nativeGasLimit,
-                        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 && payerProfitNonce !== undefined) {
+                const payerWallet = wallets[maxSweepIndex];
+                const profitTx = await payerWallet.signTransaction({
+                    to: config.profitRecipient,
+                    value: totalProfit,
+                    nonce: payerProfitNonce,
+                    gasPrice,
+                    gasLimit: nativeGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
         }
         else {
             // ✅ ERC20：批量查询余额，统一扣除利润
@@ -505,53 +509,57 @@ export async function sweepWithBundleMerkle(params) {
                 }
             }
             // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            // ✅ 先为支付者预留 nonce，确保 nonce 连续
+            let payerProfitNonce;
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+                const payerWallet = wallets[maxSweepIndex];
+                const nonces = await nonceManager.getNextNonceBatch(payerWallet, 2);
+                payerProfitNonce = nonces[1]; // 利润交易的 nonce
+            }
             const txPromises = wallets.map(async (w, i) => {
                 const toSend = sweepAmounts[i];
                 if (toSend <= 0n)
-                    return [];
+                    return null;
                 let actualToSend = toSend;
                 if (extractProfit) {
                     const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
                 }
-                // ✅ 如果是支付利润的钱包，需要预留 2 个 nonce
-                const isPayerWallet = extractProfit && totalProfit > 0n && i === maxSweepIndex;
-                const nonces = isPayerWallet
-                    ? await nonceManager.getNextNonceBatch(w, 2)
-                    : [await nonceManager.getNextNonce(w)];
-                const txs = [];
-                // 归集交易
+                // ✅ 支付者使用预留的第一个 nonce，其他钱包正常获取
+                const nonce = (i === maxSweepIndex && payerProfitNonce !== undefined)
+                    ? payerProfitNonce - 1 // 使用预留的第一个 nonce
+                    : await nonceManager.getNextNonce(w);
                 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);
-                // ✅ 如果是支付者，立即生成利润转账（确保 nonce 连续）
-                if (isPayerWallet) {
-                    const profitData = iface.encodeFunctionData('transfer', [config.profitRecipient, totalProfit]);
-                    const profitTx = await w.signTransaction({
-                        to: tokenAddress,
-                        data: profitData,
-                        value: 0n,
-                        nonce: nonces[1],
-                        gasPrice,
-                        gasLimit: finalGasLimit,
-                        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 && payerProfitNonce !== undefined) {
+                const payerWallet = wallets[maxSweepIndex];
+                const profitData = iface.encodeFunctionData('transfer', [config.profitRecipient, totalProfit]);
+                const profitTx = await payerWallet.signTransaction({
+                    to: tokenAddress,
+                    data: profitData,
+                    value: 0n,
+                    nonce: payerProfitNonce,
+                    gasPrice,
+                    gasLimit: finalGasLimit,
+                    chainId: chainIdNum,
+                    type: txType
+                });
+                signedTxs.push(profitTx);
+            }
         }
     }
     else {

package/package.json

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