four-flap-meme-sdk 1.5.23 → 1.5.24

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/xlayer/aa-account.d.ts

@@ -8,7 +8,7 @@
  * - initCode 生成
  */
 import { ethers, JsonRpcProvider, Wallet, Contract } from 'ethers';
-import type { UserOperation, SignedUserOp, AAAccount, XLayerConfig, GasPolicy, FixedGasConfig } from './types.js';
+import type { UserOperation, SignedUserOp, AAAccount, XLayerConfig } from './types.js';
 import { BundlerClient } from './bundler.js';
 /**
  * AA 账户管理器
@@ -33,11 +33,6 @@ export declare class AAAccountManager {
     private paymasterData?;
     private gasLimitMultiplier;
     private senderCache;
-    private deployedSenderSet;
-    private feeDataCache?;
-    private readonly feeDataCacheTtlMs;
-    private defaultGasPolicy?;
-    private defaultFixedGas?;
     constructor(config?: XLayerConfig);
     /**
      * 获取 Provider
@@ -132,23 +127,6 @@ export declare class AAAccountManager {
         userOp: UserOperation;
         prefundWei: bigint;
     }>;
-    /**
-     * 构建未签名的 UserOperation（固定 Gas，不做任何 estimate）
-     *
-     * 适用于大规模（1000 地址）场景：尽量减少 RPC 调用量。
-     */
-    buildUserOpWithFixedGas(params: {
-        ownerWallet: Wallet;
-        sender: string;
-        callData: string;
-        nonce: bigint;
-        initCode?: string;
-        deployed?: boolean;
-        fixedGas?: FixedGasConfig;
-    }): Promise<{
-        userOp: UserOperation;
-        prefundWei: bigint;
-    }>;
     /**
      * 签名 UserOperation
      */
@@ -160,8 +138,6 @@ export declare class AAAccountManager {
         ownerWallet: Wallet;
         callData: string;
         value?: bigint;
-        gasPolicy?: GasPolicy;
-        fixedGas?: FixedGasConfig;
         useBundlerEstimate?: boolean;
         callGasLimit?: bigint;
     }): Promise<SignedUserOp>;
@@ -183,13 +159,6 @@ export declare class AAAccountManager {
      */
     getMultipleAccountInfo(ownerAddresses: string[]): Promise<AAAccount[]>;
 }
-/**
- * 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 declare function computeUserOpHashV06(userOp: UserOperation, entryPoint: string, chainId: number | bigint): string;
 /**
  * 编码 SimpleAccount.execute 调用
  */

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, 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 { 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';
 // ============================================================================
@@ -26,16 +26,12 @@ 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' }, {
-            // 防止 ethers 自动攒太大的 JSON-RPC batch（XLayer 节点对“大 batch”很敏感）
-            batchMaxCount: 20,
-            batchStallTime: 30,
+        this.provider = new JsonRpcProvider(rpcUrl, {
+            chainId: this.chainId,
+            name: 'xlayer',
         });
         this.factoryAddress = config.factory ?? SIMPLE_ACCOUNT_FACTORY;
         this.entryPointAddress = config.entryPoint ?? ENTRYPOINT_V06;
@@ -43,9 +39,6 @@ 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({
@@ -83,14 +76,7 @@ export class AAAccountManager {
      * 获取当前 Fee Data
      */
     async 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;
+        return await this.provider.getFeeData();
     }
     /**
      * 预测 AA Sender 地址
@@ -289,7 +275,7 @@ export class AAAccountManager {
      * 构建未签名的 UserOperation（使用 Bundler 估算 Gas）
      */
     async buildUserOpWithBundlerEstimate(params) {
-        const feeData = await this.getFeeData();
+        const feeData = await this.provider.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 构建初步 UserOp（Gas 字段为 0，等待估算）
@@ -338,7 +324,7 @@ export class AAAccountManager {
         if (params.ops.length === 0) {
             return { userOps: [], prefundWeis: [] };
         }
-        const feeData = await this.getFeeData();
+        const feeData = await this.provider.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 先构建 skeleton（Gas=0），然后批量估算
@@ -389,7 +375,7 @@ export class AAAccountManager {
      * 适用于无法通过 Bundler 估算的场景（如尚未授权的 sell 操作）
      */
     async buildUserOpWithLocalEstimate(params) {
-        const feeData = await this.getFeeData();
+        const feeData = await this.provider.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
         // 估算 callGasLimit
@@ -431,43 +417,11 @@ 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 = computeUserOpHashV06(userOp, this.entryPointAddress, this.chainId);
+        const userOpHash = await this.entryPoint.getUserOpHash(userOp);
         const signature = await ownerWallet.signMessage(ethers.getBytes(userOpHash));
         return {
             userOp: { ...userOp, signature },
@@ -492,25 +446,7 @@ export class AAAccountManager {
         };
         let userOp;
         let prefundWei;
-        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') {
+        if (params.useBundlerEstimate !== false) {
             const result = await this.buildUserOpWithBundlerEstimate(buildParams);
             userOp = result.userOp;
             prefundWei = result.prefundWei;
@@ -584,133 +520,59 @@ export class AAAccountManager {
                 catch { /* ignore */ }
             }
         }
-        // 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 };
+        // 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'] });
                 }
-                catch (err) {
-                    return { ok: false, chunk, err };
+                for (const s of slice) {
+                    reqs.push({ method: 'eth_getBalance', params: [s, 'latest'] });
                 }
-            });
-            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);
+                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;
                     }
-                    continue;
-                }
-                // fallback：单请求但受控并发
-                const fetched = await mapWithConcurrency(r.chunk, 4, async (it) => {
-                    const code = await this.provider.getCode(it.sender);
-                    return { it, code };
-                });
-                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];
+            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;
-                    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 */ }
+                    codes[idx] = fetched[i].code ?? '0x';
+                    balances[idx] = fetched[i].bal ?? 0n;
                 }
             }
         }
-        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: deployed[i] ?? false,
+            deployed: codes[i] != null && String(codes[i]) !== '0x',
             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);
-}
 // ============================================================================
 // 工具函数
 // ============================================================================