four-flap-meme-sdk 2.2.19 → 2.2.20

package/dist/shared/clients/club48.js

@@ -1,9 +1,12 @@
 import axios from 'axios';
 import { ethers } from 'ethers';
+import { ZERO_ADDRESS } from '../constants/index.js';
 /**
  * 48.club Bundle 客户端
  */
 export class Club48Client {
+    endpoint;
+    explorerEndpoint;
     constructor(config) {
         this.endpoint = config?.endpoint || 'https://puissant-bsc.48.club';
         this.explorerEndpoint = config?.explorerEndpoint || 'https://explore.48.club';
@@ -18,7 +21,7 @@ export class Club48Client {
      */
     static sign48SoulPoint(privateKey, txs) {
         // 1. 计算每笔交易的哈希
-        const txHashes = txs.map(tx => ethers.keccak256(tx));
+        const txHashes = txs.map((tx) => ethers.keccak256(tx));
         // 2. 连接所有哈希
         const concatenated = ethers.concat(txHashes);
         // 3. 对连接后的数据进行哈希
@@ -103,7 +106,7 @@ export class Club48Client {
         }
         // 添加 Soul Point 签名（优先：调用方直接提供；否则按 opts 生成）
         if (params.soulPointSignature) {
-            bundleParams["48spSign"] = params.soulPointSignature;
+            bundleParams['48spSign'] = params.soulPointSignature;
         }
         else if (opts && opts.spMode && opts.spMode !== 'none') {
             if (!opts.spPrivateKey) {
@@ -121,17 +124,17 @@ export class Club48Client {
             }
             if (opts.spVMode)
                 sig = Club48Client.normalizeSignatureV(sig, opts.spVMode);
-            bundleParams["48spSign"] = sig;
+            bundleParams['48spSign'] = sig;
         }
         // 添加 backrun 目标（如果提供）
         if (params.backrunTarget) {
             bundleParams.backrunTarget = params.backrunTarget;
         }
         const response = await axios.post(this.endpoint, {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             id: 1,
-            method: "eth_sendBundle",
-            params: [bundleParams]
+            method: 'eth_sendBundle',
+            params: [bundleParams],
         });
         if (response.data.error) {
             throw new Error(`48.club bundle failed: ${response.data.error.message}`);
@@ -146,10 +149,10 @@ export class Club48Client {
      */
     async sendPrivateTransaction(signedTx) {
         const response = await axios.post(this.endpoint, {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             id: 1,
-            method: "eth_sendPrivateRawTransaction",
-            params: [signedTx]
+            method: 'eth_sendPrivateRawTransaction',
+            params: [signedTx],
         });
         if (response.data.error) {
             throw new Error(`48.club tx failed: ${response.data.error.message}`);
@@ -168,7 +171,7 @@ export class Club48Client {
     async sendPrivateTransactionWith48SP(signedTx, spPrivateKey, opts) {
         // 1) 生成 48SP 签名（默认使用 timestamp personal_sign）
         const mode = opts?.spMode ?? 'timestampPersonalSign';
-        let signature = '';
+        let signature;
         if (mode === 'timestampPersonalSign') {
             signature = await Club48Client.sign48SoulPointTimestamp(spPrivateKey, opts?.timestamp);
         }
@@ -179,10 +182,10 @@ export class Club48Client {
             signature = Club48Client.normalizeSignatureV(signature, opts.spVMode);
         // 2) 调用 48.club RPC
         const response = await axios.post(this.endpoint, {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             id: 1,
-            method: "eth_sendPrivateTransactionWith48SP",
-            params: [signedTx, signature]
+            method: 'eth_sendPrivateTransactionWith48SP',
+            params: [signedTx, signature],
         });
         if (response.data.error) {
             throw new Error(`48.club tx failed: ${response.data.error.message}`);
@@ -196,9 +199,9 @@ export class Club48Client {
      */
     async getMinGasPrice() {
         const response = await axios.post(this.endpoint, {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             id: 1,
-            method: "eth_gasPrice"
+            method: 'eth_gasPrice',
         });
         if (response.data.error) {
             throw new Error(`Get gas price failed: ${response.data.error.message}`);
@@ -237,12 +240,15 @@ export class Club48Client {
                     throw new Error(`Bundle failed to execute: ${JSON.stringify(status)}`);
                 }
                 // 等待 3 秒后重试
-                await new Promise(resolve => setTimeout(resolve, 3000));
+                await new Promise((resolve) => setTimeout(resolve, 3000));
             }
             catch (error) {
-                // 如果是 404 或网络错误，继续等待（可能是 explorer 还没索引到）
-                if (error.response?.status === 404 || error.code === 'ECONNREFUSED' || error.code === 'ENOTFOUND') {
-                    await new Promise(resolve => setTimeout(resolve, 3000));
+                const status = axios.isAxiosError(error) ? error.response?.status : undefined;
+                const nodeCode = typeof error === 'object' && error !== null && 'code' in error
+                    ? String(error.code ?? '')
+                    : '';
+                if (status === 404 || nodeCode === 'ECONNREFUSED' || nodeCode === 'ENOTFOUND') {
+                    await new Promise((resolve) => setTimeout(resolve, 3000));
                     continue;
                 }
                 // 其他错误，如果有最后状态且为 INCLUDED，返回成功
@@ -266,10 +272,10 @@ export class Club48Client {
             hash: bundleHash,
             maxTimestamp: Math.floor(Date.now() / 1000) + 300,
             transaction: {
-                from: '0x0000000000000000000000000000000000000000',
+                from: ZERO_ADDRESS,
                 gasPrice: '0',
-                nonce: 0
-            }
+                nonce: 0,
+            },
         };
     }
 }
@@ -282,11 +288,11 @@ export function createAuctionFeedClient(wsUrl, callbacks) {
     // 仅导出接口占位，避免引入 ws 依赖；用户可在应用层实现
     return {
         connect: () => {
-            callbacks.onOpen && callbacks.onOpen();
+            callbacks.onOpen?.();
         },
         close: () => {
-            callbacks.onClose && callbacks.onClose();
-        }
+            callbacks.onClose?.();
+        },
     };
 }
 /**
@@ -295,7 +301,7 @@ export function createAuctionFeedClient(wsUrl, callbacks) {
 export async function sendBatchPrivateTransactions(signedTxs, spPrivateKey, endpoint = 'https://puissant-bsc.48.club', opts) {
     // 1. 生成 48SP 签名
     const mode = opts?.spMode ?? 'timestampPersonalSign';
-    let signature = '';
+    let signature;
     if (mode === 'timestampPersonalSign') {
         signature = await Club48Client.sign48SoulPointTimestamp(spPrivateKey, opts?.timestamp);
     }
@@ -306,13 +312,13 @@ export async function sendBatchPrivateTransactions(signedTxs, spPrivateKey, endp
         signature = Club48Client.normalizeSignatureV(signature, opts.spVMode);
     // 2. 批量提交
     const response = await axios.post(endpoint, {
-        jsonrpc: "2.0",
+        jsonrpc: '2.0',
         id: 1,
-        method: "eth_sendBatchPrivateTransactionsWith48SP",
+        method: 'eth_sendBatchPrivateTransactionsWith48SP',
         params: [
             signedTxs, // 已签名的交易数组
-            signature // 48SP 签名
-        ]
+            signature, // 48SP 签名
+        ],
     });
     // 注意：批量方法不返回交易哈希，只确认接收
     if (response.data.error) {

package/dist/shared/clients/emitservice.js

@@ -13,6 +13,8 @@ async function parseJsonSafe(resp) {
     return JSON.parse(text);
 }
 export class EmitServiceClient {
+    baseUrl;
+    headers;
     constructor(config) {
         this.baseUrl = trimTrailingSlash(config.baseUrl);
         this.headers = config.headers;

package/dist/shared/clients/four.d.ts

@@ -87,14 +87,26 @@ export type CreateTokenReq = {
     funGroup: false;
     clickFun: false;
 };
+export type FourJsonValue = string | number | boolean | null | FourJsonValue[] | {
+    [key: string]: FourJsonValue;
+};
+export type FourPublicConfig = {
+    [key: string]: FourJsonValue;
+};
+export type FourTokenDetail = {
+    [key: string]: FourJsonValue;
+} & {
+    address?: string;
+    name?: string;
+    symbol?: string;
+};
 export type CreateTokenResp = {
     createArg: string;
     signature: string;
     tokenAddr?: string;
     address?: string;
     token?: string;
-    [key: string]: any;
-};
+} & Record<string, string | undefined>;
 export declare class FourClient {
     private baseUrl;
     private uploadUrls;
@@ -124,9 +136,12 @@ export declare class FourClient {
     private isCorsOrNetworkError;
     private getFilenameFromBlob;
     createToken(accessToken: string, req: CreateTokenReq): Promise<CreateTokenResp>;
-    getPublicConfig(): Promise<any>;
-    getTokenByAddress(address: string, accessToken?: string): Promise<any>;
-    getTokensByAddresses(addresses: string[], accessToken?: string): Promise<any[]>;
-    getTokenById(id: string | number, accessToken?: string): Promise<any>;
+    getPublicConfig(): Promise<FourPublicConfig>;
+    getTokenByAddress(address: string, accessToken?: string): Promise<FourTokenDetail>;
+    getTokensByAddresses(addresses: string[], accessToken?: string): Promise<(FourTokenDetail | {
+        address: string;
+        error: string;
+    })[]>;
+    getTokenById(id: string | number, accessToken?: string): Promise<FourTokenDetail>;
 }
 export declare function buildLoginMessage(nonce: string): string;

package/dist/shared/clients/four.js

@@ -1,3 +1,4 @@
+import { getErrorMessageFromUnknown } from '../foundation/index.js';
 // ============================================================================
 // 图片上传缓存（按内容哈希去重，同一张图片只上传一次）
 // ✅ 使用 localStorage 持久化，刷新页面 / 重启浏览器后缓存仍然有效
@@ -38,7 +39,9 @@ function saveCache() {
             return;
         const cache = loadCache();
         const obj = {};
-        cache.forEach((v, k) => { obj[k] = v; });
+        cache.forEach((v, k) => {
+            obj[k] = v;
+        });
         localStorage.setItem(UPLOAD_CACHE_KEY, JSON.stringify(obj));
     }
     catch {
@@ -72,7 +75,7 @@ async function hashBlob(blob) {
     const buffer = await blob.arrayBuffer();
     const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
     const hashArray = Array.from(new Uint8Array(hashBuffer));
-    return hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+    return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
 }
 /** IP 限流错误码 */
 const RATE_LIMIT_CODE = -1038;
@@ -84,6 +87,8 @@ const RATE_LIMIT_CODE = -1038;
  */
 const FOUR_MEME_OFFICIAL_API = 'https://four.meme/meme-api';
 export class FourClient {
+    baseUrl;
+    uploadUrls;
     constructor(cfg) {
         // 默认使用 Cloudflare Workers 代理，已配置 CORS，浏览器可直接使用
         this.baseUrl = cfg?.baseUrl || 'https://bscfourapi.emit.tools';
@@ -135,7 +140,6 @@ export class FourClient {
         const hash = await hashBlob(file);
         const cached = getCachedUrl(hash);
         if (cached) {
-            console.log(`[FourClient] 图片命中缓存，跳过上传 (hash: ${hash.slice(0, 12)}...)`);
             return cached;
         }
         const finalFilename = filename || this.getFilenameFromBlob(file);
@@ -148,22 +152,20 @@ export class FourClient {
                 const imgUrl = await this.doUpload(baseUrl, accessToken, file, finalFilename);
                 // 上传成功，写入持久化缓存（localStorage）
                 setCachedUrl(hash, imgUrl);
-                if (i > 0) {
-                    console.log(`[FourClient] 使用${isOfficial ? '官方直连' : '备用'}端点上传成功: ${baseUrl}`);
-                }
                 return imgUrl;
             }
             catch (e) {
-                lastError = e;
+                const err = e instanceof Error ? e : new Error(getErrorMessageFromUnknown(e));
+                lastError = err;
                 const canRetry = i < this.uploadUrls.length - 1;
-                if (this.isRateLimitError(e) && canRetry) {
+                if (this.isRateLimitError(err) && canRetry) {
                     // IP 限流 → 切下一个端点
                     const nextUrl = this.uploadUrls[i + 1];
                     const nextLabel = nextUrl === FOUR_MEME_OFFICIAL_API ? '官方直连' : `备用端点 #${i + 2}`;
                     console.warn(`[FourClient] 端点 ${baseUrl} 触发 IP 限流(100次/天)，切换到${nextLabel}...`);
                     continue;
                 }
-                if (this.isCorsOrNetworkError(e) && canRetry) {
+                if (this.isCorsOrNetworkError(err) && canRetry) {
                     // CORS/网络错误（常见于浏览器直连官方 API）→ 跳过，继续尝试下一个
                     console.warn(`[FourClient] 端点 ${baseUrl} 请求失败(${isOfficial ? 'CORS限制' : '网络错误'})，跳过`);
                     continue;
@@ -177,9 +179,11 @@ export class FourClient {
         if (isRateLimit) {
             throw new Error(`图片上传失败：所有端点均触发 IP 限流(每IP每天100次)。` +
                 `请等待次日重置，或在 FourConfig.uploadFallbackUrls 中添加不同 IP 的备用代理。` +
-                `\n原始错误: ${lastError.message}`);
+                `\n原始错误: ${getErrorMessageFromUnknown(lastError)}`);
         }
-        throw lastError || new Error('upload failed: all endpoints exhausted');
+        if (lastError !== null && lastError !== undefined)
+            throw lastError;
+        throw new Error('upload failed: all endpoints exhausted');
     }
     /**
      * 执行单次上传请求
@@ -194,9 +198,9 @@ export class FourClient {
         });
         const j = await r.json();
         if (j.code !== '0' && j.code !== 0) {
-            const err = new Error(`upload failed: ${JSON.stringify(j)}`);
-            err.apiCode = typeof j.code === 'string' ? parseInt(j.code, 10) : j.code;
-            throw err;
+            const uploadErr = new Error(`upload failed: ${JSON.stringify(j)}`);
+            uploadErr.apiCode = typeof j.code === 'string' ? parseInt(j.code, 10) : Number(j.code);
+            throw uploadErr;
         }
         return j.data; // imgUrl
     }
@@ -204,12 +208,13 @@ export class FourClient {
      * 判断是否为 IP 限流错误（code: -1038）
      */
     isRateLimitError(e) {
-        if (e?.apiCode === RATE_LIMIT_CODE)
+        if (e !== null &&
+            typeof e === 'object' &&
+            'apiCode' in e &&
+            e.apiCode === RATE_LIMIT_CODE) {
             return true;
-        // 兼容：从 message 中检测
-        if (typeof e?.message === 'string' && e.message.includes('-1038'))
-            return true;
-        return false;
+        }
+        return getErrorMessageFromUnknown(e).includes('-1038');
     }
     /**
      * 判断是否为 CORS 或网络错误
@@ -218,7 +223,7 @@ export class FourClient {
     isCorsOrNetworkError(e) {
         if (e instanceof TypeError)
             return true; // fetch CORS / network failure
-        const msg = e?.message?.toLowerCase?.() || '';
+        const msg = getErrorMessageFromUnknown(e).toLowerCase();
         return msg.includes('failed to fetch') || msg.includes('network') || msg.includes('cors');
     }
     getFilenameFromBlob(blob) {
@@ -247,7 +252,7 @@ export class FourClient {
     }
     async getPublicConfig() {
         const r = await fetch(`${this.baseUrl}/v1/public/config`);
-        return await r.json();
+        return (await r.json());
     }
     async getTokenByAddress(address, accessToken) {
         const r = await fetch(`${this.baseUrl}/v1/private/token/get?address=${address}`, {
@@ -257,12 +262,12 @@ export class FourClient {
         if (j.code && j.code !== '0' && j.code !== 0) {
             throw new Error(`getTokenByAddress failed: ${JSON.stringify(j)}`);
         }
-        return j.data ?? j;
+        return (j.data ?? j);
     }
     async getTokensByAddresses(addresses, accessToken) {
         if (!Array.isArray(addresses) || addresses.length === 0)
             return [];
-        const tasks = addresses.map((addr) => this.getTokenByAddress(addr, accessToken).catch((e) => ({ address: addr, error: String(e) })));
+        const tasks = addresses.map((addr) => this.getTokenByAddress(addr, accessToken).catch((e) => ({ address: addr, error: getErrorMessageFromUnknown(e) })));
         return await Promise.all(tasks);
     }
     async getTokenById(id, accessToken) {
@@ -273,7 +278,7 @@ export class FourClient {
         if (j.code && j.code !== '0' && j.code !== 0) {
             throw new Error(`getTokenById failed: ${JSON.stringify(j)}`);
         }
-        return j.data ?? j;
+        return (j.data ?? j);
     }
 }
 export function buildLoginMessage(nonce) {

package/dist/shared/clients/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * HTTP / Bundle 客户端统一出口（不替代根包的扁平别名，仅供子路径导入）
+ */
+export { FourClient, buildLoginMessage, type FourConfig, type GenerateNonceReq, type LoginReq, type CreateTokenReq, type CreateTokenResp, type FourTokenTaxInfo, } from './four.js';
+export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, type BundleParams, type BundleStatus, type Club48Config, } from './club48.js';
+export { MerkleClient, createMerkleClient, type MerkleConfig, type BundleParams as MerkleBundleParams, type SendBundleOptions, type BundleResult, type TransactionResult, } from './merkle.js';
+export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, type BlockRazorConfig, type BlockRazorBundleParams, type SendBundleOptions as BlockRazorSendBundleOptions, type BundleResult as BlockRazorBundleResult, type TransactionResult as BlockRazorTransactionResult, type IncentiveTransactionParams, } from './blockrazor.js';
+export { EmitServiceClient, submitToEmitServiceBlockRazor, type EmitServiceClientConfig, type EmitServiceSubmitRequest, type EmitServiceSubmitResponse, type EmitServiceSubmitResponseData, type EmitServiceRouteConfigResponse, } from './emitservice.js';

package/dist/shared/clients/index.js

@@ -0,0 +1,8 @@
+/**
+ * HTTP / Bundle 客户端统一出口（不替代根包的扁平别名，仅供子路径导入）
+ */
+export { FourClient, buildLoginMessage, } from './four.js';
+export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, } from './club48.js';
+export { MerkleClient, createMerkleClient, } from './merkle.js';
+export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, } from './blockrazor.js';
+export { EmitServiceClient, submitToEmitServiceBlockRazor, } from './emitservice.js';

package/dist/shared/clients/merkle.d.ts

@@ -21,14 +21,15 @@
  * ```
  */
 import { JsonRpcProvider, Wallet, TransactionLike } from 'ethers';
+import { CHAINS } from '../constants/index.js';
 /**
  * Merkle 客户端配置
  */
 export interface MerkleConfig {
     /** Merkle API Key (例如: pk_mbs_...) */
     apiKey: string;
-    /** 链 ID: 56=BSC, 1=Ethereum */
-    chainId: 56 | 1;
+    /** 链 ID: BSC 或 Ethereum */
+    chainId: typeof CHAINS.BSC.chainId | typeof CHAINS.ETHEREUM.chainId;
     /** 自定义 RPC URL（可选，默认使用 Merkle 官方 RPC） */
     customRpcUrl?: string;
 }
@@ -207,4 +208,4 @@ export declare class MerkleClient {
 /**
  * 创建 Merkle 客户端的便捷函数
  */
-export declare function createMerkleClient(apiKey: string, chainId?: 56 | 1): MerkleClient;
+export declare function createMerkleClient(apiKey: string, chainId?: typeof CHAINS.BSC.chainId | typeof CHAINS.ETHEREUM.chainId): MerkleClient;

package/dist/shared/clients/merkle.js

@@ -20,16 +20,21 @@
  * });
  * ```
  */
-import { JsonRpcProvider, Transaction } from 'ethers';
+import { JsonRpcProvider, Transaction, formatEther } from 'ethers';
 import { CHAINS } from '../constants/index.js';
+import { getErrorMessageFromUnknown } from '../foundation/index.js';
 /**
  * Merkle 客户端
  */
 export class MerkleClient {
+    provider;
+    chainId;
+    chainName;
+    // ✅ 区块号缓存（减少 RPC 调用）
+    // 注意：TTL 设为 1 秒，确保区块号尽可能新鲜，减少 "Missed inclusion" 风险
+    blockNumberCache = null;
+    static BLOCK_CACHE_TTL_MS = 1000; // 1秒缓存（BSC 约 3 秒出块，ETH 约 12 秒）
     constructor(config) {
-        // ✅ 区块号缓存（减少 RPC 调用）
-        // 注意：TTL 设为 1 秒，确保区块号尽可能新鲜，减少 "Missed inclusion" 风险
-        this.blockNumberCache = null;
         this.chainId = config.chainId;
         this.chainName = config.chainId === CHAINS.BSC.chainId ? 'bsc' : 'ethereum';
         // ✅ 修复：移除弃用的 mempool.merkle.io RPC，使用公共 RPC 作为默认值
@@ -78,23 +83,18 @@ export class MerkleClient {
      * 获取网络状态（用于 Bundle 参数优化）
      */
     async getNetworkStatus() {
-        const [currentBlock, feeData] = await Promise.all([
-            this.getBlockNumber(),
-            this.getFeeData()
-        ]);
+        const [currentBlock, feeData] = await Promise.all([this.getBlockNumber(), this.getFeeData()]);
         // 动态获取 gas price，并计算建议的最小值
         const baseGasPrice = feeData.gasPrice || feeData.maxFeePerGas || 3000000000n;
         // 建议至少提高 80% 以确保交易被打包
         const suggestedMinGasPrice = (baseGasPrice * 180n) / 100n;
         // BSC 平均 3 秒，Ethereum 平均 12 秒
-        const avgBlockTime = this.chainId === CHAINS.BSC.chainId
-            ? CHAINS.BSC.blockTime / 1000
-            : CHAINS.ETHEREUM.blockTime / 1000;
+        const avgBlockTime = this.chainId === CHAINS.BSC.chainId ? CHAINS.BSC.blockTime / 1000 : CHAINS.ETHEREUM.blockTime / 1000;
         return {
             currentBlock,
             gasPrice: baseGasPrice,
             suggestedMinGasPrice,
-            avgBlockTime
+            avgBlockTime,
         };
     }
     /**
@@ -139,9 +139,7 @@ export class MerkleClient {
             throw new Error('Invalid bundle result format');
         }
         catch (error) {
-            // 增强错误信息
-            const errorMsg = error.message || String(error);
-            throw new Error(`Send bundle failed: ${errorMsg}`);
+            throw new Error(`Send bundle failed: ${getErrorMessageFromUnknown(error)}`);
         }
     }
     /**
@@ -172,7 +170,7 @@ export class MerkleClient {
                     if (targetBlock <= currentBlock) {
                         if (autoRetry && attempt < maxRetries) {
                             attempt++;
-                            await new Promise(resolve => setTimeout(resolve, 300)); // 短暂延迟
+                            await new Promise((resolve) => setTimeout(resolve, 300)); // 短暂延迟
                             continue;
                         }
                         throw new Error(`Target block ${targetBlock} has already passed (current block: ${currentBlock})`);
@@ -194,7 +192,7 @@ export class MerkleClient {
                     maxTimestamp: options.maxTimestamp,
                 });
                 // ✅ 优化：并行提取交易哈希（map 比 for 循环更高效）
-                const txHashes = options.transactions.map(rawTx => {
+                const txHashes = options.transactions.map((rawTx) => {
                     try {
                         return Transaction.from(rawTx).hash || '';
                     }
@@ -215,10 +213,8 @@ export class MerkleClient {
                 if (autoRetry && attempt < maxRetries) {
                     attempt++;
                     // 等待一个区块时间再重试
-                    const blockTime = this.chainId === CHAINS.BSC.chainId
-                        ? CHAINS.BSC.blockTime
-                        : CHAINS.ETHEREUM.blockTime;
-                    await new Promise(resolve => setTimeout(resolve, blockTime));
+                    const blockTime = this.chainId === CHAINS.BSC.chainId ? CHAINS.BSC.blockTime : CHAINS.ETHEREUM.blockTime;
+                    await new Promise((resolve) => setTimeout(resolve, blockTime));
                     continue;
                 }
                 // 没有重试或已达最大重试次数
@@ -226,7 +222,10 @@ export class MerkleClient {
             }
         }
         // 如果执行到这里，说明所有重试都失败了
-        throw lastError || new Error('Bundle submission failed after all retries');
+        if (lastError !== null && lastError !== undefined) {
+            throw lastError;
+        }
+        throw new Error('Bundle submission failed after all retries');
     }
     /**
      * 等待 Bundle 中的交易确认
@@ -250,18 +249,8 @@ export class MerkleClient {
                 }
                 let gasCost;
                 if (receipt.gasUsed && receipt.gasPrice) {
-                    // 使用 BigInt 避免精度丢失
-                    try {
-                        const costWei = receipt.gasUsed * receipt.gasPrice;
-                        // 转换为 ETH/BNB（保持精度）
-                        const costEth = Number(costWei) / 1e18;
-                        gasCost = costEth.toFixed(8); // 增加精度到 8 位小数
-                    }
-                    catch (error) {
-                        // 如果计算溢出，使用字符串处理
-                        const costWei = receipt.gasUsed * receipt.gasPrice;
-                        gasCost = (Number(costWei / 1000000000n) / 1e9).toFixed(8);
-                    }
+                    const costWei = receipt.gasUsed * receipt.gasPrice;
+                    gasCost = formatEther(costWei);
                 }
                 return {
                     index,
@@ -278,7 +267,7 @@ export class MerkleClient {
                     index,
                     hash,
                     success: false,
-                    error: error.message,
+                    error: getErrorMessageFromUnknown(error),
                 };
             }
         });
@@ -351,7 +340,6 @@ export class MerkleClient {
      */
     async waitForBlock(targetBlock, maxAttempts = 10, intervalMs = 1000) {
         let attempts = 0;
-        let lastError = null;
         while (attempts < maxAttempts) {
             try {
                 const currentBlock = await this.getBlockNumber();
@@ -366,35 +354,30 @@ export class MerkleClient {
                     return false;
                 }
             }
-            catch (error) {
-                lastError = error;
-                // 继续重试
+            catch {
+                // RPC 瞬时失败：继续下一轮轮询
             }
             // 等待下一次检查
-            await new Promise(resolve => setTimeout(resolve, intervalMs));
+            await new Promise((resolve) => setTimeout(resolve, intervalMs));
             attempts++;
         }
-        // 达到最大尝试次数
-        if (lastError) {
-        }
         return false;
     }
     /**
      * 获取当前 Provider 的统计信息（用于调试）
      */
     getProviderInfo() {
+        const rpcConnection = this.provider._getConnection?.();
         return {
             chainId: this.chainId,
             chainName: this.chainName,
-            // @ts-ignore - 访问私有属性用于调试
-            rpcUrl: this.provider._getConnection?.().url || 'unknown',
+            rpcUrl: rpcConnection?.url ?? 'unknown',
         };
     }
 }
-MerkleClient.BLOCK_CACHE_TTL_MS = 1000; // 1秒缓存（BSC 约 3 秒出块，ETH 约 12 秒）
 /**
  * 创建 Merkle 客户端的便捷函数
  */
-export function createMerkleClient(apiKey, chainId = 56) {
+export function createMerkleClient(apiKey, chainId = CHAINS.BSC.chainId) {
     return new MerkleClient({ apiKey, chainId });
 }