four-flap-meme-sdk 1.5.20 → 1.5.22

package/dist/xlayer/bundle.js

@@ -11,6 +11,7 @@ import { Wallet, Interface, Contract } from 'ethers';
 import { FLAP_PORTAL, ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
 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';
 // ============================================================================
 // 捆绑交易执行器
 // ============================================================================
@@ -129,45 +130,46 @@ export class BundleExecutor {
     /**
      * 构建授权 UserOp
      */
-    async buildApproveUserOp(ownerWallet, tokenAddress, spender, nonce, ownerName) {
-        const accountInfo = await this.aaManager.getAccountInfo(ownerWallet.address);
+    async buildApproveUserOp(ownerWallet, tokenAddress, spender, sender, nonce, initCode, ownerName) {
         const approveData = encodeApproveCall(spender);
         const callData = encodeExecute(tokenAddress, 0n, approveData);
-        await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/approve-prefund`);
+        await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/approve-prefund`);
         const { userOp, prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
             ownerWallet,
-            sender: accountInfo.sender,
+            sender,
             callData,
             nonce,
+            initCode,
         });
-        await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/approve-fund`);
+        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 };
     }
     /**
      * 构建卖出 UserOp
      */
-    async buildSellUserOp(ownerWallet, tokenAddress, sellAmount, nonce, needApprove, ownerName) {
-        const accountInfo = await this.aaManager.getAccountInfo(ownerWallet.address);
+    async buildSellUserOp(ownerWallet, tokenAddress, sellAmount, sender, nonce, initCode, needApprove, ownerName) {
         const sellData = encodeSellCall(tokenAddress, sellAmount, 0n);
         const callData = encodeExecute(this.portalAddress, 0n, sellData);
-        await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, parseOkb('0.0003'), `${ownerName ?? 'owner'}/sell-prefund`);
+        await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0003'), `${ownerName ?? 'owner'}/sell-prefund`);
         // 如果需要 approve（还未执行），estimateGas 会 revert，使用固定值
         const { userOp, prefundWei } = needApprove
             ? await this.aaManager.buildUserOpWithLocalEstimate({
                 ownerWallet,
-                sender: accountInfo.sender,
+                sender,
                 callData,
                 nonce,
+                initCode,
                 callGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL,
             })
             : await this.aaManager.buildUserOpWithLocalEstimate({
                 ownerWallet,
-                sender: accountInfo.sender,
+                sender,
                 callData,
                 nonce,
+                initCode,
             });
-        await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/sell-fund`);
+        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 };
     }
@@ -177,39 +179,56 @@ export class BundleExecutor {
     async buildWithdrawUserOp(ownerWallet, reserveWei, ownerName) {
         const accountInfo = await this.aaManager.getAccountInfo(ownerWallet.address);
         const senderBalance = await this.portalQuery.getOkbBalance(accountInfo.sender);
-        if (senderBalance <= reserveWei) {
-            console.log(`\n[${ownerName ?? 'owner'}] sender OKB 太少，跳过归集：${formatOkb(senderBalance)} OKB`);
+        const initCode = accountInfo.deployed ? '0x' : this.aaManager.generateInitCode(ownerWallet.address);
+        return await this.buildWithdrawUserOpWithState({
+            ownerWallet,
+            sender: accountInfo.sender,
+            nonce: accountInfo.nonce,
+            initCode,
+            senderBalance,
+            reserveWei,
+            ownerName,
+        });
+    }
+    /**
+     * 构建归集 UserOp（已知 sender/nonce/balance 的快速版本）
+     * - 用于批量流程：避免重复 getAccountInfo / getOkbBalance
+     */
+    async buildWithdrawUserOpWithState(params) {
+        const senderBalance = params.senderBalance;
+        if (senderBalance <= params.reserveWei) {
+            console.log(`\n[${params.ownerName ?? 'owner'}] sender OKB 太少，跳过归集：${formatOkb(senderBalance)} OKB`);
             return null;
         }
-        // 先估算 prefund
-        const tempCallData = encodeExecute(ownerWallet.address, 0n, '0x');
-        await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/withdraw-prefund`);
+        // 先估算 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 { prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
-            ownerWallet,
-            sender: accountInfo.sender,
+            ownerWallet: params.ownerWallet,
+            sender: params.sender,
             callData: tempCallData,
-            nonce: accountInfo.nonce,
+            nonce: params.nonce,
+            initCode: params.initCode,
         });
-        // 计算可归集金额
-        const currentBalance = await this.portalQuery.getOkbBalance(accountInfo.sender);
-        const withdrawAmount = currentBalance > prefundWei + reserveWei
-            ? currentBalance - prefundWei - reserveWei
+        // 计算可归集金额（用已知余额近似；fund 发生时余额会变大，属于可接受的保守近似）
+        const withdrawAmount = senderBalance > prefundWei + params.reserveWei
+            ? senderBalance - prefundWei - params.reserveWei
             : 0n;
         if (withdrawAmount <= 0n) {
-            console.log(`\n[${ownerName ?? 'owner'}] 归集后可转出=0（余额不足以覆盖 prefund+reserve）`);
+            console.log(`\n[${params.ownerName ?? 'owner'}] 归集后可转出=0（余额不足以覆盖 prefund+reserve）`);
             return null;
         }
-        // 真正的 callData
-        const callData = encodeExecute(ownerWallet.address, withdrawAmount, '0x');
+        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = await this.aaManager.buildUserOpWithLocalEstimate({
-            ownerWallet,
-            sender: accountInfo.sender,
+            ownerWallet: params.ownerWallet,
+            sender: params.sender,
             callData,
-            nonce: accountInfo.nonce,
+            nonce: params.nonce,
+            initCode: params.initCode,
         });
-        console.log(`\n[${ownerName ?? 'owner'}] withdraw: ${formatOkb(withdrawAmount)} OKB`);
-        const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
-        return { ...signed, prefundWei, ownerName };
+        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 };
     }
     /**
      * 构建代币转账 UserOp（将代币从 sender 转回 owner）
@@ -338,12 +357,14 @@ export class BundleExecutor {
         console.log('token:', tokenAddress);
         console.log('owners:', wallets.length);
         console.log('sellPercent:', sellPercent);
-        // 获取 sender 列表和余额
-        const senders = await Promise.all(wallets.map((w) => this.aaManager.predictSenderAddress(w.address)));
+        // ✅ 批量获取 accountInfo（含 sender/nonce/deployed），避免循环内重复 getAccountInfo
+        const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
+        const senders = accountInfos.map((ai) => ai.sender);
         const tokenBalances = await this.portalQuery.getMultipleTokenBalances(tokenAddress, senders);
         const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders);
         // 1. 检查授权，必要时先 approve
-        const approveOps = [];
+        const approveItems = [];
+        const didApprove = new Array(wallets.length).fill(false);
         for (let i = 0; i < wallets.length; i++) {
             const sender = senders[i];
             const balance = tokenBalances.get(sender) ?? 0n;
@@ -352,9 +373,20 @@ export class BundleExecutor {
                 continue;
             if (allowance >= balance)
                 continue;
-            const accountInfo = await this.aaManager.getAccountInfo(wallets[i].address);
-            const signed = await this.buildApproveUserOp(wallets[i], tokenAddress, this.portalAddress, accountInfo.nonce, `owner${i + 1}`);
-            approveOps.push(signed.userOp);
+            const ai = accountInfos[i];
+            const initCode = ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address);
+            approveItems.push({ i, sender, nonce: ai.nonce, initCode });
+            didApprove[i] = true;
+        }
+        const approveOps = [];
+        if (approveItems.length > 0) {
+            const signedApproves = await mapWithConcurrency(approveItems, 4, async (it) => {
+                const i = it.i;
+                const signed = await this.buildApproveUserOp(wallets[i], tokenAddress, this.portalAddress, it.sender, it.nonce, it.initCode, `owner${i + 1}`);
+                return { i, userOp: signed.userOp };
+            });
+            for (const r of signedApproves)
+                approveOps.push(r.userOp);
         }
         let approveResult;
         if (approveOps.length > 0) {
@@ -362,6 +394,7 @@ export class BundleExecutor {
         }
         // 2. 卖出
         const sellOps = [];
+        const sellItems = [];
         for (let i = 0; i < wallets.length; i++) {
             const sender = senders[i];
             const balance = tokenBalances.get(sender) ?? 0n;
@@ -370,11 +403,20 @@ export class BundleExecutor {
             const sellAmount = (balance * BigInt(sellPercent)) / 100n;
             if (sellAmount === 0n)
                 continue;
-            const accountInfo = await this.aaManager.getAccountInfo(wallets[i].address);
-            const allowance = allowances.get(sender) ?? 0n;
-            const needApprove = allowance < sellAmount && approveOps.length > 0;
-            const signed = await this.buildSellUserOp(wallets[i], tokenAddress, sellAmount, accountInfo.nonce, needApprove, `owner${i + 1}`);
-            sellOps.push(signed.userOp);
+            const ai = accountInfos[i];
+            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);
+            sellItems.push({ i, sender, nonce, initCode: didApprove[i] ? '0x' : initCode, needApprove, sellAmount });
+        }
+        if (sellItems.length > 0) {
+            const signedSells = await mapWithConcurrency(sellItems, 4, async (it) => {
+                const i = it.i;
+                const signed = await this.buildSellUserOp(wallets[i], tokenAddress, it.sellAmount, it.sender, it.nonce, it.initCode, it.needApprove, `owner${i + 1}`);
+                return signed.userOp;
+            });
+            sellOps.push(...signedSells);
         }
         const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary);
         if (!sellResult) {
@@ -384,11 +426,42 @@ export class BundleExecutor {
         let withdrawResult;
         if (withdrawToOwner) {
             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 signed = await this.buildWithdrawUserOp(wallets[i], reserveWei, `owner${i + 1}`);
-                if (signed) {
-                    withdrawOps.push(signed.userOp);
-                }
+                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),
+            }));
+            const signedWithdraws = await mapWithConcurrency(withdrawItems, 3, async (it) => {
+                const signed = await this.buildWithdrawUserOpWithState({
+                    ownerWallet: it.ownerWallet,
+                    sender: it.sender,
+                    nonce: it.nonce,
+                    initCode: it.initCode,
+                    senderBalance: it.senderBalance,
+                    reserveWei,
+                    ownerName: `owner${it.i + 1}`,
+                });
+                return signed?.userOp ?? null;
+            });
+            for (const op of signedWithdraws) {
+                if (op)
+                    withdrawOps.push(op);
             }
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
@@ -415,15 +488,36 @@ export class BundleExecutor {
         console.log('token:', tokenAddress);
         console.log('owners:', wallets.length);
         console.log('sellPercent:', sellPercent);
-        // 获取 sender 列表
-        const senders = await Promise.all(wallets.map((w) => this.aaManager.predictSenderAddress(w.address)));
-        // 1. 买入
-        const buyOps = [];
-        for (let i = 0; i < wallets.length; i++) {
-            const buyWei = parseOkb(buyAmounts[i]);
-            const signed = await this.buildBuyUserOp(wallets[i], tokenAddress, buyWei, `owner${i + 1}`);
-            buyOps.push(signed.userOp);
-        }
+        // ✅ 批量获取 accountInfo（含 sender/nonce/deployed）
+        const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
+        const senders = accountInfos.map((ai) => ai.sender);
+        // 1. 买入（批量估算 + 并发补余额 + 并发签名）
+        const buyWeis = buyAmounts.map((a) => parseOkb(a));
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            const buyWei = buyWeis[i] ?? 0n;
+            if (buyWei <= 0n)
+                return;
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + 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);
+        });
+        const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
+        const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
+            ops: accountInfos.map((ai, i) => ({
+                sender: ai.sender,
+                nonce: ai.nonce,
+                callData: buyCallDatas[i],
+                initCode: initCodes[i],
+            })),
+        });
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            const buyWei = buyWeis[i] ?? 0n;
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + (prefundWeis[i] ?? 0n) + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+        });
+        const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
+        const buyOps = signedBuy.map((s) => s.userOp);
         const buyResult = await this.runHandleOps('buyBundle', buyOps, bundlerSigner, beneficiary);
         if (!buyResult) {
             throw new Error('买入交易失败');
@@ -433,27 +527,33 @@ export class BundleExecutor {
         const allowances = await this.portalQuery.getMultipleAllowances(tokenAddress, senders);
         // 2. 授权 + 卖出（可以合并到同一笔 handleOps）
         const sellOps = [];
-        for (let i = 0; i < wallets.length; i++) {
+        const sellPerWallet = await mapWithConcurrency(wallets, 4, async (w, i) => {
             const sender = senders[i];
             const balance = tokenBalances.get(sender) ?? 0n;
             if (balance === 0n) {
                 console.log(`[owner${i + 1}] 没买到代币，跳过卖出`);
-                continue;
+                return [];
             }
             const allowance = allowances.get(sender) ?? 0n;
-            let baseNonce = (await this.aaManager.getAccountInfo(wallets[i].address)).nonce;
-            // 如果需要授权，先添加 approve op
             const needApprove = allowance < balance;
+            // buy 已在上一笔 handleOps 执行，因此 nonce = 原 nonce + 1
+            let nonce = accountInfos[i].nonce + 1n;
+            const initCode = '0x';
+            const out = [];
             if (needApprove) {
-                const approveOp = await this.buildApproveUserOp(wallets[i], tokenAddress, this.portalAddress, baseNonce, `owner${i + 1}`);
-                sellOps.push(approveOp.userOp);
-                baseNonce = baseNonce + 1n;
+                const approveOp = await this.buildApproveUserOp(w, tokenAddress, this.portalAddress, sender, nonce, initCode, `owner${i + 1}`);
+                out.push(approveOp.userOp);
+                nonce = nonce + 1n;
             }
-            // 添加 sell op
             const sellAmount = (balance * BigInt(sellPercent)) / 100n;
-            const sellOp = await this.buildSellUserOp(wallets[i], tokenAddress, sellAmount, baseNonce, needApprove, `owner${i + 1}`);
-            sellOps.push(sellOp.userOp);
-        }
+            if (sellAmount === 0n)
+                return out;
+            const sellOp = await this.buildSellUserOp(w, tokenAddress, sellAmount, sender, nonce, initCode, needApprove, `owner${i + 1}`);
+            out.push(sellOp.userOp);
+            return out;
+        });
+        for (const ops of sellPerWallet)
+            sellOps.push(...ops);
         const sellResult = await this.runHandleOps('sellBundle', sellOps, bundlerSigner, beneficiary);
         if (!sellResult) {
             throw new Error('卖出交易失败');
@@ -462,11 +562,41 @@ export class BundleExecutor {
         let withdrawResult;
         if (withdrawToOwner) {
             const withdrawOps = [];
-            for (let i = 0; i < wallets.length; i++) {
-                const signed = await this.buildWithdrawUserOp(wallets[i], reserveWei, `owner${i + 1}`);
-                if (signed) {
-                    withdrawOps.push(signed.userOp);
-                }
+            // 批量获取 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],
+                initCode: '0x',
+            }));
+            const signedWithdraws = await mapWithConcurrency(withdrawItems, 3, async (it) => {
+                const signed = await this.buildWithdrawUserOpWithState({
+                    ownerWallet: it.ownerWallet,
+                    sender: it.sender,
+                    nonce: it.nonce,
+                    initCode: it.initCode,
+                    senderBalance: it.senderBalance,
+                    reserveWei,
+                    ownerName: `owner${it.i + 1}`,
+                });
+                return signed?.userOp ?? null;
+            });
+            for (const op of signedWithdraws) {
+                if (op)
+                    withdrawOps.push(op);
             }
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;

package/package.json

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