From 6809c370c027aea148466c00d3ce09c6d0ee6ddc Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Thu, 27 Feb 2020 19:49:05 +0000 Subject: [PATCH] Fixed syncScrypt declaration and use for json-wallets. --- packages/json-wallets/src.ts/keystore.ts | 2 +- packages/json-wallets/thirdparty.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/json-wallets/src.ts/keystore.ts b/packages/json-wallets/src.ts/keystore.ts index 25c2712f67..940ce6b6a8 100644 --- a/packages/json-wallets/src.ts/keystore.ts +++ b/packages/json-wallets/src.ts/keystore.ts @@ -213,7 +213,7 @@ function _computeKdfKey(data: any, password: Bytes | string, pbkdf2Func: Pbkd export function decryptSync(json: string, password: Bytes | string): KeystoreAccount { const data = JSON.parse(json); - const key = _computeKdfKey(data, password, pbkdf2Sync, scrypt.scryptSync); + const key = _computeKdfKey(data, password, pbkdf2Sync, scrypt.syncScrypt); return _getAccount(data, key); } diff --git a/packages/json-wallets/thirdparty.d.ts b/packages/json-wallets/thirdparty.d.ts index 8186557aab..53dabbd81e 100644 --- a/packages/json-wallets/thirdparty.d.ts +++ b/packages/json-wallets/thirdparty.d.ts @@ -24,7 +24,7 @@ declare module "aes-js" { declare module "scrypt-js" { export type ProgressCallback = (progress: number) => boolean | void; export function scrypt(password: Uint8Array, salt: Uint8Array, N: number, r: number, p: number, dkLen: number, callback?: ProgressCallback): Promise; - export function scryptSync(password: Uint8Array, salt: Uint8Array, N: number, r: number, p: number, dkLen: number): Uint8Array; + export function syncScrypt(password: Uint8Array, salt: Uint8Array, N: number, r: number, p: number, dkLen: number): Uint8Array; } declare module "uuid" {