diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:09:45 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:09:45 +0200 |
| commit | f5be5b7e7be454291f6bb1cd04d95c4587c64992 (patch) | |
| tree | 263eba5341ca6fa45f7aacd630327d9cb3f23e64 /src/cryptonote_basic/cryptonote_basic_impl.cpp | |
| parent | 61ac6983f29c021f9a8c13f221d5c8fbfcf9fe47 (diff) | |
| parent | cb0b559451466112332e0c251d100c2322803ad7 (diff) | |
| download | monzero-core-f5be5b7e7be454291f6bb1cd04d95c4587c64992.tar.gz monzero-core-f5be5b7e7be454291f6bb1cd04d95c4587c64992.tar.xz monzero-core-f5be5b7e7be454291f6bb1cd04d95c4587c64992.zip | |
Merge pull request #2210
cb0b5594 Move OpenAlias console input back from libs (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_basic/cryptonote_basic_impl.cpp')
| -rw-r--r-- | src/cryptonote_basic/cryptonote_basic_impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp index edd67793f..a59f96956 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.cpp +++ b/src/cryptonote_basic/cryptonote_basic_impl.cpp @@ -308,13 +308,13 @@ namespace cryptonote { , crypto::hash8& payment_id , bool testnet , const std::string& str_or_url - , bool cli_confirm + , std::function<std::string(const std::string&, const std::vector<std::string>&, bool)> dns_confirm ) { if (get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, str_or_url)) return true; bool dnssec_valid; - std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid, cli_confirm); + std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid, dns_confirm); return !address_str.empty() && get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, address_str); } @@ -323,12 +323,12 @@ namespace cryptonote { cryptonote::account_public_address& address , bool testnet , const std::string& str_or_url - , bool cli_confirm + , std::function<std::string(const std::string&, const std::vector<std::string>&, bool)> dns_confirm ) { bool has_payment_id; crypto::hash8 payment_id; - return get_account_address_from_str_or_url(address, has_payment_id, payment_id, testnet, str_or_url, cli_confirm); + return get_account_address_from_str_or_url(address, has_payment_id, payment_id, testnet, str_or_url, dns_confirm); } //-------------------------------------------------------------------------------- bool operator ==(const cryptonote::transaction& a, const cryptonote::transaction& b) { |