diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-08-29 13:23:19 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-08-29 13:23:19 +0200 |
| commit | 51f0ac09c673bfbce053040852ee05040afb0e3e (patch) | |
| tree | 1d9c4d48d72c4b2b7153708ac7e64d4fca9b03f5 | |
| parent | Merge pull request #1002 (diff) | |
| parent | wallet_rpc_server: return payment id in make_integrated_address RPC (diff) | |
| download | monero-51f0ac09c673bfbce053040852ee05040afb0e3e.tar.xz | |
Merge pull request #1004
adca903 wallet_rpc_server: return payment id in make_integrated_address RPC (moneromooo-monero)
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server_commands_defs.h | 2 |
2 files changed, 3 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) diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h index 27b897dab..6439a19fe 100644 --- a/src/wallet/wallet_rpc_server_commands_defs.h +++ b/src/wallet/wallet_rpc_server_commands_defs.h @@ -414,9 +414,11 @@ namespace wallet_rpc struct response { std::string integrated_address; + std::string payment_id; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(integrated_address) + KV_SERIALIZE(payment_id) END_KV_SERIALIZE_MAP() }; }; |