Merge pull request #6268

a6c24412 wallet: fix exceptions getting the hash of a pruned tx (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-03-12 01:02:31 -07:00
commit d500bbe68f
No known key found for this signature in database
GPG key ID: C64552D877C32479
4 changed files with 13 additions and 13 deletions

View file

@ -2471,7 +2471,7 @@ namespace tools
if (req.pool)
{
std::vector<std::pair<cryptonote::transaction, bool>> process_txs;
std::vector<std::tuple<cryptonote::transaction, crypto::hash, bool>> process_txs;
m_wallet->update_pool_state(process_txs);
if (!process_txs.empty())
m_wallet->process_pool_state(process_txs);
@ -2554,7 +2554,7 @@ namespace tools
}
}
std::vector<std::pair<cryptonote::transaction, bool>> process_txs;
std::vector<std::tuple<cryptonote::transaction, crypto::hash, bool>> process_txs;
m_wallet->update_pool_state(process_txs);
if (!process_txs.empty())
m_wallet->process_pool_state(process_txs);