mirror of https://github.com/embarklabs/embark.git
chore: upgrade ethereumjs-wallet
This pull-request upgrades `ethereumjs-wallet`, which has upgraded the underlying dependency on scrypt.js to 0.3.0, making scrypt an optional dependency and offering a pure JS version as a fallback. The reasoning behind this is that scrypt is problematic to install in some systems, particularly those that don't have node-gyp setup and we have seen some weird issues when installing with elevated privileges (i.e. `sudo npm install -g scrypt`)
This commit is contained in:
parent
efb63af71e
commit
85cf9ac44b
|
@ -49,7 +49,7 @@
|
||||||
"bip39": "2.5.0",
|
"bip39": "2.5.0",
|
||||||
"clipboardy": "1.2.3",
|
"clipboardy": "1.2.3",
|
||||||
"colors": "1.3.2",
|
"colors": "1.3.2",
|
||||||
"ethereumjs-wallet": "0.6.0",
|
"ethereumjs-wallet": "0.6.3",
|
||||||
"embark-i18n": "^4.1.0-beta.0",
|
"embark-i18n": "^4.1.0-beta.0",
|
||||||
"follow-redirects": "1.5.7",
|
"follow-redirects": "1.5.7",
|
||||||
"fuzzy": "0.1.3",
|
"fuzzy": "0.1.3",
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
"eth-ens-namehash": "2.0.8",
|
"eth-ens-namehash": "2.0.8",
|
||||||
"ethereumjs-tx": "1.3.7",
|
"ethereumjs-tx": "1.3.7",
|
||||||
"ethereumjs-util": "6.0.0",
|
"ethereumjs-util": "6.0.0",
|
||||||
"ethereumjs-wallet": "0.6.0",
|
"ethereumjs-wallet": "0.6.3",
|
||||||
"file-loader": "2.0.0",
|
"file-loader": "2.0.0",
|
||||||
"find-up": "2.1.0",
|
"find-up": "2.1.0",
|
||||||
"flatted": "0.2.3",
|
"flatted": "0.2.3",
|
||||||
|
|
93
yarn.lock
93
yarn.lock
|
@ -3367,11 +3367,6 @@ aes-js@3.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
|
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
|
||||||
integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=
|
integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=
|
||||||
|
|
||||||
aes-js@^0.2.3:
|
|
||||||
version "0.2.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"
|
|
||||||
integrity sha1-lLiBq3FyhtAV+iGeCPtmcJ3aWj0=
|
|
||||||
|
|
||||||
aes-js@^3.1.1:
|
aes-js@^3.1.1:
|
||||||
version "3.1.2"
|
version "3.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
|
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
|
||||||
|
@ -4886,11 +4881,6 @@ base-x@3.0.4:
|
||||||
dependencies:
|
dependencies:
|
||||||
safe-buffer "^5.0.1"
|
safe-buffer "^5.0.1"
|
||||||
|
|
||||||
base-x@^1.1.0:
|
|
||||||
version "1.1.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac"
|
|
||||||
integrity sha1-QtPXF0dPnqAiB/bRqh9CaRPut6w=
|
|
||||||
|
|
||||||
base-x@^3.0.2:
|
base-x@^3.0.2:
|
||||||
version "3.0.5"
|
version "3.0.5"
|
||||||
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.5.tgz#d3ada59afed05b921ab581ec3112e6444ba0795a"
|
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.5.tgz#d3ada59afed05b921ab581ec3112e6444ba0795a"
|
||||||
|
@ -5291,13 +5281,6 @@ bs58@^2.0.1:
|
||||||
resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d"
|
resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d"
|
||||||
integrity sha1-VZCNWPGYKrogCPob7Y+RmYopv40=
|
integrity sha1-VZCNWPGYKrogCPob7Y+RmYopv40=
|
||||||
|
|
||||||
bs58@^3.1.0:
|
|
||||||
version "3.1.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/bs58/-/bs58-3.1.0.tgz#d4c26388bf4804cac714141b1945aa47e5eb248e"
|
|
||||||
integrity sha1-1MJjiL9IBMrHFBQbGUWqR+XrJI4=
|
|
||||||
dependencies:
|
|
||||||
base-x "^1.1.0"
|
|
||||||
|
|
||||||
bs58@^4.0.0, bs58@^4.0.1:
|
bs58@^4.0.0, bs58@^4.0.1:
|
||||||
version "4.0.1"
|
version "4.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
|
resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
|
||||||
|
@ -5305,14 +5288,6 @@ bs58@^4.0.0, bs58@^4.0.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
base-x "^3.0.2"
|
base-x "^3.0.2"
|
||||||
|
|
||||||
bs58check@^1.0.8:
|
|
||||||
version "1.3.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-1.3.4.tgz#c52540073749117714fa042c3047eb8f9151cbf8"
|
|
||||||
integrity sha1-xSVABzdJEXcU+gQsMEfrj5FRy/g=
|
|
||||||
dependencies:
|
|
||||||
bs58 "^3.1.0"
|
|
||||||
create-hash "^1.1.0"
|
|
||||||
|
|
||||||
bs58check@^2.1.2:
|
bs58check@^2.1.2:
|
||||||
version "2.1.2"
|
version "2.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
|
resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
|
||||||
|
@ -8298,7 +8273,7 @@ ethereumjs-util@6.0.0, ethereumjs-util@^6.0.0:
|
||||||
safe-buffer "^5.1.1"
|
safe-buffer "^5.1.1"
|
||||||
secp256k1 "^3.0.1"
|
secp256k1 "^3.0.1"
|
||||||
|
|
||||||
ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0, ethereumjs-util@^4.5.0:
|
ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.5.0:
|
||||||
version "4.5.0"
|
version "4.5.0"
|
||||||
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
|
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
|
||||||
integrity sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=
|
integrity sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=
|
||||||
|
@ -8360,19 +8335,6 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4:
|
||||||
rustbn.js "~0.2.0"
|
rustbn.js "~0.2.0"
|
||||||
safe-buffer "^5.1.1"
|
safe-buffer "^5.1.1"
|
||||||
|
|
||||||
ethereumjs-wallet@0.6.0:
|
|
||||||
version "0.6.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz#82763b1697ee7a796be7155da9dfb49b2f98cfdb"
|
|
||||||
integrity sha1-gnY7Fpfuenlr5xVdqd+0my+Yz9s=
|
|
||||||
dependencies:
|
|
||||||
aes-js "^0.2.3"
|
|
||||||
bs58check "^1.0.8"
|
|
||||||
ethereumjs-util "^4.4.0"
|
|
||||||
hdkey "^0.7.0"
|
|
||||||
scrypt.js "^0.2.0"
|
|
||||||
utf8 "^2.1.1"
|
|
||||||
uuid "^2.0.1"
|
|
||||||
|
|
||||||
ethereumjs-wallet@0.6.2:
|
ethereumjs-wallet@0.6.2:
|
||||||
version "0.6.2"
|
version "0.6.2"
|
||||||
resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
|
resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
|
||||||
|
@ -8387,6 +8349,21 @@ ethereumjs-wallet@0.6.2:
|
||||||
utf8 "^3.0.0"
|
utf8 "^3.0.0"
|
||||||
uuid "^3.3.2"
|
uuid "^3.3.2"
|
||||||
|
|
||||||
|
ethereumjs-wallet@0.6.3:
|
||||||
|
version "0.6.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.3.tgz#b0eae6f327637c2aeb9ccb9047b982ac542e6ab1"
|
||||||
|
integrity sha512-qiXPiZOsStem+Dj/CQHbn5qex+FVkuPmGH7SvSnA9F3tdRDt8dLMyvIj3+U05QzVZNPYh4HXEdnzoYI4dZkr9w==
|
||||||
|
dependencies:
|
||||||
|
aes-js "^3.1.1"
|
||||||
|
bs58check "^2.1.2"
|
||||||
|
ethereumjs-util "^6.0.0"
|
||||||
|
hdkey "^1.1.0"
|
||||||
|
randombytes "^2.0.6"
|
||||||
|
safe-buffer "^5.1.2"
|
||||||
|
scrypt.js "^0.3.0"
|
||||||
|
utf8 "^3.0.0"
|
||||||
|
uuid "^3.3.2"
|
||||||
|
|
||||||
ethers@4.0.0-beta.1:
|
ethers@4.0.0-beta.1:
|
||||||
version "4.0.0-beta.1"
|
version "4.0.0-beta.1"
|
||||||
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.1.tgz#0648268b83e0e91a961b1af971c662cdf8cbab6d"
|
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.1.tgz#0648268b83e0e91a961b1af971c662cdf8cbab6d"
|
||||||
|
@ -10005,14 +9982,6 @@ hastscript@^5.0.0:
|
||||||
property-information "^5.0.1"
|
property-information "^5.0.1"
|
||||||
space-separated-tokens "^1.0.0"
|
space-separated-tokens "^1.0.0"
|
||||||
|
|
||||||
hdkey@^0.7.0:
|
|
||||||
version "0.7.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632"
|
|
||||||
integrity sha1-yu5L6BqneSHpCbjSKN0PKayu5jI=
|
|
||||||
dependencies:
|
|
||||||
coinstring "^2.0.0"
|
|
||||||
secp256k1 "^3.0.1"
|
|
||||||
|
|
||||||
hdkey@^1.0.0:
|
hdkey@^1.0.0:
|
||||||
version "1.1.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
|
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
|
||||||
|
@ -10022,6 +9991,15 @@ hdkey@^1.0.0:
|
||||||
safe-buffer "^5.1.1"
|
safe-buffer "^5.1.1"
|
||||||
secp256k1 "^3.0.1"
|
secp256k1 "^3.0.1"
|
||||||
|
|
||||||
|
hdkey@^1.1.0:
|
||||||
|
version "1.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.1.tgz#c2b3bfd5883ff9529b72f2f08b28be0972a9f64a"
|
||||||
|
integrity sha512-DvHZ5OuavsfWs5yfVJZestsnc3wzPvLWNk6c2nRUfo6X+OtxypGt20vDDf7Ba+MJzjL3KS1og2nw2eBbLCOUTA==
|
||||||
|
dependencies:
|
||||||
|
coinstring "^2.0.0"
|
||||||
|
safe-buffer "^5.1.1"
|
||||||
|
secp256k1 "^3.0.1"
|
||||||
|
|
||||||
he@1.1.1:
|
he@1.1.1:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
|
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
|
||||||
|
@ -15819,6 +15797,13 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
|
||||||
dependencies:
|
dependencies:
|
||||||
safe-buffer "^5.1.0"
|
safe-buffer "^5.1.0"
|
||||||
|
|
||||||
|
randombytes@^2.0.6:
|
||||||
|
version "2.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
|
||||||
|
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
|
||||||
|
dependencies:
|
||||||
|
safe-buffer "^5.1.0"
|
||||||
|
|
||||||
randomfill@^1.0.3:
|
randomfill@^1.0.3:
|
||||||
version "1.0.4"
|
version "1.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
|
resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
|
||||||
|
@ -17292,6 +17277,15 @@ scrypt.js@0.2.0, scrypt.js@^0.2.0:
|
||||||
scrypt "^6.0.2"
|
scrypt "^6.0.2"
|
||||||
scryptsy "^1.2.1"
|
scryptsy "^1.2.1"
|
||||||
|
|
||||||
|
scrypt.js@^0.3.0:
|
||||||
|
version "0.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.3.0.tgz#6c62d61728ad533c8c376a2e5e3e86d41a95c4c0"
|
||||||
|
integrity sha512-42LTc1nyFsyv/o0gcHtDztrn+aqpkaCNt5Qh7ATBZfhEZU7IC/0oT/qbBH+uRNoAPvs2fwiOId68FDEoSRA8/A==
|
||||||
|
dependencies:
|
||||||
|
scryptsy "^1.2.1"
|
||||||
|
optionalDependencies:
|
||||||
|
scrypt "^6.0.2"
|
||||||
|
|
||||||
scrypt@^6.0.2:
|
scrypt@^6.0.2:
|
||||||
version "6.0.3"
|
version "6.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d"
|
resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d"
|
||||||
|
@ -19391,11 +19385,6 @@ uuid@3.3.2, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
|
||||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
|
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
|
||||||
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
|
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
|
||||||
|
|
||||||
uuid@^2.0.1:
|
|
||||||
version "2.0.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
|
|
||||||
integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
|
|
||||||
|
|
||||||
validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
|
validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
|
||||||
version "3.0.4"
|
version "3.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
|
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
|
||||||
|
|
Loading…
Reference in New Issue