Skip to content
Permalink
Browse files

final release commit

  • Loading branch information...
christopher franko christopher franko
christopher franko authored and christopher franko committed Mar 29, 2017
1 parent a30f654 commit 1d80e7a3a9986620194eefb05047cc641a23ac49
Showing with 17 additions and 16 deletions.
  1. +3 −2 interface/.meteor/versions
  2. +1 −0 interface/public/dapp-styles
  3. +4 −5 modules/clientBinaryManager.js
  4. +9 −9 yarn.lock
@@ -33,9 +33,10 @@ ejson@1.0.13
ethereum:accounts@0.3.12
ethereum:blocks@0.3.2
ethereum:dapp-styles@0.5.7
ethereum:elements@0.7.10
ethereum:tools@0.6.0
ethereum:web3@0.15.3
expanse:elements@0.7.2
expanse:tools@0.5.4
expanse:web3@0.15.3
fastclick@1.0.13
frozeman:animation-helper@0.2.6
frozeman:global-notifications@0.2.1
Submodule dapp-styles added at 64fcd6
@@ -15,8 +15,7 @@ const log = require('./utils/logger').create('ClientBinaryManager');
// should be 'https://raw.githubusercontent.com/expanse-org/mist/master/clientBinaries.json'
const BINARY_URL = 'https://raw.githubusercontent.com/expanse-org/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
const ALLOWED_DOWNLOAD_URLS_REGEX = /^http:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)?expanse\.tech\/)(?:.+)/; // eslint-disable-line max-len

class Manager extends EventEmitter {
constructor() {
@@ -49,7 +48,7 @@ class Manager extends EventEmitter {
}

_checkForNewConfig(restart) {
const nodeType = 'Geth';
const nodeType = 'Gexp';
let binariesDownloaded = false;
let nodeInfo;

@@ -192,8 +191,8 @@ class Manager extends EventEmitter {

return mgr.init({
folders: [
path.join(Settings.userDataPath, 'binaries', 'Geth', 'unpacked'),
path.join(Settings.userDataPath, 'binaries', 'Eth', 'unpacked'),
path.join(Settings.userDataPath, 'binaries', 'Gexp', 'unpacked'),
path.join(Settings.userDataPath, 'binaries', 'Exp', 'unpacked'),
],
})
.then(() => {
@@ -1610,9 +1610,15 @@ get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"

geth-private@^1.3.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/geth-private/-/geth-private-1.7.0.tgz#326eae709fe12cf3545d0bcda7a3fa2c43adc7c8"
getpass@^0.1.1:
version "0.1.6"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
dependencies:
assert-plus "^1.0.0"

gexp-private@^1.3.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/gexp-private/-/gexp-private-1.8.0.tgz#1eecf08ea29086134dbc096212bd644d60b6c34a"
dependencies:
bluebird "^3.3.4"
chalk "^1.1.3"
@@ -1621,12 +1627,6 @@ geth-private@^1.3.0:
which "^1.2.4"
yargs "^4.3.2"

getpass@^0.1.1:
version "0.1.6"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
dependencies:
assert-plus "^1.0.0"

gh-release-assets@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/gh-release-assets/-/gh-release-assets-1.1.0.tgz#00f76bd151d020032de10712f525d2a944814595"

0 comments on commit 1d80e7a

Please sign in to comment.
You can’t perform that action at this time.