From 48c59662426bef80bd4d5c297d809b69d1aeb63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0ev=C4=8D=C3=ADk?= Date: Wed, 9 Mar 2022 01:25:46 +0100 Subject: [PATCH 1/2] Fix type of protocol version in config --- src/index.ts | 4 ++-- src/types/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index 8e9ae93..45d99c5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -50,7 +50,7 @@ export class ElectrumClient extends Client { await this.connect() - this.versionInfo = (await this.server_version(this.electrumConfig?.client ?? '', this.electrumConfig?.version ?? ['', ''])) as [string, string] + this.versionInfo = (await this.server_version(electrumConfig.client, electrumConfig.version)) as [string, string] if (this.onConnectCallback != null) { this.onConnectCallback(this, this.versionInfo) @@ -160,7 +160,7 @@ export class ElectrumClient extends Client { } // ElectrumX API - server_version(client_name: string, protocol_version: string[]) { + server_version(client_name: string, protocol_version: string | [string, string]) { return this.request('server.version', [client_name, protocol_version]) } diff --git a/src/types/index.ts b/src/types/index.ts index 0fc4a46..53178de 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -18,7 +18,7 @@ export type PersistencePolicy = { export type ElectrumConfig = { client: string; - version: string[]; + version: string | [string, string]; } export type ElectrumRequestParams = Array>; From 443606f7efa48a9ec8d65bf19fe6d1a6be9c5930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0ev=C4=8D=C3=ADk?= Date: Fri, 11 Mar 2022 12:02:28 +0100 Subject: [PATCH 2/2] Bump 1.2.4 --- .editorconfig | 4 ++-- CHANGELOG.md | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index d14bf07..d46f34f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,10 +3,10 @@ root = true [*] charset = utf-8 end_of_line = lf - -[{*.js, *.ts}] trim_trailing_whitespace = true insert_final_newline = true + +[{*.js, *.ts}] max_line_length = 160 indent_size = 4 indent_style = space diff --git a/CHANGELOG.md b/CHANGELOG.md index aedc41d..504be49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.2.4 (2022-03-11) +- Fixed type of protocol version in config + ## 1.2.3 (2022-03-02) - Removed faulty parameter from `blockchain.headers.subscribe` call diff --git a/package-lock.json b/package-lock.json index ba7418a..ed9286b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@samouraiwallet/electrum-client", - "version": "1.2.3", + "version": "1.2.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@samouraiwallet/electrum-client", - "version": "1.2.3", + "version": "1.2.4", "license": "LGPL-3.0", "devDependencies": { "@types/mocha": "^9.1.0", diff --git a/package.json b/package.json index 481312a..6c9f18c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@samouraiwallet/electrum-client", - "version": "1.2.3", + "version": "1.2.4", "engines": { "node": ">=14.0.0" },