gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix/0.3.1' into develop

Browse Source
This commit is contained in:
obscuren
2014-02-28 16:46:12 +01:00
parent 8ee8ec8a36 b462ca4aad
commit d7c5936ac4
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethereum.go
View File

@@ -295,7 +295,7 @@ func (s *Ethereum) Stop() {
s.TxPool.Stop() s.TxPool.Stop()
s.BlockManager.Stop() s.BlockManager.Stop()
s.shutdownChan <- true close(s.shutdownChan)
} }
// This function will wait for a shutdown and resumes main thread execution // This function will wait for a shutdown and resumes main thread execution

2
ethutil/config.go
View File

@@ -46,7 +46,7 @@ func ReadConfig(base string) *config {
} }
} }
Config = &config{ExecPath: path, Debug: true, Ver: "0.3.0"} Config = &config{ExecPath: path, Debug: true, Ver: "0.3.1"}
Config.Log = NewLogger(LogFile|LogStd, LogLevelDebug) Config.Log = NewLogger(LogFile|LogStd, LogLevelDebug)
} }

5
peer.go
View File

@@ -511,9 +511,8 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
p.port = uint16(c.Get(4).Uint()) p.port = uint16(c.Get(4).Uint())
// Self connect detection // Self connect detection
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) key := ethutil.Config.Db.GetKeys()[0]
pubkey := ethutil.NewValueFromBytes(data).Get(2).Bytes() if bytes.Compare(key.PublicKey, p.pubkey) == 0 {
if bytes.Compare(pubkey, p.pubkey) == 0 {
p.Stop() p.Stop()
return return