@cityofzion/blockchain-service 1.18.0 → 1.18.2

package/dist/functions.d.ts

@@ -24,6 +24,4 @@ type NormalizedHashOptions = {
 };
 export declare function normalizeHash(hash: string, options?: NormalizedHashOptions): string;
 export declare function denormalizeHash(hash: string): string;
-export declare function countDecimals(value: string | number): number;
-export declare function formatNumber(value?: string | number, decimals?: number): string;
 export {};

package/dist/functions.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatNumber = exports.countDecimals = exports.denormalizeHash = exports.normalizeHash = exports.generateAccountForBlockchainService = exports.generateAccount = exports.fetchAccounts = exports.waitForAccountTransaction = exports.waitForTransaction = exports.wait = exports.hasLedger = exports.hasExplorerService = exports.hasNft = exports.isCalculableFee = exports.isClaimable = exports.hasNameService = void 0;
+exports.denormalizeHash = exports.normalizeHash = exports.generateAccountForBlockchainService = exports.generateAccount = exports.fetchAccounts = exports.waitForAccountTransaction = exports.waitForTransaction = exports.wait = exports.hasLedger = exports.hasExplorerService = exports.hasNft = exports.isCalculableFee = exports.isClaimable = exports.hasNameService = void 0;
 function hasNameService(service) {
     return 'resolveNameServiceDomain' in service && 'validateNameServiceDomainFormat' in service;
 }
@@ -51,7 +51,7 @@ function waitForTransaction(service, txId) {
                 yield service.blockchainDataService.getTransaction(txId);
                 return true;
             }
-            catch (_b) {
+            catch (_a) {
                 // Empty block
             }
             attempts++;
@@ -73,7 +73,7 @@ function waitForAccountTransaction(params) {
                 if (isTransactionConfirmed)
                     return true;
             }
-            catch (_b) {
+            catch (_a) {
                 // Empty block
             }
             attempts++;
@@ -96,7 +96,7 @@ function fetchAccounts(blockchainServices, initialIndex, getAccountCallback) {
                 if (!transactions || transactions.length <= 0)
                     shouldBreak = true;
             }
-            catch (_b) {
+            catch (_a) {
                 shouldBreak = true;
             }
             accounts.push(generatedAccount);
@@ -123,9 +123,9 @@ function generateAccountForBlockchainService(blockchainServices, getAccountCallb
     return __awaiter(this, void 0, void 0, function* () {
         const accountsByBlockchainService = new Map();
         const promises = blockchainServices.map((service) => __awaiter(this, void 0, void 0, function* () {
-            var _b;
+            var _a;
             const firstAccount = yield getAccountCallback(service, 0);
-            const untilIndex = (_b = untilIndexByBlockchainService === null || untilIndexByBlockchainService === void 0 ? void 0 : untilIndexByBlockchainService[service.name]) === null || _b === void 0 ? void 0 : _b[firstAccount.address];
+            const untilIndex = (_a = untilIndexByBlockchainService === null || untilIndexByBlockchainService === void 0 ? void 0 : untilIndexByBlockchainService[service.name]) === null || _a === void 0 ? void 0 : _a[firstAccount.address];
             if (untilIndex === undefined) {
                 const accounts = yield fetchAccounts(service, 1, getAccountCallback);
                 accountsByBlockchainService.set(service.name, [firstAccount, ...accounts]);
@@ -152,29 +152,3 @@ function denormalizeHash(hash) {
     return hash.startsWith('0x') ? hash : `0x${hash}`;
 }
 exports.denormalizeHash = denormalizeHash;
-function countDecimals(value) {
-    var _b;
-    const [, decimals] = value.toString().split('.');
-    return (_b = decimals === null || decimals === void 0 ? void 0 : decimals.length) !== null && _b !== void 0 ? _b : 0;
-}
-exports.countDecimals = countDecimals;
-function formatNumber(value, decimals = 0) {
-    if (!value)
-        return '0';
-    let newValue = typeof value === 'number' ? value.toFixed(decimals) : value;
-    newValue = newValue.replace(/,|\.\.|\.,/g, '.');
-    if (decimals === 0) {
-        newValue = newValue.split('.')[0];
-    }
-    else {
-        newValue = newValue.replace(/[^\d.]/g, '');
-        const countedDecimals = countDecimals(newValue);
-        if (countedDecimals > decimals) {
-            newValue = newValue.slice(0, newValue.length - countedDecimals + decimals);
-        }
-    }
-    return newValue.replace(/\s|-/g, '').replace(/^([^.]*\.)(.*)$/, function (_a, b, c) {
-        return b + c.replace(/\./g, '');
-    });
-}
-exports.formatNumber = formatNumber;

package/dist/helpers/BSNumberHelper.d.ts

@@ -0,0 +1,16 @@
+type FormatNumberOptions = {
+    decimals?: number;
+    shouldRemoveLeadingZero?: boolean;
+    shouldRemoveTrailingZero?: boolean;
+};
+export declare class BSNumberHelper {
+    static readonly sciNotationRegex: RegExp;
+    static countDecimals(value: string | number): number;
+    static sanitizeCommasAndDotsInNumber(value: string): string;
+    static isSciNotationValue(value: string): boolean;
+    static convertSciNotationValueToString(value: number): string;
+    static removeLeadingZero(value: string): string;
+    static removeTrailingZero(value: string): string;
+    static formatNumber(value?: string | number, options?: FormatNumberOptions): string;
+}
+export {};

package/dist/helpers/BSNumberHelper.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BSNumberHelper = void 0;
+class BSNumberHelper {
+    static countDecimals(value) {
+        var _b;
+        const [, decimals] = value.toString().split('.');
+        return (_b = decimals === null || decimals === void 0 ? void 0 : decimals.length) !== null && _b !== void 0 ? _b : 0;
+    }
+    static sanitizeCommasAndDotsInNumber(value) {
+        let newValue = value.replace(/,|\.\.|\.,|,,/g, '.');
+        const parts = newValue.split('.');
+        if (parts.length > 2)
+            newValue = `${parts[0]}.${parts.slice(1).join('')}`;
+        return newValue;
+    }
+    static isSciNotationValue(value) {
+        return BSNumberHelper.sciNotationRegex.test(value);
+    }
+    static convertSciNotationValueToString(value) {
+        if (Math.abs(value) < 1.0) {
+            const parts = value.toString().split('e-');
+            const hasNegativeExponent = parts.length === 2;
+            if (hasNegativeExponent) {
+                const negativeExponent = parseInt(parts[1], 10);
+                value *= Math.pow(10, negativeExponent - 1);
+                return `0.${'0'.repeat(negativeExponent - 1)}${value.toString().substring(2)}`;
+            }
+        }
+        return value.toString();
+    }
+    static removeLeadingZero(value) {
+        return value.replace(/^0+(?!\.)/, '') || '0';
+    }
+    static removeTrailingZero(value) {
+        return value.replace(/(\.\d*?[1-9])0+$/g, '$1').replace(/\.0+$/, '');
+    }
+    static formatNumber(value, options) {
+        if (!value)
+            return '0';
+        const { decimals = 0, shouldRemoveLeadingZero = true, shouldRemoveTrailingZero = true } = options !== null && options !== void 0 ? options : {};
+        let newValue = typeof value === 'number' ? value.toString() : value.trim();
+        newValue = BSNumberHelper.sanitizeCommasAndDotsInNumber(newValue);
+        const newValueAsNumber = Number(newValue);
+        if (isNaN(newValueAsNumber))
+            return '0';
+        const isNegativeValue = newValue.startsWith('-');
+        if (BSNumberHelper.isSciNotationValue(newValue))
+            newValue = BSNumberHelper.convertSciNotationValueToString(newValueAsNumber);
+        if (decimals === 0)
+            newValue = newValue.split('.')[0];
+        else {
+            newValue = newValue.replace(/[^\d.]/g, '');
+            const countedDecimals = BSNumberHelper.countDecimals(newValue);
+            if (countedDecimals > decimals)
+                newValue = newValue.slice(0, newValue.length - countedDecimals + decimals);
+        }
+        newValue = newValue.replace(/\s|-/g, '').replace(/^([^.]*\.)(.*)$/, (_a, b, c) => b + c.replace(/\./g, ''));
+        if (shouldRemoveLeadingZero)
+            newValue = BSNumberHelper.removeLeadingZero(newValue);
+        if (shouldRemoveTrailingZero)
+            newValue = BSNumberHelper.removeTrailingZero(newValue);
+        if (newValue.startsWith('.'))
+            newValue = `0${newValue}`;
+        if (newValue.endsWith('.'))
+            newValue = newValue.slice(0, newValue.length - 1);
+        if (!newValue)
+            newValue = '0';
+        if (newValue !== '0' && isNegativeValue)
+            newValue = `-${newValue}`;
+        return newValue;
+    }
+}
+exports.BSNumberHelper = BSNumberHelper;
+BSNumberHelper.sciNotationRegex = /^[+-]?\d+(\.\d+)?e[+-]?\d+$/i;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from './constants/BSCommonConstants';
 export * from './helpers/BSFullTransactionsByAddressHelper';
 export * from './helpers/BSPromisesHelper';
+export * from './helpers/BSNumberHelper';
 export * from './services/exchange-data/CryptoCompareEDS';
 export * from './services/exchange-data/FlamingoForthewinEDS';
 export * from './BSAggregator';

package/dist/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants/BSCommonConstants"), exports);
 __exportStar(require("./helpers/BSFullTransactionsByAddressHelper"), exports);
 __exportStar(require("./helpers/BSPromisesHelper"), exports);
+__exportStar(require("./helpers/BSNumberHelper"), exports);
 __exportStar(require("./services/exchange-data/CryptoCompareEDS"), exports);
 __exportStar(require("./services/exchange-data/FlamingoForthewinEDS"), exports);
 __exportStar(require("./BSAggregator"), exports);

package/dist/interfaces.d.ts

@@ -76,12 +76,17 @@ export interface BSWithLedger<BSName extends string = string> {
     ledgerService: LedgerService<BSName>;
     generateAccountFromPublicKey(publicKey: string): Account<BSName>;
 }
+export type TransactionNotificationTypedResponse = {
+    type: string;
+    value?: string;
+};
+export type TransactionNotificationStateResponse = {
+    type: string;
+    value?: string | TransactionNotificationTypedResponse[];
+};
 export type TransactionNotifications = {
     eventName: string;
-    state: {
-        type: string;
-        value: string;
-    }[];
+    state?: TransactionNotificationStateResponse | TransactionNotificationStateResponse[];
 };
 export type TransactionTransferAsset = {
     amount: string;
@@ -132,7 +137,7 @@ export type ExportTransactionsByAddressParams = {
 };
 export type FullTransactionNftEvent = {
     eventType: 'nft';
-    amount: string;
+    amount?: string;
     methodName: string;
     hash: string;
     hashUrl?: string;
@@ -149,7 +154,7 @@ export type FullTransactionNftEvent = {
 };
 export type FullTransactionAssetEvent = {
     eventType: 'token';
-    amount: string;
+    amount?: string;
     methodName: string;
     hash: string;
     hashUrl?: string;
@@ -167,8 +172,8 @@ export type FullTransactionsItem = {
     date: string;
     invocationCount: number;
     notificationCount: number;
-    networkFeeAmount: string;
-    systemFeeAmount: string;
+    networkFeeAmount?: string;
+    systemFeeAmount?: string;
     events: (FullTransactionAssetEvent | FullTransactionNftEvent)[];
 };
 export type FullTransactionsByAddressResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/blockchain-service",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -11,12 +11,16 @@
   ],
   "devDependencies": {
     "@types/node": "~20.2.5",
+    "@types/jest": "29.5.3",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
+    "dotenv": "16.3.1",
     "eslint": "^8.48.0",
     "ts-node": "10.9.1",
     "typescript": "4.9.5",
-    "typed-emitter": "~2.1.0"
+    "typed-emitter": "~2.1.0",
+    "jest": "29.6.2",
+    "ts-jest": "29.1.1"
   },
   "dependencies": {
     "@ledgerhq/hw-transport": "~6.30.5",
@@ -24,7 +28,8 @@
     "date-fns": "~4.1.0"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --project tsconfig.build.json",
+    "test": "jest --config jest.config.ts",
     "lint": "eslint .",
     "format": "eslint --fix"
   }