@cityofzion/bs-neo3 1.4.3 → 1.6.0

package/dist/BSNeo3.d.ts

@@ -1,7 +1,6 @@
-import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BSWithSwap, ExchangeDataService, ExplorerService, Network, NftDataService, SwapService, Token, TransferParam } from '@cityofzion/blockchain-service';
+import { Account, BDSClaimable, BlockchainDataService, BlockchainService, BSCalculableFee, BSClaimable, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BSWithSwap, ExchangeDataService, ExplorerService, GetLedgerTransport, Network, NftDataService, SwapService, Token, TransferParam } from '@cityofzion/blockchain-service';
 import Neon from '@cityofzion/neon-core';
 import { api } from '@cityofzion/neon-js';
-import Transport from '@ledgerhq/hw-transport';
 import { NeonDappKitLedgerServiceNeo3 } from './services/ledger/NeonDappKitLedgerServiceNeo3';
 import { BSNeo3NetworkId } from './constants/BSNeo3Constants';
 export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSNeo3NetworkId>, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger, BSWithSwap<BSNeo3NetworkId> {
@@ -18,12 +17,13 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     exchangeDataService: ExchangeDataService;
     explorerService: ExplorerService;
     network: Network<BSNeo3NetworkId>;
-    constructor(blockchainName: BSCustomName, network?: Network<BSNeo3NetworkId>, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    constructor(blockchainName: BSCustomName, network?: Network<BSNeo3NetworkId>, getLedgerTransport?: GetLedgerTransport);
     generateSigningCallback(account: Account, isLedger?: boolean): Promise<{
         neonJsAccount: Neon.wallet.Account;
         signingCallback: api.SigningFunction;
     }>;
     createSwapService(): SwapService<BSNeo3NetworkId>;
+    testNetwork(network: Network<BSNeo3NetworkId>): Promise<void>;
     setNetwork(network: Network<BSNeo3NetworkId>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(encryptedKey: string): boolean;

package/dist/BSNeo3.js

@@ -8,12 +8,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 _BSNeo3_instances, _BSNeo3_setTokens, _BSNeo3_buildTransferInvocation;
+var _BSNeo3_instances, _BSNeo3_getLedgerTransport, _BSNeo3_setTokens, _BSNeo3_buildTransferInvocation;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeo3 = void 0;
 const bs_asteroid_sdk_1 = require("@cityofzion/bs-asteroid-sdk");
@@ -27,12 +33,15 @@ const NeonDappKitLedgerServiceNeo3_1 = require("./services/ledger/NeonDappKitLed
 const GhostMarketNDSNeo3_1 = require("./services/nft-data/GhostMarketNDSNeo3");
 const FlamingoSwapServiceNeo3_1 = require("./services/swap/FlamingoSwapServiceNeo3");
 const BSNeo3Constants_1 = require("./constants/BSNeo3Constants");
+const RpcBDSNeo3_1 = require("./services/blockchain-data/RpcBDSNeo3");
 class BSNeo3 {
     constructor(blockchainName, network, getLedgerTransport) {
         _BSNeo3_instances.add(this);
+        _BSNeo3_getLedgerTransport.set(this, void 0);
         network = network !== null && network !== void 0 ? network : BSNeo3Constants_1.BSNeo3Constants.DEFAULT_NETWORK;
         this.blockchainName = blockchainName;
         this.ledgerService = new NeonDappKitLedgerServiceNeo3_1.NeonDappKitLedgerServiceNeo3(this, getLedgerTransport);
+        __classPrivateFieldSet(this, _BSNeo3_getLedgerTransport, getLedgerTransport, "f");
         this.bip44DerivationPath = BSNeo3Constants_1.BSNeo3Constants.DEFAULT_BIP44_DERIVATION_PATH;
         this.setNetwork(network);
     }
@@ -59,6 +68,12 @@ class BSNeo3 {
     createSwapService() {
         return new FlamingoSwapServiceNeo3_1.FlamingoSwapServiceNeo3(this.network, this);
     }
+    testNetwork(network) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const blockchainDataServiceClone = new RpcBDSNeo3_1.RpcBDSNeo3(network, this.feeToken, this.claimToken, this.tokens);
+            yield blockchainDataServiceClone.getBlockHeight();
+        });
+    }
     setNetwork(network) {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;
@@ -77,9 +92,7 @@ class BSNeo3 {
         return neon_js_1.wallet.isWIF(key) || neon_js_1.wallet.isPrivateKey(key);
     }
     validateNameServiceDomainFormat(domainName) {
-        if (!domainName.endsWith('.neo'))
-            return false;
-        return true;
+        return domainName.endsWith('.neo');
     }
     generateAccountFromMnemonic(mnemonic, index) {
         bs_asteroid_sdk_1.keychain.importMnemonic(Array.isArray(mnemonic) ? mnemonic.join(' ') : mnemonic);
@@ -114,8 +127,7 @@ class BSNeo3 {
     }
     encrypt(key, password) {
         return __awaiter(this, void 0, void 0, function* () {
-            const encryptedKey = yield neon_js_1.wallet.encrypt(key, password);
-            return encryptedKey;
+            return yield neon_js_1.wallet.encrypt(key, password);
         });
     }
     calculateTransferFee(param) {
@@ -146,17 +158,16 @@ class BSNeo3 {
                 invocations,
                 signers: [],
             });
-            return [transactionHash];
+            return param.intents.map(() => transactionHash);
         });
     }
     claim(account, isLedger) {
         return __awaiter(this, void 0, void 0, function* () {
             const { neonJsAccount, signingCallback } = yield this.generateSigningCallback(account, isLedger);
             const facade = yield neon_js_1.api.NetworkFacade.fromConfig({ node: this.network.url });
-            const transactionHash = yield facade.claimGas(neonJsAccount, {
+            return yield facade.claimGas(neonJsAccount, {
                 signingCallback: signingCallback,
             });
-            return transactionHash;
         });
     }
     resolveNameServiceDomain(domainName) {
@@ -179,13 +190,12 @@ class BSNeo3 {
             const parsed = parser.parseRpcResponse(response.stack[0], {
                 type: 'Hash160',
             });
-            const address = parser.accountInputToAddress(parsed.replace('0x', ''));
-            return address;
+            return parser.accountInputToAddress(parsed.replace('0x', ''));
         });
     }
 }
 exports.BSNeo3 = BSNeo3;
-_BSNeo3_instances = new WeakSet(), _BSNeo3_setTokens = function _BSNeo3_setTokens(network) {
+_BSNeo3_getLedgerTransport = new WeakMap(), _BSNeo3_instances = new WeakSet(), _BSNeo3_setTokens = function _BSNeo3_setTokens(network) {
     const tokens = BSNeo3Helper_1.BSNeo3Helper.getTokens(network);
     this.tokens = tokens;
     this.feeToken = tokens.find(token => token.symbol === 'GAS');
@@ -193,7 +203,7 @@ _BSNeo3_instances = new WeakSet(), _BSNeo3_setTokens = function _BSNeo3_setToken
     this.claimToken = tokens.find(token => token.symbol === 'GAS');
 }, _BSNeo3_buildTransferInvocation = function _BSNeo3_buildTransferInvocation({ intents, tipIntent }, account) {
     const concatIntents = [...intents, ...(tipIntent ? [tipIntent] : [])];
-    const invocations = concatIntents.map(intent => {
+    return concatIntents.map(intent => {
         return {
             operation: 'transfer',
             scriptHash: intent.tokenHash,
@@ -210,5 +220,4 @@ _BSNeo3_instances = new WeakSet(), _BSNeo3_setTokens = function _BSNeo3_setToken
             ],
         };
     });
-    return invocations;
 };

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

@@ -1,12 +1,12 @@
-import { Account, LedgerService, LedgerServiceEmitter } from '@cityofzion/blockchain-service';
+import { Account, LedgerService, LedgerServiceEmitter, GetLedgerTransport } from '@cityofzion/blockchain-service';
 import { api } from '@cityofzion/neon-js';
 import Transport from '@ledgerhq/hw-transport';
 import { BSNeo3 } from '../../BSNeo3';
 export declare class NeonDappKitLedgerServiceNeo3 implements LedgerService {
     #private;
     emitter: LedgerServiceEmitter;
-    getLedgerTransport?: (account: Account) => Promise<Transport>;
-    constructor(blockchainService: BSNeo3, getLedgerTransport?: (account: Account) => Promise<Transport>);
+    getLedgerTransport?: GetLedgerTransport;
+    constructor(blockchainService: BSNeo3, getLedgerTransport?: GetLedgerTransport);
     getAccount(transport: Transport, index: number): Promise<Account>;
     getAccounts(transport: Transport): Promise<Account[]>;
     getSigningCallback(transport: Transport, account: Account): api.SigningFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.4.3",
+  "version": "1.6.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -20,7 +20,7 @@
     "bignumber.js": "^9.1.2",
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
-    "@cityofzion/blockchain-service": "1.4.0",
+    "@cityofzion/blockchain-service": "1.6.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.0"
   },
   "devDependencies": {