Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(session): fix failing synchronization due to protocol version swi… #2523

Closed
wants to merge 1 commit into from
Closed

fix(session): fix failing synchronization due to protocol version swi… #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 15 additions & 30 deletions node/src/actors/session/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ use futures::future::Either;
use witnet_data_structures::{
builders::from_address,
chain::{
Block, CheckpointBeacon, Epoch, Hashable, InventoryEntry, InventoryItem, SuperBlock,
SuperBlockVote,
Block, CheckpointBeacon, Epoch, InventoryEntry, InventoryItem, SuperBlock, SuperBlockVote,
},
proto::versioning::Versioned,
get_protocol_version,
proto::versioning::{Versioned, VersionedHashable},
transaction::Transaction,
types::{
Address, Command, InventoryAnnouncement, InventoryRequest, LastBeacon,
Expand Down Expand Up @@ -674,43 +674,28 @@ fn peer_discovery_peers(
fn inventory_process_block(session: &mut Session, _ctx: &mut Context<Session>, block: Block) {
// Get ChainManager address
let chain_manager_addr = ChainManager::from_registry();
let block_hash = block.hash();

if session.requested_block_hashes.contains(&block_hash) {
// Add block to requested_blocks
session.requested_blocks.insert(block_hash, block);

if session.requested_blocks.len() == session.requested_block_hashes.len() {
let mut blocks_vector = Vec::with_capacity(session.requested_blocks.len());
// Iterate over requested block hashes ordered by epoch
// TODO: We assume that the received InventoryAnnouncement message returns the list of
// block hashes ordered by epoch.
// If that is not the case, we can sort blocks_vector by block.block_header.checkpoint
for hash in session.requested_block_hashes.drain(..) {
if let Some(block) = session.requested_blocks.remove(&hash) {
blocks_vector.push(block);
} else {
// Assuming that we always clear requested_blocks after mutating
// requested_block_hashes, this branch should be unreachable.
// But if it happens, immediately exit the for loop and send an empty AddBlocks
// message to ChainManager.
log::warn!("Unexpected missing block: {}", hash);
break;
}
}
let block_hash = block.versioned_hash(get_protocol_version(Some(
block.block_header.beacon.checkpoint,
)));

if !session.requested_block_hashes.is_empty()
&& *session.requested_block_hashes.front().unwrap() == block_hash
{
session.requested_blocks.push(block);
session.requested_block_hashes.pop_front();
} else {
if !session.requested_blocks.is_empty() {
// Send a message to the ChainManager to try to add a new block
chain_manager_addr.do_send(AddBlocks {
blocks: blocks_vector,
blocks: session.requested_blocks.clone(),
sender: Some(session.remote_addr),
});

// Clear requested block structures
session.blocks_timestamp = 0;
session.requested_blocks.clear();
// requested_block_hashes is cleared by using drain(..) above
session.requested_block_hashes.clear();
}
} else {
// If this is not a requested block, assume it is a candidate
// Send a message to the ChainManager to try to add a new candidate
chain_manager_addr.do_send(AddCandidates {
Expand Down
12 changes: 6 additions & 6 deletions node/src/actors/session/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{collections::HashMap, net::SocketAddr, sync::Arc};
use std::{collections::VecDeque, net::SocketAddr, sync::Arc};

use actix::{io::FramedWrite, SystemService};

Expand Down Expand Up @@ -79,10 +79,10 @@ pub struct Session {
last_beacon: LastBeacon,

/// Requested block hashes vector
requested_block_hashes: Vec<Hash>,
requested_block_hashes: VecDeque<Hash>,

/// HashMap with requested blocks
requested_blocks: HashMap<Hash, Block>,
/// Vec with requested blocks
requested_blocks: Vec<Block>,

/// Timestamp for requested blocks
blocks_timestamp: i64,
Expand Down Expand Up @@ -132,8 +132,8 @@ impl Session {
magic_number,
current_epoch,
last_beacon,
requested_block_hashes: vec![],
requested_blocks: HashMap::new(),
requested_block_hashes: VecDeque::new(),
requested_blocks: vec![],
blocks_timestamp: 0,
config,
expected_peers_msg: 0,
Expand Down