diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:26:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:26:04 +0200 |
| commit | 9e3cedce8732cc4962ad1edcf8ce982fa25ea2ff (patch) | |
| tree | 4089fb02d60bbe026e41c86ab16eae8edd025ae8 | |
| parent | Merge pull request #1334 (diff) | |
| parent | wallet: fix serialization of new m_key_image_known member (diff) | |
| download | monero-9e3cedce8732cc4962ad1edcf8ce982fa25ea2ff.tar.xz | |
Merge pull request #1335
d48f2e9 wallet: fix serialization of new m_key_image_known member (moneromooo-monero)
| -rw-r--r-- | src/wallet/wallet2.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index d42385caf..417e754a5 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -611,7 +611,7 @@ namespace tools }; } BOOST_CLASS_VERSION(tools::wallet2, 15) -BOOST_CLASS_VERSION(tools::wallet2::transfer_details, 5) +BOOST_CLASS_VERSION(tools::wallet2::transfer_details, 6) BOOST_CLASS_VERSION(tools::wallet2::payment_details, 1) BOOST_CLASS_VERSION(tools::wallet2::unconfirmed_transfer_details, 6) BOOST_CLASS_VERSION(tools::wallet2::confirmed_transfer_details, 3) @@ -640,7 +640,10 @@ namespace boost { x.m_rct = x.m_tx.vout[x.m_internal_output_index].amount == 0; } - x.m_key_image_known = true; + if (ver < 6) + { + x.m_key_image_known = true; + } } template <class Archive> @@ -689,7 +692,18 @@ namespace boost } a & x.m_rct; if (ver < 5) + { + initialize_transfer_details(a, x, ver); return; + } + if (ver < 6) + { + // v5 did not properly initialize + uint8_t u; + a & u; + x.m_key_image_known = true; + return; + } a & x.m_key_image_known; } |