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

Encode WIF string before passing to highlevelcrypto.decodeWalletImportFormat()

Browse Source
This commit is contained in:
Lee Miller 2024-04-14 04:31:02 +03:00
parent acab92c561
commit d547a8be2f
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/class_singleWorker.py
View File

@ -201,10 +201,11 @@ class singleWorker(StoppableThread):
'Could not read or decode privkey for address %s', address) 'Could not read or decode privkey for address %s', address)
raise ValueError raise ValueError
privSigningKeyHex = hexlify( privSigningKeyHex = hexlify(highlevelcrypto.decodeWalletImportFormat(
highlevelcrypto.decodeWalletImportFormat(privSigningKeyBase58)) privSigningKeyBase58.encode()))
privEncryptionKeyHex = hexlify( privEncryptionKeyHex = hexlify(
highlevelcrypto.decodeWalletImportFormat(privEncryptionKeyBase58)) highlevelcrypto.decodeWalletImportFormat(
privEncryptionKeyBase58.encode()))
# The \x04 on the beginning of the public keys are not sent. # The \x04 on the beginning of the public keys are not sent.
# This way there is only one acceptable way to encode # This way there is only one acceptable way to encode
@ -1113,7 +1114,7 @@ class singleWorker(StoppableThread):
continue continue
privEncryptionKeyHex = hexlify( privEncryptionKeyHex = hexlify(
highlevelcrypto.decodeWalletImportFormat( highlevelcrypto.decodeWalletImportFormat(
privEncryptionKeyBase58)) privEncryptionKeyBase58.encode()))
pubEncryptionKeyBase256 = unhexlify(highlevelcrypto.privToPub( pubEncryptionKeyBase256 = unhexlify(highlevelcrypto.privToPub(
privEncryptionKeyHex))[1:] privEncryptionKeyHex))[1:]
requiredAverageProofOfWorkNonceTrialsPerByte = \ requiredAverageProofOfWorkNonceTrialsPerByte = \

4
src/shared.py
View File

@ -102,8 +102,8 @@ def reloadMyAddressHashes():
# Returns a simple 32 bytes of information encoded in 64 Hex characters # Returns a simple 32 bytes of information encoded in 64 Hex characters
try: try:
privEncryptionKey = hexlify( privEncryptionKey = hexlify(
highlevelcrypto.decodeWalletImportFormat( highlevelcrypto.decodeWalletImportFormat(config.get(
config.get(addressInKeysFile, 'privencryptionkey') addressInKeysFile, 'privencryptionkey').encode()
)) ))
except ValueError: except ValueError:
logger.error( logger.error(