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

Merge pull request #862

Browse Source 
5dc09f2 wallet_rpc_server: fix some string values being returned between <> (moneromooo-monero)
f8213c0 Require 64/16 characters for payment ids (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-06-19 21:51:32 +02:00
commit 2072c642d1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/include/string_tools.h
View File

@ -139,9 +139,11 @@ namespace string_tools
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
template<class CharT> template<class CharT>
bool parse_hexstr_to_binbuff(const std::basic_string<CharT>& s, std::basic_string<CharT>& res) bool parse_hexstr_to_binbuff(const std::basic_string<CharT>& s, std::basic_string<CharT>& res, bool allow_partial_byte = false)
{ {
res.clear(); res.clear();
if (!allow_partial_byte && (s.size() & 1))
return false;
try try
{ {
long v = 0; long v = 0;

20
src/wallet/wallet_rpc_server.cpp
View File

@ -245,9 +245,9 @@ namespace tools
m_wallet.commit_tx(ptx_vector); m_wallet.commit_tx(ptx_vector);
// populate response with tx hash // populate response with tx hash
res.tx_hash = boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(ptx_vector.back().tx)); res.tx_hash = epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx_vector.back().tx));
if (req.get_tx_key) if (req.get_tx_key)
res.tx_key = boost::lexical_cast<std::string>(ptx_vector.back().tx_key); res.tx_key = epee::string_tools::pod_to_hex(ptx_vector.back().tx_key);
return true; return true;
} }
catch (const tools::error::daemon_busy& e) catch (const tools::error::daemon_busy& e)
@ -308,9 +308,9 @@ namespace tools
// populate response with tx hashes // populate response with tx hashes
for (auto & ptx : ptx_vector) for (auto & ptx : ptx_vector)
{ {
res.tx_hash_list.push_back(boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(ptx.tx))); res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
if (req.get_tx_keys) if (req.get_tx_keys)
res.tx_key_list.push_back(boost::lexical_cast<std::string>(ptx.tx_key)); res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
} }
return true; return true;
@ -354,9 +354,9 @@ namespace tools
// populate response with tx hashes // populate response with tx hashes
for (auto & ptx : ptx_vector) for (auto & ptx : ptx_vector)
{ {
res.tx_hash_list.push_back(boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(ptx.tx))); res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
if (req.get_tx_keys) if (req.get_tx_keys)
res.tx_key_list.push_back(boost::lexical_cast<std::string>(ptx.tx_key)); res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
} }
return true; return true;
@ -413,9 +413,9 @@ namespace tools
// populate response with tx hashes // populate response with tx hashes
for (auto & ptx : ptx_vector) for (auto & ptx : ptx_vector)
{ {
res.tx_hash_list.push_back(boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(ptx.tx))); res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
if (req.get_tx_keys) if (req.get_tx_keys)
res.tx_key_list.push_back(boost::lexical_cast<std::string>(ptx.tx_key)); res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
} }
return true; return true;
@ -493,7 +493,7 @@ namespace tools
return false; return false;
} }
res.standard_address = get_account_address_as_str(m_wallet.testnet(),address); res.standard_address = get_account_address_as_str(m_wallet.testnet(),address);
res.payment_id = boost::lexical_cast<std::string>(payment_id); res.payment_id = epee::string_tools::pod_to_hex(payment_id);
return true; return true;
} }
catch (std::exception &e) catch (std::exception &e)
@ -686,7 +686,7 @@ namespace tools
rpc_transfers.amount = td.amount(); rpc_transfers.amount = td.amount();
rpc_transfers.spent = td.m_spent; rpc_transfers.spent = td.m_spent;
rpc_transfers.global_index = td.m_global_output_index; rpc_transfers.global_index = td.m_global_output_index;
rpc_transfers.tx_hash = boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(td.m_tx)); rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(td.m_tx));
rpc_transfers.tx_size = txBlob.size(); rpc_transfers.tx_size = txBlob.size();
res.transfers.push_back(rpc_transfers); res.transfers.push_back(rpc_transfers);
} }