four-flap-meme-sdk 1.5.21 → 1.5.23

package/dist/xlayer/aa-account.js

@@ -8,7 +8,7 @@
  * - 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, ZERO_ADDRESS, MULTICALL3, } from './constants.js';
+import { XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, DEFAULT_SALT, DEFAULT_GAS_PRICE, DEFAULT_CALL_GAS_LIMIT_SELL, 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';
 // ============================================================================
@@ -26,12 +26,16 @@ import { mapWithConcurrency } from '../utils/concurrency.js';
 export class AAAccountManager {
     constructor(config = {}) {
         this.senderCache = new Map(); // key: ownerLower -> sender
+        // PERF: 本文件的改造会尽量减少逐地址 RPC 调用
+        this.deployedSenderSet = new Set(); // key: senderLower（只缓存 deployed=true）
+        this.feeDataCacheTtlMs = 1200;
         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',
+        this.provider = new JsonRpcProvider(rpcUrl, { chainId: this.chainId, name: 'xlayer' }, {
+            // 防止 ethers 自动攒太大的 JSON-RPC batch（XLayer 节点对“大 batch”很敏感）
+            batchMaxCount: 20,
+            batchStallTime: 30,
         });
         this.factoryAddress = config.factory ?? SIMPLE_ACCOUNT_FACTORY;
         this.entryPointAddress = config.entryPoint ?? ENTRYPOINT_V06;
@@ -39,6 +43,9 @@ export class AAAccountManager {
         this.paymaster = config.paymaster;
         this.paymasterData = config.paymasterData;
         this.gasLimitMultiplier = config.gasLimitMultiplier ?? GAS_LIMIT_MULTIPLIER;
+        // 默认 fixed：最大化降低 RPC / bundler 请求；如需更稳可显式传 bundlerEstimate
+        this.defaultGasPolicy = config.gasPolicy ?? 'fixed';
+        this.defaultFixedGas = config.fixedGas;
         this.factory = new Contract(this.factoryAddress, FACTORY_ABI, this.provider);
         this.entryPoint = new Contract(this.entryPointAddress, ENTRYPOINT_ABI, this.provider);
         this.bundler = new BundlerClient({
@@ -76,7 +83,14 @@ export class AAAccountManager {
      * 获取当前 Fee Data
      */
     async getFeeData() {
-        return await this.provider.getFeeData();
+        // 费率在“批量构建 userOp”时会被大量复用；加短 TTL 缓存可显著减少 RPC
+        const now = Date.now();
+        const hit = this.feeDataCache;
+        if (hit && hit.expiresAt > now)
+            return hit.value;
+        const value = await this.provider.getFeeData();
+        this.feeDataCache = { expiresAt: now + this.feeDataCacheTtlMs, value };
+        return value;
     }
     /**
      * 预测 AA Sender 地址
@@ -275,7 +289,7 @@ export class AAAccountManager {
      * 构建未签名的 UserOperation（使用 Bundler 估算 Gas）
      */
     async buildUserOpWithBundlerEstimate(params) {
-        const feeData = await this.provider.getFeeData();
+        const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 构建初步 UserOp（Gas 字段为 0，等待估算）
@@ -324,7 +338,7 @@ export class AAAccountManager {
         if (params.ops.length === 0) {
             return { userOps: [], prefundWeis: [] };
         }
-        const feeData = await this.provider.getFeeData();
+        const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 先构建 skeleton（Gas=0），然后批量估算
@@ -375,7 +389,7 @@ export class AAAccountManager {
      * 适用于无法通过 Bundler 估算的场景（如尚未授权的 sell 操作）
      */
     async buildUserOpWithLocalEstimate(params) {
-        const feeData = await this.provider.getFeeData();
+        const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 估算 callGasLimit
@@ -417,11 +431,43 @@ export class AAAccountManager {
         const prefundWei = paymasterAndData !== '0x' ? 0n : gasTotal * legacyGasPrice;
         return { userOp, prefundWei };
     }
+    /**
+     * 构建未签名的 UserOperation（固定 Gas，不做任何 estimate）
+     *
+     * 适用于大规模（1000 地址）场景：尽量减少 RPC 调用量。
+     */
+    async buildUserOpWithFixedGas(params) {
+        const feeData = await this.getFeeData();
+        const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
+        const paymasterAndData = this.buildPaymasterAndData();
+        const callGasLimit = params.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_SELL;
+        const verificationGasLimit = params.deployed
+            ? (params.fixedGas?.verificationGasLimitDeployed ?? VERIFICATION_GAS_LIMIT_NORMAL)
+            : (params.fixedGas?.verificationGasLimitUndeployed ?? VERIFICATION_GAS_LIMIT_DEPLOY);
+        const preVerificationGas = params.fixedGas?.preVerificationGas ?? PRE_VERIFICATION_GAS;
+        const userOp = {
+            sender: params.sender,
+            nonce: ethers.toBeHex(params.nonce),
+            initCode: params.initCode ?? '0x',
+            callData: params.callData,
+            callGasLimit: ethers.toBeHex(callGasLimit),
+            verificationGasLimit: ethers.toBeHex(verificationGasLimit),
+            preVerificationGas: ethers.toBeHex(preVerificationGas),
+            // XLayer 更像 legacy gasPrice 语义
+            maxFeePerGas: ethers.toBeHex(legacyGasPrice),
+            maxPriorityFeePerGas: ethers.toBeHex(legacyGasPrice),
+            paymasterAndData,
+            signature: '0x',
+        };
+        const gasTotal = callGasLimit + verificationGasLimit + preVerificationGas;
+        const prefundWei = paymasterAndData !== '0x' ? 0n : gasTotal * legacyGasPrice;
+        return { userOp, prefundWei };
+    }
     /**
      * 签名 UserOperation
      */
     async signUserOp(userOp, ownerWallet) {
-        const userOpHash = await this.entryPoint.getUserOpHash(userOp);
+        const userOpHash = computeUserOpHashV06(userOp, this.entryPointAddress, this.chainId);
         const signature = await ownerWallet.signMessage(ethers.getBytes(userOpHash));
         return {
             userOp: { ...userOp, signature },
@@ -446,7 +492,25 @@ export class AAAccountManager {
         };
         let userOp;
         let prefundWei;
-        if (params.useBundlerEstimate !== false) {
+        const policy = params.gasPolicy ??
+            this.defaultGasPolicy ??
+            (params.useBundlerEstimate === false ? 'localEstimate' : 'bundlerEstimate');
+        if (policy === 'fixed') {
+            const fixedGasMerged = {
+                ...(this.defaultFixedGas ?? {}),
+                ...(params.fixedGas ?? {}),
+                ...(params.callGasLimit ? { callGasLimit: params.callGasLimit } : {}),
+            };
+            const fixedGas = Object.keys(fixedGasMerged).length > 0 ? fixedGasMerged : undefined;
+            const result = await this.buildUserOpWithFixedGas({
+                ...buildParams,
+                deployed: accountInfo.deployed,
+                fixedGas,
+            });
+            userOp = result.userOp;
+            prefundWei = result.prefundWei;
+        }
+        else if (policy === 'bundlerEstimate') {
             const result = await this.buildUserOpWithBundlerEstimate(buildParams);
             userOp = result.userOp;
             prefundWei = result.prefundWei;
@@ -520,59 +584,133 @@ export class AAAccountManager {
                 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'] });
+        // 3) deployed(getCode)：小分片 + 并发上限 + 缓存 deployed=true，避免 -32014 “batch request too many”
+        const deployed = new Array(senders.length).fill(false);
+        const needCode = [];
+        for (let i = 0; i < senders.length; i++) {
+            const sender = senders[i];
+            const key = sender.toLowerCase();
+            if (this.deployedSenderSet.has(key)) {
+                deployed[i] = true;
+                continue;
+            }
+            needCode.push({ idx: i, sender, key });
+        }
+        if (needCode.length > 0) {
+            const CHUNK = 20;
+            const chunks = [];
+            for (let c = 0; c < needCode.length; c += CHUNK)
+                chunks.push(needCode.slice(c, c + CHUNK));
+            const batchResults = await mapWithConcurrency(chunks, 2, async (chunk) => {
+                try {
+                    const reqs = chunk.map((x) => ({ method: 'eth_getCode', params: [x.sender, 'latest'] }));
+                    const codes = await this.rpcBatch(reqs);
+                    return { ok: true, chunk, codes };
                 }
-                for (const s of slice) {
-                    reqs.push({ method: 'eth_getBalance', params: [s, 'latest'] });
+                catch (err) {
+                    return { ok: false, chunk, err };
                 }
-                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;
+            });
+            for (const r of batchResults) {
+                if (r.ok) {
+                    for (let i = 0; i < r.chunk.length; i++) {
+                        const it = r.chunk[i];
+                        const code = r.codes[i];
+                        const isDeployed = !!code && code !== '0x';
+                        deployed[it.idx] = isDeployed;
+                        if (isDeployed)
+                            this.deployedSenderSet.add(it.key);
                     }
+                    continue;
                 }
-            }
-            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 };
+                // fallback：单请求但受控并发
+                const fetched = await mapWithConcurrency(r.chunk, 4, async (it) => {
+                    const code = await this.provider.getCode(it.sender);
+                    return { it, code };
                 });
-                for (let i = 0; i < fetched.length; i++) {
+                for (const f of fetched) {
+                    const isDeployed = !!f.code && f.code !== '0x';
+                    deployed[f.it.idx] = isDeployed;
+                    if (isDeployed)
+                        this.deployedSenderSet.add(f.it.key);
+                }
+            }
+        }
+        // 4) balance(getEthBalance)：用 Multicall3.getEthBalance 分片批量查询 OKB（减少 N 次 eth_getBalance）
+        const balances = new Array(senders.length).fill(0n);
+        const ethBalIface = new Interface(['function getEthBalance(address addr) view returns (uint256)']);
+        const balCalls = senders.map((sender) => ({
+            target: MULTICALL3,
+            allowFailure: true,
+            callData: ethBalIface.encodeFunctionData('getEthBalance', [sender]),
+        }));
+        const BAL_BATCH = 300;
+        try {
+            for (let cursor = 0; cursor < balCalls.length; cursor += BAL_BATCH) {
+                const sliceCalls = balCalls.slice(cursor, cursor + BAL_BATCH);
+                const res = await this.multicallAggregate3({ calls: sliceCalls });
+                for (let i = 0; i < res.length; i++) {
+                    const r = res[i];
                     const idx = cursor + i;
-                    codes[idx] = fetched[i].code ?? '0x';
-                    balances[idx] = fetched[i].bal ?? 0n;
+                    if (!r?.success || !r.returnData || r.returnData === '0x')
+                        continue;
+                    try {
+                        const decoded = ethBalIface.decodeFunctionResult('getEthBalance', r.returnData);
+                        balances[idx] = BigInt(decoded?.[0] ?? 0n);
+                    }
+                    catch { /* ignore */ }
                 }
             }
         }
+        catch {
+            const fetched = await mapWithConcurrency(senders, 6, async (s) => await this.provider.getBalance(s));
+            for (let i = 0; i < fetched.length; i++)
+                balances[i] = fetched[i] ?? 0n;
+        }
         return owners.map((owner, i) => ({
             owner,
             sender: senders[i],
-            deployed: codes[i] != null && String(codes[i]) !== '0x',
+            deployed: deployed[i] ?? false,
             balance: balances[i] ?? 0n,
             nonce: nonces[i] ?? 0n,
         }));
     }
 }
+/**
+ * ERC-4337 v0.6 userOpHash 本地计算
+ *
+ * pack 规则（v0.6）：对 (sender,nonce,keccak(initCode),keccak(callData),callGasLimit,verificationGasLimit,preVerificationGas,maxFeePerGas,maxPriorityFeePerGas,keccak(paymasterAndData))
+ * 做 abi.encode 后 keccak 得到 packHash；再 abi.encode(packHash, entryPoint, chainId) 后 keccak 得到 userOpHash。
+ */
+export function computeUserOpHashV06(userOp, entryPoint, chainId) {
+    const coder = ethers.AbiCoder.defaultAbiCoder();
+    const packed = coder.encode([
+        'address',
+        'uint256',
+        'bytes32',
+        'bytes32',
+        'uint256',
+        'uint256',
+        'uint256',
+        'uint256',
+        'uint256',
+        'bytes32',
+    ], [
+        userOp.sender,
+        BigInt(userOp.nonce),
+        ethers.keccak256(userOp.initCode ?? '0x'),
+        ethers.keccak256(userOp.callData ?? '0x'),
+        BigInt(userOp.callGasLimit),
+        BigInt(userOp.verificationGasLimit),
+        BigInt(userOp.preVerificationGas),
+        BigInt(userOp.maxFeePerGas),
+        BigInt(userOp.maxPriorityFeePerGas),
+        ethers.keccak256(userOp.paymasterAndData ?? '0x'),
+    ]);
+    const packHash = ethers.keccak256(packed);
+    const enc = coder.encode(['bytes32', 'address', 'uint256'], [packHash, entryPoint, BigInt(chainId)]);
+    return ethers.keccak256(enc);
+}
 // ============================================================================
 // 工具函数
 // ============================================================================

package/dist/xlayer/bundle.js

@@ -15,6 +15,11 @@ import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // 捆绑交易执行器
 // ============================================================================
+// 固定 gas（用于大规模减少 RPC）；具体值允许通过 config.fixedGas 覆盖
+const DEFAULT_CALL_GAS_LIMIT_BUY = DEFAULT_CALL_GAS_LIMIT_SELL; // buy 与 sell 共享一个保守值
+const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
+const DEFAULT_CALL_GAS_LIMIT_TRANSFER = 150000n;
+const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
 /**
  * XLayer 捆绑交易执行器
  *
@@ -109,14 +114,27 @@ export class BundleExecutor {
         const callData = encodeExecute(this.portalAddress, buyAmountWei, swapData);
         // 估算前确保 sender 有足够余额（用于模拟）
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, buyAmountWei + parseOkb('0.0003'), `${ownerName ?? 'owner'}/buy-prefund-before-estimate`);
-        // 使用 Bundler 估算
-        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithBundlerEstimate({
-            ownerWallet,
-            sender: accountInfo.sender,
-            callData,
-            nonce: accountInfo.nonce,
-            initCode,
-        });
+        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
+        const { userOp, prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet,
+                sender: accountInfo.sender,
+                callData,
+                nonce: accountInfo.nonce,
+                initCode,
+                deployed: accountInfo.deployed,
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_BUY,
+                },
+            })
+            : await this.aaManager.buildUserOpWithBundlerEstimate({
+                ownerWallet,
+                sender: accountInfo.sender,
+                callData,
+                nonce: accountInfo.nonce,
+                initCode,
+            });
         // 补足 prefund + 买入金额
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, buyAmountWei + prefundWei + parseOkb('0.0002'), `${ownerName ?? 'owner'}/buy-fund`);
         // 签名
@@ -134,13 +152,27 @@ export class BundleExecutor {
         const approveData = encodeApproveCall(spender);
         const callData = encodeExecute(tokenAddress, 0n, approveData);
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/approve-prefund`);
-        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
-            ownerWallet,
-            sender,
-            callData,
-            nonce,
-            initCode,
-        });
+        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
+        const { userOp, prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet,
+                sender,
+                callData,
+                nonce,
+                initCode,
+                deployed: initCode === '0x',
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_APPROVE,
+                },
+            })
+            : await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet,
+                sender,
+                callData,
+                nonce,
+                initCode,
+            });
         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 };
@@ -152,23 +184,37 @@ export class BundleExecutor {
         const sellData = encodeSellCall(tokenAddress, sellAmount, 0n);
         const callData = encodeExecute(this.portalAddress, 0n, sellData);
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, parseOkb('0.0003'), `${ownerName ?? 'owner'}/sell-prefund`);
-        // 如果需要 approve（还未执行），estimateGas 会 revert，使用固定值
-        const { userOp, prefundWei } = needApprove
-            ? await this.aaManager.buildUserOpWithLocalEstimate({
+        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
+        // 如果需要 approve（还未执行），estimateGas 可能 revert；因此默认就用固定 callGasLimit
+        const { userOp, prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet,
                 sender,
                 callData,
                 nonce,
                 initCode,
-                callGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL,
+                deployed: initCode === '0x',
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_SELL,
+                },
             })
-            : await this.aaManager.buildUserOpWithLocalEstimate({
-                ownerWallet,
-                sender,
-                callData,
-                nonce,
-                initCode,
-            });
+            : needApprove
+                ? await this.aaManager.buildUserOpWithLocalEstimate({
+                    ownerWallet,
+                    sender,
+                    callData,
+                    nonce,
+                    initCode,
+                    callGasLimit: DEFAULT_CALL_GAS_LIMIT_SELL,
+                })
+                : await this.aaManager.buildUserOpWithLocalEstimate({
+                    ownerWallet,
+                    sender,
+                    callData,
+                    nonce,
+                    initCode,
+                });
         await this.aaManager.ensureSenderBalance(ownerWallet, sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/sell-fund`);
         const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
         return { ...signed, prefundWei, ownerName };
@@ -203,13 +249,27 @@ export class BundleExecutor {
         // 先估算 prefund（使用空调用）
         const tempCallData = encodeExecute(params.ownerWallet.address, 0n, '0x');
         await this.aaManager.ensureSenderBalance(params.ownerWallet, params.sender, parseOkb('0.0002'), `${params.ownerName ?? 'owner'}/withdraw-prefund`);
-        const { prefundWei } = await this.aaManager.buildUserOpWithLocalEstimate({
-            ownerWallet: params.ownerWallet,
-            sender: params.sender,
-            callData: tempCallData,
-            nonce: params.nonce,
-            initCode: params.initCode,
-        });
+        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
+        const { prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: params.ownerWallet,
+                sender: params.sender,
+                callData: tempCallData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+                deployed: params.initCode === '0x',
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            })
+            : await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet: params.ownerWallet,
+                sender: params.sender,
+                callData: tempCallData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+            });
         // 计算可归集金额（用已知余额近似；fund 发生时余额会变大，属于可接受的保守近似）
         const withdrawAmount = senderBalance > prefundWei + params.reserveWei
             ? senderBalance - prefundWei - params.reserveWei
@@ -219,13 +279,26 @@ export class BundleExecutor {
             return null;
         }
         const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
-        const { userOp } = await this.aaManager.buildUserOpWithLocalEstimate({
-            ownerWallet: params.ownerWallet,
-            sender: params.sender,
-            callData,
-            nonce: params.nonce,
-            initCode: params.initCode,
-        });
+        const { userOp } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: params.ownerWallet,
+                sender: params.sender,
+                callData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+                deployed: params.initCode === '0x',
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            })
+            : await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet: params.ownerWallet,
+                sender: params.sender,
+                callData,
+                nonce: params.nonce,
+                initCode: params.initCode,
+            });
         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 };
@@ -243,12 +316,26 @@ export class BundleExecutor {
         const transferData = encodeTransferCall(ownerWallet.address, tokenBalance);
         const callData = encodeExecute(tokenAddress, 0n, transferData);
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, parseOkb('0.0002'), `${ownerName ?? 'owner'}/transfer-prefund`);
-        const { userOp, prefundWei } = await this.aaManager.buildUserOpWithBundlerEstimate({
-            ownerWallet,
-            sender: accountInfo.sender,
-            callData,
-            nonce: accountInfo.nonce,
-        });
+        const gasPolicy = this.config.gasPolicy ?? 'bundlerEstimate';
+        const { userOp, prefundWei } = gasPolicy === 'fixed'
+            ? await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet,
+                sender: accountInfo.sender,
+                callData,
+                nonce: accountInfo.nonce,
+                initCode: accountInfo.deployed ? '0x' : this.aaManager.generateInitCode(ownerWallet.address),
+                deployed: accountInfo.deployed,
+                fixedGas: {
+                    ...(this.config.fixedGas ?? {}),
+                    callGasLimit: this.config.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_TRANSFER,
+                },
+            })
+            : await this.aaManager.buildUserOpWithBundlerEstimate({
+                ownerWallet,
+                sender: accountInfo.sender,
+                callData,
+                nonce: accountInfo.nonce,
+            });
         await this.aaManager.ensureSenderBalance(ownerWallet, accountInfo.sender, prefundWei + parseOkb('0.00005'), `${ownerName ?? 'owner'}/transfer-fund`);
         console.log(`\n[${ownerName ?? 'owner'}] transfer token: ${tokenBalance.toString()}`);
         const signed = await this.aaManager.signUserOp(userOp, ownerWallet);
@@ -279,7 +366,10 @@ export class BundleExecutor {
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
         const buyWeis = buyAmounts.map((a) => parseOkb(a));
         // 估算前确保 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`)));
+        // 避免 Promise.all 突发并发（大规模地址会触发 RPC 限流）
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+        });
         const buyCallDatas = buyWeis.map((buyWei) => {
             const swapData = encodeBuyCall(tokenAddress, buyWei, 0n);
             return encodeExecute(this.portalAddress, buyWei, swapData);
@@ -294,9 +384,11 @@ export class BundleExecutor {
             })),
         });
         // 补足 prefund + 买入金额（多数情况下上一步的 0.0003 已足够，这里通常不会再转账）
-        await Promise.all(accountInfos.map((ai, i) => this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`)));
-        // 签名
-        const signedBuy = await Promise.all(buyUserOps.map((op, i) => this.aaManager.signUserOp(op, wallets[i])));
+        await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
+            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+        });
+        // 签名（受控并发，避免大规模时阻塞）
+        const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
         const buyOps = signedBuy.map((s) => s.userOp);
         // 2. 执行买入
         const buyResult = await this.runHandleOps('buyBundle', buyOps, bundlerSigner, beneficiary);
@@ -322,7 +414,9 @@ export class BundleExecutor {
             }
             if (idxs.length > 0) {
                 // 估算前补一点余额（paymaster 会自动跳过）
-                await Promise.all(idxs.map((i) => this.aaManager.ensureSenderBalance(wallets[i], senders[i], parseOkb('0.0002'), `owner${i + 1}/transfer-prefund`)));
+                await mapWithConcurrency(idxs, 6, async (i) => {
+                    await this.aaManager.ensureSenderBalance(wallets[i], senders[i], parseOkb('0.0002'), `owner${i + 1}/transfer-prefund`);
+                });
                 // buy 已经成功过一次，因此 transfer 的 nonce = 原 nonce + 1，且 initCode = 0x
                 const { userOps: transferUserOps, prefundWeis: transferPrefunds } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
                     ops: idxs.map((i, k) => ({
@@ -332,8 +426,10 @@ export class BundleExecutor {
                         initCode: '0x',
                     })),
                 });
-                await Promise.all(idxs.map((i, k) => this.aaManager.ensureSenderBalance(wallets[i], senders[i], transferPrefunds[k] + parseOkb('0.00005'), `owner${i + 1}/transfer-fund`)));
-                const signedTransfer = await Promise.all(transferUserOps.map((op, k) => this.aaManager.signUserOp(op, wallets[idxs[k]])));
+                await mapWithConcurrency(idxs, 6, async (i, k) => {
+                    await this.aaManager.ensureSenderBalance(wallets[i], senders[i], transferPrefunds[k] + parseOkb('0.00005'), `owner${i + 1}/transfer-fund`);
+                });
+                const signedTransfer = await mapWithConcurrency(transferUserOps, 10, async (op, k) => this.aaManager.signUserOp(op, wallets[idxs[k]]));
                 const transferOps = signedTransfer.map((s) => s.userOp);
                 transferResult =
                     (await this.runHandleOps('transferBundle', transferOps, bundlerSigner, beneficiary)) ?? undefined;