@cityofzion/bs-multichain 3.0.6 → 3.1.1

package/dist/features/swap/SimpleSwapApi.js

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _SimpleSwapApi_instances, _SimpleSwapApi_tickersBySimpleSwapBlockchain, _SimpleSwapApi_apiInstance, _SimpleSwapApi_allCurrenciesMap, _SimpleSwapApi_api_get, _SimpleSwapApi_createAddressTemplateUrl, _SimpleSwapApi_createTxTemplateUrl, _SimpleSwapApi_getTokenFromCurrency;
+var _SimpleSwapApi_instances, _SimpleSwapApi_tickersBySimpleSwapBlockchain, _SimpleSwapApi_apiInstance, _SimpleSwapApi_allCurrenciesMap, _SimpleSwapApi_api_get, _SimpleSwapApi_createAddressTemplateUrl, _SimpleSwapApi_createTransactionTemplateUrl, _SimpleSwapApi_getTokenFromCurrency;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleSwapApi = void 0;
 const axios_1 = __importDefault(require("axios"));
@@ -174,10 +174,10 @@ _SimpleSwapApi_tickersBySimpleSwapBlockchain = new WeakMap(), _SimpleSwapApi_api
     if (blockchainService && (0, blockchain_service_1.hasExplorerService)(blockchainService))
         return blockchainService.explorerService.getAddressTemplateUrl() || explorer;
     return explorer;
-}, _SimpleSwapApi_createTxTemplateUrl = function _SimpleSwapApi_createTxTemplateUrl(blockchainService, explorer) {
+}, _SimpleSwapApi_createTransactionTemplateUrl = function _SimpleSwapApi_createTransactionTemplateUrl(blockchainService, explorer) {
     explorer = !explorer ? undefined : explorer.replace('{}', '{txId}');
     if (blockchainService && (0, blockchain_service_1.hasExplorerService)(blockchainService))
-        return blockchainService.explorerService.getTxTemplateUrl() ?? explorer;
+        return blockchainService.explorerService.getTransactionTemplateUrl() ?? explorer;
     return explorer;
 }, _SimpleSwapApi_getTokenFromCurrency = function _SimpleSwapApi_getTokenFromCurrency(currency, options) {
     const { network: simpleSwapBlockchain, ticker, precision } = currency;
@@ -226,7 +226,7 @@ _SimpleSwapApi_tickersBySimpleSwapBlockchain = new WeakMap(), _SimpleSwapApi_api
         validationExtra: currency.validationExtra,
         validationAddress: currency.validationAddress,
         addressTemplateUrl: __classPrivateFieldGet(this, _SimpleSwapApi_instances, "m", _SimpleSwapApi_createAddressTemplateUrl).call(this, blockchainService, currency.addressExplorer),
-        txTemplateUrl: __classPrivateFieldGet(this, _SimpleSwapApi_instances, "m", _SimpleSwapApi_createTxTemplateUrl).call(this, blockchainService, currency.txExplorer),
+        txTemplateUrl: __classPrivateFieldGet(this, _SimpleSwapApi_instances, "m", _SimpleSwapApi_createTransactionTemplateUrl).call(this, blockchainService, currency.txExplorer),
         blockchain,
     };
 };

package/dist/features/swap/SimpleSwapOrchestrator.d.ts

@@ -1,4 +1,4 @@
-import { type TBSAccount, type ISwapOrchestrator, type TSwapOrchestratorEvents, type TSwapResult, type TSwapToken } from '@cityofzion/blockchain-service';
+import { type TBSAccount, type ISwapOrchestrator, type TSwapOrchestratorEvents, type TSwapResponse, type TSwapToken } from '@cityofzion/blockchain-service';
 import TypedEmitter from 'typed-emitter';
 import type { TSimpleSwapOrchestratorInitParams } from './types';
 export declare class SimpleSwapOrchestrator<N extends string = string> implements ISwapOrchestrator<N> {
@@ -12,6 +12,6 @@ export declare class SimpleSwapOrchestrator<N extends string = string> implement
     setTokenToReceive(token: TSwapToken<N> | null): Promise<void>;
     setAddressToReceive(address: string | null): Promise<void>;
     setExtraIdToReceive(extraIdToReceive: string | null): Promise<void>;
-    swap(): Promise<TSwapResult>;
+    swap(): Promise<TSwapResponse<N>>;
     calculateFee(): Promise<string>;
 }

package/dist/features/swap/SimpleSwapOrchestrator.js

@@ -147,11 +147,11 @@ class SimpleSwapOrchestrator {
             isNaN(__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value.decimals) ||
             (__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToReceive_get).value.hasExtraId &&
                 (!__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_extraIdToReceive_get).valid || !__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_extraIdToReceive_get).value?.trim()))) {
-            throw new Error('Not all required fields are set');
+            throw new blockchain_service_1.BSError('Not all required fields are set', 'MISSING_REQUIRED_FIELDS');
         }
-        const result = {
+        const response = {
             id: '',
-            txFrom: undefined,
+            transaction: undefined,
             log: undefined,
         };
         try {
@@ -163,10 +163,11 @@ class SimpleSwapOrchestrator {
                 address: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_addressToReceive_get).value,
                 extraIdToReceive: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_extraIdToReceive_get).value,
             });
-            result.id = id;
-            result.log = log;
+            response.id = id;
+            response.log = log;
             const service = __classPrivateFieldGet(this, _SimpleSwapOrchestrator_blockchainServicesByName, "f")[__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_accountToUse_get).value.blockchain];
-            const [transactionHash] = await service.transfer({
+            // It'll always return one transaction because it has just one intent
+            const [transaction] = await service.transfer({
                 senderAccount: __classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_accountToUse_get).value,
                 intents: [
                     {
@@ -181,12 +182,12 @@ class SimpleSwapOrchestrator {
                     },
                 ],
             });
-            result.txFrom = transactionHash;
+            response.transaction = transaction;
         }
         catch {
             // empty
         }
-        return result;
+        return response;
     }
     async calculateFee() {
         if (!__classPrivateFieldGet(this, _SimpleSwapOrchestrator_instances, "a", _SimpleSwapOrchestrator_tokenToUse_get).value ||

package/dist/features/swap/SimpleSwapService.d.ts

@@ -1,5 +1,5 @@
 import type { ISwapService, TSwapServiceStatusResponse } from '@cityofzion/blockchain-service';
-export declare class SimpleSwapService<BSName extends string = string> implements ISwapService {
+export declare class SimpleSwapService<N extends string = string> implements ISwapService {
     #private;
     constructor();
     getStatus(id: string): Promise<TSwapServiceStatusResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-multichain",
-  "version": "3.0.6",
+  "version": "3.1.1",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -13,19 +13,19 @@
     "@walletconnect/utils": "~2.21.9",
     "@walletconnect/jsonrpc-utils": "~1.0.8",
     "axios": "~1.13.5",
-    "@cityofzion/blockchain-service": "3.0.6"
+    "@cityofzion/blockchain-service": "3.1.1"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
     "@walletconnect/types": "~2.21.9",
     "dotenv": "~17.3.1",
-    "eslint": "~9.36.0",
+    "eslint": "~9.37.0",
     "typed-emitter": "~2.1.0",
     "typescript": "~5.9.2",
     "vitest": "~4.0.18",
-    "@cityofzion/bs-neo3": "3.0.6",
-    "@cityofzion/bs-neox": "3.0.6",
-    "@cityofzion/bs-ethereum": "3.0.6"
+    "@cityofzion/bs-ethereum": "3.1.1",
+    "@cityofzion/bs-neox": "3.1.1",
+    "@cityofzion/bs-neo3": "3.1.1"
   },
   "scripts": {
     "build": "rm -rf ./dist && npm run typecheck && tsc --project tsconfig.build.json",