aboutsummaryrefslogtreecommitdiffstats
path: root/package-lock.json
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-13 01:19:51 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-13 01:19:51 +0800
commit4b528405eac7cea54c743307e6f577abd6ce9507 (patch)
treed92bd22a4699f80302e045337d3d07945096dec0 /package-lock.json
parent07d8bfaec51a798e090bd2521debeddaf53bf2f9 (diff)
downloadtangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar.gz
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar.bz2
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar.lz
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar.xz
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.tar.zst
tangerine-wallet-browser-4b528405eac7cea54c743307e6f577abd6ce9507.zip
catching up with develop
Diffstat (limited to 'package-lock.json')
-rw-r--r--package-lock.json44
1 files changed, 31 insertions, 13 deletions
diff --git a/package-lock.json b/package-lock.json
index 6491f71dd..fe2db35b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11853,9 +11853,9 @@
}
},
"ganache-core": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/ganache-core/-/ganache-core-2.1.4.tgz",
- "integrity": "sha512-wYpfArYA/pCgoQtsb5V8E62b580MnQfMQHuldWToc6Fa7Z5r5u8eB0oftxbrgbdJkR3oJkNykfc2clq0hgZfWQ==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/ganache-core/-/ganache-core-2.1.5.tgz",
+ "integrity": "sha512-PuHUfISgrQknb7JpspxSzhpoYfqBWoOdTBHQj/81gu6YypRUHzD2Z6gZmFDxDzG30MFElEHp8JtexaGdgq9iYw==",
"dev": true,
"requires": {
"abstract-leveldown": "^3.0.0",
@@ -11867,7 +11867,7 @@
"clone": "^2.1.1",
"ethereumjs-account": "~2.0.4",
"ethereumjs-block": "~1.2.2",
- "ethereumjs-tx": "^1.3.0",
+ "ethereumjs-tx": "1.3.4",
"ethereumjs-util": "^5.2.0",
"ethereumjs-vm": "2.3.5",
"ethereumjs-wallet": "~0.6.0",
@@ -12024,6 +12024,24 @@
}
}
},
+ "ethereumjs-tx": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.4.tgz",
+ "integrity": "sha512-kOgUd5jC+0tgV7t52UDECMMz9Uf+Lro+6fSpCvzWemtXfMEcwI3EOxf5mVPMRbTFkMMhuERokNNVF3jItAjidg==",
+ "dev": true,
+ "requires": {
+ "ethereum-common": "^0.0.18",
+ "ethereumjs-util": "^5.0.0"
+ },
+ "dependencies": {
+ "ethereum-common": {
+ "version": "0.0.18",
+ "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
+ "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=",
+ "dev": true
+ }
+ }
+ },
"ethereumjs-util": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
@@ -12188,9 +12206,9 @@
"dev": true
},
"ws": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz",
- "integrity": "sha512-2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A==",
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
"dev": true,
"requires": {
"async-limiter": "~1.0.0"
@@ -18644,9 +18662,9 @@
}
},
"log4js": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz",
- "integrity": "sha512-NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ==",
+ "version": "2.11.0",
+ "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz",
+ "integrity": "sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==",
"dev": true,
"requires": {
"amqplib": "^0.5.2",
@@ -18665,9 +18683,9 @@
},
"dependencies": {
"circular-json": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz",
- "integrity": "sha512-vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig==",
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz",
+ "integrity": "sha512-13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==",
"dev": true
},
"debug": {