Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2816 

a17b8233 wallet2 bugfix: loading old m_unconfirmed_payments (stoffu)
This commit is contained in:
Riccardo Spagni 2017-11-15 10:48:09 +02:00
parent 0ddf3b6c75 a17b8233da
commit 2751a477d8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/wallet2.h
View File

@ -610,14 +610,13 @@ namespace tools
a & m_address_book; a & m_address_book;
if(ver < 17) if(ver < 17)
return; return;
if (ver < 21) if (ver < 22)
{ {
// we're loading an old version, where m_unconfirmed_payments payload was payment_details // we're loading an old version, where m_unconfirmed_payments payload was payment_details
std::unordered_map<crypto::hash, payment_details> m; std::unordered_multimap<crypto::hash, payment_details> m;
a & m; a & m;
for (const auto &i: m) for (const auto &i: m)
m_unconfirmed_payments.insert(std::make_pair(i.first, pool_payment_details{i.second, false})); m_unconfirmed_payments.insert(std::make_pair(i.first, pool_payment_details{i.second, false}));
return;
} }
if(ver < 18) if(ver < 18)
return; return;