@shapeshiftoss/unchained-client 9.0.3 → 9.2.0

package/dist/generated/avalanche/common.js

@@ -0,0 +1,137 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * @shapeshiftoss/avalanche-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 7.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRequestFunction = exports.toPathString = exports.serializeDataIfNeeded = exports.setSearchParams = exports.setOAuthToObject = exports.setBearerAuthToObject = exports.setBasicAuthToObject = exports.setApiKeyToObject = exports.assertParamExists = exports.DUMMY_BASE_URL = void 0;
+const base_1 = require("./base");
+/**
+ *
+ * @export
+ */
+exports.DUMMY_BASE_URL = 'https://example.com';
+/**
+ *
+ * @throws {RequiredError}
+ * @export
+ */
+const assertParamExists = function (functionName, paramName, paramValue) {
+    if (paramValue === null || paramValue === undefined) {
+        throw new base_1.RequiredError(paramName, `Required parameter ${paramName} was null or undefined when calling ${functionName}.`);
+    }
+};
+exports.assertParamExists = assertParamExists;
+/**
+ *
+ * @export
+ */
+const setApiKeyToObject = async function (object, keyParamName, configuration) {
+    if (configuration && configuration.apiKey) {
+        const localVarApiKeyValue = typeof configuration.apiKey === 'function'
+            ? await configuration.apiKey(keyParamName)
+            : await configuration.apiKey;
+        object[keyParamName] = localVarApiKeyValue;
+    }
+};
+exports.setApiKeyToObject = setApiKeyToObject;
+/**
+ *
+ * @export
+ */
+const setBasicAuthToObject = function (object, configuration) {
+    if (configuration && (configuration.username || configuration.password)) {
+        object["auth"] = { username: configuration.username, password: configuration.password };
+    }
+};
+exports.setBasicAuthToObject = setBasicAuthToObject;
+/**
+ *
+ * @export
+ */
+const setBearerAuthToObject = async function (object, configuration) {
+    if (configuration && configuration.accessToken) {
+        const accessToken = typeof configuration.accessToken === 'function'
+            ? await configuration.accessToken()
+            : await configuration.accessToken;
+        object["Authorization"] = "Bearer " + accessToken;
+    }
+};
+exports.setBearerAuthToObject = setBearerAuthToObject;
+/**
+ *
+ * @export
+ */
+const setOAuthToObject = async function (object, name, scopes, configuration) {
+    if (configuration && configuration.accessToken) {
+        const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
+            ? await configuration.accessToken(name, scopes)
+            : await configuration.accessToken;
+        object["Authorization"] = "Bearer " + localVarAccessTokenValue;
+    }
+};
+exports.setOAuthToObject = setOAuthToObject;
+/**
+ *
+ * @export
+ */
+const setSearchParams = function (url, ...objects) {
+    const searchParams = new URLSearchParams(url.search);
+    for (const object of objects) {
+        for (const key in object) {
+            if (Array.isArray(object[key])) {
+                searchParams.delete(key);
+                for (const item of object[key]) {
+                    searchParams.append(key, item);
+                }
+            }
+            else {
+                searchParams.set(key, object[key]);
+            }
+        }
+    }
+    url.search = searchParams.toString();
+};
+exports.setSearchParams = setSearchParams;
+/**
+ *
+ * @export
+ */
+const serializeDataIfNeeded = function (value, requestOptions, configuration) {
+    const nonString = typeof value !== 'string';
+    const needsSerialization = nonString && configuration && configuration.isJsonMime
+        ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
+        : nonString;
+    return needsSerialization
+        ? JSON.stringify(value !== undefined ? value : {})
+        : (value || "");
+};
+exports.serializeDataIfNeeded = serializeDataIfNeeded;
+/**
+ *
+ * @export
+ */
+const toPathString = function (url) {
+    return url.pathname + url.search + url.hash;
+};
+exports.toPathString = toPathString;
+/**
+ *
+ * @export
+ */
+const createRequestFunction = function (axiosArgs, globalAxios, BASE_PATH, configuration) {
+    return (axios = globalAxios, basePath = BASE_PATH) => {
+        const axiosRequestArgs = { ...axiosArgs.options, url: ((configuration === null || configuration === void 0 ? void 0 : configuration.basePath) || basePath) + axiosArgs.url };
+        return axios.request(axiosRequestArgs);
+    };
+};
+exports.createRequestFunction = createRequestFunction;

package/dist/generated/avalanche/configuration.d.ts

@@ -0,0 +1,83 @@
+/**
+ * @shapeshiftoss/avalanche-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 7.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+export interface ConfigurationParameters {
+    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
+    username?: string;
+    password?: string;
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
+    basePath?: string;
+    baseOptions?: any;
+    formDataCtor?: new () => any;
+}
+export declare class Configuration {
+    /**
+     * parameter for apiKey security
+     * @param name security name
+     * @memberof Configuration
+     */
+    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
+    /**
+     * parameter for basic security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    username?: string;
+    /**
+     * parameter for basic security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    password?: string;
+    /**
+     * parameter for oauth2 security
+     * @param name security name
+     * @param scopes oauth2 scope
+     * @memberof Configuration
+     */
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
+    /**
+     * override base path
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    basePath?: string;
+    /**
+     * base options for axios calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
+    /**
+     * The FormData constructor that will be used to create multipart form data
+     * requests. You can inject this here so that execution environments that
+     * do not support the FormData class can still run the generated client.
+     *
+     * @type {new () => FormData}
+     */
+    formDataCtor?: new () => any;
+    constructor(param?: ConfigurationParameters);
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    isJsonMime(mime: string): boolean;
+}

package/dist/generated/avalanche/configuration.js

@@ -0,0 +1,42 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * @shapeshiftoss/avalanche-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 7.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Configuration = void 0;
+class Configuration {
+    constructor(param = {}) {
+        this.apiKey = param.apiKey;
+        this.username = param.username;
+        this.password = param.password;
+        this.accessToken = param.accessToken;
+        this.basePath = param.basePath;
+        this.baseOptions = param.baseOptions;
+        this.formDataCtor = param.formDataCtor;
+    }
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    isJsonMime(mime) {
+        const jsonMime = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
+        return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
+    }
+}
+exports.Configuration = Configuration;

package/dist/generated/avalanche/index.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @shapeshiftoss/avalanche-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 7.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+export * from "./api";
+export * from "./configuration";

package/dist/generated/avalanche/index.js

@@ -0,0 +1,31 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * @shapeshiftoss/avalanche-api
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 7.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./api"), exports);
+__exportStar(require("./configuration"), exports);

package/dist/index.d.ts

@@ -1,6 +1,6 @@
+export * from './types';
+export * from './evm';
+export * as ws from './websocket';
 export * as bitcoin from './bitcoin';
-export * as ethereum from './ethereum';
 export * as cosmos from './cosmos';
 export * as osmosis from './osmosis';
-export * as ws from './websocket';
-export * from './types';

package/dist/index.js

@@ -15,6 +15,9 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -22,14 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ws = exports.osmosis = exports.cosmos = exports.ethereum = exports.bitcoin = void 0;
+exports.osmosis = exports.cosmos = exports.bitcoin = exports.ws = void 0;
+__exportStar(require("./types"), exports);
+__exportStar(require("./evm"), exports);
+exports.ws = __importStar(require("./websocket"));
 exports.bitcoin = __importStar(require("./bitcoin"));
-exports.ethereum = __importStar(require("./ethereum"));
 exports.cosmos = __importStar(require("./cosmos"));
 exports.osmosis = __importStar(require("./osmosis"));
-exports.ws = __importStar(require("./websocket"));
-__exportStar(require("./types"), exports);

package/dist/websocket.d.ts

@@ -2,9 +2,9 @@
 import type { ErrorResponse, Topics, TxsTopicData } from '@shapeshiftoss/common-api';
 import WebSocket from 'isomorphic-ws';
 export interface Connection {
-    ws: WebSocket;
+    ws?: WebSocket;
     pingTimeout?: NodeJS.Timeout;
-    interval: NodeJS.Timeout;
+    interval?: NodeJS.Timeout;
 }
 export interface TransactionMessage<T> {
     address: string;
@@ -12,7 +12,7 @@ export interface TransactionMessage<T> {
     subscriptionId: string;
 }
 export interface TxsParams<T> {
-    data: TxsTopicData | undefined;
+    data: TxsTopicData;
     onMessage: (message: TransactionMessage<T>) => void;
     onError?: (err: ErrorResponse) => void;
 }
@@ -21,9 +21,17 @@ export declare class Client<T> {
     private readonly url;
     private readonly connections;
     private readonly pingInterval;
+    private readonly retryAttempts;
+    private retryCount;
     private txs;
     constructor(url: string);
+    private initialize;
+    private onOpen;
+    private onClose;
+    private onError;
+    private onMessage;
     private heartbeat;
+    private getDefaultSubscriptionId;
     /**
      * Subscribe to transaction history and updates for newly confirmed and pending transactions.
      *

package/dist/websocket.js

@@ -10,25 +10,119 @@ const logger = new logger_1.Logger({
     namespace: ['unchained-client', 'websocket'],
     level: process.env.LOG_LEVEL
 });
+const NORMAL_CLOSURE_CODE = 1000;
 class Client {
     constructor(url) {
         this.pingInterval = 10000;
+        this.retryAttempts = 5;
+        this.retryCount = 0;
         this.txs = {};
         this.url = url;
         this.connections = {
             txs: undefined
         };
     }
+    async initialize() {
+        const ws = new isomorphic_ws_1.default(this.url);
+        this.connections.txs = { ws };
+        // wait for connection to open with handshake timeout
+        await new Promise((resolve, reject) => {
+            setTimeout(() => reject(new Error('timeout while trying to connect')), 5000);
+            ws.onopen = ({ target }) => this.onOpen(target, resolve, reject);
+            ws.onclose = (event) => this.onClose(event, resolve, reject);
+            ws.onerror = (event) => this.onError(event);
+            ws.onmessage = (event) => this.onMessage(event);
+        });
+    }
+    onOpen(ws, resolve, reject) {
+        this.retryCount = 0;
+        const interval = setInterval(() => {
+            // browsers do not support ping/pong frame, send ping payload instead
+            const payload = { subscriptionId: '', method: 'ping' };
+            ws.send(JSON.stringify(payload));
+        }, this.pingInterval);
+        this.heartbeat('txs');
+        if (this.connections.txs) {
+            this.connections.txs.interval = interval;
+        }
+        else {
+            this.connections.txs = { ws, interval };
+        }
+        try {
+            // subscribe to all subscriptions
+            Object.entries(this.txs).forEach(([id, { data }]) => {
+                const payload = { subscriptionId: id, method: 'subscribe', data };
+                ws.send(JSON.stringify(payload));
+            });
+            resolve(true);
+        }
+        catch (err) {
+            reject(err);
+        }
+    }
+    onClose(event, resolve, reject) {
+        var _a, _b;
+        logger.warn({ fn: 'onClose', code: event.code, reason: event.reason, type: event.type }, 'websocket closed');
+        ((_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.pingTimeout) && clearTimeout(this.connections.txs.pingTimeout);
+        ((_b = this.connections.txs) === null || _b === void 0 ? void 0 : _b.interval) && clearInterval(this.connections.txs.interval);
+        // attempt reconnect logic on non standard exit codes
+        if (event.code !== NORMAL_CLOSURE_CODE) {
+            if (++this.retryCount >= this.retryAttempts) {
+                reject(new Error('failed to reconnect, connection closed'));
+                return;
+            }
+            setTimeout(() => this.initialize(), 500 * this.retryCount ** 2);
+        }
+        resolve(false);
+    }
+    onError(event) {
+        if (!event.message)
+            return;
+        logger.error({ fn: 'onError', err: event.error, message: event.message, type: event.type }, 'websocket error');
+        // send connection errors to all subscription onError handlers
+        Object.entries(this.txs).forEach(([id, sub]) => {
+            var _a;
+            (_a = sub.onError) === null || _a === void 0 ? void 0 : _a.call(sub, { subscriptionId: id, type: 'error', message: event.message });
+        });
+    }
+    onMessage(event) {
+        var _a, _b, _c, _d;
+        if (event.type !== 'message')
+            return;
+        // trigger heartbeat keep alive on pong response
+        if (event.data === 'pong') {
+            this.heartbeat('txs');
+            return;
+        }
+        try {
+            const message = JSON.parse(event.data.toString());
+            const subscriptionId = this.getDefaultSubscriptionId();
+            // narrow type to ErrorResponse if key `type` exists and forward to correct onError handler
+            if ('type' in message) {
+                return (_b = (_a = this.txs[message.subscriptionId || subscriptionId]) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, message);
+            }
+            // forward the transaction message to the correct onMessage handler
+            (_d = (_c = this.txs[message.subscriptionId || subscriptionId]) === null || _c === void 0 ? void 0 : _c.onMessage) === null || _d === void 0 ? void 0 : _d.call(_c, message);
+        }
+        catch (err) {
+            logger.warn(`failed to handle onmessage event: ${JSON.stringify(event)}: ${err}`);
+        }
+    }
     heartbeat(topic) {
         const connection = this.connections[topic];
         if (!connection)
             return;
         connection.pingTimeout && clearTimeout(connection.pingTimeout);
         connection.pingTimeout = setTimeout(() => {
+            var _a;
             logger.warn({ fn: 'pingTimeout' }, `${topic} heartbeat failed`);
-            connection === null || connection === void 0 ? void 0 : connection.ws.close();
+            (_a = connection.ws) === null || _a === void 0 ? void 0 : _a.close();
         }, this.pingInterval + 5000);
     }
+    // for websocket connections that do not return the subscriptionId on the message, use the initial subscriptionId as the default
+    getDefaultSubscriptionId() {
+        return Object.keys(this.txs)[0];
+    }
     /**
      * Subscribe to transaction history and updates for newly confirmed and pending transactions.
      *
@@ -42,95 +136,20 @@ class Client {
      * @param [onError] optional handler for any error messages associated with `subscriptionId`
      */
     async subscribeTxs(subscriptionId, data, onMessage, onError) {
-        // keep track of the onMessage and onError handlers associated with each subscriptionId
-        this.txs[subscriptionId] = { onMessage, onError, data: undefined };
-        if (this.connections.txs) {
-            if (this.connections.txs.ws.readyState === 1) {
-                // subscribe if connection exists and is ready
-                this.connections.txs.ws.send(JSON.stringify({ subscriptionId, method: 'subscribe', data }));
-            }
-            else {
-                // queue up unique addresses for subscriptions if connection exists, but is not ready yet
-                const txsData = this.txs[subscriptionId].data;
-                this.txs[subscriptionId].data = txsData
-                    ? { ...txsData, addresses: [...new Set(...txsData.addresses, ...data.addresses)] }
-                    : data;
-            }
-            return;
+        var _a, _b, _c, _d;
+        const addresses = [
+            ...new Set([...((_c = (_b = (_a = this.txs[subscriptionId]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.addresses) !== null && _c !== void 0 ? _c : []), ...data.addresses])
+        ];
+        // keep track of all subscribed addresses and onMessage/onError handlers associated with each subscriptionId
+        this.txs[subscriptionId] = { onMessage, onError, data: { topic: 'txs', addresses } };
+        // initialize websocket connection if one does not already exist
+        if (!((_d = this.connections.txs) === null || _d === void 0 ? void 0 : _d.ws)) {
+            return this.initialize();
+        }
+        // subscribe if connection exists and is ready
+        if (this.connections.txs.ws.readyState === isomorphic_ws_1.default.OPEN) {
+            this.connections.txs.ws.send(JSON.stringify({ subscriptionId, method: 'subscribe', data }));
         }
-        const ws = new isomorphic_ws_1.default(this.url);
-        const interval = setInterval(() => {
-            // browsers do not support ping/pong frame, send ping payload instead
-            const payload = { subscriptionId: '', method: 'ping' };
-            ws.send(JSON.stringify(payload));
-        }, this.pingInterval);
-        this.connections.txs = { ws, interval };
-        // send connection errors to all subscription onError handlers
-        ws.onerror = (event) => {
-            Object.entries(this.txs).forEach(([id, sub]) => {
-                sub.onError && sub.onError({ subscriptionId: id, type: 'error', message: event.message });
-            });
-        };
-        // clear heartbeat timeout on close
-        ws.onclose = () => {
-            var _a, _b;
-            ((_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.pingTimeout) && clearTimeout(this.connections.txs.pingTimeout);
-            ((_b = this.connections.txs) === null || _b === void 0 ? void 0 : _b.interval) && clearInterval(this.connections.txs.interval);
-        };
-        ws.onmessage = (event) => {
-            var _a, _b;
-            if (!event)
-                return;
-            if (event.type !== 'message')
-                return;
-            if (event.data === 'pong') {
-                // trigger heartbeat keep alive on pong response
-                this.heartbeat('txs');
-                return;
-            }
-            try {
-                const message = JSON.parse(event.data.toString());
-                // narrow type to ErrorResponse if key `type` exists and forward to correct onError handler
-                if ('type' in message) {
-                    const onErrorHandler = (_a = this.txs[message.subscriptionId || subscriptionId]) === null || _a === void 0 ? void 0 : _a.onError;
-                    onErrorHandler && onErrorHandler(message);
-                    return;
-                }
-                // forward the transaction message to the correct onMessage handler
-                const onMessageHandler = (_b = this.txs[message.subscriptionId || subscriptionId]) === null || _b === void 0 ? void 0 : _b.onMessage;
-                onMessageHandler && onMessageHandler(message);
-            }
-            catch (err) {
-                logger.warn(`failed to handle onmessage event: ${JSON.stringify(event)}: ${err}`);
-            }
-        };
-        // wait for the connection to open
-        const openConnection = new Promise((resolve, reject) => {
-            ws.onopen = () => {
-                this.heartbeat('txs');
-                try {
-                    // subscribe to all queued subscriptions
-                    Object.values(this.txs).forEach((tx) => {
-                        if (!tx.data)
-                            return;
-                        const payload = { subscriptionId, method: 'subscribe', data: tx.data };
-                        ws.send(JSON.stringify(payload));
-                        delete this.txs[subscriptionId].data;
-                    });
-                    // subscribe to initial subscription
-                    const payload = { subscriptionId, method: 'subscribe', data };
-                    ws.send(JSON.stringify(payload));
-                    resolve(true);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            };
-        });
-        const connectionTimeout = new Promise((_, reject) => {
-            setTimeout(() => reject(new Error('timeout while trying to connect')), 5000);
-        });
-        await Promise.race([openConnection, connectionTimeout]);
     }
     /**
      * Unsubscribe from transaction history and updates for newly confirmed and pending transactions.
@@ -146,19 +165,27 @@ class Client {
      * @param data.addresses list of addresses to unsubscribe from
      */
     unsubscribeTxs(subscriptionId, data) {
-        var _a, _b, _c;
-        if (((_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.ws.readyState) !== isomorphic_ws_1.default.OPEN)
+        var _a, _b, _c, _d, _e;
+        if (((_b = (_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.ws) === null || _b === void 0 ? void 0 : _b.readyState) !== isomorphic_ws_1.default.OPEN)
             return;
         if (!subscriptionId)
             this.txs = {};
-        if (subscriptionId && !(data === null || data === void 0 ? void 0 : data.addresses.length))
-            delete this.txs[subscriptionId];
+        if (subscriptionId && this.txs[subscriptionId]) {
+            // unsubscribe addresses from the current subscribed address set if addresses provided
+            if ((_c = data === null || data === void 0 ? void 0 : data.addresses) === null || _c === void 0 ? void 0 : _c.length) {
+                this.txs[subscriptionId].data.addresses = this.txs[subscriptionId].data.addresses.filter((address) => !data.addresses.includes(address));
+            }
+            else {
+                // delete subscription if no addresses provided
+                delete this.txs[subscriptionId];
+            }
+        }
         const payload = {
             subscriptionId: subscriptionId !== null && subscriptionId !== void 0 ? subscriptionId : '',
             method: 'unsubscribe',
-            data: { topic: 'txs', addresses: (_b = data === null || data === void 0 ? void 0 : data.addresses) !== null && _b !== void 0 ? _b : [] }
+            data: { topic: 'txs', addresses: (_d = data === null || data === void 0 ? void 0 : data.addresses) !== null && _d !== void 0 ? _d : [] }
         };
-        (_c = this.connections.txs) === null || _c === void 0 ? void 0 : _c.ws.send(JSON.stringify(payload));
+        (_e = this.connections.txs) === null || _e === void 0 ? void 0 : _e.ws.send(JSON.stringify(payload));
     }
     /**
      * Close and unsubscribe from any subscriptions
@@ -169,9 +196,9 @@ class Client {
      */
     close(topic) {
         const closeTxs = () => {
-            var _a;
+            var _a, _b;
             this.unsubscribeTxs();
-            (_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.ws.close();
+            (_b = (_a = this.connections.txs) === null || _a === void 0 ? void 0 : _a.ws) === null || _b === void 0 ? void 0 : _b.close(NORMAL_CLOSURE_CODE);
         };
         // close all connections if no topic is provided
         if (!topic) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/unchained-client",
-  "version": "9.0.3",
+  "version": "9.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "source": "src/index.ts",