diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-01-27 17:24:15 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-01-27 17:24:15 -0800 |
| commit | 73a19e0b067c240bc048bd7a14c7b6f1a6a00e3d (patch) | |
| tree | 206472869db99d7b2fdebdb9277c8dd343eaab67 /src/wallet/wallet2.h | |
| parent | Merge pull request #3104 (diff) | |
| parent | wallet rpc: show fees when querying incoming transfers (diff) | |
| download | monero-73a19e0b067c240bc048bd7a14c7b6f1a6a00e3d.tar.xz | |
Merge pull request #3113
ffc2e570 wallet rpc: show fees when querying incoming transfers (stoffu)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 5bc6900ce..4bcdfa025 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -252,6 +252,7 @@ namespace tools { crypto::hash m_tx_hash; uint64_t m_amount; + uint64_t m_fee; uint64_t m_block_height; uint64_t m_unlock_time; uint64_t m_timestamp; @@ -1144,7 +1145,7 @@ BOOST_CLASS_VERSION(tools::wallet2::transfer_details, 9) 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, 2) +BOOST_CLASS_VERSION(tools::wallet2::payment_details, 3) BOOST_CLASS_VERSION(tools::wallet2::pool_payment_details, 1) BOOST_CLASS_VERSION(tools::wallet2::unconfirmed_transfer_details, 7) BOOST_CLASS_VERSION(tools::wallet2::confirmed_transfer_details, 5) @@ -1409,6 +1410,12 @@ namespace boost return; } a & x.m_subaddr_index; + if (ver < 3) + { + x.m_fee = 0; + return; + } + a & x.m_fee; } template <class Archive> |