Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit 9bf5396

Browse files
frozemanfrozeman
authored
Update geth to 1.5.5 (#1520) (#1522)
* updated solc again * updated solc to 0.4.6 * Update geth to 1.5.5 (#1520) * Update geth to 1.5.5 * corrected windows zip's internal paths * changed sanity check * made node starting better * also log path from which to fetch * show fetching origin URL * fix ESLint errors * removed -stable
1 parent d2f6d0d commit 9bf5396

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

‎clientBinaries.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,85 @@
22
{
33
"clients": {
44
"Geth": {
5-
"version": "1.5.3",
5+
"version": "1.5.5",
66
"platforms": {
77
"linux": {
88
"x64": {
99
"download": {
10-
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.3-978737f5.tar.gz",
10+
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.5-ff07d548.tar.gz",
1111
"type": "tar",
12-
"sha256": "7f1de3b66176111864571d66917ec885f0e789b140e1fca01bf2296cbcb13f57",
13-
"bin": "geth-linux-amd64-1.5.3-978737f5/geth"
12+
"sha256": "4f36d6df25c37eb33829407d8bf2cea209cc412b3443319e2430db18581c7c01",
13+
"bin": "geth-linux-amd64-1.5.5-ff07d548/geth"
1414
},
1515
"bin": "geth",
1616
"commands": {
1717
"sanity": {
1818
"args": ["version"],
19-
"output": [ "Geth", "1.5.3" ]
19+
"output": [ "Geth", "1.5.5" ]
2020
}
2121
}
2222
},
2323
"ia32": {
2424
"download": {
25-
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.3-978737f5.tar.gz",
25+
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.5-ff07d548.tar.gz",
2626
"type": "tar",
27-
"sha256": "527785d2d21655fb5756390ce06188961929856295f29811afe188aa5585880b",
28-
"bin": "geth-linux-386-1.5.3-978737f5/geth"
27+
"sha256": "6767651e4e5b34acaa6c53079d66a9047acb74e80fd25f570bf63da87d0ce863",
28+
"bin": "geth-linux-386-1.5.5-ff07d548/geth"
2929
},
3030
"bin": "geth",
3131
"commands": {
3232
"sanity": {
3333
"args": ["version"],
34-
"output": [ "Geth", "1.5.3" ]
34+
"output": [ "Geth", "1.5.5" ]
3535
}
3636
}
3737
}
3838
},
3939
"mac": {
4040
"x64": {
4141
"download": {
42-
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.3-978737f5.tar.gz",
42+
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.5-ff07d548.tar.gz",
4343
"type": "tar",
44-
"sha256": "dca175529d1d626d7ccb7dafab4374a39d715dc524734b09e5c4ebbb68615ffb",
45-
"bin": "geth-darwin-amd64-1.5.3-978737f5/geth"
44+
"sha256": "a5b3ae5b7e9d91a0ca42ca24b079631578cdccce036cc5b1f0035cd0d9706b53",
45+
"bin": "geth-darwin-amd64-1.5.5-ff07d548/geth"
4646
},
4747
"bin": "geth",
4848
"commands": {
4949
"sanity": {
5050
"args": ["version"],
51-
"output": [ "Geth", "1.5.3" ]
51+
"output": [ "Geth", "1.5.5" ]
5252
}
5353
}
5454
}
5555
},
5656
"win": {
5757
"x64": {
5858
"download": {
59-
"url": "https://gethstore.blob.core.windows.net/mist/geth-windows-amd64-1.5.3-978737f5-mist-fix.zip",
59+
"url": "https://gethstore.blob.core.windows.net/mist/geth-windows-amd64-1.5.5-ff07d548-mist-fix.zip",
6060
"type": "zip",
61-
"sha256": "329caa90b5e02f71300b217c3a93a777c6ef09ae38d7be4f2cd5127ddbaed0e1",
62-
"bin": "geth-windows-amd64-1.5.3-978737f5\\geth.exe"
61+
"sha256": "6b9e65ccac8a07535fbfd003662cdd4f69289f93947689c715d10c6486e703d7",
62+
"bin": "geth-windows-amd64-1.5.5-ff07d548\\geth.exe"
6363
},
6464
"bin": "geth.exe",
6565
"commands": {
6666
"sanity": {
6767
"args": ["version"],
68-
"output": [ "Geth", "1.5.3" ]
68+
"output": [ "Geth", "1.5.5" ]
6969
}
7070
}
7171
},
7272
"ia32": {
7373
"download": {
74-
"url": "https://gethstore.blob.core.windows.net/mist/geth-windows-386-1.5.3-978737f5-mist-fix.zip",
74+
"url": "https://gethstore.blob.core.windows.net/mist/geth-windows-386-1.5.5-ff07d548-mist-fix.zip",
7575
"type": "zip",
76-
"sha256": "637447797ed362a409d9e8e5b12bee1a56009faa8a98c20dab4af77f04527b2e",
77-
"bin": "geth-windows-386-1.5.3-978737f5\\geth.exe"
76+
"sha256": "74ef8372ae7748c1016a8fcfe2d49574b52a2780913081cf0184fb197f26f01c",
77+
"bin": "geth-windows-386-1.5.5-ff07d548\\geth.exe"
7878
},
7979
"bin": "geth.exe",
8080
"commands": {
8181
"sanity": {
8282
"args": ["version"],
83-
"output": [ "Geth", "1.5.3" ]
83+
"output": [ "Geth", "1.5.5" ]
8484
}
8585
}
8686
}

‎modules/clientBinaryManager.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ const EventEmitter = require('events').EventEmitter;
1212
const log = require('./utils/logger').create('ClientBinaryManager');
1313

1414

15+
// should be 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json'
16+
const BINARY_URL = 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json';
17+
1518
const ALLOWED_DOWNLOAD_URLS_REGEX =
16-
/^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
19+
/^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
1720

1821
class Manager extends EventEmitter {
1922
constructor() {
@@ -50,12 +53,12 @@ class Manager extends EventEmitter {
5053
let binariesDownloaded = false;
5154
let nodeInfo;
5255

53-
log.info('Checking for new client binaries config...');
56+
log.info(`Checking for new client binaries config from: ${BINARY_URL}`);
5457

5558
this._emit('loadConfig', 'Fetching remote client config');
5659

5760
// fetch config
58-
return got('https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json', {
61+
return got(BINARY_URL, {
5962
timeout: 3000,
6063
json: true,
6164
})

‎modules/ethereumNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ class EthereumNode extends EventEmitter {
323323
else
324324
throw new Error(`Node "${nodeType}" binPath is not available.`);
325325

326-
log.debug(`Start node using ${binPath}`);
326+
log.info(`Start node using ${binPath}`);
327327

328328
return new Q((resolve, reject) => {
329329
this.__startProcess(nodeType, network, binPath)

0 commit comments

Comments
 (0)