fixed plugins import onionrblocksapi unnecessary

onionr/onionrutils/blockmetadata/process.py

@@ -59,6 +59,7 @@ def process_block_metadata(blockHash: str):
         try:
             expireTime = int(myBlock.getHeader('expire'))
             # test that expire time is an integer of sane length (for epoch)
+            # doesn't matter if its too large because of the min() func below
             if not len(str(expireTime)) < 20: raise ValueError('timestamp invalid')
         except (ValueError, TypeError) as e:
             expireTime = onionrvalues.DEFAULT_EXPIRE + curTime

onionr/onionrutils/validatemetadata.py

@@ -89,6 +89,13 @@ def validate_metadata(metadata, block_data) -> bool:
         else:
             # if metadata loop gets no errors, it does not break, therefore metadata is valid
             # make sure we do not have another block with the same data content (prevent data duplication and replay attacks)
+
+            # Make sure time is set (validity was checked above if it is)
+            try:
+                metadata['time']
+            except KeyError:
+                return False
+
             nonce = bytesconverter.bytes_to_str(onionrcrypto.hashers.sha3_hash(block_data))
             try:
                 with open(filepaths.data_nonce_file, 'r') as nonceFile:

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

@@ -20,7 +20,6 @@
 
 # Imports some useful libraries
 import logger, config, threading, time, datetime, sys, json
-from onionrblockapi import Block
 from onionrutils import stringvalidators, bytesconverter
 from onionrcrypto import encryption, keypair, signing, getourkeypair
 import onionrexceptions, onionrusers

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

@@ -20,7 +20,7 @@
 
 # Imports some useful libraries
 import threading, time, locale, sys, os
-from onionrblockapi import Block
+from onionrblocks.onionrblockapi import Block
 import logger, config, onionrblocks
 from onionrutils import escapeansi, epoch, bytesconverter
 locale.setlocale(locale.LC_ALL, '')

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

@@ -21,7 +21,6 @@
 # useful libraries
 import logger, config
 import os, sys, json, time, random, shutil, base64, getpass, datetime, re
-from onionrblockapi import Block
 import onionrusers, onionrexceptions
 from onionrutils import stringvalidators
 

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

@@ -20,7 +20,6 @@
 
 # Imports some useful libraries
 import logger, config, threading, time, datetime
-from onionrblockapi import Block
 import onionrexceptions
 from onionrusers import onionrusers, contactmanager
 from utils import reconstructhash