Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop

1 files changed, 15 insertions, 2 deletions

diff --git a/eth/protocol.go b/eth/protocol.go
index 24a0f0a8e..fb694c877 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	ProtocolVersion    = 51
+	ProtocolVersion    = 52
 	NetworkId          = 0
 	ProtocolLength     = uint64(8)
 	ProtocolMaxMsgSize = 10 * 1024 * 1024
@@ -46,6 +46,7 @@ type ethProtocol struct {
 // used as an argument to EthProtocol
 type txPool interface {
 	AddTransactions([]*types.Transaction)
+	GetTransactions() types.Transactions
 }
 
 type chainManager interface {
@@ -91,16 +92,18 @@ func EthProtocol(txPool txPool, chainManager chainManager, blockPool blockPool)
 // the main loop that handles incoming messages
 // note RemovePeer in the post-disconnect hook
 func runEthProtocol(txPool txPool, chainManager chainManager, blockPool blockPool, peer *p2p.Peer, rw p2p.MsgReadWriter) (err error) {
+	id := peer.ID()
 	self := &ethProtocol{
 		txPool:       txPool,
 		chainManager: chainManager,
 		blockPool:    blockPool,
 		rw:           rw,
 		peer:         peer,
-		id:           fmt.Sprintf("%x", peer.Identity().Pubkey()[:8]),
+		id:           fmt.Sprintf("%x", id[:8]),
 	}
 	err = self.handleStatus()
 	if err == nil {
+		self.propagateTxs()
 		for {
 			err = self.handle()
 			if err != nil {
@@ -324,3 +327,13 @@ func (self *ethProtocol) protoErrorDisconnect(code int, format string, params ..
 	}
 
 }
+
+func (self *ethProtocol) propagateTxs() {
+	transactions := self.txPool.GetTransactions()
+	iface := make([]interface{}, len(transactions))
+	for i, transaction := range transactions {
+		iface[i] = transaction
+	}
+
+	self.rw.WriteMsg(p2p.NewMsg(TxMsg, iface...))
+}