Bitmessage/PyBitmessage-2024-12-10
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

make address.py portable for py3

Browse Source
This commit is contained in:
Muzahid 2021-09-16 13:26:18 +05:30
parent da7f5102d6
commit 3f89a1e3b7
Signed by untrusted user: cis-muzahid
GPG Key ID: 1DC85E7D3AB613EA
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/addresses.py
View File

@ -15,7 +15,6 @@ ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
def encodeBase58(num, alphabet=ALPHABET): def encodeBase58(num, alphabet=ALPHABET):
"""Encode a number in Base X """Encode a number in Base X
Args: Args:
num: The number to encode num: The number to encode
alphabet: The alphabet to use for encoding alphabet: The alphabet to use for encoding
@ -159,13 +158,20 @@ def encodeAddress(version, stream, ripe):
raise Exception( raise Exception(
'Programming error in encodeAddress: The length of' 'Programming error in encodeAddress: The length of'
' a given ripe hash was not 20.') ' a given ripe hash was not 20.')
ripe = ripe.lstrip(b'\x00') try:
ripe = ripe.lstrip(b'\x00')
except TypeError:
ripe = ripe.lstrip(b'\x00'.decode())
storedBinaryData = encodeVarint(version) + encodeVarint(stream) + ripe storedBinaryData = encodeVarint(version).decode() + encodeVarint(stream).decode() + ripe
# Generate the checksum # Generate the checksum
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(storedBinaryData) try:
sha.update(storedBinaryData)
except TypeError:
sha.update(storedBinaryData.encode('utf-8'))
currentHash = sha.digest() currentHash = sha.digest()
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(currentHash) sha.update(currentHash)
@ -173,7 +179,7 @@ def encodeAddress(version, stream, ripe):
# FIXME: encodeBase58 should take binary data, to reduce conversions # FIXME: encodeBase58 should take binary data, to reduce conversions
# encodeBase58(storedBinaryData + checksum) # encodeBase58(storedBinaryData + checksum)
asInt = int(hexlify(storedBinaryData) + hexlify(checksum), 16) asInt = int(hexlify(storedBinaryData.encode()) + hexlify(checksum), 16)
# should it be str? If yes, it should be everywhere in the code # should it be str? If yes, it should be everywhere in the code
return 'BM-' + encodeBase58(asInt) return 'BM-' + encodeBase58(asInt)