four-flap-meme-sdk 1.5.20 → 1.5.22

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）
      */