Merge pull request #797

d662ab5 rpc: print human readable time since received when printing pool (moneromooo-monero)
5c9dd23 rpc: add a do_not_relay boolean to tx submission (moneromooo-monero)

src/daemon/rpc_command_executor.cpp

@@ -70,6 +70,23 @@ namespace {
       << "difficulty: " << boost::lexical_cast<std::string>(header.difficulty) << std::endl
       << "reward: " << boost::lexical_cast<std::string>(header.reward);
   }
+
+  std::string get_human_time_ago(time_t t, time_t now)
+  {
+    if (t == now)
+      return "now";
+    time_t dt = t > now ? t - now : now - t;
+    std::string s;
+    if (dt < 90)
+      s = boost::lexical_cast<std::string>(dt) + " seconds";
+    else if (dt < 90 * 60)
+      s = boost::lexical_cast<std::string>(dt/60) + " minutes";
+    else if (dt < 36 * 3600)
+      s = boost::lexical_cast<std::string>(dt/3600) + " hours";
+    else
+      s = boost::lexical_cast<std::string>(dt/(3600*24)) + " days";
+    return s + " " + (t > now ? "in the future" : "ago");
+  }
 }
 
 t_rpc_command_executor::t_rpc_command_executor(
@@ -679,6 +696,7 @@ bool t_rpc_command_executor::print_transaction_pool_long() {
   }
   if (! res.transactions.empty())
   {
+    const time_t now = time(NULL);
     tools::msg_writer() << "Transactions: ";
     for (auto & tx_info : res.transactions)
     {
@@ -686,7 +704,7 @@ bool t_rpc_command_executor::print_transaction_pool_long() {
                           << tx_info.tx_json << std::endl
                           << "blob_size: " << tx_info.blob_size << std::endl
                           << "fee: " << cryptonote::print_money(tx_info.fee) << std::endl
-                          << "receive_time: " << tx_info.receive_time << std::endl
+                          << "receive_time: " << tx_info.receive_time << " (" << get_human_time_ago(tx_info.receive_time, now) << ")" << std::endl
                           << "kept_by_block: " << (tx_info.kept_by_block ? 'T' : 'F') << std::endl
                           << "max_used_block_height: " << tx_info.max_used_block_height << std::endl
                           << "max_used_block_id: " << tx_info.max_used_block_id_hash << std::endl
@@ -757,18 +775,22 @@ bool t_rpc_command_executor::print_transaction_pool_short() {
   {
     tools::msg_writer() << "Pool is empty" << std::endl;
   }
+  else
+  {
+    const time_t now = time(NULL);
     for (auto & tx_info : res.transactions)
     {
       tools::msg_writer() << "id: " << tx_info.id_hash << std::endl
                           << "blob_size: " << tx_info.blob_size << std::endl
                           << "fee: " << cryptonote::print_money(tx_info.fee) << std::endl
-                        << "receive_time: " << tx_info.receive_time << std::endl
+                          << "receive_time: " << tx_info.receive_time << " (" << get_human_time_ago(tx_info.receive_time, now) << ")" << std::endl
                           << "kept_by_block: " << (tx_info.kept_by_block ? 'T' : 'F') << std::endl
                           << "max_used_block_height: " << tx_info.max_used_block_height << std::endl
                           << "max_used_block_id: " << tx_info.max_used_block_id_hash << std::endl
                           << "last_failed_height: " << tx_info.last_failed_height << std::endl
                           << "last_failed_id: " << tx_info.last_failed_id_hash << std::endl;
     }
+  }
 
   return true;
 }

src/rpc/core_rpc_server.cpp

@@ -407,7 +407,7 @@ namespace cryptonote
       return true;
     }
 
-    if(!tvc.m_should_be_relayed)
+    if(!tvc.m_should_be_relayed || req.do_not_relay)
     {
       LOG_PRINT_L0("[on_send_raw_tx]: tx accepted, but not relayed");
       res.reason = "Not relayed";

src/rpc/core_rpc_server_commands_defs.h

@@ -244,12 +244,14 @@ namespace cryptonote
     struct request
     {
       std::string tx_as_hex;
+      bool do_not_relay;
 
       request() {}
       explicit request(const transaction &);
 
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(tx_as_hex)
+        KV_SERIALIZE(do_not_relay)
       END_KV_SERIALIZE_MAP()
     };
 

src/wallet/wallet2.cpp

@@ -1974,6 +1974,7 @@ void wallet2::commit_tx(pending_tx& ptx)
 
   COMMAND_RPC_SEND_RAW_TX::request req;
   req.tx_as_hex = epee::string_tools::buff_to_hex_nodelimer(tx_to_blob(ptx.tx));
+  req.do_not_relay = false;
   COMMAND_RPC_SEND_RAW_TX::response daemon_send_resp;
   m_daemon_rpc_mutex.lock();
   bool r = epee::net_utils::invoke_http_json_remote_command2(m_daemon_address + "/sendrawtransaction", req, daemon_send_resp, m_http_client, 200000);