diff --git a/js/package-lock.json b/js/package-lock.json index cb7da8602..a9a3d1d6e 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -44,76 +44,76 @@ } }, "@parity/dapp-account": { - "version": "github:paritytech/dapp-account#67eec35f3ef21aab77aee5c2ca4b8ae0bf5251f0", + "version": "github:paritytech/dapp-account#65b03835243219a678c1a517e2eb69845a097dcd", "requires": { - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#8abec008e59c4c4df8902188371ab83c77d1d3de", - "@parity/dapp-vaults": "github:paritytech/dapp-vaults#b3c16b417e7b1cc671de91c719040924a6632806" + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#ca55be1774563862e7b0cc72740d0747a60036b8", + "@parity/dapp-vaults": "github:paritytech/dapp-vaults#1bd5de3994227e6b733e7b3e985117a59f0ad638" } }, "@parity/dapp-accounts": { - "version": "github:paritytech/dapp-accounts#8abec008e59c4c4df8902188371ab83c77d1d3de", + "version": "github:paritytech/dapp-accounts#ca55be1774563862e7b0cc72740d0747a60036b8", "requires": { - "@parity/dapp-vaults": "github:paritytech/dapp-vaults#b3c16b417e7b1cc671de91c719040924a6632806" + "@parity/dapp-vaults": "github:paritytech/dapp-vaults#1bd5de3994227e6b733e7b3e985117a59f0ad638" } }, "@parity/dapp-address": { - "version": "github:paritytech/dapp-address#79d0f5300d17ec66476f9f59e62e73d62b31dadf", + "version": "github:paritytech/dapp-address#9b40c93dac5efa0d6a3b8aa30ea6ba19c9fd71cb", "requires": { - "@parity/dapp-account": "github:paritytech/dapp-account#67eec35f3ef21aab77aee5c2ca4b8ae0bf5251f0", - "@parity/dapp-addresses": "github:paritytech/dapp-addresses#d884a81b072805806ac6820f8b6c83d6faa04468" + "@parity/dapp-account": "github:paritytech/dapp-account#65b03835243219a678c1a517e2eb69845a097dcd", + "@parity/dapp-addresses": "github:paritytech/dapp-addresses#525453c8484b9c0e1b7ede1c5929b2e3374e2715" } }, "@parity/dapp-addresses": { - "version": "github:paritytech/dapp-addresses#d884a81b072805806ac6820f8b6c83d6faa04468", + "version": "github:paritytech/dapp-addresses#525453c8484b9c0e1b7ede1c5929b2e3374e2715", "requires": { - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#8abec008e59c4c4df8902188371ab83c77d1d3de" + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#ca55be1774563862e7b0cc72740d0747a60036b8" } }, "@parity/dapp-chaindeploy": { - "version": "github:paritytech/dapp-chaindeploy#922c728698187db94a732cd0b2c583715b9b50b8" + "version": "github:paritytech/dapp-chaindeploy#2adc0da8514c171957823d1b72131f48274300b9" }, "@parity/dapp-contract": { - "version": "github:paritytech/dapp-contract#f21537da25990a7dad4b6ec06dbb6aea4046a2a8", + "version": "github:paritytech/dapp-contract#0196d82260dbb54b468a27bed94fb0b8669ca6a0", "requires": { - "@parity/dapp-account": "github:paritytech/dapp-account#67eec35f3ef21aab77aee5c2ca4b8ae0bf5251f0" + "@parity/dapp-account": "github:paritytech/dapp-account#65b03835243219a678c1a517e2eb69845a097dcd" } }, "@parity/dapp-contracts": { - "version": "github:paritytech/dapp-contracts#6da86f65d367cab14c372825d8b25553d05ad4e8", + "version": "github:paritytech/dapp-contracts#30db6a5e6aba7cc7626972f9569319549efb7888", "requires": { - "@parity/dapp-account": "github:paritytech/dapp-account#67eec35f3ef21aab77aee5c2ca4b8ae0bf5251f0", - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#8abec008e59c4c4df8902188371ab83c77d1d3de" + "@parity/dapp-account": "github:paritytech/dapp-account#65b03835243219a678c1a517e2eb69845a097dcd", + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#ca55be1774563862e7b0cc72740d0747a60036b8" } }, "@parity/dapp-dapp-accounts": { - "version": "github:paritytech/dapp-dapp-accounts#d1692a1ed49809d4b0572e48aad0a4ed2926a10a" + "version": "github:paritytech/dapp-dapp-accounts#4cdbb5962c7a946da9df2fd80f120d9195087d41" }, "@parity/dapp-dapp-methods": { - "version": "github:paritytech/dapp-dapp-methods#3ecabdb95ef82578d5e1da4842a078db0db82d7b" + "version": "github:paritytech/dapp-dapp-methods#910fa7ba753a69d988146017a2096948463d33f4" }, "@parity/dapp-dapp-visible": { - "version": "github:paritytech/dapp-dapp-visible#337db256537c4c8195b46a1fd18fb9330d664180" + "version": "github:paritytech/dapp-dapp-visible#4506e9e9d25b837ab95d003fcd9f090db5cfefe8" }, "@parity/dapp-dappreg": { - "version": "github:paritytech/dapp-dappreg#10238d9074094fb1c97236d2416709db4267b4d2" + "version": "github:paritytech/dapp-dappreg#9cd360d7dc505b5661470ee9d6b98650c85b83b3" }, "@parity/dapp-develop": { - "version": "github:paritytech/dapp-develop#e7a32ecf2ff84772d2c437556b718cc1a56d656f", + "version": "github:paritytech/dapp-develop#85e436cdd1710e39ac45eb546ae8c029015a70ca", "requires": { - "@parity/dapp-contracts": "github:paritytech/dapp-contracts#6da86f65d367cab14c372825d8b25553d05ad4e8" + "@parity/dapp-contracts": "github:paritytech/dapp-contracts#30db6a5e6aba7cc7626972f9569319549efb7888" } }, "@parity/dapp-githubhint": { - "version": "github:paritytech/dapp-githubhint#76c60102473f80a240b99b9d1e7b84de3d7101c8" + "version": "github:paritytech/dapp-githubhint#8e299c739e1663d8590d6a8d345147e974341664" }, "@parity/dapp-home": { - "version": "github:paritytech/dapp-home#3a8c6c8efcb5c92390518f5d1cfcb3408089f218", + "version": "github:paritytech/dapp-home#d32073c41a048bb1be98cda2f569e70f6ee38070", "requires": { - "@parity/dapp-web": "github:paritytech/dapp-web#9fc091bad5fc7c960da3c90d630732ef48d7fdf7" + "@parity/dapp-web": "github:paritytech/dapp-web#fb0dbd86eeeacabda786150d1d1c2a9add8584d2" } }, "@parity/dapp-localtx": { - "version": "github:paritytech/dapp-localtx#a83b527d969f5f5de6ea02d6dcf1729e08b1ec02" + "version": "github:paritytech/dapp-localtx#087d32621c5ab87e72bd777b4dd580e9a3c844c4" }, "@parity/dapp-playground": { "version": "github:paritytech/dapp-playground#e136730fa64aceae2d7e0d2cd2aeea24d22b30f3", @@ -124,27 +124,13 @@ } }, "@parity/dapp-registry": { - "version": "github:paritytech/dapp-registry#8a3f61d10e858fe81b3731dd231b73e66a0879d9", - "requires": { - "@parity/api": "2.0.17", - "@parity/shared": "2.0.17", - "@parity/ui": "2.0.47", - "material-ui": "0.16.5" - } + "version": "github:paritytech/dapp-registry#654b44d9bccb324d27803c8751742d63e4c7690e" }, "@parity/dapp-settings": { - "version": "github:paritytech/dapp-settings#90737d6b34a62fe0843f8acbbf5669427cc2530a" + "version": "github:paritytech/dapp-settings#96d9f7a3c5e0d6fd21a8363bce1cf2a02bf746e7" }, "@parity/dapp-signaturereg": { - "version": "github:paritytech/dapp-signaturereg#31d70570a5c11bd5d954ccdcccc3dbb8f0e26f76", - "requires": { - "@parity/api": "2.0.17", - "@parity/shared": "2.0.17", - "moment": "2.17.0", - "react": "15.6.1", - "react-dom": "15.6.1", - "react-tap-event-plugin": "2.0.1" - } + "version": "github:paritytech/dapp-signaturereg#508ff60a6ed59d1d693e39fbcebce92f79ad9691" }, "@parity/dapp-signer": { "version": "github:paritytech/dapp-signer#96514150d210530eb3261399de84874b80a71f60", @@ -155,25 +141,25 @@ } }, "@parity/dapp-status": { - "version": "github:paritytech/dapp-status#4247a7885d24f7cd402264713ab37e4aab1779c0" + "version": "github:paritytech/dapp-status#397de2851688213091e161cd0c8251368406697d" }, "@parity/dapp-tokendeploy": { - "version": "github:paritytech/dapp-tokendeploy#09931fc07684e01ef0ecaa796a2ebea51ad90d6b" + "version": "github:paritytech/dapp-tokendeploy#ef5df286fa9eaed7a393fc93224004221d840af5" }, "@parity/dapp-tokenreg": { - "version": "github:paritytech/dapp-tokenreg#611f513f4c644c6513e58c4b06ea71a489a72cc7" + "version": "github:paritytech/dapp-tokenreg#530980bf9305755936b0692e63a4b7559b0f1027" }, "@parity/dapp-vaults": { - "version": "github:paritytech/dapp-vaults#b3c16b417e7b1cc671de91c719040924a6632806" + "version": "github:paritytech/dapp-vaults#1bd5de3994227e6b733e7b3e985117a59f0ad638" }, "@parity/dapp-wallet": { - "version": "github:paritytech/dapp-wallet#d7fb2e40b879676f99c36b53ce21480722b99b69", + "version": "github:paritytech/dapp-wallet#055fba4e8c3dd1e58ebc091a08df50583ac82fe0", "requires": { - "@parity/dapp-account": "github:paritytech/dapp-account#67eec35f3ef21aab77aee5c2ca4b8ae0bf5251f0" + "@parity/dapp-account": "github:paritytech/dapp-account#65b03835243219a678c1a517e2eb69845a097dcd" } }, "@parity/dapp-web": { - "version": "github:paritytech/dapp-web#9fc091bad5fc7c960da3c90d630732ef48d7fdf7", + "version": "github:paritytech/dapp-web#fb0dbd86eeeacabda786150d1d1c2a9add8584d2", "requires": { "base32.js": "0.1.0" } @@ -213,16 +199,16 @@ } }, "@parity/plugin-signer-account": { - "version": "github:paritytech/plugin-signer-account#b64a252097c09bc04cb14749d1d75778e22acbb6" + "version": "github:paritytech/plugin-signer-account#a00e131273becccab59e9852ec3313cb0fe19663" }, "@parity/plugin-signer-default": { - "version": "github:paritytech/plugin-signer-default#c6755830a3e20156f48a9d3967c152ee6a77fd1f" + "version": "github:paritytech/plugin-signer-default#54e7fa63063f2dcae409ead222ff87fbcc19f1f9" }, "@parity/plugin-signer-hardware": { - "version": "github:paritytech/plugin-signer-hardware#768207e21766ececac0295aa1a00b02925fd3766" + "version": "github:paritytech/plugin-signer-hardware#34b5562062bb1fe8ea6246c06d45624d7f309aa7" }, "@parity/plugin-signer-qr": { - "version": "github:paritytech/plugin-signer-qr#eef7108f90f625a550ad3cf1a970938eebf2bddb" + "version": "github:paritytech/plugin-signer-qr#8d937dd5f5d726fb22be72967fd9a472fa467bfd" }, "@parity/shapeshift": { "version": "2.0.17", @@ -2062,11 +2048,6 @@ "hoek": "2.16.3" } }, - "bowser": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.8.1.tgz", - "integrity": "sha512-NMPaR8ILtdLSWzxQtEs16XbxMcY8ohWGQ5V+TZSJS3fNUt/PBAGkF6YWO9B/4qWE23bK3o0moQKq8UyFEosYkA==" - }, "brace": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/brace/-/brace-0.9.0.tgz", @@ -2453,11 +2434,6 @@ "supports-color": "2.0.0" } }, - "change-emitter": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz", - "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=" - }, "check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -2496,7 +2472,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.1.2", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -3056,6 +3031,16 @@ "unique-concat": "0.2.2" } }, + "cross-env": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.1.tgz", + "integrity": "sha512-Wtvr+z0Z06KO1JxjfRRsPC+df7biIOiuV4iZ73cThjFGkH+ULBZq1MkBdywEcJC4cTDbO6c8IjgRjfswx3YTBA==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "is-windows": "1.0.1" + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5465,905 +5450,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.36" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.36", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - } - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -7321,11 +6407,6 @@ } } }, - "hyphenate-style-name": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz", - "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=" - }, "iconv-lite": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", @@ -7591,15 +6672,6 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" }, - "inline-style-prefixer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz", - "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=", - "requires": { - "bowser": "1.8.1", - "hyphenate-style-name": "1.0.2" - } - }, "inquirer": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", @@ -8046,6 +7118,12 @@ "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", "dev": true }, + "is-windows": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz", + "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=", + "dev": true + }, "is-zip": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz", @@ -8862,7 +7940,8 @@ "lodash.merge": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", - "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" + "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=", + "dev": true }, "lodash.omitby": { "version": "4.6.0", @@ -9093,24 +8172,6 @@ "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=", "dev": true }, - "material-ui": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/material-ui/-/material-ui-0.16.5.tgz", - "integrity": "sha1-u4ZhqsfKyMsiOj529PV+4YpK78E=", - "requires": { - "babel-runtime": "6.26.0", - "inline-style-prefixer": "2.0.5", - "keycode": "2.1.9", - "lodash.merge": "4.6.0", - "lodash.throttle": "4.1.1", - "react-addons-create-fragment": "15.6.2", - "react-addons-transition-group": "15.6.2", - "react-event-listener": "0.4.5", - "recompose": "0.20.2", - "simple-assign": "0.1.0", - "warning": "3.0.0" - } - }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -9302,7 +8363,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { "brace-expansion": "1.1.8" } @@ -11560,16 +10621,6 @@ } } }, - "react-addons-create-fragment": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react-addons-create-fragment/-/react-addons-create-fragment-15.6.2.tgz", - "integrity": "sha1-o5TefCx77Na1R1uhuXrEcs58dPg=", - "requires": { - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1" - } - }, "react-addons-perf": { "version": "15.4.2", "resolved": "https://registry.npmjs.org/react-addons-perf/-/react-addons-perf-15.4.2.tgz", @@ -11763,7 +10814,7 @@ "react-qr-reader": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.1.3.tgz", - "integrity": "sha512-ruBF8KaSwUW9nbzjO4rA7/HOCGYZuNUz9od7uBRy8SRBi24nwxWWmwa2z8R6vPGDRglA0y2Qk1aVBuC1olTnHw==", + "integrity": "sha1-dDmnZvyZPLj17u/HLCnblh1AswI=", "requires": { "jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b", "prop-types": "15.5.10", @@ -11989,24 +11040,6 @@ "resolve": "1.5.0" } }, - "recompose": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.20.2.tgz", - "integrity": "sha1-ET1qx+KcpmTP/+wWtoHd3fFSULw=", - "requires": { - "change-emitter": "0.1.6", - "fbjs": "0.8.16", - "hoist-non-react-statics": "1.2.0", - "symbol-observable": "0.2.4" - }, - "dependencies": { - "symbol-observable": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", - "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=" - } - } - }, "redbox-react": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.5.0.tgz", @@ -12718,11 +11751,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, - "simple-assign": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz", - "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o=" - }, "simple-get": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz", diff --git a/js/package.json b/js/package.json index 508b328f4..ba4193bf2 100644 --- a/js/package.json +++ b/js/package.json @@ -21,16 +21,12 @@ "Parity" ], "scripts": { - "build": "npm run build:lib && npm run build:app", + "build": "npm run build:lib && npm run build:app && npm run build:embed", "build:app": "webpack --progress --config webpack/app", "build:lib": "webpack --progress --config webpack/libraries", - "build:embed": "EMBED=1 node webpack/embed", + "build:embed": "cross-env EMBED=1 node webpack/embed", "build:i18n": "npm run clean && npm run build && babel-node ./scripts/build-i18n.js", - "ci:build": "npm run ci:build:lib && npm run ci:build:app && npm run ci:build:embed", - "ci:build:app": "NODE_ENV=production webpack --progress --config webpack/app", - "ci:build:lib": "NODE_ENV=production webpack --progress --config webpack/libraries", - "ci:build:npm": "NODE_ENV=production webpack --progress --config webpack/npm", - "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed", + "ci:build": "cross-env NODE_ENV=production npm run build", "clean": "rm -rf ./.build ./.coverage ./.happypack ./build ./node_modules/.cache", "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info", "lint": "npm run lint:css && npm run lint:js", @@ -44,9 +40,9 @@ "start": "npm run clean && npm install && npm run build:lib && npm run start:app", "start:app": "node webpack/dev.server", "start:electron": "npm run build:app && electron .build/", - "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'", - "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'", - "test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js'", + "test": "cross-env NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'", + "test:coverage": "cross-env NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'", + "test:e2e": "cross-env NODE_ENV=test mocha 'src/**/*.e2e.js'", "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)", "prepush": "npm run lint:cached" }, @@ -75,6 +71,7 @@ "copy-webpack-plugin": "4.0.1", "core-js": "2.4.1", "coveralls": "2.11.16", + "cross-env": "5.1.1", "css-loader": "0.28.4", "ejs-loader": "0.3.0", "ejsify": "1.0.0", diff --git a/js/src/embed.js b/js/src/embed.js index a1a2573d1..ace85a016 100644 --- a/js/src/embed.js +++ b/js/src/embed.js @@ -31,6 +31,7 @@ import { patchApi } from '@parity/shared/util/tx'; import SecureApi from './secureApi'; +import './ShellExtend'; import '@parity/shared/environment'; import '@parity/shared/assets/fonts/Roboto/font.css'; import '@parity/shared/assets/fonts/RobotoMono/font.css'; @@ -70,8 +71,6 @@ class FrameSecureApi extends SecureApi { connect () { // Do nothing - this API does not need connecting this.emit('connecting'); - // Fetch settings - this._fetchSettings(); // Fire connected event with some delay. setTimeout(() => { this.emit('connected'); @@ -99,7 +98,7 @@ transport.uiUrl = uiUrl.replace('http://', '').replace('https://', ''); const api = new FrameSecureApi(transport); patchApi(api); -ContractInstances.create(api); +ContractInstances.get(api); const store = initStore(api, null, true); @@ -125,3 +124,9 @@ ReactDOM.render( , container ); + +// testing, signer plugins +import '@parity/plugin-signer-account'; +import '@parity/plugin-signer-default'; +import '@parity/plugin-signer-hardware'; +import '@parity/plugin-signer-qr'; diff --git a/js/webpack/app.js b/js/webpack/app.js index d9ec3e48a..8fbe18d85 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -46,7 +46,7 @@ const isProd = ENV === 'production'; const isEmbed = EMBED === '1' || EMBED === 'true'; const entry = isEmbed - ? { embed: './embed.js' } + ? { embed: ['babel-polyfill', './embed.js'] } : { bundle: ['babel-polyfill', './index.parity.js'] }; module.exports = { @@ -238,7 +238,7 @@ module.exports = { new HtmlWebpackPlugin({ title: 'Parity Bar', filename: 'embed.html', - template: './index.ejs', + template: './index.parity.ejs', favicon: FAVICON, chunks: ['embed'] })