@cityofzion/blockchain-service 1.21.0 → 1.21.2

package/dist/helpers/BSBigNumberHelper.d.ts

@@ -9,4 +9,5 @@ export declare class BSBigNumberHelper {
     static fromDecimals(value: string | number, decimals?: number): BigNumber;
     static format(value?: string | number | BigNumber, options?: FormatNumberOptions): string;
 }
+export declare const BSBigNumber: typeof BigNumber;
 export {};

package/dist/helpers/BSBigNumberHelper.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BSBigNumberHelper = void 0;
+exports.BSBigNumber = exports.BSBigNumberHelper = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 class BSBigNumberHelper {
     static toDecimals(value, decimals = 0) {
@@ -42,3 +42,4 @@ class BSBigNumberHelper {
     }
 }
 exports.BSBigNumberHelper = BSBigNumberHelper;
+exports.BSBigNumber = bignumber_js_1.default;

package/dist/interfaces.d.ts

@@ -469,9 +469,9 @@ export type TTokenServicePredicateBySymbolParams = string | {
     symbol: string;
 };
 export interface ITokenService {
-    predicate({ hash, symbol }: TTokenServicePredicateParams): (params: TTokenServicePredicateParams) => boolean;
-    predicateByHash(tokenOrHash: TTokenServicePredicateByHashParams): (params: TTokenServicePredicateByHashParams) => boolean;
-    predicateBySymbol(tokenOrSymbol: TTokenServicePredicateBySymbolParams): (params: TTokenServicePredicateBySymbolParams) => boolean;
+    predicate(compareFrom: TTokenServicePredicateParams, compareTo: TTokenServicePredicateParams): boolean;
+    predicateByHash(compareFrom: TTokenServicePredicateByHashParams, compareTo: TTokenServicePredicateByHashParams): boolean;
+    predicateBySymbol(compareFrom: TTokenServicePredicateBySymbolParams, compareTo: TTokenServicePredicateBySymbolParams): boolean;
     normalizeToken<T extends Token | Token[]>(token: T): T;
     normalizeHash(hash: string): string;
 }

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

@@ -40,13 +40,13 @@ class FlamingoForthewinEDS extends CryptoCompareEDS_1.CryptoCompareEDS {
             const { data: flamingoData } = yield __classPrivateFieldGet(this, _FlamingoForthewinEDS_flamingoAxiosInstance, "f").get('/live-data/prices/latest');
             const prices = [];
             const neoToken = tokens.find(({ symbol }) => symbol === 'NEO');
-            if (neoToken && !flamingoData.find(__classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate(neoToken)))
+            if (neoToken && !flamingoData.find(token => __classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate(neoToken, token)))
                 flamingoData.forEach(item => {
                     if (item.symbol === 'bNEO')
                         flamingoData.push(Object.assign(Object.assign({}, item), { symbol: neoToken.symbol, hash: neoToken.hash }));
                 });
             flamingoData.forEach(item => {
-                const token = tokens.find(__classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate(item));
+                const token = tokens.find(currentToken => __classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate(item, currentToken));
                 if (!token)
                     return;
                 prices.push({ usdPrice: item.usd_price, token });
@@ -54,10 +54,10 @@ class FlamingoForthewinEDS extends CryptoCompareEDS_1.CryptoCompareEDS {
             if (tokens.length > prices.length) {
                 const { data: forthewinData } = yield __classPrivateFieldGet(this, _FlamingoForthewinEDS_forthewinAxiosInstance, "f").get('/mainnet/prices');
                 Object.entries(forthewinData).forEach(([hash, usdPrice]) => {
-                    const hasPrice = !!prices.find(({ token }) => __classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate({ hash })(token));
+                    const hasPrice = !!prices.find(({ token }) => __classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicateByHash(hash, token));
                     if (hasPrice)
                         return;
-                    const foundToken = tokens.find(__classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicate({ hash }));
+                    const foundToken = tokens.find(token => __classPrivateFieldGet(this, _FlamingoForthewinEDS_tokenService, "f").predicateByHash(hash, token));
                     if (!foundToken)
                         return;
                     prices.push({ usdPrice, token: foundToken });

package/dist/services/token/TokenService.d.ts

@@ -4,9 +4,9 @@ export type TBSTokenHelperPredicateParams = {
     symbol?: string;
 };
 export declare abstract class TokenService implements ITokenService {
-    predicate({ hash, symbol }: TTokenServicePredicateParams): (params: TTokenServicePredicateParams) => boolean;
-    predicateByHash(tokenOrHash: TTokenServicePredicateByHashParams): (params: TTokenServicePredicateByHashParams) => boolean;
-    predicateBySymbol(tokenOrSymbol: TTokenServicePredicateBySymbolParams): (params: TTokenServicePredicateBySymbolParams) => boolean;
+    predicate(compareFrom: TTokenServicePredicateParams, compareTo: TBSTokenHelperPredicateParams): boolean;
+    predicateByHash(compareFrom: TTokenServicePredicateByHashParams, compareTo: TTokenServicePredicateByHashParams): boolean;
+    predicateBySymbol(compareFrom: TTokenServicePredicateBySymbolParams, compareTo: TTokenServicePredicateBySymbolParams): boolean;
     normalizeToken<T extends Token | Token[]>(token: T): T;
     abstract normalizeHash(hash: string): string;
 }

package/dist/services/token/TokenService.js

@@ -2,29 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenService = void 0;
 class TokenService {
-    predicate({ hash, symbol }) {
-        const normalizedHash = this.normalizeHash(hash);
-        return (params) => {
-            if (normalizedHash === this.normalizeHash(params.hash))
-                return true;
-            if (symbol && params.symbol && symbol.toLowerCase() === params.symbol.toLowerCase())
-                return true;
-            return false;
-        };
+    predicate(compareFrom, compareTo) {
+        if (this.normalizeHash(compareFrom.hash) === this.normalizeHash(compareTo.hash))
+            return true;
+        if (compareFrom.symbol && compareTo.symbol && compareFrom.symbol.toLowerCase() === compareTo.symbol.toLowerCase())
+            return true;
+        return false;
     }
-    predicateByHash(tokenOrHash) {
-        const hash = typeof tokenOrHash === 'string' ? tokenOrHash : tokenOrHash.hash;
-        const normalizedHash = this.normalizeHash(hash);
-        return (params) => normalizedHash === this.normalizeHash(typeof params === 'string' ? params : params.hash);
+    predicateByHash(compareFrom, compareTo) {
+        return (this.normalizeHash(typeof compareFrom === 'string' ? compareFrom : compareFrom.hash) ===
+            this.normalizeHash(typeof compareTo === 'string' ? compareTo : compareTo.hash));
     }
-    predicateBySymbol(tokenOrSymbol) {
-        const symbol = typeof tokenOrSymbol === 'string' ? tokenOrSymbol : tokenOrSymbol.symbol;
+    predicateBySymbol(compareFrom, compareTo) {
+        const symbol = typeof compareFrom === 'string' ? compareFrom : compareFrom.symbol;
         const lowercaseSymbol = symbol.toLowerCase();
-        return (params) => {
-            const tokenSymbol = typeof params === 'string' ? params : params.symbol;
-            const lowercaseTokenSymbol = tokenSymbol.toLowerCase();
-            return lowercaseSymbol === lowercaseTokenSymbol;
-        };
+        const symbolToPredicate = typeof compareTo === 'string' ? compareTo : compareTo.symbol;
+        const lowercaseSymbolToPredicate = symbolToPredicate.toLowerCase();
+        return lowercaseSymbol === lowercaseSymbolToPredicate;
     }
     normalizeToken(token) {
         if (Array.isArray(token)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/blockchain-service",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -16,7 +16,7 @@
     "@typescript-eslint/parser": "^6.5.0",
     "dotenv": "16.3.1",
     "eslint": "^8.48.0",
-    "ts-node": "10.9.1",
+    "ts-node": "~10.9.2",
     "typescript": "4.9.5",
     "typed-emitter": "~2.1.0",
     "jest": "29.6.2",