Merge pull request 'fixing tor hidden service ports' (#428) from nahuhh/wownero:tor into master

Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/428

README.md

@@ -181,7 +181,7 @@ Type `help` in CLI wallet to see standard commands (for advanced options, type `
 add the following:
 ```
 HiddenServiceDir /var/lib/tor/wownero/
-HiddenServicePort 34568 127.0.0.1:34568
+HiddenServicePort 34569 127.0.0.1:34569
 HiddenServicePort 34566 127.0.0.1:34566
 HiddenServiceVersion 3
 ```

src/common/dns_utils.cpp

@@ -400,7 +400,7 @@ namespace dns_utils
 std::string address_from_txt_record(const std::string& s)
 {
   // make sure the txt record has "oa1:xmr" and find it
-  auto pos = s.find("oa1:xmr");
+  auto pos = s.find("oa1:wow");
   if (pos == std::string::npos)
     return {};
   // search from there to find "recipient_address="
@@ -412,14 +412,14 @@ std::string address_from_txt_record(const std::string& s)
   auto pos2 = s.find(";", pos);
   if (pos2 != std::string::npos)
   {
-    // length of address == 95, we can at least validate that much here
-    if (pos2 - pos == 95)
+    // length of address == 97, we can at least validate that much here
+    if (pos2 - pos == 97)
     {
-      return s.substr(pos, 95);
+      return s.substr(pos, 97);
     }
-    else if (pos2 - pos == 106) // length of address == 106 --> integrated address
+    else if (pos2 - pos == 108) // length of address == 108 --> integrated address
     {
-      return s.substr(pos, 106);
+      return s.substr(pos, 108);
     }
   }
   return {};

src/p2p/net_node.inl

@@ -850,6 +850,9 @@ namespace nodetool
       if (m_nettype == cryptonote::MAINNET)
       {
         return {
+          "lrq65qrhpbt5voom2ncvowpes6kvobodkldhpuwhxlsrpugmgmlq.b32.i2p:34565",
+          "72tbpgeczdtx2q2enbyaqcot7mghbnjenjkmdpyylrssqehr746a.b32.i2p:34565",
+          "rkel2qy7xv3cc5bnxfrzwgh3jvd4woagd4vlhr3qsdxy6cfkimnq.b32.i2p:34565",
         };
       }
       return {};

src/wallet/api/transaction_history.cpp

@@ -233,7 +233,7 @@ void TransactionHistoryImpl::refresh()
         ti->m_timestamp = pd.m_timestamp;
         ti->m_confirmations = 0;
 
-        for (const auto &d : pd.m_dests) {
+        for (const auto &d : pd.m_dests)
         {
             ti->m_transfers.push_back({d.amount, d.address(m_wallet->m_wallet->nettype(), pd.m_payment_id)});
         }
@@ -274,4 +274,3 @@ void TransactionHistoryImpl::refresh()
 }
 
 } // namespace
-}

src/wallet/api/wallet.cpp

@@ -435,6 +435,10 @@ WalletImpl::WalletImpl(NetworkType nettype, uint64_t kdf_rounds)
 
     m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS;
 
+    m_refreshThread = boost::thread([this] () {
+        this->refreshThreadFunc();
+    });
+
 }
 
 WalletImpl::~WalletImpl()

wownerod.conf

@@ -3,13 +3,15 @@ check-updates=disabled
 log-level=0
 no-igd=1
 no-zmq=1
-restricted-rpc=1
 p2p-bind-ip=0.0.0.0
 p2p-bind-port=34567
-public-node=1
-confirm-external-bind=1
-rpc-bind-ip=0.0.0.0
+#public-node=1
+#confirm-external-bind=1
+#restricted-rpc=1
+rpc-bind-ip=127.0.0.1
 rpc-bind-port=34568
+rpc-restricted-bind-ip=0.0.0.0
+rpc-restricted-bind-port=34569
 rpc-ssl=autodetect
 disable-rpc-ban=1
 db-sync-mode=safe
@@ -18,11 +20,15 @@ in-peers=64
 limit-rate-up=1048576
 limit-rate-down=1048576
 tx-proxy=tor,127.0.0.1:9050,23
-add-priority-node=v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34568
-add-priority-node=iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34568
-add-priority-node=7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34568
-add-priority-node=j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34568
-add-priority-node=aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34568
-add-priority-node=nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34568
-add-priority-node=666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34568
-add-priority-node=ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34568
+
+# Add Peers
+add-priority-node=qstotuswqshpfq3tk5ue6ngbx6rge3macsfa7qyt5j4caopixxhckpad.onion:34566
+# Dead Peers?
+add-priority-node=v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34566
+add-priority-node=iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34566
+add-priority-node=7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34566
+add-priority-node=j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34566
+add-priority-node=aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34566
+add-priority-node=nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34566
+add-priority-node=666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34566
+add-priority-node=ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34566