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

[devp2p discovery]: remove deprecated_echo_hash (#11564)

Browse Source 
Removes support for `deprecated_echo_hash` ping/pong in devp2p-discovery.
It will not work with nodes prior to `stable 2.0.5` (#9526)
This commit is contained in:
Niklas Adolfsson 2020-03-17 16:43:48 +01:00 committed by GitHub
parent 2bcc31928e
commit 3231454bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
util/network-devp2p/src/discovery.rs
View File

@ -131,9 +131,6 @@ struct PingRequest {
node: NodeEntry, node: NodeEntry,
// The hash sent in the Ping request // The hash sent in the Ping request
echo_hash: H256, echo_hash: H256,
// The hash Parity used to respond with (until rev 01f825b0e1f1c4c420197b51fc801cbe89284b29)
#[deprecated()]
deprecated_echo_hash: H256,
reason: PingReason reason: PingReason
} }
@ -255,23 +252,17 @@ impl Discovery {
}.and_then(|(node_entry, bucket_distance)| { }.and_then(|(node_entry, bucket_distance)| {
trace!(target: "discovery", "Adding a new node {:?} into our bucket {}", &node_entry, bucket_distance); trace!(target: "discovery", "Adding a new node {:?} into our bucket {}", &node_entry, bucket_distance);
let mut added = HashMap::with_capacity(1); let bucket = &mut self.node_buckets[bucket_distance];
added.insert(node_entry.id, node_entry.clone()); bucket.nodes.push_front(BucketEntry::new(node_entry.clone()));
if bucket.nodes.len() > BUCKET_SIZE {
let node_to_ping = { if let Some(node) = select_bucket_ping(bucket.nodes.iter()) {
let bucket = &mut self.node_buckets[bucket_distance]; self.try_ping(node, PingReason::Default);
bucket.nodes.push_front(BucketEntry::new(node_entry.clone()));
if bucket.nodes.len() > BUCKET_SIZE {
select_bucket_ping(bucket.nodes.iter())
} else {
None
} }
}; }
if let Some(node) = node_to_ping {
self.try_ping(node, PingReason::Default);
};
if node_entry.endpoint.is_valid_sync_node() { if node_entry.endpoint.is_valid_sync_node() {
let mut added = HashMap::with_capacity(1);
added.insert(node_entry.id, node_entry);
Some(TableUpdates { added, removed: HashSet::new() }) Some(TableUpdates { added, removed: HashSet::new() })
} else { } else {
None None
@ -381,14 +372,12 @@ impl Discovery {
self.public_endpoint.to_rlp_list(&mut rlp); self.public_endpoint.to_rlp_list(&mut rlp);
node.endpoint.to_rlp_list(&mut rlp); node.endpoint.to_rlp_list(&mut rlp);
append_expiration(&mut rlp); append_expiration(&mut rlp);
let old_parity_hash = keccak(rlp.as_raw());
let hash = self.send_packet(PACKET_PING, node.endpoint.udp_address(), rlp.drain())?; let hash = self.send_packet(PACKET_PING, node.endpoint.udp_address(), rlp.drain())?;
self.in_flight_pings.insert(node.id, PingRequest { self.in_flight_pings.insert(node.id, PingRequest {
sent_at: Instant::now(), sent_at: Instant::now(),
node: node.clone(), node: node.clone(),
echo_hash: hash, echo_hash: hash,
deprecated_echo_hash: old_parity_hash,
reason, reason,
}); });
@ -569,28 +558,15 @@ impl Discovery {
self.check_timestamp(timestamp)?; self.check_timestamp(timestamp)?;
let expected_node = match self.in_flight_pings.entry(node_id) { let expected_node = match self.in_flight_pings.entry(node_id) {
Entry::Occupied(entry) => { Entry::Occupied(entry) if entry.get().echo_hash != echo_hash => {
let expected_node = { debug!(target: "discovery", "Got unexpected Pong from {:?} ; packet_hash={:#x} ; expected_hash={:#x}", &from, entry.get().echo_hash, echo_hash);
let request = entry.get();
if request.echo_hash != echo_hash && request.deprecated_echo_hash != echo_hash {
debug!(target: "discovery", "Got unexpected Pong from {:?} ; packet_hash={:#x} ; expected_hash={:#x}", &from, request.echo_hash, echo_hash);
None
} else {
if request.deprecated_echo_hash == echo_hash {
trace!(target: "discovery", "Got Pong from an old open-ethereum version.");
}
Some((request.node.clone(), request.reason))
}
};
if expected_node.is_some() {
entry.remove();
}
expected_node
},
Entry::Vacant(_) => {
None None
}, },
Entry::Occupied(entry) => {
let request = entry.remove();
Some((request.node, request.reason))
},
Entry::Vacant(_) => None,
}; };
if let Some((node, ping_reason)) = expected_node { if let Some((node, ping_reason)) = expected_node {
@ -606,7 +582,7 @@ impl Discovery {
debug!(target: "discovery", "Error occured when processing ping from a bucket node: {:?}", &error); debug!(target: "discovery", "Error occured when processing ping from a bucket node: {:?}", &error);
}); });
}, },
NodeValidity::UnknownNode | NodeValidity::ExpiredNode(NodeCategory::Observed) | NodeValidity::ValidNode(NodeCategory::Observed)=> { NodeValidity::UnknownNode | NodeValidity::ExpiredNode(NodeCategory::Observed) | NodeValidity::ValidNode(NodeCategory::Observed) => {
trace!(target: "discovery", "Updating node {:?} in the list of other_observed_nodes", &node); trace!(target: "discovery", "Updating node {:?} in the list of other_observed_nodes", &node);
self.other_observed_nodes.insert(node.id, (node.endpoint, Instant::now())); self.other_observed_nodes.insert(node.id, (node.endpoint, Instant::now()));
}, },