four-flap-meme-sdk 1.2.87 → 1.2.89

package/dist/contracts/tm-bundle-merkle/types.d.ts

@@ -251,6 +251,8 @@ export type DisperseSignParams = {
         hopPrivateKeys?: string[];
     }>;
     config: FourSignConfig;
+    /** ✅ 起始 Nonce（用于并行调用时控制 nonce 顺序） */
+    startNonce?: number;
 };
 /**
  * ✅ 分发结果（简化版）
@@ -300,6 +302,8 @@ export type SweepSignParams = {
         hopPrivateKeys?: string[];
     }>;
     config: FourSignConfig;
+    /** ✅ 起始 Nonce（用于并行调用时控制 nonce 顺序 - 仅当有多个源钱包且使用同一私钥时有效，通常归集不需要） */
+    startNonce?: number;
 };
 /**
  * ✅ 归集结果（简化版）

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

@@ -8,7 +8,7 @@ import { getErc20DecimalsMerkle as _getErc20DecimalsMerkle, generateHopWallets a
  * ✅ 精简版：只负责签名交易，不提交到 Merkle
  */
 export async function disperseWithBundleMerkle(params) {
-    const { fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config } = params;
+    const { fromPrivateKey, recipients, amount, amounts, tokenAddress, tokenDecimals, hopCount = 0, hopPrivateKeys, items, config, startNonce } = params;
     // 快速返回空结果
     if (!recipients || recipients.length === 0) {
         return {
@@ -69,6 +69,9 @@ export async function disperseWithBundleMerkle(params) {
     if (!preparedHops) {
         // ========== 无多跳：直接批量转账 ==========
         const nonceManager = new NonceManager(provider);
+        if (startNonce !== undefined) {
+            nonceManager.setNonce(mainWallet.address, startNonce);
+        }
         const extraTxCount = extractProfit ? 1 : 0; // ✅ 利润转账需要额外1个nonce
         const nonces = await nonceManager.getNextNonceBatch(mainWallet, recipients.length + extraTxCount);
         if (isNative) {
@@ -158,6 +161,9 @@ export async function disperseWithBundleMerkle(params) {
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
         const nonceManager = new NonceManager(provider);
+        if (startNonce !== undefined) {
+            nonceManager.setNonce(mainWallet.address, startNonce);
+        }
         for (let i = 0; i < recipients.length; i++) {
             const finalRecipient = recipients[i];
             const originalAmountWei = isNative
@@ -315,7 +321,7 @@ export async function disperseWithBundleMerkle(params) {
  * ✅ 精简版：只负责签名交易，不提交到 Merkle
  */
 export async function sweepWithBundleMerkle(params) {
-    const { sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config } = params;
+    const { sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce } = params;
     // 快速返回空结果
     if (!sourcePrivateKeys || sourcePrivateKeys.length === 0) {
         return {
@@ -383,6 +389,10 @@ export async function sweepWithBundleMerkle(params) {
         const wallets = actualKeys.map(pk => new Wallet(pk, provider));
         const addresses = wallets.map(w => w.address);
         const nonceManager = new NonceManager(provider);
+        // ✅ 如果提供了 startNonce，设置给第一个钱包（主要用于测试场景下单一源钱包的并发调用）
+        if (startNonce !== undefined && wallets.length > 0) {
+            nonceManager.setNonce(wallets[0].address, startNonce);
+        }
         if (isNative) {
             // ✅ 原生币：批量查询余额，统一扣除利润
             const balances = await _batchGetBalances(provider, addresses);
@@ -661,6 +671,11 @@ 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);
+        // ✅ 如果提供了 startNonce，设置给第一个钱包（主要用于测试场景下单一源钱包的并发调用）
+        if (startNonce !== undefined && actualKeys.length > 0) {
+            const firstWallet = new Wallet(actualKeys[0], provider);
+            nonceManager.setNonce(firstWallet.address, startNonce);
+        }
         // 分离有跳转和无跳转的地址
         const sourceWallets = actualKeys.map(pk => new Wallet(pk, provider));
         const withHopIndexes = [];

package/dist/utils/bundle-helpers.d.ts

@@ -16,6 +16,12 @@ export declare class NonceManager {
     private provider;
     private tempNonceCache;
     constructor(provider: JsonRpcProvider);
+    /**
+     * 手动设置缓存的 nonce（用于外部控制起始 nonce）
+     * @param wallet 钱包对象或地址
+     * @param nonce 起始 nonce（getNextNonce 将返回此值）
+     */
+    setNonce(wallet: Wallet | string, nonce: number): void;
     /**
      * 获取下一个可用的 nonce
      * @param wallet 钱包对象或地址

package/dist/utils/bundle-helpers.js

@@ -18,6 +18,15 @@ export class NonceManager {
         this.tempNonceCache = new Map();
         this.provider = provider;
     }
+    /**
+     * 手动设置缓存的 nonce（用于外部控制起始 nonce）
+     * @param wallet 钱包对象或地址
+     * @param nonce 起始 nonce（getNextNonce 将返回此值）
+     */
+    setNonce(wallet, nonce) {
+        const address = typeof wallet === 'string' ? wallet : wallet.address;
+        this.tempNonceCache.set(address.toLowerCase(), nonce);
+    }
     /**
      * 获取下一个可用的 nonce
      * @param wallet 钱包对象或地址

package/package.json

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