remove merkletools dependency

plugins/Bigfile/BigfilePlugin.py

@@ -15,9 +15,7 @@
 from Plugin import PluginManager
 from Debug import Debug
 from Crypt import CryptHash
-with warnings.catch_warnings():
- warnings.filterwarnings("ignore") # Ignore missing sha3 warning
- import merkletools
+from .merkletools import MerkleTools
 
 from util import helper
 from util import Msgpack
@@ -287,8 +285,7 @@ def hashBigfile(self, read_func, size, piece_size=1024 * 1024, file_out=None):
  piece_hashes = []
  piece_recv = 0
 
- mt = merkletools.MerkleTools()
- mt.hash_function = CryptHash.sha512t
+ mt = MerkleTools()
 
  part = ""
  for part in self.readFile(read_func, size):

plugins/Bigfile/merkletools.py

@@ -0,0 +1,104 @@
+import hashlib
+import binascii
+import sys
+from Crypt import CryptHash
+
+class MerkleTools(object):
+ def __init__(self):
+ self.hash_function = CryptHash.sha512t
+ self.reset_tree()
+
+ def reset_tree(self):
+ self.leaves = list()
+ self.levels = None
+ self.is_ready = False
+
+ def add_leaf(self, values, do_hash=False):
+ self.is_ready = False
+ # check if single leaf
+ if not isinstance(values, tuple) and not isinstance(values, list):
+ values = [values]
+ for v in values:
+ if do_hash:
+ v = v.encode('utf-8')
+ v = self.hash_function(v).hexdigest()
+ v = bytearray.fromhex(v)
+ self.leaves.append(v)
+
+ def get_leaf(self, index):
+ return self.leaves[index].hex()
+
+ def get_leaf_count(self):
+ return len(self.leaves)
+
+ def get_tree_ready_state(self):
+ return self.is_ready
+
+ def _calculate_next_level(self):
+ solo_leave = None
+ N = len(self.levels[0]) # number of leaves on the level
+ if N % 2 == 1: # if odd number of leaves on the level
+ solo_leave = self.levels[0][-1]
+ N -= 1
+
+ new_level = []
+ for l, r in zip(self.levels[0][0:N:2], self.levels[0][1:N:2]):
+ new_level.append(self.hash_function(l+r).digest())
+ if solo_leave is not None:
+ new_level.append(solo_leave)
+ self.levels = [new_level, ] + self.levels # prepend new level
+
+ def make_tree(self):
+ self.is_ready = False
+ if self.get_leaf_count() > 0:
+ self.levels = [self.leaves, ]
+ while len(self.levels[0]) > 1:
+ self._calculate_next_level()
+ self.is_ready = True
+
+ def get_merkle_root(self):
+ if self.is_ready:
+ if self.levels is not None:
+ return self.levels[0][0].hex()
+ else:
+ return None
+ else:
+ return None
+
+ def get_proof(self, index):
+ if self.levels is None:
+ return None
+ elif not self.is_ready or index > len(self.leaves)-1 or index < 0:
+ return None
+ else:
+ proof = []
+ for x in range(len(self.levels) - 1, 0, -1):
+ level_len = len(self.levels[x])
+ if (index == level_len - 1) and (level_len % 2 == 1): # skip if this is an odd end node
+ index = int(index / 2.)
+ continue
+ is_right_node = index % 2
+ sibling_index = index - 1 if is_right_node else index + 1
+ sibling_pos = "left" if is_right_node else "right"
+ sibling_value = self.levels[x][sibling_index].hex()
+ proof.append({sibling_pos: sibling_value})
+ index = int(index / 2.)
+ return proof
+
+ def validate_proof(self, proof, target_hash, merkle_root):
+ merkle_root = bytearray.fromhex(merkle_root)
+ target_hash = bytearray.fromhex(target_hash)
+ if len(proof) == 0:
+ return target_hash == merkle_root
+ else:
+ proof_hash = target_hash
+ for p in proof:
+ try:
+ # the sibling is a left node
+ sibling = bytearray.fromhex(p['left'])
+ proof_hash = self.hash_function(sibling + proof_hash).digest()
+ except:
+ # the sibling is a right node
+ sibling = bytearray.fromhex(p['right'])
+ proof_hash = self.hash_function(proof_hash + sibling).digest()
+ return proof_hash == merkle_root

plugins/Stats/StatsPlugin.py

@@ -592,7 +592,7 @@ def testEnv(self, format="text"):
 
  yield self.formatHead("Libraries:")
  rows = []
- for lib_name in ["gevent", "greenlet", "msgpack", "base58", "merkletools", "rsa", "socks", "pyasn1", "gevent_ws", "websocket", "maxminddb"]:
+ for lib_name in ["gevent", "greenlet", "msgpack", "base58", "rsa", "socks", "pyasn1", "gevent_ws", "websocket", "maxminddb"]:
  try:
  module = importlib.import_module(lib_name)
  if "__version__" in dir(module):

requirements.txt

@@ -3,7 +3,6 @@ greenlet==0.4.16; python_version <= "3.6"
 gevent>=20.9.0; python_version >= "3.7"
 msgpack>=0.4.4
 base58
-merkletools
 rsa
 PySocks>=1.6.8
 pyasn1