aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorAlexander Blair <snipa@jagtech.io>2020-10-18 23:25:32 -0700
committerAlexander Blair <snipa@jagtech.io>2020-10-18 23:25:32 -0700
commit142489bd60fda13651c731718b486bd267a41d4c (patch)
tree91e3ce12e96ea112ce05bb1269c805af15260ddf /src/wallet
parentMerge pull request #6875 (diff)
parentwallet2: fix missing m_state field in wallet serialization (diff)
downloadmonero-142489bd60fda13651c731718b486bd267a41d4c.tar.xz
Merge pull request #6882
fcbfb0a00 wallet2: fix missing m_state field in wallet serialization (moneromooo-monero)
Diffstat (limited to 'src/wallet')
-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)