Merge pull request #1247

10a79ea daemon: report transaction relay status in print_pool* commands (moneromooo-monero)
1e16366 core: notify the txpool when transactions are relayed (moneromooo-monero)
f3c374f tx_pool: set relayed flag on relay (moneromooo-monero)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 178cbda3c..dba05a539 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -387,7 +387,10 @@ namespace cryptonote
     {
       auto i = m_transactions.find(it->first);
       if (i != m_transactions.end())
+      {
+        i->second.relayed = true;
         i->second.last_relayed_time = now;
+      }
     }
   }
   //---------------------------------------------------------------------------------
@@ -422,6 +425,8 @@ namespace cryptonote
       txi.last_failed_height = txd.last_failed_height;
       txi.last_failed_id_hash = epee::string_tools::pod_to_hex(txd.last_failed_id);
       txi.receive_time = txd.receive_time;
+      txi.relayed = txd.relayed;
+      txi.last_relayed_time = txd.last_relayed_time;
       tx_infos.push_back(txi);
     }