Merge pull request #330 from SurfingNerd/i172-service-transactions-garbage-collector

v4.0.2-rc3

Author: SurfingNerd

CHANGELOG.md

@@ -9,11 +9,12 @@
 ### RPC
 - [Gas price from contracts](https://github.com/DMDcoin/diamond-node/issues/159)
 
-### Further stability improvements
+### Further improvements
 - [FIXED: received transactions are getting pooled, if announced by another peer](https://github.com/DMDcoin/diamond-node/issues/304)
 - [FIXED: dropped transactions are getting pooled](https://github.com/DMDcoin/diamond-node/issues/303)
 - [FIXED: key generation can panic if faulty validators write malicious parts](https://github.com/DMDcoin/diamond-node/issues/100)
 - [FIXED: already included transactions are refretched from peers](https://github.com/DMDcoin/diamond-node/issues/196)
+- [FIXED:not staked nodes write log entries about service transactions](https://github.com/DMDcoin/diamond-node/issues/323)
 - [Gracefull Node Shutdown: increase to 15 seconds](https://github.com/DMDcoin/diamond-node/issues/321)
 
 

Cargo.lock

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

Cargo.toml

@@ -1211,12 +1211,10 @@ impl HoneyBadgerBFT {
                     return Ok(());
                 }
 
-                self.hbbft_peers_service
-                    .channel()
-                    .send(HbbftConnectToPeersMessage::AnnounceAvailability)?;
-
-                self.hbbft_peers_service
-                    .send_message(HbbftConnectToPeersMessage::AnnounceOwnInternetAddress)?;
+                if self.is_staked() {
+                    self.hbbft_peers_service.send_message(HbbftConnectToPeersMessage::AnnounceAvailability)?;
+                    self.hbbft_peers_service.send_message(HbbftConnectToPeersMessage::AnnounceOwnInternetAddress)?;
+                }
 
                 if self.should_connect_to_validator_set() {
                     // we just keep those variables here, because we need them in the early_epoch_end_manager.

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

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