diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 02:53:18 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 02:53:18 +0800 |
| commit | b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b (patch) | |
| tree | f687a5a0b0f62ee9582f3fe31e8b468ede065e67 | |
| parent | f5e0388f62085c7eb100769765f8649ec364c1bd (diff) | |
| parent | 24995f9ab7c0dbfde0b45ce0bb1c01cf8015c0e8 (diff) | |
| download | go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar.gz go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar.bz2 go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar.lz go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar.xz go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.tar.zst go-tangerine-b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b.zip | |
Merge pull request #797 from tgerring/bootnodes
Bootnodes update
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | eth/backend.go | 5 |
2 files changed, 4 insertions, 7 deletions
@@ -92,9 +92,5 @@ are ignored (use gofmt!). If you send pull requests make absolute sure that you commit on the `develop` branch and that you do not merge to master. Commits that are directly based on master are simply ignored. -For dependency management, we use [godep](https://github.com/tools/godep). After installing with `go get github.com/tools/godep`, run `godep restore` to ensure that changes to other repositories do not break the build. To update a dependency version (for example, to include a new upstream fix), run `go get -u <foo/bar>` then `godep update <foo/...>`. To track a new dependency, add it to the project as normal than run `godep save ./...`. Changes to the [Godeps folder](https://github.com/ethereum/go-ethereum/tree/develop/Godeps): should be manually verified then commited. - -To make life easier try [git flow](http://nvie.com/posts/a-successful-git-branching-model/) it sets this all up and streamlines your work flow. - -See [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/eth/backend.go b/eth/backend.go index 0e671f1bf..356e7fd1a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -30,8 +30,9 @@ var ( jsonlogger = logger.NewJsonLogger() defaultBootNodes = []*discover.Node{ - // ETH/DEV cmd/bootnode - discover.MustParseNode("enode://09fbeec0d047e9a37e63f60f8618aa9df0e49271f3fadb2c070dc09e2099b95827b63a8b837c6fd01d0802d457dd83e3bd48bd3e6509f8209ed90dabbc30e3d3@52.16.188.185:30303"), + // ETH/DEV Go Bootnodes + discover.MustParseNode("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303"), + discover.MustParseNode("enode://7f25d3eab333a6b98a8b5ed68d962bb22c876ffcd5561fca54e3c2ef27f754df6f7fd7c9b74cc919067abac154fb8e1f8385505954f161ae440abc355855e034@54.207.93.166:30303"), // ETH/DEV cpp-ethereum (poc-9.ethdev.com) discover.MustParseNode("enode://487611428e6c99a11a9795a6abe7b529e81315ca6aad66e2a2fc76e3adf263faba0d35466c2f8f68d561dbefa8878d4df5f1f2ddb1fbeab7f42ffb8cd328bd4a@5.1.83.226:30303"), } |