Merge pull request #114 from kumavis/v0.6.x

v0.6.x back patch: add node v12 support

.travis.yml

@@ -3,6 +3,8 @@ node_js:
   - "6"
   - "8"
   - "10"
+  - "12"
+  - "14"
 env:
   - CXX=g++-4.8
 addons:
@@ -11,20 +13,12 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
-branches:
-  # We need to whitelist the branches which we want to have "push" automation.
-  # Pull request automation is not constrained to this set of branches.
-  only:
-  - master
 env:
   matrix:
     - CXX=g++-4.8 TEST_SUITE=test
 matrix:
   fast_finish: true
   include:
-    - os: linux
-      node_js: "8"
-      env: CXX=g++-4.8 TEST_SUITE=coveralls
     - os: linux
       node_js: "8"
       env: CXX=g++-4.8 TEST_SUITE=lint

package.json

@@ -37,13 +37,13 @@
   },
   "homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
   "dependencies": {
+    "scryptsy": "^1.2.1",
     "aes-js": "^3.1.1",
     "bs58check": "^2.1.2",
     "ethereumjs-util": "^6.0.0",
     "hdkey": "^1.1.1",
     "randombytes": "^2.0.6",
     "safe-buffer": "^5.1.2",
-    "scrypt.js": "^0.3.0",
     "utf8": "^3.0.0",
     "uuid": "^3.3.2"
   },

src/index.js

@@ -2,7 +2,7 @@ var Buffer = require('safe-buffer').Buffer
 var ethUtil = require('ethereumjs-util')
 var crypto = require('crypto')
 var randomBytes = require('randombytes')
-var scryptsy = require('scrypt.js')
+var scryptsy = require('scryptsy')
 var uuidv4 = require('uuid/v4')
 var bs58check = require('bs58check')
 

src/thirdparty.js

@@ -1,7 +1,7 @@
 var Wallet = require('./index.js')
 var ethUtil = require('ethereumjs-util')
 var crypto = require('crypto')
-var scryptsy = require('scrypt.js')
+var scryptsy = require('scryptsy')
 var utf8 = require('utf8')
 var aesjs = require('aes-js')
 var Buffer = require('safe-buffer').Buffer
@@ -176,7 +176,7 @@ Thirdparty.fromKryptoKit = function (entropy, password) {
 
   var privKey
   if (type === 'd') {
-    privKey = ethUtil.sha256(entropy)
+    privKey = ethUtil.sha256(Buffer.from(entropy))
   } else if (type === 'q') {
     if (typeof password !== 'string') {
       throw new Error('Password required')