renamed onionr dir and bugfixes/linting progress

src/onionrcrypto/cryptoutils/__init__.py

@@ -0,0 +1,8 @@
+from . import safecompare, replayvalidation, randomshuffle, verifypow
+from . import getpubfrompriv
+
+replay_validator = replayvalidation.replay_timestamp_validation
+random_shuffle = randomshuffle.random_shuffle
+safe_compare = safecompare.safe_compare
+verify_POW = verifypow.verify_POW
+get_pub_key_from_priv = getpubfrompriv.get_pub_key_from_priv

src/onionrcrypto/cryptoutils/getpubfrompriv.py

@@ -0,0 +1,6 @@
+from nacl import signing, encoding
+
+from onionrtypes import UserID, UserIDSecretKey
+
+def get_pub_key_from_priv(priv_key: UserIDSecretKey, raw_encoding:bool=False)->UserID:
+    return signing.SigningKey(priv_key, encoder=encoding.Base32Encoder).verify_key.encode(encoding.Base32Encoder)

src/onionrcrypto/cryptoutils/randomshuffle.py

@@ -0,0 +1,13 @@
+import secrets
+def random_shuffle(theList):
+    myList = list(theList)
+    shuffledList = []
+    myListLength = len(myList) + 1
+    while myListLength > 0:
+        removed = secrets.randbelow(myListLength)
+        try:
+            shuffledList.append(myList.pop(removed))
+        except IndexError:
+            pass
+        myListLength = len(myList)
+    return shuffledList

src/onionrcrypto/cryptoutils/replayvalidation.py

@@ -0,0 +1,6 @@
+from onionrutils import epoch
+def replay_timestamp_validation(timestamp):
+    if epoch.get_epoch() - int(timestamp) > 2419200:
+        return False
+    else:
+        return True

src/onionrcrypto/cryptoutils/safecompare.py

@@ -0,0 +1,12 @@
+import hmac
+def safe_compare(one, two):
+    # Do encode here to avoid spawning core
+    try:
+        one = one.encode()
+    except AttributeError:
+        pass
+    try:
+        two = two.encode()
+    except AttributeError:
+        pass
+    return hmac.compare_digest(one, two)

src/onionrcrypto/cryptoutils/verifypow.py

@@ -0,0 +1,38 @@
+from .. import hashers
+import config, onionrproofs, logger
+import onionrexceptions
+def verify_POW(blockContent):
+    '''
+        Verifies the proof of work associated with a block
+    '''
+    retData = False
+
+    dataLen = len(blockContent)
+
+    try:
+        blockContent = blockContent.encode()
+    except AttributeError:
+        pass
+
+    blockHash = hashers.sha3_hash(blockContent)
+    try:
+        blockHash = blockHash.decode() # bytes on some versions for some reason
+    except AttributeError:
+        pass
+    
+    difficulty = onionrproofs.getDifficultyForNewBlock(blockContent)
+    
+    if difficulty < int(config.get('general.minimum_block_pow')):
+        difficulty = int(config.get('general.minimum_block_pow'))
+    mainHash = '0000000000000000000000000000000000000000000000000000000000000000'#nacl.hash.blake2b(nacl.utils.random()).decode()
+    puzzle = mainHash[:difficulty]
+
+    if blockHash[:difficulty] == puzzle:
+        # logger.debug('Validated block pow')
+        retData = True
+    else:
+        logger.debug("Invalid token, bad proof")
+        raise onionrexceptions.InvalidProof('Proof for %s needs to be %s' % (blockHash, puzzle))
+
+    return retData
+