diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-08-21 15:20:51 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-21 15:20:51 -0500 |
| commit | 1bd3f1a1fbb7ae940cb3a147da8332b471117f62 (patch) | |
| tree | a1a0f42197cb15ac6793e65e69896cb793789ccb /src/wallet/wallet_rpc_server.cpp | |
| parent | Merge pull request #5749 (diff) | |
| parent | wallet: provide original address for outgoing transfers (diff) | |
| download | monero-1bd3f1a1fbb7ae940cb3a147da8332b471117f62.tar.xz | |
Merge pull request #5750
884df82 wallet: provide original address for outgoing transfers (xiphon)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 844ecf90c..c64b662f3 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -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"; |