PoS_EVM
/
sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(keystore):compatible with node 12

Browse Source
staking
neeboo 5 years ago
parent 6e1abec93b
commit ad01043bb0
5 changed files with 26 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 2
      packages/harmony-crypto/package.json
  3. 68
      packages/harmony-crypto/src/keystore.ts
  4. 8
      scripts/webpack/webpack.config.ts
  5. 2
      typings/scrypt.d.ts

2
package.json
Unescape View File

@ -119,6 +119,7 @@
"rollup-plugin-node-resolve": "^3.4.0",
"rollup-plugin-typescript2": "^0.17.1",
"solc": "^0.5.8",
"terser-webpack-plugin": "^2.1.2",
"ts-jest": "^23.1.3",
"ts-node": "^7.0.1",
"tslint": "^5.11.0",
@ -127,7 +128,6 @@
"typedoc-plugin-markdown": "^2.1.0",
"typescript": "^3.2",
"typescript-json-schema": "^0.36.0",
"uglifyjs-webpack-plugin": "^2.1.2",
"webpack": "^4.20.2",
"webpack-command": "^0.4.1",
"webpack-node-externals": "^1.7.2",

2
packages/harmony-crypto/package.json
Unescape View File

@ -27,7 +27,7 @@
"hmac-drbg": "^1.0.1",
"js-sha3": "^0.8.0",
"pbkdf2": "^3.0.17",
"scrypt.js": "^0.3.0",
"scrypt-shim": "github:web3-js/scrypt-shim",
"uuid": "^3.3.2"
},
"gitHead": "775e2ba36924fcffd8d2c0b73587b549ed90bb81"

68
packages/harmony-crypto/src/keystore.ts
Unescape View File

@ -1,5 +1,6 @@
import aes from 'aes-js';
import scrypt from 'scrypt.js';
// import scrypt from 'scrypt.js';
import scrypt from 'scrypt-shim';
import { pbkdf2Sync } from 'pbkdf2';
import uuid from 'uuid';
import { isPrivateKey } from '@harmony-js/utils';
@ -7,14 +8,7 @@ import { randomBytes } from './random';
import { getAddressFromPrivateKey } from './keyTool';
import { concat, hexToIntArray } from './bytes';
import { keccak256 } from './keccak256';
import {
KDF,
KDFParams,
EncryptOptions,
PBKDF2Params,
ScryptParams,
Keystore,
} from './types';
import { KDF, KDFParams, EncryptOptions, PBKDF2Params, ScryptParams, Keystore } from './types';
const DEFAULT_ALGORITHM = 'aes-128-ctr';
@ -29,11 +23,7 @@ const DEFAULT_ALGORITHM = 'aes-128-ctr';
*
* @returns {Promise<Buffer>}
*/
async function getDerivedKey(
key: Buffer,
kdf: KDF,
params: KDFParams,
): Promise<Buffer> {
async function getDerivedKey(key: Buffer, kdf: KDF, params: KDFParams): Promise<Buffer> {
const salt = Buffer.from(params.salt, 'hex');
if (kdf === 'pbkdf2') {
@ -77,10 +67,8 @@ export const encrypt = async (
const salt = randomBytes(32);
const iv = Buffer.from(randomBytes(16), 'hex');
const kdf =
options !== undefined ? (options.kdf ? options.kdf : 'scrypt') : 'scrypt';
const level =
options !== undefined ? (options.level ? options.level : 8192) : 8192;
const kdf = options !== undefined ? (options.kdf ? options.kdf : 'scrypt') : 'scrypt';
const level = options !== undefined ? (options.level ? options.level : 8192) : 8192;
const uuidRandom = options !== undefined ? options.uuid : undefined;
@ -94,18 +82,13 @@ export const encrypt = async (
};
const derivedKey = await getDerivedKey(Buffer.from(password), kdf, kdfparams);
const cipher = new aes.ModeOfOperation.ctr(
derivedKey.slice(0, 16),
new aes.Counter(iv),
);
const cipher = new aes.ModeOfOperation.ctr(derivedKey.slice(0, 16), new aes.Counter(iv));
if (!cipher) {
throw new Error('Unsupported cipher');
}
const ciphertext = Buffer.from(
cipher.encrypt(Buffer.from(privateKey.replace('0x', ''), 'hex')),
);
const ciphertext = Buffer.from(cipher.encrypt(Buffer.from(privateKey.replace('0x', ''), 'hex')));
const mac = keccak256(concat([derivedKey.slice(16, 32), ciphertext]));
@ -132,24 +115,14 @@ export const encrypt = async (
* @param {string} password - password string
* @return {string} privateKey
*/
export const decrypt = async (
keystore: Keystore,
password: string,
): Promise<string> => {
export const decrypt = async (keystore: Keystore, password: string): Promise<string> => {
const ciphertext = Buffer.from(keystore.Crypto.ciphertext, 'hex');
const iv = Buffer.from(keystore.Crypto.cipherparams.iv, 'hex');
const { kdfparams } = keystore.Crypto;
const derivedKey = await getDerivedKey(
Buffer.from(password),
keystore.Crypto.kdf,
kdfparams,
);
const derivedKey = await getDerivedKey(Buffer.from(password), keystore.Crypto.kdf, kdfparams);
const mac = keccak256(concat([derivedKey.slice(16, 32), ciphertext])).replace(
'0x',
'',
);
const mac = keccak256(concat([derivedKey.slice(16, 32), ciphertext])).replace('0x', '');
if (mac.toUpperCase() !== keystore.Crypto.mac.toUpperCase()) {
return Promise.reject(new Error('Failed to decrypt.'));
@ -159,8 +132,7 @@ export const decrypt = async (
const cipher = new CTR(derivedKey.slice(0, 16), new aes.Counter(iv));
const decrypted =
'0x' + Buffer.from(cipher.decrypt(ciphertext)).toString('hex');
const decrypted = '0x' + Buffer.from(cipher.decrypt(ciphertext)).toString('hex');
return decrypted;
};
@ -174,10 +146,8 @@ export const encryptPhrase = async (
}
const salt = randomBytes(32);
const iv = Buffer.from(randomBytes(16), 'hex');
const kdf =
options !== undefined ? (options.kdf ? options.kdf : 'scrypt') : 'scrypt';
const level =
options !== undefined ? (options.level ? options.level : 8192) : 8192;
const kdf = options !== undefined ? (options.kdf ? options.kdf : 'scrypt') : 'scrypt';
const level = options !== undefined ? (options.level ? options.level : 8192) : 8192;
const uuidRandom = options !== undefined ? options.uuid : undefined;
@ -190,10 +160,7 @@ export const encryptPhrase = async (
dklen: 32,
};
const derivedKey = await getDerivedKey(Buffer.from(password), kdf, kdfparams);
const cipher = new aes.ModeOfOperation.ctr(
derivedKey.slice(0, 16),
new aes.Counter(iv),
);
const cipher = new aes.ModeOfOperation.ctr(derivedKey.slice(0, 16), new aes.Counter(iv));
if (!cipher) {
throw new Error('Unsupported cipher');
@ -218,10 +185,7 @@ export const encryptPhrase = async (
});
};
export const decryptPhrase = async (
keystore: Keystore,
password: string,
): Promise<string> => {
export const decryptPhrase = async (keystore: Keystore, password: string): Promise<string> => {
const result = await decrypt(keystore, password);
return Buffer.from(result.replace('0x', ''), 'hex').toString();
};

8
scripts/webpack/webpack.config.ts
Unescape View File

@ -1,6 +1,6 @@
import path from 'path';
// tslint:disable-next-line: no-implicit-dependencies
import UglifyJs from 'uglifyjs-webpack-plugin';
import TerserPlugin from 'terser-webpack-plugin';
// tslint:disable-next-line: no-implicit-dependencies
import { Configuration } from 'webpack';
@ -37,9 +37,11 @@ function createBatchConfig(list: PackageItem[]) {
const batchClientConfig = {
...batchBaseConfig,
optimization: {
minimize: true,
minimizer: [
new UglifyJs({
uglifyOptions: {
new TerserPlugin({
terserOptions: {
ecma: 6,
compress: true,
mangle: true,
toplevel: false,

2
typings/scrypt.d.ts vendored
Unescape View File

@ -1,4 +1,4 @@
declare module 'scrypt.js' {
declare module 'scrypt-shim' {
export default function scrypt(
key: Buffer,
salt: Buffer,

Write Preview
Loading…
Cancel
Save