@cityofzion/bs-ethereum 2.13.4 → 2.14.0

package/dist/services/blockchain-data/RpcBDSEthereum.js

@@ -8,28 +8,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _RpcBDSEthereum_instances, _RpcBDSEthereum_providerInstance, _RpcBDSEthereum_provider_get;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcBDSEthereum = void 0;
 const ethers_1 = require("ethers");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const ERC20_1 = require("../../assets/abis/ERC20");
 class RpcBDSEthereum {
-    constructor(network, tokenService) {
+    constructor(service) {
+        _RpcBDSEthereum_instances.add(this);
+        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5; // 5 minutes
         this._tokenCache = new Map();
-        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
-        this._network = network;
-        this._tokenService = tokenService;
+        _RpcBDSEthereum_providerInstance.set(this, void 0);
+        this._service = service;
     }
     getTransaction(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._network.url);
-            const transaction = yield provider.getTransaction(hash);
+            const transaction = yield __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getTransaction(hash);
             if (!transaction || !transaction.blockHash || !transaction.to)
                 throw new Error('Transaction not found');
-            const block = yield provider.getBlock(transaction.blockHash);
+            const block = yield __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getBlock(transaction.blockHash);
             if (!block)
                 throw new Error('Block not found');
-            const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
+            const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
             return {
                 block: block.number,
                 time: block.timestamp,
@@ -51,7 +63,7 @@ class RpcBDSEthereum {
     }
     getTransactionsByAddress(_params) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("RPC doesn't support get transactions history of address");
+            throw new Error('Method not supported.');
         });
     }
     getFullTransactionsByAddress(_params) {
@@ -66,22 +78,21 @@ class RpcBDSEthereum {
     }
     getContract(_hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("RPC doesn't support contract info");
+            throw new Error('Method not supported.');
         });
     }
     getTokenInfo(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            if (this._tokenService.predicateByHash(nativeAsset, hash))
+            const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
+            if (this._service.tokenService.predicateByHash(nativeAsset, hash))
                 return nativeAsset;
             if (this._tokenCache.has(hash)) {
                 return this._tokenCache.get(hash);
             }
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._network.url);
-            const contract = new ethers_1.ethers.Contract(hash, ERC20_1.ERC20_ABI, provider);
+            const contract = new ethers_1.ethers.Contract(hash, ERC20_1.ERC20_ABI, __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get));
             const decimals = yield contract.decimals();
             const symbol = yield contract.symbol();
-            const token = this._tokenService.normalizeToken({
+            const token = this._service.tokenService.normalizeToken({
                 decimals,
                 symbol,
                 hash,
@@ -93,9 +104,8 @@ class RpcBDSEthereum {
     }
     getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._network.url);
-            const balance = yield provider.getBalance(address);
-            const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
+            const balance = yield __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getBalance(address);
+            const token = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._service.network);
             return [
                 {
                     amount: ethers_1.ethers.utils.formatEther(balance),
@@ -106,43 +116,14 @@ class RpcBDSEthereum {
     }
     getBlockHeight() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._network.url);
-            return yield provider.getBlockNumber();
-        });
-    }
-    getRpcList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const list = [];
-            const urls = BSEthereumHelper_1.BSEthereumHelper.getRpcList(this._network);
-            const promises = urls.map(url => {
-                // eslint-disable-next-line no-async-promise-executor
-                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                    const timeout = setTimeout(() => {
-                        resolve();
-                    }, 5000);
-                    try {
-                        const provider = new ethers_1.ethers.providers.JsonRpcProvider(url);
-                        const timeStart = Date.now();
-                        const height = yield provider.getBlockNumber();
-                        const latency = Date.now() - timeStart;
-                        list.push({
-                            url,
-                            height,
-                            latency,
-                        });
-                    }
-                    catch (_a) {
-                        /* empty */
-                    }
-                    finally {
-                        resolve();
-                        clearTimeout(timeout);
-                    }
-                }));
-            });
-            yield Promise.allSettled(promises);
-            return list;
+            return yield __classPrivateFieldGet(this, _RpcBDSEthereum_instances, "a", _RpcBDSEthereum_provider_get).getBlockNumber();
         });
     }
 }
 exports.RpcBDSEthereum = RpcBDSEthereum;
+_RpcBDSEthereum_providerInstance = new WeakMap(), _RpcBDSEthereum_instances = new WeakSet(), _RpcBDSEthereum_provider_get = function _RpcBDSEthereum_provider_get() {
+    if (!__classPrivateFieldGet(this, _RpcBDSEthereum_providerInstance, "f")) {
+        __classPrivateFieldSet(this, _RpcBDSEthereum_providerInstance, new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url), "f");
+    }
+    return __classPrivateFieldGet(this, _RpcBDSEthereum_providerInstance, "f");
+};

package/dist/services/exchange-data/MoralisEDSEthereum.d.ts

@@ -1,8 +1,11 @@
-import { BlockchainDataService, CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse, TokenService } from '@cityofzion/blockchain-service';
-import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
-export declare class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
+import { CryptoCompareEDS, TGetTokenPriceHistoryParams, TGetTokenPricesParams, TBSNetworkId, TTokenPricesHistoryResponse, TTokenPricesResponse } from '@cityofzion/blockchain-service';
+import { IBSEthereum } from '../../types';
+export declare class MoralisEDSEthereum<N extends string, A extends TBSNetworkId> extends CryptoCompareEDS {
     #private;
-    constructor(network: Network<BSEthereumNetworkId>, blockchainDataService: BlockchainDataService, tokenService: TokenService);
-    getTokenPrices({ tokens }: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
-    getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
+    static readonly NUMBERS_OF_BLOCK_BY_HOUR: number;
+    static readonly NUMBER_OF_BLOCK_BY_DAY: number;
+    static readonly MAX_TOKEN_PRICES_PER_CALL = 24;
+    constructor(service: IBSEthereum<N, A>);
+    getTokenPrices({ tokens }: TGetTokenPricesParams): Promise<TTokenPricesResponse[]>;
+    getTokenPriceHistory(params: TGetTokenPriceHistoryParams): Promise<TTokenPricesHistoryResponse[]>;
 }

package/dist/services/exchange-data/MoralisEDSEthereum.js

@@ -19,7 +19,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MoralisEDSEthereum_instances, _MoralisEDSEthereum_network, _MoralisEDSEthereum_blockchainDataService, _MoralisEDSEthereum_numberOfBlockByHour, _MoralisEDSEthereum_numberOfBlockByDay, _MoralisEDSEthereum_maxTokenPricesPerCall, _MoralisEDSEthereum_tokenService, _MoralisEDSEthereum_getWrappedNativeToken;
+var _MoralisEDSEthereum_instances, _MoralisEDSEthereum_service, _MoralisEDSEthereum_apiInstance, _MoralisEDSEthereum_api_get, _MoralisEDSEthereum_getWrappedNativeToken;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisEDSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -27,27 +27,20 @@ const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const MoralisBDSEthereum_1 = require("../blockchain-data/MoralisBDSEthereum");
 class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
-    constructor(network, blockchainDataService, tokenService) {
+    constructor(service) {
         super();
         _MoralisEDSEthereum_instances.add(this);
-        _MoralisEDSEthereum_network.set(this, void 0);
-        _MoralisEDSEthereum_blockchainDataService.set(this, void 0);
-        _MoralisEDSEthereum_numberOfBlockByHour.set(this, (15 / 60) * 60);
-        _MoralisEDSEthereum_numberOfBlockByDay.set(this, __classPrivateFieldGet(this, _MoralisEDSEthereum_numberOfBlockByHour, "f") * 24);
-        _MoralisEDSEthereum_maxTokenPricesPerCall.set(this, 24);
-        _MoralisEDSEthereum_tokenService.set(this, void 0);
-        __classPrivateFieldSet(this, _MoralisEDSEthereum_network, network, "f");
-        __classPrivateFieldSet(this, _MoralisEDSEthereum_blockchainDataService, blockchainDataService, "f");
-        __classPrivateFieldSet(this, _MoralisEDSEthereum_tokenService, tokenService, "f");
+        _MoralisEDSEthereum_service.set(this, void 0);
+        _MoralisEDSEthereum_apiInstance.set(this, void 0);
+        __classPrivateFieldSet(this, _MoralisEDSEthereum_service, service, "f");
     }
-    getTokenPrices({ tokens }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnet(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f")))
+    getTokenPrices(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ tokens }) {
+            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f")))
                 throw new Error('Exchange is only available on mainnet');
-            if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f")))
+            if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network))
                 throw new Error('Exchange is not supported on this network');
-            const client = MoralisBDSEthereum_1.MoralisBDSEthereum.getClient(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
-            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
+            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network);
             const tokensBody = [];
             let wrappedNativeToken;
             if (tokens.some(token => token.symbol === nativeToken.symbol)) {
@@ -57,7 +50,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                         tokensBody.push({ token_address: wrappedNativeToken.hash.toLowerCase() });
                     }
                 }
-                catch (_a) {
+                catch (_b) {
                     /* empty */
                 }
             }
@@ -69,23 +62,23 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
             if (tokensBody.length === 0)
                 return [];
             const splitTokensBody = [];
-            for (let i = 0; i < tokensBody.length; i += __classPrivateFieldGet(this, _MoralisEDSEthereum_maxTokenPricesPerCall, "f")) {
-                splitTokensBody.push(tokensBody.slice(i, i + __classPrivateFieldGet(this, _MoralisEDSEthereum_maxTokenPricesPerCall, "f")));
+            for (let i = 0; i < tokensBody.length; i += MoralisEDSEthereum.MAX_TOKEN_PRICES_PER_CALL) {
+                splitTokensBody.push(tokensBody.slice(i, i + MoralisEDSEthereum.MAX_TOKEN_PRICES_PER_CALL));
             }
             const response = [];
             yield Promise.allSettled(splitTokensBody.map((body) => __awaiter(this, void 0, void 0, function* () {
-                const { data } = yield client.post('/erc20/prices', {
+                const { data } = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "a", _MoralisEDSEthereum_api_get).post('/erc20/prices', {
                     tokens: body,
                 });
                 data.forEach(item => {
                     let token;
-                    if (wrappedNativeToken && __classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").predicateByHash(wrappedNativeToken, item.tokenAddress)) {
+                    if (wrappedNativeToken && __classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").tokenService.predicateByHash(wrappedNativeToken, item.tokenAddress)) {
                         token = nativeToken;
                     }
                     else {
                         token = {
                             decimals: Number(item.tokenDecimals),
-                            hash: __classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").normalizeHash(item.tokenAddress),
+                            hash: __classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").tokenService.normalizeHash(item.tokenAddress),
                             name: item.tokenName,
                             symbol: item.tokenSymbol,
                         };
@@ -101,31 +94,36 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     }
     getTokenPriceHistory(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnet(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f")))
+            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnetNetwork(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f")))
                 throw new Error('Exchange is only available on mainnet');
-            if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f")))
+            if (!MoralisBDSEthereum_1.MoralisBDSEthereum.isSupported(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network))
                 throw new Error('Exchange is not supported on this network');
-            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
+            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network);
             let token;
-            if (__classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").predicateByHash(nativeToken, params.token)) {
+            if (__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").tokenService.predicateByHash(nativeToken, params.token)) {
                 token = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "m", _MoralisEDSEthereum_getWrappedNativeToken).call(this);
             }
             else {
                 token = params.token;
             }
-            const client = MoralisBDSEthereum_1.MoralisBDSEthereum.getClient(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
-            const currentBlockNumber = (yield __classPrivateFieldGet(this, _MoralisEDSEthereum_blockchainDataService, "f").getBlockHeight()) - 1; // Last block is not included
+            const currentBlockNumber = (yield __classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").blockchainDataService.getBlockHeight()) - 1; // Last block is not included
             const tokensBody = Array.from({ length: params.limit }).map((_, index) => ({
                 token_address: token.hash,
-                to_block: currentBlockNumber - index * (params.type === 'hour' ? __classPrivateFieldGet(this, _MoralisEDSEthereum_numberOfBlockByHour, "f") : __classPrivateFieldGet(this, _MoralisEDSEthereum_numberOfBlockByDay, "f")),
+                to_block: currentBlockNumber -
+                    index *
+                        (params.type === 'hour'
+                            ? MoralisEDSEthereum.NUMBERS_OF_BLOCK_BY_HOUR
+                            : MoralisEDSEthereum.NUMBER_OF_BLOCK_BY_DAY),
             }));
             const splitTokensBody = [];
-            for (let i = 0; i < tokensBody.length; i += __classPrivateFieldGet(this, _MoralisEDSEthereum_maxTokenPricesPerCall, "f")) {
-                splitTokensBody.push(tokensBody.slice(i, i + __classPrivateFieldGet(this, _MoralisEDSEthereum_maxTokenPricesPerCall, "f")));
+            for (let i = 0; i < tokensBody.length; i += MoralisEDSEthereum.MAX_TOKEN_PRICES_PER_CALL) {
+                splitTokensBody.push(tokensBody.slice(i, i + MoralisEDSEthereum.MAX_TOKEN_PRICES_PER_CALL));
             }
             const history = [];
             yield Promise.allSettled(splitTokensBody.map((body) => __awaiter(this, void 0, void 0, function* () {
-                const priceResponse = yield client.post('/erc20/prices', { tokens: body });
+                const priceResponse = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "a", _MoralisEDSEthereum_api_get).post('/erc20/prices', {
+                    tokens: body,
+                });
                 priceResponse.data.forEach(item => {
                     history.push({
                         timestamp: Number(item.blockTimestamp),
@@ -139,13 +137,21 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     }
 }
 exports.MoralisEDSEthereum = MoralisEDSEthereum;
-_MoralisEDSEthereum_network = new WeakMap(), _MoralisEDSEthereum_blockchainDataService = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByHour = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByDay = new WeakMap(), _MoralisEDSEthereum_maxTokenPricesPerCall = new WeakMap(), _MoralisEDSEthereum_tokenService = new WeakMap(), _MoralisEDSEthereum_instances = new WeakSet(), _MoralisEDSEthereum_getWrappedNativeToken = function _MoralisEDSEthereum_getWrappedNativeToken() {
+_MoralisEDSEthereum_service = new WeakMap(), _MoralisEDSEthereum_apiInstance = new WeakMap(), _MoralisEDSEthereum_instances = new WeakSet(), _MoralisEDSEthereum_api_get = function _MoralisEDSEthereum_api_get() {
+    if (!__classPrivateFieldGet(this, _MoralisEDSEthereum_apiInstance, "f")) {
+        __classPrivateFieldSet(this, _MoralisEDSEthereum_apiInstance, MoralisBDSEthereum_1.MoralisBDSEthereum.getClient(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network), "f");
+    }
+    return __classPrivateFieldGet(this, _MoralisEDSEthereum_apiInstance, "f");
+}, _MoralisEDSEthereum_getWrappedNativeToken = function _MoralisEDSEthereum_getWrappedNativeToken() {
     return __awaiter(this, void 0, void 0, function* () {
-        const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
+        const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network);
         const wrappedSymbol = `W${nativeToken.symbol}`;
-        const localWrappedHash = BSEthereumConstants_1.BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f").id];
+        const localWrappedHash = BSEthereumConstants_1.BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[__classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").network.id];
         if (!localWrappedHash)
             throw new Error('Wrapper token not found');
-        return __classPrivateFieldGet(this, _MoralisEDSEthereum_tokenService, "f").normalizeToken(Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash }));
+        return __classPrivateFieldGet(this, _MoralisEDSEthereum_service, "f").tokenService.normalizeToken(Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash }));
     });
 };
+MoralisEDSEthereum.NUMBERS_OF_BLOCK_BY_HOUR = (60 / 15) * 60;
+MoralisEDSEthereum.NUMBER_OF_BLOCK_BY_DAY = MoralisEDSEthereum.NUMBERS_OF_BLOCK_BY_HOUR * 24;
+MoralisEDSEthereum.MAX_TOKEN_PRICES_PER_CALL = 24;

package/dist/services/explorer/BlockscoutESEthereum.d.ts

@@ -1,11 +1,13 @@
-import { BuildNftUrlParams, ExplorerService, Network, NetworkId, TokenService } from '@cityofzion/blockchain-service';
-import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
-export declare class BlockscoutESEthereum<BSNetworkId extends NetworkId = BSEthereumNetworkId> implements ExplorerService {
-    #private;
-    constructor(network: Network<BSEthereumNetworkId>, tokenService: TokenService, baseUrlByNetworkId?: Partial<Record<BSNetworkId, string>>);
+import { TBuildNftUrlParams, IExplorerService, TBSNetworkId } from '@cityofzion/blockchain-service';
+import { IBSEthereum, TBSEthereumNetworkId } from '../../types';
+export declare class BlockscoutESEthereum<N extends string, A extends TBSNetworkId> implements IExplorerService {
+    static readonly DEFAULT_BASE_URL_BY_NETWORK_ID: Partial<Record<TBSEthereumNetworkId, string>>;
+    readonly _service: IBSEthereum<N, A>;
+    constructor(service: IBSEthereum<N, A>);
+    getBaseUrl(): NonNullable<Partial<Record<TBSEthereumNetworkId, string>>[TBSNetworkId<A>]>;
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
-    buildNftUrl(params: BuildNftUrlParams): string;
+    buildNftUrl(params: TBuildNftUrlParams): string;
     getAddressTemplateUrl(): string | undefined;
     getTxTemplateUrl(): string | undefined;
     getNftTemplateUrl(): string | undefined;

package/dist/services/explorer/BlockscoutESEthereum.js

@@ -1,55 +1,32 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BlockscoutESEthereum_instances, _BlockscoutESEthereum_network, _BlockscoutESEthereum_baseUrlByNetworkId, _BlockscoutESEthereum_tokenService, _BlockscoutESEthereum_getBaseUrl;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutESEthereum = void 0;
-const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
-const DEFAULT_BASE_URL_BY_NETWORK_ID = {
-    [BSEthereumConstants_1.BSEthereumConstants.ETHEREUM_MAINNET_NETWORK_ID]: 'https://eth.blockscout.com',
-    '10': 'https://optimism.blockscout.com',
-    [BSEthereumConstants_1.BSEthereumConstants.POLYGON_MAINNET_NETWORK_ID]: 'https://polygon.blockscout.com',
-    [BSEthereumConstants_1.BSEthereumConstants.BASE_MAINNET_NETWORK_ID]: 'https://base.blockscout.com',
-    [BSEthereumConstants_1.BSEthereumConstants.ARBITRUM_MAINNET_NETWORK_ID]: 'https://arbitrum.blockscout.com',
-    '42220': 'https://explorer.celo.org/mainnet',
-    '59144': 'https://explorer.linea.build',
-    '1101': 'https://zkevm.blockscout.com',
-    '11155111': 'https://eth-sepolia.blockscout.com',
-};
 class BlockscoutESEthereum {
-    constructor(network, tokenService, baseUrlByNetworkId) {
-        _BlockscoutESEthereum_instances.add(this);
-        _BlockscoutESEthereum_network.set(this, void 0);
-        _BlockscoutESEthereum_baseUrlByNetworkId.set(this, void 0);
-        _BlockscoutESEthereum_tokenService.set(this, void 0);
-        __classPrivateFieldSet(this, _BlockscoutESEthereum_network, network, "f");
-        __classPrivateFieldSet(this, _BlockscoutESEthereum_baseUrlByNetworkId, baseUrlByNetworkId !== null && baseUrlByNetworkId !== void 0 ? baseUrlByNetworkId : DEFAULT_BASE_URL_BY_NETWORK_ID, "f");
-        __classPrivateFieldSet(this, _BlockscoutESEthereum_tokenService, tokenService, "f");
+    constructor(service) {
+        this._service = service;
+    }
+    getBaseUrl() {
+        const baseUrl = BlockscoutESEthereum.DEFAULT_BASE_URL_BY_NETWORK_ID[this._service.network.id];
+        if (!baseUrl) {
+            throw new Error('Network not supported');
+        }
+        return baseUrl;
     }
     buildTransactionUrl(hash) {
-        const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/tx/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(hash)}`;
+        const baseURL = this.getBaseUrl();
+        return `${baseURL}/tx/${this._service.tokenService.normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
-        const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/address/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(contractHash)}`;
+        const baseURL = this.getBaseUrl();
+        return `${baseURL}/address/${this._service.tokenService.normalizeHash(contractHash)}`;
     }
     buildNftUrl(params) {
-        const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/token/${__classPrivateFieldGet(this, _BlockscoutESEthereum_tokenService, "f").normalizeHash(params.collectionHash)}/instance/${params.tokenHash}`;
+        const baseURL = this.getBaseUrl();
+        return `${baseURL}/token/${this._service.tokenService.normalizeHash(params.collectionHash)}/instance/${params.tokenHash}`;
     }
     getAddressTemplateUrl() {
         try {
-            const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
+            const baseUrl = this.getBaseUrl();
             return `${baseUrl}/address/{address}`;
         }
         catch (_a) {
@@ -58,7 +35,7 @@ class BlockscoutESEthereum {
     }
     getTxTemplateUrl() {
         try {
-            const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
+            const baseUrl = this.getBaseUrl();
             return `${baseUrl}/tx/{txId}`;
         }
         catch (_a) {
@@ -67,7 +44,7 @@ class BlockscoutESEthereum {
     }
     getNftTemplateUrl() {
         try {
-            const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
+            const baseUrl = this.getBaseUrl();
             return `${baseUrl}/token/{collectionHash}/instance/{tokenHash}`;
         }
         catch (_a) {
@@ -76,7 +53,7 @@ class BlockscoutESEthereum {
     }
     getContractTemplateUrl() {
         try {
-            const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
+            const baseUrl = this.getBaseUrl();
             return `${baseUrl}/address/{hash}`;
         }
         catch (_a) {
@@ -85,10 +62,14 @@ class BlockscoutESEthereum {
     }
 }
 exports.BlockscoutESEthereum = BlockscoutESEthereum;
-_BlockscoutESEthereum_network = new WeakMap(), _BlockscoutESEthereum_baseUrlByNetworkId = new WeakMap(), _BlockscoutESEthereum_tokenService = new WeakMap(), _BlockscoutESEthereum_instances = new WeakSet(), _BlockscoutESEthereum_getBaseUrl = function _BlockscoutESEthereum_getBaseUrl(network) {
-    const baseUrl = __classPrivateFieldGet(this, _BlockscoutESEthereum_baseUrlByNetworkId, "f")[network.id];
-    if (!baseUrl) {
-        throw new Error('Network not supported');
-    }
-    return baseUrl;
+BlockscoutESEthereum.DEFAULT_BASE_URL_BY_NETWORK_ID = {
+    '1': 'https://eth.blockscout.com',
+    '10': 'https://optimism.blockscout.com',
+    '137': 'https://polygon.blockscout.com',
+    '8453': 'https://base.blockscout.com',
+    '42161': 'https://arbitrum.blockscout.com',
+    '42220': 'https://explorer.celo.org/mainnet',
+    '59144': 'https://explorer.linea.build',
+    '1101': 'https://zkevm.blockscout.com',
+    '11155111': 'https://eth-sepolia.blockscout.com',
 };

package/dist/services/ledger/EthersLedgerServiceEthereum.d.ts

@@ -1,23 +1,24 @@
-import { Account, LedgerService, LedgerServiceEmitter, GetLedgerTransport, UntilIndexRecord } from '@cityofzion/blockchain-service';
+import { TBSAccount, TLedgerServiceEmitter, TGetLedgerTransport, TUntilIndexRecord, ILedgerService } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import { ethers, Signer } from 'ethers';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
 import { BSEthereum } from '../../BSEthereum';
 export declare class EthersLedgerSigner extends Signer implements TypedDataSigner {
     #private;
-    constructor(transport: Transport, bip44Path: string, provider?: ethers.providers.Provider, emitter?: LedgerServiceEmitter);
+    static shouldRetry: (error: any) => boolean;
+    constructor(transport: Transport, bip44Path: string, provider?: ethers.providers.Provider, emitter?: TLedgerServiceEmitter);
     connect(provider: ethers.providers.Provider): EthersLedgerSigner;
     getAddress(): Promise<string>;
     signMessage(message: string | ethers.utils.Bytes): Promise<string>;
     signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
     _signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, any>): Promise<string>;
 }
-export declare class EthersLedgerServiceEthereum<BSName extends string = string> implements LedgerService<BSName> {
+export declare class EthersLedgerServiceEthereum<N extends string> implements ILedgerService<N> {
     #private;
-    emitter: LedgerServiceEmitter;
-    getLedgerTransport?: GetLedgerTransport<BSName>;
-    constructor(blockchainService: BSEthereum<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
-    getAccounts(transport: Transport, untilIndexByBlockchainService?: UntilIndexRecord<BSName>): Promise<Account<BSName>[]>;
-    getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
+    emitter: TLedgerServiceEmitter;
+    getLedgerTransport?: TGetLedgerTransport<N>;
+    constructor(blockchainService: BSEthereum<N>, getLedgerTransport?: TGetLedgerTransport<N>);
+    getAccounts(transport: Transport, untilIndexByBlockchainService?: TUntilIndexRecord<N>): Promise<TBSAccount<N>[]>;
+    getAccount(transport: Transport, index: number): Promise<TBSAccount<N>>;
     getSigner(transport: Transport, path: string, provider?: ethers.providers.Provider): EthersLedgerSigner;
 }