aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-11-15 13:30:49 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-11-15 13:30:49 +0800
commit3219e949cf72ae34e62dfe045330b522041083ae (patch)
tree90f82a6aa9bb94cf8b314d55b2ddb5d2fdb66bcb
parentca758f0bd605f52c14b984e1c4fac55a3171ce8a (diff)
parent4dbc0926c6f66f0d3c9c8110bef6efe8f6eca918 (diff)
downloadtangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar.gz
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar.bz2
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar.lz
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar.xz
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.tar.zst
tangerine-wallet-browser-3219e949cf72ae34e62dfe045330b522041083ae.zip
Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezor-v5
-rw-r--r--package-lock.json23
-rwxr-xr-xtest/e2e/beta/run-drizzle.sh4
2 files changed, 19 insertions, 8 deletions
diff --git a/package-lock.json b/package-lock.json
index 4bf9fea4a..fca0ee94c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10502,10 +10502,17 @@
"resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
"integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
"requires": {
- "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
"ethereumjs-util": "^5.1.1"
}
},
+ "ethereumjs-abi": {
+ "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
+ "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
+ "requires": {
+ "bn.js": "^4.10.0",
+ "ethereumjs-util": "^5.0.0"
+ }
+ },
"ethereumjs-util": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
@@ -27250,6 +27257,7 @@
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"dev": true,
+ "optional": true,
"requires": {
"kind-of": "^3.0.2",
"longest": "^1.0.1",
@@ -27628,7 +27636,8 @@
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
- "dev": true
+ "dev": true,
+ "optional": true
},
"is-builtin-module": {
"version": "1.0.0",
@@ -27724,6 +27733,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
+ "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -27766,7 +27776,8 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"lru-cache": {
"version": "4.1.3",
@@ -27996,7 +28007,8 @@
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"require-directory": {
"version": "2.1.1",
@@ -38320,7 +38332,6 @@
"resolved": "https://registry.npmjs.org/web3/-/web3-0.20.3.tgz",
"integrity": "sha1-yqRDc9yIFayHZ73ba6cwc5ZMqos=",
"requires": {
- "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"crypto-js": "^3.1.4",
"utf8": "^2.1.1",
"xhr2": "*",
@@ -38329,7 +38340,7 @@
"dependencies": {
"bignumber.js": {
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
- "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
+ "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
}
}
},
diff --git a/test/e2e/beta/run-drizzle.sh b/test/e2e/beta/run-drizzle.sh
index 609f2765e..04f2b2b54 100755
--- a/test/e2e/beta/run-drizzle.sh
+++ b/test/e2e/beta/run-drizzle.sh
@@ -7,8 +7,8 @@ sleep 5
cd test/e2e/beta/
rm -rf drizzle-test
mkdir drizzle-test && cd drizzle-test
-sudo npm install -g truffle
-truffle unbox drizzle
+npm install truffle
+truffle unbox https://github.com/brunobar79/drizzle-box/
echo "Deploying contracts for Drizzle test..."
truffle compile && truffle migrate
BROWSER=none npm start >> /dev/null 2>&1 &