@cityofzion/blockchain-service 1.19.2 → 1.20.0

package/dist/helpers/BSUtilsHelper.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSUtilsHelper = void 0;
+const error_1 = require("../error");
 class BSUtilsHelper {
     static wait(ms) {
         return new Promise(resolve => setTimeout(resolve, ms));
@@ -18,19 +19,21 @@ class BSUtilsHelper {
         const { retries = 50, delay = 100, shouldRetry } = options || {};
         // eslint-disable-next-line no-async-promise-executor
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            let errorMessage = '';
             for (let i = 0; i < retries; i++) {
                 try {
                     const result = yield callback();
                     return resolve(result);
                 }
                 catch (error) {
+                    errorMessage = error.message;
                     if (shouldRetry && !shouldRetry(error)) {
                         return reject(error);
                     }
                 }
                 yield this.wait(delay);
             }
-            return reject(new Error('timeout'));
+            return reject(new error_1.BSError('Timeout: ' + errorMessage, 'TIMEOUT'));
         }));
     }
 }

package/dist/interfaces.d.ts

@@ -104,6 +104,17 @@ export type TransactionTransferNft = {
     type: 'nft';
     contractHash: string;
 };
+type TransactionDefaultResponse = {
+    type: 'default';
+};
+export type TransactionBridgeNeo3NeoXResponse = {
+    type: 'bridgeNeo3NeoX';
+    data: {
+        amount: string;
+        token: Token;
+        receiverAddress: string;
+    };
+};
 export type TransactionResponse = {
     hash: string;
     block: number;
@@ -111,7 +122,7 @@ export type TransactionResponse = {
     transfers: (TransactionTransferAsset | TransactionTransferNft)[];
     fee?: string;
     notifications: TransactionNotifications[];
-};
+} & (TransactionDefaultResponse | TransactionBridgeNeo3NeoXResponse);
 export type ContractParameter = {
     name: string;
     type: string;
@@ -166,6 +177,17 @@ export type FullTransactionAssetEvent = {
     token?: Token;
     tokenType: 'generic' | (string & NonNullable<unknown>);
 };
+type FullTransactionsItemDefault = {
+    type: 'default';
+};
+export type FullTransactionsItemBridgeNeo3NeoX = {
+    type: 'bridgeNeo3NeoX';
+    data: {
+        amount: string;
+        token: Token;
+        receiverAddress: string;
+    };
+};
 export type FullTransactionsItem = {
     txId: string;
     txIdUrl?: string;
@@ -176,7 +198,7 @@ export type FullTransactionsItem = {
     networkFeeAmount?: string;
     systemFeeAmount?: string;
     events: (FullTransactionAssetEvent | FullTransactionNftEvent)[];
-};
+} & (FullTransactionsItemDefault | FullTransactionsItemBridgeNeo3NeoX);
 export type FullTransactionsByAddressResponse = {
     nextCursor?: string;
     data: FullTransactionsItem[];
@@ -360,8 +382,9 @@ export interface ISwapOrchestrator<BSName extends string = string> {
     swap(): Promise<TSwapResult>;
     calculateFee(): Promise<string>;
 }
-export type TBridgeToken = Token & {
+export type TBridgeToken<BSName extends string = string> = Token & {
     multichainId: string;
+    blockchain: BSName;
 };
 export type TBridgeValue<T> = {
     value: T | null;
@@ -376,24 +399,23 @@ export type TBridgeOrchestratorEvents<BSName extends string = string> = {
     amountToUse: (amount: TBridgeValidateValue<string>) => void | Promise<void>;
     amountToUseMin: (max: TBridgeValue<string>) => void | Promise<void>;
     amountToUseMax: (max: TBridgeValue<string>) => void | Promise<void>;
-    tokenToUse: (token: TBridgeValue<TBridgeToken>) => void | Promise<void>;
-    availableTokensToUse: (tokens: TBridgeValue<TBridgeToken[]>) => void | Promise<void>;
+    tokenToUse: (token: TBridgeValue<TBridgeToken<BSName>>) => void | Promise<void>;
+    availableTokensToUse: (tokens: TBridgeValue<TBridgeToken<BSName>[]>) => void | Promise<void>;
     addressToReceive: (account: TBridgeValidateValue<string>) => void | Promise<void>;
     amountToReceive: (amount: TBridgeValue<string>) => void | Promise<void>;
-    tokenToReceive: (token: TBridgeValue<TBridgeToken>) => void | Promise<void>;
+    tokenToReceive: (token: TBridgeValue<TBridgeToken<BSName>>) => void | Promise<void>;
     tokenToUseBalance: (balance: TBridgeValue<BalanceResponse | undefined>) => void | Promise<void>;
     bridgeFee: (fee: TBridgeValue<string>) => void | Promise<void>;
 };
 export interface IBridgeOrchestrator<BSName extends string = string> {
     eventEmitter: TypedEmitter<TBridgeOrchestratorEvents<BSName>>;
-    setTokenToUse(token: TBridgeToken | null): Promise<void>;
+    setTokenToUse(token: TBridgeToken<BSName> | null): Promise<void>;
     setAccountToUse(account: Account<BSName> | null): Promise<void>;
     setAmountToUse(amount: string | null): Promise<void>;
     setAddressToReceive(address: string | null): Promise<void>;
     setBalances(balances: BalanceResponse[] | null): Promise<void>;
     switchTokens(): Promise<void>;
     bridge(): Promise<string>;
-    wait(): Promise<boolean>;
 }
 export interface IBSWithNeo3NeoXBridge<BSName extends string = string> {
     neo3NeoXBridgeService: INeo3NeoXBridgeService<BSName>;
@@ -407,27 +429,28 @@ export type TNeo3NeoXBridgeServiceBridgeParam<BSName extends string = string> =
     account: Account<BSName>;
     receiverAddress: string;
     amount: string;
-    token: TBridgeToken;
+    token: TBridgeToken<BSName>;
     bridgeFee: string;
 };
 export type TNeo3NeoXBridgeServiceGetApprovalParam<BSName extends string = string> = {
     account: Account<BSName>;
     amount: string;
-    token: TBridgeToken;
+    token: TBridgeToken<BSName>;
 };
-export type TNeo3NeoXBridgeServiceGetNonceParams = {
-    token: TBridgeToken;
+export type TNeo3NeoXBridgeServiceGetNonceParams<BSName extends string = string> = {
+    token: TBridgeToken<BSName>;
     transactionHash: string;
 };
-export type TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams = {
-    token: TBridgeToken;
+export type TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<BSName extends string = string> = {
+    token: TBridgeToken<BSName>;
     nonce: string;
 };
 export interface INeo3NeoXBridgeService<BSName extends string = string> {
-    tokens: TBridgeToken[];
+    tokens: TBridgeToken<BSName>[];
     getApprovalFee(params: TNeo3NeoXBridgeServiceGetApprovalParam): Promise<string>;
     getBridgeConstants(token: TBridgeToken): Promise<TNeo3NeoXBridgeServiceConstants>;
     bridge(params: TNeo3NeoXBridgeServiceBridgeParam<BSName>): Promise<string>;
-    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams): Promise<string | null>;
-    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams): Promise<string | null>;
+    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<BSName>): Promise<string>;
+    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<BSName>): Promise<string>;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/blockchain-service",
-  "version": "1.19.2",
+  "version": "1.20.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",