@cityofzion/bs-ethereum 2.2.13 → 2.3.0

package/dist/{BlockscoutNeoXBDSEthereum.js → services/blockchain-data/BlockscoutBDSEthereum.js}

@@ -12,18 +12,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockscoutNeoXBDSEthereum = void 0;
+exports.BlockscoutBDSEthereum = void 0;
 const axios_1 = __importDefault(require("axios"));
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
 const ethers_1 = require("ethers");
-const ERC20_1 = require("./assets/abis/ERC20");
-class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
+const ERC20_1 = require("../../assets/abis/ERC20");
+const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+class BlockscoutBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     static isSupported(network) {
-        return !!BlockscoutNeoXBDSEthereum.BASE_URL_BY_CHAIN_ID[network.id];
+        return !!BlockscoutBDSEthereum.BASE_URL_BY_CHAIN_ID[network.id];
     }
     static getClient(network) {
-        const baseURL = BlockscoutNeoXBDSEthereum.BASE_URL_BY_CHAIN_ID[network.id];
+        const baseURL = BlockscoutBDSEthereum.BASE_URL_BY_CHAIN_ID[network.id];
         if (!baseURL) {
             throw new Error('Unsupported network');
         }
@@ -40,10 +41,10 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getTransaction: { get: () => super.getTransaction }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getTransaction.call(this, txid);
             }
-            const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+            const client = BlockscoutBDSEthereum.getClient(this._network);
             const { data } = yield client.get(`/transactions/${txid}`);
             if (!data || 'message' in data) {
                 throw new Error('Transaction not found');
@@ -106,10 +107,10 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getTransactionsByAddress: { get: () => super.getTransactionsByAddress }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getTransactionsByAddress.call(this, params);
             }
-            const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+            const client = BlockscoutBDSEthereum.getClient(this._network);
             const { data } = yield client.get(`/addresses/${params.address}/transactions`, {
                 params: {
                     next_page_params: params.nextPageParams,
@@ -177,11 +178,11 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getContract: { get: () => super.getContract }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getContract.call(this, contractHash);
             }
             try {
-                const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+                const client = BlockscoutBDSEthereum.getClient(this._network);
                 const { data } = yield client.get(`/smart-contracts/${contractHash}`);
                 if (!data || 'message' in data) {
                     throw new Error('Contract not found');
@@ -216,7 +217,7 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getTokenInfo: { get: () => super.getTokenInfo }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getTokenInfo.call(this, tokenHash);
             }
             const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
@@ -226,7 +227,7 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             if (this._tokenCache.has(tokenHash)) {
                 return this._tokenCache.get(tokenHash);
             }
-            const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+            const client = BlockscoutBDSEthereum.getClient(this._network);
             const { data } = yield client.get(`/tokens/${tokenHash}`);
             if (!data || 'message' in data) {
                 throw new Error('Token not found');
@@ -235,7 +236,7 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 throw new Error('Token is not an ERC-20 token');
             }
             return {
-                decimals: data.decimals ? parseInt(data.decimals) : BSEthereumHelper_1.BSEthereumHelper.DEFAULT_DECIMALS,
+                decimals: data.decimals ? parseInt(data.decimals) : BSEthereumConstants_1.BSEthereumConstants.DEFAULT_DECIMALS,
                 hash: tokenHash,
                 name: data.name,
                 symbol: data.symbol,
@@ -247,10 +248,10 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getBalance: { get: () => super.getBalance }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getBalance.call(this, address);
             }
-            const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+            const client = BlockscoutBDSEthereum.getClient(this._network);
             const { data: nativeBalance } = yield client.get(`/addresses/${address}`);
             if (!nativeBalance || 'message' in nativeBalance) {
                 throw new Error('Native balance not found');
@@ -272,7 +273,7 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                         return;
                     }
                     const token = {
-                        decimals: balance.token.decimals ? parseInt(balance.token.decimals) : BSEthereumHelper_1.BSEthereumHelper.DEFAULT_DECIMALS,
+                        decimals: balance.token.decimals ? parseInt(balance.token.decimals) : BSEthereumConstants_1.BSEthereumConstants.DEFAULT_DECIMALS,
                         hash: balance.token.address,
                         name: balance.token.symbol,
                         symbol: balance.token.symbol,
@@ -294,10 +295,10 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             getBlockHeight: { get: () => super.getBlockHeight }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BlockscoutNeoXBDSEthereum.isSupported(this._network)) {
+            if (!BlockscoutBDSEthereum.isSupported(this._network)) {
                 return _super.getBlockHeight.call(this);
             }
-            const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
+            const client = BlockscoutBDSEthereum.getClient(this._network);
             const { data } = yield client.get('/blocks');
             if (!data || 'message' in data) {
                 throw new Error('Block not found');
@@ -306,8 +307,8 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
         });
     }
 }
-exports.BlockscoutNeoXBDSEthereum = BlockscoutNeoXBDSEthereum;
-BlockscoutNeoXBDSEthereum.BASE_URL_BY_CHAIN_ID = {
+exports.BlockscoutBDSEthereum = BlockscoutBDSEthereum;
+BlockscoutBDSEthereum.BASE_URL_BY_CHAIN_ID = {
     '12227332': 'https://dora-stage.coz.io/api/neox/testnet',
     '47763': 'https://dora.coz.io/api/neox/mainnet',
 };

package/dist/{MoralisBDSEthereum.d.ts → services/blockchain-data/MoralisBDSEthereum.d.ts}

@@ -1,6 +1,6 @@
 import { BalanceResponse, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import { RpcBDSEthereum } from './RpcBDSEthereum';
-import { BSEthereumNetworkId } from './BSEthereumHelper';
+import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class MoralisBDSEthereum extends RpcBDSEthereum {
     static BASE_URL: string;
     static SUPPORTED_CHAINS: string[];

package/dist/{MoralisBDSEthereum.js → services/blockchain-data/MoralisBDSEthereum.js}

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisBDSEthereum = void 0;
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
 const axios_1 = __importDefault(require("axios"));
 const ethers_1 = require("ethers");
-const ERC20_1 = require("./assets/abis/ERC20");
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+const ERC20_1 = require("../../assets/abis/ERC20");
 class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     static getClient(network) {
         return axios_1.default.create({

package/dist/{RpcBDSEthereum.d.ts → services/blockchain-data/RpcBDSEthereum.d.ts}

@@ -1,5 +1,5 @@
 import { BalanceResponse, BlockchainDataService, ContractResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
-import { BSEthereumNetworkId } from './BSEthereumHelper';
+import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class RpcBDSEthereum implements BlockchainDataService {
     _network: Network<BSEthereumNetworkId>;
     _tokenCache: Map<string, Token>;

package/dist/{RpcBDSEthereum.js → services/blockchain-data/RpcBDSEthereum.js}

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcBDSEthereum = void 0;
 const ethers_1 = require("ethers");
-const ERC20_1 = require("./assets/abis/ERC20");
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+const ERC20_1 = require("../../assets/abis/ERC20");
 class RpcBDSEthereum {
     constructor(network) {
         this._tokenCache = new Map();

package/dist/{BlockscoutNeoXEDSEthereum.d.ts → services/exchange-data/BlockscoutEDSEthereum.d.ts}

@@ -1,5 +1,5 @@
 import { CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
-export declare class BlockscoutNeoXEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
+export declare class BlockscoutEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
     #private;
     constructor(network: Network);
     getTokenPrices(params: GetTokenPricesParams): Promise<TokenPricesResponse[]>;

package/dist/{BlockscoutNeoXEDSEthereum.js → services/exchange-data/BlockscoutEDSEthereum.js}

@@ -19,42 +19,44 @@ 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 _BlockscoutNeoXEDSEthereum_network;
+var _BlockscoutEDSEthereum_network;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockscoutNeoXEDSEthereum = void 0;
+exports.BlockscoutEDSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
-const BlockscoutNeoXBDSEthereum_1 = require("./BlockscoutNeoXBDSEthereum");
-class BlockscoutNeoXEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+const BlockscoutBDSEthereum_1 = require("../blockchain-data/BlockscoutBDSEthereum");
+class BlockscoutEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     constructor(network) {
         super();
-        _BlockscoutNeoXEDSEthereum_network.set(this, void 0);
-        __classPrivateFieldSet(this, _BlockscoutNeoXEDSEthereum_network, network, "f");
+        _BlockscoutEDSEthereum_network.set(this, void 0);
+        __classPrivateFieldSet(this, _BlockscoutEDSEthereum_network, network, "f");
     }
     getTokenPrices(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnet(__classPrivateFieldGet(this, _BlockscoutNeoXEDSEthereum_network, "f")))
+            if (!BSEthereumHelper_1.BSEthereumHelper.isMainnet(__classPrivateFieldGet(this, _BlockscoutEDSEthereum_network, "f")))
                 throw new Error('Exchange is only available on mainnet');
-            if (!BlockscoutNeoXBDSEthereum_1.BlockscoutNeoXBDSEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutNeoXEDSEthereum_network, "f"))) {
+            if (!BlockscoutBDSEthereum_1.BlockscoutBDSEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutEDSEthereum_network, "f"))) {
                 throw new Error('Exchange is not supported on this network');
             }
-            const client = BlockscoutNeoXBDSEthereum_1.BlockscoutNeoXBDSEthereum.getClient(__classPrivateFieldGet(this, _BlockscoutNeoXEDSEthereum_network, "f"));
-            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _BlockscoutNeoXEDSEthereum_network, "f"));
+            const client = BlockscoutBDSEthereum_1.BlockscoutBDSEthereum.getClient(__classPrivateFieldGet(this, _BlockscoutEDSEthereum_network, "f"));
+            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _BlockscoutEDSEthereum_network, "f"));
             const prices = [];
             const promises = params.tokens.map((token) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (BSEthereumHelper_1.BSEthereumHelper.normalizeHash(token.hash) !== BSEthereumHelper_1.BSEthereumHelper.normalizeHash(nativeToken.hash)) {
                         const { data } = yield client.get(`/tokens/${token.hash}`);
+                        const exchangeRateNumber = Number(data.exchange_rate);
                         prices.push({
                             token,
-                            usdPrice: Number(data.exchange_rate),
+                            usdPrice: isNaN(exchangeRateNumber) ? 0 : exchangeRateNumber,
                         });
                         return;
                     }
                     const { data } = yield client.get(`/stats`);
+                    const coinPriceNumber = Number(data.coin_price);
                     prices.push({
                         token,
-                        usdPrice: Number(data.coin_price),
+                        usdPrice: isNaN(coinPriceNumber) ? 0 : coinPriceNumber,
                     });
                 }
                 catch (_a) {
@@ -72,5 +74,5 @@ class BlockscoutNeoXEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
         throw new Error('Blockscout does not support this feature');
     }
 }
-exports.BlockscoutNeoXEDSEthereum = BlockscoutNeoXEDSEthereum;
-_BlockscoutNeoXEDSEthereum_network = new WeakMap();
+exports.BlockscoutEDSEthereum = BlockscoutEDSEthereum;
+_BlockscoutEDSEthereum_network = new WeakMap();

package/dist/{MoralisEDSEthereum.d.ts → services/exchange-data/MoralisEDSEthereum.d.ts}

@@ -1,5 +1,5 @@
 import { BlockchainDataService, CryptoCompareEDS, ExchangeDataService, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse } from '@cityofzion/blockchain-service';
-import { BSEthereumNetworkId } from './BSEthereumHelper';
+import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
     #private;
     constructor(network: Network<BSEthereumNetworkId>, blockchainDataService: BlockchainDataService);

package/dist/{MoralisEDSEthereum.js → services/exchange-data/MoralisEDSEthereum.js}

@@ -23,8 +23,8 @@ var _MoralisEDSEthereum_instances, _MoralisEDSEthereum_network, _MoralisEDSEther
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisEDSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
-const MoralisBDSEthereum_1 = require("./MoralisBDSEthereum");
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+const MoralisBDSEthereum_1 = require("../blockchain-data/MoralisBDSEthereum");
 class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     constructor(network, blockchainDataService) {
         super();

package/dist/{BlockscoutNeoXESEthereum.d.ts → services/explorer/BlockscoutESEthereum.d.ts}

@@ -1,6 +1,6 @@
 import { BuildNftUrlParams, ExplorerService, Network } from '@cityofzion/blockchain-service';
-import { BSEthereumNetworkId } from './BSEthereumHelper';
-export declare class BlockscoutNeoXESEthereum implements ExplorerService {
+import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
+export declare class BlockscoutESEthereum implements ExplorerService {
     #private;
     static BASE_URL_BY_CHAIN_ID: Partial<Record<BSEthereumNetworkId, string>>;
     static isSupported(network: Network<BSEthereumNetworkId>): boolean;

package/dist/{BlockscoutNeoXESEthereum.js → services/explorer/BlockscoutESEthereum.js}

@@ -10,42 +10,51 @@ 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 _BlockscoutNeoXESEthereum_network;
+var _BlockscoutESEthereum_network;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockscoutNeoXESEthereum = void 0;
-class BlockscoutNeoXESEthereum {
+exports.BlockscoutESEthereum = void 0;
+class BlockscoutESEthereum {
     static isSupported(network) {
-        return !!BlockscoutNeoXESEthereum.BASE_URL_BY_CHAIN_ID[network.id];
+        return !!BlockscoutESEthereum.BASE_URL_BY_CHAIN_ID[network.id];
     }
     constructor(network) {
-        _BlockscoutNeoXESEthereum_network.set(this, void 0);
-        __classPrivateFieldSet(this, _BlockscoutNeoXESEthereum_network, network, "f");
+        _BlockscoutESEthereum_network.set(this, void 0);
+        __classPrivateFieldSet(this, _BlockscoutESEthereum_network, network, "f");
     }
     buildTransactionUrl(hash) {
-        if (!BlockscoutNeoXESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f"))) {
+        if (!BlockscoutESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"))) {
             throw new Error('Network not supported');
         }
-        const baseURL = BlockscoutNeoXESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f").id];
+        const baseURL = BlockscoutESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f").id];
         return `${baseURL}/tx/${hash}`;
     }
     buildContractUrl(contractHash) {
-        if (!BlockscoutNeoXESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f"))) {
+        if (!BlockscoutESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"))) {
             throw new Error('Network not supported');
         }
-        const baseURL = BlockscoutNeoXESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f").id];
+        const baseURL = BlockscoutESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f").id];
         return `${baseURL}/address/${contractHash}`;
     }
     buildNftUrl(params) {
-        if (!BlockscoutNeoXESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f"))) {
+        if (!BlockscoutESEthereum.isSupported(__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"))) {
             throw new Error('Network not supported');
         }
-        const baseURL = BlockscoutNeoXESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutNeoXESEthereum_network, "f").id];
+        const baseURL = BlockscoutESEthereum.BASE_URL_BY_CHAIN_ID[__classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f").id];
         return `${baseURL}/token/${params.contractHash}/instance/${params.tokenId}`;
     }
 }
-exports.BlockscoutNeoXESEthereum = BlockscoutNeoXESEthereum;
-_BlockscoutNeoXESEthereum_network = new WeakMap();
-BlockscoutNeoXESEthereum.BASE_URL_BY_CHAIN_ID = {
-    '12227332': 'https://xt4scan.ngd.network',
+exports.BlockscoutESEthereum = BlockscoutESEthereum;
+_BlockscoutESEthereum_network = new WeakMap();
+BlockscoutESEthereum.BASE_URL_BY_CHAIN_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',
     '47763': 'https://xexplorer.neo.org',
+    '59144': 'https://explorer.linea.build',
+    '1101': 'https://zkevm.blockscout.com',
+    '11155111': 'https://eth-sepolia.blockscout.com',
+    '12227332': 'https://xt4scan.ngd.network',
 };

package/dist/{EthersLedgerServiceEthereum.d.ts → services/ledger/EthersLedgerServiceEthereum.d.ts}

@@ -2,21 +2,22 @@ import { Account, LedgerService, LedgerServiceEmitter } from '@cityofzion/blockc
 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, provider?: ethers.providers.Provider, emitter?: LedgerServiceEmitter);
+    constructor(transport: Transport, bip44Path: string, provider?: ethers.providers.Provider, emitter?: LedgerServiceEmitter);
     connect(provider: ethers.providers.Provider): EthersLedgerSigner;
     getAddress(): Promise<string>;
-    getPublicKey(): 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 implements LedgerService {
-    getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined;
+    #private;
     emitter: LedgerServiceEmitter;
-    constructor(getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined);
-    getAddress(transport: Transport): Promise<string>;
-    getPublicKey(transport: Transport): Promise<string>;
-    getSigner(transport: Transport, provider?: ethers.providers.Provider): EthersLedgerSigner;
+    getLedgerTransport?: (account: Account) => Promise<Transport>;
+    constructor(blockchainService: BSEthereum, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    getAccounts(transport: Transport): Promise<Account[]>;
+    getAccount(transport: Transport, index: number): Promise<Account>;
+    getSigner(transport: Transport, path: string, provider?: ethers.providers.Provider): EthersLedgerSigner;
 }

package/dist/{EthersLedgerServiceEthereum.js → services/ledger/EthersLedgerServiceEthereum.js}

@@ -45,41 +45,35 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _EthersLedgerSigner_instances, _EthersLedgerSigner_transport, _EthersLedgerSigner_emitter, _EthersLedgerSigner_path, _EthersLedgerSigner_retry;
+var _EthersLedgerSigner_transport, _EthersLedgerSigner_emitter, _EthersLedgerSigner_bip44Path, _EthersLedgerSigner_ledgerApp, _EthersLedgerServiceEthereum_blockchainService;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthersLedgerServiceEthereum = exports.EthersLedgerSigner = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const hw_app_eth_1 = __importStar(require("@ledgerhq/hw-app-eth"));
 const ethers_1 = require("ethers");
 const properties_1 = require("@ethersproject/properties");
 const events_1 = __importDefault(require("events"));
-const BSEthereumHelper_1 = require("./BSEthereumHelper");
+const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 class EthersLedgerSigner extends ethers_1.Signer {
-    constructor(transport, provider, emitter) {
+    constructor(transport, bip44Path, provider, emitter) {
         super();
-        _EthersLedgerSigner_instances.add(this);
         _EthersLedgerSigner_transport.set(this, void 0);
         _EthersLedgerSigner_emitter.set(this, void 0);
-        _EthersLedgerSigner_path.set(this, void 0);
-        __classPrivateFieldSet(this, _EthersLedgerSigner_path, BSEthereumHelper_1.BSEthereumHelper.DEFAULT_PATH, "f");
+        _EthersLedgerSigner_bip44Path.set(this, void 0);
+        _EthersLedgerSigner_ledgerApp.set(this, void 0);
+        __classPrivateFieldSet(this, _EthersLedgerSigner_bip44Path, bip44Path, "f");
         __classPrivateFieldSet(this, _EthersLedgerSigner_transport, transport, "f");
         __classPrivateFieldSet(this, _EthersLedgerSigner_emitter, emitter, "f");
+        __classPrivateFieldSet(this, _EthersLedgerSigner_ledgerApp, new hw_app_eth_1.default(transport), "f");
         (0, properties_1.defineReadOnly)(this, 'provider', provider);
     }
     connect(provider) {
-        return new EthersLedgerSigner(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"), provider, __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f"));
+        return new EthersLedgerSigner(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"), __classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), provider, __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f"));
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"));
-            const { address } = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f")));
-            return ethers_1.ethers.utils.getAddress(address);
-        });
-    }
-    getPublicKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"));
-            const { publicKey } = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f")));
-            return '0x' + publicKey;
+            const { address } = yield __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"));
+            return address;
         });
     }
     signMessage(message) {
@@ -89,9 +83,8 @@ class EthersLedgerSigner extends ethers_1.Signer {
                 if (typeof message === 'string') {
                     message = ethers_1.ethers.utils.toUtf8Bytes(message);
                 }
-                const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"));
                 (_a = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
-                const obj = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)));
+                const obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)));
                 (_b = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
                 // Normalize the signature for Ethers
                 obj.r = '0x' + obj.r;
@@ -108,7 +101,6 @@ class EthersLedgerSigner extends ethers_1.Signer {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"));
                 const tx = yield ethers_1.ethers.utils.resolveProperties(transaction);
                 const unsignedTransaction = {
                     chainId: (_a = tx.chainId) !== null && _a !== void 0 ? _a : undefined,
@@ -122,7 +114,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
                 const serializedUnsignedTransaction = ethers_1.ethers.utils.serializeTransaction(unsignedTransaction).substring(2);
                 const resolution = yield hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
                 (_g = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _g === void 0 ? void 0 : _g.emit('getSignatureStart');
-                const signature = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f"), serializedUnsignedTransaction, resolution));
+                const signature = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), serializedUnsignedTransaction, resolution));
                 (_h = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _h === void 0 ? void 0 : _h.emit('getSignatureEnd');
                 return ethers_1.ethers.utils.serializeTransaction(unsignedTransaction, {
                     v: ethers_1.ethers.BigNumber.from('0x' + signature.v).toNumber(),
@@ -149,16 +141,15 @@ class EthersLedgerSigner extends ethers_1.Signer {
                     return resolved;
                 }));
                 const payload = ethers_1.ethers.utils._TypedDataEncoder.getPayload(populated.domain, types, populated.value);
-                const ledgerApp = new hw_app_eth_1.default(__classPrivateFieldGet(this, _EthersLedgerSigner_transport, "f"));
                 (_a = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
                 let obj;
                 try {
-                    obj = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f"), payload));
+                    obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), payload));
                 }
                 catch (_d) {
                     const domainSeparatorHex = ethers_1.ethers.utils._TypedDataEncoder.hashDomain(payload.domain);
                     const hashStructMessageHex = ethers_1.ethers.utils._TypedDataEncoder.hashStruct(payload.primaryType, types, payload.message);
-                    obj = yield __classPrivateFieldGet(this, _EthersLedgerSigner_instances, "m", _EthersLedgerSigner_retry).call(this, () => ledgerApp.signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_path, "f"), domainSeparatorHex, hashStructMessageHex));
+                    obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), domainSeparatorHex, hashStructMessageHex));
                 }
                 (_b = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
                 // Normalize the signature for Ethers
@@ -174,49 +165,40 @@ class EthersLedgerSigner extends ethers_1.Signer {
     }
 }
 exports.EthersLedgerSigner = EthersLedgerSigner;
-_EthersLedgerSigner_transport = new WeakMap(), _EthersLedgerSigner_emitter = new WeakMap(), _EthersLedgerSigner_path = new WeakMap(), _EthersLedgerSigner_instances = new WeakSet(), _EthersLedgerSigner_retry = function _EthersLedgerSigner_retry(callback) {
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-        // Wait up to 5 seconds
-        for (let i = 0; i < 50; i++) {
-            try {
-                const result = yield callback();
-                return resolve(result);
-            }
-            catch (error) {
-                if (error.id !== 'TransportLocked') {
-                    return reject(error);
-                }
-            }
-            yield wait(100);
-        }
-        return reject(new Error('timeout'));
-    }));
-};
+_EthersLedgerSigner_transport = new WeakMap(), _EthersLedgerSigner_emitter = new WeakMap(), _EthersLedgerSigner_bip44Path = new WeakMap(), _EthersLedgerSigner_ledgerApp = new WeakMap();
 class EthersLedgerServiceEthereum {
-    constructor(getLedgerTransport) {
-        this.getLedgerTransport = getLedgerTransport;
+    constructor(blockchainService, getLedgerTransport) {
+        _EthersLedgerServiceEthereum_blockchainService.set(this, void 0);
         this.emitter = new events_1.default();
+        __classPrivateFieldSet(this, _EthersLedgerServiceEthereum_blockchainService, blockchainService, "f");
+        this.getLedgerTransport = getLedgerTransport;
     }
-    getAddress(transport) {
+    getAccounts(transport) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = this.getSigner(transport);
-            return yield signer.getAddress();
+            const accountsByBlockchainService = yield (0, blockchain_service_1.fetchAccountsForBlockchainServices)([__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
+                return this.getAccount(transport, index);
+            }));
+            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").blockchainName);
+            return accounts !== null && accounts !== void 0 ? accounts : [];
         });
     }
-    getPublicKey(transport) {
+    getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = this.getSigner(transport);
-            return yield signer.getPublicKey();
+            const ledgerApp = new hw_app_eth_1.default(transport);
+            const bip44Path = __classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
+            const { publicKey, address } = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => ledgerApp.getAddress(bip44Path));
+            const publicKeyWithPrefix = '0x' + publicKey;
+            return {
+                address,
+                key: publicKeyWithPrefix,
+                type: 'publicKey',
+                bip44Path,
+            };
         });
     }
-    getSigner(transport, provider) {
-        return new EthersLedgerSigner(transport, provider, this.emitter);
+    getSigner(transport, path, provider) {
+        return new EthersLedgerSigner(transport, path, provider, this.emitter);
     }
 }
 exports.EthersLedgerServiceEthereum = EthersLedgerServiceEthereum;
-function wait(duration) {
-    return new Promise(resolve => {
-        setTimeout(resolve, duration);
-    });
-}
+_EthersLedgerServiceEthereum_blockchainService = new WeakMap();

package/dist/{GhostMarketNDSEthereum.d.ts → services/nft-data/GhostMarketNDSEthereum.d.ts}

@@ -1,6 +1,6 @@
 import { NftResponse, NftsResponse, GetNftParam, GetNftsByAddressParams, Network } from '@cityofzion/blockchain-service';
 import { RpcNDSEthereum } from './RpcNDSEthereum';
-import { BSEthereumNetworkId } from './BSEthereumHelper';
+import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants';
 export declare class GhostMarketNDSEthereum extends RpcNDSEthereum {
     #private;
     static CONFIG_BY_NETWORK_ID: Partial<Record<BSEthereumNetworkId, {

package/dist/{RpcNDSEthereum.js → services/nft-data/RpcNDSEthereum.js}

@@ -23,7 +23,7 @@ var _RpcNDSEthereum_network;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcNDSEthereum = void 0;
 const ethers_1 = require("ethers");
-const ERC20_1 = require("./assets/abis/ERC20");
+const ERC20_1 = require("../../assets/abis/ERC20");
 class RpcNDSEthereum {
     constructor(network) {
         _RpcNDSEthereum_network.set(this, void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.2.13",
+  "version": "2.3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -20,7 +20,7 @@
     "@ledgerhq/hw-app-eth": "~6.35.7",
     "@ethersproject/abstract-signer": "~5.7.0",
     "@ethersproject/properties": "~5.7.0",
-    "@cityofzion/blockchain-service": "1.3.2"
+    "@cityofzion/blockchain-service": "1.4.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",