@cityofzion/bs-neo3 1.16.3 → 1.17.0

package/dist/services/blockchain-data/RpcBDSNeo3.js

@@ -10,32 +10,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcBDSNeo3 = void 0;
-const neon_core_1 = require("@cityofzion/neon-core");
-const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
-const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
+const BSNeo3NeonJsSingletonHelper_1 = require("../../helpers/BSNeo3NeonJsSingletonHelper");
+const BSNeo3NeonDappKitSingletonHelper_1 = require("../../helpers/BSNeo3NeonDappKitSingletonHelper");
 class RpcBDSNeo3 {
-    constructor(network, feeToken, claimToken, tokens, tokenService) {
+    constructor(service) {
+        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 2; // 2 minutes
         this._tokenCache = new Map();
-        this._tokens = [];
-        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 2;
-        this._network = network;
-        this._feeToken = feeToken;
-        this._claimToken = claimToken;
-        this._tokens = tokens;
-        this._tokenService = tokenService;
+        this._service = service;
     }
     getTransaction(hash) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
-                const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
+                const { rpc, u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+                const rpcClient = new rpc.RPCClient(this._service.network.url);
                 const response = yield rpcClient.getRawTransaction(hash, true);
                 return {
                     hash: response.hash,
                     block: response.validuntilblock,
-                    fee: neon_core_1.u.BigInteger.fromNumber((_a = response.netfee) !== null && _a !== void 0 ? _a : 0)
-                        .add(neon_core_1.u.BigInteger.fromNumber((_b = response.sysfee) !== null && _b !== void 0 ? _b : 0))
-                        .toDecimal(this._feeToken.decimals),
+                    fee: u.BigInteger.fromNumber((_a = response.netfee) !== null && _a !== void 0 ? _a : 0)
+                        .add(u.BigInteger.fromNumber((_b = response.sysfee) !== null && _b !== void 0 ? _b : 0))
+                        .toDecimal(this._service.feeToken.decimals),
                     notifications: [],
                     transfers: [],
                     time: response.blocktime,
@@ -65,7 +60,8 @@ class RpcBDSNeo3 {
     getContract(contractHash) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
+                const { rpc } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+                const rpcClient = new rpc.RPCClient(this._service.network.url);
                 const contractState = yield rpcClient.getContractState(contractHash);
                 const methods = contractState.manifest.abi.methods.map(method => ({
                     name: method.name,
@@ -92,12 +88,14 @@ class RpcBDSNeo3 {
                 if (cachedToken) {
                     return cachedToken;
                 }
-                let token = this._tokens.find(currentToken => this._tokenService.predicateByHash(tokenHash, currentToken));
+                let token = this._service.tokens.find(token => this._service.tokenService.predicateByHash(tokenHash, token));
                 if (!token) {
-                    const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
+                    const { rpc, u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+                    const rpcClient = new rpc.RPCClient(this._service.network.url);
                     const contractState = yield rpcClient.getContractState(tokenHash);
-                    const invoker = yield neon_dappkit_1.NeonInvoker.init({
-                        rpcAddress: this._network.url,
+                    const { TypeChecker, NeonInvoker } = BSNeo3NeonDappKitSingletonHelper_1.BSNeo3NeonDappKitSingletonHelper.getInstance();
+                    const invoker = yield NeonInvoker.init({
+                        rpcAddress: this._service.network.url,
                     });
                     const response = yield invoker.testInvoke({
                         invocations: [
@@ -109,13 +107,13 @@ class RpcBDSNeo3 {
                             { scriptHash: tokenHash, operation: 'symbol', args: [] },
                         ],
                     });
-                    if (!neon_dappkit_1.TypeChecker.isStackTypeInteger(response.stack[0]))
+                    if (!TypeChecker.isStackTypeInteger(response.stack[0]))
                         throw new Error('Invalid decimals');
-                    if (!neon_dappkit_1.TypeChecker.isStackTypeByteString(response.stack[1]))
+                    if (!TypeChecker.isStackTypeByteString(response.stack[1]))
                         throw new Error('Invalid symbol');
                     const decimals = Number(response.stack[0].value);
-                    const symbol = neon_core_1.u.base642utf8(response.stack[1].value);
-                    token = this._tokenService.normalizeToken({
+                    const symbol = u.base642utf8(response.stack[1].value);
+                    token = this._service.tokenService.normalizeToken({
                         name: contractState.manifest.name,
                         symbol,
                         hash: contractState.hash,
@@ -132,7 +130,8 @@ class RpcBDSNeo3 {
     }
     getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
+            const { rpc, u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+            const rpcClient = new rpc.RPCClient(this._service.network.url);
             const response = yield rpcClient.getNep17Balances(address);
             const promises = response.balance.map((balance) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
@@ -149,7 +148,7 @@ class RpcBDSNeo3 {
                     // Empty Block
                 }
                 return {
-                    amount: neon_core_1.u.BigInteger.fromNumber(balance.amount).toDecimal((_a = token === null || token === void 0 ? void 0 : token.decimals) !== null && _a !== void 0 ? _a : 8),
+                    amount: u.BigInteger.fromNumber(balance.amount).toDecimal((_a = token === null || token === void 0 ? void 0 : token.decimals) !== null && _a !== void 0 ? _a : 8),
                     token,
                 };
             }));
@@ -158,43 +157,10 @@ class RpcBDSNeo3 {
     }
     getBlockHeight() {
         return __awaiter(this, void 0, void 0, function* () {
-            const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
+            const { rpc } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+            const rpcClient = new rpc.RPCClient(this._service.network.url);
             return yield rpcClient.getBlockCount();
         });
     }
-    getUnclaimed(address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const rpcClient = new neon_core_1.rpc.RPCClient(this._network.url);
-            const response = yield rpcClient.getUnclaimedGas(address);
-            return neon_core_1.u.BigInteger.fromNumber(response).toDecimal(this._claimToken.decimals);
-        });
-    }
-    getRpcList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const list = [];
-            const urls = BSNeo3Helper_1.BSNeo3Helper.getRpcList(this._network);
-            const promises = urls.map(url => {
-                // eslint-disable-next-line no-async-promise-executor
-                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                    const timeout = setTimeout(() => {
-                        resolve();
-                    }, 5000);
-                    try {
-                        const rpcClient = new neon_core_1.rpc.RPCClient(url);
-                        const timeStart = Date.now();
-                        const height = yield rpcClient.getBlockCount();
-                        const latency = Date.now() - timeStart;
-                        list.push({ url, latency, height });
-                    }
-                    finally {
-                        resolve();
-                        clearTimeout(timeout);
-                    }
-                }));
-            });
-            yield Promise.allSettled(promises);
-            return list;
-        });
-    }
 }
 exports.RpcBDSNeo3 = RpcBDSNeo3;

package/dist/services/chaim-data/RpcCDSNeo3.d.ts

@@ -0,0 +1,7 @@
+import { IClaimDataService } from '@cityofzion/blockchain-service';
+import { IBSNeo3 } from '../../types';
+export declare class RpcCDSNeo3<N extends string> implements IClaimDataService {
+    readonly _service: IBSNeo3<N>;
+    constructor(service: IBSNeo3<N>);
+    getUnclaimed(address: string): Promise<string>;
+}

package/dist/services/chaim-data/RpcCDSNeo3.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RpcCDSNeo3 = void 0;
+const BSNeo3NeonJsSingletonHelper_1 = require("../../helpers/BSNeo3NeonJsSingletonHelper");
+class RpcCDSNeo3 {
+    constructor(service) {
+        this._service = service;
+    }
+    getUnclaimed(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { rpc, u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+            const rpcClient = new rpc.RPCClient(this._service.network.url);
+            const response = yield rpcClient.getUnclaimedGas(address);
+            return u.BigInteger.fromNumber(response).toDecimal(this._service.claimToken.decimals);
+        });
+    }
+}
+exports.RpcCDSNeo3 = RpcCDSNeo3;

package/dist/services/exchange-data/FlamingoForthewinEDSNeo3.d.ts

@@ -1,8 +1,7 @@
-import { ExchangeDataService, FlamingoForthewinEDS, GetTokenPriceHistoryParams, GetTokenPricesParams, Network, TokenPricesHistoryResponse, TokenPricesResponse, TokenService } from '@cityofzion/blockchain-service';
-import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
-export declare class FlamingoForthewinEDSNeo3 extends FlamingoForthewinEDS implements ExchangeDataService {
-    #private;
-    constructor(network: Network<BSNeo3NetworkId>, tokenService: TokenService);
-    getTokenPrices(params: GetTokenPricesParams): Promise<TokenPricesResponse[]>;
-    getTokenPriceHistory(params: GetTokenPriceHistoryParams): Promise<TokenPricesHistoryResponse[]>;
+import { FlamingoForthewinEDS, TGetTokenPriceHistoryParams, TGetTokenPricesParams, TTokenPricesHistoryResponse, TTokenPricesResponse } from '@cityofzion/blockchain-service';
+import { IBSNeo3 } from '../../types';
+export declare class FlamingoForthewinEDSNeo3<N extends string> extends FlamingoForthewinEDS<N> {
+    constructor(service: IBSNeo3<N>);
+    getTokenPrices(params: TGetTokenPricesParams): Promise<TTokenPricesResponse[]>;
+    getTokenPriceHistory(params: TGetTokenPriceHistoryParams): Promise<TTokenPricesHistoryResponse[]>;
 }

package/dist/services/exchange-data/FlamingoForthewinEDSNeo3.js

@@ -8,34 +8,20 @@ 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 _FlamingoForthewinEDSNeo3_network;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlamingoForthewinEDSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 class FlamingoForthewinEDSNeo3 extends blockchain_service_1.FlamingoForthewinEDS {
-    constructor(network, tokenService) {
-        super(tokenService);
-        _FlamingoForthewinEDSNeo3_network.set(this, void 0);
-        __classPrivateFieldSet(this, _FlamingoForthewinEDSNeo3_network, network, "f");
+    constructor(service) {
+        super(service);
     }
     getTokenPrices(params) {
         const _super = Object.create(null, {
             getTokenPrices: { get: () => super.getTokenPrices }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_network, "f")))
+            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnetNetwork(this._service.network))
                 throw new Error('Exchange is only available on Mainnet');
             return yield _super.getTokenPrices.call(this, params);
         });
@@ -45,11 +31,10 @@ class FlamingoForthewinEDSNeo3 extends blockchain_service_1.FlamingoForthewinEDS
             getTokenPriceHistory: { get: () => super.getTokenPriceHistory }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnet(__classPrivateFieldGet(this, _FlamingoForthewinEDSNeo3_network, "f")))
+            if (!BSNeo3Helper_1.BSNeo3Helper.isMainnetNetwork(this._service.network))
                 throw new Error('Exchange is only available on Mainnet');
             return yield _super.getTokenPriceHistory.call(this, params);
         });
     }
 }
 exports.FlamingoForthewinEDSNeo3 = FlamingoForthewinEDSNeo3;
-_FlamingoForthewinEDSNeo3_network = new WeakMap();

package/dist/services/explorer/DoraESNeo3.d.ts

@@ -1,11 +1,11 @@
-import { BuildNftUrlParams, ExplorerService, Network, TokenService } from '@cityofzion/blockchain-service';
-import { BSNeo3NetworkId } from '../../constants/BSNeo3Constants';
-export declare class DoraESNeo3 implements ExplorerService {
+import { TBuildNftUrlParams, IExplorerService } from '@cityofzion/blockchain-service';
+import { IBSNeo3 } from '../../types';
+export declare class DoraESNeo3<N extends string> implements IExplorerService {
     #private;
-    constructor(network: Network<BSNeo3NetworkId>, tokenService: TokenService);
+    constructor(service: IBSNeo3<N>);
     buildTransactionUrl(hash: string): string;
     buildContractUrl(contractHash: string): string;
-    buildNftUrl({ collectionHash, tokenHash }: BuildNftUrlParams): string;
+    buildNftUrl({ collectionHash, tokenHash }: TBuildNftUrlParams): string;
     getAddressTemplateUrl(): string | undefined;
     getTxTemplateUrl(): string | undefined;
     getNftTemplateUrl(): string | undefined;

package/dist/services/explorer/DoraESNeo3.js

@@ -10,54 +10,51 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _DoraESNeo3_BASE_URL, _DoraESNeo3_network, _DoraESNeo3_tokenService;
+var _DoraESNeo3_service;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraESNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 class DoraESNeo3 {
-    constructor(network, tokenService) {
-        _DoraESNeo3_BASE_URL.set(this, blockchain_service_1.BSCommonConstants.DORA_URL);
-        _DoraESNeo3_network.set(this, void 0);
-        _DoraESNeo3_tokenService.set(this, void 0);
-        __classPrivateFieldSet(this, _DoraESNeo3_network, network, "f");
-        __classPrivateFieldSet(this, _DoraESNeo3_tokenService, tokenService, "f");
+    constructor(service) {
+        _DoraESNeo3_service.set(this, void 0);
+        __classPrivateFieldSet(this, _DoraESNeo3_service, service, "f");
     }
     buildTransactionUrl(hash) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${__classPrivateFieldGet(this, _DoraESNeo3_tokenService, "f").normalizeHash(hash)}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").tokenService.normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${__classPrivateFieldGet(this, _DoraESNeo3_tokenService, "f").normalizeHash(contractHash)}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").tokenService.normalizeHash(contractHash)}`;
     }
     buildNftUrl({ collectionHash, tokenHash }) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             throw new Error('DoraESNeo3 is only available on mainnet and testnet');
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/${collectionHash}/${tokenHash}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/${collectionHash}/${tokenHash}`;
     }
     getAddressTemplateUrl() {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             return undefined;
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/address/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{address}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/address/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/{address}`;
     }
     getTxTemplateUrl() {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             return undefined;
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{txId}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/transaction/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/{txId}`;
     }
     getNftTemplateUrl() {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             return undefined;
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{collectionHash}/{tokenHash}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/nft/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/{collectionHash}/{tokenHash}`;
     }
     getContractTemplateUrl() {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNet(__classPrivateFieldGet(this, _DoraESNeo3_network, "f")))
+        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network))
             return undefined;
-        return `${__classPrivateFieldGet(this, _DoraESNeo3_BASE_URL, "f")}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_network, "f").id}/{hash}`;
+        return `${blockchain_service_1.BSCommonConstants.DORA_URL}/contract/neo3/${__classPrivateFieldGet(this, _DoraESNeo3_service, "f").network.id}/{hash}`;
     }
 }
 exports.DoraESNeo3 = DoraESNeo3;
-_DoraESNeo3_BASE_URL = new WeakMap(), _DoraESNeo3_network = new WeakMap(), _DoraESNeo3_tokenService = new WeakMap();
+_DoraESNeo3_service = new WeakMap();

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

@@ -1,14 +1,14 @@
-import { Account, GetLedgerTransport, LedgerService, LedgerServiceEmitter, UntilIndexRecord } from '@cityofzion/blockchain-service';
-import { api } from '@cityofzion/neon-js';
+import { TBSAccount, TGetLedgerTransport, ILedgerService, TLedgerServiceEmitter, TUntilIndexRecord } from '@cityofzion/blockchain-service';
 import Transport from '@ledgerhq/hw-transport';
-import { BSNeo3 } from '../../BSNeo3';
-export declare class NeonDappKitLedgerServiceNeo3<BSName extends string = string> implements LedgerService<BSName> {
+import { IBSNeo3 } from '../../types';
+import { api } from '../../helpers/BSNeo3NeonJsSingletonHelper';
+export declare class NeonDappKitLedgerServiceNeo3<N extends string = string> implements ILedgerService<N> {
     #private;
-    emitter: LedgerServiceEmitter;
-    getLedgerTransport?: GetLedgerTransport<BSName>;
-    constructor(blockchainService: BSNeo3<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
+    readonly getLedgerTransport?: TGetLedgerTransport<N>;
+    emitter: TLedgerServiceEmitter;
+    constructor(blockchainService: IBSNeo3<N>, getLedgerTransport?: TGetLedgerTransport<N>);
     verifyAppName(transport: Transport): Promise<boolean>;
-    getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
-    getAccounts(transport: Transport, untilIndexByBlockchainService?: UntilIndexRecord<BSName>): Promise<Account<BSName>[]>;
-    getSigningCallback(transport: Transport, account: Account): api.SigningFunction;
+    getAccount(transport: Transport, index: number): Promise<TBSAccount<N>>;
+    getAccounts(transport: Transport, untilIndexByBlockchainService?: TUntilIndexRecord<N>): Promise<TBSAccount<N>[]>;
+    getSigningCallback(transport: Transport, account: TBSAccount): api.SigningFunction;
 }

package/dist/services/ledger/NeonDappKitLedgerServiceNeo3.js

@@ -22,41 +22,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _NeonDappKitLedgerServiceNeo3_instances, _NeonDappKitLedgerServiceNeo3_blockchainService, _NeonDappKitLedgerServiceNeo3_sendChunk, _NeonDappKitLedgerServiceNeo3_bip44PathToHex, _NeonDappKitLedgerServiceNeo3_derSignatureToHex;
+var _NeonDappKitLedgerServiceNeo3_instances, _NeonDappKitLedgerServiceNeo3_service, _NeonDappKitLedgerServiceNeo3_sendChunk, _NeonDappKitLedgerServiceNeo3_bip44PathToHex, _NeonDappKitLedgerServiceNeo3_derSignatureToHex;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeonDappKitLedgerServiceNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
-const neon_js_1 = require("@cityofzion/neon-js");
 const events_1 = __importDefault(require("events"));
-var LedgerStatus;
-(function (LedgerStatus) {
-    LedgerStatus[LedgerStatus["OK"] = 36864] = "OK";
-})(LedgerStatus || (LedgerStatus = {}));
-var LedgerCommand;
-(function (LedgerCommand) {
-    LedgerCommand[LedgerCommand["GET_APP_NAME"] = 0] = "GET_APP_NAME";
-    LedgerCommand[LedgerCommand["GET_PUBLIC_KEY"] = 4] = "GET_PUBLIC_KEY";
-    LedgerCommand[LedgerCommand["SIGN"] = 2] = "SIGN";
-})(LedgerCommand || (LedgerCommand = {}));
-var LedgerSecondParameter;
-(function (LedgerSecondParameter) {
-    LedgerSecondParameter[LedgerSecondParameter["MORE_DATA"] = 128] = "MORE_DATA";
-    LedgerSecondParameter[LedgerSecondParameter["LAST_DATA"] = 0] = "LAST_DATA";
-})(LedgerSecondParameter || (LedgerSecondParameter = {}));
+const types_1 = require("../../types");
+const BSNeo3NeonJsSingletonHelper_1 = require("../../helpers/BSNeo3NeonJsSingletonHelper");
+const BSNeo3NeonDappKitSingletonHelper_1 = require("../../helpers/BSNeo3NeonDappKitSingletonHelper");
 class NeonDappKitLedgerServiceNeo3 {
     constructor(blockchainService, getLedgerTransport) {
         _NeonDappKitLedgerServiceNeo3_instances.add(this);
-        _NeonDappKitLedgerServiceNeo3_blockchainService.set(this, void 0);
+        _NeonDappKitLedgerServiceNeo3_service.set(this, void 0);
         this.emitter = new events_1.default();
-        __classPrivateFieldSet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, blockchainService, "f");
+        __classPrivateFieldSet(this, _NeonDappKitLedgerServiceNeo3_service, blockchainService, "f");
         this.getLedgerTransport = getLedgerTransport;
     }
     // This verification is necessary because the NEO2 Ledger App also detects NEO3
     verifyAppName(transport) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_APP_NAME, 0x00, LedgerSecondParameter.LAST_DATA, undefined);
+                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.GET_APP_NAME, 0x00, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.LAST_DATA, undefined);
                 const version = response.toString('ascii');
                 const appName = version.substring(0, version.length - 2);
                 if (appName !== 'NEO N3')
@@ -70,53 +56,56 @@ class NeonDappKitLedgerServiceNeo3 {
     }
     getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            const bip44Path = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
+            const bip44Path = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_service, "f").bip44DerivationPath.replace('?', index.toString());
             const bip44PathHex = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_bip44PathToHex).call(this, bip44Path);
             const isNeoN3App = yield this.verifyAppName(transport);
             if (!isNeoN3App)
                 throw new Error('App is not NEO N3');
-            const result = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.GET_PUBLIC_KEY, 0x00, LedgerSecondParameter.LAST_DATA, bip44PathHex);
+            const result = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.GET_PUBLIC_KEY, 0x00, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.LAST_DATA, bip44PathHex);
             const publicKey = result.toString('hex').substring(0, 130);
-            const { address } = new neon_js_1.wallet.Account(publicKey);
+            const { wallet } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+            const { address } = new wallet.Account(publicKey);
             return {
                 address,
                 key: publicKey,
                 type: 'publicKey',
                 bip44Path,
-                blockchain: __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f").name,
+                blockchain: __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_service, "f").name,
                 isHardware: true,
             };
         });
     }
     getAccounts(transport, untilIndexByBlockchainService) {
         return __awaiter(this, void 0, void 0, function* () {
-            const accountsByBlockchainService = yield (0, blockchain_service_1.generateAccountForBlockchainService)([__classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
+            const accountsByBlockchainService = yield (0, blockchain_service_1.generateAccountForBlockchainService)([__classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_service, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
                 return this.getAccount(transport, index);
             }), untilIndexByBlockchainService);
-            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_blockchainService, "f").name);
+            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_service, "f").name);
             return accounts !== null && accounts !== void 0 ? accounts : [];
         });
     }
     getSigningCallback(transport, account) {
-        return (transaction, { witnessIndex, network }) => __awaiter(this, void 0, void 0, function* () {
+        return (transaction_1, _a) => __awaiter(this, [transaction_1, _a], void 0, function* (transaction, { witnessIndex, network }) {
             const isNeoN3App = yield this.verifyAppName(transport);
             if (!isNeoN3App)
                 throw new Error('App is not NEO N3');
             try {
                 this.emitter.emit('getSignatureStart');
                 if (!account.bip44Path) {
-                    throw new Error('Account must have a bip 44 path to sign with Ledger');
+                    throw new Error('TBSAccount must have a bip 44 path to sign with Ledger');
                 }
-                const neonJsAccount = new neon_js_1.wallet.Account(account.key);
-                const witnessScriptHash = neon_js_1.wallet.getScriptHashFromVerificationScript(transaction.witnesses[witnessIndex].verificationScript.toString());
+                const { wallet } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+                const neonJsAccount = new wallet.Account(account.key);
+                const witnessScriptHash = wallet.getScriptHashFromVerificationScript(transaction.witnesses[witnessIndex].verificationScript.toString());
                 if (neonJsAccount.scriptHash !== witnessScriptHash) {
                     throw new Error('Invalid witness script hash');
                 }
                 const bip44PathHex = __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_bip44PathToHex).call(this, account.bip44Path);
                 // Send the BIP44 account as first chunk
-                yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.SIGN, 0, LedgerSecondParameter.MORE_DATA, bip44PathHex);
+                yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.SIGN, 0, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.MORE_DATA, bip44PathHex);
+                const { NeonParser } = BSNeo3NeonDappKitSingletonHelper_1.BSNeo3NeonDappKitSingletonHelper.getInstance();
                 // Send the network magic as second chunk
-                yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.SIGN, 1, LedgerSecondParameter.MORE_DATA, neon_dappkit_1.NeonParser.numToHex(network, 4, true));
+                yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.SIGN, 1, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.MORE_DATA, NeonParser.numToHex(network, 4, true));
                 const serializedTransaction = transaction.serialize(false);
                 // Split the serialized transaction into chunks of 510 bytes
                 const chunks = serializedTransaction.match(/.{1,510}/g) || [];
@@ -124,12 +113,12 @@ class NeonDappKitLedgerServiceNeo3 {
                 for (let i = 0; i < chunks.length - 1; i++) {
                     // We plus 2 because we already sent 2 chunks before
                     const commandIndex = 2 + i;
-                    yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.SIGN, commandIndex, LedgerSecondParameter.MORE_DATA, chunks[i]);
+                    yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.SIGN, commandIndex, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.MORE_DATA, chunks[i]);
                 }
                 // Again, we plus 2 because we already sent 2 chunks before getting the chunks
                 const lastChunkIndex = 2 + chunks.length;
                 // Send the last chunk signaling that it is the last one and get the signature
-                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, LedgerCommand.SIGN, lastChunkIndex, LedgerSecondParameter.LAST_DATA, chunks[chunks.length - 1]);
+                const response = yield __classPrivateFieldGet(this, _NeonDappKitLedgerServiceNeo3_instances, "m", _NeonDappKitLedgerServiceNeo3_sendChunk).call(this, transport, types_1.ENeonDappKitLedgerServiceNeo3Command.SIGN, lastChunkIndex, types_1.ENeonDappKitLedgerServiceNeo3SecondParameter.LAST_DATA, chunks[chunks.length - 1]);
                 if (response.length <= 2) {
                     throw new Error('Invalid signature returned from Ledger');
                 }
@@ -142,9 +131,9 @@ class NeonDappKitLedgerServiceNeo3 {
     }
 }
 exports.NeonDappKitLedgerServiceNeo3 = NeonDappKitLedgerServiceNeo3;
-_NeonDappKitLedgerServiceNeo3_blockchainService = new WeakMap(), _NeonDappKitLedgerServiceNeo3_instances = new WeakSet(), _NeonDappKitLedgerServiceNeo3_sendChunk = function _NeonDappKitLedgerServiceNeo3_sendChunk(transport, command, commandIndex, secondParameter, chunk) {
+_NeonDappKitLedgerServiceNeo3_service = new WeakMap(), _NeonDappKitLedgerServiceNeo3_instances = new WeakSet(), _NeonDappKitLedgerServiceNeo3_sendChunk = function _NeonDappKitLedgerServiceNeo3_sendChunk(transport, command, commandIndex, secondParameter, chunk) {
     return transport.send(0x80, command, commandIndex, secondParameter, chunk ? Buffer.from(chunk, 'hex') : undefined, [
-        LedgerStatus.OK,
+        types_1.ENeonDappKitLedgerServiceNeo3Status.OK,
     ]);
 }, _NeonDappKitLedgerServiceNeo3_bip44PathToHex = function _NeonDappKitLedgerServiceNeo3_bip44PathToHex(path) {
     let result = '';
@@ -161,7 +150,8 @@ _NeonDappKitLedgerServiceNeo3_blockchainService = new WeakMap(), _NeonDappKitLed
     });
     return result;
 }, _NeonDappKitLedgerServiceNeo3_derSignatureToHex = function _NeonDappKitLedgerServiceNeo3_derSignatureToHex(response) {
-    const ss = new neon_js_1.u.StringStream(response);
+    const { u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
+    const ss = new u.StringStream(response);
     // The first byte is format. It is usually 0x30 (SEQ) or 0x31 (SET)
     // The second byte represents the total length of the DER module.
     ss.read(2);

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.d.ts

@@ -1,13 +1,14 @@
 import { INeo3NeoXBridgeService, TBridgeToken, TNeo3NeoXBridgeServiceBridgeParam, TNeo3NeoXBridgeServiceConstants, TNeo3NeoXBridgeServiceGetNonceParams, TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams } from '@cityofzion/blockchain-service';
-import { BSNeo3 } from '../../BSNeo3';
-export declare class Neo3NeoXBridgeService<BSName extends string = string> implements INeo3NeoXBridgeService<BSName> {
+import { IBSNeo3 } from '../../types';
+export declare class Neo3NeoXBridgeService<N extends string> implements INeo3NeoXBridgeService<N> {
     #private;
-    readonly BRIDGE_SCRIPT_HASH = "0xbb19cfc864b73159277e1fd39694b3fd5fc613d2";
-    tokens: TBridgeToken<BSName>[];
-    constructor(service: BSNeo3<BSName>);
+    static readonly BRIDGE_SCRIPT_HASH: string;
+    readonly gasToken: TBridgeToken<N>;
+    readonly neoToken: TBridgeToken<N>;
+    constructor(service: IBSNeo3<N>);
     getApprovalFee(): Promise<string>;
-    getBridgeConstants(token: TBridgeToken<BSName>): Promise<TNeo3NeoXBridgeServiceConstants>;
-    bridge(params: TNeo3NeoXBridgeServiceBridgeParam<BSName>): Promise<string>;
-    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<BSName>): Promise<string>;
-    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<BSName>): Promise<string>;
+    getBridgeConstants(token: TBridgeToken<N>): Promise<TNeo3NeoXBridgeServiceConstants>;
+    bridge(params: TNeo3NeoXBridgeServiceBridgeParam<N>): Promise<string>;
+    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<N>): Promise<string>;
+    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<N>): Promise<string>;
 }