four-flap-meme-sdk 1.5.23 → 1.5.24

package/dist/xlayer/bundle.js

@@ -13,13 +13,60 @@ import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
+// AA Nonce（EntryPoint nonce）本地分配器
+// ============================================================================
+/**
+ * ✅ 仅用于 ERC-4337 AA（EntryPoint.getNonce(sender, 0)）
+ *
+ * 目标：不要在业务代码里手写 `+1/+2` 推导，而是像 BSC bundle 一样用本地 Map
+ * 对“同一 sender 多步流程”连续分配 nonce。
+ *
+ * 注意：
+ * - 这是**同一次 SDK 调用/同一条流程**内的 nonce 分配；不解决多进程/多并发任务同时使用同一 sender 的问题。
+ * - 对“可能不生成 op”的分支（例如 withdraw 返回 null），使用 peek + commit，避免提前消耗 nonce。
+ */
+class AANonceMap {
+    constructor() {
+        this.nextBySenderLower = new Map();
+    }
+    init(sender, startNonce) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined || startNonce > cur) {
+            this.nextBySenderLower.set(k, startNonce);
+        }
+    }
+    peek(sender) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined) {
+            throw new Error(`AANonceMap: sender not initialized: ${sender}`);
+        }
+        return cur;
+    }
+    commit(sender, usedNonce) {
+        const k = sender.toLowerCase();
+        const cur = this.nextBySenderLower.get(k);
+        if (cur === undefined) {
+            throw new Error(`AANonceMap: sender not initialized: ${sender}`);
+        }
+        // 只允许“使用当前 nonce”或“重复 commit”（幂等）
+        if (usedNonce !== cur && usedNonce !== cur - 1n) {
+            throw new Error(`AANonceMap: nonce mismatch for ${sender}: used=${usedNonce.toString()} cur=${cur.toString()}`);
+        }
+        if (usedNonce === cur) {
+            this.nextBySenderLower.set(k, cur + 1n);
+        }
+    }
+    next(sender) {
+        const n = this.peek(sender);
+        this.commit(sender, n);
+        return n;
+    }
+}
+// ============================================================================
 // 捆绑交易执行器
 // ============================================================================
-// 固定 gas（用于大规模减少 RPC）；具体值允许通过 config.fixedGas 覆盖
-const DEFAULT_CALL_GAS_LIMIT_BUY = DEFAULT_CALL_GAS_LIMIT_SELL; // buy 与 sell 共享一个保守值
-const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
-const DEFAULT_CALL_GAS_LIMIT_TRANSFER = 150000n;
-const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
 /**
  * XLayer 捆绑交易执行器
  *
@@ -114,27 +161,14 @@ export class BundleExecutor {
         const callData = encodeExecute(this.portalAddress, buyAmountWei, swapData);
         // 估算前确保 sender 有足够余额（用于模拟）
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, buyAmountWei + parseOkb('0.0003'), `${ownerName ?? 'owner'}/buy-prefund-before-estimate`);
-        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
-        const { userOp, prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet,
-                sender: accountInfo.sender,
-                callData,
-                nonce: accountInfo.nonce,
-                initCode,
-                deployed: accountInfo.deployed,
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
-                },
-            })
-            : await this.aaManager.buildUserOpWithBundlerEstimate({
-                ownerWallet,
-                sender: accountInfo.sender,
-                callData,
-                nonce: accountInfo.nonce,
-                initCode,
-            });
+        // 使用 Bundler 估算
+        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithBundlerEstimate({
+            ownerWallet,
+            sender: accountInfo.sender,
+            callData,
+            nonce: accountInfo.nonce,
+            initCode,
+        });
         // 补足 prefund + 买入金额
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, buyAmountWei + prefundWei + parseOkb('0.0002'), `${ownerName ?? 'owner'}/buy-fund`);
         // 签名
@@ -152,27 +186,13 @@ export class BundleExecutor {
         const approveData = encodeApproveCall(spender);
         const callData = encodeExecute(tokenAddress, 0n, approveData);
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/approve-prefund`);
-        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
-        const { userOp, prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet,
-                sender,
-                callData,
-                nonce,
-                initCode,
-                deployed: initCode === '0x',
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_APPROVE,
-                },
-            })
-            : await this.aaManager.buildUserOpWithLocalEstimate({
-                ownerWallet,
-                sender,
-                callData,
-                nonce,
-                initCode,
-            });
+        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
+            ownerWallet,
+            sender,
+            callData,
+            nonce,
+            initCode,
+        });
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/approve-fund`);
         const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
         return { ...signed, prefundWei, ownerName };
@@ -184,37 +204,23 @@ export class BundleExecutor {
         const sellData = encodeSellCall(tokenAddress, sellAmount, 0n);
         const callData = encodeExecute(this.portalAddress, 0n, sellData);
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0003'), `${ownerName ?? 'owner'}/sell-prefund`);
-        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
-        // 如果需要 approve（还未执行），estimateGas 可能 revert；因此默认就用固定 callGasLimit
-        const { userOp, prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
+        // 如果需要 approve（还未执行），estimateGas 会 revert，使用固定值
+        const { userOp, prefundWei } = needApprove
+            ? await this.aaManager.buildUserOpWithLocalEstimate({
                 ownerWallet,
                 sender,
                 callData,
                 nonce,
                 initCode,
-                deployed: initCode === '0x',
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_SELL,
-                },
+                callGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL,
             })
-            : needApprove
-                ? await this.aaManager.buildUserOpWithLocalEstimate({
-                    ownerWallet,
-                    sender,
-                    callData,
-                    nonce,
-                    initCode,
-                    callGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL,
-                })
-                : await this.aaManager.buildUserOpWithLocalEstimate({
-                    ownerWallet,
-                    sender,
-                    callData,
-                    nonce,
-                    initCode,
-                });
+            : await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet,
+                sender,
+                callData,
+                nonce,
+                initCode,
+            });
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/sell-fund`);
         const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
         return { ...signed, prefundWei, ownerName };
@@ -249,27 +255,13 @@ export class BundleExecutor {
         // 先估算 prefund（使用空调用）
         const tempCallData = encodeExecute(params.ownerWallet.address, 0n, '0x');
         await this.aaManager.ensureSenderBalance(params.ownerWallet, params.sender, parseOkb('0.0002'), `${params.ownerName ?? 'owner'}/withdraw-prefund`);
-        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
-        const { prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet: params.ownerWallet,
-                sender: params.sender,
-                callData: tempCallData,
-                nonce: params.nonce,
-                initCode: params.initCode,
-                deployed: params.initCode === '0x',
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
-                },
-            })
-            : await this.aaManager.buildUserOpWithLocalEstimate({
-                ownerWallet: params.ownerWallet,
-                sender: params.sender,
-                callData: tempCallData,
-                nonce: params.nonce,
-                initCode: params.initCode,
-            });
+        const { prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
+            ownerWallet: params.ownerWallet,
+            sender: params.sender,
+            callData: tempCallData,
+            nonce: params.nonce,
+            initCode: params.initCode,
+        });
         // 计算可归集金额（用已知余额近似；fund 发生时余额会变大，属于可接受的保守近似）
         const withdrawAmount = senderBalance > prefundWei + params.reserveWei
             ? senderBalance - prefundWei - params.reserveWei
@@ -279,26 +271,13 @@ export class BundleExecutor {
             return null;
         }
         const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
-        const { userOp } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet: params.ownerWallet,
-                sender: params.sender,
-                callData,
-                nonce: params.nonce,
-                initCode: params.initCode,
-                deployed: params.initCode === '0x',
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
-                },
-            })
-            : await this.aaManager.buildUserOpWithLocalEstimate({
-                ownerWallet: params.ownerWallet,
-                sender: params.sender,
-                callData,
-                nonce: params.nonce,
-                initCode: params.initCode,
-            });
+        const { userOp } = await this.aaManager.buildUserOpWithLocalEstimate({
+            ownerWallet: params.ownerWallet,
+            sender: params.sender,
+            callData,
+            nonce: params.nonce,
+            initCode: params.initCode,
+        });
         console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(withdrawAmount)} OKB`);
         const signed = await this.aaManager.signUserOp(userOp, params.ownerWallet);
         return { ...signed, prefundWei, ownerName: params.ownerName };
@@ -316,26 +295,12 @@ export class BundleExecutor {
         const transferData = encodeTransferCall(ownerWallet.address, tokenBalance);
         const callData = encodeExecute(tokenAddress, 0n, transferData);
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/transfer-prefund`);
-        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
-        const { userOp, prefundWei } = gasPolicy === 'fixed'
-            ? await this.aaManager.buildUserOpWithFixedGas({
-                ownerWallet,
-                sender: accountInfo.sender,
-                callData,
-                nonce: accountInfo.nonce,
-                initCode: accountInfo.deployed ? '0x' : this.aaManager.generateInitCode(ownerWallet.address),
-                deployed: accountInfo.deployed,
-                fixedGas: {
-                    ...(this.config.fixedGas ?? {}),
-                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_TRANSFER,
-                },
-            })
-            : await this.aaManager.buildUserOpWithBundlerEstimate({
-                ownerWallet,
-                sender: accountInfo.sender,
-                callData,
-                nonce: accountInfo.nonce,
-            });
+        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithBundlerEstimate({
+            ownerWallet,
+            sender: accountInfo.sender,
+            callData,
+            nonce: accountInfo.nonce,
+        });
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/transfer-fund`);
         console.log(`\n[${ownerName ?? 'owner'}] transfer token: ${tokenBalance.toString()}`);
         const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
@@ -365,11 +330,11 @@ export class BundleExecutor {
         // 1. 预取账户信息（并行），并批量估算 gas（减少对 bundler 的 N 次请求）
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const buyWeis = buyAmounts.map((a) => parseOkb(a));
+        const nonceMap = new AANonceMap();
+        for (const ai of accountInfos)
+            nonceMap.init(ai.sender, ai.nonce);
         // 估算前确保 sender 有足够余额（用于 bundler 模拟；paymaster 场景会自动跳过）
-        // 避免 Promise.all 突发并发（大规模地址会触发 RPC 限流）
-        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
-        });
+        await Promise.all(accountInfos.map((ai, i) => this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`)));
         const buyCallDatas = buyWeis.map((buyWei) => {
             const swapData = encodeBuyCall(tokenAddress, buyWei, 0n);
             return encodeExecute(this.portalAddress, buyWei, swapData);
@@ -378,17 +343,15 @@ export class BundleExecutor {
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
             ops: accountInfos.map((ai, i) => ({
                 sender: ai.sender,
-                nonce: ai.nonce,
+                nonce: nonceMap.next(ai.sender),
                 callData: buyCallDatas[i],
                 initCode: initCodes[i],
             })),
         });
         // 补足 prefund + 买入金额（多数情况下上一步的 0.0003 已足够，这里通常不会再转账）
-        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
-        });
-        // 签名（受控并发，避免大规模时阻塞）
-        const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
+        await Promise.all(accountInfos.map((ai, i) => this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`)));
+        // 签名
+        const signedBuy = await Promise.all(buyUserOps.map((op, i) => this.aaManager.signUserOp(op, wallets[i])));
         const buyOps = signedBuy.map((s) => s.userOp);
         // 2. 执行买入
         const buyResult = await this.runHandleOps('buyBundle', buyOps, bundlerSigner, beneficiary);
@@ -403,6 +366,7 @@ export class BundleExecutor {
         if (transferBackToOwner) {
             const idxs = [];
             const transferCallDatas = [];
+            const transferNonces = [];
             for (let i = 0; i < wallets.length; i++) {
                 const sender = senders[i];
                 const bal = tokenBalances.get(sender) ?? 0n;
@@ -411,25 +375,22 @@ export class BundleExecutor {
                 idxs.push(i);
                 const transferData = encodeTransferCall(wallets[i].address, bal);
                 transferCallDatas.push(encodeExecute(tokenAddress, 0n, transferData));
+                transferNonces.push(nonceMap.next(sender));
             }
             if (idxs.length > 0) {
                 // 估算前补一点余额（paymaster 会自动跳过）
-                await mapWithConcurrency(idxs, 6, async (i) => {
-                    await this.aaManager.ensureSenderBalance(wallets[i], senders[i], parseOkb('0.0002'), `owner${i + 1}/transfer-prefund`);
-                });
+                await Promise.all(idxs.map((i) => this.aaManager.ensureSenderBalance(wallets[i], senders[i], parseOkb('0.0002'), `owner${i + 1}/transfer-prefund`)));
                 // buy 已经成功过一次，因此 transfer 的 nonce = 原 nonce + 1，且 initCode = 0x
                 const { userOps: transferUserOps, prefundWeis: transferPrefunds } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
                     ops: idxs.map((i, k) => ({
                         sender: senders[i],
-                        nonce: accountInfos[i].nonce + 1n,
+                        nonce: transferNonces[k],
                         callData: transferCallDatas[k],
                         initCode: '0x',
                     })),
                 });
-                await mapWithConcurrency(idxs, 6, async (i, k) => {
-                    await this.aaManager.ensureSenderBalance(wallets[i], senders[i], transferPrefunds[k] + parseOkb('0.00005'), `owner${i + 1}/transfer-fund`);
-                });
-                const signedTransfer = await mapWithConcurrency(transferUserOps, 10, async (op, k) => this.aaManager.signUserOp(op, wallets[idxs[k]]));
+                await Promise.all(idxs.map((i, k) => this.aaManager.ensureSenderBalance(wallets[i], senders[i], transferPrefunds[k] + parseOkb('0.00005'), `owner${i + 1}/transfer-fund`)));
+                const signedTransfer = await Promise.all(transferUserOps.map((op, k) => this.aaManager.signUserOp(op, wallets[idxs[k]])));
                 const transferOps = signedTransfer.map((s) => s.userOp);
                 transferResult =
                     (await this.runHandleOps('transferBundle', transferOps, bundlerSigner, beneficiary)) ?? undefined;
@@ -456,11 +417,15 @@ export class BundleExecutor {
         // ✅ 批量获取 accountInfo（含 sender/nonce/deployed），避免循环内重复 getAccountInfo
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const senders = accountInfos.map((ai) => ai.sender);
+        const nonceMap = new AANonceMap();
+        for (const ai of accountInfos)
+            nonceMap.init(ai.sender, ai.nonce);
         const tokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, senders);
         const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders);
         // 1. 检查授权，必要时先 approve
         const approveItems = [];
         const didApprove = new Array(wallets.length).fill(false);
+        const touched = new Array(wallets.length).fill(false); // 任意阶段使用过 UserOp（用于决定 initCode=0x）
         for (let i = 0; i < wallets.length; i++) {
             const sender = senders[i];
             const balance = tokenBalances.get(sender) ?? 0n;
@@ -471,8 +436,9 @@ export class BundleExecutor {
                 continue;
             const ai = accountInfos[i];
             const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
-            approveItems.push({ i, sender, nonce: ai.nonce, initCode });
+            approveItems.push({ i, sender, nonce: nonceMap.next(sender), initCode });
             didApprove[i] = true;
+            touched[i] = true;
         }
         const approveOps = [];
         if (approveItems.length > 0) {
@@ -503,8 +469,9 @@ export class BundleExecutor {
             const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
             // approve 已单独打包并等待确认，因此这里不需要用“needApprove=真”去走保守 callGasLimit
             const needApprove = false;
-            const nonce = ai.nonce + (didApprove[i] ? 1n : 0n);
+            const nonce = nonceMap.next(sender);
             sellItems.push({ i, sender, nonce, initCode: didApprove[i] ? '0x' : initCode, needApprove, sellAmount });
+            touched[i] = true;
         }
         if (sellItems.length > 0) {
             const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
@@ -524,24 +491,15 @@ export class BundleExecutor {
             const withdrawOps = [];
             // 批量获取 sender OKB 余额
             const okbBalances = await this.portalQuery.getMultipleOkbBalances(senders);
-            // 计算 sell 后的下一 nonce
-            const nextNonces = new Array(wallets.length).fill(0n);
-            const sold = new Array(wallets.length).fill(false);
-            for (const it of sellItems) {
-                sold[it.i] = true;
-            }
-            for (let i = 0; i < wallets.length; i++) {
-                const ai = accountInfos[i];
-                const sellNonceUsed = ai.nonce + (didApprove[i] ? 1n : 0n);
-                nextNonces[i] = sold[i] ? (sellNonceUsed + 1n) : (ai.nonce + (didApprove[i] ? 1n : 0n));
-            }
             const withdrawItems = wallets.map((w, i) => ({
                 i,
                 ownerWallet: w,
                 sender: senders[i],
                 senderBalance: okbBalances.get(senders[i]) ?? 0n,
-                nonce: nextNonces[i],
-                initCode: (accountInfos[i].deployed || didApprove[i] || sold[i]) ? '0x' : this.aaManager.generateInitCode(wallets[i].address),
+                // ⚠️ 这里 nonce 用 peek（不消耗），只有确实生成 withdraw op 才 commit
+                nonce: nonceMap.peek(senders[i]),
+                // 如果该 sender 在 approve/sell 阶段已经出现过（或原本已部署），则 withdraw 不再需要 initCode
+                initCode: (accountInfos[i].deployed || touched[i]) ? '0x' : this.aaManager.generateInitCode(wallets[i].address),
             }));
             const signedWithdraws = await mapWithConcurrency(withdrawItems, 3, async (it) => {
                 const signed = await this.buildWithdrawUserOpWithState({
@@ -553,6 +511,8 @@ export class BundleExecutor {
                     reserveWei,
                     ownerName: `owner${it.i + 1}`,
                 });
+                if (signed?.userOp)
+                    nonceMap.commit(it.sender, it.nonce);
                 return signed?.userOp ?? null;
             });
             for (const op of signedWithdraws) {
@@ -587,6 +547,9 @@ export class BundleExecutor {
         // ✅ 批量获取 accountInfo（含 sender/nonce/deployed）
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const senders = accountInfos.map((ai) => ai.sender);
+        const nonceMap = new AANonceMap();
+        for (const ai of accountInfos)
+            nonceMap.init(ai.sender, ai.nonce);
         // 1. 买入（批量估算 + 并发补余额 + 并发签名）
         const buyWeis = buyAmounts.map((a) => parseOkb(a));
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
@@ -603,7 +566,7 @@ export class BundleExecutor {
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
             ops: accountInfos.map((ai, i) => ({
                 sender: ai.sender,
-                nonce: ai.nonce,
+                nonce: nonceMap.next(ai.sender),
                 callData: buyCallDatas[i],
                 initCode: initCodes[i],
             })),
@@ -632,19 +595,18 @@ export class BundleExecutor {
             }
             const allowance = allowances.get(sender) ?? 0n;
             const needApprove = allowance < balance;
-            // buy 已在上一笔 handleOps 执行，因此 nonce = 原 nonce + 1
-            let nonce = accountInfos[i].nonce + 1n;
             const initCode = '0x';
             const out = [];
             if (needApprove) {
+                const nonce = nonceMap.next(sender);
                 const approveOp = await this.buildApproveUserOp(w, tokenAddress, this.portalAddress, sender, nonce, initCode, `owner${i + 1}`);
                 out.push(approveOp.userOp);
-                nonce = nonce + 1n;
             }
             const sellAmount = (balance * BigInt(sellPercent)) / 100n;
             if (sellAmount === 0n)
                 return out;
-            const sellOp = await this.buildSellUserOp(w, tokenAddress, sellAmount, sender, nonce, initCode, needApprove, `owner${i + 1}`);
+            const sellNonce = nonceMap.next(sender);
+            const sellOp = await this.buildSellUserOp(w, tokenAddress, sellAmount, sender, sellNonce, initCode, needApprove, `owner${i + 1}`);
             out.push(sellOp.userOp);
             return out;
         });
@@ -660,22 +622,12 @@ export class BundleExecutor {
             const withdrawOps = [];
             // 批量获取 OKB 余额（sell 后状态）
             const okbBalances = await this.portalQuery.getMultipleOkbBalances(senders);
-            // sell handleOps 里每个 wallet：一定有 sell op（balance>0）且可能还有 approve op
-            const nextNonces = wallets.map((_, i) => {
-                const sender = senders[i];
-                const bal = tokenBalances.get(sender) ?? 0n;
-                if (bal === 0n)
-                    return accountInfos[i].nonce + 1n; // buy 后但未 sell
-                const allowance = allowances.get(sender) ?? 0n;
-                const needApprove = allowance < bal;
-                return accountInfos[i].nonce + 1n + (needApprove ? 2n : 1n);
-            });
             const withdrawItems = wallets.map((w, i) => ({
                 i,
                 ownerWallet: w,
                 sender: senders[i],
                 senderBalance: okbBalances.get(senders[i]) ?? 0n,
-                nonce: nextNonces[i],
+                nonce: nonceMap.peek(senders[i]),
                 initCode: '0x',
             }));
             const signedWithdraws = await mapWithConcurrency(withdrawItems, 3, async (it) => {
@@ -688,6 +640,8 @@ export class BundleExecutor {
                     reserveWei,
                     ownerName: `owner${it.i + 1}`,
                 });
+                if (signed?.userOp)
+                    nonceMap.commit(it.sender, it.nonce);
                 return signed?.userOp ?? null;
             });
             for (const op of signedWithdraws) {

package/dist/xlayer/bundler.js

@@ -4,7 +4,6 @@
  * 与 Particle Bundler 交互，提供 ERC-4337 相关 RPC 方法
  */
 import { PARTICLE_BUNDLER_URL, XLAYER_CHAIN_ID, ENTRYPOINT_V06, } from './constants.js';
-import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // Bundler 客户端类
 // ============================================================================
@@ -152,35 +151,17 @@ export class BundlerClient {
     async estimateUserOperationGasBatch(userOps) {
         if (userOps.length === 0)
             return [];
-        const maxBatchSize = 30;
-        const maxSingleConcurrency = 4;
-        const estimateChunk = async (chunk, batchSize) => {
-            if (chunk.length === 0)
-                return [];
-            if (batchSize <= 1 || chunk.length === 1) {
-                // 最终兜底：受控并发的单请求（避免 Promise.all 突发）
-                return await mapWithConcurrency(chunk, maxSingleConcurrency, async (op) => await this.estimateUserOperationGas(op));
-            }
-            const out = [];
-            for (let cursor = 0; cursor < chunk.length; cursor += batchSize) {
-                const slice = chunk.slice(cursor, cursor + batchSize);
-                try {
-                    const res = await this.rpcBatch(slice.map((op) => ({
-                        method: 'eth_estimateUserOperationGas',
-                        params: [op, this.entryPoint],
-                    })));
-                    out.push(...res);
-                }
-                catch (err) {
-                    // 降级：拆分为更小 batch（直到 1）
-                    const next = Math.max(1, Math.floor(batchSize / 2));
-                    const res = await estimateChunk(slice, next);
-                    out.push(...res);
-                }
-            }
-            return out;
-        };
-        return await estimateChunk(userOps, Math.min(maxBatchSize, userOps.length));
+        // 先尝试 batch（显著降低 HTTP 往返次数）
+        try {
+            return await this.rpcBatch(userOps.map((op) => ({
+                method: 'eth_estimateUserOperationGas',
+                params: [op, this.entryPoint],
+            })));
+        }
+        catch {
+            // fallback：并发单请求（比串行快，但可能触发限流）
+            return await Promise.all(userOps.map((op) => this.estimateUserOperationGas(op)));
+        }
     }
     /**
      * 发送 UserOperation

package/dist/xlayer/portal-ops.d.ts

@@ -57,7 +57,6 @@ export declare class PortalQuery {
     private portal;
     private portalAddress;
     constructor(config?: PortalQueryConfig);
-    private multicallAggregate3;
     /**
      * 获取 Provider
      */