@cityofzion/bs-ethereum 1.2.2 → 1.2.4

package/dist/BSEthereum.js

@@ -66,7 +66,7 @@ class BSEthereum {
             this.blockchainDataService = new BitqueryBDSEthereum_1.BitqueryBDSEthereum(network);
         }
         this.exchangeDataService = new BitqueryEDSEthereum_1.BitqueryEDSEthereum(network.type);
-        this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(network.type);
+        this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(network);
     }
     validateAddress(address) {
         return ethers_1.ethers.utils.isAddress(address);

package/dist/BitqueryEDSEthereum.d.ts

@@ -1,5 +1,5 @@
-import { Currency, ExchangeDataService, NetworkType, TokenPricesResponse } from '@cityofzion/blockchain-service';
-export declare class BitqueryEDSEthereum implements ExchangeDataService {
+import { CryptoCompareEDS, Currency, ExchangeDataService, NetworkType, TokenPricesResponse } from '@cityofzion/blockchain-service';
+export declare class BitqueryEDSEthereum extends CryptoCompareEDS implements ExchangeDataService {
     #private;
     constructor(networkType: NetworkType);
     getTokenPrices(currency: Currency): Promise<TokenPricesResponse[]>;

package/dist/BitqueryEDSEthereum.js

@@ -25,13 +25,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _BitqueryEDSEthereum_client, _BitqueryEDSEthereum_networkType;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitqueryEDSEthereum = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const axios_1 = __importDefault(require("axios"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 const constants_1 = require("./constants");
 dayjs_1.default.extend(utc_1.default);
-class BitqueryEDSEthereum {
+class BitqueryEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     constructor(networkType) {
+        super(networkType, constants_1.TOKENS[networkType]);
         _BitqueryEDSEthereum_client.set(this, void 0);
         _BitqueryEDSEthereum_networkType.set(this, void 0);
         __classPrivateFieldSet(this, _BitqueryEDSEthereum_networkType, networkType, "f");

package/dist/GhostMarketNDSEthereum.d.ts

@@ -1,7 +1,8 @@
-import { NftResponse, NftsResponse, NetworkType, NftDataService, GetNftParam, GetNftsByAddressParams } from '@cityofzion/blockchain-service';
-export declare class GhostMarketNDSEthereum implements NftDataService {
+import { NftResponse, NftsResponse, GetNftParam, GetNftsByAddressParams, Network } from '@cityofzion/blockchain-service';
+import { RpcNDSEthereum } from './RpcNDSEthereum';
+export declare class GhostMarketNDSEthereum extends RpcNDSEthereum {
     #private;
-    constructor(networkType: NetworkType);
+    constructor(network: Network);
     getNftsByAddress({ address, size, cursor }: GetNftsByAddressParams): Promise<NftsResponse>;
     getNft({ contractHash, tokenId }: GetNftParam): Promise<NftResponse>;
     private treatGhostMarketImage;

package/dist/GhostMarketNDSEthereum.js

@@ -28,10 +28,12 @@ exports.GhostMarketNDSEthereum = void 0;
 const query_string_1 = __importDefault(require("query-string"));
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
-class GhostMarketNDSEthereum {
-    constructor(networkType) {
+const RpcNDSEthereum_1 = require("./RpcNDSEthereum");
+class GhostMarketNDSEthereum extends RpcNDSEthereum_1.RpcNDSEthereum {
+    constructor(network) {
+        super(network);
         _GhostMarketNDSEthereum_networkType.set(this, void 0);
-        __classPrivateFieldSet(this, _GhostMarketNDSEthereum_networkType, networkType, "f");
+        __classPrivateFieldSet(this, _GhostMarketNDSEthereum_networkType, network.type, "f");
     }
     getNftsByAddress({ address, size = 18, cursor }) {
         var _a;

package/dist/RpcBDSEthereum.d.ts

@@ -1,4 +1,4 @@
-import { BalanceResponse, BlockchainDataService, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { BalanceResponse, BlockchainDataService, ContractResponse, Network, RpcResponse, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 export declare class RpcBDSEthereum implements BlockchainDataService {
     #private;
     maxTimeToConfirmTransactionInMs: number;
@@ -9,4 +9,5 @@ export declare class RpcBDSEthereum implements BlockchainDataService {
     getTokenInfo(hash: string): Promise<Token>;
     getBalance(address: string): Promise<BalanceResponse[]>;
     getBlockHeight(): Promise<number>;
+    getRpcList(): Promise<RpcResponse[]>;
 }

package/dist/RpcBDSEthereum.js

@@ -98,6 +98,36 @@ class RpcBDSEthereum {
             return yield provider.getBlockNumber();
         });
     }
+    getRpcList() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const list = [];
+            const promises = constants_1.RPC_LIST_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").type].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,
+                        });
+                    }
+                    finally {
+                        resolve();
+                        clearTimeout(timeout);
+                    }
+                }));
+            });
+            yield Promise.allSettled(promises);
+            return list;
+        });
+    }
 }
 exports.RpcBDSEthereum = RpcBDSEthereum;
 _RpcBDSEthereum_network = new WeakMap();

package/dist/RpcNDSEthereum.d.ts

@@ -0,0 +1,8 @@
+import { GetNftParam, GetNftsByAddressParams, HasTokenParam, Network, NftDataService, NftResponse, NftsResponse } from '@cityofzion/blockchain-service';
+export declare abstract class RpcNDSEthereum implements NftDataService {
+    #private;
+    protected constructor(network: Network);
+    abstract getNftsByAddress(params: GetNftsByAddressParams): Promise<NftsResponse>;
+    abstract getNft(params: GetNftParam): Promise<NftResponse>;
+    hasToken({ contractHash, address }: HasTokenParam): Promise<boolean>;
+}

package/dist/RpcNDSEthereum.js

@@ -0,0 +1,49 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _RpcNDSEthereum_network;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RpcNDSEthereum = void 0;
+const ethers_1 = require("ethers");
+class RpcNDSEthereum {
+    constructor(network) {
+        _RpcNDSEthereum_network.set(this, void 0);
+        __classPrivateFieldSet(this, _RpcNDSEthereum_network, network, "f");
+    }
+    hasToken({ contractHash, address }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _RpcNDSEthereum_network, "f").url);
+                const contract = new ethers_1.ethers.Contract(contractHash, ['function balanceOf(address _owner) external view returns (uint256)'], provider);
+                const response = yield contract.balanceOf(address);
+                if (!response)
+                    throw new Error();
+                const parsedResponse = response;
+                return parsedResponse.gt(0);
+            }
+            catch (_a) {
+                throw new Error(`Token not found: ${contractHash}`);
+            }
+        });
+    }
+}
+exports.RpcNDSEthereum = RpcNDSEthereum;
+_RpcNDSEthereum_network = new WeakMap();

package/dist/constants.d.ts

@@ -7,9 +7,10 @@ export declare const NATIVE_ASSETS: {
     hash: string;
     decimals: number;
 }[];
-export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<NetworkType, string>;
 export declare const BITQUERY_MIRROR_URL = "https://i4l7kcg43c.execute-api.us-east-1.amazonaws.com/production/";
 export declare const BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE: Record<Exclude<NetworkType, 'custom'>, BitqueryNetwork>;
 export declare const GHOSTMARKET_URL_BY_NETWORK_TYPE: Partial<Record<NetworkType, string>>;
 export declare const GHOSTMARKET_CHAIN_BY_NETWORK_TYPE: Partial<Record<NetworkType, string>>;
 export declare const DERIVATION_PATH = "m/44'/60'/0'/0/?";
+export declare const RPC_LIST_BY_NETWORK_TYPE: Record<NetworkType, string[]>;
+export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<NetworkType, string>;

package/dist/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DERIVATION_PATH = exports.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE = exports.GHOSTMARKET_URL_BY_NETWORK_TYPE = exports.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE = exports.BITQUERY_MIRROR_URL = exports.DEFAULT_URL_BY_NETWORK_TYPE = exports.NATIVE_ASSETS = exports.TOKENS = void 0;
+exports.DEFAULT_URL_BY_NETWORK_TYPE = exports.RPC_LIST_BY_NETWORK_TYPE = exports.DERIVATION_PATH = exports.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE = exports.GHOSTMARKET_URL_BY_NETWORK_TYPE = exports.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE = exports.BITQUERY_MIRROR_URL = exports.NATIVE_ASSETS = exports.TOKENS = void 0;
 const common_json_1 = __importDefault(require("./assets/tokens/common.json"));
 exports.TOKENS = {
     mainnet: [...common_json_1.default],
@@ -11,11 +11,6 @@ exports.TOKENS = {
     custom: common_json_1.default,
 };
 exports.NATIVE_ASSETS = common_json_1.default;
-exports.DEFAULT_URL_BY_NETWORK_TYPE = {
-    mainnet: 'https://ethereum-mainnet-rpc.allthatnode.com',
-    testnet: 'https://ethereum-sepolia-rpc.publicnode.com',
-    custom: 'http://127.0.0.1:8545',
-};
 exports.BITQUERY_MIRROR_URL = 'https://i4l7kcg43c.execute-api.us-east-1.amazonaws.com/production/';
 exports.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE = {
     mainnet: 'ethereum',
@@ -30,3 +25,27 @@ exports.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE = {
     testnet: 'etht',
 };
 exports.DERIVATION_PATH = "m/44'/60'/0'/0/?";
+exports.RPC_LIST_BY_NETWORK_TYPE = {
+    mainnet: [
+        'https://ethereum-mainnet-rpc.allthatnode.com',
+        'https://eth.llamarpc.com',
+        'https://ethereum-rpc.publicnode.com',
+        'https://endpoints.omniatech.io/v1/eth/mainnet/public',
+        'https://rpc.flashbots.net',
+        'https://rpc.mevblocker.io',
+    ],
+    testnet: [
+        'https://ethereum-sepolia-rpc.publicnode.com',
+        'https://endpoints.omniatech.io/v1/eth/sepolia/public',
+        'https://eth-sepolia.public.blastapi.io',
+        'https://eth-sepolia-public.unifra.io',
+        'https://1rpc.io/sepolia',
+        'https://eth-sepolia.api.onfinality.io/public',
+    ],
+    custom: ['http://127.0.0.1:8545'],
+};
+exports.DEFAULT_URL_BY_NETWORK_TYPE = {
+    mainnet: exports.RPC_LIST_BY_NETWORK_TYPE.mainnet[0],
+    testnet: exports.RPC_LIST_BY_NETWORK_TYPE.testnet[0],
+    custom: exports.RPC_LIST_BY_NETWORK_TYPE.custom[0],
+};

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export * from './constants';
 export * from './BitqueryBDSEthereum';
 export * from './BitqueryEDSEthereum';
 export * from './RpcBDSEthereum';
+export * from './RpcNDSEthereum';

package/dist/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./constants"), exports);
 __exportStar(require("./BitqueryBDSEthereum"), exports);
 __exportStar(require("./BitqueryEDSEthereum"), exports);
 __exportStar(require("./RpcBDSEthereum"), exports);
+__exportStar(require("./RpcNDSEthereum"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",
     "@ledgerhq/hw-transport": "~6.30.5",
     "@ledgerhq/hw-app-eth": "~6.35.7",
-    "@cityofzion/blockchain-service": "0.11.0"
+    "@cityofzion/blockchain-service": "0.11.2"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",