Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-16 12:50:19 -04:00
Code Issues Projects Releases Packages 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
commit 5ba6eef272
No known key found for this signature in database
GPG key ID: C64552D877C32479
3 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/simplewallet/simplewallet.cpp
View file

@ -1691,7 +1691,7 @@ bool simple_wallet::print_ring(const std::vector<std::string> &args)
rings.push_back({key_image, ring});
else if (!m_wallet->get_rings(txid, rings))
{
fail_msg_writer() << tr("Key image either not spent, or spent with mixin 0");
fail_msg_writer() << tr("Key image either not spent, or spent with ring size 1");
return true;
}