Properly exchange peer capabilities between peers

2 files changed, 5 insertions, 1 deletions

diff --git a/ethereum.go b/ethereum.go
index e3140b5ce..97ea35d45 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -122,6 +122,10 @@ func (s *Ethereum) TxPool() *ethchain.TxPool {
 	return s.txPool
 }
 
+func (s *Ethereum) ServerCaps() Caps {
+	return s.serverCaps
+}
+
 func (s *Ethereum) AddPeer(conn net.Conn) {
 	peer := NewPeer(conn, s, true)
 
diff --git a/peer.go b/peer.go
index 9b8b3f2ae..54e6af823 100644
--- a/peer.go
+++ b/peer.go
@@ -146,6 +146,7 @@ func NewPeer(conn net.Conn, ethereum *Ethereum, inbound bool) *Peer {
 		port:            30303,
 		pubkey:          pubkey,
 		blocksRequested: 10,
+		caps:            ethereum.ServerCaps(),
 	}
 }
 
@@ -573,7 +574,6 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
 	}
 
 	// Catch up with the connected peer
-	// p.CatchupWithPeer(p.ethereum.BlockChain().CurrentBlock.Hash())
 	p.SyncWithBlocks()
 
 	// Set the peer's caps