Skip to content

Commit 4137fb7

Browse files
committed
Merge branch 'master' into abigen-slices
2 parents d37a347 + e1edfe0 commit 4137fb7

File tree

1,950 files changed

+428077
-92235
lines changed

Some content is hidden

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

1,950 files changed

+428077
-92235
lines changed

.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
**/.git
2+
.git
3+
!.git/HEAD
4+
!.git/refs/heads
25
**/*_test.go
36

47
build/_workspace

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
*.sol linguist-language=Solidity

.github/CODEOWNERS

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Lines starting with '#' are comments.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
accounts/usbwallet @karalabe
5+
accounts/abi @gballet
6+
consensus @karalabe
7+
core/ @karalabe @holiman
8+
eth/ @karalabe
9+
les/ @zsfelfoldi
10+
light/ @zsfelfoldi
11+
mobile/ @karalabe
12+
p2p/ @fjl @zsfelfoldi
13+
p2p/simulations @lmars
14+
p2p/protocols @zelig
15+
swarm/api/http @justelad
16+
swarm/bmt @zelig
17+
swarm/dev @lmars
18+
swarm/fuse @jmozah @holisticode
19+
swarm/grafana_dashboards @nonsense
20+
swarm/metrics @nonsense @holisticode
21+
swarm/multihash @nolash
22+
swarm/network/bitvector @zelig @janos
23+
swarm/network/priorityqueue @zelig @janos
24+
swarm/network/simulations @zelig @janos
25+
swarm/network/stream @janos @zelig @holisticode @justelad
26+
swarm/network/stream/intervals @janos
27+
swarm/network/stream/testing @zelig
28+
swarm/pot @zelig
29+
swarm/pss @nolash @zelig @nonsense
30+
swarm/services @zelig
31+
swarm/state @justelad
32+
swarm/storage/encryption @zelig @nagydani
33+
swarm/storage/mock @janos
34+
swarm/storage/feed @nolash @jpeletier
35+
swarm/testutil @lmars
36+
whisper/ @gballet @gluk256

.github/CONTRIBUTING.md

+35-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1+
# Contributing
2+
3+
Thank you for considering to help out with the source code! We welcome
4+
contributions from anyone on the internet, and are grateful for even the
5+
smallest of fixes!
6+
7+
If you'd like to contribute to go-ethereum, please fork, fix, commit and send a
8+
pull request for the maintainers to review and merge into the main code base. If
9+
you wish to submit more complex changes though, please check up with the core
10+
devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) to
11+
ensure those changes are in line with the general philosophy of the project
12+
and/or get some early feedback which can make both your efforts much lighter as
13+
well as our review and merge procedures quick and simple.
14+
15+
## Coding guidelines
16+
17+
Please make sure your contributions adhere to our coding guidelines:
18+
19+
* Code must adhere to the official Go
20+
[formatting](https://golang.org/doc/effective_go.html#formatting) guidelines
21+
(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
22+
* Code must be documented adhering to the official Go
23+
[commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
24+
* Pull requests need to be based on and opened against the `master` branch.
25+
* Commit messages should be prefixed with the package(s) they modify.
26+
* E.g. "eth, rpc: make trace configs optional"
27+
128
## Can I have feature X
229

3-
Before you do a feature request please check and make sure that it isn't possible
4-
through some other means. The JavaScript enabled console is a powerful feature
5-
in the right hands. Please check our [Bitchin' tricks](https://github.com/ethereum/go-ethereum/wiki/bitchin-tricks) wiki page for more info
30+
Before you submit a feature request, please check and make sure that it isn't
31+
possible through some other means. The JavaScript-enabled console is a powerful
32+
feature in the right hands. Please check our
33+
[Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info
634
and help.
735

8-
## Contributing
9-
10-
If you'd like to contribute to go-ethereum please fork, fix, commit and
11-
send a pull request. Commits which do not comply with the coding standards
12-
are ignored (use gofmt!).
36+
## Configuration, dependencies, and tests
1337

14-
See [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
15-
for more details on configuring your environment, testing, and
16-
dependency management.
38+
Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
39+
for more details on configuring your environment, managing project dependencies
40+
and testing procedures.

.github/ISSUE_TEMPLATE.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Hi there,
2+
3+
please note that this is an issue tracker reserved for bug reports and feature requests.
4+
5+
For general questions please use the gitter channel or the Ethereum stack exchange at https://ethereum.stackexchange.com.
6+
17
#### System information
28

39
Geth version: `geth version`

.github/no-response.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Number of days of inactivity before an Issue is closed for lack of response
2+
daysUntilClose: 30
3+
# Label requiring a response
4+
responseRequiredLabel: "need:more-information"
5+
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
6+
closeComment: >
7+
This issue has been automatically closed because there has been no response
8+
to our request for more information from the original author. With only the
9+
information that is currently in the issue, we don't have enough information
10+
to take action. Please reach out if you have more relevant information or
11+
answers to our questions so that we can investigate further.

.github/stale.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 366
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 42
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: "status:inactive"
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

.gitignore

+12
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,15 @@ profile.cov
3333

3434
# IdeaIDE
3535
.idea
36+
37+
# VS Code
38+
.vscode
39+
40+
# dashboard
41+
/dashboard/assets/flow-typed
42+
/dashboard/assets/node_modules
43+
/dashboard/assets/stats.json
44+
/dashboard/assets/bundle.js
45+
/dashboard/assets/package-lock.json
46+
47+
**/yarn-error.log

.mailmap

+13-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Enrique Fynn <enriquefynn@gmail.com>
6565

6666
Vincent G <caktux@gmail.com>
6767

68-
RJ Catalano <rj@erisindustries.com>
68+
RJ Catalano <catalanor0220@gmail.com>
69+
RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>
6970

7071
Nchinda Nchinda <nchinda2@gmail.com>
7172

@@ -109,3 +110,14 @@ Frank Wang <eternnoir@gmail.com>
109110
Gary Rong <garyrong0905@gmail.com>
110111

111112
Guillaume Nicolas <guin56@gmail.com>
113+
114+
Sorin Neacsu <sorin.neacsu@gmail.com>
115+
Sorin Neacsu <sorin.neacsu@gmail.com> <sorin@users.noreply.github.com>
116+
117+
Valentin Wüstholz <wuestholz@gmail.com>
118+
Valentin Wüstholz <wuestholz@gmail.com> <wuestholz@users.noreply.github.com>
119+
120+
Armin Braun <me@obrown.io>
121+
122+
Ernesto del Toro <ernesto.deltoro@gmail.com>
123+
Ernesto del Toro <ernesto.deltoro@gmail.com> <ernestodeltoro@users.noreply.github.com>

0 commit comments

Comments
 (0)