Properly exchange peer capabilities between peers

This commit is contained in:
Maran 2014-05-12 13:39:37 +02:00
parent 4eb3ad192e
commit 8b4ed8c505
2 changed files with 5 additions and 1 deletions

View File

@ -122,6 +122,10 @@ func (s *Ethereum) TxPool() *ethchain.TxPool {
return s.txPool return s.txPool
} }
func (s *Ethereum) ServerCaps() Caps {
return s.serverCaps
}
func (s *Ethereum) AddPeer(conn net.Conn) { func (s *Ethereum) AddPeer(conn net.Conn) {
peer := NewPeer(conn, s, true) peer := NewPeer(conn, s, true)

View File

@ -146,6 +146,7 @@ func NewPeer(conn net.Conn, ethereum *Ethereum, inbound bool) *Peer {
port: 30303, port: 30303,
pubkey: pubkey, pubkey: pubkey,
blocksRequested: 10, blocksRequested: 10,
caps: ethereum.ServerCaps(),
} }
} }
@ -573,7 +574,6 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
} }
// Catch up with the connected peer // Catch up with the connected peer
// p.CatchupWithPeer(p.ethereum.BlockChain().CurrentBlock.Hash())
p.SyncWithBlocks() p.SyncWithBlocks()
// Set the peer's caps // Set the peer's caps