From 742cedd29a541b3eb77d9703a185243c2f459378 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 12 Jan 2019 17:23:51 +0000 Subject: [PATCH 01/11] chore(package): update autoprefixer to version 9.4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e938dff6..b8befb53 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@ethereum-alarm-clock/timenode-core": "5.5.0", "@fortawesome/fontawesome-free": "5.6.3", "acorn5-object-spread": "5.1.2", - "autoprefixer": "9.4.4", + "autoprefixer": "9.4.5", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.0.1", "babel-jest": "23.6.0", From 5c2ed8698b09575943393c81d6b11cfd55092e94 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 12 Jan 2019 17:23:55 +0000 Subject: [PATCH 02/11] chore(package): update lockfile package-lock.json --- package-lock.json | 127 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 95 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61c69a84..7fc289ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1053,7 +1053,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -1093,8 +1092,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "utf8": { "version": "2.1.1", @@ -1140,6 +1138,19 @@ "underscore": "1.8.3", "web3-core-helpers": "1.0.0-beta.36", "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + }, + "dependencies": { + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "dev": true, + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } + } } }, "web3-utils": { @@ -1168,7 +1179,6 @@ "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "dev": true, "requires": { "debug": "^2.2.0", "nan": "^2.3.3", @@ -2113,17 +2123,50 @@ "dev": true }, "autoprefixer": { - "version": "9.4.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.4.tgz", - "integrity": "sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==", + "version": "9.4.5", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.5.tgz", + "integrity": "sha512-M602C0ZxzFpJKqD4V6eq2j+K5CkzlhekCrcQupJmAOrPEZjWJyj/wSeo6qRSNoN6M3/9mtLPQqTTrABfReytQg==", "dev": true, "requires": { - "browserslist": "^4.3.7", - "caniuse-lite": "^1.0.30000926", + "browserslist": "^4.4.0", + "caniuse-lite": "^1.0.30000928", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.7", + "postcss": "^7.0.11", "postcss-value-parser": "^3.3.1" + }, + "dependencies": { + "browserslist": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.0.tgz", + "integrity": "sha512-tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30000928", + "electron-to-chromium": "^1.3.100", + "node-releases": "^1.1.3" + } + }, + "postcss": { + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.11.tgz", + "integrity": "sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + } + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "aws-sign2": { @@ -7802,7 +7845,7 @@ "dependencies": { "ethereumjs-abi": { "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", + "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799", "dev": true, "requires": { "bn.js": "^4.10.0", @@ -9361,12 +9404,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9381,17 +9426,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9508,7 +9556,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9520,6 +9569,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9534,6 +9584,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9541,12 +9592,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9565,6 +9618,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9645,7 +9699,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9657,6 +9712,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9778,6 +9834,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12030,8 +12087,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-url": { "version": "1.2.4", @@ -15048,8 +15104,7 @@ "nan": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" }, "nano-json-stream-parser": { "version": "0.1.2", @@ -18519,7 +18574,7 @@ }, "buble": { "version": "github:pemrouz/buble#4e639aeeb64712ac95dc30a52750d1ee4432c9c8", - "from": "github:pemrouz/buble", + "from": "github:pemrouz/buble#4e639aeeb64712ac95dc30a52750d1ee4432c9c8", "dev": true, "requires": { "acorn": "^5.1.2", @@ -21368,7 +21423,6 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, "requires": { "is-typedarray": "^1.0.0" } @@ -22491,7 +22545,7 @@ "dependencies": { "bignumber.js": { "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "dev": true }, "crypto-js": { @@ -22576,7 +22630,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -22584,8 +22637,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "web3-providers-ws": { "version": "1.0.0-beta.35", @@ -22596,12 +22648,24 @@ "underscore": "1.8.3", "web3-core-helpers": "1.0.0-beta.35", "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + }, + "dependencies": { + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "dev": true, + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } + } } }, "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "dev": true, "requires": { "debug": "^2.2.0", "nan": "^2.3.3", @@ -22903,7 +22967,7 @@ }, "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "dev": true, "requires": { "debug": "^2.2.0", @@ -24665,8 +24729,7 @@ "yaeti": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", - "dev": true + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" }, "yallist": { "version": "2.1.2", From e1f88aaa7477d5475ab632fb56c556c6c8acf73b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 15 Jan 2019 08:11:21 +0000 Subject: [PATCH 03/11] chore(package): update electron-builder to version 20.38.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e938dff6..bbfac14d 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "eac-counter": "0.1.2", "eac.js-lib": "2.5.1", "electron": "3.0.11", - "electron-builder": "20.28.4", + "electron-builder": "20.38.5", "electron-packager": "13.0.1", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.7.1", From 1585a0aa752c135949691b91d2b48fdeaaa14458 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 15 Jan 2019 08:11:24 +0000 Subject: [PATCH 04/11] fix(package): update electron-updater to version 4.0.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbfac14d..901e18e4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "electron-is-dev": "1.0.1", - "electron-updater": "3.1.2" + "electron-updater": "4.0.6" }, "devDependencies": { "@babel/core": "7.2.2", From ecf97dab2cea56cd7e9502f9f8ecfc78c6ac34ae Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 15 Jan 2019 08:11:28 +0000 Subject: [PATCH 05/11] chore(package): update lockfile package-lock.json --- package-lock.json | 433 +++++++++++++++++++++++----------------------- 1 file changed, 219 insertions(+), 214 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61c69a84..29365d25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "7zip-bin": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.0.2.tgz", - "integrity": "sha512-XtGk+IF57pr852UK1AhQJXqmm1WmSgS5uISL+LPs0z/iAxXouMvdlLJrHPeukP6gd7yR2rDTMSMkHNODgwIq7A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.1.0.tgz", + "integrity": "sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA==", "dev": true }, "@babel/code-frame": { @@ -1053,7 +1053,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -1093,8 +1092,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "utf8": { "version": "2.1.1", @@ -1140,6 +1138,19 @@ "underscore": "1.8.3", "web3-core-helpers": "1.0.0-beta.36", "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + }, + "dependencies": { + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "dev": true, + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } + } } }, "web3-utils": { @@ -1168,7 +1179,6 @@ "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "dev": true, "requires": { "debug": "^2.2.0", "nan": "^2.3.3", @@ -1704,51 +1714,63 @@ } }, "app-builder-bin": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.2.tgz", - "integrity": "sha512-PZJspzAqB0+z60OalXChP9I05BzODd/ffDz6RvTmDG3qclr7YrnpqzvPF+T7vGVtk2nN7syuveTQROJfXcB8xA==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.3.tgz", + "integrity": "sha512-JL8C41e6yGIchFsHP/q15aGNedAaUakLhkV6ER0Yxafx08sRnlDnlkAkEIKjX7edg/4i7swpGa6CBv1zX9GgCA==", "dev": true }, "app-builder-lib": { - "version": "20.28.4", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.28.4.tgz", - "integrity": "sha512-RY4/NJs1HCFWAOpLMivuDzbesU5VyaZVKuQllxgCNZ56+ihgO5aGexla2DVjG/bBQleWfF3DPnEsF3sbZPlpHw==", + "version": "20.38.5", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.38.5.tgz", + "integrity": "sha512-vVgM9d9twwlhr+8vNAJOAD9dyVBRk7reuVa1BE1OmvaHb1M+fS8KpvcDKVdBqX9KDHy7zSc57mnIcHgax4/XMA==", "dev": true, "requires": { - "7zip-bin": "~4.0.2", - "app-builder-bin": "2.1.2", + "7zip-bin": "~4.1.0", + "app-builder-bin": "2.6.3", "async-exit-hook": "^2.0.1", - "bluebird-lst": "^1.0.5", - "builder-util": "6.1.3", - "builder-util-runtime": "4.4.1", + "bluebird-lst": "^1.0.6", + "builder-util": "9.6.2", + "builder-util-runtime": "8.1.1", "chromium-pickle-js": "^0.2.0", - "debug": "^3.1.0", + "debug": "^4.1.1", "ejs": "^2.6.1", - "electron-osx-sign": "0.4.10", - "electron-publish": "20.28.3", - "fs-extra-p": "^4.6.1", + "electron-osx-sign": "0.4.11", + "electron-publish": "20.38.5", + "fs-extra-p": "^7.0.0", "hosted-git-info": "^2.7.1", - "is-ci": "^1.2.0", - "isbinaryfile": "^3.0.3", - "js-yaml": "^3.12.0", + "is-ci": "^2.0.0", + "isbinaryfile": "^4.0.0", + "js-yaml": "^3.12.1", "lazy-val": "^1.0.3", "minimatch": "^3.0.4", "normalize-package-data": "^2.4.0", "plist": "^3.0.1", - "read-config-file": "3.1.2", + "read-config-file": "3.2.1", "sanitize-filename": "^1.6.1", - "semver": "^5.5.1", - "temp-file": "^3.1.3" + "semver": "^5.6.0", + "temp-file": "^3.3.2" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", "dev": true, "requires": { - "ms": "^2.1.1" + "ci-info": "^2.0.0" } + }, + "isbinaryfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz", + "integrity": "sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA==", + "dev": true } } }, @@ -4036,57 +4058,61 @@ "dev": true }, "builder-util": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-6.1.3.tgz", - "integrity": "sha512-MXeARNff9KHlzJYGJcAhLI/tpE57PmUnleaYfL22IE+viRt192Yr3wQL444ztsA+LUHJ8d12moUoG00jh1hfLA==", + "version": "9.6.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.2.tgz", + "integrity": "sha512-cWl/0/Q851lesMmXp1IjreeAX1QAWA9e+iU2IT61oh+CvMYJnDwao2m9ZCHammdw2zllrwWu4fOC3gvsb/yOCw==", "dev": true, "requires": { - "7zip-bin": "~4.0.2", - "app-builder-bin": "2.1.2", - "bluebird-lst": "^1.0.5", - "builder-util-runtime": "^4.4.1", - "chalk": "^2.4.1", - "debug": "^3.1.0", - "fs-extra-p": "^4.6.1", - "is-ci": "^1.2.0", - "js-yaml": "^3.12.0", - "lazy-val": "^1.0.3", - "semver": "^5.5.1", - "source-map-support": "^0.5.9", + "7zip-bin": "~4.1.0", + "app-builder-bin": "2.6.3", + "bluebird-lst": "^1.0.6", + "builder-util-runtime": "^8.1.1", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "fs-extra-p": "^7.0.0", + "is-ci": "^2.0.0", + "js-yaml": "^3.12.1", + "source-map-support": "^0.5.10", "stat-mode": "^0.2.2", - "temp-file": "^3.1.3" + "temp-file": "^3.3.2" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", "dev": true, "requires": { - "ms": "^2.1.1" + "ci-info": "^2.0.0" + } + }, + "source-map-support": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } } } }, "builder-util-runtime": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", - "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz", + "integrity": "sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==", "requires": { - "bluebird-lst": "^1.0.5", - "debug": "^3.1.0", - "fs-extra-p": "^4.6.1", + "bluebird-lst": "^1.0.6", + "debug": "^4.1.1", + "fs-extra-p": "^7.0.0", "sax": "^1.2.4" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - } } }, "builtin-modules": { @@ -5747,7 +5773,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, "requires": { "ms": "^2.1.1" } @@ -6244,17 +6269,17 @@ "dev": true }, "dmg-builder": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.3.1.tgz", - "integrity": "sha512-/+vtqlgvTtha/4Gc76XIRKS2KzYO58sTWXhZ/kgfNr05ZXY6bIw26v7xDu8ZBpTYnfWI09JRZTMv1yIXT/vvfg==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.4.tgz", + "integrity": "sha512-EaEkF8weXez3iAwgYffjcYfumauUh5x+BggMgn/IuihNIA5/WfzRAUR4wMq9aII2zwArlw+rIrX6ZHKbmtkQmA==", "dev": true, "requires": { - "app-builder-lib": "~20.28.3", - "bluebird-lst": "^1.0.5", - "builder-util": "~6.1.3", - "fs-extra-p": "^4.6.1", + "app-builder-lib": "~20.38.5", + "bluebird-lst": "^1.0.6", + "builder-util": "~9.6.2", + "fs-extra-p": "^7.0.0", "iconv-lite": "^0.4.24", - "js-yaml": "^3.12.0", + "js-yaml": "^3.12.1", "parse-color": "^1.0.0", "sanitize-filename": "^1.6.1" } @@ -6514,24 +6539,24 @@ } }, "electron-builder": { - "version": "20.28.4", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.28.4.tgz", - "integrity": "sha512-JMOzMfx9BrC9SJr6+UacuvQZmuodL02Zua8iFn0l5bv32GkWcNj1D6FwybV33BpsmdQ8sF1SkQj+7L+FEIxang==", + "version": "20.38.5", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.5.tgz", + "integrity": "sha512-p88IDHhH2J4hA6KwRBJY+OfVZuFtFIShY3Uh/TwYAfbX0v1RhKZytuGdO8sty2zcWxDYX74xDBv+X9oN6qEIRQ==", "dev": true, "requires": { - "app-builder-lib": "20.28.4", - "bluebird-lst": "^1.0.5", - "builder-util": "6.1.3", - "builder-util-runtime": "4.4.1", - "chalk": "^2.4.1", - "dmg-builder": "5.3.1", - "fs-extra-p": "^4.6.1", - "is-ci": "^1.2.0", + "app-builder-lib": "20.38.5", + "bluebird-lst": "^1.0.6", + "builder-util": "9.6.2", + "builder-util-runtime": "8.1.1", + "chalk": "^2.4.2", + "dmg-builder": "6.5.4", + "fs-extra-p": "^7.0.0", + "is-ci": "^2.0.0", "lazy-val": "^1.0.3", - "read-config-file": "3.1.2", + "read-config-file": "3.2.1", "sanitize-filename": "^1.6.1", "update-notifier": "^2.5.0", - "yargs": "^12.0.1" + "yargs": "^12.0.5" }, "dependencies": { "ansi-regex": { @@ -6546,6 +6571,12 @@ "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", "dev": true }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -6609,6 +6640,15 @@ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "requires": { + "ci-info": "^2.0.0" + } + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -6817,9 +6857,9 @@ } }, "electron-osx-sign": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz", - "integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=", + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz", + "integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==", "dev": true, "requires": { "bluebird": "^3.5.0", @@ -6827,15 +6867,9 @@ "debug": "^2.6.8", "isbinaryfile": "^3.0.2", "minimist": "^1.2.0", - "plist": "^2.1.0" + "plist": "^3.0.1" }, "dependencies": { - "base64-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", - "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=", - "dev": true - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -6850,17 +6884,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "plist": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz", - "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=", - "dev": true, - "requires": { - "base64-js": "1.2.0", - "xmlbuilder": "8.2.2", - "xmldom": "0.1.x" - } } } }, @@ -6956,18 +6979,18 @@ } }, "electron-publish": { - "version": "20.28.3", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.28.3.tgz", - "integrity": "sha512-/2t5zk9EKgH7p7rFZ+ynTKLmpKGF9bktMP2UR6u4bbPz9w4r3WEUbPOeZ1TLqUCAqdfZECcj4ThjrlcAJTghCA==", + "version": "20.38.5", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.5.tgz", + "integrity": "sha512-EhdPm6t0nKDfa0r3KjV1kSFcz03VrzgJRv7v5nHkkpQZB6OSmDNlHq7k66NBwQhPK3i4CK+uvehljZAP28vbCA==", "dev": true, "requires": { - "bluebird-lst": "^1.0.5", - "builder-util": "~6.1.3", - "builder-util-runtime": "^4.4.1", - "chalk": "^2.4.1", - "fs-extra-p": "^4.6.1", + "bluebird-lst": "^1.0.6", + "builder-util": "~9.6.2", + "builder-util-runtime": "^8.1.1", + "chalk": "^2.4.2", + "fs-extra-p": "^7.0.0", "lazy-val": "^1.0.3", - "mime": "^2.3.1" + "mime": "^2.4.0" }, "dependencies": { "mime": { @@ -6985,25 +7008,25 @@ "dev": true }, "electron-updater": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-3.1.2.tgz", - "integrity": "sha512-y3n37O01pdynMJHhJbOd2UVhVrmDW6zLvR2SOZ+gk3S6r16872+0nNbC48GXWwc26lTeus/Zja/XUpiqrvdw4A==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.0.6.tgz", + "integrity": "sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==", "requires": { - "bluebird-lst": "^1.0.5", - "builder-util-runtime": "~4.4.1", - "electron-is-dev": "^0.3.0", - "fs-extra-p": "^4.6.1", + "bluebird-lst": "^1.0.6", + "builder-util-runtime": "~8.1.0", + "fs-extra-p": "^7.0.0", "js-yaml": "^3.12.0", "lazy-val": "^1.0.3", "lodash.isequal": "^4.5.0", - "semver": "^5.5.1", + "pako": "^1.0.7", + "semver": "^5.6.0", "source-map-support": "^0.5.9" }, "dependencies": { - "electron-is-dev": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz", - "integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4=" + "pako": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz", + "integrity": "sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==" } } }, @@ -7802,7 +7825,7 @@ "dependencies": { "ethereumjs-abi": { "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", + "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799", "dev": true, "requires": { "bn.js": "^4.10.0", @@ -9251,9 +9274,9 @@ "dev": true }, "fs-extra": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", - "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "requires": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -9261,12 +9284,12 @@ } }, "fs-extra-p": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", - "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.0.tgz", + "integrity": "sha512-5tg5jBOd0xIXjwj4PDnafOXL5TyPVzjxLby4DPKev53wurEXp7IsojBaD4Lj5M5w7jxw0pbkEU0fFEPmcKoMnA==", "requires": { - "bluebird-lst": "^1.0.5", - "fs-extra": "^6.0.1" + "bluebird-lst": "^1.0.6", + "fs-extra": "^7.0.0" } }, "fs-promise": { @@ -9361,12 +9384,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9381,17 +9406,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9508,7 +9536,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9520,6 +9549,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9534,6 +9564,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9541,12 +9572,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9565,6 +9598,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9645,7 +9679,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9657,6 +9692,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9778,6 +9814,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12030,8 +12067,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-url": { "version": "1.2.4", @@ -15048,8 +15084,7 @@ "nan": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" }, "nano-json-stream-parser": { "version": "0.1.2", @@ -17285,26 +17320,26 @@ } }, "read-config-file": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.2.tgz", - "integrity": "sha512-QCATYzlYHvmWps/W/eP7rcKuhYRYZg5XKeXFxSJRIXvn+KSw1+Ntz2et1aBz5TrEpawGrxWZ7zBipj+/v0xwWQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.1.tgz", + "integrity": "sha512-yW4hZZXdNN+Paij5JVAiTv1lUsAN5QRBU5NqotQqwYdVkUczSmDzm66VLu0eojiZt2zFeYptTFDAYlalDGuHdA==", "dev": true, "requires": { - "ajv": "^6.5.2", + "ajv": "^6.7.0", "ajv-keywords": "^3.2.0", - "bluebird-lst": "^1.0.5", - "dotenv": "^6.0.0", + "bluebird-lst": "^1.0.6", + "dotenv": "^6.2.0", "dotenv-expand": "^4.2.0", - "fs-extra-p": "^4.6.1", - "js-yaml": "^3.12.0", - "json5": "^1.0.1", + "fs-extra-p": "^7.0.0", + "js-yaml": "^3.12.1", + "json5": "^2.1.0", "lazy-val": "^1.0.3" }, "dependencies": { "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -17330,15 +17365,6 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } } } }, @@ -18519,7 +18545,7 @@ }, "buble": { "version": "github:pemrouz/buble#4e639aeeb64712ac95dc30a52750d1ee4432c9c8", - "from": "github:pemrouz/buble", + "from": "github:pemrouz/buble#4e639aeeb64712ac95dc30a52750d1ee4432c9c8", "dev": true, "requires": { "acorn": "^5.1.2", @@ -20796,29 +20822,6 @@ "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.6", "fs-extra-p": "^7.0.0" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-extra-p": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.0.tgz", - "integrity": "sha512-5tg5jBOd0xIXjwj4PDnafOXL5TyPVzjxLby4DPKev53wurEXp7IsojBaD4Lj5M5w7jxw0pbkEU0fFEPmcKoMnA==", - "dev": true, - "requires": { - "bluebird-lst": "^1.0.6", - "fs-extra": "^7.0.0" - } - } } }, "term-size": { @@ -21368,7 +21371,6 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, "requires": { "is-typedarray": "^1.0.0" } @@ -22491,7 +22493,7 @@ "dependencies": { "bignumber.js": { "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "dev": true }, "crypto-js": { @@ -22576,7 +22578,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -22584,8 +22585,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "web3-providers-ws": { "version": "1.0.0-beta.35", @@ -22596,12 +22596,24 @@ "underscore": "1.8.3", "web3-core-helpers": "1.0.0-beta.35", "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + }, + "dependencies": { + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "dev": true, + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } + } } }, "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "dev": true, "requires": { "debug": "^2.2.0", "nan": "^2.3.3", @@ -22903,7 +22915,7 @@ }, "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", "dev": true, "requires": { "debug": "^2.2.0", @@ -24603,12 +24615,6 @@ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", "dev": true }, - "xmlbuilder": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", - "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=", - "dev": true - }, "xmldom": { "version": "0.1.27", "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", @@ -24665,8 +24671,7 @@ "yaeti": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", - "dev": true + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" }, "yallist": { "version": "2.1.2", From 01ed17fb3a24616630d22e7eec7a6f45a51fa753 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 17 Jan 2019 07:35:36 +0000 Subject: [PATCH 06/11] chore(package): update eslint-plugin-react to version 7.12.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e938dff6..d30bea82 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint-plugin-jest": "21.26.1", "eslint-plugin-node": "7.0.1", "eslint-plugin-promise": "4.0.1", - "eslint-plugin-react": "7.12.3", + "eslint-plugin-react": "7.12.4", "eslint-plugin-standard": "4.0.0", "ethereumjs-util": "5.2.0", "ethereumjs-wallet": "0.6.2", From e1281aaf78b600b672ff697307021f4974080b81 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 17 Jan 2019 07:35:44 +0000 Subject: [PATCH 07/11] chore(package): update lockfile package-lock.json --- package-lock.json | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index edb2c651..9e36d319 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7581,9 +7581,9 @@ "dev": true }, "eslint-plugin-react": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz", - "integrity": "sha512-WTIA3cS8OzkPeCi4KWuPmjR33lgG9r9Y/7RmnLTRw08MZKgAfnK/n3BO4X0S67MPkVLazdfCNT/XWqcDu4BLTA==", + "version": "7.12.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz", + "integrity": "sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==", "dev": true, "requires": { "array-includes": "^3.0.3", @@ -9347,12 +9347,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9367,17 +9369,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9494,7 +9499,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9506,6 +9512,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9520,6 +9527,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9527,12 +9535,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9551,6 +9561,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9631,7 +9642,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9643,6 +9655,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9764,6 +9777,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", From 0fb6d3bc98e77308730fb69c22c1108531dd6a9a Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 17 Jan 2019 20:08:11 +0000 Subject: [PATCH 08/11] chore(package): update browserslist to version 4.4.1 Closes #955 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e938dff6..bde4f0a5 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "bootstrap": "4.2.1", "bootstrap-datepicker": "1.8.0", "bootstrap-timepicker": "0.5.2", - "browserslist": "4.3.7", + "browserslist": "4.4.1", "chart.js": "2.7.3", "compression-webpack-plugin": "2.0.0", "concurrently": "4.1.0", From 76b95db2d910af148826e01cb6fcd0fc250415ab Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 17 Jan 2019 20:08:17 +0000 Subject: [PATCH 09/11] chore(package): update lockfile package-lock.json --- package-lock.json | 52 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index edb2c651..e3f78952 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3873,14 +3873,28 @@ } }, "browserslist": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.7.tgz", - "integrity": "sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", + "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000925", - "electron-to-chromium": "^1.3.96", + "caniuse-lite": "^1.0.30000929", + "electron-to-chromium": "^1.3.103", "node-releases": "^1.1.3" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30000929", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz", + "integrity": "sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.103", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz", + "integrity": "sha512-tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ==", + "dev": true + } } }, "bs58": { @@ -9347,12 +9361,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9367,17 +9383,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9494,7 +9513,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9506,6 +9526,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9520,6 +9541,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9527,12 +9549,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9551,6 +9575,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9631,7 +9656,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9643,6 +9669,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9764,6 +9791,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", From 2250c125dc3f16fb955941f486e85d5956aa40f7 Mon Sep 17 00:00:00 2001 From: Daniel Kmak Date: Thu, 31 Jan 2019 13:27:31 +0100 Subject: [PATCH 10/11] [BUGFIX] Fix cancel section when scheduling by blocks. (#973) --- __tests__/TransactionDetails.unit.test.js | 12 +++- .../TransactionScanner/BlockOrTimeDisplay.js | 7 ++- .../TransactionScanner/TransactionDetails.js | 60 ++++++++++--------- .../TransactionDetails/CancelSection.jsx | 11 +++- app/services/transaction-helper.js | 4 +- 5 files changed, 59 insertions(+), 35 deletions(-) diff --git a/__tests__/TransactionDetails.unit.test.js b/__tests__/TransactionDetails.unit.test.js index fc0c1d54..a38ddc55 100644 --- a/__tests__/TransactionDetails.unit.test.js +++ b/__tests__/TransactionDetails.unit.test.js @@ -7,6 +7,7 @@ import TransactionDetails from '../app/components/TransactionScanner/Transaction import { TransactionStore } from '../app/stores/TransactionStore'; import TokenHelper from '../app/services/token-helper'; import LoadingStateStore from '../app/stores/LoadingStateStore'; +import TransactionHelper from '../app/services/transaction-helper'; describe('TransactionDetails', () => { it('correctly renders', async () => { @@ -54,7 +55,16 @@ describe('TransactionDetails', () => { } }; - const transactionStore = new TransactionStore(eacService, web3Service); + const transactionHelper = new TransactionHelper(); + + const transactionStore = new TransactionStore( + eacService, + web3Service, + {}, + {}, + {}, + transactionHelper + ); const tokenHelper = new TokenHelper(web3Service); const loadingStateStore = new LoadingStateStore(web3Service, {}, transactionStore); diff --git a/app/components/TransactionScanner/BlockOrTimeDisplay.js b/app/components/TransactionScanner/BlockOrTimeDisplay.js index ddaaba53..8b9f1369 100644 --- a/app/components/TransactionScanner/BlockOrTimeDisplay.js +++ b/app/components/TransactionScanner/BlockOrTimeDisplay.js @@ -97,11 +97,13 @@ class BlockOrTimeDisplay extends Component { } render() { - const { duration } = this.props; + const { duration, includeUnitText, isTimestamp } = this.props; const { block, time } = this.state; if (block) { - return `${block} ${duration ? 'blocks ' : ''}(${time})`; + return `${includeUnitText && !isTimestamp ? 'block ' : ''}${block} ${ + duration ? 'blocks ' : '' + }(${time})`; } return time; @@ -110,6 +112,7 @@ class BlockOrTimeDisplay extends Component { BlockOrTimeDisplay.propTypes = { duration: PropTypes.bool, + includeUnitText: PropTypes.any, isTimestamp: PropTypes.any, model: PropTypes.any, eacService: PropTypes.any, diff --git a/app/components/TransactionScanner/TransactionDetails.js b/app/components/TransactionScanner/TransactionDetails.js index bc7dcc70..90772d86 100644 --- a/app/components/TransactionScanner/TransactionDetails.js +++ b/app/components/TransactionScanner/TransactionDetails.js @@ -275,18 +275,6 @@ class TransactionDetails extends Component { this.setState({ isFrozen: isFrozen || transaction.isCancelled }); } - getTransactionPropertyTimeDisplay(transaction, property) { - let display = ''; - - if (transaction[property] && transaction[property].toString) { - const parsedUnixTime = moment.unix(transaction[property].toString()); - - display = parsedUnixTime.format('YYYY/MM/DD HH:mm:ss'); - } - - return display; - } - handleProxyDataClick() { this.setState({ proxyDataCheckBox: !this.state.proxyDataCheckBox @@ -342,6 +330,8 @@ class TransactionDetails extends Component { async setupDetails() { const { transaction, transactionStore, transactionMissingData } = this.props; + await transactionStore.init(); + const status = await transactionStore.getTxStatus(transaction, moment().unix()); const statePropertiesToSet = { @@ -562,9 +552,32 @@ class TransactionDetails extends Component { return ; } + isCancelButtonEnabled() { + const { transaction, transactionMissingData, transactionStore } = this.props; + const { isFrozen, status } = this.state; + const isOwner = this.isOwner(transaction); + const isTimestamp = transactionStore.isTxUnitTimestamp(transaction); + + let isBeforeClaimWindowStart = false; + + if (isTimestamp) { + isBeforeClaimWindowStart = moment.unix(transaction.claimWindowStart) > moment(); + } else { + isBeforeClaimWindowStart = transaction.claimWindowStart > transactionStore.lastBlock; + } + + return ( + !transactionMissingData && + isOwner && + !isFrozen && + ((status === TRANSACTION_STATUS.SCHEDULED && isBeforeClaimWindowStart) || + status === TRANSACTION_STATUS.MISSED) + ); + } + render() { - const { transaction, transactionMissingData } = this.props; - const { callData, executedAt, isFrozen, status, tokenTransferApproved } = this.state; + const { transaction, transactionMissingData, transactionStore } = this.props; + const { callData, executedAt, status, tokenTransferApproved } = this.state; const { bounty, callGas, @@ -578,7 +591,7 @@ class TransactionDetails extends Component { } = transaction; const isOwner = this.isOwner(transaction); - const isTimestamp = transaction.temporalUnit === 2; + const isTimestamp = transactionStore.isTxUnitTimestamp(transaction); const tokenTransferApprovalStatus = tokenTransferApproved ? 'Approved' : 'Not Approved'; @@ -714,23 +727,14 @@ class TransactionDetails extends Component {
{this.getInfoMessage()}
(this.cancelBtn = el)} cancelTransaction={this.cancelTransaction} - claimWindowStart={this.getTransactionPropertyTimeDisplay(transaction, 'claimWindowStart')} - executionWindowEnd={this.getTransactionPropertyTimeDisplay( - transaction, - 'executionWindowEnd' - )} + claimWindowStart={transaction.claimWindowStart} + executionWindowEnd={transaction.executionWindowEnd} isOwner={isOwner} owner={owner} + isTimestamp={isTimestamp} /> { - const { cancelButtonEnabled, cancelBtnRef, cancelTransaction, claimWindowStart, executionWindowEnd, isOwner, owner } = props; + const { cancelButtonEnabled, cancelBtnRef, cancelTransaction, claimWindowStart, executionWindowEnd, isOwner, isTimestamp, owner } = props; return (
@@ -21,12 +22,16 @@ const CancelSection = props => {
  1. - Before {claimWindowStart}{' '} + Before + + {' '} (Claim Window Start)
  2. When wasn't executed by any TimeNode after{' '} - {executionWindowEnd}{' '} + + + {' '} (Execution Window End)
  3. When it hasn't been already cancelled
    4. diff --git a/app/services/transaction-helper.js b/app/services/transaction-helper.js index 10c6f8fd..a62c519c 100644 --- a/app/services/transaction-helper.js +++ b/app/services/transaction-helper.js @@ -15,7 +15,9 @@ export default class TransactionHelper { if (this.isTxUnitTimestamp(transaction)) { afterExecutionWindow = transaction.executionWindowEnd.lessThan(currentTimestamp); } else { - afterExecutionWindow = transaction.executionWindowEnd.lessThan(currentBlock); + if (currentBlock) { + afterExecutionWindow = transaction.executionWindowEnd.lessThan(currentBlock); + } } return Boolean(afterExecutionWindow && !transaction.wasCalled); From 3f8e0a78e881da0b6c7cb8d2969ffc107dd85a6b Mon Sep 17 00:00:00 2001 From: Bagaric Date: Fri, 1 Feb 2019 13:51:24 +0100 Subject: [PATCH 11/11] 1.4.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index cbab2874..7ab83e9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "eth-alarm-clock-dapp", - "version": "1.4.0", + "version": "1.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4a91d593..9fd863bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eth-alarm-clock-dapp", - "version": "1.4.0", + "version": "1.4.1", "main": "main.js", "description": "", "scripts": {