diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-05-06 08:00:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-05-06 08:09:31 +0200 |
| commit | 8005a0c7a17a0e41c4df053d71c7148bf30af378 (patch) | |
| tree | d21ffd56f1aee6ddf60ce7ea75aa597f06d53046 /src/rpc/core_rpc_server.cpp | |
| parent | 9598a39578268bff1d863fc01a25d5d045e98a1d (diff) | |
| parent | 641d824f372569046811a2a8ad3cec175280f726 (diff) | |
| download | monzero-core-8005a0c7a17a0e41c4df053d71c7148bf30af378.tar.gz monzero-core-8005a0c7a17a0e41c4df053d71c7148bf30af378.tar.xz monzero-core-8005a0c7a17a0e41c4df053d71c7148bf30af378.zip | |
Merge pull request #269
641d824 Keep memory pool consistent when stuck tx removed (warptangent)
b76857f Add mempool output to daemon via command and RPC (warptangent)
Diffstat (limited to 'src/rpc/core_rpc_server.cpp')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 8eeac489d..561161950 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -401,10 +401,8 @@ namespace cryptonote //------------------------------------------------------------------------------------------------------------------------------ bool core_rpc_server::on_get_transaction_pool(const COMMAND_RPC_GET_TRANSACTION_POOL::request& req, COMMAND_RPC_GET_TRANSACTION_POOL::response& res) { - /* CHECK_CORE_BUSY(); - res.transactions = m_core.transaction_pool_info(); - */ + m_core.get_pool_transactions_and_spent_keys_info(res.transactions, res.spent_key_images); res.status = CORE_RPC_STATUS_OK; return true; } |