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

Updates master branch #3065

Merged
merged 23 commits into from Sep 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7fae2a8
improve 'METHOD_DENIED' error message (#2127)
luclu Jul 14, 2017
72626a1
Swarm additions (#2764)
frozeman Jul 14, 2017
846d450
Error page fixes and build errors (#2780)
frozeman Jul 18, 2017
68bd2e6
Merge branch 'master' of https://github.com/ethereum/mist into develop
evertonfraga Jul 21, 2017
9b61762
Mac release path (#2808)
evertonfraga Jul 21, 2017
3e00848
Adding gitter channel info (#2807)
evertonfraga Jul 21, 2017
cc1ac85
Add bzz and .eth to urls (#2792)
alexvansande Jul 23, 2017
20ae893
Update README.md (#2829)
evertonfraga Aug 10, 2017
94670a4
Node version field.
evertonfraga Aug 14, 2017
43fd3b8
Borrowing sentence from truffle's issue template
evertonfraga Aug 14, 2017
742fc14
Complete Albanian translation (#2919)
alter2000 Aug 15, 2017
0204563
Fixing json format (#2946)
evertonfraga Aug 15, 2017
61e4d16
Fixing gitter URL (#2948)
evertonfraga Aug 16, 2017
fe2b8ff
Updating geth (#2949)
evertonfraga Aug 16, 2017
d04f679
Update solc 1.4.15 (#2960)
evertonfraga Aug 22, 2017
c8a64f1
Update copyright year 2016 to 2017 on About page (#3000)
dongsam Sep 5, 2017
ba7a210
Adds GitHub PR template (#3035)
wolovim Sep 12, 2017
3d9cc7a
Revert "Update copyright year 2016 to 2017 on About page" (#3037)
Horbi Sep 12, 2017
093fae5
Compiles ES6+ (#3034)
wolovim Sep 14, 2017
d803f14
Fixes Swarm template typos (#3048)
wolovim Sep 18, 2017
c8d93b5
Tweaks README for new dev script (#3058)
wolovim Sep 20, 2017
6c09e66
Update geth binaries to 1.7.0 (#3046)
Sep 20, 2017
2a35862
Merge branch 'master' into develop
evertonfraga Sep 21, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .babelrc
@@ -0,0 +1,3 @@
{
"presets": ["es2016-node5"]
}
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE.md
@@ -1,10 +1,13 @@
- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.


<!-- Please fill in these information below: -->
``````
```
Version: `0.0.0`
OS & Version: windows/linux/osx
Node type: `eth/geth`
Node version: `geth 0.0.0`
Number of blocks synchronized: 0
``````
```

<!--

Expand Down
9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,9 @@
#### What does it do?

#### Any helpful background information?

#### Which code should the reviewer start with?

#### New dependencies? What are they used for?

#### Relevant screenshots?
28 changes: 18 additions & 10 deletions README.md
Expand Up @@ -40,7 +40,7 @@ Once a Mist version is released the Meteor frontend part is bundled using the `m

To run mist in development you need:

- [Node.js](https://nodejs.org) `v6.x` (use the prefered installation method for your OS)
- [Node.js](https://nodejs.org) `v7.x` (use the prefered installation method for your OS)
- [Meteor](https://www.meteor.com/install) javascript app framework
- [Yarn](https://yarnpkg.com/) package manager
- [Electron](http://electron.atom.io/) `v1.4.15` cross platform desktop app framework
Expand Down Expand Up @@ -77,7 +77,7 @@ For development we start the interface with a Meteor server for autoreload etc.
In the original window you can then start Mist with:

$ cd mist
$ electron .
$ yarn dev:electron

*NOTE: client-binaries (e.g. [geth](https://github.com/ethereum/go-ethereum)) specified in [clientBinaries.json](https://github.com/ethereum/mist/blob/master/clientBinaries.json) will be checked during every startup and downloaded if out-of-date, binaries are stored in the [config folder](#config-folder)*

Expand All @@ -96,7 +96,7 @@ Start the wallet app for development, *in a separate terminal window:*
In the original window you can then start Mist using wallet mode:

$ cd mist
$ electron . --mode wallet
$ yarn dev:electron --mode wallet


### Connecting to node via HTTP instead of IPC
Expand All @@ -105,7 +105,7 @@ This is useful if you have a node running on another machine, though note that
it's less secure than using the default IPC method.

```bash
$ electron . --rpc http://localhost:8545
$ yarn dev:electron --rpc http://localhost:8545
```


Expand All @@ -115,21 +115,21 @@ You can pass command-line options directly to Geth by prefixing them with `--nod
the command-line invocation:

```bash
$ electron . --mode mist --node-rpcport 19343 --node-networkid 2
$ yarn dev:electron --mode mist --node-rpcport 19343 --node-networkid 2
```

The `--rpc` Mist option is a special case. If you set this to an IPC socket file
path then the `--ipcpath` option automatically gets set, i.e.:

```bash
$ electron . --rpc /my/geth.ipc
$ yarn dev:electron --rpc /my/geth.ipc
```

...is the same as doing...


```bash
$ electron . --rpc /my/geth.ipc --node-ipcpath /my/geth.ipc
$ yarn dev:electron --rpc /my/geth.ipc --node-ipcpath /my/geth.ipc
```

### Creating a local private net
Expand All @@ -144,7 +144,7 @@ To run a private network you will need to set the IPC path, network id and data
folder:

```bash
$ electron . --rpc ~/Library/Ethereum/geth.ipc --node-networkid 1234 --node-datadir ~/Library/Ethereum/privatenet
$ yarn dev:electron --rpc ~/Library/Ethereum/geth.ipc --node-networkid 1234 --node-datadir ~/Library/Ethereum/privatenet
```

_NOTE: since `ipcpath` is also a Mist option you do not need to also include a
Expand Down Expand Up @@ -215,6 +215,12 @@ Options are:

*Note: applicable only when combined with `--wallet`*

#### skipTasks

When building a binary, you can optionally skip some tasks — generally for testing purposes.

$ gulp --mac --skipTasks=bundling-interface,release-dist

#### Checksums

Spits out the MD5 checksums of distributables.
Expand All @@ -226,12 +232,14 @@ It expects installer/zip files to be in the generated folders e.g. `dist_mist/re

## Testing

Tests are ran using [Spectron](https://github.com/electron/spectron/), a webdriver.io runner built for Electron.

First make sure to build Mist with:

$ gulp [--wallet]
$ gulp

Then run the tests:

$ gulp test [--wallet]
$ gulp test

*Note: Integration tests are not yet supported on Windows.*
120 changes: 60 additions & 60 deletions clientBinaries.json
@@ -1,15 +1,15 @@
{
"clients": {
"Geth": {
"version": "1.6.6",
"version": "1.7.0",
"platforms": {
"linux": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.6-10a45cb5.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.7.0-6c6c7b2a.tar.gz",
"type": "tar",
"md5": "5d60910275bcdec0ddf6e9c217e65b9d",
"bin": "geth-linux-amd64-1.6.6-10a45cb5/geth"
"md5": "9f40a6cd7f8f6de6b3cfd480847f7c38",
"bin": "geth-linux-amd64-1.7.0-6c6c7b2a/geth"
},
"bin": "geth",
"commands": {
Expand All @@ -19,17 +19,17 @@
],
"output": [
"Geth",
"1.6.6"
"1.7.0"
]
}
}
},
"ia32": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.6-10a45cb5.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.7.0-6c6c7b2a.tar.gz",
"type": "tar",
"md5": "cf6794245871235a7664903090593479",
"bin": "geth-linux-386-1.6.6-10a45cb5/geth"
"md5": "611ae050fe9dbbb90fec1be4e9f6d356",
"bin": "geth-linux-386-1.7.0-6c6c7b2a/geth"
},
"bin": "geth",
"commands": {
Expand All @@ -39,7 +39,7 @@
],
"output": [
"Geth",
"1.6.6"
"1.7.0"
]
}
}
Expand All @@ -48,10 +48,10 @@
"mac": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.6-10a45cb5.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.7.0-6c6c7b2a.tar.gz",
"type": "tar",
"md5": "faf0aa0af6d90685deeef70062d653f5",
"bin": "geth-darwin-amd64-1.6.6-10a45cb5/geth"
"md5": "fbd3103db321886e5abf93a4d3f42577",
"bin": "geth-darwin-amd64-1.7.0-6c6c7b2a/geth"
},
"bin": "geth",
"commands": {
Expand All @@ -61,7 +61,7 @@
],
"output": [
"Geth",
"1.6.6"
"1.7.0"
]
}
}
Expand All @@ -70,10 +70,10 @@
"win": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.6-10a45cb5.zip",
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.7.0-6c6c7b2a.zip",
"type": "zip",
"md5": "2a73767451a27538f3f335bf5d466658",
"bin": "geth-windows-amd64-1.6.6-10a45cb5\\geth.exe"
"md5": "d73d0c3e41263d8cccd72fbabb5cc4d1",
"bin": "geth-windows-amd64-1.7.0-6c6c7b2a\\geth.exe"
},
"bin": "geth.exe",
"commands": {
Expand All @@ -83,17 +83,17 @@
],
"output": [
"Geth",
"1.6.6"
"1.7.0"
]
}
}
},
"ia32": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.6-10a45cb5.zip",
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.7.0-6c6c7b2a.zip",
"type": "zip",
"md5": "08188b29b8f2ba49db52215cc279c23e",
"bin": "geth-windows-386-1.6.6-10a45cb5\\geth.exe"
"md5": "3d21ea8621dfc96f91c4ab8aa7163471",
"bin": "geth-windows-386-1.7.0-6c6c7b2a\\geth.exe"
},
"bin": "geth.exe",
"commands": {
Expand All @@ -103,7 +103,7 @@
],
"output": [
"Geth",
"1.6.6"
"1.7.0"
]
}
}
Expand All @@ -115,69 +115,69 @@
"swarm": {
"archives": {
"windows-amd64": {
"archive": "swarm-windows-amd64-1.6.7.exe",
"binaryMD5": "c2d827dc4553d9b91a7d6c1d5a6140fd",
"archiveMD5": "059196d21548060a18a12e17cc0ee59a"
"archive": "swarm-windows-amd64-1.6.7.exe",
"binaryMD5": "c2d827dc4553d9b91a7d6c1d5a6140fd",
"archiveMD5": "059196d21548060a18a12e17cc0ee59a"
},
"linux-amd64": {
"archive": "swarm-linux-amd64-1.6.7",
"binaryMD5": "85002d79b8ebc2d2f2f10fb198636a81",
"archiveMD5": "3e8874299ab8c0e3043d70ebb6673879"
"archive": "swarm-linux-amd64-1.6.7",
"binaryMD5": "85002d79b8ebc2d2f2f10fb198636a81",
"archiveMD5": "3e8874299ab8c0e3043d70ebb6673879"
},
"linux-386": {
"archive": "swarm-linux-386-1.6.7",
"binaryMD5": "35bc2ab976f60f96a2cede117e0df19d",
"archiveMD5": "7868a86c9cbdf8ac7ac2e5682b4ce40f"
"archive": "swarm-linux-386-1.6.7",
"binaryMD5": "35bc2ab976f60f96a2cede117e0df19d",
"archiveMD5": "7868a86c9cbdf8ac7ac2e5682b4ce40f"
},
"darwin-amd64": {
"archive": "swarm-darwin-amd64-1.6.7",
"binaryMD5": "c499b186645229260dd6ab685dd58f07",
"archiveMD5": "0794d111e5018eac3b657bcb29851121"
"archive": "swarm-darwin-amd64-1.6.7",
"binaryMD5": "c499b186645229260dd6ab685dd58f07",
"archiveMD5": "0794d111e5018eac3b657bcb29851121"
},
"linux-arm5": {
"archive": "swarm-linux-arm5-1.6.7",
"binaryMD5": "516fcd85246c905529442cd9b689c12f",
"archiveMD5": "47312708d417cb196b07ba0af1d3abb4"
"archive": "swarm-linux-arm5-1.6.7",
"binaryMD5": "516fcd85246c905529442cd9b689c12f",
"archiveMD5": "47312708d417cb196b07ba0af1d3abb4"
},
"linux-arm6": {
"archive": "swarm-linux-arm6-1.6.7",
"binaryMD5": "82ff7bdbe388b4a190f4101c5150d3b4",
"archiveMD5": "350276de7bb175a15c314cfc4cb7f8fd"
"archive": "swarm-linux-arm6-1.6.7",
"binaryMD5": "82ff7bdbe388b4a190f4101c5150d3b4",
"archiveMD5": "350276de7bb175a15c314cfc4cb7f8fd"
},
"linux-mips": {
"archive": "swarm-linux-mips-1.6.7",
"binaryMD5": "e1e95280441c0ca35633927792ef5317",
"archiveMD5": "8fb4b64e94cd73aa718db787b9d4c53e"
"archive": "swarm-linux-mips-1.6.7",
"binaryMD5": "e1e95280441c0ca35633927792ef5317",
"archiveMD5": "8fb4b64e94cd73aa718db787b9d4c53e"
},
"linux-arm7": {
"archive": "swarm-linux-arm7-1.6.7",
"binaryMD5": "bfc0b4d1c86d8a975af052fc7854bdd3",
"archiveMD5": "4378641d8e1e1fbb947f941c8fca8613"
"archive": "swarm-linux-arm7-1.6.7",
"binaryMD5": "bfc0b4d1c86d8a975af052fc7854bdd3",
"archiveMD5": "4378641d8e1e1fbb947f941c8fca8613"
},
"linux-arm64": {
"archive": "swarm-linux-arm64-1.6.7",
"binaryMD5": "bbac21a6c6fa8208f67ca4123d3f948a",
"archiveMD5": "4e503160327c5fbcca0414f17c54e5ee"
"archive": "swarm-linux-arm64-1.6.7",
"binaryMD5": "bbac21a6c6fa8208f67ca4123d3f948a",
"archiveMD5": "4e503160327c5fbcca0414f17c54e5ee"
},
"linux-mipsle": {
"archive": "swarm-linux-mipsle-1.6.7",
"binaryMD5": "a82f191b2f9d2c470d0273219c820657",
"archiveMD5": "3016bdb6d237ae654c0cdf36fe85dc7c"
"archive": "swarm-linux-mipsle-1.6.7",
"binaryMD5": "a82f191b2f9d2c470d0273219c820657",
"archiveMD5": "3016bdb6d237ae654c0cdf36fe85dc7c"
},
"windows-386": {
"archive": "swarm-windows-386-1.6.7.exe",
"binaryMD5": "ce0b34640642e58068ae5a359faef102",
"archiveMD5": "640aede4da08a3a9d8a6ac0434ba7c0f"
"archive": "swarm-windows-386-1.6.7.exe",
"binaryMD5": "ce0b34640642e58068ae5a359faef102",
"archiveMD5": "640aede4da08a3a9d8a6ac0434ba7c0f"
},
"linux-mips64": {
"archive": "swarm-linux-mips64-1.6.7",
"binaryMD5": "9da967664f384817adb5083fd1ffe8f1",
"archiveMD5": "357a33be470f8f89ba2619957a08deff"
"archive": "swarm-linux-mips64-1.6.7",
"binaryMD5": "9da967664f384817adb5083fd1ffe8f1",
"archiveMD5": "357a33be470f8f89ba2619957a08deff"
},
"linux-mips64le": {
"archive": "swarm-linux-mips64le-1.6.7",
"binaryMD5": "ec1abcf7b216e87645ec83954d8344cd",
"archiveMD5": "a81fd0158190d99813c738ffa4f87627"
"archive": "swarm-linux-mips64le-1.6.7",
"binaryMD5": "ec1abcf7b216e87645ec83954d8344cd",
"archiveMD5": "a81fd0158190d99813c738ffa4f87627"
}
}
}
Expand Down
17 changes: 15 additions & 2 deletions gulpTasks/building.js
Expand Up @@ -4,6 +4,7 @@ const del = require('del');
const exec = require('child_process').exec;
const fs = require('fs');
const gulp = require('gulp');
const babel = require('gulp-babel');
const options = require('../gulpfile.js').options;
const path = require('path');
const Q = require('bluebird');
Expand All @@ -28,9 +29,7 @@ gulp.task('copy-app-source-files', () => {
'node_modules/**/*',
'!node_modules/electron/',
'!node_modules/electron/**/*',
'./main.js',
'./clientBinaries.json',
'./modules/**',
'./tests/**/*.*',
'!./tests/wallet/*',
`./icons/${type}/*`,
Expand All @@ -44,6 +43,20 @@ gulp.task('copy-app-source-files', () => {
});


gulp.task('transpile-main', () => {
return gulp.src('./main.js')
.pipe(babel({ presets: ['es2016-node5'] }))
.pipe(gulp.dest(`./dist_${type}/app`));
});


gulp.task('transpile-modules', () => {
return gulp.src('./modules/**')
.pipe(babel({ presets: ['es2016-node5'] }))
.pipe(gulp.dest(`./dist_${type}/app/modules`));
});


gulp.task('copy-build-folder-files', () => {
return gulp.src([
`./icons/${type}/*`,
Expand Down