@cityofzion/bs-ethereum 1.0.4 → 1.2.0

package/dist/BSEthereum.d.ts

@@ -1,15 +1,18 @@
-import { Account, AccountWithDerivationPath, BSCalculableFee, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, Network, NftDataService, PartialBy, Token, TransferParam } from '@cityofzion/blockchain-service';
-export declare class BSEthereum<BSCustomName extends string = string> implements BlockchainService, BSWithNft, BSWithNameService, BSCalculableFee {
+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 {
+    #private;
     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'>, bitqueryApiKey: string, getLedgerTransport?: (account: Account) => Promise<Transport>);
     setNetwork(param: PartialBy<Network, 'url'>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(json: string): boolean;
@@ -17,9 +20,10 @@ export declare class BSEthereum<BSCustomName extends string = string> implements
     validateNameServiceDomainFormat(domainName: string): boolean;
     generateAccountFromMnemonic(mnemonic: string[] | string, index: number): AccountWithDerivationPath;
     generateAccountFromKey(key: string): Account;
+    generateAccountFromPublicKey(publicKey: string): Account;
     decrypt(json: string, password: string): Promise<Account>;
     encrypt(key: string, password: string): Promise<string>;
-    transfer({ senderAccount, intent }: TransferParam): Promise<string>;
-    calculateTransferFee({ senderAccount, intent }: TransferParam): Promise<string>;
+    transfer(param: TransferParam): Promise<string>;
+    calculateTransferFee({ intent }: TransferParam): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSEthereum.js

@@ -31,6 +31,18 @@ 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 _BSEthereum_bitqueryApiKey;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const ethers_1 = require("ethers");
@@ -42,12 +54,15 @@ const BitqueryEDSEthereum_1 = require("./BitqueryEDSEthereum");
 const GhostMarketNDSEthereum_1 = require("./GhostMarketNDSEthereum");
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 const BitqueryBDSEthereum_1 = require("./BitqueryBDSEthereum");
+const LedgerServiceEthereum_1 = require("./LedgerServiceEthereum");
 class BSEthereum {
-    constructor(blockchainName, network, bitqueryApiKey) {
+    constructor(blockchainName, network, bitqueryApiKey, getLedgerTransport) {
+        _BSEthereum_bitqueryApiKey.set(this, void 0);
         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;
+        __classPrivateFieldSet(this, _BSEthereum_bitqueryApiKey, bitqueryApiKey, "f");
         this.feeToken = this.tokens.find(token => token.symbol === 'ETH');
         this.setNetwork(network);
     }
@@ -58,13 +73,13 @@ class BSEthereum {
             url: (_a = param.url) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_URL_BY_NETWORK_TYPE[param.type],
         };
         this.network = network;
-        if (network.type === 'custom') {
+        if (network.type !== 'mainnet') {
             this.blockchainDataService = new RpcBDSEthereum_1.RpcBDSEthereum(network);
         }
         else {
-            this.blockchainDataService = new BitqueryBDSEthereum_1.BitqueryBDSEthereum(network, this.bitqueryApiKey);
+            this.blockchainDataService = new BitqueryBDSEthereum_1.BitqueryBDSEthereum(network, __classPrivateFieldGet(this, _BSEthereum_bitqueryApiKey, "f"));
         }
-        this.exchangeDataService = new BitqueryEDSEthereum_1.BitqueryEDSEthereum(network.type, this.bitqueryApiKey);
+        this.exchangeDataService = new BitqueryEDSEthereum_1.BitqueryEDSEthereum(network.type, __classPrivateFieldGet(this, _BSEthereum_bitqueryApiKey, "f"));
         this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(network.type);
     }
     validateAddress(address) {
@@ -109,6 +124,14 @@ class BSEthereum {
             type: 'privateKey',
         };
     }
+    generateAccountFromPublicKey(publicKey) {
+        const address = ethers_1.ethers.utils.computeAddress(publicKey);
+        return {
+            address,
+            key: publicKey,
+            type: 'publicKey',
+        };
+    }
     decrypt(json, password) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = yield ethers_1.ethers.Wallet.fromEncryptedJson(json, password);
@@ -125,44 +148,57 @@ class BSEthereum {
             return wallet.encrypt(password);
         });
     }
-    transfer({ senderAccount, intent }) {
+    transfer(param) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-            const wallet = new ethers_1.ethers.Wallet(senderAccount.key, provider);
-            let transaction;
-            const decimals = (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
-            const amount = ethersBigNumber.parseFixed(intent.amount, decimals);
-            const isNative = constants_1.NATIVE_ASSETS.some(asset => asset.hash === intent.tokenHash);
-            if (!isNative) {
-                const contract = new ethers_1.ethers.Contract(intent.tokenHash, ['function transfer(address to, uint amount) returns (bool)'], wallet);
-                transaction = yield contract.transfer(intent.receiverAddress, amount);
+            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);
             }
-            else {
-                transaction = yield wallet.sendTransaction({
-                    to: intent.receiverAddress,
+            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);
+            let transactionParams;
+            const isNative = constants_1.NATIVE_ASSETS.some(asset => asset.hash === param.intent.tokenHash);
+            if (isNative) {
+                transactionParams = {
+                    to: param.intent.receiverAddress,
                     value: amount,
-                });
+                };
+            }
+            else {
+                const contract = new ethers_1.ethers.Contract(param.intent.tokenHash, [
+                    'function transfer(address to, uint amount) returns (bool)',
+                ]);
+                transactionParams = yield contract.populateTransaction.transfer(param.intent.receiverAddress, amount);
             }
-            return transaction.hash;
+            const voidSigner = new ethers_1.ethers.VoidSigner(param.senderAccount.address, provider);
+            const transaction = yield voidSigner.populateTransaction(transactionParams);
+            const signedTransaction = yield signTransactionFunction(transaction);
+            const transactionResponse = yield provider.sendTransaction(signedTransaction);
+            return transactionResponse.hash;
         });
     }
-    calculateTransferFee({ senderAccount, intent }) {
+    calculateTransferFee({ intent }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-            const wallet = new ethers_1.ethers.Wallet(senderAccount.key, provider);
             const gasPrice = yield provider.getGasPrice();
             let estimated;
             const isNative = constants_1.NATIVE_ASSETS.some(asset => asset.hash === intent.tokenHash);
             const decimals = (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
             const amount = ethersBigNumber.parseFixed(intent.amount, decimals);
             if (!isNative) {
-                const contract = new ethers_1.ethers.Contract(intent.tokenHash, ['function transfer(address to, uint amount) returns (bool)'], wallet);
+                const contract = new ethers_1.ethers.Contract(intent.tokenHash, ['function transfer(address to, uint amount) returns (bool)'], provider);
                 estimated = yield contract.estimateGas.transfer(intent.receiverAddress, amount);
             }
             else {
-                estimated = yield wallet.estimateGas({
+                estimated = yield provider.estimateGas({
                     to: intent.receiverAddress,
                     value: amount,
                 });
@@ -181,3 +217,4 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
+_BSEthereum_bitqueryApiKey = new WeakMap();

package/dist/BitqueryBDSEthereum.d.ts

@@ -1,8 +1,7 @@
 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);
     getTransaction(hash: string): Promise<TransactionResponse>;

package/dist/BitqueryBDSEthereum.js

@@ -8,9 +8,21 @@ 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");
@@ -21,11 +33,13 @@ const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     constructor(network, apiKey) {
         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({
+        __classPrivateFieldSet(this, _BitqueryBDSEthereum_networkType, network.type, "f");
+        __classPrivateFieldSet(this, _BitqueryBDSEthereum_client, new core_1.Client({
             url: constants_1.BITQUERY_URL,
             exchanges: [core_1.fetchExchange],
             fetch: node_fetch_1.default,
@@ -34,14 +48,14 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     'X-API-KEY': apiKey,
                 },
             },
-        });
+        }), "f");
     }
     getTransaction(hash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.client
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f")
                 .query(graphql_1.bitqueryGetTransactionQuery, {
                 hash,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
+                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")],
             })
                 .toPromise();
             if (result.error)
@@ -65,12 +79,12 @@ 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
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f")
                 .query(graphql_1.bitqueryGetTransactionsByAddressQuery, {
                 address,
                 limit,
                 offset,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
+                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")],
             })
                 .toPromise();
             if (result.error)
@@ -110,13 +124,13 @@ 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
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f")
                 .query(graphql_1.bitqueryGetTokenInfoQuery, {
                 hash,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
+                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")],
             })
                 .toPromise();
             if (result.error)
@@ -137,10 +151,10 @@ 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
+            const result = yield __classPrivateFieldGet(this, _BitqueryBDSEthereum_client, "f")
                 .query(graphql_1.bitqueryGetBalanceQuery, {
                 address,
-                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[this.networkType],
+                network: constants_1.BITQUERY_NETWORK_BY_NETWORK_TYPE[__classPrivateFieldGet(this, _BitqueryBDSEthereum_networkType, "f")],
             })
                 .toPromise();
             if (result.error)
@@ -196,3 +210,4 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
 }
 exports.BitqueryBDSEthereum = BitqueryBDSEthereum;
+_BitqueryBDSEthereum_client = new WeakMap(), _BitqueryBDSEthereum_networkType = new WeakMap();

package/dist/BitqueryEDSEthereum.d.ts

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

package/dist/BitqueryEDSEthereum.js

@@ -8,9 +8,21 @@ 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");
@@ -22,8 +34,10 @@ const graphql_1 = require("./graphql");
 dayjs_1.default.extend(utc_1.default);
 class BitqueryEDSEthereum {
     constructor(networkType, apiKey) {
-        this.networkType = networkType;
-        this.client = new core_1.Client({
+        _BitqueryEDSEthereum_client.set(this, void 0);
+        _BitqueryEDSEthereum_networkType.set(this, void 0);
+        __classPrivateFieldSet(this, _BitqueryEDSEthereum_networkType, networkType, "f");
+        __classPrivateFieldSet(this, _BitqueryEDSEthereum_client, new core_1.Client({
             url: constants_1.BITQUERY_URL,
             exchanges: [core_1.fetchExchange],
             fetch: node_fetch_1.default,
@@ -32,14 +46,14 @@ class BitqueryEDSEthereum {
                     'X-API-KEY': apiKey,
                 },
             },
-        });
+        }), "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
+            const result = yield __classPrivateFieldGet(this, _BitqueryEDSEthereum_client, "f")
                 .query(graphql_1.bitqueryGetPricesQuery, { after: twoDaysAgo, network: 'ethereum' })
                 .toPromise();
             if (result.error) {
@@ -71,3 +85,4 @@ class BitqueryEDSEthereum {
     }
 }
 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,9 +8,21 @@ 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"));
@@ -18,7 +30,8 @@ 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;
@@ -56,8 +69,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 +92,4 @@ class GhostMarketNDSEthereum {
     }
 }
 exports.GhostMarketNDSEthereum = GhostMarketNDSEthereum;
+_GhostMarketNDSEthereum_networkType = new WeakMap();

package/dist/LedgerServiceEthereum.d.ts

@@ -0,0 +1,11 @@
+import { Account, LedgerService } from '@cityofzion/blockchain-service';
+import Transport from '@ledgerhq/hw-transport';
+import { ethers } from 'ethers';
+export declare class LedgerServiceEthereum implements LedgerService {
+    #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

@@ -0,0 +1,81 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 __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(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(__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(__classPrivateFieldGet(this, _LedgerServiceEthereum_defaultPath, "f"));
+            return '0x' + publicKey;
+        });
+    }
+    getSignTransactionFunction(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (transaction) => __awaiter(this, void 0, void 0, function* () {
+                const ledgerApp = new hw_app_eth_1.default(transport);
+                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(__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,
+                    s: '0x' + signature.s,
+                });
+            });
+        });
+    }
+}
+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.js

@@ -13,7 +13,7 @@ exports.TOKENS = {
 exports.NATIVE_ASSETS = common_json_1.default;
 exports.DEFAULT_URL_BY_NETWORK_TYPE = {
     mainnet: 'https://ethereum-mainnet-rpc.allthatnode.com',
-    testnet: 'https://ethereum-goerli.publicnode.com',
+    testnet: 'https://ethereum-sepolia-rpc.publicnode.com',
     custom: 'http://127.0.0.1:8545',
 };
 exports.BITQUERY_URL = 'https://graphql.bitquery.io';