aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-10-16 07:02:23 +0800
committerGitHub <noreply@github.com>2018-10-16 07:02:23 +0800
commitde169221b51ea24e18274362c3ac3d19bcf9b453 (patch)
tree0d6b18cbf40d6360c6dccee22aedf7cecf3d6594
parentc7758ebd15f1b5638102bfa913a69aa7abb7b7fc (diff)
parentfebf214ee89aa1db4645fcce14f96850c682f367 (diff)
downloadtangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar.gz
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar.bz2
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar.lz
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar.xz
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.tar.zst
tangerine-wallet-browser-de169221b51ea24e18274362c3ac3d19bcf9b453.zip
Merge pull request #5521 from MetaMask/deps-old-ethjs-fix
bug fix - bump eth-token-tracker for ethjs-rpc bug in deps
-rw-r--r--package-lock.json160
-rw-r--r--package.json2
2 files changed, 70 insertions, 92 deletions
diff --git a/package-lock.json b/package-lock.json
index 968186218..09b66d261 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10376,21 +10376,21 @@
}
},
"eth-token-tracker": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/eth-token-tracker/-/eth-token-tracker-1.1.4.tgz",
- "integrity": "sha1-Kf8kV9Zr+juO5JDoP/QP0M8s7EE=",
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/eth-token-tracker/-/eth-token-tracker-1.1.5.tgz",
+ "integrity": "sha512-dyNzEt62i5vpbAAHHj6kEVxSHg/WqCr7TBq1Sbs4y0PvsxcvfWLJpEYtJilndg36H7nJHGadgmHqGW5mYbcNfw==",
"requires": {
"deep-equal": "^1.0.1",
"eth-block-tracker": "^1.0.7",
- "ethjs": "^0.2.7",
- "ethjs-contract": "^0.1.9",
- "ethjs-query": "^0.2.6",
+ "ethjs": "^0.3.6",
+ "ethjs-contract": "^0.2.1",
+ "ethjs-query": "^0.3.7",
"human-standard-token-abi": "^1.0.2"
},
"dependencies": {
"babelify": {
"version": "7.3.0",
- "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
+ "resolved": "http://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
"integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
"requires": {
"babel-core": "^6.0.14",
@@ -10413,81 +10413,58 @@
"ethjs-util": "^0.1.3",
"pify": "^2.3.0",
"tape": "^4.6.3"
- },
- "dependencies": {
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
- }
}
},
"ethjs": {
- "version": "0.2.9",
- "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.2.9.tgz",
- "integrity": "sha1-yagNR7ydVg9Z53gEnSIlXlgfMSs=",
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.3.9.tgz",
+ "integrity": "sha512-gOQzA3tDUjoLpNONSOALJ/rUFtHi5tXl2mholHasF1cvXhoddqi06yU4OJFJu9AGd6n9v9ywzHlYeIKg1t1hdw==",
"requires": {
"bn.js": "4.11.6",
- "ethjs-abi": "0.2.0",
- "ethjs-contract": "0.1.9",
- "ethjs-filter": "0.1.5",
+ "ethjs-abi": "0.2.1",
+ "ethjs-contract": "0.2.2",
+ "ethjs-filter": "0.1.8",
"ethjs-provider-http": "0.1.6",
- "ethjs-query": "0.3.0",
+ "ethjs-query": "0.3.7",
"ethjs-unit": "0.1.6",
"ethjs-util": "0.1.3",
"js-sha3": "0.5.5",
"number-to-bn": "1.7.0"
},
"dependencies": {
- "ethjs-format": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/ethjs-format/-/ethjs-format-0.2.3.tgz",
- "integrity": "sha1-m9hnyu6CstvtmEYAuzAiDPPLWDA=",
+ "ethjs-contract": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.2.2.tgz",
+ "integrity": "sha512-xxPqEjsULQ/QNWuvX6Ako0PGs5RxALA8N/H3+boLvnaXDFZVGpD7H63H1gBCRTZyYqCldPpVlVHuw/rD45vazw==",
"requires": {
- "bn.js": "4.11.6",
- "ethjs-schema": "^0.1.6",
+ "ethjs-abi": "0.2.0",
+ "ethjs-filter": "0.1.8",
"ethjs-util": "0.1.3",
- "is-hex-prefixed": "1.0.0",
- "number-to-bn": "1.7.0",
- "strip-hex-prefix": "1.0.0"
+ "js-sha3": "0.5.5"
+ },
+ "dependencies": {
+ "ethjs-abi": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.0.tgz",
+ "integrity": "sha1-0+LCIQEVIPxJm3FoIDbBT8wvWyU=",
+ "requires": {
+ "bn.js": "4.11.6",
+ "js-sha3": "0.5.5",
+ "number-to-bn": "1.7.0"
+ }
+ }
}
},
"ethjs-query": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.0.tgz",
- "integrity": "sha1-CAmNYQ+BvV+VSnpXq0mJ9+mBX8Q=",
+ "version": "0.3.7",
+ "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.7.tgz",
+ "integrity": "sha512-TZnKUwfkWjy0SowFdPLtmsytCorHi0i4vvkQn7Jg8rZt33cRzKhuzOwKr/G3vdigCc+ePXOhUGMcJSAPlOG44A==",
"requires": {
- "ethjs-format": "0.2.3",
- "ethjs-rpc": "0.1.5"
+ "ethjs-format": "0.2.7",
+ "ethjs-rpc": "0.2.0",
+ "promise-to-callback": "^1.0.0"
}
},
- "ethjs-schema": {
- "version": "0.1.9",
- "resolved": "https://registry.npmjs.org/ethjs-schema/-/ethjs-schema-0.1.9.tgz",
- "integrity": "sha1-hYwqXacGrgSBK0zosetLSSHjMJI="
- },
- "ethjs-util": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz",
- "integrity": "sha1-39XqSkANxeQhqInK9H4IGtp4u1U=",
- "requires": {
- "is-hex-prefixed": "1.0.0",
- "strip-hex-prefix": "1.0.0"
- }
- }
- }
- },
- "ethjs-contract": {
- "version": "0.1.9",
- "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.1.9.tgz",
- "integrity": "sha1-HCdmiWpW1H7B1tZhgpxJzDilUgo=",
- "requires": {
- "ethjs-abi": "0.2.0",
- "ethjs-filter": "0.1.5",
- "ethjs-util": "0.1.3",
- "js-sha3": "0.5.5"
- },
- "dependencies": {
"ethjs-util": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz",
@@ -10499,43 +10476,39 @@
}
}
},
- "ethjs-format": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/ethjs-format/-/ethjs-format-0.2.2.tgz",
- "integrity": "sha1-1zs6YFwuElcHn3B3/VRI6ZjOD80=",
+ "ethjs-abi": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz",
+ "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=",
"requires": {
"bn.js": "4.11.6",
- "ethjs-schema": "0.1.5",
- "ethjs-util": "0.1.3",
- "is-hex-prefixed": "1.0.0",
- "number-to-bn": "1.7.0",
- "strip-hex-prefix": "1.0.0"
- },
- "dependencies": {
- "ethjs-util": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz",
- "integrity": "sha1-39XqSkANxeQhqInK9H4IGtp4u1U=",
- "requires": {
- "is-hex-prefixed": "1.0.0",
- "strip-hex-prefix": "1.0.0"
- }
- }
+ "js-sha3": "0.5.5",
+ "number-to-bn": "1.7.0"
}
},
+ "ethjs-filter": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/ethjs-filter/-/ethjs-filter-0.1.8.tgz",
+ "integrity": "sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA=="
+ },
"ethjs-query": {
- "version": "0.2.9",
- "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.2.9.tgz",
- "integrity": "sha1-om5rTzhpnpLzSyGE51x4lDKcQvE=",
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.8.tgz",
+ "integrity": "sha512-/J5JydqrOzU8O7VBOwZKUWXxHDGr46VqNjBCJgBVNNda+tv7Xc8Y2uJc6aMHHVbeN3YOQ7YRElgIc0q1CI02lQ==",
"requires": {
- "ethjs-format": "0.2.2",
- "ethjs-rpc": "0.1.5"
+ "babel-runtime": "^6.26.0",
+ "ethjs-format": "0.2.7",
+ "ethjs-rpc": "0.2.0",
+ "promise-to-callback": "^1.0.0"
}
},
- "ethjs-schema": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/ethjs-schema/-/ethjs-schema-0.1.5.tgz",
- "integrity": "sha1-WXQOOzl3vNu5sRvDBoIB6Kzquw0="
+ "ethjs-rpc": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz",
+ "integrity": "sha512-RINulkNZTKnj4R/cjYYtYMnFFaBcVALzbtEJEONrrka8IeoarNB9Jbzn+2rT00Cv8y/CxAI+GgY1d0/i2iQeOg==",
+ "requires": {
+ "promise-to-callback": "^1.0.0"
+ }
},
"human-standard-token-abi": {
"version": "1.0.2",
@@ -10546,6 +10519,11 @@
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
"integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
+ },
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
}
}
},
diff --git a/package.json b/package.json
index 3ae6be2a1..c994acc2f 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
"eth-sig-util": "^2.0.2",
- "eth-token-tracker": "^1.1.4",
+ "eth-token-tracker": "^1.1.5",
"eth-trezor-keyring": "^0.1.0",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-tx": "^1.3.0",