aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-02-08 12:55:27 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-02-08 12:56:00 +0000
commit3627e53aab9dd161568513e12c8507ce3b9ea655 (patch)
tree85624c8bc4df910ad60c952a98c6591d700a46cd
parentMerge pull request #6184 (diff)
downloadmonero-3627e53aab9dd161568513e12c8507ce3b9ea655.tar.xz
rpc: fix print_pool_sh not finding local txes
-rw-r--r--src/rpc/core_rpc_server.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index e92ae7c08..7c1be7512 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -782,6 +782,9 @@ namespace cryptonote
CHECK_PAYMENT_MIN1(req, res, req.txs_hashes.size() * COST_PER_TX, false);
+ const bool restricted = m_restricted && ctx;
+ const bool request_has_rpc_origin = ctx != NULL;
+
std::vector<crypto::hash> vh;
for(const auto& tx_hex_str: req.txs_hashes)
{
@@ -816,7 +819,7 @@ namespace cryptonote
{
std::vector<tx_info> pool_tx_info;
std::vector<spent_key_image_info> pool_key_image_info;
- bool r = m_core.get_pool_transactions_and_spent_keys_info(pool_tx_info, pool_key_image_info);
+ bool r = m_core.get_pool_transactions_and_spent_keys_info(pool_tx_info, pool_key_image_info, !request_has_rpc_origin || !restricted);
if(r)
{
// sort to match original request