use @web3-js/scrypt-shim in place of scrypt.js
This commit is contained in:
parent
8156be2d00
commit
1ec629a57d
|
@ -44,12 +44,12 @@
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
|
"homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@web3-js/scrypt-shim": "^0.1.0",
|
||||||
"aes-js": "^3.1.1",
|
"aes-js": "^3.1.1",
|
||||||
"bs58check": "^2.1.2",
|
"bs58check": "^2.1.2",
|
||||||
"ethereumjs-util": "^6.0.0",
|
"ethereumjs-util": "^6.0.0",
|
||||||
"hdkey": "^1.1.1",
|
"hdkey": "^1.1.1",
|
||||||
"randombytes": "^2.0.6",
|
"randombytes": "^2.0.6",
|
||||||
"scrypt.js": "^0.3.0",
|
|
||||||
"utf8": "^3.0.0",
|
"utf8": "^3.0.0",
|
||||||
"uuid": "^3.3.2"
|
"uuid": "^3.3.2"
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,7 +3,7 @@ import * as ethUtil from 'ethereumjs-util'
|
||||||
|
|
||||||
const bs58check = require('bs58check')
|
const bs58check = require('bs58check')
|
||||||
const randomBytes = require('randombytes')
|
const randomBytes = require('randombytes')
|
||||||
const scryptsy = require('scrypt.js')
|
const scrypt = require('@web3-js/scrypt-shim')
|
||||||
const uuidv4 = require('uuid/v4')
|
const uuidv4 = require('uuid/v4')
|
||||||
|
|
||||||
// parameters for the toV3() method
|
// parameters for the toV3() method
|
||||||
|
@ -313,7 +313,7 @@ export default class Wallet {
|
||||||
}
|
}
|
||||||
|
|
||||||
const kdfparams = json.Crypto.KeyHeader.KdfParams
|
const kdfparams = json.Crypto.KeyHeader.KdfParams
|
||||||
const derivedKey = scryptsy(
|
const derivedKey = scrypt(
|
||||||
Buffer.from(password),
|
Buffer.from(password),
|
||||||
Buffer.from(json.Crypto.Salt, 'hex'),
|
Buffer.from(json.Crypto.Salt, 'hex'),
|
||||||
kdfparams.N,
|
kdfparams.N,
|
||||||
|
@ -354,7 +354,7 @@ export default class Wallet {
|
||||||
kdfparams = json.crypto.kdfparams
|
kdfparams = json.crypto.kdfparams
|
||||||
|
|
||||||
// FIXME: support progress reporting callback
|
// FIXME: support progress reporting callback
|
||||||
derivedKey = scryptsy(
|
derivedKey = scrypt(
|
||||||
Buffer.from(password),
|
Buffer.from(password),
|
||||||
Buffer.from(kdfparams.salt, 'hex'),
|
Buffer.from(kdfparams.salt, 'hex'),
|
||||||
kdfparams.n,
|
kdfparams.n,
|
||||||
|
@ -491,7 +491,7 @@ export default class Wallet {
|
||||||
case KDFFunctions.Scrypt:
|
case KDFFunctions.Scrypt:
|
||||||
kdfParams = kdfParamsForScrypt(v3Params)
|
kdfParams = kdfParamsForScrypt(v3Params)
|
||||||
// FIXME: support progress reporting callback
|
// FIXME: support progress reporting callback
|
||||||
derivedKey = scryptsy(
|
derivedKey = scrypt(
|
||||||
Buffer.from(password),
|
Buffer.from(password),
|
||||||
kdfParams.salt,
|
kdfParams.salt,
|
||||||
kdfParams.n,
|
kdfParams.n,
|
||||||
|
|
|
@ -3,7 +3,7 @@ import * as ethUtil from 'ethereumjs-util'
|
||||||
|
|
||||||
import Wallet from './index'
|
import Wallet from './index'
|
||||||
|
|
||||||
const scryptsy = require('scrypt.js')
|
const scrypt = require('@web3-js/scrypt-shim')
|
||||||
const utf8 = require('utf8')
|
const utf8 = require('utf8')
|
||||||
const aesjs = require('aes-js')
|
const aesjs = require('aes-js')
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ function fromKryptoKit(entropy: string, password: string): Wallet {
|
||||||
const checksum = entropy.slice(30, 46)
|
const checksum = entropy.slice(30, 46)
|
||||||
|
|
||||||
const salt = kryptoKitBrokenScryptSeed(encryptedSeed)
|
const salt = kryptoKitBrokenScryptSeed(encryptedSeed)
|
||||||
const aesKey = scryptsy(Buffer.from(password, 'utf8'), salt, 16384, 8, 1, 32)
|
const aesKey = scrypt(Buffer.from(password, 'utf8'), salt, 16384, 8, 1, 32)
|
||||||
|
|
||||||
/* FIXME: try to use `crypto` instead of `aesjs`
|
/* FIXME: try to use `crypto` instead of `aesjs`
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue