Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6882

Browse Source 
fcbfb0a00 wallet2: fix missing m_state field in wallet serialization (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-10-18 23:25:32 -07:00
commit 142489bd60
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.h
View File

@ -434,7 +434,7 @@ private:
std::vector<std::pair<crypto::key_image, std::vector<uint64_t>>> m_rings; // relative std::vector<std::pair<crypto::key_image, std::vector<uint64_t>>> m_rings; // relative
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
VERSION_FIELD(0) VERSION_FIELD(1)
FIELD(m_tx) FIELD(m_tx)
VARINT_FIELD(m_amount_in) VARINT_FIELD(m_amount_in)
VARINT_FIELD(m_amount_out) VARINT_FIELD(m_amount_out)
@ -442,6 +442,8 @@ private:
VARINT_FIELD(m_sent_time) VARINT_FIELD(m_sent_time)
FIELD(m_dests) FIELD(m_dests)
FIELD(m_payment_id) FIELD(m_payment_id)
if (version >= 1)
VARINT_FIELD(m_state)
VARINT_FIELD(m_timestamp) VARINT_FIELD(m_timestamp)
VARINT_FIELD(m_subaddr_account) VARINT_FIELD(m_subaddr_account)
FIELD(m_subaddr_indices) FIELD(m_subaddr_indices)