ud: add back in bridge code

Author: hayzamjs

src/common/dns_utils.cpp

@@ -41,6 +41,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/optional.hpp>
 #include <boost/utility/string_ref.hpp>
+#include <rapidjson/document.h>
+
 using namespace epee;
 
 #undef scala_DEFAULT_LOG_CATEGORY
@@ -486,14 +488,85 @@ std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec
 
 std::string get_account_address_as_str_from_url(const std::string& url, bool& dnssec_valid, std::function<std::string(const std::string&, const std::vector<std::string>&, bool)> dns_confirm)
 {
- // attempt to get address from dns query
- auto addresses = addresses_from_url(url, dnssec_valid);
- if (addresses.empty())
+ std::vector<std::string> valid_ud_tlds{ ".crypto", ".nft", ".blockchain", ".bitcoin", ".wallet", ".888", ".dao", ".x", ".klever", ".zil", ".eth" };
+ 
+ bool valid_tld = false;
+
+ for (const auto& tld : valid_ud_tlds)
  {
- LOG_ERROR("wrong address: " << url);
- return {};
+ if (url.find(tld) != std::string::npos)
+ {
+ valid_tld = true;
+ break;
+ }
  }
- return dns_confirm(url, addresses, dnssec_valid);
+
+ if (!valid_tld)
+ {
+ // attempt to get address from dns query
+ auto addresses = addresses_from_url(url, dnssec_valid);
+ if (addresses.empty())
+ {
+ LOG_ERROR("wrong address: " << url);
+ return {};
+ }
+ return dns_confirm(url, addresses, dnssec_valid);
+ } else {
+ std::vector<std::string> addresses;
+ std::vector<std::string> ud_addresses;
+ std::string ud_bridge_api = "http://ud-bridge.scalaproject.io/fetch-records/" + url;
+
+ epee::net_utils::http::http_simple_client client;
+ epee::net_utils::http::url_content u_c;
+
+ if (!epee::net_utils::parse_url(ud_bridge_api, u_c)){
+ MERROR("Failed to parse URL " << ud_bridge_api);
+ return {};
+ }
+
+ epee::net_utils::ssl_support_t ssl_requirement = epee::net_utils::ssl_support_t::e_ssl_support_disabled;
+ uint16_t port = 80;
+
+ client.set_server(u_c.host, std::to_string(port), boost::none, ssl_requirement);
+ epee::net_utils::http::fields_list fields;
+ const epee::net_utils::http::http_response_info *info = NULL;
+
+ 
+ if (!client.invoke_get(u_c.uri, std::chrono::seconds(10), "", &info, fields)){
+LOG_ERROR(ud_bridge_api << " is not responding, skipping.");
+return {};
+ } else{
+ if (info->m_response_code != 200){
+ LOG_ERROR("Failed to get address from " << ud_bridge_api << ", skipping.");
+ return {};
+ }
+
+ std::string response = info->m_body;
+ rapidjson::Document doc;
+
+
+ if (doc.Parse(response.c_str()).HasParseError()){
+ LOG_ERROR("Failed to parse response from " << ud_bridge_api << ", skipping.");
+ return {};
+ }
+
+ if (!doc.HasMember("records")){
+ LOG_ERROR("Failed to get records from " << ud_bridge_api << ", skipping.");
+ return {};
+ }
+
+ if (!doc["records"].HasMember("crypto.XLA.address")){
+ LOG_ERROR("Failed to get XLA address from " << ud_bridge_api << ", skipping.");
+ return {};
+ } else {
+ std::string address = doc["records"]["crypto.XLA.address"].GetString();
+
+ addresses.push_back(address);
+ return dns_confirm(url, addresses, true);
+ }
+ }
+ }
+
 }
 
 bool load_txt_records_from_dns(std::vector<std::string> &good_records, const std::vector<std::string> &dns_urls)

src/common/dns_utils.h

@@ -34,6 +34,8 @@
 #include <boost/optional/optional_fwd.hpp>
 #include <boost/utility/string_ref_fwd.hpp>
 
+#include "net/http_client.h"
+
 namespace tools
 {
 

src/p2p/net_node.inl

@@ -702,18 +702,16 @@ namespace nodetool
  {
  std::set<std::string> full_addrs;
  if (m_nettype == cryptonote::TESTNET)
- {
- }
+ {}
  else if (m_nettype == cryptonote::STAGENET)
- {
- }
+ {}
  else if (m_nettype == cryptonote::FAKECHAIN)
- {
- }
+ {}
  else
  {
  full_addrs.insert("65.21.221.2:11811");
  full_addrs.insert("65.21.221.3:11811");
+ full_addrs.insert("95.111.237.231:11811");
  }
  return full_addrs;
  }
@@ -843,25 +841,13 @@ namespace nodetool
  case epee::net_utils::zone::tor:
  if (m_nettype == cryptonote::MAINNET)
  {
- return {
- "xwvz3ekocr3dkyxfkmgm2hvbpzx2ysqmaxgter7znnqrhoicygkfswid.onion:18083",
- "4pixvbejrvihnkxmduo2agsnmc3rrulrqc7s3cbwwrep6h6hrzsibeqd.onion:18083",
- "zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:18083",
- "qz43zul2x56jexzoqgkx2trzwcfnr6l3hbtfcfx54g4r3eahy3bssjyd.onion:18083",
- "plowsof3t5hogddwabaeiyrno25efmzfxyro2vligremt7sxpsclfaid.onion:18083",
- "plowsoffjexmxalw73tkjmf422gq6575fc7vicuu4javzn2ynnte6tyd.onion:18083",
- };
+ return {};
  }
  return {};
  case epee::net_utils::zone::i2p:
  if (m_nettype == cryptonote::MAINNET)
  {
- return {
- "s3l6ke4ed3df466khuebb4poienoingwof7oxtbo6j4n56sghe3a.b32.i2p:18080",
- "sel36x6fibfzujwvt4hf5gxolz6kd3jpvbjqg6o3ud2xtionyl2q.b32.i2p:18080",
- "uqj3aphckqtjsitz7kxx5flqpwjlq5ppr3chazfued7xucv3nheq.b32.i2p:18080",
- "vdmnehdjkpkg57nthgnjfuaqgku673r5bpbqg56ix6fyqoywgqrq.b32.i2p:18080",
- };
+ return {};
  }
  return {};
  default: