Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3.0.2' of https://github.com/LiskHQ/lisk-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@shuse2
shuse2 committed Feb 11, 2020
2 parents e4560b1 + ed44abd commit 0dcfc03
Show file tree
Hide file tree
Showing 43 changed files with 537 additions and 260 deletions.
2 changes: 1 addition & 1 deletion commander/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions commander/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lisk-commander",
"version": "3.0.1",
"version": "3.0.2",
"description": "A command line interface for Lisk",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -101,10 +101,10 @@
"dependencies": {
"@liskhq/lisk-api-client": "3.0.1",
"@liskhq/lisk-constants": "1.3.0",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-cryptography": "2.4.2",
"@liskhq/lisk-passphrase": "3.0.0",
"@liskhq/lisk-transactions": "3.0.1",
"@liskhq/lisk-validator": "0.3.0",
"@liskhq/lisk-transactions": "3.0.2",
"@liskhq/lisk-validator": "0.3.1",
"@oclif/command": "1.5.6",
"@oclif/config": "1.9.0",
"@oclif/errors": "1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-client/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions elements/lisk-client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-client",
"version": "3.0.1",
"version": "3.0.2",
"description": "A default set of Elements for use by clients of the Lisk network",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -61,9 +61,9 @@
"dependencies": {
"@liskhq/lisk-api-client": "3.0.1",
"@liskhq/lisk-constants": "1.3.0",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-cryptography": "2.4.2",
"@liskhq/lisk-passphrase": "3.0.0",
"@liskhq/lisk-transactions": "3.0.1",
"@liskhq/lisk-transactions": "3.0.2",
"@types/node": "12.12.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-cryptography/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion elements/lisk-cryptography/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-cryptography",
"version": "2.4.1",
"version": "2.4.2",
"description": "General cryptographic functions for use with Lisk-related software",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down
19 changes: 7 additions & 12 deletions elements/lisk-cryptography/src/nacl/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,16 @@
*/
import { NaclInterface } from './nacl_types';

// tslint:disable-next-line no-let
let lib: NaclInterface;
// tslint:disable-next-line no-let no-require-imports no-var-requires
let lib: NaclInterface = require('./slow');

try {
if (process.env.NACL_FAST === 'disable') {
throw new Error('Use tweetnacl');
if (process.env.NACL_FAST !== 'disable') {
// tslint:disable-next-line no-var-requires no-require-imports
lib = require('./fast');
}
// Require used for conditional importing
// tslint:disable-next-line no-var-requires no-require-imports
lib = require('./fast');
} catch (err) {
process.env.NACL_FAST = 'disable';
// tslint:disable-next-line no-var-requires no-require-imports
lib = require('./slow');
}
// tslint:disable-next-line no-empty
} catch (err) {}

export const NACL_SIGN_PUBLICKEY_LENGTH = 32;

Expand Down
4 changes: 2 additions & 2 deletions elements/lisk-cryptography/test/nacl/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ describe('nacl index.js', () => {
return Promise.resolve();
});

it('should set process.env.NACL_FAST to disable', () => {
it('should not set process.env.NACL_FAST to disable', () => {
require('../../src/nacl');
return expect(process.env.NACL_FAST).to.eql('disable');
return expect(process.env.NACL_FAST).not.to.eql('disable');
});

it('should load nacl slow if process.env.NACL_FAST is set to enable', () => {
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-elements/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions elements/lisk-elements/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lisk-elements",
"version": "3.0.1",
"version": "3.0.2",
"description": "Elements for building blockchain applications in the Lisk network",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -61,12 +61,12 @@
"dependencies": {
"@liskhq/lisk-api-client": "3.0.1",
"@liskhq/lisk-constants": "1.3.0",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-p2p": "0.4.1",
"@liskhq/lisk-cryptography": "2.4.2",
"@liskhq/lisk-p2p": "0.4.2",
"@liskhq/lisk-passphrase": "3.0.0",
"@liskhq/lisk-transaction-pool": "0.2.0",
"@liskhq/lisk-transactions": "3.0.1",
"@liskhq/lisk-validator": "0.3.0",
"@liskhq/lisk-transaction-pool": "0.2.1",
"@liskhq/lisk-transactions": "3.0.2",
"@liskhq/lisk-validator": "0.3.1",
"@types/node": "12.12.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-p2p/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions elements/lisk-p2p/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-p2p",
"version": "0.4.1",
"version": "0.4.2",
"description": "Unstructured P2P library for use with Lisk-related software",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -55,7 +55,7 @@
"disableLocalIPs": "./scripts/disableTestLocalIPs.sh 2 19"
},
"dependencies": {
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-cryptography": "2.4.2",
"lodash.shuffle": "4.2.0",
"semver": "5.6.0",
"socketcluster-client": "14.3.1",
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-transaction-pool/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions elements/lisk-transaction-pool/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-transaction-pool",
"version": "0.2.0",
"version": "0.2.1",
"description": "Transaction pool library for use with Lisk-related software",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -64,6 +64,6 @@
"typescript": "3.7.2"
},
"dependencies": {
"@liskhq/lisk-cryptography": "2.4.1"
"@liskhq/lisk-cryptography": "2.4.2"
}
}
2 changes: 1 addition & 1 deletion elements/lisk-transactions/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions elements/lisk-transactions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-transactions",
"version": "3.0.1",
"version": "3.0.2",
"description": "Everything related to transactions according to the Lisk protocol",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -58,8 +58,8 @@
},
"dependencies": {
"@liskhq/bignum": "1.3.1",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-validator": "0.3.0",
"@liskhq/lisk-cryptography": "2.4.2",
"@liskhq/lisk-validator": "0.3.1",
"ajv": "6.8.1",
"ajv-merge-patch": "4.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion elements/lisk-validator/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions elements/lisk-validator/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@liskhq/lisk-validator",
"version": "0.3.0",
"version": "0.3.1",
"description": "Validation library according to the Lisk protocol",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@liskhq/bignum": "1.3.1",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-cryptography": "2.4.2",
"@types/node": "12.12.11",
"@types/semver": "5.5.0",
"@types/validator": "10.9.0",
Expand Down
2 changes: 1 addition & 1 deletion framework/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions framework/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lisk-framework",
"version": "0.5.1",
"version": "0.5.2",
"description": "Lisk blockchain application platform",
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -47,11 +47,11 @@
},
"dependencies": {
"@liskhq/bignum": "1.3.1",
"@liskhq/lisk-cryptography": "2.4.1",
"@liskhq/lisk-p2p": "0.4.1",
"@liskhq/lisk-transaction-pool": "0.2.0",
"@liskhq/lisk-transactions": "3.0.1",
"@liskhq/lisk-validator": "0.3.0",
"@liskhq/lisk-cryptography": "2.4.2",
"@liskhq/lisk-p2p": "0.4.2",
"@liskhq/lisk-transaction-pool": "0.2.1",
"@liskhq/lisk-transactions": "3.0.2",
"@liskhq/lisk-validator": "0.3.1",
"ajv": "6.7.0",
"ajv-keywords": "3.4.0",
"async": "2.6.1",
Expand Down
Loading

0 comments on commit 0dcfc03

Please sign in to comment.