diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-11-14 19:44:35 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-11-15 00:00:14 +0800 |
| commit | dfe79cc7845d94d14c2bc091c7eeac082f6b1e90 (patch) | |
| tree | 18d9c033f86af4eda374261e4c0a165ac2c733c0 /cmd | |
| parent | 4a439c2359991bdc49463ae66da11da895cc6eb7 (diff) | |
| download | dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar.gz dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar.bz2 dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar.lz dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar.xz dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.tar.zst dexon-dfe79cc7845d94d14c2bc091c7eeac082f6b1e90.zip | |
cmd/utils, mobile: place bootnodes in LGPL packages
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/utils/bootnodes.go | 52 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 6 |
2 files changed, 3 insertions, 55 deletions
diff --git a/cmd/utils/bootnodes.go b/cmd/utils/bootnodes.go deleted file mode 100644 index 07e64b25f..000000000 --- a/cmd/utils/bootnodes.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2015 The go-ethereum Authors -// This file is part of go-ethereum. -// -// go-ethereum is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// go-ethereum is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. - -package utils - -import ( - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" -) - -// MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on -// the main Ethereum network. -var MainnetBootnodes = []*discover.Node{ - // ETH/DEV Go Bootnodes - discover.MustParseNode("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303"), // IE - discover.MustParseNode("enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303"), // BR - discover.MustParseNode("enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303"), // SG - - // ETH/DEV Cpp Bootnodes - discover.MustParseNode("enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303"), -} - -// TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the -// Morden test network. -var TestnetBootnodes = []*discover.Node{ - // ETH/DEV Go Bootnodes - discover.MustParseNode("enode://e4533109cc9bd7604e4ff6c095f7a1d807e15b38e9bfeb05d3b7c423ba86af0a9e89abbf40bd9dde4250fef114cd09270fa4e224cbeef8b7bf05a51e8260d6b8@94.242.229.4:40404"), - discover.MustParseNode("enode://8c336ee6f03e99613ad21274f269479bf4413fb294d697ef15ab897598afb931f56beb8e97af530aee20ce2bcba5776f4a312bc168545de4d43736992c814592@94.242.229.203:30303"), - - // ETH/DEV Cpp Bootnodes -} - -// DiscoveryV5Bootnodes are the enode URLs of the P2P bootstrap nodes for the -// experimental RLPx v5 topic-discovery network. -var DiscoveryV5Bootnodes = []*discv5.Node{ - discv5.MustParseNode("enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30305"), - discv5.MustParseNode("enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30308"), - discv5.MustParseNode("enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30309"), -} diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 0b18d9f79..1ba905657 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -488,9 +488,9 @@ func MakeBootstrapNodes(ctx *cli.Context) []*discover.Node { // Return pre-configured nodes if none were manually requested if !ctx.GlobalIsSet(BootnodesFlag.Name) { if ctx.GlobalBool(TestNetFlag.Name) { - return TestnetBootnodes + return params.TestnetBootnodes } - return MainnetBootnodes + return params.MainnetBootnodes } // Otherwise parse and use the CLI bootstrap nodes bootnodes := []*discover.Node{} @@ -511,7 +511,7 @@ func MakeBootstrapNodes(ctx *cli.Context) []*discover.Node { func MakeBootstrapNodesV5(ctx *cli.Context) []*discv5.Node { // Return pre-configured nodes if none were manually requested if !ctx.GlobalIsSet(BootnodesFlag.Name) { - return DiscoveryV5Bootnodes + return params.DiscoveryV5Bootnodes } // Otherwise parse and use the CLI bootstrap nodes bootnodes := []*discv5.Node{} |