Merge pull request #630

bf6d147 new flush_txpool command, and associated RPC call (moneromooo-monero)
6288295 rpc: add missing return on error when getting a tx (moneromooo-monero)
b7e37b7 simplewallet: show_transfers can now show just failed txes (moneromooo-monero)
b11539f wallet: detect and handle failed outgoing transfers (moneromooo-monero)
4b23714 tx_pool: serialize missing kept_by_block flag (moneromooo-monero)

1 files changed, 11 insertions, 0 deletions

diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h
index ad475a03a..10d27651f 100644
--- a/src/wallet/wallet_errors.h
+++ b/src/wallet/wallet_errors.h
@@ -61,6 +61,7 @@ namespace tools
     //         get_blocks_error
     //         get_out_indexes_error
     //         tx_parse_error
+    //         get_tx_pool_error
     //       transfer_error *
     //         get_random_outs_general_error
     //         not_enough_money
@@ -307,6 +308,16 @@ namespace tools
       cryptonote::blobdata m_tx_blob;
     };
     //----------------------------------------------------------------------------------------------------
+    struct get_tx_pool_error : public refresh_error
+    {
+      explicit get_tx_pool_error(std::string&& loc)
+        : refresh_error(std::move(loc), "error getting tranaction pool")
+      {
+      }
+
+      std::string to_string() const { return refresh_error::to_string(); }
+    };
+    //----------------------------------------------------------------------------------------------------
     struct transfer_error : public wallet_logic_error
     {
     protected: