tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4153

Browse Source 
37f0799 wallet: distinguish coinbase from other txes in show_transfers (moneromooo-monero)
This commit is contained in:
luigi1111
2018-08-15 17:23:56 -05:00
parent 2a44c2defd 37f0799284
commit 5e795ee7af
4 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.h
+10 -2
View File
@@ -260,12 +260,12 @@ namespace tools
uint64_t m_block_height;
uint64_t m_unlock_time;
uint64_t m_timestamp;
bool m_coinbase;
cryptonote::subaddress_index m_subaddr_index;
};
struct address_tx : payment_details
{
bool m_coinbase;
bool m_mempool;
bool m_incoming;
};
@@ -1324,7 +1324,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, 3)
BOOST_CLASS_VERSION(tools::wallet2::payment_details, 4)
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)
@@ -1591,16 +1591,24 @@ namespace boost
a & x.m_timestamp;
if (ver < 2)
{
x.m_coinbase = false;
x.m_subaddr_index = {};
return;
}
a & x.m_subaddr_index;
if (ver < 3)
{
x.m_coinbase = false;
x.m_fee = 0;
return;
}
a & x.m_fee;
if (ver < 4)
{
x.m_coinbase = false;
return;
}
a & x.m_coinbase;
}
template <class Archive>