Merge branch 'jl777' into nSPV

src/main.cpp

@@ -7503,7 +7503,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
     else if (strCommand == "getnSPV")
     {
-        if ( KOMODO_NSPV == 0 )
+        if ( KOMODO_NSPV == 0 && KOMODO_INSYNC != 0 )
         {
             std::vector<uint8_t> payload;
             vRecv >> payload;

src/tui/lib/tuilib.py

@@ -21,6 +21,24 @@ if operating_system != 'Win64' and operating_system != 'Windows':
     import readline
 
 
+class CustomProxy(Proxy):
+    def __init__(self,
+                 service_url=None,
+                 service_port=None,
+                 conf_file=None,
+                 timeout=3000):
+        config = dict()
+        if conf_file:
+            config = slickrpc.ConfigObj(conf_file)
+        if service_url:
+            config.update(self.url_to_conf(service_url))
+        if service_port:
+            config.update(rpcport=service_port)
+        elif not config.get('rpcport'):
+            config['rpcport'] = 7771
+        self.conn = self.prepare_connection(config, timeout=timeout)
+
+
 def colorize(string, color):
 
     colors = {
@@ -97,7 +115,7 @@ def def_credentials(chain):
             print("check "+coin_config_file)
             exit(1)
 
-    return(Proxy("http://%s:%s@127.0.0.1:%d"%(rpcuser, rpcpassword, int(rpcport))))
+    return(CustomProxy("http://%s:%s@127.0.0.1:%d"%(rpcuser, rpcpassword, int(rpcport))))
 
 
 def getinfo_tui(rpc_connection):