diff --git a/app/trezor-usb-permissions.html b/app/trezor-usb-permissions.html
index 34791288f..fc1da1657 100644
--- a/app/trezor-usb-permissions.html
+++ b/app/trezor-usb-permissions.html
@@ -28,6 +28,6 @@
-
+
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 06dfecda2..cf9fdb585 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10250,8 +10250,8 @@
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
}
},
"ethereumjs-util": {
@@ -10437,8 +10437,8 @@
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
}
},
"ethereumjs-util": {
@@ -10509,8 +10509,8 @@
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d84a96796079c8595a0c78accd1e7709f2277215",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
}
},
"ethereumjs-util": {
@@ -10570,8 +10570,8 @@
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d84a96796079c8595a0c78accd1e7709f2277215",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
}
},
"ethereumjs-tx": {
@@ -10963,23 +10963,31 @@
}
},
"eth-trezor-keyring": {
- "version": "github:vbaranov/eth-trezor-keyring#ec3df8a71ff8733e525d5609faeb5b711678dd11",
- "from": "github:vbaranov/eth-trezor-keyring#0.2.0--clear-accounts-flag",
+ "version": "github:vbaranov/eth-trezor-keyring#97eae35b7de7e1107f11de74635d787750596e10",
+ "from": "github:vbaranov/eth-trezor-keyring#0.3.0--clear-accounts-flag",
"requires": {
"eth-sig-util": "^1.4.2",
"ethereumjs-tx": "^1.3.4",
"ethereumjs-util": "^5.1.5",
"events": "^2.0.0",
"hdkey": "0.8.0",
- "trezor-connect": "^6.0.2"
+ "trezor-connect": "^7.0.1"
},
"dependencies": {
+ "@babel/runtime": {
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz",
+ "integrity": "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==",
+ "requires": {
+ "regenerator-runtime": "^0.12.0"
+ }
+ },
"eth-sig-util": {
"version": "1.4.2",
"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#d84a96796079c8595a0c78accd1e7709f2277215",
+ "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
"ethereumjs-util": "^5.1.1"
}
},
@@ -10989,11 +10997,27 @@
"integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8="
},
"ethereumjs-abi": {
- "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d84a96796079c8595a0c78accd1e7709f2277215",
+ "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
+ },
+ "dependencies": {
+ "ethereumjs-util": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+ "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+ "requires": {
+ "bn.js": "^4.11.0",
+ "create-hash": "^1.1.2",
+ "ethjs-util": "0.1.6",
+ "keccak": "^1.0.2",
+ "rlp": "^2.0.0",
+ "safe-buffer": "^5.1.1",
+ "secp256k1": "^3.0.1"
+ }
+ }
}
},
"ethereumjs-tx": {
@@ -11019,6 +11043,15 @@
"secp256k1": "^3.0.1"
}
},
+ "ethjs-util": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+ "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+ "requires": {
+ "is-hex-prefixed": "1.0.0",
+ "strip-hex-prefix": "1.0.0"
+ }
+ },
"events": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
@@ -11033,6 +11066,33 @@
"safe-buffer": "^5.1.1",
"secp256k1": "^3.0.1"
}
+ },
+ "regenerator-runtime": {
+ "version": "0.12.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+ "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+ },
+ "trezor-connect": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/trezor-connect/-/trezor-connect-7.0.1.tgz",
+ "integrity": "sha512-cMPwSGMfBpp4z5AZvpRwbYNOJU/X+WaxPm+O1Bl1qsdtpl1P4mX81KDtImY6GBk0xC8aKyOd/ZIqYWXZF9tCRQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "events": "^3.0.0",
+ "whatwg-fetch": "^3.0.0"
+ },
+ "dependencies": {
+ "events": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+ "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
+ }
+ }
+ },
+ "whatwg-fetch": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+ "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
}
}
},
@@ -11069,8 +11129,8 @@
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
}
},
"ethereumjs-util": {
@@ -25567,6 +25627,21 @@
"requires": {
"browserify-sha3": "^0.0.1",
"sha3": "^1.1.0"
+ },
+ "dependencies": {
+ "nan": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+ "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+ },
+ "sha3": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.2.tgz",
+ "integrity": "sha1-pmxQmN5MJbyIM27ItIF9AFvKe6k=",
+ "requires": {
+ "nan": "2.10.0"
+ }
+ }
}
},
"kew": {
@@ -34809,11 +34884,22 @@
}
},
"sha3": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.0.tgz",
- "integrity": "sha1-aYnxtwpJhwWHajc+LGKs6WqpOZo=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/sha3/-/sha3-2.0.0.tgz",
+ "integrity": "sha512-20U15KDnIWrpJDSQ8o1i1C+dH3g/c08DYXyS2/wIfbErDn6pbw8rvYCwJvFH5OO3ZwwNNy0NVcua7Cxdd2RBnA==",
"requires": {
- "nan": "^2.0.5"
+ "buffer": "5.2.1"
+ },
+ "dependencies": {
+ "buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+ "requires": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4"
+ }
+ }
}
},
"shallow-clone": {
@@ -38160,23 +38246,6 @@
"resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz",
"integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="
},
- "trezor-connect": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/trezor-connect/-/trezor-connect-6.0.3.tgz",
- "integrity": "sha512-QqgnulN9uQstVjxYTF9+gcNk01kBUQA4xXy2abyPOgxh8Wio9iiSGftQa12KkFfWLZKkZD1sL03KvQ2ievL05g==",
- "requires": {
- "babel-runtime": "^6.26.0",
- "events": "^1.1.1",
- "whatwg-fetch": "^2.0.4"
- },
- "dependencies": {
- "whatwg-fetch": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
- "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
- }
- }
- },
"trim": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
diff --git a/package.json b/package.json
index 92c90520d..9ceb7e94a 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
"eth-query": "^2.1.2",
"eth-sig-util": "^2.0.2",
"eth-token-watcher": "^1.1.6",
- "eth-trezor-keyring": "github:vbaranov/eth-trezor-keyring#0.2.0--clear-accounts-flag",
+ "eth-trezor-keyring": "github:vbaranov/eth-trezor-keyring#0.3.0--clear-accounts-flag",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
@@ -202,6 +202,7 @@
"sandwich-expando": "^1.1.3",
"semaphore": "^1.0.5",
"semver": "^5.4.1",
+ "sha3": "^2.0.0",
"sw-controller": "^1.0.3",
"sw-stream": "^2.0.2",
"swappable-obj-proxy": "^1.1.0",