4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 12:26:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4158

Browse Source 
7db7ec8 wallet rpc: support making integrated address of given standard address (stoffu)
This commit is contained in:
luigi1111 2018-08-15 17:25:19 -05:00
commit e7328ed5b7
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wallet/wallet_rpc_server.cpp
View File

@ -1255,7 +1255,39 @@ namespace tools
}
}
res.integrated_address = m_wallet->get_integrated_address_as_str(payment_id);
if (req.standard_address.empty())
{
res.integrated_address = m_wallet->get_integrated_address_as_str(payment_id);
}
else
{
cryptonote::address_parse_info info;
if(!get_account_address_from_str(info, m_wallet->nettype(), req.standard_address))
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_ADDRESS;
er.message = "Invalid address";
return false;
}
if (info.is_subaddress)
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_ADDRESS;
er.message = "Subaddress shouldn't be used";
return false;
}
if (info.has_payment_id)
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_ADDRESS;
er.message = "Already integrated address";
return false;
}
if (req.payment_id.empty())
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
er.message = "Payment ID shouldn't be left unspecified";
return false;
}
res.integrated_address = get_account_integrated_address_as_str(m_wallet->nettype(), info.address, payment_id);
}
res.payment_id = epee::string_tools::pod_to_hex(payment_id);
return true;
}

2
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -914,9 +914,11 @@ namespace wallet_rpc
{
struct request
{
std::string standard_address;
std::string payment_id;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(standard_address)
KV_SERIALIZE(payment_id)
END_KV_SERIALIZE_MAP()
};