From 7eb2d2f90a2b5bf34a3418450403febf4da018bd Mon Sep 17 00:00:00 2001 From: Ev Date: Wed, 26 Oct 2016 20:15:44 -0200 Subject: [PATCH] Merging develop into master (#1355) * Minor fixes on the internal links (#1323) * Tens of new ABI signatures (#1341) * Electron package renaming & Readme updates (#1339) * Renaming electron-prebuilt to electron * Updating Readme instructions * [npm] tighten versions in dependency-graph * Fix shell v ul ns (#1354) * fix vulns * readd syncminimongo to popupWindows * Removing duplicated instruction * Version bump (#1356) --- MISTAPI.md | 7 +- README.md | 4 +- gulpfile.js | 2 +- interface/client/collections.js | 4 +- .../client/lib/helpers/templateHelpers.js | 4 +- interface/client/lib/signatures.js | 168 +++++++++++ .../client/templates/layout/browserBar.js | 2 +- .../templates/popupWindows/splashScreen.js | 2 +- modules/ipc/ipcProviderBackend.js | 2 +- modules/ipc/methods/eth_accounts.js | 2 +- modules/ipc/methods/eth_coinbase.js | 32 +++ modules/mistAPI.js | 4 - modules/preloader/mistUI.js | 4 + modules/preloader/popupWindows.js | 2 + modules/preloader/popupWindowsNoWeb3.js | 2 + modules/preloader/splashScreen.js | 2 + modules/windows.js | 2 +- npm-shrinkwrap.json | 262 +++++++++--------- package.json | 4 +- 19 files changed, 359 insertions(+), 152 deletions(-) create mode 100644 modules/ipc/methods/eth_coinbase.js diff --git a/MISTAPI.md b/MISTAPI.md index 8c987461b..b4fb00dcb 100644 --- a/MISTAPI.md +++ b/MISTAPI.md @@ -32,13 +32,16 @@ else ## API -- [mist.platform](#mistmenuupdateid-options-callback) -- [mist.menu](#mistmenuupdateid-options-callback) +- [mist.platform](#mistplatform) +- [mist.requestAccount](#mistrequestaccountcallback)(callback) +- [mist.menu](#mistmenu) - [mist.menu.setBadge](#mistmenusetbadgetext)(text) - [mist.menu.add](#mistmenuaddid-options-callback)(id, options, callback) - [mist.menu.update](#mistmenuupdateid--options--callback)(id [, options] [, callback]) - [mist.menu.remove](#mistmenuremoveid)(id) - [mist.menu.clear](#mistmenuclear)() +- [mist.sounds](#mistsounds) +- [mist.sounds.bip](#mistsoundsbip)() ### mist.platform diff --git a/README.md b/README.md index e549d5659..418e67453 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Requirements: To run mist in development you need [Node.js NPM](https://nodejs.org) and [Meteor](https://www.meteor.com/install) and electron installed: $ curl https://install.meteor.com/ | sh - $ npm install -g electron-prebuilt@1.3.5 + $ npm install -g electron@1.3.5 $ npm install -g gulp And some futher tools to help with downloading and unzipping client nodes: @@ -53,14 +53,12 @@ Now you're ready to install Mist: $ cd mist $ git submodule update --init $ npm install - $ gulp update-nodes To update Mist in the future, run: $ cd mist $ git pull && git submodule update $ npm install - $ gulp update-nodes #### Options diff --git a/gulpfile.js b/gulpfile.js index 64bfd9f8d..d1118b07e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -41,7 +41,7 @@ var type = 'mist'; var filenameLowercase = 'mist'; var filenameUppercase = 'Mist'; var applicationName = 'Mist'; -var electronVersion = require('electron-prebuilt/package.json').version; +var electronVersion = require('electron/package.json').version; var packJson = require('./package.json'); diff --git a/interface/client/collections.js b/interface/client/collections.js index 098a360dc..d895a3ffb 100644 --- a/interface/client/collections.js +++ b/interface/client/collections.js @@ -9,8 +9,8 @@ // Contains the accounts Tabs = new Mongo.Collection('tabs', {connection: null}); -if (typeof window.mist.syncMinimongo !== 'undefined') { - Tabs = window.mist.syncMinimongo.frontendSync(Tabs); +if (typeof window.syncMinimongo !== 'undefined') { + Tabs = window.syncMinimongo.frontendSync(Tabs); } diff --git a/interface/client/lib/helpers/templateHelpers.js b/interface/client/lib/helpers/templateHelpers.js index 652642fc0..c641783c4 100644 --- a/interface/client/lib/helpers/templateHelpers.js +++ b/interface/client/lib/helpers/templateHelpers.js @@ -35,7 +35,7 @@ Return the preload modules dirname. @method (dirname) **/ Template.registerHelper('preload_dirname', function(){ - return window.mist.dirname + '/modules/preloader'; + return window.dirname + '/modules/preloader'; }); /** @@ -72,7 +72,7 @@ Return the app icon path. @method (iconPath) **/ Template.registerHelper('appIconPath', function(){ - return 'file://'+ window.mist.dirname +'/icons/'+ window.mist.mode +'/icon2x.png'; + return 'file://'+ window.dirname +'/icons/'+ window.mist.mode +'/icon2x.png'; }); /** diff --git a/interface/client/lib/signatures.js b/interface/client/lib/signatures.js index 9a0dadc01..02da97be5 100644 --- a/interface/client/lib/signatures.js +++ b/interface/client/lib/signatures.js @@ -1,4 +1,172 @@ window.SIGNATURES = { + "0x30a24abd": [ + "create(bytes4,bytes)" + ], + "0xa039e3c7": [ + "testSetNotTransferable()" + ], + "0xac3e6b2f": [ + "testSetNotRetractable()" + ], + "0xee0dc478": [ + "testSetEnforceRevisions()" + ], + "0xad544dcb": [ + "testSetNotUpdatable()" + ], + "0xda5c0a7c": [ + "testDisown()" + ], + "0x804e11dc": [ + "testThrowsDisownNotTransferable()" + ], + "0x0af4626d": [ + "testRetract()" + ], + "0xd96e5565": [ + "testThrowsRetractNotRetractable()" + ], + "0xcaab0acc": [ + "testThrowCreateRetracted()" + ], + "0x465e759b": [ + "testRestart()" + ], + "0x5292c1a9": [ + "testThrowsRestartEnforceRevisions()" + ], + "0x1b769e74": [ + "testThrowsRestartNotUpdatable()" + ], + "0x40695625": [ + "testRetractLatestRevision()" + ], + "0xe0cfc05c": [ + "testThrowsRetractLatestRevisionDoesntHaveAdditionalRevisions()" + ], + "0x8e1ffb19": [ + "testThrowsRetractLatestRevisionEnforceRevisions()" + ], + "0xe82f7dd4": [ + "testThrowsRetractLatestRevisionNotUpdatable()" + ], + "0x1fb2f2a0": [ + "testUpdateLatestRevision()" + ], + "0x2eb5c61f": [ + "testThrowsUpdateLatestRevisionEnforceRevisions()" + ], + "0x13137731": [ + "testThrowsUpdateLatestRevisionNotUpdatable()" + ], + "0x22057bc7": [ + "getAllRevisionBlockNumbers(bytes20)" + ], + "0x74f8d96e": [ + "getRevisionBlockNumber(bytes20,uint256)" + ], + "0x3ef87414": [ + "getRevisionCount(bytes20)" + ], + "0xe487eb58": [ + "getOwner(bytes20)" + ], + "0xaa5d4719": [ + "getTransferable(bytes20)" + ], + "0x3c335b0e": [ + "getRetractable(bytes20)" + ], + "0xdba1ac3d": [ + "getEnforceRevisions(bytes20)" + ], + "0x3df91162": [ + "getUpdatable(bytes20)" + ], + "0x01fd89a4": [ + "getFlags(bytes20)" + ], + "0xba15e52e": [ + "getInfo(bytes20)" + ], + "0xec035393": [ + "_getAllRevisionBlockNumbers(bytes20)" + ], + "0xfb47a067": [ + "_getRevisionBlockNumber(bytes20,uint256)" + ], + "0x08b7c13b": [ + "getExists(bytes20)" + ], + "0xb971b4e5": [ + "setNotTransferable(bytes20)" + ], + "0x976b01c0": [ + "setNotRetractable(bytes20)" + ], + "0x9243e088": [ + "setEnforceRevisions(bytes20)" + ], + "0xd0c24e93": [ + "setNotUpdatable(bytes20)" + ], + "0xd6ca8ccb": [ + "disown(bytes20)" + ], + "0xb06df18e": [ + "transfer(bytes20,address)" + ], + "0x47bdb7f4": [ + "transferDisable(bytes20)" + ], + "0x12511c14": [ + "transferEnable(bytes20)" + ], + "0xcf7315c6": [ + "retract(bytes20)" + ], + "0xe0a70811": [ + "restart(bytes20,bytes)" + ], + "0x5ccd2f9b": [ + "_deleteAllPackedRevisionBlockNumbers(bytes20)" + ], + "0xa7e93e87": [ + "retractLatestRevision(bytes20)" + ], + "0x9e65c7e5": [ + "updateLatestRevision(bytes20,bytes)" + ], + "0xa84c5330": [ + "createNewRevision(bytes20,bytes)" + ], + "0x338a1379": [ + "_setPackedBlockNumber(bytes20,uint256)" + ], + "0x5b37e150": [ + "create(bytes32,bytes)" + ], + "0xd0b52156": [ + "getIpfsHash(address,address)" + ], + "0x337b1cf9": [ + "setIpfsHash(bytes)" + ], + "0x7fefde53": [ + "WillRegistry()" + ], + "0xe597f402": [ + "create(bytes1,bytes32,bytes)" + ], + "0x8d375da2": [ + "testMakeItFail()" + ], + "0x2551858e": [ + "getFlags(bytes32)" + ], + "0x5f0edfb8": [ + "create(bytes,bytes32,bytes1)" + ], "0x85b73d3c": [ "testCreateNewRevision()" ], diff --git a/interface/client/templates/layout/browserBar.js b/interface/client/templates/layout/browserBar.js index 2dd492770..44c15ee5c 100644 --- a/interface/client/templates/layout/browserBar.js +++ b/interface/client/templates/layout/browserBar.js @@ -146,7 +146,7 @@ Template['layout_browserBar'].events({ mist.requestAccount(function(e, addresses){ var tabId; - mist.syncMinimongo.frontendSync(Tabs); + window.syncMinimongo.frontendSync(Tabs); tabId = LocalStore.get('selectedTab'); diff --git a/interface/client/templates/popupWindows/splashScreen.js b/interface/client/templates/popupWindows/splashScreen.js index b89fe6c34..7d1765b7a 100644 --- a/interface/client/templates/popupWindows/splashScreen.js +++ b/interface/client/templates/popupWindows/splashScreen.js @@ -166,7 +166,7 @@ Template['popupWindows_splashScreen'].helpers({ @method iconPath */ 'iconPath': function(){ - return 'file://'+ window.mist.dirname +'/icons/'+ window.mist.mode +'/icon2x.png'; + return 'file://'+ window.dirname +'/icons/'+ window.mist.mode +'/icon2x.png'; }, /** Updates the Sync Message live diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js index 78e4cfe68..e4c265caa 100644 --- a/modules/ipc/ipcProviderBackend.js +++ b/modules/ipc/ipcProviderBackend.js @@ -52,8 +52,8 @@ class IpcProviderBackend { // dynamically load in method processors let processors = fs.readdirSync(path.join(__dirname, 'methods')); + // get response processors this._processors = {}; - processors.forEach((p) => { let name = path.basename(p, '.js'); diff --git a/modules/ipc/methods/eth_accounts.js b/modules/ipc/methods/eth_accounts.js index a31d54a24..9643589c4 100644 --- a/modules/ipc/methods/eth_accounts.js +++ b/modules/ipc/methods/eth_accounts.js @@ -12,7 +12,7 @@ module.exports = class extends BaseProcessor { * @override */ sanitizeResponsePayload (conn, payload, isPartOfABatch) { - this._log.trace('Sanitize account list', payload.result); + this._log.trace('Sanitize eth_acconts', payload.result); // if not an admin connection then do a check if (!this._isAdminConnection(conn)) { diff --git a/modules/ipc/methods/eth_coinbase.js b/modules/ipc/methods/eth_coinbase.js new file mode 100644 index 000000000..93958897f --- /dev/null +++ b/modules/ipc/methods/eth_coinbase.js @@ -0,0 +1,32 @@ +"use strict"; + +const _ = global._; +const BaseProcessor = require('./base'); +const db = require('../../db'); + +/** + * Process method: eth_coinbase + */ +module.exports = class extends BaseProcessor { + /** + * @override + */ + sanitizeResponsePayload (conn, payload, isPartOfABatch) { + this._log.trace('Sanitize account eth_coinbase', payload.result); + + // if not an admin connection then do a check + if (!this._isAdminConnection(conn)) { + let tab = db.getCollection('tabs').findOne({ webviewId: conn.id }); + + if(_.get(tab, 'permissions.accounts')) { + payload.result = _.contains(tab.permissions.accounts, payload.result) ? payload.result : null; + } else { + payload.result = null; + } + } + + return super.sanitizeResponsePayload(conn, payload, isPartOfABatch); + } +} + + diff --git a/modules/mistAPI.js b/modules/mistAPI.js index a13ba1993..b289397c3 100644 --- a/modules/mistAPI.js +++ b/modules/mistAPI.js @@ -4,7 +4,6 @@ const electron = require('electron'); const packageJson = require('./../package.json'); -const syncMinimongo = require('./syncMinimongo.js'); const remote = electron.remote; const ipc = electron.ipcRenderer; @@ -68,13 +67,10 @@ module.exports = function(isWallet) { */ var mist = { - syncMinimongo: syncMinimongo, callbacks: {}, - dirname: remote.getGlobal('dirname'), version: packageJson.version, mode: remote.getGlobal('mode'), license: packageJson.license, - shell: remote.shell, platform: process.platform, requestAccount: function(callback){ if(callback) { diff --git a/modules/preloader/mistUI.js b/modules/preloader/mistUI.js index 7d299960d..3e4f9615a 100644 --- a/modules/preloader/mistUI.js +++ b/modules/preloader/mistUI.js @@ -10,11 +10,13 @@ const Menu = remote.Menu; const MenuItem = remote.MenuItem; const i18n = require('../i18n.js'); const mist = require('../mistAPI.js'); +const syncMinimongo = require('../syncMinimongo.js'); const BigNumber = require('bignumber.js'); const Web3 = require('web3'); const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js'); const web3Admin = require('../web3Admin.js'); + require('./include/setBasePath')('interface'); // register with window manager @@ -33,6 +35,8 @@ setTimeout(function(){ }, 1000); window.mist = mist(); +window.dirname = remote.getGlobal('dirname'); +window.syncMinimongo = syncMinimongo; window.ipc = ipc; diff --git a/modules/preloader/popupWindows.js b/modules/preloader/popupWindows.js index 293672c5a..6b295bf56 100644 --- a/modules/preloader/popupWindows.js +++ b/modules/preloader/popupWindows.js @@ -7,6 +7,7 @@ const electron = require('electron'); const ipc = electron.ipcRenderer; require('../openExternal.js'); const mist = require('../mistAPI.js'); +const syncMinimongo = require('../syncMinimongo.js'); const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js'); const BigNumber = require('bignumber.js'); const Q = require('bluebird'); @@ -30,6 +31,7 @@ ipc.on('data', function(e, data) { // make variables globally accessable window.mist = mist(); +window.syncMinimongo = syncMinimongo; window.BigNumber = BigNumber; window.Q = Q; window.web3 = new Web3(new Web3.providers.IpcProvider('', ipcProviderWrapper)); diff --git a/modules/preloader/popupWindowsNoWeb3.js b/modules/preloader/popupWindowsNoWeb3.js index 89fb55dba..08e71ab4f 100644 --- a/modules/preloader/popupWindowsNoWeb3.js +++ b/modules/preloader/popupWindowsNoWeb3.js @@ -5,6 +5,7 @@ require('./include/common')('popup-no-web3'); const electron = require('electron'); const mist = require('../mistAPI.js'); +const syncMinimongo = require('../syncMinimongo.js'); const ipc = electron.ipcRenderer; const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js'); @@ -23,3 +24,4 @@ ipc.on('data', function(e, data) { window.ipc = ipc; window.mist = mist(); +window.syncMinimongo = syncMinimongo; diff --git a/modules/preloader/splashScreen.js b/modules/preloader/splashScreen.js index 8c1d0e13f..0eaa03204 100644 --- a/modules/preloader/splashScreen.js +++ b/modules/preloader/splashScreen.js @@ -1,6 +1,7 @@ require('./include/common')('splash'); const mist = require('../mistAPI.js'); const electron = require('electron'); +const remote = electron.remote; const ipc = electron.ipcRenderer; const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js'); const Web3 = require('web3'); @@ -19,4 +20,5 @@ electron.webFrame.setZoomLevelLimits(1, 1); window.ipc = ipc; window.mist = mist(); +window.dirname = remote.getGlobal('dirname'); window.web3 = new Web3(new Web3.providers.IpcProvider('', ipcProviderWrapper)); diff --git a/modules/windows.js b/modules/windows.js index 020dcf82a..6edeaf068 100644 --- a/modules/windows.js +++ b/modules/windows.js @@ -266,7 +266,7 @@ class Windows { opts.isPopup = true; if (opts.useWeb3) { - opts.electronOptions.webPreferences.preload = __dirname +'/preloader/popupWindows.js'; opts.electronOptions.webPreferences.preload = __dirname +'/preloader/popupWindows.js'; + opts.electronOptions.webPreferences.preload = __dirname +'/preloader/popupWindows.js'; } else { opts.electronOptions.webPreferences.preload = __dirname +'/preloader/popupWindowsNoWeb3.js'; } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9c4840039..d6ac5f4fb 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,10 +1,10 @@ { "name": "Mist", - "version": "0.8.6", + "version": "0.8.7", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@2.0.0", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" }, "async": { @@ -21,12 +21,12 @@ }, "balanced-match": { "version": "0.4.2", - "from": "balanced-match@0.4.2", + "from": "balanced-match@>=0.4.1 <0.5.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, "bignumber.js": { "version": "2.4.0", - "from": "bignumber.js@2.4.0", + "from": "bignumber.js@>=2.1.4 <3.0.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz" }, "binary": { @@ -36,47 +36,47 @@ }, "bindings": { "version": "1.2.1", - "from": "bindings@1.2.1", + "from": "bindings@>=1.2.1 <2.0.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" }, "bip66": { "version": "1.1.4", - "from": "bip66@1.1.4", + "from": "bip66@>=1.1.3 <2.0.0", "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.4.tgz" }, "bluebird": { "version": "3.4.6", - "from": "bluebird@3.4.6", + "from": "bluebird@>=3.3.5 <4.0.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz" }, "bn.js": { "version": "4.11.6", - "from": "bn.js@4.11.6", + "from": "bn.js@>=4.10.0 <5.0.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz" }, "brace-expansion": { "version": "1.1.6", - "from": "brace-expansion@1.1.6", + "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz" }, "brorand": { "version": "1.0.6", - "from": "brorand@1.0.6", + "from": "brorand@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz" }, "browserify-aes": { "version": "1.0.6", - "from": "browserify-aes@1.0.6", + "from": "browserify-aes@>=1.0.6 <2.0.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz" }, "browserify-sha3": { "version": "0.0.1", - "from": "browserify-sha3@0.0.1", + "from": "browserify-sha3@>=0.0.1 <0.0.2", "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.1.tgz" }, "buffer-xor": { "version": "1.0.3", - "from": "buffer-xor@1.0.3", + "from": "buffer-xor@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz" }, "buffered-spawn": { @@ -91,17 +91,17 @@ }, "builtin-modules": { "version": "1.1.1", - "from": "builtin-modules@1.1.1", + "from": "builtin-modules@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" }, "camelcase": { "version": "3.0.0", - "from": "camelcase@3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" }, "capture-stack-trace": { "version": "1.0.0", - "from": "capture-stack-trace@1.0.0", + "from": "capture-stack-trace@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz" }, "chainsaw": { @@ -111,12 +111,12 @@ }, "cipher-base": { "version": "1.0.3", - "from": "cipher-base@1.0.3", + "from": "cipher-base@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz" }, "cliui": { "version": "3.2.0", - "from": "cliui@3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" }, "code-point-at": { @@ -126,7 +126,7 @@ }, "colors": { "version": "1.1.2", - "from": "colors@1.1.2", + "from": "colors@>=1.1.2 <2.0.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" }, "concat-map": { @@ -136,22 +136,22 @@ }, "core-util-is": { "version": "1.0.2", - "from": "core-util-is@1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "create-error-class": { "version": "3.0.2", - "from": "create-error-class@3.0.2", + "from": "create-error-class@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz" }, "create-hash": { "version": "1.1.2", - "from": "create-hash@1.1.2", + "from": "create-hash@>=1.1.2 <2.0.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz" }, "create-hmac": { "version": "1.1.4", - "from": "create-hmac@1.1.4", + "from": "create-hmac@>=1.1.4 <2.0.0", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz" }, "cross-spawn": { @@ -166,47 +166,47 @@ }, "debug": { "version": "2.2.0", - "from": "debug@2.2.0", + "from": "debug@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" }, "decamelize": { "version": "1.2.0", - "from": "decamelize@1.2.0", + "from": "decamelize@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, "deep-extend": { "version": "0.4.1", - "from": "deep-extend@0.4.1", + "from": "deep-extend@>=0.4.1 <0.5.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" }, "diff": { "version": "2.2.3", - "from": "diff@2.2.3", + "from": "diff@>=2.2.1 <3.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz" }, "drbg.js": { "version": "1.0.1", - "from": "drbg.js@1.0.1", + "from": "drbg.js@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz" }, "duplexer3": { "version": "0.1.4", - "from": "duplexer3@0.1.4", + "from": "duplexer3@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" }, "electron-squirrel-startup": { "version": "1.0.0", - "from": "electron-squirrel-startup@1.0.0", + "from": "electron-squirrel-startup@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz" }, "elliptic": { "version": "6.3.2", - "from": "elliptic@6.3.2", + "from": "elliptic@>=6.2.3 <7.0.0", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz" }, "error-ex": { "version": "1.3.0", - "from": "error-ex@1.3.0", + "from": "error-ex@>=1.2.0 <2.0.0", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz" }, "ethereum-client-binaries": { @@ -223,22 +223,22 @@ }, "ethereumjs-abi": { "version": "0.6.4", - "from": "ethereumjs-abi@0.6.4", + "from": "ethereumjs-abi@>=0.6.3 <0.7.0", "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.4.tgz" }, "ethereumjs-util": { "version": "4.5.0", - "from": "ethereumjs-util@4.5.0", + "from": "ethereumjs-util@>=4.3.0 <5.0.0", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz" }, "evp_bytestokey": { "version": "1.0.0", - "from": "evp_bytestokey@1.0.0", + "from": "evp_bytestokey@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz" }, "find-up": { "version": "1.1.2", - "from": "find-up@1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "dependencies": { "path-exists": { @@ -250,19 +250,19 @@ }, "findup-sync": { "version": "0.3.0", - "from": "findup-sync@0.3.0", + "from": "findup-sync@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", "dependencies": { "glob": { "version": "5.0.15", - "from": "glob@5.0.15", + "from": "glob@>=5.0.0 <5.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" } } }, "fs.realpath": { "version": "1.0.0", - "from": "fs.realpath@1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, "fstream": { @@ -272,12 +272,12 @@ }, "get-caller-file": { "version": "1.0.2", - "from": "get-caller-file@1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" }, "get-stream": { "version": "2.3.1", - "from": "get-stream@2.3.1", + "from": "get-stream@>=2.3.0 <3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "dependencies": { "object-assign": { @@ -294,7 +294,7 @@ }, "got": { "version": "6.5.0", - "from": "got@6.5.0", + "from": "got@>=6.3.0 <7.0.0", "resolved": "https://registry.npmjs.org/got/-/got-6.5.0.tgz" }, "graceful-fs": { @@ -304,17 +304,17 @@ }, "hash.js": { "version": "1.0.3", - "from": "hash.js@1.0.3", + "from": "hash.js@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz" }, "hosted-git-info": { "version": "2.1.5", - "from": "hosted-git-info@2.1.5", + "from": "hosted-git-info@>=2.1.4 <3.0.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz" }, "i18next": { "version": "2.5.1", - "from": "i18next@2.5.1", + "from": "i18next@>=2.3.4 <3.0.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-2.5.1.tgz" }, "inflight": { @@ -324,72 +324,72 @@ }, "inherits": { "version": "2.0.3", - "from": "inherits@2.0.3", + "from": "inherits@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" }, "invert-kv": { "version": "1.0.0", - "from": "invert-kv@1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" }, "is-arrayish": { "version": "0.2.1", - "from": "is-arrayish@0.2.1", + "from": "is-arrayish@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" }, "is-builtin-module": { "version": "1.0.0", - "from": "is-builtin-module@1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" }, "is-fullwidth-code-point": { "version": "1.0.0", - "from": "is-fullwidth-code-point@1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" }, "is-redirect": { "version": "1.0.0", - "from": "is-redirect@1.0.0", + "from": "is-redirect@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz" }, "is-retry-allowed": { "version": "1.1.0", - "from": "is-retry-allowed@1.1.0", + "from": "is-retry-allowed@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz" }, "is-stream": { "version": "1.1.0", - "from": "is-stream@1.1.0", + "from": "is-stream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" }, "is-utf8": { "version": "0.2.1", - "from": "is-utf8@0.2.1", + "from": "is-utf8@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" }, "isexe": { "version": "1.1.2", - "from": "isexe@1.1.2", + "from": "isexe@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" }, "js-sha3": { "version": "0.3.1", - "from": "js-sha3@0.3.1", + "from": "js-sha3@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.3.1.tgz" }, "keccakjs": { "version": "0.2.1", - "from": "keccakjs@0.2.1", + "from": "keccakjs@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.1.tgz" }, "lcid": { "version": "1.0.0", - "from": "lcid@1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" }, "load-json-file": { "version": "1.1.0", - "from": "load-json-file@1.1.0", + "from": "load-json-file@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "dependencies": { "graceful-fs": { @@ -406,7 +406,7 @@ }, "lodash.assign": { "version": "4.2.0", - "from": "lodash.assign@4.2.0", + "from": "lodash.assign@>=4.0.3 <5.0.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz" }, "lodash.get": { @@ -416,7 +416,7 @@ }, "lodash.isempty": { "version": "4.4.0", - "from": "lodash.isempty@4.4.0", + "from": "lodash.isempty@>=4.2.1 <5.0.0", "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz" }, "lodash.values": { @@ -426,12 +426,12 @@ }, "log-rotate": { "version": "0.2.7", - "from": "log-rotate@0.2.7", + "from": "log-rotate@>=0.2.7 <0.3.0", "resolved": "https://registry.npmjs.org/log-rotate/-/log-rotate-0.2.7.tgz" }, "log4js": { "version": "0.6.38", - "from": "log4js@0.6.38", + "from": "log4js@>=0.6.35 <0.7.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", "dependencies": { "isarray": { @@ -446,24 +446,24 @@ }, "semver": { "version": "4.3.6", - "from": "semver@4.3.6", + "from": "semver@>=4.3.3 <4.4.0", "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" } } }, "lokijs": { "version": "1.4.1", - "from": "lokijs@1.4.1", + "from": "lokijs@>=1.4.1 <2.0.0", "resolved": "https://registry.npmjs.org/lokijs/-/lokijs-1.4.1.tgz" }, "lowercase-keys": { "version": "1.0.0", - "from": "lowercase-keys@1.0.0", + "from": "lowercase-keys@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz" }, "lru-cache": { "version": "4.0.1", - "from": "lru-cache@4.0.1", + "from": "lru-cache@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz" }, "match-stream": { @@ -485,17 +485,17 @@ }, "memorystream": { "version": "0.3.1", - "from": "memorystream@0.3.1", + "from": "memorystream@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz" }, "minimatch": { "version": "3.0.3", - "from": "minimatch@3.0.3", + "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" }, "minimist": { "version": "1.2.0", - "from": "minimist@1.2.0", + "from": "minimist@>=1.1.3 <2.0.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" }, "minimongo-standalone": { @@ -505,7 +505,7 @@ }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@0.5.1", + "from": "mkdirp@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "dependencies": { "minimist": { @@ -522,12 +522,12 @@ }, "nan": { "version": "2.4.0", - "from": "nan@2.4.0", + "from": "nan@>=2.0.5 <3.0.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" }, "natives": { "version": "1.1.0", - "from": "natives@1.1.0", + "from": "natives@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz" }, "node-status-codes": { @@ -537,7 +537,7 @@ }, "normalize-package-data": { "version": "2.3.5", - "from": "normalize-package-data@2.3.5", + "from": "normalize-package-data@>=2.3.2 <3.0.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz" }, "number-is-nan": { @@ -547,12 +547,12 @@ }, "numeral": { "version": "1.5.3", - "from": "numeral@1.5.3", + "from": "numeral@>=1.5.3 <2.0.0", "resolved": "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz" }, "once": { "version": "1.4.0", - "from": "once@1.4.0", + "from": "once@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz" }, "optimist": { @@ -562,24 +562,24 @@ "dependencies": { "minimist": { "version": "0.0.10", - "from": "minimist@0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } }, "os-locale": { "version": "1.4.0", - "from": "os-locale@1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" }, "os-timesync": { "version": "1.0.6", - "from": "os-timesync@1.0.6", + "from": "os-timesync@>=1.0.6 <2.0.0", "resolved": "https://registry.npmjs.org/os-timesync/-/os-timesync-1.0.6.tgz" }, "os-tmpdir": { "version": "1.0.2", - "from": "os-tmpdir@1.0.2", + "from": "os-tmpdir@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" }, "over": { @@ -589,7 +589,7 @@ }, "parse-json": { "version": "2.2.0", - "from": "parse-json@2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz" }, "path-is-absolute": { @@ -599,7 +599,7 @@ }, "path-type": { "version": "1.1.0", - "from": "path-type@1.1.0", + "from": "path-type@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "dependencies": { "graceful-fs": { @@ -611,27 +611,27 @@ }, "pify": { "version": "2.3.0", - "from": "pify@2.3.0", + "from": "pify@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" }, "pinkie": { "version": "2.0.4", - "from": "pinkie@2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" }, "pinkie-promise": { "version": "2.0.1", - "from": "pinkie-promise@2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" }, "prepend-http": { "version": "1.0.4", - "from": "prepend-http@1.0.4", + "from": "prepend-http@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz" }, "pseudomap": { "version": "1.0.2", - "from": "pseudomap@1.0.2", + "from": "pseudomap@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" }, "pullstream": { @@ -653,17 +653,17 @@ }, "read-pkg": { "version": "1.1.0", - "from": "read-pkg@1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" }, "read-pkg-up": { "version": "1.0.1", - "from": "read-pkg-up@1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "require-directory": { "version": "2.1.1", - "from": "require-directory@2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" }, "require-from-string": { @@ -673,42 +673,42 @@ }, "require-main-filename": { "version": "1.0.1", - "from": "require-main-filename@1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" }, "resolve": { "version": "1.1.7", - "from": "resolve@1.1.7", + "from": "resolve@>=1.1.7 <2.0.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" }, "rimraf": { "version": "2.5.4", - "from": "rimraf@2.5.4", + "from": "rimraf@>=2.2.8 <3.0.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz" }, "ripemd160": { "version": "1.0.1", - "from": "ripemd160@1.0.1", + "from": "ripemd160@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz" }, "rlp": { "version": "2.0.0", - "from": "rlp@2.0.0", + "from": "rlp@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz" }, "secp256k1": { "version": "3.2.0", - "from": "secp256k1@3.2.0", + "from": "secp256k1@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.2.0.tgz" }, "semver": { "version": "5.3.0", - "from": "semver@5.3.0", + "from": "semver@>=5.1.0 <6.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" }, "set-blocking": { "version": "2.0.0", - "from": "set-blocking@2.0.0", + "from": "set-blocking@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" }, "setimmediate": { @@ -718,12 +718,12 @@ }, "sha.js": { "version": "2.4.5", - "from": "sha.js@2.4.5", + "from": "sha.js@>=2.3.6 <3.0.0", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz" }, "sha3": { "version": "1.2.0", - "from": "sha3@1.2.0", + "from": "sha3@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.0.tgz" }, "slice-stream": { @@ -734,7 +734,7 @@ "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "resolved": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "readable-stream": { "version": "1.0.34", @@ -750,7 +750,7 @@ }, "spdx-correct": { "version": "1.0.2", - "from": "spdx-correct@1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz" }, "spdx-expression-parse": { @@ -760,32 +760,32 @@ }, "spdx-license-ids": { "version": "1.2.2", - "from": "spdx-license-ids@1.2.2", + "from": "spdx-license-ids@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" }, "sprintf-js": { "version": "1.0.3", - "from": "sprintf-js@1.0.3", + "from": "sprintf-js@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@0.10.31", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "string-width": { "version": "1.0.2", - "from": "string-width@1.0.2", + "from": "string-width@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" }, "strip-ansi": { "version": "3.0.1", - "from": "strip-ansi@3.0.1", + "from": "strip-ansi@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" }, "timed-out": { "version": "2.0.0", - "from": "timed-out@2.0.0", + "from": "timed-out@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz" }, "traverse": { @@ -795,22 +795,22 @@ }, "tslint": { "version": "3.15.1", - "from": "tslint@3.15.1", + "from": "tslint@>=3.15.1 <4.0.0", "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz" }, "typescript": { "version": "1.8.10", - "from": "typescript@1.8.10", + "from": "typescript@>=1.7.3 <2.0.0", "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz" }, "underscore": { "version": "1.8.3", - "from": "underscore@1.8.3", + "from": "underscore@>=1.8.3 <2.0.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" }, "underscore.string": { "version": "3.3.4", - "from": "underscore.string@3.3.4", + "from": "underscore.string@>=3.3.4 <4.0.0", "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz" }, "unzip": { @@ -821,7 +821,7 @@ "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "resolved": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "readable-stream": { "version": "1.0.34", @@ -832,37 +832,37 @@ }, "unzip-response": { "version": "2.0.1", - "from": "unzip-response@2.0.1", + "from": "unzip-response@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz" }, "url-parse-lax": { "version": "1.0.0", - "from": "url-parse-lax@1.0.0", + "from": "url-parse-lax@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz" }, "utf8": { "version": "2.1.1", - "from": "utf8@2.1.1", + "from": "utf8@>=2.1.1 <3.0.0", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz" }, "util-deprecate": { "version": "1.0.2", - "from": "util-deprecate@1.0.2", + "from": "util-deprecate@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" }, "uuid": { "version": "2.0.3", - "from": "uuid@2.0.3", + "from": "uuid@>=2.0.2 <3.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz" }, "validate-npm-package-license": { "version": "3.0.1", - "from": "validate-npm-package-license@3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz" }, "web3": { "version": "0.17.0-beta", - "from": "web3@0.17.0-beta", + "from": "web3@>=0.17.0-alpha <0.18.0", "resolved": "https://registry.npmjs.org/web3/-/web3-0.17.0-beta.tgz", "dependencies": { "bignumber.js": { @@ -874,57 +874,57 @@ }, "which": { "version": "1.2.11", - "from": "which@1.2.11", + "from": "which@>=1.2.8 <2.0.0", "resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz" }, "which-module": { "version": "1.0.0", - "from": "which-module@1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" }, "window-size": { "version": "0.2.0", - "from": "window-size@0.2.0", + "from": "window-size@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz" }, "wordwrap": { "version": "0.0.3", - "from": "wordwrap@0.0.3", + "from": "wordwrap@>=0.0.2 <0.1.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "wrap-ansi": { "version": "2.0.0", - "from": "wrap-ansi@2.0.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz" }, "wrappy": { "version": "1.0.2", - "from": "wrappy@1.0.2", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" }, "xmlhttprequest": { "version": "1.8.0", - "from": "xmlhttprequest@1.8.0", + "from": "xmlhttprequest@*", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz" }, "y18n": { "version": "3.2.1", - "from": "y18n@3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" }, "yallist": { "version": "2.0.0", - "from": "yallist@2.0.0", + "from": "yallist@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" }, "yargs": { "version": "4.8.1", - "from": "yargs@4.8.1", + "from": "yargs@>=4.3.1 <5.0.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz" }, "yargs-parser": { "version": "2.4.1", - "from": "yargs-parser@2.4.1", + "from": "yargs-parser@>=2.4.1 <3.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz" } } diff --git a/package.json b/package.json index 99b97ce45..66dda869e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Mist", - "version": "0.8.6", + "version": "0.8.7", "license": "GPL-3.0", "author": "Ethereum Mist Team ", "repository": { @@ -42,7 +42,7 @@ "co-mocha": "^1.1.2", "del": "^1.2.1", "electron-builder": "=5.23.2", - "electron-prebuilt": "=1.3.5", + "electron": "=1.3.5", "genomatic": "^1.0.0", "geth-private": "^1.3.0", "gulp": "^3.9.0",