From c2f410214c99ee3636cfb670e84e5f05d179a1ef Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 18 Apr 2015 01:11:09 +0200 Subject: eth: began split up of peers and protocol manager --- eth/backend.go | 13 +- eth/handler.go | 224 +++++++++++++++++++++++++++++++++ eth/peer.go | 137 ++++++++++++++++++++ eth/protocol.go | 383 ++------------------------------------------------------ 4 files changed, 369 insertions(+), 388 deletions(-) create mode 100644 eth/handler.go create mode 100644 eth/peer.go diff --git a/eth/backend.go b/eth/backend.go index 3d5c4ba09..d34a2d26b 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -10,7 +10,6 @@ import ( "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/blockpool" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" @@ -131,7 +130,6 @@ type Ethereum struct { blockProcessor *core.BlockProcessor txPool *core.TxPool chainManager *core.ChainManager - blockPool *blockpool.BlockPool accountManager *accounts.Manager whisper *whisper.Whisper pow *ethash.Ethash @@ -219,17 +217,12 @@ func New(config *Config) (*Ethereum, error) { eth.shhVersionId = int(eth.whisper.Version()) eth.miner = miner.New(eth, eth.pow, config.MinerThreads) - hasBlock := eth.chainManager.HasBlock - insertChain := eth.chainManager.InsertChain - td := eth.chainManager.Td() - eth.blockPool = blockpool.New(hasBlock, insertChain, eth.pow.Verify, eth.EventMux(), td) - netprv, err := config.nodeKey() if err != nil { return nil, err } - ethProto := EthProtocol(config.ProtocolVersion, config.NetworkId, eth.txPool, eth.chainManager, eth.blockPool, eth.downloader) + ethProto := EthProtocol(config.ProtocolVersion, config.NetworkId, eth.txPool, eth.chainManager, eth.downloader) protocols := []p2p.Protocol{ethProto} if config.Shh { protocols = append(protocols, eth.whisper.Protocol()) @@ -352,7 +345,6 @@ func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManag func (s *Ethereum) ChainManager() *core.ChainManager { return s.chainManager } func (s *Ethereum) BlockProcessor() *core.BlockProcessor { return s.blockProcessor } func (s *Ethereum) TxPool() *core.TxPool { return s.txPool } -func (s *Ethereum) BlockPool() *blockpool.BlockPool { return s.blockPool } func (s *Ethereum) Whisper() *whisper.Whisper { return s.whisper } func (s *Ethereum) EventMux() *event.TypeMux { return s.eventMux } func (s *Ethereum) BlockDb() common.Database { return s.blockDb } @@ -384,7 +376,6 @@ func (s *Ethereum) Start() error { // Start services s.txPool.Start() - s.blockPool.Start() if s.whisper != nil { s.whisper.Start() @@ -410,7 +401,6 @@ func (s *Ethereum) StartForTest() { // Start services s.txPool.Start() - s.blockPool.Start() } func (self *Ethereum) SuggestPeer(nodeURL string) error { @@ -433,7 +423,6 @@ func (s *Ethereum) Stop() { s.txPool.Stop() s.eventMux.Stop() - s.blockPool.Stop() if s.whisper != nil { s.whisper.Stop() } diff --git a/eth/handler.go b/eth/handler.go new file mode 100644 index 000000000..b3890d365 --- /dev/null +++ b/eth/handler.go @@ -0,0 +1,224 @@ +package eth + +import ( + "fmt" + "sync" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/eth/downloader" + "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/p2p" + "github.com/ethereum/go-ethereum/rlp" +) + +func errResp(code errCode, format string, v ...interface{}) error { + return fmt.Errorf("%v - %v", code, fmt.Sprintf(format, v...)) +} + +// main entrypoint, wrappers starting a server running the eth protocol +// use this constructor to attach the protocol ("class") to server caps +// the Dev p2p layer then runs the protocol instance on each peer +func EthProtocol(protocolVersion, networkId int, txPool txPool, chainManager chainManager, downloader *downloader.Downloader) p2p.Protocol { + protocol := newProtocolManager(txPool, chainManager, downloader) + + return p2p.Protocol{ + Name: "eth", + Version: uint(protocolVersion), + Length: ProtocolLength, + Run: func(p *p2p.Peer, rw p2p.MsgReadWriter) error { + //return runEthProtocol(protocolVersion, networkId, txPool, chainManager, downloader, p, rw) + peer := protocol.newPeer(protocolVersion, networkId, p, rw) + err := protocol.handle(peer) + glog.V(logger.Detail).Infof("[%s]: %v\n", peer.id, err) + + return err + }, + } +} + +type hashFetcherFn func(common.Hash) error +type blockFetcherFn func([]common.Hash) error + +// extProt is an interface which is passed around so we can expose GetHashes and GetBlock without exposing it to the rest of the protocol +// extProt is passed around to peers which require to GetHashes and GetBlocks +type extProt struct { + getHashes hashFetcherFn + getBlocks blockFetcherFn +} + +func (ep extProt) GetHashes(hash common.Hash) error { return ep.getHashes(hash) } +func (ep extProt) GetBlock(hashes []common.Hash) error { return ep.getBlocks(hashes) } + +type EthProtocolManager struct { + protVer, netId int + txpool txPool + chainman chainManager + downloader *downloader.Downloader + + pmu sync.Mutex + peers map[string]*peer +} + +func newProtocolManager(txpool txPool, chainman chainManager, downloader *downloader.Downloader) *EthProtocolManager { + return &EthProtocolManager{ + txpool: txpool, + chainman: chainman, + downloader: downloader, + peers: make(map[string]*peer), + } +} + +func (pm *EthProtocolManager) newPeer(pv, nv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer { + pm.pmu.Lock() + defer pm.pmu.Unlock() + + td, current, genesis := pm.chainman.Status() + + peer := newPeer(pv, nv, genesis, current, td, p, rw) + pm.peers[peer.id] = peer + + return peer +} + +func (pm *EthProtocolManager) handle(p *peer) error { + if err := p.handleStatus(); err != nil { + return err + } + + pm.downloader.RegisterPeer(p.id, p.td, p.currentHash, p.requestHashes, p.requestBlocks) + defer pm.downloader.UnregisterPeer(p.id) + + // propagate existing transactions. new transactions appearing + // after this will be sent via broadcasts. + if err := p.sendTransactions(pm.txpool.GetTransactions()); err != nil { + return err + } + + // main loop. handle incoming messages. + for { + if err := pm.handleMsg(p); err != nil { + return err + } + } + + return nil +} + +func (self *EthProtocolManager) handleMsg(p *peer) error { + msg, err := p.rw.ReadMsg() + if err != nil { + return err + } + if msg.Size > ProtocolMaxMsgSize { + return errResp(ErrMsgTooLarge, "%v > %v", msg.Size, ProtocolMaxMsgSize) + } + // make sure that the payload has been fully consumed + defer msg.Discard() + + switch msg.Code { + case GetTxMsg: // ignore + case StatusMsg: + return errResp(ErrExtraStatusMsg, "uncontrolled status message") + + case TxMsg: + // TODO: rework using lazy RLP stream + var txs []*types.Transaction + if err := msg.Decode(&txs); err != nil { + return errResp(ErrDecode, "msg %v: %v", msg, err) + } + for i, tx := range txs { + if tx == nil { + return errResp(ErrDecode, "transaction %d is nil", i) + } + jsonlogger.LogJson(&logger.EthTxReceived{ + TxHash: tx.Hash().Hex(), + RemoteId: p.ID().String(), + }) + } + self.txpool.AddTransactions(txs) + + case GetBlockHashesMsg: + var request getBlockHashesMsgData + if err := msg.Decode(&request); err != nil { + return errResp(ErrDecode, "->msg %v: %v", msg, err) + } + + if request.Amount > maxHashes { + request.Amount = maxHashes + } + hashes := self.chainman.GetBlockHashesFromHash(request.Hash, request.Amount) + return p.sendBlockHashes(hashes) + case BlockHashesMsg: + msgStream := rlp.NewStream(msg.Payload) + + var hashes []common.Hash + if err := msgStream.Decode(&hashes); err != nil { + break + } + self.downloader.HashCh <- hashes + + case GetBlocksMsg: + msgStream := rlp.NewStream(msg.Payload) + if _, err := msgStream.List(); err != nil { + return err + } + + var blocks []*types.Block + var i int + for { + i++ + var hash common.Hash + err := msgStream.Decode(&hash) + if err == rlp.EOL { + break + } else if err != nil { + return errResp(ErrDecode, "msg %v: %v", msg, err) + } + + block := self.chainman.GetBlock(hash) + if block != nil { + blocks = append(blocks, block) + } + if i == maxBlocks { + break + } + } + return p.sendBlocks(blocks) + case BlocksMsg: + msgStream := rlp.NewStream(msg.Payload) + + var blocks []*types.Block + if err := msgStream.Decode(&blocks); err != nil { + glog.V(logger.Detail).Infoln("Decode error", err) + fmt.Println("decode error", err) + blocks = nil + } + self.downloader.DeliverChunk(p.id, blocks) + + case NewBlockMsg: + var request newBlockMsgData + if err := msg.Decode(&request); err != nil { + return errResp(ErrDecode, "%v: %v", msg, err) + } + if err := request.Block.ValidateFields(); err != nil { + return errResp(ErrDecode, "block validation %v: %v", msg, err) + } + hash := request.Block.Hash() + _, chainHead, _ := self.chainman.Status() + + jsonlogger.LogJson(&logger.EthChainReceivedNewBlock{ + BlockHash: hash.Hex(), + BlockNumber: request.Block.Number(), // this surely must be zero + ChainHeadHash: chainHead.Hex(), + BlockPrevHash: request.Block.ParentHash().Hex(), + RemoteId: p.ID().String(), + }) + self.downloader.AddBlock(p.id, request.Block, request.TD) + + default: + return errResp(ErrInvalidMsgCode, "%v", msg.Code) + } + return nil +} diff --git a/eth/peer.go b/eth/peer.go new file mode 100644 index 000000000..db7fea7a7 --- /dev/null +++ b/eth/peer.go @@ -0,0 +1,137 @@ +package eth + +import ( + "fmt" + "math/big" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/p2p" + "gopkg.in/fatih/set.v0" +) + +type statusMsgData struct { + ProtocolVersion uint32 + NetworkId uint32 + TD *big.Int + CurrentBlock common.Hash + GenesisBlock common.Hash +} + +type getBlockHashesMsgData struct { + Hash common.Hash + Amount uint64 +} + +type peer struct { + *p2p.Peer + + rw p2p.MsgReadWriter + + protv, netid int + + currentHash common.Hash + id string + td *big.Int + + genesis, ourHash common.Hash + ourTd *big.Int + + txHashes *set.Set + blockHashes *set.Set +} + +func newPeer(protv, netid int, genesis, currentHash common.Hash, td *big.Int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer { + id := p.ID() + + return &peer{ + Peer: p, + rw: rw, + genesis: genesis, + ourHash: currentHash, + ourTd: td, + protv: protv, + netid: netid, + id: fmt.Sprintf("%x", id[:8]), + txHashes: set.New(), + blockHashes: set.New(), + } +} + +// sendTransactions sends transactions to the peer and includes the hashes +// in it's tx hash set for future reference. The tx hash will allow the +// manager to check whether the peer has already received this particular +// transaction +func (p *peer) sendTransactions(txs types.Transactions) error { + for _, tx := range txs { + p.txHashes.Add(tx.Hash()) + } + + return p2p.Send(p.rw, TxMsg, txs) +} + +func (p *peer) sendBlockHashes(hashes []common.Hash) error { + return p2p.Send(p.rw, BlockHashesMsg, hashes) +} + +func (p *peer) sendBlocks(blocks []*types.Block) error { + return p2p.Send(p.rw, BlocksMsg, blocks) +} + +func (p *peer) requestHashes(from common.Hash) error { + p.Debugf("fetching hashes (%d) %x...\n", maxHashes, from[0:4]) + return p2p.Send(p.rw, GetBlockHashesMsg, getBlockHashesMsgData{from, maxHashes}) +} + +func (p *peer) requestBlocks(hashes []common.Hash) error { + p.Debugf("fetching %v blocks", len(hashes)) + return p2p.Send(p.rw, GetBlocksMsg, hashes) +} + +func (p *peer) handleStatus() error { + errc := make(chan error, 1) + go func() { + errc <- p2p.Send(p.rw, StatusMsg, &statusMsgData{ + ProtocolVersion: uint32(p.protv), + NetworkId: uint32(p.netid), + TD: p.ourTd, + CurrentBlock: p.ourHash, + GenesisBlock: p.genesis, + }) + }() + + // read and handle remote status + msg, err := p.rw.ReadMsg() + if err != nil { + return err + } + if msg.Code != StatusMsg { + return errResp(ErrNoStatusMsg, "first msg has code %x (!= %x)", msg.Code, StatusMsg) + } + if msg.Size > ProtocolMaxMsgSize { + return errResp(ErrMsgTooLarge, "%v > %v", msg.Size, ProtocolMaxMsgSize) + } + + var status statusMsgData + if err := msg.Decode(&status); err != nil { + return errResp(ErrDecode, "msg %v: %v", msg, err) + } + + if status.GenesisBlock != p.genesis { + return errResp(ErrGenesisBlockMismatch, "%x (!= %x)", status.GenesisBlock, p.genesis) + } + + if int(status.NetworkId) != p.netid { + return errResp(ErrNetworkIdMismatch, "%d (!= %d)", status.NetworkId, p.netid) + } + + if int(status.ProtocolVersion) != p.protv { + return errResp(ErrProtocolVersionMismatch, "%d (!= %d)", status.ProtocolVersion, p.protv) + } + // Set the total difficulty of the peer + p.td = status.TD + // set the best hash of the peer + p.currentHash = status.CurrentBlock + + return <-errc +} diff --git a/eth/protocol.go b/eth/protocol.go index 66f3cbac8..48f37b59c 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -1,17 +1,10 @@ package eth import ( - "fmt" "math/big" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/errs" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" ) const ( @@ -35,6 +28,8 @@ const ( NewBlockMsg ) +type errCode int + const ( ErrMsgTooLarge = iota ErrDecode @@ -47,6 +42,11 @@ const ( ErrSuspendedPeer ) +func (e errCode) String() string { + return errorToString[int(e)] +} + +// XXX change once legacy code is out var errorToString = map[int]string{ ErrMsgTooLarge: "Message too long", ErrDecode: "Invalid message", @@ -59,21 +59,6 @@ var errorToString = map[int]string{ ErrSuspendedPeer: "Suspended peer", } -// ethProtocol represents the ethereum wire protocol -// instance is running on each peer -type ethProtocol struct { - txPool txPool - chainManager chainManager - blockPool blockPool - downloader *downloader.Downloader - peer *p2p.Peer - id string - rw p2p.MsgReadWriter - errors *errs.Errors - protocolVersion int - networkId int -} - // backend is the interface the ethereum protocol backend should implement // used as an argument to EthProtocol type txPool interface { @@ -87,362 +72,8 @@ type chainManager interface { Status() (td *big.Int, currentBlock common.Hash, genesisBlock common.Hash) } -type blockPool interface { - AddBlockHashes(next func() (common.Hash, bool), peerId string) - AddBlock(block *types.Block, peerId string) - AddPeer(td *big.Int, currentBlock common.Hash, peerId string, requestHashes func(common.Hash) error, requestBlocks func([]common.Hash) error, peerError func(*errs.Error)) (best bool, suspended bool) - RemovePeer(peerId string) -} - // message structs used for RLP serialization type newBlockMsgData struct { Block *types.Block TD *big.Int } - -type getBlockHashesMsgData struct { - Hash common.Hash - Amount uint64 -} - -type statusMsgData struct { - ProtocolVersion uint32 - NetworkId uint32 - TD *big.Int - CurrentBlock common.Hash - GenesisBlock common.Hash -} - -// main entrypoint, wrappers starting a server running the eth protocol -// use this constructor to attach the protocol ("class") to server caps -// the Dev p2p layer then runs the protocol instance on each peer -func EthProtocol(protocolVersion, networkId int, txPool txPool, chainManager chainManager, blockPool blockPool, downloader *downloader.Downloader) p2p.Protocol { - return p2p.Protocol{ - Name: "eth", - Version: uint(protocolVersion), - Length: ProtocolLength, - Run: func(peer *p2p.Peer, rw p2p.MsgReadWriter) error { - return runEthProtocol(protocolVersion, networkId, txPool, chainManager, blockPool, downloader, peer, rw) - }, - } -} - -// the main loop that handles incoming messages -// note RemovePeer in the post-disconnect hook -func runEthProtocol(protocolVersion, networkId int, txPool txPool, chainManager chainManager, blockPool blockPool, downloader *downloader.Downloader, peer *p2p.Peer, rw p2p.MsgReadWriter) (err error) { - id := peer.ID() - self := ðProtocol{ - txPool: txPool, - chainManager: chainManager, - blockPool: blockPool, - downloader: downloader, - rw: rw, - peer: peer, - protocolVersion: protocolVersion, - networkId: networkId, - errors: &errs.Errors{ - Package: "ETH", - Errors: errorToString, - }, - id: fmt.Sprintf("%x", id[:8]), - } - - // handshake. - if err := self.handleStatus(); err != nil { - return err - } - defer self.blockPool.RemovePeer(self.id) - - // propagate existing transactions. new transactions appearing - // after this will be sent via broadcasts. - if err := p2p.Send(rw, TxMsg, txPool.GetTransactions()); err != nil { - return err - } - - // main loop. handle incoming messages. - for { - if err := self.handle(); err != nil { - return err - } - } -} - -func (self *ethProtocol) handle() error { - msg, err := self.rw.ReadMsg() - if err != nil { - return err - } - if msg.Size > ProtocolMaxMsgSize { - return self.protoError(ErrMsgTooLarge, "%v > %v", msg.Size, ProtocolMaxMsgSize) - } - // make sure that the payload has been fully consumed - defer msg.Discard() - - switch msg.Code { - case GetTxMsg: // ignore - case StatusMsg: - return self.protoError(ErrExtraStatusMsg, "") - - case TxMsg: - // TODO: rework using lazy RLP stream - var txs []*types.Transaction - if err := msg.Decode(&txs); err != nil { - return self.protoError(ErrDecode, "msg %v: %v", msg, err) - } - for i, tx := range txs { - if tx == nil { - return self.protoError(ErrDecode, "transaction %d is nil", i) - } - jsonlogger.LogJson(&logger.EthTxReceived{ - TxHash: tx.Hash().Hex(), - RemoteId: self.peer.ID().String(), - }) - } - self.txPool.AddTransactions(txs) - - case GetBlockHashesMsg: - var request getBlockHashesMsgData - if err := msg.Decode(&request); err != nil { - return self.protoError(ErrDecode, "->msg %v: %v", msg, err) - } - - if request.Amount > maxHashes { - request.Amount = maxHashes - } - hashes := self.chainManager.GetBlockHashesFromHash(request.Hash, request.Amount) - return p2p.Send(self.rw, BlockHashesMsg, hashes) - - case BlockHashesMsg: - msgStream := rlp.NewStream(msg.Payload) - - var hashes []common.Hash - if err := msgStream.Decode(&hashes); err != nil { - break - } - self.downloader.HashCh <- hashes - - /* - if _, err := msgStream.List(); err != nil { - return err - } - - var i int - iter := func() (hash common.Hash, err error) { - err = msgStream.Decode(&hash) - if err == rlp.EOL { - return common.Hash{}, err - } else if err != nil { - return common.Hash{}, fmt.Errorf("Fetching hashes err (%d): %v", i, err) - } - - i++ - return hash, nil - } - self.downloader.HashCh <- iter - //self.blockPool.AddBlockHashes(iter, self.id) - */ - - case GetBlocksMsg: - msgStream := rlp.NewStream(msg.Payload) - if _, err := msgStream.List(); err != nil { - return err - } - - var blocks []*types.Block - var i int - for { - i++ - var hash common.Hash - err := msgStream.Decode(&hash) - if err == rlp.EOL { - break - } else if err != nil { - return self.protoError(ErrDecode, "msg %v: %v", msg, err) - } - - block := self.chainManager.GetBlock(hash) - if block != nil { - blocks = append(blocks, block) - } - if i == maxBlocks { - break - } - } - return p2p.Send(self.rw, BlocksMsg, blocks) - - case BlocksMsg: - msgStream := rlp.NewStream(msg.Payload) - - var blocks []*types.Block - if err := msgStream.Decode(&blocks); err != nil { - glog.V(logger.Detail).Infoln("Decode error", err) - fmt.Println("decode error", err) - blocks = nil - } - self.downloader.DeliverChunk(self.id, blocks) - /* - msgStream := rlp.NewStream(msg.Payload) - if _, err := msgStream.List(); err != nil { - return err - } - for { - var block types.Block - if err := msgStream.Decode(&block); err != nil { - if err == rlp.EOL { - break - } else { - return self.protoError(ErrDecode, "msg %v: %v", msg, err) - } - } - if err := block.ValidateFields(); err != nil { - return self.protoError(ErrDecode, "block validation %v: %v", msg, err) - } - self.blockPool.AddBlock(&block, self.id) - } - */ - - case NewBlockMsg: - var request newBlockMsgData - if err := msg.Decode(&request); err != nil { - return self.protoError(ErrDecode, "%v: %v", msg, err) - } - if err := request.Block.ValidateFields(); err != nil { - return self.protoError(ErrDecode, "block validation %v: %v", msg, err) - } - hash := request.Block.Hash() - _, chainHead, _ := self.chainManager.Status() - - jsonlogger.LogJson(&logger.EthChainReceivedNewBlock{ - BlockHash: hash.Hex(), - BlockNumber: request.Block.Number(), // this surely must be zero - ChainHeadHash: chainHead.Hex(), - BlockPrevHash: request.Block.ParentHash().Hex(), - RemoteId: self.peer.ID().String(), - }) - - self.downloader.AddBlock(self.id, request.Block, request.TD) - // to simplify backend interface adding a new block - // uses AddPeer followed by AddBlock only if peer is the best peer - // (or selected as new best peer) - if _, suspended := self.blockPool.AddPeer(request.TD, hash, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect); !suspended { - self.blockPool.AddBlock(request.Block, self.id) - } - - default: - return self.protoError(ErrInvalidMsgCode, "%v", msg.Code) - } - return nil -} - -func (self *ethProtocol) handleStatus() error { - if err := self.sendStatus(); err != nil { - return err - } - - // read and handle remote status - msg, err := self.rw.ReadMsg() - if err != nil { - return err - } - if msg.Code != StatusMsg { - return self.protoError(ErrNoStatusMsg, "first msg has code %x (!= %x)", msg.Code, StatusMsg) - } - if msg.Size > ProtocolMaxMsgSize { - return self.protoError(ErrMsgTooLarge, "%v > %v", msg.Size, ProtocolMaxMsgSize) - } - - var status statusMsgData - if err := msg.Decode(&status); err != nil { - return self.protoError(ErrDecode, "msg %v: %v", msg, err) - } - - _, _, genesisBlock := self.chainManager.Status() - - if status.GenesisBlock != genesisBlock { - return self.protoError(ErrGenesisBlockMismatch, "%x (!= %x)", status.GenesisBlock, genesisBlock) - } - - if int(status.NetworkId) != self.networkId { - return self.protoError(ErrNetworkIdMismatch, "%d (!= %d)", status.NetworkId, self.networkId) - } - - if int(status.ProtocolVersion) != self.protocolVersion { - return self.protoError(ErrProtocolVersionMismatch, "%d (!= %d)", status.ProtocolVersion, self.protocolVersion) - } - - err = self.downloader.RegisterPeer(self.id, status.TD, status.CurrentBlock, self.requestBlockHashes, self.requestBlocks) - if err != nil { - return self.protoError(ErrSuspendedPeer, "something") - } - /* - _, suspended := self.blockPool.AddPeer(status.TD, status.CurrentBlock, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect) - if suspended { - return self.protoError(ErrSuspendedPeer, "") - } - */ - - self.peer.Debugf("Peer is [eth] capable (%d/%d). TD=%v H=%x\n", status.ProtocolVersion, status.NetworkId, status.TD, status.CurrentBlock[:4]) - - return nil -} - -func (self *ethProtocol) requestBlockHashes(from common.Hash) error { - self.peer.Debugf("fetching hashes (%d) %x...\n", maxHashes, from[0:4]) - return p2p.Send(self.rw, GetBlockHashesMsg, getBlockHashesMsgData{from, maxHashes}) -} - -func (self *ethProtocol) requestBlocks(hashes []common.Hash) error { - self.peer.Debugf("fetching %v blocks", len(hashes)) - return p2p.Send(self.rw, GetBlocksMsg, hashes) -} - -/* -func (self *ethProtocol) newRespBlockCh() BlockPack { - self.blockRespCh = make(chan blockResp) - return self.blockRespCh -} - -func (self *ethProtocol) RequestBlocks(hashes *set.Set) <-chan []*types.Block { - out := make(chan []*types.Block) - go func() { - done: - for { - select { - case blockResp := <-self.newRespBlockCh(): - if len(blockResp.blocks) { - } - case <-time.After(5 * time.Second): - } - } - - close(out) - }() - return out -} -*/ - -func (self *ethProtocol) protoError(code int, format string, params ...interface{}) (err *errs.Error) { - err = self.errors.New(code, format, params...) - //err.Log(self.peer.Logger) - err.Log(glog.V(logger.Info)) - return -} - -func (self *ethProtocol) sendStatus() error { - td, currentBlock, genesisBlock := self.chainManager.Status() - return p2p.Send(self.rw, StatusMsg, &statusMsgData{ - ProtocolVersion: uint32(self.protocolVersion), - NetworkId: uint32(self.networkId), - TD: td, - CurrentBlock: currentBlock, - GenesisBlock: genesisBlock, - }) -} - -func (self *ethProtocol) protoErrorDisconnect(err *errs.Error) { - err.Log(glog.V(logger.Info)) - if err.Fatal() { - self.peer.Disconnect(p2p.DiscSubprotocolError) - } - -} -- cgit v1.2.3