Merge pull request #108 from dmihal/use-scrypt-shim

Change scrypt.js to scrypt-shim

Author: holgerd77

package.json

@@ -43,12 +43,12 @@
   },
   "homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
   "dependencies": {
+    "@web3-js/scrypt-shim": "^0.1.0",
     "aes-js": "^3.1.1",
     "bs58check": "^2.1.2",
     "ethereumjs-util": "^6.0.0",
     "hdkey": "^1.1.1",
     "randombytes": "^2.0.6",
-    "scrypt.js": "^0.3.0",
     "utf8": "^3.0.0",
     "uuid": "^3.3.2"
   },
@@ -58,9 +58,9 @@
     "@ethereumjs/config-tsc": "^1.1.1",
     "@ethereumjs/config-tslint": "^1.1.1",
     "@types/bn.js": "^4.11.5",
+    "@types/lodash.zip": "^4.2.6",
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.0.10",
-    "@types/lodash.zip": "^4.2.6",
     "coveralls": "^3.0.0",
     "ethers": "^4.0.33",
     "husky": "^2.1.0",

src/index.ts

@@ -3,7 +3,7 @@ import * as ethUtil from 'ethereumjs-util'
 
 const bs58check = require('bs58check')
 const randomBytes = require('randombytes')
-const scryptsy = require('scrypt.js')
+const scryptsy = require('@web3-js/scrypt-shim')
 const uuidv4 = require('uuid/v4')
 
 // parameters for the toV3() method

src/thirdparty.ts

@@ -3,7 +3,7 @@ import * as ethUtil from 'ethereumjs-util'
 
 import Wallet from './index'
 
-const scryptsy = require('scrypt.js')
+const scryptsy = require('@web3-js/scrypt-shim')
 const utf8 = require('utf8')
 const aesjs = require('aes-js')
 

test/index.ts

@@ -297,12 +297,14 @@ describe('.toV3()', function() {
           p: p,
         })
 
-        const encFixtureEthersWallet = (await fixtureEthersWallet.encrypt(pw, {
-          scrypt: { N: n, r: r, p: p },
-          salt: ethersOpts.salt,
-          iv: ethersOpts.iv,
-          uuid: ethersOpts.uuid,
-        })).toLowerCase()
+        const encFixtureEthersWallet = (
+          await fixtureEthersWallet.encrypt(pw, {
+            scrypt: { N: n, r: r, p: p },
+            salt: ethersOpts.salt,
+            iv: ethersOpts.iv,
+            uuid: ethersOpts.uuid,
+          })
+        ).toLowerCase()
 
         const encRandomWallet = wRandom.toV3String(pw, {
           kdf: 'scrypt',
@@ -314,12 +316,14 @@ describe('.toV3()', function() {
           p: p,
         })
 
-        const encEthersWallet = (await wEthers.encrypt(pw, {
-          scrypt: { N: n, r: r, p: p },
-          salt: ethersOpts.salt,
-          iv: ethersOpts.iv,
-          uuid: ethersOpts.uuid,
-        })).toLowerCase()
+        const encEthersWallet = (
+          await wEthers.encrypt(pw, {
+            scrypt: { N: n, r: r, p: p },
+            salt: ethersOpts.salt,
+            iv: ethersOpts.iv,
+            uuid: ethersOpts.uuid,
+          })
+        ).toLowerCase()
 
         assert.deepStrictEqual(JSON.parse(wStatic), JSON.parse(encFixtureWallet))
         assert.deepStrictEqual(JSON.parse(wStatic), JSON.parse(encFixtureEthersWallet))