aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-10-13 10:46:37 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-10-13 10:46:37 -0500
commit745d90c4a4f0b7cd6f087d7f547d9faf5c15ebe6 (patch)
tree6204cfc0b4914f53631d4f5b55f2efc835a1a09c
parentMerge pull request #6880 (diff)
parentwallet2: fix missing m_state field in wallet serialization (diff)
downloadmonero-745d90c4a4f0b7cd6f087d7f547d9faf5c15ebe6.tar.xz
Merge pull request #6883
c407b92 wallet2: fix missing m_state field in wallet serialization (moneromooo-monero)
-rw-r--r--src/wallet/wallet2.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index eac99185c..fed7d745c 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -434,7 +434,7 @@ private:
std::vector<std::pair<crypto::key_image, std::vector<uint64_t>>> m_rings; // relative
BEGIN_SERIALIZE_OBJECT()
- VERSION_FIELD(0)
+ VERSION_FIELD(1)
FIELD(m_tx)
VARINT_FIELD(m_amount_in)
VARINT_FIELD(m_amount_out)
@@ -442,6 +442,8 @@ private:
VARINT_FIELD(m_sent_time)
FIELD(m_dests)
FIELD(m_payment_id)
+ if (version >= 1)
+ VARINT_FIELD(m_state)
VARINT_FIELD(m_timestamp)
VARINT_FIELD(m_subaddr_account)
FIELD(m_subaddr_indices)