rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-12-02 03:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6325

Browse source 
3627e53 rpc: fix print_pool_sh not finding local txes (moneromooo-monero)
This commit is contained in:
luigi1111 2020-03-31 15:13:51 -05:00
commit 94f44d4ee3
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rpc/core_rpc_server.cpp
View file

@ -791,6 +791,9 @@ namespace cryptonote
CHECK_PAYMENT_MIN1(req, res, req.txs_hashes.size() * COST_PER_TX, false); 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; std::vector<crypto::hash> vh;
for(const auto& tx_hex_str: req.txs_hashes) for(const auto& tx_hex_str: req.txs_hashes)
{ {
@ -825,7 +828,7 @@ namespace cryptonote
{ {
std::vector<tx_info> pool_tx_info; std::vector<tx_info> pool_tx_info;
std::vector<spent_key_image_info> pool_key_image_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) if(r)
{ {
// sort to match original request // sort to match original request