more endpoints reimplemented in new api

onionr/communicator2.py

@@ -19,8 +19,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import gevent.monkey
-gevent.monkey.patch_all()
+#import gevent.monkey
+#gevent.monkey.patch_all()
 import sys, os, core, config, json, requests, time, logger, threading, base64, onionr, uuid
 import onionrexceptions, onionrpeers, onionrevents as events, onionrplugins as plugins, onionrblockapi as block
 import onionrdaemontools, onionrsockets, onionrchat, onionr, onionrproofs

onionr/onionr.py

@@ -20,8 +20,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import gevent.monkey
-gevent.monkey.patch_all()
 import sys
 if sys.version_info[0] == 2 or sys.version_info[1] < 5:
     print('Error, Onionr requires Python 3.5+')
@@ -71,6 +69,9 @@ class Onionr:
         self.onionrCore = core.Core()
         self.onionrUtils = onionrutils.OnionrUtils(self.onionrCore)
 
+        self.clientAPIInst = '' # Client http api instance
+        self.publicAPIInst = '' # Public http api instance
+
         # Handle commands
 
         self.debug = False # Whole application debugging

onionr/onionrproofs.py

@@ -238,6 +238,7 @@ class POW:
                     break
                 else:
                     time.sleep(2)
+                print('boi')
         except KeyboardInterrupt:
             self.shutdown()
             logger.warn('Got keyboard interrupt while waiting for POW result, stopping')