rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 10:37:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7422

Browse Source 
d46d90c return output key for incoming transfers (benevanoff)
This commit is contained in:
luigi1111 2021-03-20 01:57:44 -04:00
commit 5b8d714a4b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/wallet_rpc_server.cpp
View File

@ -1887,6 +1887,7 @@ namespace tools
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.major, td.m_subaddr_index.minor}; rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor};
rpc_transfers.key_image = td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : ""; rpc_transfers.key_image = td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : "";
rpc_transfers.pubkey = epee::string_tools::pod_to_hex(td.get_public_key());
rpc_transfers.block_height = td.m_block_height; rpc_transfers.block_height = td.m_block_height;
rpc_transfers.frozen = td.m_frozen; rpc_transfers.frozen = td.m_frozen;
rpc_transfers.unlocked = m_wallet->is_transfer_unlocked(td); rpc_transfers.unlocked = m_wallet->is_transfer_unlocked(td);

2
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -1010,6 +1010,7 @@ namespace wallet_rpc
std::string tx_hash; std::string tx_hash;
cryptonote::subaddress_index subaddr_index; cryptonote::subaddress_index subaddr_index;
std::string key_image; std::string key_image;
std::string pubkey; // owned output public key found
uint64_t block_height; uint64_t block_height;
bool frozen; bool frozen;
bool unlocked; bool unlocked;
@ -1021,6 +1022,7 @@ namespace wallet_rpc
KV_SERIALIZE(tx_hash) KV_SERIALIZE(tx_hash)
KV_SERIALIZE(subaddr_index) KV_SERIALIZE(subaddr_index)
KV_SERIALIZE(key_image) KV_SERIALIZE(key_image)
KV_SERIALIZE(pubkey);
KV_SERIALIZE(block_height) KV_SERIALIZE(block_height)
KV_SERIALIZE(frozen) KV_SERIALIZE(frozen)
KV_SERIALIZE(unlocked) KV_SERIALIZE(unlocked)