Builds/wownero
1
0
Fork 0
forked from such-gitea/wownero
Code Pull Requests Actions Releases 3 Activity

wallet2: fix subaddress fields serialization

Browse Source 
When loading an older wallet cache, they wouldn't be initialized,
leading them to have random(ish) values, and so assigned to some
random subaddress.
This commit is contained in:
moneromooo-monero
2017-10-23 11:53:49 +01:00
parent 8d511f3c24
commit ca87cbd852
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wallet/wallet2.h
View File

@@ -1042,7 +1042,10 @@ namespace boost
x.m_amount_out += x.m_change; x.m_amount_out += x.m_change;
} }
if (ver < 7) if (ver < 7)
{
x.m_subaddr_account = 0;
return; return;
}
a & x.m_subaddr_account; a & x.m_subaddr_account;
a & x.m_subaddr_indices; a & x.m_subaddr_indices;
} }
@@ -1083,7 +1086,10 @@ namespace boost
} }
a & x.m_unlock_time; a & x.m_unlock_time;
if (ver < 5) if (ver < 5)
{
x.m_subaddr_account = 0;
return; return;
}
a & x.m_subaddr_account; a & x.m_subaddr_account;
a & x.m_subaddr_indices; a & x.m_subaddr_indices;
} }
@@ -1099,7 +1105,10 @@ namespace boost
return; return;
a & x.m_timestamp; a & x.m_timestamp;
if (ver < 2) if (ver < 2)
{
x.m_subaddr_index = {};
return; return;
}
a & x.m_subaddr_index; a & x.m_subaddr_index;
} }
@@ -1110,7 +1119,10 @@ namespace boost
a & x.m_payment_id; a & x.m_payment_id;
a & x.m_description; a & x.m_description;
if (ver < 17) if (ver < 17)
{
x.m_is_subaddress = false;
return; return;
}
a & x.m_is_subaddress; a & x.m_is_subaddress;
} }
@@ -1140,7 +1152,10 @@ namespace boost
a & x.use_rct; a & x.use_rct;
a & x.dests; a & x.dests;
if (ver < 1) if (ver < 1)
{
x.subaddr_account = 0;
return; return;
}
a & x.subaddr_account; a & x.subaddr_account;
a & x.subaddr_indices; a & x.subaddr_indices;
} }