Fix merge conflicts

onionr/static-data/default-plugins/cliui/main.py

@@ -52,7 +52,7 @@ class OnionrCLIUI:
 
         while showMenu:
             if firstRun:
-                logger.info('Please wait while Onionr starts...'')
+                logger.info('Please wait while Onionr starts...')
                 daemon = subprocess.Popen(["./onionr.py", "start"], stdin=subprocess.PIPE, stdout=subprocess.DEVNULL)
                 time.sleep(30)
                 firstRun = False
@@ -63,7 +63,6 @@ class OnionrCLIUI:
                 isOnline = "No"
 
             logger.info('''Daemon Running: ''' + isOnline + '''
-
 1. Flow (Anonymous public chat, use at your own risk)
 2. Mail (Secure email-like service)
 3. File Sharing
@@ -91,6 +90,7 @@ class OnionrCLIUI:
                 if isOnline == "Yes":
                     logger.info("Onionr daemon will shutdown...")
                     self.myCore.daemonQueueAdd('shutdown')
+
                     try:
                         daemon.kill()
                     except UnboundLocalError:

onionr/static-data/default-plugins/encrypt/main.py

@@ -72,6 +72,7 @@ class PlainEncryption:
             encrypted = self.api.get_core()._crypto.pubKeyEncrypt(plaintext, pubkey, anonymous=True, encodedData=True)
             encrypted = self.api.get_core()._utils.bytesToStr(encrypted)
             logger.info('Encrypted Message: \n\nONIONR ENCRYPTED DATA %s END ENCRYPTED DATA' % (encrypted,))
+
     def decrypt(self):
         plaintext = ""
         data = ""
@@ -102,7 +103,6 @@ class PlainEncryption:
                 logger.info("Message has good signature.")
         return
 
-
 def on_init(api, data = None):
     '''
         This event is called after Onionr is initialized, but before the command
@@ -114,4 +114,5 @@ def on_init(api, data = None):
     encrypt = PlainEncryption(pluginapi)
     api.commands.register(['encrypt'], encrypt.encrypt)
     api.commands.register(['decrypt'], encrypt.decrypt)
+    
     return

onionr/static-data/default-plugins/pms/main.py

@@ -129,8 +129,10 @@ class OnionrMail:
                 else:
                     cancel = ''
                     readBlock.verifySig()
+
                     logger.info('Message recieved from %s' % (self.myCore._utils.bytesToStr(readBlock.signer,)))
                     logger.info('Valid signature: %s' % readBlock.validSig)
+
                     if not readBlock.validSig:
                         logger.warn('This message has an INVALID signature. ANYONE could have sent this message.')
                         cancel = logger.readline('Press enter to continue to message, or -q to not open the message (recommended).')
@@ -172,6 +174,7 @@ class OnionrMail:
         for i in self.sentboxTools.listSent():
             self.sentboxList.append(i['hash'])
             self.sentMessages[i['hash']] = (i['message'], i['peer'])
+
             logger.info('%s. %s - %s - %s' % (count, i['hash'], i['peer'][:12], i['date']))
             count += 1
 

onionr/static-data/default_config.json

@@ -2,6 +2,8 @@
     "general" : {
         "dev_mode" : true,
         "display_header" : true,
+        "minimum_block_pow": 5,
+        "minimum_send_pow": 5,
 
         "minimum_block_pow": 5,
         "minimum_send_pow": 5,