four-flap-meme-sdk 1.5.22 → 1.5.24

package/dist/xlayer/bundle.js

@@ -13,6 +13,58 @@ 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;
+    }
+}
+// ============================================================================
 // 捆绑交易执行器
 // ============================================================================
 /**
@@ -278,6 +330,9 @@ 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 场景会自动跳过）
         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) => {
@@ -288,7 +343,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],
             })),
@@ -311,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;
@@ -319,6 +375,7 @@ 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 会自动跳过）
@@ -327,7 +384,7 @@ export class BundleExecutor {
                 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',
                     })),
@@ -360,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;
@@ -375,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) {
@@ -407,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) => {
@@ -428,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({
@@ -457,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) {
@@ -491,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) => {
@@ -507,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],
             })),
@@ -536,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;
         });
@@ -564,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) => {
@@ -592,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/package.json

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