mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-24 21:34:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6288

Browse Source 
0349347e ringdb: use a different iv for key and data in rings table (moneromooo-monero)
7b882087 simplewallet: reword mixin in user message in terms of ring size (moneromooo-monero)
f507a43a wallet2: do not remove known rings when a tx fails (moneromooo-monero)
This commit is contained in:
Alexander Blair
2020-03-27 12:23:58 -07:00
parent 7d4a93fab3 0349347e6d
commit 5ba6eef272
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/wallet2.cpp
View File

@@ -2934,7 +2934,6 @@ void wallet2::update_pool_state(std::vector<std::tuple<cryptonote::transaction,
pit->second.m_state = wallet2::unconfirmed_transfer_details::failed;
// the inputs aren't spent anymore, since the tx failed
remove_rings(pit->second.m_tx);
for (size_t vini = 0; vini < pit->second.m_tx.vin.size(); ++vini)
{
if (pit->second.m_tx.vin[vini].type() == typeid(txin_to_key))