tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change to allow (at least a bit) for multiple TXT records

Browse Source
This commit is contained in:
Thomas Winget
2014-09-17 17:38:54 -04:00
committed by Riccardo Spagni
parent f437cb58bf
commit c14c7e1683
7 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/simplewallet/simplewallet.cpp
View File

@@ -913,16 +913,15 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
{
// if treating as an address fails, try as url
bool dnssec_ok = false;
std::string addr_from_dns;
std::string url = local_args[i];
// attempt to get address from dns query
addr_from_dns = tools::wallet2::address_from_url(url, dnssec_ok);
auto addresses_from_dns = tools::wallet2::addresses_from_url(url, dnssec_ok);
// if string not empty, see if it's an address
if (addr_from_dns.size())
// for now, move on only if one address found
if (addresses_from_dns.size() == 1)
{
if (get_account_address_from_str(de.addr, addr_from_dns))
if (get_account_address_from_str(de.addr, addresses_from_dns[0]))
{
// if it was an address, prompt user for confirmation.
// inform user of DNSSEC validation status as well.
@@ -938,8 +937,8 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
}
std::stringstream prompt;
prompt << "For URL: " << url
<< "," << dnssec_str
<< " Monero Address = " << addr_from_dns
<< "," << dnssec_str << std::endl
<< " Monero Address = " << addresses_from_dns[0]
<< std::endl
<< "Is this OK? (Y/n) "
;
@@ -958,6 +957,10 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
return true;
}
}
else if (addresses_from_dns.size() > 1)
{
tools::fail_msg_writer() << "Multiple Monero addresses found for given URL: " << url << ", this is not yet supported.";
}
else
{
fail_msg_writer() << "wrong address: " << local_args[i];