From 80e5e4f238dd292aa874022e1667b8a055a536c4 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 15 Dec 2016 22:14:44 -0200 Subject: [PATCH 1/8] Update geth to 1.5.5 --- clientBinaries.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index ff5dd7b74..f2a7c0c7e 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -2,36 +2,36 @@ { "clients": { "Geth": { - "version": "1.5.3", + "version": "1.5.5", "platforms": { "linux": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.3-978737f5.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.5-ff07d548.tar.gz", "type": "tar", - "sha256": "7f1de3b66176111864571d66917ec885f0e789b140e1fca01bf2296cbcb13f57", - "bin": "geth-linux-amd64-1.5.3-978737f5/geth" + "sha256": "4f36d6df25c37eb33829407d8bf2cea209cc412b3443319e2430db18581c7c01", + "bin": "geth-linux-amd64-1.5.5-ff07d548/geth" }, "bin": "geth", "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.3" ] + "output": [ "Geth", "1.5.5" ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.3-978737f5.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.5-ff07d548.tar.gz", "type": "tar", - "sha256": "527785d2d21655fb5756390ce06188961929856295f29811afe188aa5585880b", - "bin": "geth-linux-386-1.5.3-978737f5/geth" + "sha256": "6767651e4e5b34acaa6c53079d66a9047acb74e80fd25f570bf63da87d0ce863", + "bin": "geth-linux-386-1.5.5-ff07d548/geth" }, "bin": "geth", "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.3" ] + "output": [ "Geth", "1.5.5" ] } } } @@ -39,16 +39,16 @@ "mac": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.3-978737f5.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.5-ff07d548.tar.gz", "type": "tar", - "sha256": "dca175529d1d626d7ccb7dafab4374a39d715dc524734b09e5c4ebbb68615ffb", - "bin": "geth-darwin-amd64-1.5.3-978737f5/geth" + "sha256": "a5b3ae5b7e9d91a0ca42ca24b079631578cdccce036cc5b1f0035cd0d9706b53", + "bin": "geth-darwin-amd64-1.5.5-ff07d548/geth" }, "bin": "geth", "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.3" ] + "output": [ "Geth", "1.5.5" ] } } } @@ -56,31 +56,31 @@ "win": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-amd64-1.5.3-978737f5-mist-fix.zip", + "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-amd64-1.5.5-ff07d548-mist-fix.zip", "type": "zip", - "sha256": "329caa90b5e02f71300b217c3a93a777c6ef09ae38d7be4f2cd5127ddbaed0e1", - "bin": "geth-windows-amd64-1.5.3-978737f5\\geth.exe" + "sha256": "6b9e65ccac8a07535fbfd003662cdd4f69289f93947689c715d10c6486e703d7", + "bin": "geth-windows-amd64-1.5.5-ff07d548-mist-fix\\geth.exe" }, "bin": "geth.exe", "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.3" ] + "output": [ "Geth", "1.5.5" ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-386-1.5.3-978737f5-mist-fix.zip", + "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-386-1.5.5-ff07d548-mist-fix.zip", "type": "zip", - "sha256": "637447797ed362a409d9e8e5b12bee1a56009faa8a98c20dab4af77f04527b2e", - "bin": "geth-windows-386-1.5.3-978737f5\\geth.exe" + "sha256": "74ef8372ae7748c1016a8fcfe2d49574b52a2780913081cf0184fb197f26f01c", + "bin": "geth-windows-386-1.5.5-ff07d548-mist-fix\\geth.exe" }, "bin": "geth.exe", "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.3" ] + "output": [ "Geth", "1.5.5" ] } } } From 8a40b3e2e6f7604044b429c64e35ada487ef1a68 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Fri, 16 Dec 2016 13:00:21 +0100 Subject: [PATCH 2/8] corrected windows zip's internal paths --- clientBinaries.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index f2a7c0c7e..63a19f55b 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -59,7 +59,7 @@ "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-amd64-1.5.5-ff07d548-mist-fix.zip", "type": "zip", "sha256": "6b9e65ccac8a07535fbfd003662cdd4f69289f93947689c715d10c6486e703d7", - "bin": "geth-windows-amd64-1.5.5-ff07d548-mist-fix\\geth.exe" + "bin": "geth-windows-amd64-1.5.5-ff07d548\\geth.exe" }, "bin": "geth.exe", "commands": { @@ -74,7 +74,7 @@ "url": "https://gethstore.blob.core.windows.net/mist/geth-windows-386-1.5.5-ff07d548-mist-fix.zip", "type": "zip", "sha256": "74ef8372ae7748c1016a8fcfe2d49574b52a2780913081cf0184fb197f26f01c", - "bin": "geth-windows-386-1.5.5-ff07d548-mist-fix\\geth.exe" + "bin": "geth-windows-386-1.5.5-ff07d548\\geth.exe" }, "bin": "geth.exe", "commands": { From 0d0ffd0f233b92bc3111908e879826b2e4540c97 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 16 Dec 2016 13:53:36 +0100 Subject: [PATCH 3/8] changed sanity check --- clientBinaries.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index 63a19f55b..a8fd001ee 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -16,7 +16,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5" ] + "output": [ "Geth", "1.5.5-stable" ] } } }, @@ -31,7 +31,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5" ] + "output": [ "Geth", "1.5.5-stable" ] } } } @@ -48,7 +48,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5" ] + "output": [ "Geth", "1.5.5-stable" ] } } } @@ -65,7 +65,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5" ] + "output": [ "Geth", "1.5.5-stable" ] } } }, @@ -80,7 +80,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5" ] + "output": [ "Geth", "1.5.5-stable" ] } } } From 55923969d916555ef68e6af6a4eb5e0e6155bf4a Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 16 Dec 2016 14:10:52 +0100 Subject: [PATCH 4/8] made node starting better --- clientBinaries.json | 2 +- modules/clientBinaryManager.js | 5 ++++- modules/ethereumNode.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index a8fd001ee..7aa3f8c0a 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -80,7 +80,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5-stable" ] + "output": [ "Geth", "1.5.5" ] } } } diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index 4718b33b9..f2171acc1 100644 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -12,6 +12,9 @@ const EventEmitter = require('events').EventEmitter; const log = require('./utils/logger').create('ClientBinaryManager'); +// should be 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json' +const BINARY_URL = 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json'; + const ALLOWED_DOWNLOAD_URLS_REGEX = /^https:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?\.)?ethereum\.org\/|gethstore\.blob\.core\.windows\.net\/|bintray\.com\/artifact\/download\/karalabe\/ethereum\/)(?:.+)/; // eslint-disable-line max-len @@ -55,7 +58,7 @@ class Manager extends EventEmitter { this._emit('loadConfig', 'Fetching remote client config'); // fetch config - return got('https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json', { + return got(BINARY_URL, { timeout: 3000, json: true, }) diff --git a/modules/ethereumNode.js b/modules/ethereumNode.js index d6771f136..2932dac0a 100644 --- a/modules/ethereumNode.js +++ b/modules/ethereumNode.js @@ -323,7 +323,7 @@ class EthereumNode extends EventEmitter { else throw new Error(`Node "${nodeType}" binPath is not available.`); - log.debug(`Start node using ${binPath}`); + log.info(`Start node using ${binPath}`); return new Q((resolve, reject) => { this.__startProcess(nodeType, network, binPath) From 523f6d994b748c1bb27efabebc03e30e6b4508f5 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 16 Dec 2016 14:14:20 +0100 Subject: [PATCH 5/8] also log path from which to fetch --- modules/clientBinaryManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index f2171acc1..00727d65c 100644 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -55,7 +55,7 @@ class Manager extends EventEmitter { log.info('Checking for new client binaries config...'); - this._emit('loadConfig', 'Fetching remote client config'); + this._emit('loadConfig', 'Fetching remote client config from: '+ BINARY_URL); // fetch config return got(BINARY_URL, { From 438e277331019ffe0091e2eacce3ea06d307db70 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 16 Dec 2016 14:15:41 +0100 Subject: [PATCH 6/8] show fetching origin URL --- modules/clientBinaryManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index 00727d65c..f5a1c0458 100644 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -53,9 +53,9 @@ class Manager extends EventEmitter { let binariesDownloaded = false; let nodeInfo; - log.info('Checking for new client binaries config...'); + log.info('Checking for new client binaries config from: '+ BINARY_URL); - this._emit('loadConfig', 'Fetching remote client config from: '+ BINARY_URL); + this._emit('loadConfig', 'Fetching remote client config'); // fetch config return got(BINARY_URL, { From d0b62acd088799379978698b0e6576f0f12eafd0 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Fri, 16 Dec 2016 14:25:30 +0100 Subject: [PATCH 7/8] fix ESLint errors --- modules/clientBinaryManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index f5a1c0458..7cb5c5e1a 100644 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -16,7 +16,7 @@ const log = require('./utils/logger').create('ClientBinaryManager'); const BINARY_URL = 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json'; const ALLOWED_DOWNLOAD_URLS_REGEX = - /^https:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?\.)?ethereum\.org\/|gethstore\.blob\.core\.windows\.net\/|bintray\.com\/artifact\/download\/karalabe\/ethereum\/)(?:.+)/; // eslint-disable-line max-len + /^https:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)?ethereum\.org\/|gethstore\.blob\.core\.windows\.net\/|bintray\.com\/artifact\/download\/karalabe\/ethereum\/)(?:.+)/; // eslint-disable-line max-len class Manager extends EventEmitter { constructor() { @@ -53,7 +53,7 @@ class Manager extends EventEmitter { let binariesDownloaded = false; let nodeInfo; - log.info('Checking for new client binaries config from: '+ BINARY_URL); + log.info(`Checking for new client binaries config from: ${BINARY_URL}`); this._emit('loadConfig', 'Fetching remote client config'); From f4ce8996f5b089ca57d9a62d5ec739bfbb662828 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 16 Dec 2016 14:42:03 +0100 Subject: [PATCH 8/8] removed -stable --- clientBinaries.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index 7aa3f8c0a..63a19f55b 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -16,7 +16,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5-stable" ] + "output": [ "Geth", "1.5.5" ] } } }, @@ -31,7 +31,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5-stable" ] + "output": [ "Geth", "1.5.5" ] } } } @@ -48,7 +48,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5-stable" ] + "output": [ "Geth", "1.5.5" ] } } } @@ -65,7 +65,7 @@ "commands": { "sanity": { "args": ["version"], - "output": [ "Geth", "1.5.5-stable" ] + "output": [ "Geth", "1.5.5" ] } } },