|
|
@ -152,7 +152,6 @@ func (self *ethProtocol) handle() error { |
|
|
|
return self.protoError(ErrDecode, "->msg %v: %v", msg, err) |
|
|
|
return self.protoError(ErrDecode, "->msg %v: %v", msg, err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//request.Amount = uint64(math.Min(float64(maxHashes), float64(request.Amount)))
|
|
|
|
|
|
|
|
if request.Amount > maxHashes { |
|
|
|
if request.Amount > maxHashes { |
|
|
|
request.Amount = maxHashes |
|
|
|
request.Amount = maxHashes |
|
|
|
} |
|
|
|
} |
|
|
@ -224,6 +223,15 @@ func (self *ethProtocol) handle() error { |
|
|
|
return self.protoError(ErrDecode, "msg %v: %v", msg, err) |
|
|
|
return self.protoError(ErrDecode, "msg %v: %v", msg, err) |
|
|
|
} |
|
|
|
} |
|
|
|
hash := request.Block.Hash() |
|
|
|
hash := request.Block.Hash() |
|
|
|
|
|
|
|
_, chainHead, _ := self.chainManager.Status() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
jsonlogger.LogJson(&logger.EthChainReceivedNewBlock{ |
|
|
|
|
|
|
|
BlockHash: ethutil.Bytes2Hex(hash), |
|
|
|
|
|
|
|
BlockNumber: request.Block.Number(), // this surely must be zero
|
|
|
|
|
|
|
|
ChainHeadHash: ethutil.Bytes2Hex(chainHead), |
|
|
|
|
|
|
|
BlockPrevHash: ethutil.Bytes2Hex(request.Block.ParentHash()), |
|
|
|
|
|
|
|
RemoteId: self.peer.ID().String(), |
|
|
|
|
|
|
|
}) |
|
|
|
// to simplify backend interface adding a new block
|
|
|
|
// to simplify backend interface adding a new block
|
|
|
|
// uses AddPeer followed by AddHashes, AddBlock only if peer is the best peer
|
|
|
|
// uses AddPeer followed by AddHashes, AddBlock only if peer is the best peer
|
|
|
|
// (or selected as new best peer)
|
|
|
|
// (or selected as new best peer)
|
|
|
|