Client supports now to query the Status of local transactions.

+ Log Level adjustments

Author: SurfingNerd

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

@@ -41,6 +41,8 @@ use crate::pool::{
     verifier, PendingOrdering, PendingSettings, PrioritizationStrategy,
 };
 
+use super::local_transactions;
+
 type Listener = (
     LocalTransactionsList,
     (listener::Notifier, listener::Logger),
@@ -546,6 +548,17 @@ impl TransactionQueue {
         )
     }
 
+    /// Returns status of a local transaction by its hash.
+    pub fn local_transaction_status(&self, tx_hash: &H256) -> Option<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/ethcore/src/client/client.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> {

crates/ethcore/src/engines/hbbft/contracts/validator_set.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/hbbft_peers_management.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;
     }

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

@@ -440,6 +440,13 @@ impl KeygenTransactionSender {
         // it could trigger in a scenario where a service transaction was just sent,
         // is getting included by other nodes, but this one does not know about it yet,
         // sending a Nonce that is to small.
+        // if a transaction gets replaced, "own_tx  Transaction culled" happens,
+        // in this case we there are signs, that our key gen transaction was not included,
+        // and we might need to resend it.
+        // currently there is no "observer" available, to observe culled transactions,
+        // local_transactions frequently deletes outdated transactions.
+        // however: we could check if the transaction is neither available in the service transaction pool,
+        // nor available as included transaction.
         // A better ServiceTransactionManager could be implemented to handle this more gracefully.
 
         let nonce = full_client

crates/ethcore/src/miner/miner.rs

@@ -1484,6 +1484,10 @@ impl miner::MinerService for Miner {
             .expect("remove() returns one result per hash; one hash passed; qed")
     }
 
+    fn local_transaction_status(&self, hash: &H256) -> Option<pool::local_transactions::Status> {
+        self.transaction_queue.local_transaction_status(hash)
+    }
+
     fn queue_status(&self) -> QueueStatus {
         self.transaction_queue.status()
     }

crates/ethcore/src/miner/mod.rs

@@ -46,7 +46,10 @@ use crate::types::{
     transaction::{self, PendingTransaction, SignedTransaction, UnverifiedTransaction},
 };
 use bytes::Bytes;
-use ethcore_miner::pool::{QueueStatus, VerifiedTransaction, local_transactions};
+use ethcore_miner::pool::{
+    QueueStatus, VerifiedTransaction,
+    local_transactions::{self, Status},
+};
 use ethereum_types::{Address, H256, U256};
 
 use crate::{
@@ -287,4 +290,7 @@ pub trait MinerService: Send + Sync {
     /// Set a new minimum gas limit.
     /// Will not work if dynamic gas calibration is set.
     fn set_minimal_gas_price(&self, gas_price: U256) -> Result<bool, &str>;
+
+    /// Get the status of a local transaction by its hash.
+    fn local_transaction_status(&self, hash: &H256) -> Option<Status>;
 }

crates/rpc/src/v1/tests/helpers/miner_service.rs

@@ -286,6 +286,10 @@ impl MinerService for TestMinerService {
             .collect()
     }
 
+    fn local_transaction_status(&self, tx_hash: &H256) -> Option<LocalTransactionStatus> {
+        self.local_transactions.lock().get(tx_hash).cloned()
+    }
+
     fn ready_transactions_filtered<C: ethcore::client::BlockChain>(
         &self,
         chain: &C,