diff --git a/js/package-lock.json b/js/package-lock.json index 3dee6e635..3392c7119 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@parity/abi": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.1.1.tgz", - "integrity": "sha512-AWd1Lnsau8DvEihzoGg3xCSOIHFqf1tsn14wHVCRv7O5BcCI+6Ww/g4iLjdYKGLjtMKtxdQiUblCcIhaZrqmpQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.1.2.tgz", + "integrity": "sha512-DVH7aEZrSc0seimtehO6pCkkJ/oqXZanAXJXKqgk6x1vSc276pAk7xOcMNe3RKio7VfnIi9c05tqqTX8hUG5hw==", "requires": { "bignumber.js": "3.0.1", "js-sha3": "0.5.5", @@ -15,12 +15,12 @@ } }, "@parity/api": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.3.tgz", - "integrity": "sha512-M+/9mGQ6Th6LRIXetUHQQqsqSE//XAd/p5I/jrhKqV9dW73dwTIKW/xlPWPi/JwbRiTehbliJKmrt8vsOtvkww==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.5.tgz", + "integrity": "sha512-HkvMIhIwDMEIyTmXqEjWn1C2qes0qJO270bQldRfCZf0XiOGXG726EzV3FUpUbVONCVQ9riDviAl3fw6D+N6nA==", "requires": { - "@parity/abi": "2.1.1", - "@parity/jsonrpc": "2.1.2", + "@parity/abi": "2.1.2", + "@parity/jsonrpc": "2.1.3", "@parity/wordlist": "1.1.0", "bignumber.js": "3.0.1", "blockies": "0.0.2", @@ -47,7 +47,7 @@ } }, "@parity/dapp-console": { - "version": "github:paritytech/dapp-console#71561b4f216d12395bc35b5affb1fc5182626a38" + "version": "github:paritytech/dapp-console#f48baba86be6ee2f04ab208731c9529c7b6f92f8" }, "@parity/dapp-dapp-accounts": { "version": "github:paritytech/dapp-dapp-accounts#4cdbb5962c7a946da9df2fd80f120d9195087d41" @@ -59,31 +59,31 @@ "version": "github:paritytech/dapp-dapp-visible#4506e9e9d25b837ab95d003fcd9f090db5cfefe8" }, "@parity/dapp-dappreg": { - "version": "github:paritytech/dapp-dappreg#9cd360d7dc505b5661470ee9d6b98650c85b83b3" + "version": "github:paritytech/dapp-dappreg#e098ff0a873c7a11e608f0d2472af3bb415c6c0f" }, "@parity/dapp-githubhint": { - "version": "github:paritytech/dapp-githubhint#8e299c739e1663d8590d6a8d345147e974341664" + "version": "github:paritytech/dapp-githubhint#21f52278a775abf6480ff9543af70a6a44a2ccaa" }, "@parity/dapp-localtx": { - "version": "github:paritytech/dapp-localtx#087d32621c5ab87e72bd777b4dd580e9a3c844c4" + "version": "github:paritytech/dapp-localtx#493715fa6e2ac7b28b130618c6f2fee9d6f0bcdb" }, "@parity/dapp-registry": { - "version": "github:paritytech/dapp-registry#654b44d9bccb324d27803c8751742d63e4c7690e" + "version": "github:paritytech/dapp-registry#d9e934e17ded10d1379c8834de26a9621b509f40" }, "@parity/dapp-signaturereg": { - "version": "github:paritytech/dapp-signaturereg#508ff60a6ed59d1d693e39fbcebce92f79ad9691" + "version": "github:paritytech/dapp-signaturereg#a288f69f1912970f3d1bbbe0281f87a4dc9a6743" }, "@parity/dapp-tokendeploy": { - "version": "github:paritytech/dapp-tokendeploy#ef5df286fa9eaed7a393fc93224004221d840af5" + "version": "github:paritytech/dapp-tokendeploy#3c2b03e2a8703ac29e11f36df39ee5f8028dce28" }, "@parity/dapp-tokenreg": { - "version": "github:paritytech/dapp-tokenreg#530980bf9305755936b0692e63a4b7559b0f1027" + "version": "github:paritytech/dapp-tokenreg#a347041854eec61fd9a416b9c9d7bd1bda6b9c3d" }, "@parity/dapp-vaults": { "version": "github:paritytech/dapp-vaults#1bd5de3994227e6b733e7b3e985117a59f0ad638" }, "@parity/dapp-web": { - "version": "github:paritytech/dapp-web#fb0dbd86eeeacabda786150d1d1c2a9add8584d2", + "version": "github:paritytech/dapp-web#6ea1fe0c7c0d01c43788dbf6a11d1573a443ce1d", "requires": { "base32.js": "0.1.0" } @@ -93,7 +93,7 @@ "resolved": "https://registry.npmjs.org/@parity/etherscan/-/etherscan-2.1.3.tgz", "integrity": "sha512-GtQMaE8t7PDOcz/K4Ud+Z6EELB47+qG5V6R7iTJ4DcueXVgiMAXK5OiNeKF3Qjd1/M4FIJdFm5NTSdC7bR38+Q==", "requires": { - "@parity/api": "2.1.3", + "@parity/api": "2.1.5", "bignumber.js": "3.0.1", "es6-promise": "4.1.1", "node-fetch": "1.7.3", @@ -102,9 +102,9 @@ } }, "@parity/jsonrpc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.2.tgz", - "integrity": "sha512-JN5MTZO9d27ZMLuibnYWri2Is0p5ZM7dAXafJNWBKGe1sMBDqQA44Sz6La4Baem2PTgjWAlWYjeD78SXx+9mYA==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.3.tgz", + "integrity": "sha512-ALSn/gwX0r3aTcsKI6ucuEtFXCjIFdFmMN455yade1dju+PSWQ0aR61H3/zzZMGx6fV9OQh+n3xAueBxUjJpzQ==" }, "@parity/ledger": { "version": "2.1.2", @@ -151,11 +151,11 @@ } }, "@parity/ui": { - "version": "2.2.13", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-2.2.13.tgz", - "integrity": "sha512-hMs151GydqeU6fKNt4abptUU91df0GvDzO4I7P9WJ9L/GJYYl2plYZCdhysAg3eYSaKCSMUqD5LZt+JsqoHROQ==", + "version": "2.2.15", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-2.2.15.tgz", + "integrity": "sha512-6bICFA1c1GBz4d7vratkoqovBezJNjc8VCwnZtpPTcyLeMshAhatPV4dGgJo/eHtlOCkKAeaAKatWZhEtXt/5g==", "requires": { - "@parity/api": "2.1.3", + "@parity/api": "2.1.5", "@parity/etherscan": "2.1.3", "@parity/shared": "2.2.5", "bignumber.js": "3.0.1", @@ -207,9 +207,9 @@ "integrity": "sha1-np7Tq3g39WM7WETmCjVenmPkJ64=" }, "@types/node": { - "version": "7.0.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz", - "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==", + "version": "7.0.48", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.48.tgz", + "integrity": "sha512-LLlXafM3BD52MH056tHxTXO8JFCnpJJQkdzIU3+m8ew+CXJY/5zIXgDNb4TK/QFvlI8QexLS5tL+sE0Qhegr1w==", "dev": true }, "JSONStream": { @@ -561,7 +561,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -574,7 +574,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "electron-to-chromium": "1.3.27" } } @@ -1751,9 +1751,9 @@ "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y=" }, "binary-extensions": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", - "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, "bindings": { @@ -1803,7 +1803,7 @@ "deep-equal": "1.0.1", "dns-equal": "1.0.0", "dns-txt": "2.0.2", - "multicast-dns": "6.1.1", + "multicast-dns": "6.2.0", "multicast-dns-service-types": "1.1.0" }, "dependencies": { @@ -1935,12 +1935,12 @@ } }, "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "0.2.9" + "pako": "1.0.6" } }, "browserslist": { @@ -1949,7 +1949,7 @@ "integrity": "sha512-vJEBcDTANoDhSHL46NeOEW5hvQw7It9uCqzeFPQhpawXfnOwnpvW5C97vn1eGJ7iCkSg8wWU0nYObE7d/N95Iw==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000764", + "caniuse-lite": "1.0.30000769", "electron-to-chromium": "1.3.27" } }, @@ -2045,7 +2045,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -2056,22 +2056,22 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "electron-to-chromium": "1.3.27" } } } }, "caniuse-db": { - "version": "1.0.30000764", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000764.tgz", - "integrity": "sha1-1zqxGuYvap4vaYZ9bZwjrj8uXY0=", + "version": "1.0.30000769", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000769.tgz", + "integrity": "sha1-wjC5wbno2z4cDYWMluaFdBuWzBA=", "dev": true }, "caniuse-lite": { - "version": "1.0.30000764", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000764.tgz", - "integrity": "sha1-l+p0cvnT5pHu3jTyGYPPwhmseEI=", + "version": "1.0.30000769", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000769.tgz", + "integrity": "sha1-1oxaoHcuo+rGyX1C4jnJtNMmG5M=", "dev": true }, "caseless": { @@ -3050,14 +3050,14 @@ "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=" }, "d3-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz", - "integrity": "sha1-a0gLqohohdRlHcJIqPSsnaFtsHo=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.1.tgz", + "integrity": "sha512-U4zRVLDXW61bmqoo+OJ/V687e1T5nVd3TAKAJKgtpZ/P1JsMgyod0y9br+mlQOryTAACdiXI3wCjuERHFNp91w==" }, "d3-interpolate": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz", - "integrity": "sha1-aeCZ/zkhRxblY8muw+qdHqS4p58=", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz", + "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==", "requires": { "d3-color": "1.0.3" } @@ -3075,10 +3075,10 @@ "d3-array": "1.2.1", "d3-collection": "1.0.4", "d3-color": "1.0.3", - "d3-format": "1.2.0", - "d3-interpolate": "1.1.5", - "d3-time": "1.0.7", - "d3-time-format": "2.1.0" + "d3-format": "1.2.1", + "d3-interpolate": "1.1.6", + "d3-time": "1.0.8", + "d3-time-format": "2.1.1" } }, "d3-shape": { @@ -3090,16 +3090,16 @@ } }, "d3-time": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz", - "integrity": "sha1-lMr27bt4ebuAnQ0fdXK8SEgvcnA=" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.8.tgz", + "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ==" }, "d3-time-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.0.tgz", - "integrity": "sha512-mqTsfDTylgwE3YE/VNs9oB2OGX274fO0B5j1irbgLQI+X3FPoJg25pesNxrcdZ2nBeRx/6sHDJlDyMIjWL0BGQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz", + "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==", "requires": { - "d3-time": "1.0.7" + "d3-time": "1.0.8" } }, "dashdash": { @@ -3340,7 +3340,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "css-rule-stream": "1.1.0", "duplexer2": "0.0.2", "jsonfilter": "1.1.2", @@ -3359,7 +3359,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "electron-to-chromium": "1.3.27" } }, @@ -3636,7 +3636,7 @@ "integrity": "sha1-BloxAr+LhxAt9QxQmF/v5sVpBFs=", "dev": true, "requires": { - "@types/node": "7.0.46", + "@types/node": "7.0.48", "electron-download": "3.3.0", "extract-zip": "1.6.6" } @@ -4709,7 +4709,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.7.0", + "nan": "2.8.0", "node-pre-gyp": "0.6.39" }, "dependencies": { @@ -6083,7 +6083,7 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.1.9" + "uglify-js": "3.1.10" }, "dependencies": { "source-map": { @@ -6093,9 +6093,9 @@ "dev": true }, "uglify-js": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.9.tgz", - "integrity": "sha512-ari2E89bD7f+fMU173NgF12JBcOhgoxeyuCs97h5K58IBENrnG9eVj2lFadrOPdqf0KifsxVmUQfzA2cHNxCZQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.10.tgz", + "integrity": "sha512-0ul3BWx79We0mIPM1l72oqpMtWL0TVMnKZZY6FaHPy3tDzCZGXeFxw5N1ZvtkmQsLI+ECR/tUQyIYbyHUcuvEw==", "dev": true, "requires": { "commander": "2.11.0", @@ -6240,9 +6240,9 @@ } }, "https-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, "humanize": { @@ -6395,9 +6395,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "inline-style-prefixer": { "version": "2.0.5", @@ -6518,7 +6518,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -7181,7 +7181,7 @@ "requires": { "bindings": "1.3.0", "inherits": "2.0.3", - "nan": "2.7.0", + "nan": "2.8.0", "prebuild-install": "2.3.0", "safe-buffer": "5.1.1" } @@ -7209,7 +7209,7 @@ "requires": { "bindings": "1.3.0", "inherits": "2.0.3", - "nan": "2.7.0", + "nan": "2.8.0", "prebuild-install": "2.3.0" } }, @@ -7224,7 +7224,7 @@ "create-hash": "1.1.3", "drbg.js": "1.0.1", "elliptic": "6.4.0", - "nan": "2.7.0", + "nan": "2.8.0", "prebuild-install": "2.3.0" } } @@ -8054,9 +8054,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz", - "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.0.tgz", + "integrity": "sha512-tnQqWkuWYHCOVRveiWQf+5KjHUnEmtxUycTy1esL4prQjXoT4qpndIS4fH63zObmHNxIHke3YHRnQrXYpXHf2A==", "dev": true, "requires": { "dns-packet": "1.2.2", @@ -8088,9 +8088,9 @@ "dev": true }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" }, "native-promise-only": { "version": "0.8.1", @@ -8177,21 +8177,21 @@ "dev": true }, "node-libs-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", "dev": true, "requires": { "assert": "1.4.1", - "browserify-zlib": "0.1.4", + "browserify-zlib": "0.2.0", "buffer": "4.9.1", "console-browserify": "1.1.0", "constants-browserify": "1.0.0", "crypto-browserify": "3.12.0", "domain-browser": "1.1.7", "events": "1.1.1", - "https-browserify": "0.0.1", - "os-browserify": "0.2.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.0", "process": "0.11.10", "punycode": "1.4.1", @@ -8199,7 +8199,7 @@ "readable-stream": "2.3.3", "stream-browserify": "2.0.1", "stream-http": "2.7.2", - "string_decoder": "0.10.31", + "string_decoder": "1.0.3", "timers-browserify": "2.0.4", "tty-browserify": "0.0.0", "url": "0.11.0", @@ -8212,12 +8212,6 @@ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true } } }, @@ -8466,9 +8460,9 @@ } }, "onecolor": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz", - "integrity": "sha1-daRvgNpseqpbTarhekcZi9llJJQ=", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.5.tgz", + "integrity": "sha1-Nu/zIgE3nv3xGA+0ReUajiQl+fY=", "dev": true }, "onetime": { @@ -8541,9 +8535,9 @@ } }, "os-browserify": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, "os-homedir": { @@ -8603,9 +8597,9 @@ "dev": true }, "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", "dev": true }, "param-case": { @@ -8768,7 +8762,7 @@ "integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=", "dev": true, "requires": { - "onecolor": "3.0.4", + "onecolor": "3.0.5", "synesthesia": "1.0.1" } }, @@ -9156,7 +9150,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "electron-to-chromium": "1.3.27" } } @@ -9747,7 +9741,7 @@ "noop-logger": "0.1.1", "npmlog": "4.1.2", "os-homedir": "1.0.2", - "pump": "1.0.2", + "pump": "1.0.3", "rc": "1.2.2", "simple-get": "1.4.3", "tar-fs": "1.16.0", @@ -9899,9 +9893,9 @@ } }, "pump": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", - "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", "requires": { "end-of-stream": "1.4.0", "once": "1.4.0" @@ -10048,7 +10042,7 @@ "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=", "requires": { "deep-extend": "0.4.2", - "ini": "1.3.4", + "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" }, @@ -10945,13 +10939,13 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "5.3.0" + "ajv": "5.4.0" }, "dependencies": { "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz", + "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=", "dev": true, "requires": { "co": "4.6.0", @@ -10983,7 +10977,7 @@ "create-hash": "1.1.3", "drbg.js": "1.0.1", "elliptic": "6.4.0", - "nan": "2.7.0", + "nan": "2.8.0", "prebuild-install": "2.3.0", "safe-buffer": "5.1.1" } @@ -11722,7 +11716,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000764", + "caniuse-db": "1.0.30000769", "electron-to-chromium": "1.3.27" } }, @@ -11794,9 +11788,9 @@ }, "dependencies": { "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz", + "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=", "dev": true, "requires": { "co": "4.6.0", @@ -11912,7 +11906,7 @@ "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "5.3.0", + "ajv": "5.4.0", "ajv-keywords": "2.1.1", "chalk": "2.3.0", "lodash": "4.17.4", @@ -12086,7 +12080,7 @@ "requires": { "chownr": "1.0.1", "mkdirp": "0.5.1", - "pump": "1.0.2", + "pump": "1.0.3", "tar-stream": "1.5.5" } }, @@ -12737,7 +12731,7 @@ "requires": { "acorn": "5.2.1", "acorn-dynamic-import": "2.0.2", - "ajv": "5.3.0", + "ajv": "5.4.0", "ajv-keywords": "2.1.1", "async": "2.6.0", "enhanced-resolve": "3.4.1", @@ -12749,7 +12743,7 @@ "loader-utils": "1.1.0", "memory-fs": "0.4.1", "mkdirp": "0.5.1", - "node-libs-browser": "2.0.0", + "node-libs-browser": "2.1.0", "source-map": "0.5.7", "supports-color": "4.5.0", "tapable": "0.2.8", @@ -12760,9 +12754,9 @@ }, "dependencies": { "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz", + "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=", "dev": true, "requires": { "co": "4.6.0", @@ -13125,7 +13119,7 @@ "dev": true, "requires": { "debug": "2.6.9", - "nan": "2.7.0", + "nan": "2.8.0", "typedarray-to-buffer": "3.1.2", "yaeti": "0.0.6" } diff --git a/js/src/Application/application.js b/js/src/Application/application.js index e20b03de1..e8015c948 100644 --- a/js/src/Application/application.js +++ b/js/src/Application/application.js @@ -35,7 +35,7 @@ import Snackbar from '../Snackbar'; import Status from '../Status'; import UpgradeParity from '../UpgradeParity'; -import parityLogo from '../../assets/parity-logo-black.png'; +import { appLogoDark as parityLogo } from '../config'; import Store from './store'; import styles from './application.css'; diff --git a/js/src/FirstRun/Welcome/welcome.js b/js/src/FirstRun/Welcome/welcome.js index 16a652a7d..6992da58b 100644 --- a/js/src/FirstRun/Welcome/welcome.js +++ b/js/src/FirstRun/Welcome/welcome.js @@ -17,7 +17,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import imagesEthcore from '@parity/shared/assets/images/parity-logo-white.svg'; +import { appLogoDark as imageParity } from '../../config'; import styles from '../firstRun.css'; @@ -32,7 +32,7 @@ export default function Welcome () { return (
Parity Ltd. diff --git a/js/src/FirstRun/firstRun.js b/js/src/FirstRun/firstRun.js index ef5867a01..cdac87d9f 100644 --- a/js/src/FirstRun/firstRun.js +++ b/js/src/FirstRun/firstRun.js @@ -27,7 +27,7 @@ import Button from '@parity/ui/lib/Button'; import Portal from '@parity/ui/lib/Portal'; import { CheckIcon, DoneIcon, NextIcon, PrintIcon, ReplayIcon } from '@parity/ui/lib/Icons'; -import ParityLogo from '@parity/shared/assets/images/parity-logo-black-no-text.svg'; +import { appLogoDarkNoText as parityLogo } from '../config'; import { NewAccount, AccountDetails } from '@parity/dapp-accounts/src/CreateAccount'; import print from '@parity/dapp-accounts/src/CreateAccount/print'; import recoveryPage from '@parity/dapp-accounts/src/CreateAccount/recoveryPage.ejs'; @@ -341,7 +341,7 @@ class FirstRun extends Component { print(recoveryPage({ address, identity, - logo: ParityLogo, + logo: parityLogo, name, phrase })); diff --git a/js/src/Status/Consensus/consensus.js b/js/src/Status/Consensus/consensus.js index 0c5f38527..e768c873a 100644 --- a/js/src/Status/Consensus/consensus.js +++ b/js/src/Status/Consensus/consensus.js @@ -23,16 +23,16 @@ export default function Consensus ({ upgradeStore }) { return null; } - if (upgradeStore.consensusCapability === 'capable') { - return ( -
- -
- ); - } + // if (upgradeStore.consensusCapability === 'capable') { + // return ( + //
+ // + //
+ // ); + // } if (upgradeStore.consensusCapability.capableUntil) { return ( @@ -62,14 +62,16 @@ export default function Consensus ({ upgradeStore }) { ); } - return ( -
- -
- ); + // return ( + //
+ // + //
+ // ); + + return null; } Consensus.propTypes = { diff --git a/js/src/Status/status.css b/js/src/Status/status.css index f24bde819..b761a1929 100644 --- a/js/src/Status/status.css +++ b/js/src/Status/status.css @@ -17,6 +17,12 @@ $textColor: #ccc; +.home { + color: $textColor !important; + font-size: 1.2em; + margin-right: 1em; +} + .container { flex: 0; box-sizing: border-box; diff --git a/js/src/Status/status.js b/js/src/Status/status.js index 98212f914..ba5b38f16 100644 --- a/js/src/Status/status.js +++ b/js/src/Status/status.js @@ -22,6 +22,7 @@ import { FormattedMessage } from 'react-intl'; import BlockNumber from '@parity/ui/lib/BlockNumber'; import ClientVersion from '@parity/ui/lib/ClientVersion'; import GradientBg from '@parity/ui/lib/GradientBg'; +import { HomeIcon } from '@parity/ui/lib/Icons'; import IdentityIcon from '@parity/ui/lib/IdentityIcon'; import NetChain from '@parity/ui/lib/NetChain'; import NetPeers from '@parity/ui/lib/NetPeers'; @@ -47,6 +48,9 @@ function Status ({ className = '', upgradeStore }, { api }) {
+ + +
diff --git a/js/src/config.js b/js/src/config.js new file mode 100644 index 000000000..156704eba --- /dev/null +++ b/js/src/config.js @@ -0,0 +1,25 @@ +// Copyright 2015-2017 Parity Technologies (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +import appLogoDark from '../assets/parity-logo-black.png'; +import appLogoDarkNoText from '@parity/shared/assets/images/parity-logo-black-no-text.svg'; +import appLogoLight from '@parity/shared/assets/images/parity-logo-white.svg'; + +export { + appLogoDark, + appLogoDarkNoText, + appLogoLight +}; diff --git a/js/src/index.parity.js b/js/src/index.parity.js index 89d329b4d..0d6f75188 100644 --- a/js/src/index.parity.js +++ b/js/src/index.parity.js @@ -33,7 +33,7 @@ import Application from './Application'; import Dapp from './Dapp'; import Dapps from './Dapps'; import { setupProviderFilters } from './DappRequests'; -import { injectExternalScript } from './ShellExtend'; +// import { injectExternalScript } from './ShellExtend'; import SecureApi from './secureApi'; injectTapEventPlugin(); @@ -82,7 +82,7 @@ ReactDOM.render( ); // testing, priceTicker gist -injectExternalScript('https://cdn.rawgit.com/jacogr/396fc583e81b9404e21195a48dc862ca/raw/33e5058a4c0028cf9acf4b0662d75298e41ca6fa/priceTicker.js'); +// injectExternalScript('https://cdn.rawgit.com/jacogr/396fc583e81b9404e21195a48dc862ca/raw/33e5058a4c0028cf9acf4b0662d75298e41ca6fa/priceTicker.js'); // testing, signer plugins import '@parity/plugin-signer-account'; diff --git a/js/webpack/app.js b/js/webpack/app.js index b6a0574b8..c3970a11c 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -217,7 +217,7 @@ module.exports = { : Api.util.sha3(dapp.url); return [ - 'index.html', 'dist.css', 'dist.js', + 'icon.png', 'index.html', 'dist.css', 'dist.js', isProd ? null : 'dist.css.map', isProd ? null : 'dist.js.map' ]