nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #704

Browse Source 
e2b7e55 get_payments short ID (luigi1111)
This commit is contained in:
Riccardo Spagni 2016-03-05 23:13:23 +02:00
commit d0f011d873
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/wallet/wallet_rpc_server.cpp
View File

@ -461,6 +461,7 @@ namespace tools
bool wallet_rpc_server::on_get_payments(const wallet_rpc::COMMAND_RPC_GET_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_PAYMENTS::response& res, epee::json_rpc::error& er) bool wallet_rpc_server::on_get_payments(const wallet_rpc::COMMAND_RPC_GET_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_PAYMENTS::response& res, epee::json_rpc::error& er)
{ {
crypto::hash payment_id; crypto::hash payment_id;
crypto::hash8 payment_id8;
cryptonote::blobdata payment_id_blob; cryptonote::blobdata payment_id_blob;
if(!epee::string_tools::parse_hexstr_to_binbuff(req.payment_id, payment_id_blob)) if(!epee::string_tools::parse_hexstr_to_binbuff(req.payment_id, payment_id_blob))
{ {
@ -469,14 +470,22 @@ namespace tools
return false; return false;
} }
if(sizeof(payment_id) != payment_id_blob.size()) if(sizeof(payment_id) == payment_id_blob.size())
{ {
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID; payment_id = *reinterpret_cast<const crypto::hash*>(payment_id_blob.data());
er.message = "Payment ID has invalid size"; }
return false; else if(sizeof(payment_id8) == payment_id_blob.size())
} {
payment_id8 = *reinterpret_cast<const crypto::hash8*>(payment_id_blob.data());
payment_id = *reinterpret_cast<const crypto::hash*>(payment_id_blob.data()); memcpy(payment_id.data, payment_id8.data, 8);
memset(payment_id.data + 8, 0, 24);
}
else
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
er.message = "Payment ID has invalid size: " + req.payment_id;
return false;
}
res.payments.clear(); res.payments.clear();
std::list<wallet2::payment_details> payment_list; std::list<wallet2::payment_details> payment_list;