@cityofzion/bs-ethereum 1.1.0 → 1.2.1

package/dist/BSEthereum.d.ts

@@ -1,17 +1,17 @@
 import { Account, AccountWithDerivationPath, BSCalculableFee, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, Network, NftDataService, PartialBy, Token, TransferParam } from '@cityofzion/blockchain-service';
 import { LedgerServiceEthereum } from './LedgerServiceEthereum';
+import Transport from '@ledgerhq/hw-transport';
 export declare class BSEthereum<BSCustomName extends string = string> implements BlockchainService, BSWithNft, BSWithNameService, BSCalculableFee, BSWithLedger {
     readonly blockchainName: BSCustomName;
     readonly feeToken: Token;
     readonly derivationPath: string;
-    private readonly bitqueryApiKey;
     blockchainDataService: BlockchainDataService;
     exchangeDataService: ExchangeDataService;
     ledgerService: LedgerServiceEthereum;
     tokens: Token[];
     nftDataService: NftDataService;
     network: Network;
-    constructor(blockchainName: BSCustomName, network: PartialBy<Network, 'url'>, bitqueryApiKey: string);
+    constructor(blockchainName: BSCustomName, network: PartialBy<Network, 'url'>, getLedgerTransport?: (account: Account) => Promise<Transport>);
     setNetwork(param: PartialBy<Network, 'url'>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(json: string): boolean;

package/dist/BSEthereum.js

@@ -44,12 +44,11 @@ const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 const BitqueryBDSEthereum_1 = require("./BitqueryBDSEthereum");
 const LedgerServiceEthereum_1 = require("./LedgerServiceEthereum");
 class BSEthereum {
-    constructor(blockchainName, network, bitqueryApiKey) {
-        this.ledgerService = new LedgerServiceEthereum_1.LedgerServiceEthereum();
+    constructor(blockchainName, network, getLedgerTransport) {
         this.blockchainName = blockchainName;
+        this.ledgerService = new LedgerServiceEthereum_1.LedgerServiceEthereum(getLedgerTransport);
         this.derivationPath = constants_1.DERIVATION_PATH;
         this.tokens = constants_1.TOKENS[network.type];
-        this.bitqueryApiKey = bitqueryApiKey;
         this.feeToken = this.tokens.find(token => token.symbol === 'ETH');
         this.setNetwork(network);
     }
@@ -64,9 +63,9 @@ class BSEthereum {
             this.blockchainDataService = new RpcBDSEthereum_1.RpcBDSEthereum(network);
         }
         else {
-            this.blockchainDataService = new BitqueryBDSEthereum_1.BitqueryBDSEthereum(network, this.bitqueryApiKey);
+            this.blockchainDataService = new BitqueryBDSEthereum_1.BitqueryBDSEthereum(network);
         }
-        this.exchangeDataService = new BitqueryEDSEthereum_1.BitqueryEDSEthereum(network.type, this.bitqueryApiKey);
+        this.exchangeDataService = new BitqueryEDSEthereum_1.BitqueryEDSEthereum(network.type);
         this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(network.type);
     }
     validateAddress(address) {
@@ -139,8 +138,14 @@ class BSEthereum {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-            const signTransactionFunction = param.isLedger
-                ? yield this.ledgerService.getSignTransactionFunction(param.ledgerTransport)
+            let ledgerTransport;
+            if (param.isLedger) {
+                if (!this.ledgerService.getLedgerTransport)
+                    throw new Error('You must provide getLedgerTransport function to use Ledger');
+                ledgerTransport = yield this.ledgerService.getLedgerTransport(param.senderAccount);
+            }
+            const signTransactionFunction = ledgerTransport
+                ? yield this.ledgerService.getSignTransactionFunction(ledgerTransport)
                 : new ethers_1.ethers.Wallet(param.senderAccount.key, provider).signTransaction;
             const decimals = (_a = param.intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
             const amount = ethersBigNumber.parseFixed(param.intent.amount, decimals);

package/dist/BitqueryBDSEthereum.d.ts

@@ -1,10 +1,9 @@
 import { BalanceResponse, ContractResponse, Token, TransactionsByAddressParams, TransactionsByAddressResponse, TransactionResponse, Network } from '@cityofzion/blockchain-service';
 import { RpcBDSEthereum } from './RpcBDSEthereum';
 export declare class BitqueryBDSEthereum extends RpcBDSEthereum {
-    private readonly client;
-    private readonly networkType;
+    #private;
     maxTimeToConfirmTransactionInMs: number;
-    constructor(network: Network, apiKey: string);
+    constructor(network: Network);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress({ address, page, }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;
     getContract(): Promise<ContractResponse>;

package/dist/BitqueryBDSEthereum.js

@@ -8,44 +8,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _BitqueryBDSEthereum_client, _BitqueryBDSEthereum_networkType;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitqueryBDSEthereum = void 0;
-const core_1 = require("@urql/core");
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const constants_1 = require("./constants");
-const graphql_1 = require("./graphql");
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
+const axios_1 = __importDefault(require("axios"));
 class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
-    constructor(network, apiKey) {
+    constructor(network) {
         super(network);
+        _BitqueryBDSEthereum_client.set(this, void 0);
+        _BitqueryBDSEthereum_networkType.set(this, void 0);
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 8;
         if (network.type === 'custom')
             throw new Error('Custom network not supported');
-        this.networkType = network.type;
-        this.client = new core_1.Client({
-            url: constants_1.BITQUERY_URL,
-            exchanges: [core_1.fetchExchange],
-            fetch: node_fetch_1.default,
-            fetchOptions: {
-                headers: {
-                    'X-API-KEY': apiKey,
-                },
-            },
-        });
+        __classPrivateFieldSet(this, _BitqueryBDSEthereum_networkType, network.type, "f");
+        __classPrivateFieldSet(this, _BitqueryBDSEthereum_client, axios_1.default.create({
+            baseURL: constants_1.BITQUERY_MIRROR_URL,
+        }), "f");
     }
     getTransaction(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.client
-                .query(graphql_1.bitqueryGetTransactionQuery, {
-                hash,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
-            })
-                .toPromise();
-            if (result.error)
-                throw new Error(result.error.message);
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f").get(`/get-transaction/${hash}`, {
+                params: { network: constants_1.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")] },
+            });
             if (!result.data || !result.data.ethereum.transfers.length)
                 throw new Error('Transaction not found');
             const transfers = result.data.ethereum.transfers.map(this.parseTransactionTransfer);
@@ -65,16 +65,9 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
         return __awaiter(this, void 0, void 0, function* () {
             const limit = 10;
             const offset = limit * (page - 1);
-            const result = yield this.client
-                .query(graphql_1.bitqueryGetTransactionsByAddressQuery, {
-                address,
-                limit,
-                offset,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
-            })
-                .toPromise();
-            if (result.error)
-                throw new Error(result.error.message);
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f").get(`/get-transactions/${address}`, {
+                params: { network: constants_1.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")], limit, offset },
+            });
             if (!result.data)
                 throw new Error('Address does not have transactions');
             const totalCount = ((_a = result.data.ethereum.sentCount[0].count) !== null && _a !== void 0 ? _a : 0) + ((_b = result.data.ethereum.receiverCount[0].count) !== null && _b !== void 0 ? _b : 0);
@@ -110,17 +103,12 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
     getTokenInfo(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const localToken = constants_1.TOKENS[this.networkType].find(token => token.hash === hash);
+            const localToken = constants_1.TOKENS[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")].find(token => token.hash === hash);
             if (localToken)
                 return localToken;
-            const result = yield this.client
-                .query(graphql_1.bitqueryGetTokenInfoQuery, {
-                hash,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
-            })
-                .toPromise();
-            if (result.error)
-                throw new Error(result.error.message);
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f").get(`/get-token-info/${hash}`, {
+                params: { network: constants_1.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")] },
+            });
             if (!result.data || result.data.ethereum.smartContractCalls.length <= 0)
                 throw new Error('Token not found');
             const { address: { address }, currency: { decimals, name, symbol, tokenType }, } = result.data.ethereum.smartContractCalls[0].smartContract;
@@ -137,14 +125,9 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     getBalance(address) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.client
-                .query(graphql_1.bitqueryGetBalanceQuery, {
-                address,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
-            })
-                .toPromise();
-            if (result.error)
-                throw new Error(result.error.message);
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f").get(`/get-balance/${address}`, {
+                params: { network: constants_1.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")] },
+            });
             const data = (_b = (_a = result.data) === null || _a === void 0 ? void 0 : _a.ethereum.address[0].balances) !== null && _b !== void 0 ? _b : [];
             const ethBalance = (_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c.ethereum.address[0].balance) !== null && _d !== void 0 ? _d : 0;
             const ethToken = constants_1.NATIVE_ASSETS.find(asset => asset.symbol === 'ETH');
@@ -196,3 +179,4 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
 }
 exports.BitqueryBDSEthereum = BitqueryBDSEthereum;
+_BitqueryBDSEthereum_client = new WeakMap(), _BitqueryBDSEthereum_networkType = new WeakMap();

package/dist/BitqueryEDSEthereum.d.ts

@@ -1,8 +1,7 @@
 import { Currency, ExchangeDataService, NetworkType, TokenPricesResponse } from '@cityofzion/blockchain-service';
 export declare class BitqueryEDSEthereum implements ExchangeDataService {
-    private readonly client;
-    private readonly networkType;
-    constructor(networkType: NetworkType, apiKey: string);
+    #private;
+    constructor(networkType: NetworkType);
     getTokenPrices(currency: Currency): Promise<TokenPricesResponse[]>;
     private getCurrencyRatio;
 }

package/dist/BitqueryEDSEthereum.js

@@ -8,43 +8,45 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _BitqueryEDSEthereum_client, _BitqueryEDSEthereum_networkType;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitqueryEDSEthereum = void 0;
-const core_1 = require("@urql/core");
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const constants_1 = require("./constants");
+const axios_1 = __importDefault(require("axios"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
-const graphql_1 = require("./graphql");
+const constants_1 = require("./constants");
 dayjs_1.default.extend(utc_1.default);
 class BitqueryEDSEthereum {
-    constructor(networkType, apiKey) {
-        this.networkType = networkType;
-        this.client = new core_1.Client({
-            url: constants_1.BITQUERY_URL,
-            exchanges: [core_1.fetchExchange],
-            fetch: node_fetch_1.default,
-            fetchOptions: {
-                headers: {
-                    'X-API-KEY': apiKey,
-                },
-            },
-        });
+    constructor(networkType) {
+        _BitqueryEDSEthereum_client.set(this, void 0);
+        _BitqueryEDSEthereum_networkType.set(this, void 0);
+        __classPrivateFieldSet(this, _BitqueryEDSEthereum_networkType, networkType, "f");
+        __classPrivateFieldSet(this, _BitqueryEDSEthereum_client, axios_1.default.create({
+            baseURL: constants_1.BITQUERY_MIRROR_URL,
+        }), "f");
     }
     getTokenPrices(currency) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.networkType !== 'mainnet')
+            if (__classPrivateFieldGet(this, _BitqueryEDSEthereum_networkType, "f") !== 'mainnet')
                 throw new Error('Exchange is only available on mainnet');
             const twoDaysAgo = dayjs_1.default.utc().subtract(2, 'day').startOf('date').toISOString();
-            const result = yield this.client
-                .query(graphql_1.bitqueryGetPricesQuery, { after: twoDaysAgo, network: 'ethereum' })
-                .toPromise();
-            if (result.error) {
-                throw new Error(result.error.message);
-            }
+            const result = yield __classPrivateFieldGet(this, _BitqueryEDSEthereum_client, "f").get(`/get-price`, {
+                params: { network: constants_1.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryEDSEthereum_networkType, "f")], after: twoDaysAgo },
+            });
             if (!result.data) {
                 throw new Error('There is no price data');
             }
@@ -62,12 +64,10 @@ class BitqueryEDSEthereum {
     }
     getCurrencyRatio(currency) {
         return __awaiter(this, void 0, void 0, function* () {
-            const request = yield (0, node_fetch_1.default)(`https://api.flamingo.finance/fiat/exchange-rate?pair=USD_${currency}`, {
-                method: 'GET',
-            });
-            const data = yield request.json();
+            const { data } = yield axios_1.default.get(`https://api.flamingo.finance/fiat/exchange-rate?pair=USD_${currency}`);
             return data;
         });
     }
 }
 exports.BitqueryEDSEthereum = BitqueryEDSEthereum;
+_BitqueryEDSEthereum_client = new WeakMap(), _BitqueryEDSEthereum_networkType = new WeakMap();

package/dist/GhostMarketNDSEthereum.d.ts

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

package/dist/GhostMarketNDSEthereum.js

@@ -8,17 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _GhostMarketNDSEthereum_networkType;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GhostMarketNDSEthereum = void 0;
 const query_string_1 = __importDefault(require("query-string"));
+const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
-const node_fetch_1 = __importDefault(require("node-fetch"));
 class GhostMarketNDSEthereum {
     constructor(networkType) {
-        this.networkType = networkType;
+        _GhostMarketNDSEthereum_networkType.set(this, void 0);
+        __classPrivateFieldSet(this, _GhostMarketNDSEthereum_networkType, networkType, "f");
     }
     getNftsByAddress({ address, size = 18, cursor }) {
         var _a;
@@ -28,10 +41,9 @@ class GhostMarketNDSEthereum {
                 owners: [address],
                 cursor: cursor,
             });
-            const request = yield (0, node_fetch_1.default)(url, { method: 'GET' });
-            const data = (yield request.json());
-            const nfts = (_a = data.assets) !== null && _a !== void 0 ? _a : [];
-            return { nextCursor: data.next, items: nfts.map(this.parse.bind(this)) };
+            const request = yield axios_1.default.get(url);
+            const nfts = (_a = request.data.assets) !== null && _a !== void 0 ? _a : [];
+            return { nextCursor: request.data.next, items: nfts.map(this.parse.bind(this)) };
         });
     }
     getNft({ contractHash, tokenId }) {
@@ -40,9 +52,8 @@ class GhostMarketNDSEthereum {
                 contract: contractHash,
                 tokenIds: [tokenId],
             });
-            const request = yield (0, node_fetch_1.default)(url, { method: 'GET' });
-            const data = (yield request.json());
-            return this.parse(data.assets[0]);
+            const request = yield axios_1.default.get(url);
+            return this.parse(request.data.assets[0]);
         });
     }
     treatGhostMarketImage(srcImage) {
@@ -56,8 +67,8 @@ class GhostMarketNDSEthereum {
         return srcImage;
     }
     getUrlWithParams(params) {
-        const parameters = query_string_1.default.stringify(Object.assign({ chain: constants_1.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE[this.networkType] }, params), { arrayFormat: 'bracket' });
-        return `${constants_1.GHOSTMARKET_URL_BY_NETWORK_TYPE[this.networkType]}/assets?${parameters}`;
+        const parameters = query_string_1.default.stringify(Object.assign({ chain: constants_1.GHOSTMARKET_CHAIN_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSEthereum_networkType, "f")] }, params), { arrayFormat: 'bracket' });
+        return `${constants_1.GHOSTMARKET_URL_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _GhostMarketNDSEthereum_networkType, "f")]}/assets?${parameters}`;
     }
     parse(data) {
         var _a, _b;
@@ -79,3 +90,4 @@ class GhostMarketNDSEthereum {
     }
 }
 exports.GhostMarketNDSEthereum = GhostMarketNDSEthereum;
+_GhostMarketNDSEthereum_networkType = new WeakMap();

package/dist/LedgerServiceEthereum.d.ts

@@ -1,8 +1,10 @@
-import { LedgerService } from '@cityofzion/blockchain-service';
+import { Account, LedgerService } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import { ethers } from 'ethers';
 export declare class LedgerServiceEthereum implements LedgerService {
-    private readonly defaultPath;
+    #private;
+    getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined;
+    constructor(getLedgerTransport?: ((account: Account) => Promise<Transport>) | undefined);
     getAddress(transport: Transport): Promise<string>;
     getPublicKey(transport: Transport): Promise<string>;
     getSignTransactionFunction(transport: Transport): Promise<(transaction: ethers.providers.TransactionRequest) => Promise<string>>;

package/dist/LedgerServiceEthereum.js

@@ -31,25 +31,32 @@ 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 _LedgerServiceEthereum_defaultPath;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LedgerServiceEthereum = void 0;
 const hw_app_eth_1 = __importStar(require("@ledgerhq/hw-app-eth"));
 const ethers_1 = require("ethers");
 class LedgerServiceEthereum {
-    constructor() {
-        this.defaultPath = "44'/60'/0'/0/0";
+    constructor(getLedgerTransport) {
+        this.getLedgerTransport = getLedgerTransport;
+        _LedgerServiceEthereum_defaultPath.set(this, "44'/60'/0'/0/0");
     }
     getAddress(transport) {
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_eth_1.default(transport);
-            const { address } = yield ledgerApp.getAddress(this.defaultPath);
+            const { address } = yield ledgerApp.getAddress(__classPrivateFieldGet(this, _LedgerServiceEthereum_defaultPath, "f"));
             return address;
         });
     }
     getPublicKey(transport) {
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_eth_1.default(transport);
-            const { publicKey } = yield ledgerApp.getAddress(this.defaultPath);
+            const { publicKey } = yield ledgerApp.getAddress(__classPrivateFieldGet(this, _LedgerServiceEthereum_defaultPath, "f"));
             return '0x' + publicKey;
         });
     }
@@ -60,7 +67,7 @@ class LedgerServiceEthereum {
                 const unsignedTransaction = Object.assign(Object.assign({}, transaction), { nonce: transaction.nonce ? ethers_1.ethers.BigNumber.from(transaction.nonce).toNumber() : undefined });
                 const serializedUnsignedTransaction = ethers_1.ethers.utils.serializeTransaction(unsignedTransaction).substring(2);
                 const resolution = yield hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
-                const signature = yield ledgerApp.signTransaction(this.defaultPath, serializedUnsignedTransaction, resolution);
+                const signature = yield ledgerApp.signTransaction(__classPrivateFieldGet(this, _LedgerServiceEthereum_defaultPath, "f"), serializedUnsignedTransaction, resolution);
                 return ethers_1.ethers.utils.serializeTransaction(unsignedTransaction, {
                     v: ethers_1.ethers.BigNumber.from('0x' + signature.v).toNumber(),
                     r: '0x' + signature.r,
@@ -71,3 +78,4 @@ class LedgerServiceEthereum {
     }
 }
 exports.LedgerServiceEthereum = LedgerServiceEthereum;
+_LedgerServiceEthereum_defaultPath = new WeakMap();

package/dist/RpcBDSEthereum.d.ts

@@ -1,6 +1,6 @@
 import { BalanceResponse, BlockchainDataService, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 export declare class RpcBDSEthereum implements BlockchainDataService {
-    private readonly network;
+    #private;
     maxTimeToConfirmTransactionInMs: number;
     constructor(network: Network);
     getTransaction(hash: string): Promise<TransactionResponse>;

package/dist/RpcBDSEthereum.js

@@ -8,25 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _RpcBDSEthereum_network;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcBDSEthereum = void 0;
 const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
 class RpcBDSEthereum {
     constructor(network) {
+        _RpcBDSEthereum_network.set(this, void 0);
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
-        this.network = network;
+        __classPrivateFieldSet(this, _RpcBDSEthereum_network, network, "f");
     }
     getTransaction(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+            const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").url);
             const transaction = yield provider.getTransaction(hash);
             if (!transaction || !transaction.blockHash || !transaction.to)
                 throw new Error('Transaction not found');
             const block = yield provider.getBlock(transaction.blockHash);
             if (!block)
                 throw new Error('Block not found');
-            const tokens = constants_1.TOKENS[this.network.type];
+            const tokens = constants_1.TOKENS[__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").type];
             const token = tokens.find(token => token.symbol === 'ETH');
             return {
                 block: block.number,
@@ -58,7 +71,7 @@ class RpcBDSEthereum {
     }
     getTokenInfo(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tokens = constants_1.TOKENS[this.network.type];
+            const tokens = constants_1.TOKENS[__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").type];
             const token = tokens.find(token => token.hash === hash);
             if (!token)
                 throw new Error('Token not found');
@@ -67,9 +80,9 @@ class RpcBDSEthereum {
     }
     getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+            const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").url);
             const balance = yield provider.getBalance(address);
-            const tokens = constants_1.TOKENS[this.network.type];
+            const tokens = constants_1.TOKENS[__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").type];
             const token = tokens.find(token => token.symbol === 'ETH');
             return [
                 {
@@ -81,9 +94,10 @@ class RpcBDSEthereum {
     }
     getBlockHeight() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+            const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _RpcBDSEthereum_network, "f").url);
             return yield provider.getBlockNumber();
         });
     }
 }
 exports.RpcBDSEthereum = RpcBDSEthereum;
+_RpcBDSEthereum_network = new WeakMap();

package/dist/constants.d.ts

@@ -8,8 +8,8 @@ export declare const NATIVE_ASSETS: {
     decimals: number;
 }[];
 export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<NetworkType, string>;
-export declare const BITQUERY_URL = "https://graphql.bitquery.io";
-export declare const BITQUERY_NETWORK_BY_NETWORK_TYPE: Record<Exclude<NetworkType, 'custom'>, BitqueryNetwork>;
+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/?";

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_NETWORK_BY_NETWORK_TYPE = exports.BITQUERY_URL = exports.DEFAULT_URL_BY_NETWORK_TYPE = exports.NATIVE_ASSETS = exports.TOKENS = void 0;
+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;
 const common_json_1 = __importDefault(require("./assets/tokens/common.json"));
 exports.TOKENS = {
     mainnet: [...common_json_1.default],
@@ -16,8 +16,8 @@ exports.DEFAULT_URL_BY_NETWORK_TYPE = {
     testnet: 'https://ethereum-sepolia-rpc.publicnode.com',
     custom: 'http://127.0.0.1:8545',
 };
-exports.BITQUERY_URL = 'https://graphql.bitquery.io';
-exports.BITQUERY_NETWORK_BY_NETWORK_TYPE = {
+exports.BITQUERY_MIRROR_URL = 'https://i4l7kcg43c.execute-api.us-east-1.amazonaws.com/production/';
+exports.BITQUERY_MIRROR_NETWORK_BY_NETWORK_TYPE = {
     mainnet: 'ethereum',
     testnet: 'goerli',
 };

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "author": "Coz",
   "license": "MIT",
+  "files": [
+    "/dist"
+  ],
   "dependencies": {
+    "axios": "1.5.1",
     "ethers": "5.7.2",
-    "@urql/core": "~4.1.1",
     "graphql": "~16.8.0",
-    "node-fetch": "2.6.4",
     "dayjs": "~1.11.9",
     "query-string": "7.1.3",
     "@ethersproject/json-wallets": "5.7.0",
@@ -19,11 +21,10 @@
     "@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.10.0"
+    "@cityofzion/blockchain-service": "0.11.0"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",
-    "@types/node-fetch": "2.6.4",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
     "dotenv": "16.3.1",

package/.eslintignore

@@ -1,13 +0,0 @@
-.DS_Store
-node_modules
-/build
-/dist
-/package
-.env
-.env.*
-!.env.example
-*.md
-*.html
-
-# Ignore files for NPM lock file
-package-lock.json