aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-08-29 12:18:22 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-08-29 12:18:22 +0100
commitadca9035899532902b78b20a593a6c70018b7004 (patch)
tree1d9c4d48d72c4b2b7153708ac7e64d4fca9b03f5
parentMerge pull request #1002 (diff)
downloadmonero-adca9035899532902b78b20a593a6c70018b7004.tar.xz
wallet_rpc_server: return payment id in make_integrated_address RPC
It is useful, especially when requesting a random one
-rw-r--r--src/wallet/wallet_rpc_server.cpp1
-rw-r--r--src/wallet/wallet_rpc_server_commands_defs.h2
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()
};
};