kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1004

Browse source 
adca903 wallet_rpc_server: return payment id in make_integrated_address RPC (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-08-29 13:23:19 +02:00
commit 51f0ac09c6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/wallet/wallet_rpc_server.cpp
View file

@ -473,6 +473,7 @@ namespace tools
} }
res.integrated_address = m_wallet.get_account().get_public_integrated_address_str(payment_id, m_wallet.testnet()); 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; return true;
} }
catch (std::exception &e) catch (std::exception &e)

2
src/wallet/wallet_rpc_server_commands_defs.h
View file

@ -414,9 +414,11 @@ namespace wallet_rpc
struct response struct response
{ {
std::string integrated_address; std::string integrated_address;
std::string payment_id;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(integrated_address) KV_SERIALIZE(integrated_address)
KV_SERIALIZE(payment_id)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };