Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

Improve structure.Object:

Browse Source 
- use shared.stream instead of hardcoded 1;
  - reuse pow_initial_hash() in is_valid().
This commit is contained in:
Lee Miller 2023-08-11 20:30:50 +03:00
parent 218905739c
commit 399fc6f21f
Signed by: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
minode/structure.py
View File

@ -112,18 +112,16 @@ class Object():
'Invalid object %s, reason: payload is too long', 'Invalid object %s, reason: payload is too long',
base64.b16encode(self.vector).decode()) base64.b16encode(self.vector).decode())
return False return False
if self.stream_number != 1: if self.stream_number != shared.stream:
logging.warning( logging.warning(
'Invalid object %s, reason: not in stream 1', 'Invalid object %s, reason: not in stream %i',
base64.b16encode(self.vector).decode()) base64.b16encode(self.vector).decode(), shared.stream)
return False return False
data = self.to_bytes()[8:]
# length = len(data) + 8 + shared.payload_length_extra_bytes
# dt = max(self.expires_time - time.time(), 0)
h = hashlib.sha512(data).digest()
pow_value = int.from_bytes( pow_value = int.from_bytes(
hashlib.sha512(hashlib.sha512( hashlib.sha512(hashlib.sha512(
self.nonce + h).digest()).digest()[:8], 'big') self.nonce + self.pow_initial_hash()
).digest()).digest()[:8], 'big')
target = self.pow_target() target = self.pow_target()
if target < pow_value: if target < pow_value:
logging.warning( logging.warning(