fix(transaction_pool/candidates): candidate not added if we have received same candidate from another peer

Author: binier

node/src/transaction_pool/candidate/transaction_pool_candidate_actions.rs

@@ -60,9 +60,12 @@ pub enum TransactionPoolCandidateAction {
 impl redux::EnablingCondition<crate::State> for TransactionPoolCandidateAction {
     fn is_enabled(&self, state: &crate::State, _time: redux::Timestamp) -> bool {
         match self {
-            TransactionPoolCandidateAction::InfoReceived { info, .. } => {
+            TransactionPoolCandidateAction::InfoReceived { peer_id, info } => {
                 !state.transaction_pool.contains(&info.hash)
-                    && !state.transaction_pool.candidates.contains(&info.hash)
+                    && !state
+                        .transaction_pool
+                        .candidates
+                        .peer_contains(*peer_id, &info.hash)
             }
             TransactionPoolCandidateAction::FetchAll => state.p2p.ready().is_some(),
             TransactionPoolCandidateAction::FetchInit { peer_id, hash } => {

node/src/transaction_pool/candidate/transaction_pool_candidate_state.rs

@@ -68,6 +68,12 @@ impl TransactionPoolCandidatesState {
         self.by_hash.contains_key(hash)
     }
 
+    pub fn peer_contains(&self, peer_id: PeerId, hash: &TransactionHash) -> bool {
+        self.by_peer
+            .get(&peer_id)
+            .map_or(false, |txs| txs.contains_key(hash))
+    }
+
     pub fn get(
         &self,
         peer_id: PeerId,

node/src/transaction_pool/transaction_pool_reducer.rs

@@ -249,7 +249,7 @@ impl TransactionPoolState {
                         (rpc_action, accepted, rejected)
                     }
                     Err(e) => {
-                        bug_condition!("unsafe_apply error: {:?}", e);
+                        crate::core::warn!(meta.time(); kind = "TransactionPoolUnsafeApplyError", summary = e);
                         return;
                     }
                 };