Merge pull request #14737 from holiman/txpool_localaccounts

Txpool localaccounts
2017-07-10 12:43:23 +03:00
parent 65f0e905dd 34ec9913f6
commit 4f7a38001f
13 changed files with 392 additions and 287 deletions
--- a/eth/handler.go
+++ b/eth/handler.go
@ -658,7 +658,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			}
 			p.MarkTransaction(tx.Hash())
 		}
-		pm.txpool.AddBatch(txs)
+		pm.txpool.AddRemotes(txs)

 	default:
 		return errResp(ErrInvalidMsgCode, "%v", msg.Code)