Update to new Block API

onionr/api.py

@@ -22,9 +22,10 @@ from flask import request, Response, abort
 from multiprocessing import Process
 from gevent.wsgi import WSGIServer
 import sys, random, threading, hmac, hashlib, base64, time, math, os, logger, config
-
 from core import Core
+from onionrblockapi import Block
 import onionrutils, onionrcrypto
+
 class API:
     '''
         Main HTTP API (Flask)
@@ -50,7 +51,7 @@ class API:
         '''
 
         config.reload()
-        
+
         if config.get('devmode', True):
             self._developmentMode = True
             logger.set_level(logger.LEVEL_DEBUG)

onionr/communicator.py

@@ -21,6 +21,7 @@
 '''
 import sqlite3, requests, hmac, hashlib, time, sys, os, math, logger, urllib.parse, base64, binascii, random, json, threading
 import core, onionrutils, onionrcrypto, netcontroller, onionrproofs, config, onionrplugins as plugins
+from onionrblockapi import Block
 
 class OnionrCommunicate:
     def __init__(self, debug, developmentMode):
@@ -76,7 +77,7 @@ class OnionrCommunicate:
         while True:
             command = self._core.daemonQueue()
             # Process blocks based on a timer
-            self.timerTick() 
+            self.timerTick()
             # TODO: migrate below if statements to be own functions which are called in the above timerTick() function
             if self.communicatorTimers['highFailure'] == self.communicatorTimerCounts['highFailure']:
                 self.communicatorTimerCounts['highFailure'] = 0
@@ -191,7 +192,7 @@ class OnionrCommunicate:
         self.communicatorTimers[timerName] = rate
         self.communicatorTimerCounts[timerName] = 0
         self.communicatorTimerFuncs[timerName] = timerFunc
-    
+
     def timerTick(self):
         '''Increments timers "ticks" and calls funcs if applicable'''
         tName = ''

onionr/core.py

@@ -18,8 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import sqlite3, os, sys, time, math, base64, tarfile, getpass, simplecrypt, hashlib, nacl, logger, json, netcontroller, math, config
-#from Crypto.Cipher import AES
+from onionrblockapi import Block
-#from Crypto import Random
 
 import onionrutils, onionrcrypto, onionrproofs, onionrevents as events
 
@@ -111,7 +110,7 @@ class Core:
         '''
             Add an address to the address database (only tor currently)
         '''
-        if address == config.get('i2p')['ownAddr']:
+        if (not (config.is_set('i2p') and 'ownAddr' in config.get('i2p'))) or address == config.get('i2p')['ownAddr']:
             return False
         if self._utils.validateID(address):
             conn = sqlite3.connect(self.addressDB)

onionr/netcontroller.py

@@ -19,6 +19,7 @@
 '''
 
 import subprocess, os, random, sys, logger, time, signal
+from onionrblockapi import Block
 
 class NetController:
     '''

onionr/onionrutils.py

@@ -20,6 +20,7 @@
 # Misc functions that do not fit in the main api, but are useful
 import getpass, sys, requests, os, socket, hashlib, logger, sqlite3, config, binascii, time, base64, json, glob, shutil, math
 import nacl.signing, nacl.encoding
+from onionrblockapi import Block
 
 if sys.version_info < (3, 6):
     try:
@@ -347,47 +348,41 @@ class OnionrUtils:
         '''
             Find, decrypt, and return array of PMs (array of dictionary, {from, text})
         '''
-        #blocks = self._core.getBlockList()
+        blocks = Block.getBlocks(type = 'pm', core = self._core)
-        blocks = self._core.getBlocksByType('pm')
         message = ''
         sender = ''
         for i in blocks:
-            if len (i) == 0:
-                continue
             try:
-                with open('data/blocks/' + i + '.dat', 'r') as potentialMessage:
+                blockContent = i.getContent()
-                    potentialMessage = potentialMessage.read()
+
-                    blockMetadata = json.loads(potentialMessage[:potentialMessage.find('\n')])
+                try:
-                    blockContent = potentialMessage[potentialMessage.find('\n') + 1:]
+                    message = self._core._crypto.pubKeyDecrypt(blockContent, encodedData=True, anonymous=True)
+                except nacl.exceptions.CryptoError as e:
+                    pass
+                else:
+                    try:
+                        message = message.decode()
+                    except AttributeError:
+                        pass
 
                     try:
-                        message = self._core._crypto.pubKeyDecrypt(blockContent, encodedData=True, anonymous=True)
+                        message = json.loads(message)
-                    except nacl.exceptions.CryptoError as e:
+                    except json.decoder.JSONDecodeError:
                         pass
                     else:
-                        try:
+                        logger.debug('Decrypted %s:' % i.getHash())
-                            message = message.decode()
+                        logger.info(message["msg"])
-                        except AttributeError:
-                            pass
 
-                        try:
+                        signer = message["id"]
-                            message = json.loads(message)
+                        sig = message["sig"]
-                        except json.decoder.JSONDecodeError:
-                            pass
-                        else:
-                            logger.info('Decrypted %s:' % i)
-                            logger.info(message["msg"])
 
-                            signer = message["id"]
+                        if self.validatePubKey(signer):
-                            sig = message["sig"]
+                            if self._core._crypto.edVerify(message["msg"], signer, sig, encodedData=True):
-
+                                logger.info("Good signature by %s" % signer)
-                            if self.validatePubKey(signer):
-                                if self._core._crypto.edVerify(message["msg"], signer, sig, encodedData=True):
-                                    logger.info("Good signature by %s" % signer)
-                                else:
-                                    logger.warn("Bad signature by %s" % signer)
                             else:
-                                logger.warn('Bad sender id: %s' % signer)
+                                logger.warn("Bad signature by %s" % signer)
+                        else:
+                            logger.warn('Bad sender id: %s' % signer)
 
             except FileNotFoundError:
                 pass
@@ -475,7 +470,7 @@ class OnionrUtils:
 
         sys.stdout.write("\r┣{0}┫ {1}%".format(arrow + spaces, int(round(percent * 100))))
         sys.stdout.flush()
-    
+
     def getEpoch(self):
         '''returns epoch'''
         return math.floor(time.time())
@@ -504,4 +499,4 @@ def humanSize(num, suffix='B'):
         if abs(num) < 1024.0:
             return "%.1f %s%s" % (num, unit, suffix)
         num /= 1024.0
-    return "%.1f %s%s" % (num, 'Yi', suffix)
+    return "%.1f %s%s" % (num, 'Yi', suffix)

onionr/static-data/default_plugin.py

@@ -5,6 +5,7 @@
 
 # Imports some useful libraries
 import logger, config
+from onionrblockapi import Block
 
 plugin_name = '$name'