four-flap-meme-sdk 1.5.20 → 1.5.21

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -0,0 +1,16 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
+/**
+ * 验证公钥格式（Base64）
+ */
+export declare function validatePublicKey(publicKeyBase64: string): boolean;

package/dist/flap/portal-bundle-merkle/encryption.js

@@ -0,0 +1,146 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 获取全局 crypto 对象（最简单直接的方式）
+ */
+function getCryptoAPI() {
+    // 尝试所有可能的全局对象，优先浏览器环境
+    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
+        (typeof self !== 'undefined' && self.crypto) ||
+        (typeof global !== 'undefined' && global.crypto) ||
+        (typeof globalThis !== 'undefined' && globalThis.crypto);
+    if (!cryptoObj) {
+        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
+            '请确保在 HTTPS 或 localhost 下运行');
+    }
+    return cryptoObj;
+}
+/**
+ * 获取 SubtleCrypto（用于加密操作）
+ */
+function getSubtleCrypto() {
+    const crypto = getCryptoAPI();
+    if (!crypto.subtle) {
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
+        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
+            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
+            '3) 不在无痕/隐私浏览模式下');
+    }
+    return crypto.subtle;
+}
+/**
+ * Base64 转 ArrayBuffer（优先使用浏览器 API）
+ */
+function base64ToArrayBuffer(base64) {
+    // 浏览器环境（优先）
+    if (typeof atob !== 'undefined') {
+        const binaryString = atob(base64);
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+            bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(base64, 'base64').buffer;
+    }
+    throw new Error('❌ Base64 解码不可用');
+}
+/**
+ * ArrayBuffer 转 Base64（优先使用浏览器 API）
+ */
+function arrayBufferToBase64(buffer) {
+    // 浏览器环境（优先）
+    if (typeof btoa !== 'undefined') {
+        const bytes = new Uint8Array(buffer);
+        let binary = '';
+        for (let i = 0; i < bytes.length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(buffer).toString('base64');
+    }
+    throw new Error('❌ Base64 编码不可用');
+}
+/**
+ * 生成随机 Hex 字符串
+ */
+function randomHex(length) {
+    const crypto = getCryptoAPI();
+    const array = new Uint8Array(length);
+    crypto.getRandomValues(array);
+    return Array.from(array)
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join('');
+}
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
+    try {
+        // 0. 获取 SubtleCrypto 和 Crypto API
+        const subtle = getSubtleCrypto();
+        const crypto = getCryptoAPI();
+        // 1. 准备数据
+        const payload = {
+            signedTransactions,
+            timestamp: Date.now(),
+            nonce: randomHex(8)
+        };
+        const plaintext = JSON.stringify(payload);
+        // 2. 生成临时 ECDH 密钥对
+        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
+        // 3. 导入服务器公钥
+        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
+        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
+        // 4. 派生共享密钥（AES-256）
+        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
+        // 5. AES-GCM 加密
+        const iv = crypto.getRandomValues(new Uint8Array(12));
+        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
+        // 6. 导出临时公钥
+        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
+        // 7. 返回加密包（JSON 格式）
+        return JSON.stringify({
+            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
+            i: arrayBufferToBase64(iv.buffer), // IV
+            d: arrayBufferToBase64(encrypted) // 密文
+        });
+    }
+    catch (error) {
+        throw new Error(`加密失败: ${error?.message || String(error)}`);
+    }
+}
+/**
+ * 验证公钥格式（Base64）
+ */
+export function validatePublicKey(publicKeyBase64) {
+    try {
+        if (!publicKeyBase64)
+            return false;
+        // Base64 字符集验证
+        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
+            return false;
+        // ECDH P-256 公钥固定长度 65 字节（未压缩）
+        // Base64 编码后约 88 字符
+        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
+            return false;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/utils/concurrency.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 并发映射工具（SDK 内部使用）
+ * - 用于将可并行的异步任务按并发上限执行，避免 RPC/Bundler 限流或超时
+ */
+export declare function mapWithConcurrency<T, R>(items: T[], limit: number, fn: (item: T, idx: number) => Promise<R>): Promise<R[]>;

package/dist/utils/concurrency.js

@@ -0,0 +1,19 @@
+/**
+ * 并发映射工具（SDK 内部使用）
+ * - 用于将可并行的异步任务按并发上限执行，避免 RPC/Bundler 限流或超时
+ */
+export async function mapWithConcurrency(items, limit, fn) {
+    const res = new Array(items.length);
+    let idx = 0;
+    const n = Math.max(1, Math.min(Number(limit || 1), items.length || 1));
+    const workers = Array.from({ length: n }).map(async () => {
+        while (true) {
+            const i = idx++;
+            if (i >= items.length)
+                return;
+            res[i] = await fn(items[i], i);
+        }
+    });
+    await Promise.all(workers);
+    return res;
+}

package/dist/xlayer/aa-account.d.ts

@@ -21,6 +21,7 @@ import { BundlerClient } from './bundler.js';
  */
 export declare class AAAccountManager {
     private provider;
+    private rpcUrl;
     private chainId;
     private factory;
     private entryPoint;
@@ -31,6 +32,7 @@ export declare class AAAccountManager {
     private paymaster?;
     private paymasterData?;
     private gasLimitMultiplier;
+    private senderCache;
     constructor(config?: XLayerConfig);
     /**
      * 获取 Provider
@@ -60,6 +62,14 @@ export declare class AAAccountManager {
      * @returns 预测的 Sender 地址
      */
     predictSenderAddress(ownerAddress: string, salt?: bigint): Promise<string>;
+    private rpcBatch;
+    private multicallAggregate3;
+    private predictSendersByOwnersFast;
+    /**
+     * 批量预测 Sender 地址（只做地址预测，不额外查询 nonce/balance/code）
+     * - 用于“生成/导入钱包”场景：更快、更省 RPC
+     */
+    predictSendersBatch(ownerAddresses: string[], salt?: bigint): Promise<string[]>;
     /**
      * 获取完整的 AA 账户信息
      */

package/dist/xlayer/aa-account.js

@@ -8,8 +8,9 @@
  * - initCode 生成
  */
 import { ethers, JsonRpcProvider, Wallet, Contract, Interface } from 'ethers';
-import { XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, DEFAULT_SALT, DEFAULT_GAS_PRICE, GAS_LIMIT_MULTIPLIER, VERIFICATION_GAS_LIMIT_DEPLOY, VERIFICATION_GAS_LIMIT_NORMAL, PRE_VERIFICATION_GAS, FACTORY_ABI, ENTRYPOINT_ABI, SIMPLE_ACCOUNT_ABI, } from './constants.js';
+import { XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, DEFAULT_SALT, DEFAULT_GAS_PRICE, GAS_LIMIT_MULTIPLIER, VERIFICATION_GAS_LIMIT_DEPLOY, VERIFICATION_GAS_LIMIT_NORMAL, PRE_VERIFICATION_GAS, FACTORY_ABI, ENTRYPOINT_ABI, SIMPLE_ACCOUNT_ABI, ZERO_ADDRESS, MULTICALL3, } from './constants.js';
 import { BundlerClient } from './bundler.js';
+import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // AA 账户管理器
 // ============================================================================
@@ -24,8 +25,10 @@ import { BundlerClient } from './bundler.js';
  */
 export class AAAccountManager {
     constructor(config = {}) {
+        this.senderCache = new Map(); // key: ownerLower -> sender
         this.chainId = config.chainId ?? XLAYER_CHAIN_ID;
         const rpcUrl = config.rpcUrl ?? DEFAULT_RPC_URL;
+        this.rpcUrl = rpcUrl;
         this.provider = new JsonRpcProvider(rpcUrl, {
             chainId: this.chainId,
             name: 'xlayer',
@@ -88,6 +91,148 @@ export class AAAccountManager {
         // 这比 getAddress 更可靠（某些链上 getAddress 有问题）
         return await this.factory.createAccount.staticCall(ownerAddress, useSalt);
     }
+    // ============================================================================
+    // 内部：RPC batch / multicall（性能优化）
+    // ============================================================================
+    async rpcBatch(items, timeoutMs = 20000) {
+        if (items.length === 0)
+            return [];
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), timeoutMs);
+        try {
+            const body = items.map((it, i) => ({
+                jsonrpc: '2.0',
+                id: i + 1,
+                method: it.method,
+                params: it.params,
+            }));
+            const res = await fetch(this.rpcUrl, {
+                method: 'POST',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify(body),
+                signal: controller.signal,
+            });
+            const text = await res.text();
+            let data;
+            try {
+                data = JSON.parse(text);
+            }
+            catch {
+                throw new Error(`RPC batch 非 JSON 响应 (HTTP ${res.status}): ${text.slice(0, 400)}`);
+            }
+            if (!res.ok) {
+                throw new Error(`RPC batch HTTP ${res.status}: ${JSON.stringify(data).slice(0, 800)}`);
+            }
+            if (!Array.isArray(data)) {
+                throw new Error(`RPC batch 响应格式错误: ${JSON.stringify(data).slice(0, 800)}`);
+            }
+            const byId = new Map();
+            for (const r of data) {
+                const id = Number(r?.id);
+                if (r?.error)
+                    throw new Error(`RPC batch error: ${JSON.stringify(r.error)}`);
+                if (Number.isFinite(id))
+                    byId.set(id, r?.result);
+            }
+            return items.map((_, i) => byId.get(i + 1));
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    async multicallAggregate3(params) {
+        const mcIface = new Interface([
+            'function aggregate3((address target,bool allowFailure,bytes callData)[] calls) view returns ((bool success,bytes returnData)[] returnData)',
+        ]);
+        const data = mcIface.encodeFunctionData('aggregate3', [params.calls]);
+        const raw = await this.provider.call({ to: MULTICALL3, data });
+        const decoded = mcIface.decodeFunctionResult('aggregate3', raw)?.[0];
+        return decoded || [];
+    }
+    async predictSendersByOwnersFast(ownerAddresses, salt) {
+        const useSalt = salt ?? this.salt;
+        const owners = ownerAddresses.map((a) => String(a || '').trim()).filter(Boolean);
+        if (owners.length === 0)
+            return [];
+        const out = new Array(owners.length).fill('');
+        const need = [];
+        // 缓存命中（owner->sender）
+        for (let i = 0; i < owners.length; i++) {
+            const key = owners[i].toLowerCase();
+            const hit = this.senderCache.get(key);
+            if (hit)
+                out[i] = hit;
+            else
+                need.push({ idx: i, owner: owners[i] });
+        }
+        if (need.length === 0)
+            return out;
+        const factoryIface = new Interface(FACTORY_ABI);
+        const calls = need.map((x) => ({
+            target: this.factoryAddress,
+            allowFailure: true,
+            callData: factoryIface.encodeFunctionData('getAddress', [x.owner, useSalt]),
+        }));
+        // 分批 multicall，避免 callData 过大
+        const BATCH = 300;
+        for (let cursor = 0; cursor < calls.length; cursor += BATCH) {
+            const sliceCalls = calls.slice(cursor, cursor + BATCH);
+            const sliceNeed = need.slice(cursor, cursor + BATCH);
+            try {
+                const res = await this.multicallAggregate3({ calls: sliceCalls });
+                for (let i = 0; i < res.length; i++) {
+                    const r = res[i];
+                    const { idx, owner } = sliceNeed[i];
+                    if (!r?.success || !r.returnData || r.returnData === '0x')
+                        continue;
+                    try {
+                        const decoded = factoryIface.decodeFunctionResult('getAddress', r.returnData);
+                        const addr = String(decoded?.[0] || '').trim();
+                        if (addr && addr !== ZERO_ADDRESS) {
+                            out[idx] = addr;
+                            this.senderCache.set(owner.toLowerCase(), addr);
+                        }
+                    }
+                    catch { /* ignore */ }
+                }
+            }
+            catch {
+                // ignore：fallback below
+            }
+        }
+        // fallback：对仍然缺失的，使用 createAccount.staticCall（更可靠但更慢），并控制并发
+        const missingIdxs = [];
+        for (let i = 0; i < owners.length; i++) {
+            if (!out[i])
+                missingIdxs.push(i);
+        }
+        if (missingIdxs.length > 0) {
+            const filled = await mapWithConcurrency(missingIdxs, 6, async (idx) => {
+                const owner = owners[idx];
+                try {
+                    const sender = await this.factory.createAccount.staticCall(owner, useSalt);
+                    return { idx, owner, sender: String(sender) };
+                }
+                catch {
+                    return { idx, owner, sender: '' };
+                }
+            });
+            for (const it of filled) {
+                if (it.sender) {
+                    out[it.idx] = it.sender;
+                    this.senderCache.set(it.owner.toLowerCase(), it.sender);
+                }
+            }
+        }
+        return out;
+    }
+    /**
+     * 批量预测 Sender 地址（只做地址预测，不额外查询 nonce/balance/code）
+     * - 用于“生成/导入钱包”场景：更快、更省 RPC
+     */
+    async predictSendersBatch(ownerAddresses, salt) {
+        return await this.predictSendersByOwnersFast(ownerAddresses, salt);
+    }
     /**
      * 获取完整的 AA 账户信息
      */
@@ -346,7 +491,86 @@ export class AAAccountManager {
      * 批量获取多个 owner 的 AA 账户信息
      */
     async getMultipleAccountInfo(ownerAddresses) {
-        return Promise.all(ownerAddresses.map((addr) => this.getAccountInfo(addr)));
+        const owners = ownerAddresses.map((a) => String(a || '').trim()).filter(Boolean);
+        if (owners.length === 0)
+            return [];
+        // 1) 批量预测 sender（优先 getAddress+multicall，失败回退 createAccount.staticCall）
+        const senders = await this.predictSendersByOwnersFast(owners);
+        // 2) 批量 getNonce（multicall EntryPoint.getNonce）
+        const epIface = new Interface(ENTRYPOINT_ABI);
+        const nonceCalls = senders.map((sender) => ({
+            target: this.entryPointAddress,
+            allowFailure: true,
+            callData: epIface.encodeFunctionData('getNonce', [sender, 0]),
+        }));
+        const nonces = new Array(senders.length).fill(0n);
+        const BATCH = 350;
+        for (let cursor = 0; cursor < nonceCalls.length; cursor += BATCH) {
+            const sliceCalls = nonceCalls.slice(cursor, cursor + BATCH);
+            const res = await this.multicallAggregate3({ calls: sliceCalls });
+            for (let i = 0; i < res.length; i++) {
+                const r = res[i];
+                const idx = cursor + i;
+                if (!r?.success || !r.returnData || r.returnData === '0x')
+                    continue;
+                try {
+                    const decoded = epIface.decodeFunctionResult('getNonce', r.returnData);
+                    nonces[idx] = BigInt(decoded?.[0] ?? 0n);
+                }
+                catch { /* ignore */ }
+            }
+        }
+        // 3) 批量 getCode + getBalance（JSON-RPC batch；分块避免请求体过大）
+        const codes = new Array(senders.length).fill('0x');
+        const balances = new Array(senders.length).fill(0n);
+        const CHUNK = 200;
+        for (let cursor = 0; cursor < senders.length; cursor += CHUNK) {
+            const slice = senders.slice(cursor, cursor + CHUNK);
+            try {
+                const reqs = [];
+                for (const s of slice) {
+                    reqs.push({ method: 'eth_getCode', params: [s, 'latest'] });
+                }
+                for (const s of slice) {
+                    reqs.push({ method: 'eth_getBalance', params: [s, 'latest'] });
+                }
+                const results = await this.rpcBatch(reqs);
+                const codePart = results.slice(0, slice.length);
+                const balPart = results.slice(slice.length);
+                for (let i = 0; i < slice.length; i++) {
+                    const idx = cursor + i;
+                    const c = codePart[i];
+                    const b = balPart[i];
+                    if (typeof c === 'string')
+                        codes[idx] = c;
+                    try {
+                        balances[idx] = typeof b === 'string' ? BigInt(b) : 0n;
+                    }
+                    catch {
+                        balances[idx] = 0n;
+                    }
+                }
+            }
+            catch {
+                // fallback：节点不支持 batch 时，改为并发单请求（控制并发）
+                const fetched = await mapWithConcurrency(slice, 8, async (s) => {
+                    const [code, bal] = await Promise.all([this.provider.getCode(s), this.provider.getBalance(s)]);
+                    return { s, code, bal };
+                });
+                for (let i = 0; i < fetched.length; i++) {
+                    const idx = cursor + i;
+                    codes[idx] = fetched[i].code ?? '0x';
+                    balances[idx] = fetched[i].bal ?? 0n;
+                }
+            }
+        }
+        return owners.map((owner, i) => ({
+            owner,
+            sender: senders[i],
+            deployed: codes[i] != null && String(codes[i]) !== '0x',
+            balance: balances[i] ?? 0n,
+            nonce: nonces[i] ?? 0n,
+        }));
     }
 }
 // ============================================================================
@@ -428,20 +652,24 @@ export async function generateAAWallets(params) {
         const wallet = Wallet.createRandom();
         const owner = wallet.address;
         const privateKey = wallet.privateKey;
-        // 预测 AA 地址
-        const sender = await manager.predictSenderAddress(owner);
         wallets.push({
             index: i + 1,
             owner,
             privateKey,
-            sender,
+            sender: '',
         });
         owners.push(owner);
         privateKeys.push(privateKey);
-        senders.push(sender);
+        senders.push('');
+    }
+    // ✅ 批量预测 sender（比逐个 staticCall 快很多）
+    const sendersPredicted = await manager.predictSendersBatch(owners);
+    for (let i = 0; i < wallets.length; i++) {
+        wallets[i].sender = sendersPredicted[i] || '';
+        senders[i] = sendersPredicted[i] || '';
         console.log(`#${i + 1}`);
-        console.log(`  Owner:  ${owner}`);
-        console.log(`  Sender: ${sender}`);
+        console.log(`  Owner:  ${owners[i]}`);
+        console.log(`  Sender: ${senders[i]}`);
     }
     // 生成格式化输出
     const formatted = formatWalletOutput(wallets);
@@ -468,29 +696,34 @@ export async function generateAAWalletsFromMnemonic(mnemonic, count, startIndex
     const privateKeys = [];
     const senders = [];
     console.log(`\n从助记词派生 ${count} 个 XLayer AA 钱包 (起始索引: ${startIndex})...\n`);
+    const paths = [];
     for (let i = 0; i < count; i++) {
         const index = startIndex + i;
         const path = `m/44'/60'/0'/0/${index}`;
+        paths.push(path);
         // 从助记词派生
         const hdNode = ethers.HDNodeWallet.fromPhrase(mnemonic, undefined, path);
         const owner = hdNode.address;
         const privateKey = hdNode.privateKey;
-        // 预测 AA 地址
-        const sender = await manager.predictSenderAddress(owner);
         wallets.push({
             index: i + 1,
             owner,
             privateKey,
-            sender,
+            sender: '',
             mnemonic: i === 0 ? mnemonic : undefined, // 只在第一个记录助记词
             derivationPath: path,
         });
         owners.push(owner);
         privateKeys.push(privateKey);
-        senders.push(sender);
-        console.log(`#${i + 1} (path: ${path})`);
-        console.log(`  Owner:  ${owner}`);
-        console.log(`  Sender: ${sender}`);
+        senders.push('');
+    }
+    const sendersPredicted = await manager.predictSendersBatch(owners);
+    for (let i = 0; i < wallets.length; i++) {
+        wallets[i].sender = sendersPredicted[i] || '';
+        senders[i] = sendersPredicted[i] || '';
+        console.log(`#${i + 1} (path: ${paths[i]})`);
+        console.log(`  Owner:  ${owners[i]}`);
+        console.log(`  Sender: ${senders[i]}`);
     }
     const formatted = formatWalletOutput(wallets, mnemonic);
     return {
@@ -516,18 +749,22 @@ export async function predictSendersFromPrivateKeys(privateKeys, config) {
     for (let i = 0; i < privateKeys.length; i++) {
         const wallet = new Wallet(privateKeys[i]);
         const owner = wallet.address;
-        const sender = await manager.predictSenderAddress(owner);
         wallets.push({
             index: i + 1,
             owner,
             privateKey: privateKeys[i],
-            sender,
+            sender: '',
         });
         owners.push(owner);
-        senders.push(sender);
+        senders.push('');
+    }
+    const sendersPredicted = await manager.predictSendersBatch(owners);
+    for (let i = 0; i < wallets.length; i++) {
+        wallets[i].sender = sendersPredicted[i] || '';
+        senders[i] = sendersPredicted[i] || '';
         console.log(`#${i + 1}`);
-        console.log(`  Owner:  ${owner}`);
-        console.log(`  Sender: ${sender}`);
+        console.log(`  Owner:  ${owners[i]}`);
+        console.log(`  Sender: ${senders[i]}`);
     }
     const formatted = formatWalletOutput(wallets);
     return {

package/dist/xlayer/bundle.d.ts

@@ -52,6 +52,11 @@ export declare class BundleExecutor {
      * 构建归集 UserOp（将 OKB 从 sender 转回 owner）
      */
     private buildWithdrawUserOp;
+    /**
+     * 构建归集 UserOp（已知 sender/nonce/balance 的快速版本）
+     * - 用于批量流程：避免重复 getAccountInfo / getOkbBalance
+     */
+    private buildWithdrawUserOpWithState;
     /**
      * 构建代币转账 UserOp（将代币从 sender 转回 owner）
      */

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.21",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",