grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #737 from ethcore/sync

Browse Source 
Sync fixed again
This commit is contained in:
Gav Wood 2016-03-15 12:13:44 +01:00
commit b0f233a06c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/chain.rs
View File

@ -479,6 +479,9 @@ impl ChainSync {
let header_rlp = try!(block_rlp.at(0)); let header_rlp = try!(block_rlp.at(0));
let h = header_rlp.as_raw().sha3(); let h = header_rlp.as_raw().sha3();
trace!(target: "sync", "{} -> NewBlock ({})", peer_id, h); trace!(target: "sync", "{} -> NewBlock ({})", peer_id, h);
if !self.have_common_block {
trace!(target: "sync", "NewBlock ignored while seeking");
}
let header: BlockHeader = try!(header_rlp.as_val()); let header: BlockHeader = try!(header_rlp.as_val());
let mut unknown = false; let mut unknown = false;
{ {
@ -498,9 +501,10 @@ impl ChainSync {
Ok(_) => { Ok(_) => {
if self.current_base_block() < header.number { if self.current_base_block() < header.number {
self.last_imported_block = Some(header.number); self.last_imported_block = Some(header.number);
self.last_imported_hash = Some(header.hash());
self.remove_downloaded_blocks(header.number); self.remove_downloaded_blocks(header.number);
} }
trace!(target: "sync", "New block queued {:?}", h); trace!(target: "sync", "New block queued {:?} ({})", h, header.number);
}, },
Err(Error::Block(BlockError::UnknownParent(p))) => { Err(Error::Block(BlockError::UnknownParent(p))) => {
unknown = true; unknown = true;
@ -779,7 +783,7 @@ impl ChainSync {
{ {
let headers = self.headers.range_iter().next().unwrap(); let headers = self.headers.range_iter().next().unwrap();
let bodies = self.bodies.range_iter().next().unwrap(); let bodies = self.bodies.range_iter().next().unwrap();
if headers.0 != bodies.0 || headers.0 != self.current_base_block() + 1 { if headers.0 != bodies.0 || headers.0 > self.current_base_block() + 1 {
return; return;
} }

4
util/src/network/session.rs
View File

@ -213,6 +213,10 @@ impl Session {
/// Send a protocol packet to peer. /// Send a protocol packet to peer.
pub fn send_packet(&mut self, protocol: &str, packet_id: u8, data: &[u8]) -> Result<(), UtilError> { pub fn send_packet(&mut self, protocol: &str, packet_id: u8, data: &[u8]) -> Result<(), UtilError> {
if self.info.capabilities.is_empty() || !self.had_hello {
debug!(target: "network", "Sending to unconfirmed session {}, protocol: {}, packet: {}", self.token(), protocol, packet_id);
return Err(From::from(NetworkError::BadProtocol));
}
if self.expired() { if self.expired() {
return Err(From::from(NetworkError::Expired)); return Err(From::from(NetworkError::Expired));
} }