Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Upgrade lisk-elements #639

Merged
merged 1 commit into from
Nov 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 132 additions & 36 deletions package-lock.json

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

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@
"/default_config.json"
],
"dependencies": {
"@liskhq/lisk-api-client": "1.1.0",
"@liskhq/lisk-constants": "1.1.0",
"@liskhq/lisk-cryptography": "1.1.0",
"@liskhq/lisk-passphrase": "1.1.0",
"@liskhq/lisk-transactions": "1.1.0",
"@oclif/command": "1.5.0",
"@oclif/config": "1.7.4",
"@oclif/errors": "1.2.0",
Expand All @@ -113,7 +118,6 @@
"chalk": "2.4.1",
"cli-table3": "0.5.0",
"inquirer": "6.2.0",
"lisk-elements": "1.0.0",
"lockfile": "1.0.4",
"semver": "5.5.1",
"strip-ansi": "4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/commands/account/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { createMnemonicPassphrase } from '../../utils/mnemonic';

Expand Down
2 changes: 1 addition & 1 deletion src/commands/account/show.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Removal or modification of this copyright notice is prohibited.
*
*/
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import { flags as flagParser } from '@oclif/command';
import BaseCommand from '../../base';
import getInputsFromSources from '../../utils/input';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/config/set.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import url from 'url';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import {
CONFIG_VARIABLES,
Expand All @@ -30,7 +30,7 @@ const WRITE_FAIL_WARNING =
'Config file could not be written: your changes will not be persisted.';

const NETHASH_ERROR_MESSAGE =
'Value must be a hex string with 64 characters, or one of main, test or beta.';
'Value must be a hex string with 64 characters, or one of main or test.';

const URL_ERROR_MESSAGE = `Node URLs must include a supported protocol (${API_PROTOCOLS.map(
protocol => protocol.replace(':', ''),
Expand Down
2 changes: 1 addition & 1 deletion src/commands/message/decrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { ValidationError } from '../../utils/error';
import getInputsFromSources from '../../utils/input';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/message/encrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { ValidationError } from '../../utils/error';
import getInputsFromSources from '../../utils/input';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/message/sign.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { ValidationError } from '../../utils/error';
import getInputsFromSources from '../../utils/input';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/message/verify.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { ValidationError } from '../../utils/error';
import getInputsFromSources from '../../utils/input';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/node/forging.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import elements from 'lisk-elements';
import transactions from '@liskhq/lisk-transactions';
import BaseCommand from '../../base';
import commonFlags from '../../utils/flags';
import getAPIClient from '../../utils/api';
Expand All @@ -39,7 +39,7 @@ export default class ForgingCommand extends BaseCommand {
flags: { password: passwordSource },
} = this.parse(ForgingCommand);

elements.transaction.utils.validatePublicKey(publicKey);
transactions.utils.validatePublicKey(publicKey);

const client = getAPIClient(this.userConfig.api);
const { password } = await getInputsFromSources({
Expand Down
2 changes: 1 addition & 1 deletion src/commands/passphrase/decrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import { ValidationError } from '../../utils/error';
import commonFlags from '../../utils/flags';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/passphrase/encrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import { cryptography } from 'lisk-elements';
import cryptography from '@liskhq/lisk-cryptography';
import BaseCommand from '../../base';
import commonFlags from '../../utils/flags';
import getInputsFromSources from '../../utils/input';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/signature/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Removal or modification of this copyright notice is prohibited.
*
*/
import elements from 'lisk-elements';
import transactions from '@liskhq/lisk-transactions';
import { flags as flagParser } from '@oclif/command';
import BaseCommand from '../../base';
import { getStdIn } from '../../utils/input/utils';
Expand Down Expand Up @@ -52,7 +52,7 @@ export default class CreateCommand extends BaseCommand {
},
});

const result = elements.transaction.createSignatureObject(
const result = transactions.createSignatureObject(
transactionObject,
passphrase,
);
Expand Down
4 changes: 2 additions & 2 deletions src/commands/transaction/create/delegate.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
*
*/
import { flags as flagParser } from '@oclif/command';
import elements from 'lisk-elements';
import transactions from '@liskhq/lisk-transactions';
import BaseCommand from '../../../base';
import commonFlags from '../../../utils/flags';
import getInputsFromSources from '../../../utils/input';

const processInputs = username => ({ passphrase, secondPassphrase }) =>
elements.transaction.registerDelegate({
transactions.registerDelegate({
passphrase,
secondPassphrase,
username,
Expand Down
Loading