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

wallet_rpc_server: use original addresses in destinations in get_transfers

Browse source 
And add them for pending transfers, where they were missing
This commit is contained in:
moneromooo-monero 2019-05-02 09:01:40 +00:00
parent 581994b61c
commit 914b1061d4
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallet_rpc_server.cpp
View file

@ -385,7 +385,7 @@ namespace tools
entry.destinations.push_back(wallet_rpc::transfer_destination()); entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back(); wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount; td.amount = d.amount;
td.address = get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr); td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original;
} }
entry.type = "out"; entry.type = "out";
@ -410,6 +410,14 @@ namespace tools
entry.amount = pd.m_amount_in - pd.m_change - entry.fee; entry.amount = pd.m_amount_in - pd.m_change - entry.fee;
entry.unlock_time = pd.m_tx.unlock_time; entry.unlock_time = pd.m_tx.unlock_time;
entry.note = m_wallet->get_tx_note(txid); entry.note = m_wallet->get_tx_note(txid);
for (const auto &d: pd.m_dests) {
entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount;
td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original;
}
entry.type = is_failed ? "failed" : "pending"; entry.type = is_failed ? "failed" : "pending";
entry.subaddr_index = { pd.m_subaddr_account, 0 }; entry.subaddr_index = { pd.m_subaddr_account, 0 };
for (uint32_t i: pd.m_subaddr_indices) for (uint32_t i: pd.m_subaddr_indices)