diff options
author | Neozaru <neozaru@mailoo.org> | 2014-06-02 00:22:42 +0200 |
---|---|---|
committer | Neozaru <neozaru@mailoo.org> | 2014-06-02 00:22:42 +0200 |
commit | 117393d562fc9782efed0e1b25f6470d9f8102b2 (patch) | |
tree | 64bda474a67cbc24cea03fdfca9aaf7a2ab8fadb /src/wallet/wallet2.cpp | |
parent | Merge bitmonero@monero-project (diff) | |
download | monero-117393d562fc9782efed0e1b25f6470d9f8102b2.tar.xz |
Added 'payment_id' optional argument to 'transfer' wallet RPC method
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r-- | src/wallet/wallet2.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 111b76117..fb1e5575b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -19,6 +19,7 @@ using namespace epee; #include "profile_tools.h" #include "crypto/crypto.h" #include "serialization/binary_utils.h" +#include "cryptonote_protocol/blobdatatype.h" using namespace cryptonote; @@ -465,6 +466,19 @@ void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists wallet_file_exists = boost::filesystem::exists(wallet_file, ignore); } //---------------------------------------------------------------------------------------------------- +bool wallet2::parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id) +{ + cryptonote::blobdata payment_id_data; + if(!epee::string_tools::parse_hexstr_to_binbuff(payment_id_str, payment_id_data)) + return false; + + if(sizeof(crypto::hash) != payment_id_data.size()) + return false; + + payment_id = *reinterpret_cast<const crypto::hash*>(payment_id_data.data()); + return true; +} +//---------------------------------------------------------------------------------------------------- bool wallet2::prepare_file_names(const std::string& file_path) { do_prepare_file_names(file_path, m_keys_file, m_wallet_file); |