Merge pull request DMDcoin#297 from SurfingNerd/log-improvements

Logging & Phoenix Protocol improvements

Author: SurfingNerd

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## Diamond Node Software 0.12.8
+
+- [Phoenix Protocol](https://github.com/DMDcoin/openethereum-3.x/issues/52)
+
 ## Diamond Node Software 0.12.7
 
 - [hbbft key generation: double transactions / missing transactions](https://github.com/DMDcoin/diamond-node/issues/290)

Cargo.lock

@@ -2,7 +2,7 @@
 description = "Diamond Node"
 name = "diamond-node"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "0.12.7"
+version = "0.12.8"
 license = "GPL-3.0"
 authors = [
 	"bit.diamonds developers",

Cargo.toml

@@ -6,7 +6,7 @@ Node client for the protocol version 4 of the bit.diamonds network.
 
 [license-badge]: https://img.shields.io/badge/license-GPL_v3-green.svg
 [license-url]: LICENSE
-[chat-url]: (https://dmdcoin.slack.com/)
+[chat-url]: (https://discord.com/invite/MwqZ2CYcB4)
 
 ## Table of Contents
 

README.md

@@ -496,9 +496,13 @@ impl HoneyBadgerBFT {
     /// Retry recovery every n*PHOENIX_DEFER_AFTER_SECS by deferring and resetting,
     /// and resume sending messages every n*PHOENIX_DEFER_AFTER_SECS + PHOENIX_RESUME_AFTER_SECS.
     fn handle_phoenix_recovery_protocol(&self) {
+        if self.hbbft_state.read().is_validator() {
+            return;
+        }
+
         if let Some(client) = self.client_arc() {
             // Skip if still syncing.
-            if self.is_syncing(&client) {
+            if self.is_major_syncing(&client) {
                 return;
             }
 
@@ -1405,6 +1409,14 @@ impl HoneyBadgerBFT {
         }
     }
 
+    fn is_major_syncing(&self, client: &Arc<dyn EngineClient>) -> bool {
+        match client.as_full_client() {
+            Some(full_client) => full_client.is_major_syncing(),
+            // We only support full clients at this point.
+            None => true,
+        }
+    }
+
     /** returns if the signer of hbbft is tracked as available in the hbbft contracts..*/
     pub fn is_available(&self) -> bool {
         self.hbbft_engine_cache.lock().is_available()

crates/ethcore/src/engines/hbbft/hbbft_engine.rs

@@ -298,7 +298,9 @@ impl HbbftPeersManagement {
                 }
             }
 
-            info!(target: "engine", "removed {} peers from reserved peers management.", removed.len());
+            if removed.len() > 0 {
+                info!(target: "engine", "removed {} peers from reserved peers management.", removed.len());
+            }
         }
 
         // regardless of disconnect problems here, we clear all the data here.

crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs

@@ -1,7 +1,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
-version = "0.12.7"
+version = "0.12.8"
 authors = [
 	"bit.diamonds developers",
 	"OpenEthereum developers",