Skip to content

Commit fadeac7

Browse files
committed
changes made in berlin
1 parent c49abfc commit fadeac7

12 files changed

+108
-401
lines changed

docs/_install-and-build/Backup--restore.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ title: Backup & restore
33
---
44
**DO NOT FORGET YOUR PASSWORD** and **BACKUP YOUR KEYSTORE**
55

6+
<!--
7+
This whole page can be nuked, _except_ for the info about
8+
where the keystore is located and advise the user
9+
to back up his keystore. That section should be moved
10+
into both accounts-info but also to any getting-started guide.
11+
-->
12+
613
# Backup & restore
714

815
## Data directory

docs/_install-and-build/Building-Ethereum.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/_install-and-build/Developers-Guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
title: Developers' guide
33
---
44
**NOTE: These instructions are for people who want to contribute Go source code changes.
5-
If you just want to run ethereum, use the normal [Installation Instructions](Building-Ethereum)**
5+
If you just want to run ethereum, use the normal [Installation Instructions](Installing-Geth)**
66

77
This document is the entry point for developers of the Go implementation of Ethereum. Developers here refer to the hands-on: who are interested in build, develop, debug, submit a bug report or pull request or contribute code to go-ethereum.
88

99
## Building and Testing
1010

1111
### Go Environment
1212

13-
We assume that you have [`go` v1.8 installed](../doc/Installing-Go), and `GOPATH` is set.
13+
We assume that you have [`go` installed](https://golang.org/doc/install), and `GOPATH` is set.
1414

1515
**Note**:You must have your working copy under `$GOPATH/src/github.com/ethereum/go-ethereum`.
1616

docs/_install-and-build/Installation-Instructions-for-ARM.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/_install-and-build/Installation-Instructions-for-Arch.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/_install-and-build/Installation-Instructions-for-FreeBSD.md

Lines changed: 0 additions & 60 deletions
This file was deleted.

docs/_install-and-build/Installation-Instructions-for-Mac.md

Lines changed: 0 additions & 60 deletions
This file was deleted.

docs/_install-and-build/Installation-Instructions-for-Ubuntu.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/_install-and-build/Installing-Geth.md

Lines changed: 99 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ The Go implementation of Ethereum can be installed using a variety of ways. Thes
66
* [Install from a package manager](#install-from-a-package-manager)
77
* [Install on macOS via Homebrew](#install-on-macos-via-homebrew)
88
* [Install on Ubuntu via PPAs](#install-on-ubuntu-via-ppas)
9-
* [Install on Windows via Chocolatey](#install-on-windows-via-chocolatey)
109
* [Download standalone bundle](#download-standalone-bundle)
1110
* [Run inside docker container](#run-inside-docker-container)
1211
* [Build it from source code](#build-it-from-source-code)
@@ -16,6 +15,31 @@ The Go implementation of Ethereum can be installed using a variety of ways. Thes
1615

1716
### Install on macOS via Homebrew
1817

18+
By far the easiest way to install go-ethereum is to use our
19+
Homebrew tap. If you don't have Homebrew, [install it first](http://brew.sh).
20+
21+
Then run the following commands to add the tap and install `geth`:
22+
23+
```shell
24+
brew tap ethereum/ethereum
25+
brew install ethereum
26+
```
27+
28+
You can install the develop branch using the `--devel` parameter:
29+
30+
```shell
31+
brew install ethereum --devel
32+
```
33+
34+
After installing, run `geth account new` to create an account on your node.
35+
36+
You should now be able to run `geth` and connect to the network.
37+
38+
Make sure to check the different options and commands with `geth --help`
39+
40+
For options and patches, see: <https://github.com/ethereum/homebrew-ethereum>
41+
42+
1943
### Install on Ubuntu via PPAs
2044

2145
The simplest way to install go-ethereum on Ubuntu distributions is via the built in launchpad PPAs (Personal Package Archives). We provide a single PPA repository that contains both our stable as well as our develop releases for Ubuntu versions `trusty`, `xenial`, `zesty` and `artful`.
@@ -40,9 +64,40 @@ sudo apt-get update
4064
sudo apt-get install ethereum-unstable
4165
```
4266

43-
### Install on Windows via Chocolatey
67+
### Installing on FreeBSD using `pkg`
68+
69+
```shell
70+
pkg install go-ethereum
71+
```
72+
73+
The `geth` command is then available on your system in `/usr/local/bin/geth`, you can start it e.g. on the testnet by typing:
74+
75+
```shell
76+
geth -rinkeby
77+
```
78+
79+
### Installing on FreeBSD Using ports
80+
81+
Go to the `net-p2p/go-ethereum` ports directory:
82+
83+
```shell
84+
cd /usr/ports/net-p2p/go-ethereum
85+
```
86+
Then build it the standard way (as root):
87+
88+
```shell
89+
make install
90+
```
91+
92+
### Installing on Arch Linux using `pacman`
4493

45-
Although we were shipping Chocolatey packages for a time after Frontier, it has fallen out of date due to the constant manual approval process. With our new build infrastructure in place we will attempt to negotiate trusted package status for go-ethereum to be able to reinstate the Chocolatey workflow. Until then please grab a Windows installer from our [downloads](https://geth.ethereum.org/downloads) page.
94+
The `geth` package is available from the [community repo](https://www.archlinux.org/packages/community/x86_64/geth/).
95+
96+
You can install it using
97+
98+
```shell
99+
pacman -S geth
100+
```
46101

47102
## Download standalone bundle
48103

@@ -78,14 +133,15 @@ The image has the following ports automatically exposed:
78133

79134
* `8545` TCP, used by the HTTP based JSON RPC API
80135
* `8546` TCP, used by the WebSocket based JSON RPC API
136+
* `8547` TCP, used by the GraphQL API
81137
* `30303` TCP and UDP, used by the P2P protocol running the network
82-
* `30304` UDP, used by the P2P protocol's new peer discovery overlay
83138

84139
*Note, if you are running an Ethereum client inside a docker container, you might want to mount in a data volume as the client's data directory (located at `/root/.ethereum` inside the container) to ensure that downloaded data is preserved between restarts and/or container life-cycles.*
85140

86141
## Build it from source code
87142

88-
Go Ethereum (as its name implies) is written in [Go](https://golang.org), and as such to build from source code you'll need to ensure that you have at least Go 1.7 installed (preferably the latest version, currently at 1.9.2). This guide will not go into details on how to install Go itself, for that please consult the [Go installation instructions](https://golang.org/doc/install) and grab any needed bundles from the [Go download page](https://golang.org/dl/).
143+
### Most Linux systems
144+
Go Ethereum (as its name implies) is written in [Go](https://golang.org), and as such to build from source code you'll need to ensure that you have the most recent version of Go. This guide will not go into details on how to install Go itself, for that please consult the [Go installation instructions](https://golang.org/doc/install) and grab any needed bundles from the [Go download page](https://golang.org/dl/).
89145

90146
Assuming you have Go installed, you can download our project via:
91147

@@ -101,6 +157,44 @@ go install github.com/ethereum/go-ethereum/cmd/geth
101157

102158
Or you can also build the entire project and install `geth` along with all developer tools by running `go install ./...` in the repository root inside your `GOPATH` work space.
103159

160+
### MacOS
161+
162+
If you see some errors related to header files of Mac OS system library, install XCode Command Line Tools, and try again.
163+
164+
```shell
165+
xcode-select --install
166+
```
167+
168+
### FreeBSD
169+
170+
Ports are slightly more up to date (1.8.14 at the time of writing)
171+
172+
Clone the repository to a directory of your choosing:
173+
174+
```shell
175+
git clone https://github.com/ethereum/go-ethereum
176+
```
177+
178+
Building `geth` requires the Go compiler:
179+
180+
```shell
181+
pkg install go
182+
```
183+
184+
If your golang version is >= 1.5, build the `geth` program using the following command.
185+
```shell
186+
cd go-ethereum
187+
make geth
188+
```
189+
If your golang version is < 1.5 (quarterly packages, for example), use the following command instead.
190+
```shell
191+
cd go-ethereum
192+
CC=clang make geth
193+
```
194+
195+
You can now run `build/bin/geth` to start your node.
196+
197+
104198
### Building without a Go workflow
105199

106200
If you do not want to set up Go work spaces on your machine, only build `geth` and forget about the build process, you can clone our repository directly into a folder of your choosing and invoke `make`, which will configure everything for a temporary build and clean up after itself:

docs/_install-and-build/Installing-Go.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)