monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4433

Browse source 
b35beaa8 wallet_rpc_server: include account index in incoming_transfers RPC (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-25 12:12:14 +02:00
commit cd8c7f6e78
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/wallet_rpc_server.cpp
View file

@ -1553,7 +1553,7 @@ namespace tools
rpc_transfers.spent = td.m_spent; rpc_transfers.spent = td.m_spent;
rpc_transfers.global_index = td.m_global_output_index; rpc_transfers.global_index = td.m_global_output_index;
rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(td.m_txid); rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(td.m_txid);
rpc_transfers.subaddr_index = td.m_subaddr_index.minor; rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor};
rpc_transfers.key_image = req.verbose && td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : ""; rpc_transfers.key_image = req.verbose && td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : "";
res.transfers.push_back(rpc_transfers); res.transfers.push_back(rpc_transfers);
} }

2
src/wallet/wallet_rpc_server_commands_defs.h
View file

@ -863,7 +863,7 @@ namespace wallet_rpc
bool spent; bool spent;
uint64_t global_index; uint64_t global_index;
std::string tx_hash; std::string tx_hash;
uint32_t subaddr_index; cryptonote::subaddress_index subaddr_index;
std::string key_image; std::string key_image;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()