@cityofzion/bs-ethereum 2.3.0 → 2.5.0

package/dist/BSEthereum.d.ts

@@ -1,7 +1,6 @@
-import { Account, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam } from '@cityofzion/blockchain-service';
+import { Account, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam, GetLedgerTransport } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from './constants/BSEthereumConstants';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
-import Transport from '@ledgerhq/hw-transport';
 export declare class BSEthereum<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSEthereumNetworkId>, BSWithNft, BSWithNameService, BSCalculableFee, BSWithLedger, BSWithExplorerService {
     #private;
     readonly blockchainName: BSCustomName;
@@ -14,7 +13,8 @@ export declare class BSEthereum<BSCustomName extends string = string> implements
     nftDataService: NftDataService;
     network: Network<BSEthereumNetworkId>;
     explorerService: ExplorerService;
-    constructor(blockchainName: BSCustomName, network?: Network<BSEthereumNetworkId>, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    constructor(blockchainName: BSCustomName, network?: Network<BSEthereumNetworkId>, getLedgerTransport?: GetLedgerTransport);
+    testNetwork(network: Network<BSEthereumNetworkId>): Promise<void>;
     setNetwork(network: Network<BSEthereumNetworkId>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(json: string): boolean;

package/dist/BSEthereum.js

@@ -31,12 +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_instances, _BSEthereum_generateSigner, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
+var _BSEthereum_instances, _BSEthereum_getLedgerTransport, _BSEthereum_generateSigner, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const ethers_1 = require("ethers");
@@ -52,15 +58,24 @@ const MoralisBDSEthereum_1 = require("./services/blockchain-data/MoralisBDSEther
 const MoralisEDSEthereum_1 = require("./services/exchange-data/MoralisEDSEthereum");
 const GhostMarketNDSEthereum_1 = require("./services/nft-data/GhostMarketNDSEthereum");
 const BlockscoutESEthereum_1 = require("./services/explorer/BlockscoutESEthereum");
+const RpcBDSEthereum_1 = require("./services/blockchain-data/RpcBDSEthereum");
 class BSEthereum {
     constructor(blockchainName, network, getLedgerTransport) {
         _BSEthereum_instances.add(this);
+        _BSEthereum_getLedgerTransport.set(this, void 0);
         network = network !== null && network !== void 0 ? network : BSEthereumConstants_1.BSEthereumConstants.DEFAULT_NETWORK;
         this.blockchainName = blockchainName;
         this.ledgerService = new EthersLedgerServiceEthereum_1.EthersLedgerServiceEthereum(this, getLedgerTransport);
+        __classPrivateFieldSet(this, _BSEthereum_getLedgerTransport, getLedgerTransport, "f");
         this.bip44DerivationPath = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_BIP44_DERIVATION_PATH;
         this.setNetwork(network);
     }
+    testNetwork(network) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const blockchainDataServiceClone = new RpcBDSEthereum_1.RpcBDSEthereum(network);
+            yield blockchainDataServiceClone.getBlockHeight();
+        });
+    }
     setNetwork(network) {
         __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_setTokens).call(this, network);
         this.network = network;
@@ -86,18 +101,14 @@ class BSEthereum {
             if (!key.startsWith('0x')) {
                 key = '0x' + key;
             }
-            if (ethersBytes.hexDataLength(key) !== 32)
-                return false;
-            return true;
+            return ethersBytes.hexDataLength(key) === 32;
         }
         catch (error) {
             return false;
         }
     }
     validateNameServiceDomainFormat(domainName) {
-        if (!domainName.endsWith('.eth'))
-            return false;
-        return true;
+        return domainName.endsWith('.eth');
     }
     generateAccountFromMnemonic(mnemonic, index) {
         const bip44Path = this.bip44DerivationPath.replace('?', index.toString());
@@ -146,6 +157,7 @@ class BSEthereum {
             const signer = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_generateSigner).call(this, param.senderAccount, param.isLedger);
             const sentTransactionHashes = [];
             for (const intent of param.intents) {
+                let transactionHash = '';
                 try {
                     const { transactionParams, gasPrice } = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_buildTransferParams).call(this, intent);
                     let gasLimit;
@@ -156,11 +168,12 @@ class BSEthereum {
                         gasLimit = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT;
                     }
                     const transaction = yield signer.sendTransaction(Object.assign(Object.assign({}, transactionParams), { gasLimit, maxPriorityFeePerGas: gasPrice, maxFeePerGas: gasPrice }));
-                    sentTransactionHashes.push(transaction.hash);
+                    transactionHash = transaction.hash;
                 }
                 catch (_b) {
                     /* empty */
                 }
+                sentTransactionHashes.push(transactionHash);
             }
             return sentTransactionHashes;
         });
@@ -189,7 +202,7 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
-_BSEthereum_instances = new WeakSet(), _BSEthereum_generateSigner = function _BSEthereum_generateSigner(account, isLedger) {
+_BSEthereum_getLedgerTransport = new WeakMap(), _BSEthereum_instances = new WeakSet(), _BSEthereum_generateSigner = function _BSEthereum_generateSigner(account, isLedger) {
     return __awaiter(this, void 0, void 0, function* () {
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
         if (isLedger) {

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

@@ -1,4 +1,4 @@
-import { Account, LedgerService, LedgerServiceEmitter } from '@cityofzion/blockchain-service';
+import { Account, LedgerService, LedgerServiceEmitter, GetLedgerTransport } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
 import { ethers, Signer } from 'ethers';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
@@ -15,8 +15,8 @@ export declare class EthersLedgerSigner extends Signer implements TypedDataSigne
 export declare class EthersLedgerServiceEthereum implements LedgerService {
     #private;
     emitter: LedgerServiceEmitter;
-    getLedgerTransport?: (account: Account) => Promise<Transport>;
-    constructor(blockchainService: BSEthereum, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    getLedgerTransport?: GetLedgerTransport;
+    constructor(blockchainService: BSEthereum, getLedgerTransport?: GetLedgerTransport);
     getAccounts(transport: Transport): Promise<Account[]>;
     getAccount(transport: Transport, index: number): Promise<Account>;
     getSigner(transport: Transport, path: string, provider?: ethers.providers.Provider): EthersLedgerSigner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.3.0",
+  "version": "2.5.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.4.0"
+    "@cityofzion/blockchain-service": "1.6.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",