Merge pull request #3035 from michaelsbradleyjr/refactor/1.x-scrypt-shim

Replace 1.x scrypt shim of web3-eth-accounts with https://github.com/web3-js/scrypt-shim

bower.json

@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [

package.js

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
     name: 'ethereum:web3',
-    version: '1.2.0',
+    version: '1.2.1',
     summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
     git: 'https://github.com/ethereum/ethereum.js',
     // By default, Meteor will default to using README.md for documentation.

packages/web3-eth-accounts/package.json

@@ -12,8 +12,7 @@
         "any-promise": "1.3.0",
         "crypto-browserify": "3.12.0",
         "eth-lib": "0.2.7",
-        "scryptsy": "2.1.0",
-        "semver": "6.2.0",
+        "scrypt-shim": "github:web3-js/scrypt-shim",
         "underscore": "1.9.1",
         "uuid": "3.3.2",
         "web3-core": "1.2.1",

packages/web3-eth-accounts/src/index.js

@@ -32,7 +32,7 @@ var RLP = require("eth-lib/lib/rlp");
 var Nat = require("eth-lib/lib/nat");
 var Bytes = require("eth-lib/lib/bytes");
 var cryp = (typeof global === 'undefined') ? require('crypto-browserify') : require('crypto');
-var scrypt = require('./scrypt');
+var scrypt = require('scrypt-shim');
 var uuid = require('uuid');
 var utils = require('web3-utils');
 var helpers = require('web3-core-helpers');