@cityofzion/bs-multichain 1.0.8 → 1.0.10

package/dist/features/bridge/Neo3NeoXBridgeOrchestrator.js

@@ -87,9 +87,9 @@ class Neo3NeoXBridgeOrchestrator {
                 if (!__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_availableTokensToUse_get).value)
                     throw new blockchain_service_1.BSError('No available tokens to use', 'NO_AVAILABLE_TOKENS');
                 if (token) {
-                    if (__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value && this.fromService.tokenService.predicate(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value)(token))
+                    if (__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value && this.fromService.tokenService.predicate(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value, token))
                         return;
-                    if (!__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_availableTokensToUse_get).value.some(this.fromService.tokenService.predicate(token)))
+                    if (!__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_availableTokensToUse_get).value.some(currentToken => this.fromService.tokenService.predicate(token, currentToken)))
                         throw new blockchain_service_1.BSError('You are trying to use a token that is not available', 'TOKEN_NOT_AVAILABLE');
                     tokenToReceive = this.toService.neo3NeoXBridgeService.tokens.find(item => token.multichainId === item.multichainId);
                     if (!tokenToReceive)
@@ -150,15 +150,14 @@ class Neo3NeoXBridgeOrchestrator {
         return __awaiter(this, void 0, void 0, function* () {
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_balances, balances, "f");
             const tokenToUseBalance = __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value && balances
-                ? balances === null || balances === void 0 ? void 0 : balances.find(item => this.fromService.tokenService.predicateByHash(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value)(item.token))
+                ? balances === null || balances === void 0 ? void 0 : balances.find(item => this.fromService.tokenService.predicateByHash(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value, item.token))
                 : null;
             __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, {
                 value: tokenToUseBalance,
             }, "a", _Neo3NeoXBridgeOrchestrator_tokenToUseBalance_set);
-            const feeTokenBalance = balances
-                ? balances === null || balances === void 0 ? void 0 : balances.find(item => this.fromService.tokenService.predicateByHash(this.fromService.feeToken)(item.token))
-                : null;
-            __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_feeTokenBalance, feeTokenBalance, "f");
+            __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_feeTokenBalance, balances
+                ? balances === null || balances === void 0 ? void 0 : balances.find(item => this.fromService.tokenService.predicateByHash(this.fromService.feeToken, item.token))
+                : null, "f");
             if (tokenToUseBalance === null || !__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value) {
                 return;
             }
@@ -171,7 +170,7 @@ class Neo3NeoXBridgeOrchestrator {
                 __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, { value: constants.bridgeFee }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
                 const bridgeMaxAmountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(constants.bridgeMaxAmount);
                 const tokenBalanceAmountBn = blockchain_service_1.BSBigNumberHelper.fromNumber((_a = tokenToUseBalance === null || tokenToUseBalance === void 0 ? void 0 : tokenToUseBalance.amount) !== null && _a !== void 0 ? _a : 0);
-                const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken)(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
+                const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken, __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
                 const maxTokenBalanceAmountBn = isFeeToken
                     ? tokenBalanceAmountBn.minus(constants.bridgeFee)
                     : tokenBalanceAmountBn;
@@ -239,7 +238,7 @@ class Neo3NeoXBridgeOrchestrator {
                     __classPrivateFieldSet(this, _Neo3NeoXBridgeOrchestrator_instances, {
                         value: blockchain_service_1.BSBigNumberHelper.format(newBridgeFee, { decimals: this.fromService.feeToken.decimals }),
                     }, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_set);
-                    const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken)(__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
+                    const isFeeToken = this.fromService.tokenService.predicateByHash(this.fromService.feeToken, __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value);
                     if (newBridgeFee.plus(isFeeToken ? amountToUseBn : 0).isGreaterThan((_b = (_a = __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_feeTokenBalance, "f")) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0)) {
                         throw new blockchain_service_1.BSError('You do not have enough fee token balance to cover the bridge fee', 'INSUFFICIENT_FEE_TOKEN_BALANCE');
                     }
@@ -268,14 +267,13 @@ class Neo3NeoXBridgeOrchestrator {
                 !__classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_get).value) {
                 throw new blockchain_service_1.BSError('Required parameters are not set for bridging', 'BRIDGE_NOT_READY');
             }
-            const transaction = yield this.fromService.neo3NeoXBridgeService.bridge({
+            return yield this.fromService.neo3NeoXBridgeService.bridge({
                 account: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_accountToUse_get).value,
                 token: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_tokenToUse_get).value,
                 amount: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_amountToUse_get).value,
                 receiverAddress: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_addressToReceive_get).value,
                 bridgeFee: __classPrivateFieldGet(this, _Neo3NeoXBridgeOrchestrator_instances, "a", _Neo3NeoXBridgeOrchestrator_bridgeFee_get).value,
             });
-            return transaction;
         });
     }
     static wait({ tokenToUse, tokenToReceive, transactionHash, neo3Service, neoXService, }) {

package/dist/features/swap/SimpleSwapApi.js

@@ -224,7 +224,7 @@ _SimpleSwapApi_tickersBySimpleSwapBlockchain = new WeakMap(), _SimpleSwapApi_axi
         blockchainService = options.blockchainServicesByName[blockchain];
         const normalizedHash = hash && blockchainService ? blockchainService.tokenService.normalizeHash(hash) : '';
         const token = blockchainService.tokens.find(item => {
-            if (normalizedHash && blockchainService && blockchainService.tokenService.predicateByHash(item)(normalizedHash))
+            if (normalizedHash && blockchainService && blockchainService.tokenService.predicateByHash(item, normalizedHash))
                 return true;
             const currentLowerCaseSymbol = item.symbol.toLowerCase();
             if (!normalizedHash)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-multichain",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -12,7 +12,7 @@
   "dependencies": {
     "axios": "~1.8.2",
     "lodash": "~4.17.21",
-    "@cityofzion/blockchain-service": "1.21.0"
+    "@cityofzion/blockchain-service": "1.21.1"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",
@@ -27,10 +27,10 @@
     "@types/node": "~22.8.6",
     "@typescript-eslint/eslint-plugin": "~8.12.2",
     "@typescript-eslint/parser": "~8.12.2",
-    "@cityofzion/bs-neo-legacy": "1.13.1",
-    "@cityofzion/bs-ethereum": "2.13.1",
-    "@cityofzion/bs-neox": "1.3.1",
-    "@cityofzion/bs-neo3": "1.16.1"
+    "@cityofzion/bs-neo3": "1.16.2",
+    "@cityofzion/bs-ethereum": "2.13.2",
+    "@cityofzion/bs-neo-legacy": "1.13.2",
+    "@cityofzion/bs-neox": "1.3.3"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",