Merge pull request #295 from DMDcoin/0.12

v0.12.7

Author: SurfingNerd

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## Diamond Node Software 0.12.7
+
+- [hbbft key generation: double transactions / missing transactions](https://github.com/DMDcoin/diamond-node/issues/290)
+
 ## Diamond Node Software 0.12.6
 
 - reduced Trace Log output for tracing devp2p propagation

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.6"
+version = "0.12.7"
 license = "GPL-3.0"
 authors = [
 	"bit.diamonds developers",

Cargo.toml

@@ -546,6 +546,20 @@ impl TransactionQueue {
         )
     }
 
+    /// Returns status of a local transaction by its hash.
+    pub fn local_transaction_status(
+        &self,
+        tx_hash: &H256,
+    ) -> Option<crate::pool::local_transactions::Status> {
+        self.pool
+            .read()
+            .listener()
+            .0
+            .all_transactions()
+            .get(tx_hash)
+            .cloned()
+    }
+
     /// Collect pending transactions.
     ///
     /// NOTE This is re-computing the pending set and it might be expensive to do so.

crates/concensus/miner/src/pool/queue.rs

@@ -89,7 +89,7 @@ use ansi_term::Colour;
 use bytes::{Bytes, ToPretty};
 use call_contract::{CallContract, RegistryInfo};
 use db::{DBTransaction, DBValue, KeyValueDB};
-use ethcore_miner::pool::VerifiedTransaction;
+use ethcore_miner::pool::{VerifiedTransaction, local_transactions::Status};
 use ethereum_types::{Address, H256, H264, H512, U256};
 use hash::keccak;
 use itertools::Itertools;
@@ -1410,6 +1410,16 @@ impl Client {
         }
     }
 
+    /// Get local transactions from the miner.
+    pub fn local_transactions(&self) -> BTreeMap<H256, Status> {
+        self.importer.miner.local_transactions()
+    }
+
+    /// Get local transactions from the miner.
+    pub fn local_transaction_status(&self, tx_hash: &H256) -> Option<Status> {
+        self.importer.miner.local_transaction_status(tx_hash)
+    }
+
     /// Get shared miner reference.
     #[cfg(test)]
     pub fn miner(&self) -> Arc<Miner> {
@@ -3360,6 +3370,11 @@ impl super::traits::EngineClient for Client {
             .miner
             .create_pending_block_at(self, txns, timestamp, block_number)
     }
+
+    /// Get local transactions from the miner.
+    fn local_transaction_status(&self, tx_hash: &H256) -> Option<Status> {
+        self.importer.miner.local_transaction_status(tx_hash)
+    }
 }
 
 impl ProvingBlockChainClient for Client {

crates/ethcore/src/client/client.rs

@@ -48,7 +48,7 @@ use crate::{
 use bytes::Bytes;
 use crypto::publickey::{Generator, Random};
 use db::{COL_STATE, NUM_COLUMNS};
-use ethcore_miner::pool::VerifiedTransaction;
+use ethcore_miner::pool::{VerifiedTransaction, local_transactions::Status};
 use ethereum_types::{Address, H256, H512, U256};
 use ethtrie;
 use hash::keccak;
@@ -1274,6 +1274,10 @@ impl super::traits::EngineClient for TestBlockChainClient {
     }
 
     fn demand_shutdown(&self) {}
+
+    fn local_transaction_status(&self, tx_hash: &H256) -> Option<Status> {
+        self.miner.local_transaction_status(tx_hash)
+    }
 }
 
 impl PrometheusMetrics for TestBlockChainClient {

crates/ethcore/src/client/test_client.rs

@@ -45,7 +45,7 @@ use crate::{
 };
 use bytes::Bytes;
 use call_contract::{CallContract, RegistryInfo};
-use ethcore_miner::pool::VerifiedTransaction;
+use ethcore_miner::pool::{VerifiedTransaction, local_transactions::Status};
 use ethereum_types::{Address, H256, H512, U256};
 use evm::Schedule;
 use itertools::Itertools;
@@ -707,6 +707,12 @@ pub trait EngineClient: Sync + Send + ChainInfo {
     fn config_shutdown_on_missing_block_import(&self) -> Option<u64> {
         None
     }
+
+    /// Get local transaction status.
+    /// Note that already included transactions might be not available here anymore.
+    /// As well as transactions that were culled, replaced, dropped or whatever,
+    /// do not exist forever in the memory.
+    fn local_transaction_status(&self, tx_hash: &H256) -> Option<Status>;
 }
 
 /// Extended client interface for providing proofs of the state.

crates/ethcore/src/client/traits.rs

@@ -81,7 +81,7 @@ pub fn is_pending_validator(
     call_const_validator!(c, is_pending_validator, staking_address.clone())
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Debug)]
 pub enum KeyGenMode {
     WritePart,
     WriteAck,

crates/ethcore/src/engines/hbbft/contracts/validator_set.rs

@@ -461,7 +461,7 @@ impl HoneyBadgerBFT {
         let engine = Arc::new(HoneyBadgerBFT {
             transition_service: IoService::<()>::start("Hbbft", 4)?,
             hbbft_peers_service: IoService::<HbbftConnectToPeersMessage>::start(
-                "peers_management",
+                "hbbftp", /* hbbft peers (we use 6 letter acronyms for nice log file layout.) */
                 1,
             )?,
             client: Arc::new(RwLock::new(None)),
@@ -484,7 +484,9 @@ impl HoneyBadgerBFT {
             params,
             message_counter: Mutex::new(0), // restore message counter from memory here for RBC ?  */
             random_numbers: RwLock::new(BTreeMap::new()),
-            keygen_transaction_sender: RwLock::new(KeygenTransactionSender::new()),
+            /* Todo: make this configureable
+             */
+            keygen_transaction_sender: RwLock::new(KeygenTransactionSender::new(1, 60000)),
 
             has_connected_to_validator_set: AtomicBool::new(false),
             current_minimum_gas_price: Mutex::new(None),

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

@@ -91,7 +91,7 @@ impl HbbftPeersManagement {
                 ) {
                     connected_current_pending_validators.push(connected_validator);
                 } else {
-                    warn!(target: "Engine", "could not add pending validator to reserved peers: {}", pending_validator_address);
+                    debug!(target: "Engine", "could not add pending validator to reserved peers: {}", pending_validator_address);
                 }
             }
         }
@@ -546,7 +546,7 @@ fn connect_to_validator_core(
     };
 
     if socket_addr.port() == 0 {
-        error!(target: "engine", "connect_to_validator_core: no port specified for Node ( Public (NodeId): {:?} , staking address: {}, socket_addr: {:?}", node_id, staking_address, socket_addr);
+        debug!(target: "engine", "connect_to_validator_core: no port specified for Node ( Public (NodeId): {:?} , staking address: {}, socket_addr: {:?}", node_id, staking_address, socket_addr);
         // we interprate port 0 as NULL.
         return None;
     }