Skip to content

Commit 3983dd2

Browse files
committed
Merge branch 'release/v0.7.10'
2 parents 7daa8c2 + 0a9dc15 commit 3983dd2

File tree

344 files changed

+67743
-1445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+67743
-1445
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
*un~
1010
.DS_Store
1111
*/**/.DS_Store
12-
ethereum/ethereum
13-
ethereal/ethereal
14-
12+
.ethtest

.travis.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
1-
before_install: sudo apt-get install libgmp3-dev
21
language: go
32
go:
4-
- 1.2
3+
- 1.3
4+
before_install:
5+
- sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
6+
- sudo apt-get update -qq
7+
- sudo apt-get install -yqq libgmp3-dev qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev libreadline6-dev
8+
install:
9+
- go get code.google.com/p/go.tools/cmd/goimports
10+
- go get github.com/golang/lint/golint
11+
# - go get code.google.com/p/go.tools/cmd/vet
12+
- go get code.google.com/p/go.tools/cmd/cover
13+
- go get github.com/mattn/goveralls
14+
- ./install_deps.sh
15+
before_script:
16+
- gofmt -l -w .
17+
- goimports -l -w .
18+
- golint .
19+
# - go vet ./...
20+
# - go test -race ./...
21+
script:
22+
- ./gocoverage.sh && goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN
23+
env:
24+
- secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64="
25+

Dockerfile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
FROM ubuntu:14.04
2+
3+
## Environment setup
4+
ENV HOME /root
5+
ENV GOPATH /root/go
6+
ENV PATH /go/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
7+
8+
RUN mkdir -p /root/go
9+
ENV DEBIAN_FRONTEND noninteractive
10+
11+
## Install base dependencies
12+
RUN apt-get update && apt-get upgrade -y
13+
RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
14+
15+
## Build and install Go
16+
RUN hg clone -u release https://code.google.com/p/go
17+
RUN cd go && hg update go1.4
18+
RUN cd go/src && ./all.bash && go version
19+
20+
## Install GUI dependencies
21+
RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y
22+
RUN apt-get update -y
23+
RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev
24+
25+
## Fetch and install serpent-go
26+
RUN go get -v -d github.com/ethereum/serpent-go
27+
WORKDIR $GOPATH/src/github.com/ethereum/serpent-go
28+
RUN git checkout master
29+
RUN git submodule update --init
30+
RUN go install -v
31+
32+
# Fetch and install go-ethereum
33+
RUN go get -v -d github.com/ethereum/go-ethereum/...
34+
WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
35+
RUN git checkout poc8
36+
RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi
37+
RUN go install -v ./cmd/ethereum
38+
39+
# Run JSON RPC
40+
ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8080"]
41+
EXPOSE 8080

LICENSE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
22

33
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU General Public
4+
modify it under the terms of the GNU Lesser General Public
55
License as published by the Free Software Foundation; either
66
version 2.1 of the License, or (at your option) any later version.
77

88
This library is distributed in the hope that it will be useful,
99
but WITHOUT ANY WARRANTY; without even the implied warranty of
1010
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
General Public License for more details.
11+
Lesser General Public License for more details.
1212

13-
You should have received a copy of the GNU General Public License
14-
along with this library; if not, write to the Free Software
13+
You should have received a copy of the GNU Lesser General Public
14+
License along with this library; if not, write to the Free Software
1515
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1616
MA 02110-1301 USA

README.md

Lines changed: 63 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
[![Bugs](https://badge.waffle.io/ethereum/go-ethereum.png?label=bug&title=Bugs)](https://waffle.io/ethereum/go-ethereum)
12
[![Stories in Ready](https://badge.waffle.io/ethereum/go-ethereum.png?label=ready&title=Ready)](https://waffle.io/ethereum/go-ethereum)
3+
[![Stories in
4+
Progress](https://badge.waffle.io/ethereum/go-ethereum.svg?label=in%20progress&title=In Progress)](http://waffle.io/ethereum/go-ethereum)
5+
26
Ethereum
37
========
48

@@ -8,70 +12,99 @@ Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20
812

913
Ethereum Go Client © 2014 Jeffrey Wilcke.
1014

11-
Current state: Proof of Concept 0.6.7.
15+
Current state: Proof of Concept 0.7
1216

13-
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
17+
Ethereum is currently in its testing phase.
1418

1519
Build
16-
=======
20+
=====
1721

18-
To build Ethereal (GUI):
22+
To build Mist (GUI):
1923

20-
`go get github.com/ethereum/go-ethereum/ethereal`
24+
`go get github.com/ethereum/go-ethereum/cmd/mist`
2125

2226
To build the node (CLI):
2327

24-
`go get github.com/ethereum/go-ethereum/ethereum`
28+
`go get github.com/ethereum/go-ethereum/cmd/ethereum`
2529

2630
For further, detailed, build instruction please see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go))
2731

32+
Automated (dev) builds
33+
======================
34+
35+
* [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/latest/app/)]
36+
* [Windows] Coming soon™
37+
* [Linux] Coming soon™
38+
39+
Binaries
40+
========
41+
42+
Go Ethereum comes with several binaries found in
43+
[cmd](https://github.com/ethereum/go-ethereum/tree/master/cmd):
44+
45+
* `mist` Official Ethereum Browser
46+
* `ethereum` Ethereum CLI
47+
* `ethtest` test tool which runs with the [tests](https://github.com/ethereum/testes) suit:
48+
`ethtest "`cat myfile.json`"`.
49+
* `evm` is a generic Ethereum Virtual Machine: `evm -code 60ff60ff -gas
50+
10000 -price 0 -dump`. See `-h` for a detailed description.
51+
2852
General command line options
29-
====================
53+
============================
3054

3155
```
32-
Shared between ethereum and ethereal
56+
== Shared between ethereum and Mist ==
57+
58+
= Settings
3359
-id Set the custom identifier of the client (shows up on other clients)
3460
-port Port on which the server will accept incomming connections
3561
-upnp Enable UPnP
3662
-maxpeer Desired amount of peers
3763
-rpc Start JSON RPC
38-
3964
-dir Data directory used to store configs and databases
40-
-import Import a private key
41-
-genaddr Generates a new address and private key (destructive action)
42-
-h This
65+
66+
= Utility
67+
-h This
68+
-import Import a private key
69+
-genaddr Generates a new address and private key (destructive action)
70+
-dump Dump a specific state of a block to stdout given the -number or -hash
71+
-difftool Supress all output and prints VM output to stdout
72+
-diff vm=only vm output, all=all output including state storage
4373
4474
Ethereum only
4575
ethereum [options] [filename]
4676
-js Start the JavaScript REPL
4777
filename Load the given file and interpret as JavaScript
4878
-m Start mining blocks
4979
50-
Etheral only
80+
== Mist only ==
81+
5182
-asset_path absolute path to GUI assets directory
5283
```
5384

5485
Contribution
5586
============
5687

57-
If you would like to contribute to Ethereum Go, please fork, fix, commit and
58-
send a pull request to the main repository. Commits which do not comply with the coding standards explained below
59-
will be ignored. If you send a pull request, make sure that you
60-
commit to the `develop` branch and that you do not merge to `master`.
61-
Commits that are directly based off of the `master` branch instead of the `develop` branch will be ignored.
88+
If you'd like to contribute to Ethereum please fork, fix, commit and
89+
send a pull request. Commits who do not comply with the coding standards
90+
are ignored (use gofmt!). If you send pull requests make absolute sure that you
91+
commit on the `develop` branch and that you do not merge to master.
92+
Commits that are directly based on master are simply ignored.
6293

63-
To make this process simpler try following the [git flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model, as it sets this process up and streamlines work flow.
94+
To make life easier try [git flow](http://nvie.com/posts/a-successful-git-branching-model/) it sets
95+
this all up and streamlines your work flow.
6496

6597
Coding standards
6698
================
6799

68-
Code should be formatted according to the [Go Formatting
100+
Sources should be formatted according to the [Go Formatting
69101
Style](http://golang.org/doc/effective_go.html#formatting).
70102

71-
Unless struct fields are supposed to be directly accessible, provide
72-
getters and hide the fields through Go's exporting facility.
103+
Unless structs fields are supposed to be directly accesible, provide
104+
Getters and hide the fields through Go's exporting facility.
73105

74-
Make comments in your code meaningful and only use them when necessary. Describe in detail what your code is trying to achieve. For example, this would be redundant and unnecessary commenting:
106+
When you comment put meaningfull comments. Describe in detail what you
107+
want to achieve.
75108

76109
*wrong*
77110

@@ -82,7 +115,12 @@ if x > y {
82115
}
83116
```
84117

85-
Everyone reading the source code should know what this code snippet was meant to achieve, and so those are **not** meaningful comments.
118+
Everyone reading the source probably know what you wanted to achieve
119+
with above code. Those are **not** meaningful comments.
86120

87-
While this project is constantly tested and run, code tests should be written regardless. There is not time to evaluate every person's code specifically, so it is expected of you to write tests for the code so that it does not have to be tested manually. In fact, contributing by simply writing tests is perfectly fine!
121+
While the project isn't 100% tested I want you to write tests non the
122+
less. I haven't got time to evaluate everyone's code in detail so I
123+
expect you to write tests for me so I don't have to test your code
124+
manually. (If you want to contribute by just writing tests that's fine
125+
too!)
88126

_data/chain1

171 KB
Binary file not shown.

_data/chain2

27.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)