diff options
| author | paybee <dev@payb.ee> | 2014-06-02 22:43:11 +0200 |
|---|---|---|
| committer | paybee <dev@payb.ee> | 2014-06-02 22:43:11 +0200 |
| commit | 133019cfc54f4842a030a346418056e513e6c581 (patch) | |
| tree | 3a03a4efe97972c0bcb46370d4ab5506051d8393 /src/wallet/wallet2.h | |
| parent | Added incoming_transfers RPC API method (diff) | |
| parent | Merge pull request #21 from Neozaru/master (diff) | |
| download | monero-133019cfc54f4842a030a346418056e513e6c581.tar.xz | |
fixed conflict
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index f90fc4fac..9ca586425 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -151,6 +151,8 @@ namespace tools static void wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists); + static bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id); + private: bool store_keys(const std::string& keys_file_name, const std::string& password); void load_keys(const std::string& keys_file_name, const std::string& password); |