forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 13:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

changed flags.go from shift to chatty. new genesis. new seed node.

Browse source
This commit is contained in:
Chatty Network 2016-02-18 13:35:32 +01:00
parent 67253c3ffb
commit 141571ce98
3 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/utils/flags.go
View file

@ -154,7 +154,7 @@ var (
Usage: "Enable automatic DAG pregeneration", Usage: "Enable automatic DAG pregeneration",
} }
EtherbaseFlag = cli.StringFlag{ EtherbaseFlag = cli.StringFlag{
Name: "shiftbase", Name: "chattybase",
Usage: "Public address for block mining rewards. By default the address first created is used", Usage: "Public address for block mining rewards. By default the address first created is used",
Value: "0", Value: "0",
} }
@ -250,7 +250,7 @@ var (
RPCPortFlag = cli.IntFlag{ RPCPortFlag = cli.IntFlag{
Name: "rpcport", Name: "rpcport",
Usage: "Port on which the JSON-RPC server should listen", Usage: "Port on which the JSON-RPC server should listen",
Value: 53901, Value: 54501,
} }
RPCCORSDomainFlag = cli.StringFlag{ RPCCORSDomainFlag = cli.StringFlag{
Name: "rpccorsdomain", Name: "rpccorsdomain",
@ -294,7 +294,7 @@ var (
ListenPortFlag = cli.IntFlag{ ListenPortFlag = cli.IntFlag{
Name: "port", Name: "port",
Usage: "Network listening port", Usage: "Network listening port",
Value: 53900, Value: 54500,
} }
BootnodesFlag = cli.StringFlag{ BootnodesFlag = cli.StringFlag{
Name: "bootnodes", Name: "bootnodes",
@ -402,7 +402,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
am := MakeAccountManager(ctx) am := MakeAccountManager(ctx)
etherbase, err := ParamToAddress(ctx.GlobalString(EtherbaseFlag.Name), am) etherbase, err := ParamToAddress(ctx.GlobalString(EtherbaseFlag.Name), am)
if err != nil { if err != nil {
glog.V(logger.Error).Infoln("WARNING: No shiftbase(coinbase) set and no accounts found as default") glog.V(logger.Error).Infoln("WARNING: No chattybase(coinbase) set and no accounts found as default")
} }
return &eth.Config{ return &eth.Config{

2
core/default_genesis.go
View file

@ -27,4 +27,4 @@ func NewDefaultGenesisReader() (io.Reader, error) {
return gzip.NewReader(base64.NewDecoder(base64.StdEncoding, strings.NewReader(defaultGenesisBlock))) return gzip.NewReader(base64.NewDecoder(base64.StdEncoding, strings.NewReader(defaultGenesisBlock)))
} }
const defaultGenesisBlock = "H4sICPDv5VUAA2dlbi50eHQArU9LDoIwFLzLW7NoKxbLCVx4iaG00qQtxNYEQ7i7iLowISYmznI+781MFPuoDdXERvYBASqoddY6ffX5tjrEW1wkeN9rqieS0BXK1pRCVbAHGMaV5HIHybW2ViqLkvNGPrwNPJ7vxJ5tgua5oODGDqnbaPU7lqq6d7FB2lr5NZddMCkjDK/gQg24mJiPfyx3Rjq54PJ6T63kfAf/y7oElgEAAA==" const defaultGenesisBlock = "H4sICMxN51UAA2dlbi50eHQArY9BCsIwFETv8tddJLGmpidw4SWmaWIDSSomQqX07sbqRiiC4CwfM//PzBTHqA21xCb2IQGqqHfWOn3z+b46ROGFwvtRUzuThG5Q96YWqoE9wDCuJJc7SK61tVJZ1Jx38unt4PH6JPZsU7QsFQU3DUjDRqHfVarq0cUOaWvg11x2waSMcHkHC7rgamI+/rHcGenkgsvrPbXC5QEactCQkQEAAA=="

21
eth/backend.go
View file

@ -61,20 +61,7 @@ var (
jsonlogger = logger.NewJsonLogger() jsonlogger = logger.NewJsonLogger()
defaultBootNodes = []*discover.Node{ defaultBootNodes = []*discover.Node{
// Dallas discover.MustParseNode("enode://15f8e12a3cb83138cbc300ee34473a9a26ce48397df01e6c7a020960f3b5f66191c80f886fd4511fb352528d840f39d7c2b4c0a16733f0ffe8f29030dbbe621c@45.32.236.217:53900"),
discover.MustParseNode("enode://1dbee226a0f5eb65ab49897d7097c230ff8c0cbacea4b34bc2ac27883a8394452ed9467673fc6082c38a1aa098295cd9aa3927504e00338dca303179061fdd0c@104.238.146.111:53900"),
// Frankfurt
discover.MustParseNode("enode://031da6e0e52ff30d25e115e00e39f1aabc66ea1c86af9afb063ecf4e7c3981595e47470606e44b662f6102d9f1367ccf247aea120ef469c52beeffaf71038970@104.238.167.149:53900"),
// London
discover.MustParseNode("enode://fd7959f1b7a431f6cc26cedd1cdaf021f3ee309f52aecd120b35391319a3d7b4c48eedda72c994adfeeb12d33c0b3f058c2eb68539dfd099aaeebc88fe071739@104.238.172.251:53900"),
// Los Angeles
discover.MustParseNode("enode://2a0b96b2b7800e2e69172023bdc53d92d0c963178cb50b01346129d37680b516f53dc56b06c67984d1b4437faee5c849225385a6afbf70a1eaf9e40e2f26f104@108.61.218.27:53900"),
// Paris
discover.MustParseNode("enode://6416448dfd960339ea5a5eb94923341759e5756967e7f24ff89e0182180d7da381ce28a0c6684835ca5728f040e41a6dea90f2f954ee213711d520948336f7c3@104.238.191.83:53900"),
// Sydney
discover.MustParseNode("enode://c4c7b45d9751f329fa33268be4569434fa3639dc3a646e9ca5a925a149cc9fdea1f1f053a4ffd4c756f2704e5cd44a5c96cde10831a01edd4f6f424404e04033@45.32.241.124:53900"),
// Tokyo
discover.MustParseNode("enode://ca30a08cc389ad43a2023730bff05c1eb40f2358e9687d3f46da0d20d83a12ae64091028fb3accb162730644e7bd74e3519f4be3ce0d86481c2f0247454cf536@45.32.253.1:53900"),
} }
staticNodes = "static-nodes.json" // Path within <datadir> to search for the static node list staticNodes = "static-nodes.json" // Path within <datadir> to search for the static node list
@ -331,7 +318,7 @@ func New(config *Config) (*Ethereum, error) {
b, _ := chainDb.Get([]byte("BlockchainVersion")) b, _ := chainDb.Get([]byte("BlockchainVersion"))
bcVersion := int(common.NewValue(b).Uint()) bcVersion := int(common.NewValue(b).Uint())
if bcVersion != config.BlockChainVersion && bcVersion != 0 { if bcVersion != config.BlockChainVersion && bcVersion != 0 {
return nil, fmt.Errorf("Blockchain DB version mismatch (%d / %d). Run shift upgradedb.\n", bcVersion, config.BlockChainVersion) return nil, fmt.Errorf("Blockchain DB version mismatch (%d / %d). Run chatty upgradedb.\n", bcVersion, config.BlockChainVersion)
} }
saveBlockchainVersion(chainDb, config.BlockChainVersion) saveBlockchainVersion(chainDb, config.BlockChainVersion)
} }
@ -497,7 +484,7 @@ func (s *Ethereum) ResetWithGenesisBlock(gb *types.Block) {
func (s *Ethereum) StartMining(threads int) error { func (s *Ethereum) StartMining(threads int) error {
eb, err := s.Etherbase() eb, err := s.Etherbase()
if err != nil { if err != nil {
err = fmt.Errorf("Cannot start mining without shiftbase(coinbase) address: %v", err) err = fmt.Errorf("Cannot start mining without chattybase(coinbase) address: %v", err)
glog.V(logger.Error).Infoln(err) glog.V(logger.Error).Infoln(err)
return err return err
} }
@ -511,7 +498,7 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
if (eb == common.Address{}) { if (eb == common.Address{}) {
addr, e := s.AccountManager().AddressByIndex(0) addr, e := s.AccountManager().AddressByIndex(0)
if e != nil { if e != nil {
err = fmt.Errorf("shiftbase(coinbase) address must be explicitly specified") err = fmt.Errorf("chattybase(coinbase) address must be explicitly specified")
} }
eb = common.HexToAddress(addr) eb = common.HexToAddress(addr)
} }