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

Merge pull request #5750

Browse source 
884df82 wallet: provide original address for outgoing transfers (xiphon)
This commit is contained in:
luigi1111 2019-08-21 15:20:51 -05:00
commit 1bd3f1a1fb
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet_rpc_server.cpp
View file

@ -352,7 +352,7 @@ namespace tools
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;
td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
}
entry.type = "out";
@ -382,7 +382,7 @@ namespace tools
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;
td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
}
entry.type = is_failed ? "failed" : "pending";