aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-16 11:05:31 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-16 11:05:31 +0200
commit4561119846e998e955bb0c34a3cfd6774e238b9d (patch)
tree3f4496f7e665325b1d1b268e49cacabf3cfb3b9c /src/wallet
parentMerge pull request #4778 (diff)
parentwallet_rpc_server: include additional tx keys in sign_transfer response (diff)
downloadmonero-4561119846e998e955bb0c34a3cfd6774e238b9d.tar.xz
Merge pull request #4784
1c04c21d wallet_rpc_server: include additional tx keys in sign_transfer response (stoffu)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet_rpc_server.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 50e3581f2..533784acf 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -982,7 +982,11 @@ namespace tools
{
res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
if (req.get_tx_keys)
+ {
res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
+ for (const crypto::secret_key& additional_tx_key : ptx.additional_tx_keys)
+ res.tx_key_list.back() += epee::string_tools::pod_to_hex(additional_tx_key);
+ }
}
if (req.export_raw)