Merge pull request DMDcoin#197 from SurfingNerd/devp2p-fixes

i will solve failing Unit tests in later addition

Author: SurfingNerd

crates/ethcore/sync/src/chain/handler.rs

@@ -861,6 +861,9 @@ impl SyncHandler {
                 .as_val::<H256>()
                 .map_err(|_| DownloaderImportError::Invalid)?;
 
+            // todo: what if the Transaction is not new, and already in the chain?
+            // see: https://github.com/DMDcoin/diamond-node/issues/196
+
             if io.chain().queued_transaction(hash).is_none() {
                 sync.peers
                     .get_mut(&peer_id)

crates/ethcore/sync/src/chain/mod.rs

@@ -1419,7 +1419,10 @@ impl ChainSync {
 
             // communicate with this peer in any case if we are on the same block.
             // more about: https://github.com/DMDcoin/diamond-node/issues/173
-            let communicate_with_peer = chain_info.best_block_hash == peer_latest;
+
+            //let communicate_with_peer = chain_info.best_block_hash == peer_latest;
+
+            let communicate_with_peer = true;
 
             // on a distributed real network, 3 seconds is about they physical minimum.
             // therefore we "accept" other nodes to be 1 block behind - usually they are not!
@@ -1459,18 +1462,27 @@ impl ChainSync {
                             if self
                                 .asking_pooled_transaction_overview
                                 .get_last_fetched(hash)
-                                .map_or(false, |t| t.elapsed().as_millis() > 300)
+                                .map_or(true, |t| t.elapsed().as_millis() > 300)
                             {
                                 to_send.insert(hash.clone());
                                 self.asking_pooled_transaction_overview
                                     .report_transaction_pooling(hash);
                             }
                         }
 
-                        peer.unfetched_pooled_transactions
-                            .retain(|u| !to_send.contains(u));
-
-                        peer.asking_pooled_transactions = to_send.clone();
+                        if !to_send.is_empty() {
+                            peer.unfetched_pooled_transactions
+                                .retain(|u| !to_send.contains(u));
+
+                            // trace!(
+                            //     target: "sync",
+                            //     "Asking {} pooled transactions from peer {}: {:?}",
+                            //     to_send.len(),
+                            //     peer_id,
+                            //     to_send
+                            // );
+                            peer.asking_pooled_transactions = to_send.clone();
+                        }
                     } else {
                         info!(
                             "we are already asking from peer {}: {} transactions",

crates/ethcore/sync/src/chain/propagator.rs

@@ -65,6 +65,9 @@ impl ChainSync {
         blocks: &[H256],
         peers: &[PeerId],
     ) -> usize {
+        if peers.len() == 0 {
+            return 0;
+        }
         trace!(target: "sync", "Sending NewBlocks to {:?}", peers);
         let sent = peers.len();
         let mut send_packet = |io: &mut dyn SyncIo, rlp: Bytes| {
@@ -100,6 +103,9 @@ impl ChainSync {
         io: &mut dyn SyncIo,
         peers: &[PeerId],
     ) -> usize {
+        if peers.len() == 0 {
+            return 0;
+        }
         trace!(target: "sync", "Sending NewHashes to {:?}", peers);
         let last_parent = *io.chain().best_block_header().parent_hash();
         let best_block_hash = chain_info.best_block_hash;
@@ -226,14 +232,15 @@ impl ChainSync {
             let peer_info = self.peers.get_mut(&peer_id)
                 .expect("peer_id is form peers; peers is result of select_peers_for_transactions; select_peers_for_transactions selects peers from self.peers; qed");
 
-            warn!(target: "sync", "peer_info.protocol_version: {:?}", peer_info.protocol_version);
-
             let mut id: Option<ethereum_types::H512> = None;
             let mut is_hashes = false;
 
             if let Some(session_info) = io.peer_session_info(peer_id) {
                 is_hashes = session_info.is_pooled_transactions_capable();
                 id = session_info.id;
+            } else {
+                warn!(target: "sync", "no peer session info available: could not detect if peer is capable of eip-2464 transaction gossiping");
+                continue;
             }
 
             // Send all transactions, if the peer doesn't know about anything