aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/cryptonote_core.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-05-06 08:00:07 +0200
committerRiccardo Spagni <ric@spagni.net>2015-05-06 08:09:31 +0200
commit8005a0c7a17a0e41c4df053d71c7148bf30af378 (patch)
treed21ffd56f1aee6ddf60ce7ea75aa597f06d53046 /src/cryptonote_core/cryptonote_core.cpp
parent9598a39578268bff1d863fc01a25d5d045e98a1d (diff)
parent641d824f372569046811a2a8ad3cec175280f726 (diff)
downloadmonzero-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/cryptonote_core/cryptonote_core.cpp')
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 78d034e7a..a5517e011 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -658,6 +658,11 @@ namespace cryptonote
return true;
}
//-----------------------------------------------------------------------------------------------
+ bool core::get_pool_transactions_and_spent_keys_info(std::vector<tx_info>& tx_infos, std::vector<spent_key_image_info>& key_image_infos) const
+ {
+ return m_mempool.get_transactions_and_spent_keys_info(tx_infos, key_image_infos);
+ }
+ //-----------------------------------------------------------------------------------------------
bool core::get_short_chain_history(std::list<crypto::hash>& ids)
{
return m_blockchain_storage.get_short_chain_history(ids);