diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-03-24 19:37:07 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-03-24 19:37:07 +0200 |
commit | 4176a399de2e3b40fe2d8a7cebe457cd5ac2c8cf (patch) | |
tree | 1f2028973b6c36691ddd78ae170d9a920b64874b /src/wallet/wallet_rpc_server.cpp | |
parent | Merge pull request #5277 (diff) | |
parent | wallet_rpc_server: include out subaddress indices in get_transfers (diff) | |
download | monero-4176a399de2e3b40fe2d8a7cebe457cd5ac2c8cf.tar.xz |
Merge pull request #5282
f962449d wallet_rpc_server: include out subaddress indices in get_transfers (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
-rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 7040597df..a1f60ea01 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -319,6 +319,8 @@ namespace tools entry.type = "out"; entry.subaddr_index = { pd.m_subaddr_account, 0 }; + for (uint32_t i: pd.m_subaddr_indices) + entry.subaddr_indices.push_back({pd.m_subaddr_account, i}); entry.address = m_wallet->get_subaddress_as_str({pd.m_subaddr_account, 0}); set_confirmations(entry, m_wallet->get_blockchain_current_height(), m_wallet->get_last_block_reward()); } @@ -339,6 +341,8 @@ namespace tools entry.note = m_wallet->get_tx_note(txid); entry.type = is_failed ? "failed" : "pending"; entry.subaddr_index = { pd.m_subaddr_account, 0 }; + for (uint32_t i: pd.m_subaddr_indices) + entry.subaddr_indices.push_back({pd.m_subaddr_account, i}); entry.address = m_wallet->get_subaddress_as_str({pd.m_subaddr_account, 0}); set_confirmations(entry, m_wallet->get_blockchain_current_height(), m_wallet->get_last_block_reward()); } |