four-flap-meme-sdk 1.5.21 → 1.5.23

package/dist/xlayer/bundler.js

@@ -4,6 +4,7 @@
  * 与 Particle Bundler 交互，提供 ERC-4337 相关 RPC 方法
  */
 import { PARTICLE_BUNDLER_URL, XLAYER_CHAIN_ID, ENTRYPOINT_V06, } from './constants.js';
+import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // Bundler 客户端类
 // ============================================================================
@@ -151,17 +152,35 @@ export class BundlerClient {
     async estimateUserOperationGasBatch(userOps) {
         if (userOps.length === 0)
             return [];
-        // 先尝试 batch（显著降低 HTTP 往返次数）
-        try {
-            return await this.rpcBatch(userOps.map((op) => ({
-                method: 'eth_estimateUserOperationGas',
-                params: [op, this.entryPoint],
-            })));
-        }
-        catch {
-            // fallback：并发单请求（比串行快，但可能触发限流）
-            return await Promise.all(userOps.map((op) => this.estimateUserOperationGas(op)));
-        }
+        const maxBatchSize = 30;
+        const maxSingleConcurrency = 4;
+        const estimateChunk = async (chunk, batchSize) => {
+            if (chunk.length === 0)
+                return [];
+            if (batchSize <= 1 || chunk.length === 1) {
+                // 最终兜底：受控并发的单请求（避免 Promise.all 突发）
+                return await mapWithConcurrency(chunk, maxSingleConcurrency, async (op) => await this.estimateUserOperationGas(op));
+            }
+            const out = [];
+            for (let cursor = 0; cursor < chunk.length; cursor += batchSize) {
+                const slice = chunk.slice(cursor, cursor + batchSize);
+                try {
+                    const res = await this.rpcBatch(slice.map((op) => ({
+                        method: 'eth_estimateUserOperationGas',
+                        params: [op, this.entryPoint],
+                    })));
+                    out.push(...res);
+                }
+                catch (err) {
+                    // 降级：拆分为更小 batch（直到 1）
+                    const next = Math.max(1, Math.floor(batchSize / 2));
+                    const res = await estimateChunk(slice, next);
+                    out.push(...res);
+                }
+            }
+            return out;
+        };
+        return await estimateChunk(userOps, Math.min(maxBatchSize, userOps.length));
     }
     /**
      * 发送 UserOperation

package/dist/xlayer/portal-ops.d.ts

@@ -57,6 +57,7 @@ export declare class PortalQuery {
     private portal;
     private portalAddress;
     constructor(config?: PortalQueryConfig);
+    private multicallAggregate3;
     /**
      * 获取 Provider
      */

package/dist/xlayer/portal-ops.js

@@ -8,7 +8,8 @@
  * - 代币转账
  */
 import { ethers, Interface, Contract, JsonRpcProvider } from 'ethers';
-import { FLAP_PORTAL, ZERO_ADDRESS, PORTAL_ABI, ERC20_ABI, DEFAULT_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
+import { FLAP_PORTAL, ZERO_ADDRESS, PORTAL_ABI, ERC20_ABI, MULTICALL3, DEFAULT_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
+import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // Portal 操作编码器
 // ============================================================================
@@ -81,10 +82,22 @@ export class PortalQuery {
     constructor(config = {}) {
         const rpcUrl = config.rpcUrl ?? DEFAULT_RPC_URL;
         const chainId = config.chainId ?? XLAYER_CHAIN_ID;
-        this.provider = new JsonRpcProvider(rpcUrl, { chainId, name: 'xlayer' });
+        this.provider = new JsonRpcProvider(rpcUrl, { chainId, name: 'xlayer' }, {
+            batchMaxCount: 20,
+            batchStallTime: 30,
+        });
         this.portalAddress = config.portalAddress ?? FLAP_PORTAL;
         this.portal = new Contract(this.portalAddress, PORTAL_ABI, this.provider);
     }
+    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 || [];
+    }
     /**
      * 获取 Provider
      */
@@ -171,8 +184,42 @@ export class PortalQuery {
      */
     async getMultipleTokenBalances(tokenAddress, accounts) {
         const balances = new Map();
-        const results = await Promise.all(accounts.map((acc) => this.getTokenBalance(tokenAddress, acc)));
-        accounts.forEach((acc, i) => balances.set(acc, results[i]));
+        const list = accounts.map((a) => String(a || '').trim()).filter(Boolean);
+        if (list.length === 0)
+            return balances;
+        const calls = list.map((acc) => ({
+            target: tokenAddress,
+            allowFailure: true,
+            callData: erc20Iface.encodeFunctionData('balanceOf', [acc]),
+        }));
+        const BATCH = 350;
+        try {
+            for (let cursor = 0; cursor < calls.length; cursor += BATCH) {
+                const sliceCalls = calls.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;
+                    const acc = list[idx];
+                    if (!r?.success || !r.returnData || r.returnData === '0x') {
+                        balances.set(acc, 0n);
+                        continue;
+                    }
+                    try {
+                        const decoded = erc20Iface.decodeFunctionResult('balanceOf', r.returnData);
+                        balances.set(acc, BigInt(decoded?.[0] ?? 0n));
+                    }
+                    catch {
+                        balances.set(acc, 0n);
+                    }
+                }
+            }
+            return balances;
+        }
+        catch {
+            const results = await mapWithConcurrency(list, 8, async (acc) => this.getTokenBalance(tokenAddress, acc));
+            list.forEach((acc, i) => balances.set(acc, results[i] ?? 0n));
+        }
         return balances;
     }
     /**
@@ -180,8 +227,43 @@ export class PortalQuery {
      */
     async getMultipleOkbBalances(accounts) {
         const balances = new Map();
-        const results = await Promise.all(accounts.map((acc) => this.getOkbBalance(acc)));
-        accounts.forEach((acc, i) => balances.set(acc, results[i]));
+        const list = accounts.map((a) => String(a || '').trim()).filter(Boolean);
+        if (list.length === 0)
+            return balances;
+        const ethBalIface = new Interface(['function getEthBalance(address addr) view returns (uint256)']);
+        const calls = list.map((acc) => ({
+            target: MULTICALL3,
+            allowFailure: true,
+            callData: ethBalIface.encodeFunctionData('getEthBalance', [acc]),
+        }));
+        const BATCH = 350;
+        try {
+            for (let cursor = 0; cursor < calls.length; cursor += BATCH) {
+                const sliceCalls = calls.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;
+                    const acc = list[idx];
+                    if (!r?.success || !r.returnData || r.returnData === '0x') {
+                        balances.set(acc, 0n);
+                        continue;
+                    }
+                    try {
+                        const decoded = ethBalIface.decodeFunctionResult('getEthBalance', r.returnData);
+                        balances.set(acc, BigInt(decoded?.[0] ?? 0n));
+                    }
+                    catch {
+                        balances.set(acc, 0n);
+                    }
+                }
+            }
+            return balances;
+        }
+        catch {
+            const results = await mapWithConcurrency(list, 8, async (acc) => this.getOkbBalance(acc));
+            list.forEach((acc, i) => balances.set(acc, results[i] ?? 0n));
+        }
         return balances;
     }
     /**
@@ -189,8 +271,43 @@ export class PortalQuery {
      */
     async getMultipleAllowances(tokenAddress, owners, spender) {
         const allowances = new Map();
-        const results = await Promise.all(owners.map((owner) => this.getAllowance(tokenAddress, owner, spender)));
-        owners.forEach((owner, i) => allowances.set(owner, results[i]));
+        const list = owners.map((a) => String(a || '').trim()).filter(Boolean);
+        if (list.length === 0)
+            return allowances;
+        const useSpender = spender ?? this.portalAddress;
+        const calls = list.map((owner) => ({
+            target: tokenAddress,
+            allowFailure: true,
+            callData: erc20Iface.encodeFunctionData('allowance', [owner, useSpender]),
+        }));
+        const BATCH = 350;
+        try {
+            for (let cursor = 0; cursor < calls.length; cursor += BATCH) {
+                const sliceCalls = calls.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;
+                    const owner = list[idx];
+                    if (!r?.success || !r.returnData || r.returnData === '0x') {
+                        allowances.set(owner, 0n);
+                        continue;
+                    }
+                    try {
+                        const decoded = erc20Iface.decodeFunctionResult('allowance', r.returnData);
+                        allowances.set(owner, BigInt(decoded?.[0] ?? 0n));
+                    }
+                    catch {
+                        allowances.set(owner, 0n);
+                    }
+                }
+            }
+            return allowances;
+        }
+        catch {
+            const results = await mapWithConcurrency(list, 8, async (owner) => this.getAllowance(tokenAddress, owner, useSpender));
+            list.forEach((owner, i) => allowances.set(owner, results[i] ?? 0n));
+        }
         return allowances;
     }
 }

package/dist/xlayer/types.d.ts

@@ -41,6 +41,17 @@ export interface GasEstimate {
     maxFeePerGas?: HexString;
     maxPriorityFeePerGas?: HexString;
 }
+export type GasPolicy = 'fixed' | 'localEstimate' | 'bundlerEstimate';
+export interface FixedGasConfig {
+    /** callGasLimit（若不提供，SDK 会使用较保守的默认值） */
+    callGasLimit?: bigint;
+    /** 已部署 sender 的 verificationGasLimit（默认用 SDK 常量） */
+    verificationGasLimitDeployed?: bigint;
+    /** 未部署 sender 的 verificationGasLimit（默认用 SDK 常量） */
+    verificationGasLimitUndeployed?: bigint;
+    /** preVerificationGas（默认用 SDK 常量） */
+    preVerificationGas?: bigint;
+}
 /**
  * XLayer SDK 基础配置
  */
@@ -65,6 +76,15 @@ export interface XLayerConfig {
     timeoutMs?: number;
     /** Gas 估算安全余量倍数 */
     gasLimitMultiplier?: number;
+    /**
+     * AA Gas 策略（用于大规模地址时减少 RPC）
+     * - fixed：固定 gas（不 estimate）
+     * - localEstimate：eth_estimateGas（不走 bundler）
+     * - bundlerEstimate：eth_estimateUserOperationGas（最慢但最稳）
+     */
+    gasPolicy?: GasPolicy;
+    /** fixed 策略的默认 gas 配置（可被每次调用覆盖） */
+    fixedGas?: FixedGasConfig;
 }
 /**
  * AA 账户信息

package/package.json

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

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

@@ -1,16 +0,0 @@
-/**
- * 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

@@ -1,146 +0,0 @@
-/**
- * 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;
-    }
-}