Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-09 04:22:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3113

Browse source 
ffc2e570 wallet rpc: show fees when querying incoming transfers (stoffu)
This commit is contained in:
Riccardo Spagni 2018-01-27 17:24:15 -08:00
commit 73a19e0b06
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet_rpc_server.cpp
View file

@ -254,7 +254,7 @@ namespace tools
entry.timestamp = pd.m_timestamp;
entry.amount = pd.m_amount;
entry.unlock_time = pd.m_unlock_time;
entry.fee = 0; // TODO
entry.fee = pd.m_fee;
entry.note = m_wallet->get_tx_note(pd.m_tx_hash);
entry.type = "in";
entry.subaddr_index = pd.m_subaddr_index;
@ -317,7 +317,7 @@ namespace tools
entry.timestamp = pd.m_timestamp;
entry.amount = pd.m_amount;
entry.unlock_time = pd.m_unlock_time;
entry.fee = 0; // TODO
entry.fee = pd.m_fee;
entry.note = m_wallet->get_tx_note(pd.m_tx_hash);
entry.double_spend_seen = ppd.m_double_spend_seen;
entry.type = "pool";