diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:13:51 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:13:51 -0500 |
| commit | 94f44d4ee311973527adb0d30e255f815fc5bbbc (patch) | |
| tree | 0f08afb097e81f495f7ad81f4996deea40e8c913 | |
| parent | Merge pull request #6318 (diff) | |
| parent | rpc: fix print_pool_sh not finding local txes (diff) | |
| download | monero-94f44d4ee311973527adb0d30e255f815fc5bbbc.tar.xz | |
Merge pull request #6325
3627e53 rpc: fix print_pool_sh not finding local txes (moneromooo-monero)
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 23ade21a2..8e5207e82 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -791,6 +791,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) { @@ -825,7 +828,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 |