aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet_rpc_server.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-08-29 13:23:19 +0200
committerRiccardo Spagni <ric@spagni.net>2016-08-29 13:23:19 +0200
commit51f0ac09c673bfbce053040852ee05040afb0e3e (patch)
tree1d9c4d48d72c4b2b7153708ac7e64d4fca9b03f5 /src/wallet/wallet_rpc_server.cpp
parentMerge pull request #1002 (diff)
parentwallet_rpc_server: return payment id in make_integrated_address RPC (diff)
downloadmonero-51f0ac09c673bfbce053040852ee05040afb0e3e.tar.xz
Merge pull request #1004
adca903 wallet_rpc_server: return payment id in make_integrated_address RPC (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet_rpc_server.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 4c190b005..0e76075d1 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -473,6 +473,7 @@ namespace tools
}
res.integrated_address = m_wallet.get_account().get_public_integrated_address_str(payment_id, m_wallet.testnet());
+ res.payment_id = epee::string_tools::pod_to_hex(payment_id);
return true;
}
catch (std::exception &e)