diff options
author | luigi1111 <luigi1111w@gmail.com> | 2020-02-19 22:22:36 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2020-02-19 22:22:36 -0500 |
commit | 22a03673982fae857b4f2eb6a775021e3a624a56 (patch) | |
tree | 398eff1ede23de9f6575aedbc633c06c839e53ec /src/wallet/wallet2.h | |
parent | Merge pull request #6188 (diff) | |
parent | Wallet: Distingush amounts for a single subaddress (diff) | |
download | monero-22a03673982fae857b4f2eb6a775021e3a624a56.tar.xz |
Merge pull request #6190
096a9db Wallet: Distingush amounts for a single subaddress (tmoravec)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r-- | src/wallet/wallet2.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index b17fe6f3a..810c002fe 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -360,10 +360,12 @@ private: END_SERIALIZE() }; + typedef std::vector<uint64_t> amounts_container; struct payment_details { crypto::hash m_tx_hash; uint64_t m_amount; + amounts_container m_amounts; uint64_t m_fee; uint64_t m_block_height; uint64_t m_unlock_time; @@ -1631,7 +1633,7 @@ BOOST_CLASS_VERSION(tools::wallet2::transfer_details, 12) BOOST_CLASS_VERSION(tools::wallet2::multisig_info, 1) BOOST_CLASS_VERSION(tools::wallet2::multisig_info::LR, 0) BOOST_CLASS_VERSION(tools::wallet2::multisig_tx_set, 1) -BOOST_CLASS_VERSION(tools::wallet2::payment_details, 4) +BOOST_CLASS_VERSION(tools::wallet2::payment_details, 5) BOOST_CLASS_VERSION(tools::wallet2::pool_payment_details, 1) BOOST_CLASS_VERSION(tools::wallet2::unconfirmed_transfer_details, 8) BOOST_CLASS_VERSION(tools::wallet2::confirmed_transfer_details, 6) @@ -1942,6 +1944,9 @@ namespace boost return; } a & x.m_coinbase; + if (ver < 5) + return; + a & x.m_amounts; } template <class Archive> |