gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-01 23:40:03 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5446

Browse Source 
7d79222f daemon: remove debug info (moneromooo-monero)
8fec0f98 functional_tests: add sweep_single test (moneromooo-monero)
9880d61b wallet_rpc_server: remove unused code (moneromooo-monero)
8a61b33d rpc: omit irrelevant fields for pool txes in gettransactions (moneromooo-monero)
56508524 rpc: add relayed in get_transaction output (moneromooo-monero)
82e510f1 rpc: set default log category in core_rpc_server.h (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2019-04-16 22:46:29 +02:00
parent e98cbfbdfe 7d79222f5c
commit f376cd5605
7 changed files with 96 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/core_rpc_server.cpp
View File

@@ -575,7 +575,7 @@ namespace cryptonote
// try the pool for any missing txes
size_t found_in_pool = 0;
std::unordered_set<crypto::hash> pool_tx_hashes;
std::unordered_map<crypto::hash, bool> double_spend_seen;
std::unordered_map<crypto::hash, tx_info> per_tx_pool_tx_info;
if (!missed_txs.empty())
{
std::vector<tx_info> pool_tx_info;
@@ -630,7 +630,7 @@ namespace cryptonote
{
if (ti.id_hash == hash_string)
{
double_spend_seen.insert(std::make_pair(h, ti.double_spend_seen));
per_tx_pool_tx_info.insert(std::make_pair(h, ti));
break;
}
}
@@ -716,14 +716,17 @@ namespace cryptonote
if (e.in_pool)
{
e.block_height = e.block_timestamp = std::numeric_limits<uint64_t>::max();
if (double_spend_seen.find(tx_hash) != double_spend_seen.end())
auto it = per_tx_pool_tx_info.find(tx_hash);
if (it != per_tx_pool_tx_info.end())
{
e.double_spend_seen = double_spend_seen[tx_hash];
e.double_spend_seen = it->second.double_spend_seen;
e.relayed = it->second.relayed;
}
else
{
MERROR("Failed to determine double spend status for " << tx_hash);
MERROR("Failed to determine pool info for " << tx_hash);
e.double_spend_seen = false;
e.relayed = false;
}
}
else
@@ -731,6 +734,7 @@ namespace cryptonote
e.block_height = m_core.get_blockchain_storage().get_db().get_tx_block_height(tx_hash);
e.block_timestamp = m_core.get_blockchain_storage().get_db().get_block_timestamp(e.block_height);
e.double_spend_seen = false;
e.relayed = false;
}
// fill up old style responses too, in case an old wallet asks