four-flap-meme-sdk 1.2.23 → 1.2.25

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

@@ -397,6 +397,13 @@ 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)
@@ -406,7 +413,10 @@ export async function sweepWithBundleMerkle(params) {
                     const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
                 }
-                const nonce = await nonceManager.getNextNonce(w);
+                // ✅ 支付者使用预留的第一个 nonce，其他钱包正常获取
+                const nonce = (i === maxSweepIndex && payerProfitNonce !== undefined)
+                    ? payerProfitNonce - 1 // 使用预留的第一个 nonce
+                    : await nonceManager.getNextNonce(w);
                 const mainTx = await w.signTransaction({
                     to: target,
                     value: actualToSend,
@@ -420,16 +430,15 @@ export async function sweepWithBundleMerkle(params) {
             });
             const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
-            // ✅ 第三步：由归集金额最大的钱包统一支付所有利润
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+            // ✅ 第三步：在所有归集交易之后，生成利润交易
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
                 const payerWallet = wallets[maxSweepIndex];
-                const profitNonce = await nonceManager.getNextNonce(payerWallet);
                 const profitTx = await payerWallet.signTransaction({
                     to: config.profitRecipient,
                     value: totalProfit,
-                    nonce: profitNonce,
+                    nonce: payerProfitNonce,
                     gasPrice,
-                    gasLimit: nativeGasLimit, // ✅ 使用用户配置的 gasLimit
+                    gasLimit: nativeGasLimit,
                     chainId: chainIdNum,
                     type: txType
                 });
@@ -500,6 +509,13 @@ 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)
@@ -509,7 +525,10 @@ export async function sweepWithBundleMerkle(params) {
                     const { remaining } = calculateProfit(toSend, config);
                     actualToSend = remaining;
                 }
-                const nonce = await nonceManager.getNextNonce(w);
+                // ✅ 支付者使用预留的第一个 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,
@@ -525,18 +544,17 @@ export async function sweepWithBundleMerkle(params) {
             });
             const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
-            // ✅ 第三步：由归集金额最大的钱包统一支付所有利润
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
+            // ✅ 第三步：在所有归集交易之后，生成利润交易
+            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
                 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,
+                    nonce: payerProfitNonce,
                     gasPrice,
-                    gasLimit: finalGasLimit, // ✅ 使用用户配置的 gasLimit
+                    gasLimit: finalGasLimit,
                     chainId: chainIdNum,
                     type: txType
                 });

package/package.json

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