diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-01-18 19:12:58 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-01-18 19:12:58 +0200 |
commit | 4e723843183b12308bce2ef560385ea885ad0174 (patch) | |
tree | 86796c708d53a72f73e20360c87ff5991b1c0ee2 /src/wallet/wallet_rpc_server.cpp | |
parent | Merge pull request #5050 (diff) | |
parent | core: include a dummy encrypted payment id when no payment is used (diff) | |
download | monero-4e723843183b12308bce2ef560385ea885ad0174.tar.xz |
Merge pull request #5008
c6d38718 core: include a dummy encrypted payment id when no payment is used (moneromooo-monero)
b7441c4a core, wallet: remember original text version of destination address (moneromooo-monero)
a9b1c04a crptonote_core: do not error out sending unparsable extra field (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
-rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index dd65ee7fe..5dc6ac0e8 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -644,9 +644,11 @@ namespace tools return false; } + de.original = it->address; de.addr = info.address; de.is_subaddress = info.is_subaddress; de.amount = it->amount; + de.is_integrated = info.has_payment_id; dsts.push_back(de); if (info.has_payment_id) |