monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpc: Fix get_transactions failing when not found

Browse source
This commit is contained in:
Nathan Dorfman 2021-09-20 14:15:59 -06:00
parent a39b1d56c8
commit 2e8936f614
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/rpc/core_rpc_server.cpp
View file

@ -972,14 +972,26 @@ namespace cryptonote
LOG_PRINT_L2("Found " << found_in_pool << "/" << vh.size() << " transactions in the pool"); LOG_PRINT_L2("Found " << found_in_pool << "/" << vh.size() << " transactions in the pool");
} }
std::vector<std::string>::const_iterator txhi = req.txs_hashes.begin(); CHECK_AND_ASSERT_MES(txs.size() + missed_txs.size() == vh.size(), false, "mismatched number of txs");
std::vector<crypto::hash>::const_iterator vhi = vh.begin();
auto txhi = req.txs_hashes.cbegin();
auto vhi = vh.cbegin();
auto missedi = missed_txs.cbegin();
for(auto& tx: txs) for(auto& tx: txs)
{ {
res.txs.push_back(COMMAND_RPC_GET_TRANSACTIONS::entry()); res.txs.push_back(COMMAND_RPC_GET_TRANSACTIONS::entry());
COMMAND_RPC_GET_TRANSACTIONS::entry &e = res.txs.back(); COMMAND_RPC_GET_TRANSACTIONS::entry &e = res.txs.back();
while (missedi != missed_txs.end() && *missedi == *vhi)
{
++vhi;
++txhi;
++missedi;
}
crypto::hash tx_hash = *vhi++; crypto::hash tx_hash = *vhi++;
CHECK_AND_ASSERT_MES(tx_hash == std::get<0>(tx), false, "mismatched tx hash");
e.tx_hash = *txhi++; e.tx_hash = *txhi++;
e.prunable_hash = epee::string_tools::pod_to_hex(std::get<2>(tx)); e.prunable_hash = epee::string_tools::pod_to_hex(std::get<2>(tx));
if (req.split || req.prune || std::get<3>(tx).empty()) if (req.split || req.prune || std::get<3>(tx).empty())