diff options
author | Oran Juice <oranjuices@hotmail.com> | 2014-09-28 15:52:05 +0530 |
---|---|---|
committer | Oran Juice <oranjuices@hotmail.com> | 2014-09-28 15:52:05 +0530 |
commit | 4f693d715c036346b642298cc94bd4d87c5f35e2 (patch) | |
tree | c7f764d9f9d90de3947eff7910901ee3a56212b1 /src/wallet/wallet2.h | |
parent | Minor comment changes and code clean-up (diff) | |
parent | Revert "low risk, potentially varint overflow bug patched thanks to BBR" (diff) | |
download | monero-4f693d715c036346b642298cc94bd4d87c5f35e2.tar.xz |
Merge with origin/master
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r-- | src/wallet/wallet2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 3311e3438..90918677e 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -196,6 +196,9 @@ namespace tools static bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id); + static std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec_valid); + + static std::string address_from_txt_record(const std::string& s); 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); |