Merge branch 'hotfix/6.0.1' into 9148-hash

LiskArchive · Nov 23, 2023 · c448ee5 · c448ee5
2 parents 8b66166 + 1e73f05
commit c448ee5
Show file tree

Hide file tree

Showing 32 changed files with 190 additions and 867 deletions.
diff --git a/commander/oclif.manifest.json b/commander/oclif.manifest.json
diff --git a/commander/package.json b/commander/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "lisk-commander",
-	"version": "6.0.0-rc.6",
+	"version": "6.0.0",
 	"description": "A command line interface for Lisk",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -101,16 +101,16 @@
 		"/docs"
 	],
 	"dependencies": {
-		"@liskhq/lisk-api-client": "^6.0.0-rc.4",
-		"@liskhq/lisk-chain": "^0.5.0-rc.4",
-		"@liskhq/lisk-client": "^6.0.0-rc.4",
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
+		"@liskhq/lisk-api-client": "^6.0.0",
+		"@liskhq/lisk-chain": "^0.5.0",
+		"@liskhq/lisk-client": "^6.0.0",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
 		"@liskhq/lisk-db": "0.3.10",
-		"@liskhq/lisk-passphrase": "^4.0.0-rc.0",
-		"@liskhq/lisk-transactions": "^6.0.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2",
+		"@liskhq/lisk-passphrase": "^4.0.0",
+		"@liskhq/lisk-transactions": "^6.0.0",
+		"@liskhq/lisk-utils": "^0.4.0",
+		"@liskhq/lisk-validator": "^0.8.0",
 		"@oclif/core": "1.20.4",
 		"@oclif/plugin-autocomplete": "1.3.6",
 		"@oclif/plugin-help": "5.1.19",
@@ -121,7 +121,7 @@
 		"cli-table3": "0.6.0",
 		"fs-extra": "11.1.0",
 		"inquirer": "8.2.5",
-		"lisk-framework": "^0.11.0-rc.5",
+		"lisk-framework": "^0.11.0",
 		"listr": "0.14.3",
 		"progress": "2.0.3",
 		"semver": "7.5.2",

diff --git a/commander/src/bootstrapping/templates/lisk-template-ts/templates/init/package-template.json b/commander/src/bootstrapping/templates/lisk-template-ts/templates/init/package-template.json
@@ -85,21 +85,21 @@
 		}
 	},
 	"dependencies": {
-		"@liskhq/lisk-framework-dashboard-plugin": "0.3.0-rc.5",
-		"@liskhq/lisk-framework-faucet-plugin": "0.3.0-rc.5",
-		"@liskhq/lisk-framework-monitor-plugin": "0.4.0-rc.5",
-		"@liskhq/lisk-framework-forger-plugin": "0.4.0-rc.5",
-		"@liskhq/lisk-framework-report-misbehavior-plugin": "0.4.0-rc.5",
-		"@liskhq/lisk-framework-chain-connector-plugin": "0.1.0-rc.5",
+		"@liskhq/lisk-framework-dashboard-plugin": "0.3.0",
+		"@liskhq/lisk-framework-faucet-plugin": "0.3.0",
+		"@liskhq/lisk-framework-monitor-plugin": "0.4.0",
+		"@liskhq/lisk-framework-forger-plugin": "0.4.0",
+		"@liskhq/lisk-framework-report-misbehavior-plugin": "0.4.0",
+		"@liskhq/lisk-framework-chain-connector-plugin": "0.1.0",
 		"@oclif/core": "1.20.4",
 		"@oclif/plugin-autocomplete": "1.3.6",
 		"@oclif/plugin-help": "5.1.19",
 		"@oclif/plugin-version": "1.1.3",
 		"axios": "0.21.2",
 		"fs-extra": "11.1.0",
 		"inquirer": "8.2.5",
-		"lisk-commander": "6.0.0-rc.6",
-		"lisk-sdk": "6.0.0-rc.5",
+		"lisk-commander": "6.0.0",
+		"lisk-sdk": "6.0.0",
 		"tar": "6.1.11",
 		"tslib": "2.4.1"
 	},

diff --git a/commander/src/bootstrapping/templates/lisk-template-ts/templates/init_plugin/package.json b/commander/src/bootstrapping/templates/lisk-template-ts/templates/init_plugin/package.json
@@ -28,7 +28,7 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"lisk-sdk": "^6.0.0-rc.5"
+		"lisk-sdk": "^6.0.0"
 	},
 	"devDependencies": {
 		"@types/jest": "26.0.21",

diff --git a/elements/lisk-api-client/package.json b/elements/lisk-api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-api-client",
-	"version": "6.0.0-rc.4",
+	"version": "6.0.0",
 	"description": "An API client for the Lisk network",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,16 +35,16 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-transactions": "^6.0.0-rc.2",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-transactions": "^6.0.0",
+		"@liskhq/lisk-validator": "^0.8.0",
 		"isomorphic-ws": "4.0.1",
 		"ws": "8.11.0",
 		"zeromq": "6.0.0-beta.6"
 	},
 	"devDependencies": {
-		"@liskhq/lisk-chain": "^0.5.0-rc.4",
+		"@liskhq/lisk-chain": "^0.5.0",
 		"@types/jest": "29.2.3",
 		"@types/jest-when": "3.5.2",
 		"@types/node": "18.15.3",

diff --git a/elements/lisk-api-client/src/ws_channel.ts b/elements/lisk-api-client/src/ws_channel.ts
@@ -18,8 +18,8 @@ import { EventEmitter } from 'events';
 import { JSONRPCMessage, EventCallback, Defer } from './types';
 import { convertRPCError, defer, messageIsNotification, promiseWithTimeout } from './utils';
 
-const CONNECTION_TIMEOUT = 2000;
-const RESPONSE_TIMEOUT = 3000;
+export const CONNECTION_TIMEOUT = 5000;
+export const RESPONSE_TIMEOUT = 10000;
 
 export class WSChannel {
 	public isAlive = false;

diff --git a/elements/lisk-api-client/test/integration/ws_channel.spec.ts b/elements/lisk-api-client/test/integration/ws_channel.spec.ts
@@ -15,7 +15,7 @@
 import { createServer, Server } from 'http';
 import * as WebSocket from 'isomorphic-ws';
 import { Socket } from 'net';
-import { WSChannel } from '../../src/ws_channel';
+import { WSChannel, CONNECTION_TIMEOUT, RESPONSE_TIMEOUT } from '../../src/ws_channel';
 
 jest.unmock('isomorphic-ws');
 
@@ -58,32 +58,38 @@ describe('WSChannel', () => {
 			expect.assertions(3);
 		});
 
-		it('should timeout if ws server not responding', async () => {
-			const http = createServer();
-			const server = new WebSocket.Server({ path: '/my-path', noServer: true });
+		it(
+			'should timeout if ws server not responding',
+			async () => {
+				const http = createServer();
+				const server = new WebSocket.Server({ path: '/my-path', noServer: true });
 
-			// https://github.com/websockets/ws/issues/377#issuecomment-462152231
-			http.on('upgrade', (request, socket, head) => {
-				setTimeout(() => {
-					server.handleUpgrade(request, socket as Socket, head, ws => {
-						server.emit('connection', ws, request);
-					});
-				}, 3000);
-			});
+				// https://github.com/websockets/ws/issues/377#issuecomment-462152231
+				http.on('upgrade', (request, socket, head) => {
+					setTimeout(() => {
+						server.handleUpgrade(request, socket as Socket, head, ws => {
+							server.emit('connection', ws, request);
+						});
+					}, CONNECTION_TIMEOUT + 1000);
+				});
 
-			http.listen(65535);
+				http.listen(65535);
 
-			const channel = new WSChannel('ws://127.0.0.1:65535/my-path');
+				const channel = new WSChannel('ws://127.0.0.1:65535/my-path');
 
-			try {
-				await expect(channel.connect()).rejects.toThrow('Could not connect in 2000ms');
-				expect(server.clients.size).toBe(0);
-			} finally {
-				await closeServer(http);
-				await closeServer(server);
-			}
-			expect.assertions(2);
-		}, 5000);
+				try {
+					await expect(channel.connect()).rejects.toThrow(
+						`Could not connect in ${CONNECTION_TIMEOUT}ms`,
+					);
+					expect(server.clients.size).toBe(0);
+				} finally {
+					await closeServer(http);
+					await closeServer(server);
+				}
+				expect.assertions(2);
+			},
+			RESPONSE_TIMEOUT,
+		);
 
 		it('should throw error if server is not running', async () => {
 			const channel = new WSChannel('ws://127.0.0.1:65534/my-path');

diff --git a/elements/lisk-chain/package.json b/elements/lisk-chain/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-chain",
-	"version": "0.5.0-rc.4",
+	"version": "0.5.0",
 	"description": "Blocks and state management implementation that are used for block processing according to the Lisk protocol",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,16 +35,16 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
 		"@liskhq/lisk-db": "0.3.10",
-		"@liskhq/lisk-tree": "^0.4.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2",
+		"@liskhq/lisk-tree": "^0.4.0",
+		"@liskhq/lisk-utils": "^0.4.0",
+		"@liskhq/lisk-validator": "^0.8.0",
 		"debug": "4.3.4"
 	},
 	"devDependencies": {
-		"@liskhq/lisk-passphrase": "^4.0.0-rc.0",
+		"@liskhq/lisk-passphrase": "^4.0.0",
 		"@types/debug": "4.1.5",
 		"@types/faker": "4.1.10",
 		"@types/jest": "29.2.3",

diff --git a/elements/lisk-client/package.json b/elements/lisk-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-client",
-	"version": "6.0.0-rc.4",
+	"version": "6.0.0",
 	"description": "A default set of Elements for use by clients of the Lisk network",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -56,14 +56,14 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-api-client": "^6.0.0-rc.4",
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-passphrase": "^4.0.0-rc.0",
-		"@liskhq/lisk-transactions": "^6.0.0-rc.2",
-		"@liskhq/lisk-tree": "^0.4.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2",
+		"@liskhq/lisk-api-client": "^6.0.0",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-passphrase": "^4.0.0",
+		"@liskhq/lisk-transactions": "^6.0.0",
+		"@liskhq/lisk-tree": "^0.4.0",
+		"@liskhq/lisk-utils": "^0.4.0",
+		"@liskhq/lisk-validator": "^0.8.0",
 		"buffer": "6.0.3"
 	},
 	"devDependencies": {

diff --git a/elements/lisk-codec/package.json b/elements/lisk-codec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-codec",
-	"version": "0.4.0-rc.2",
+	"version": "0.4.0",
 	"description": "Implementation of decoder and encoder using Lisk JSON schema according to the Lisk protocol",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,9 +35,9 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2"
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-utils": "^0.4.0",
+		"@liskhq/lisk-validator": "^0.8.0"
 	},
 	"devDependencies": {
 		"@types/jest": "29.2.3",

diff --git a/elements/lisk-cryptography/package.json b/elements/lisk-cryptography/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-cryptography",
-	"version": "4.0.0-rc.2",
+	"version": "4.0.0",
 	"description": "General cryptographic functions for use with Lisk-related software",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-passphrase": "^4.0.0-rc.0",
+		"@liskhq/lisk-passphrase": "^4.0.0",
 		"buffer-reverse": "1.0.1",
 		"hash-wasm": "4.9.0",
 		"tweetnacl": "1.0.3"

diff --git a/elements/lisk-elements/package.json b/elements/lisk-elements/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "lisk-elements",
-	"version": "6.0.0-rc.4",
+	"version": "6.0.0",
 	"description": "Elements for building blockchain applications in the Lisk network",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,18 +35,18 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-api-client": "^6.0.0-rc.4",
-		"@liskhq/lisk-chain": "^0.5.0-rc.4",
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
+		"@liskhq/lisk-api-client": "^6.0.0",
+		"@liskhq/lisk-chain": "^0.5.0",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
 		"@liskhq/lisk-db": "0.3.10",
-		"@liskhq/lisk-p2p": "^0.9.0-rc.2",
-		"@liskhq/lisk-passphrase": "^4.0.0-rc.0",
-		"@liskhq/lisk-transaction-pool": "^0.7.0-rc.2",
-		"@liskhq/lisk-transactions": "^6.0.0-rc.2",
-		"@liskhq/lisk-tree": "^0.4.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2"
+		"@liskhq/lisk-p2p": "^0.9.0",
+		"@liskhq/lisk-passphrase": "^4.0.0",
+		"@liskhq/lisk-transaction-pool": "^0.7.0",
+		"@liskhq/lisk-transactions": "^6.0.0",
+		"@liskhq/lisk-tree": "^0.4.0",
+		"@liskhq/lisk-utils": "^0.4.0",
+		"@liskhq/lisk-validator": "^0.8.0"
 	},
 	"devDependencies": {
 		"@types/jest": "29.2.3",

diff --git a/elements/lisk-p2p/package.json b/elements/lisk-p2p/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-p2p",
-	"version": "0.9.0-rc.2",
+	"version": "0.9.0",
 	"description": "Unstructured P2P library for use with Lisk-related software",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -41,9 +41,9 @@
 		"disableLocalIPs": "./scripts/disableTestLocalIPs.sh 2 19"
 	},
 	"dependencies": {
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2",
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-validator": "^0.8.0",
 		"lodash.shuffle": "4.2.0",
 		"semver": "7.5.2",
 		"socketcluster-client": "14.3.1",

diff --git a/elements/lisk-passphrase/package.json b/elements/lisk-passphrase/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-passphrase",
-	"version": "4.0.0-rc.0",
+	"version": "4.0.0",
 	"description": "Mnemonic passphrase helpers for use with Lisk-related software",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",

diff --git a/elements/lisk-transaction-pool/package.json b/elements/lisk-transaction-pool/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-transaction-pool",
-	"version": "0.7.0-rc.2",
+	"version": "0.7.0",
 	"description": "Transaction pool library for use with Lisk-related software",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -36,8 +36,8 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-utils": "^0.4.0-rc.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-utils": "^0.4.0",
 		"debug": "4.3.4"
 	},
 	"devDependencies": {

diff --git a/elements/lisk-transactions/package.json b/elements/lisk-transactions/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@liskhq/lisk-transactions",
-	"version": "6.0.0-rc.2",
+	"version": "6.0.0",
 	"description": "Utility functions related to transactions according to the Lisk protocol",
 	"author": "Lisk Foundation <admin@lisk.com>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -35,9 +35,9 @@
 		"build:check": "node -e \"require('./dist-node')\""
 	},
 	"dependencies": {
-		"@liskhq/lisk-codec": "^0.4.0-rc.2",
-		"@liskhq/lisk-cryptography": "^4.0.0-rc.2",
-		"@liskhq/lisk-validator": "^0.8.0-rc.2"
+		"@liskhq/lisk-codec": "^0.4.0",
+		"@liskhq/lisk-cryptography": "^4.0.0",
+		"@liskhq/lisk-validator": "^0.8.0"
 	},
 	"devDependencies": {
 		"@types/jest": "29.2.3",