From d547a8be2f2eb42bb7f05b104317dec2ef1df362 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Sun, 14 Apr 2024 04:31:02 +0300
Subject: [PATCH] Encode WIF string before passing to
 highlevelcrypto.decodeWalletImportFormat()

---
 src/class_singleWorker.py | 9 +++++----
 src/shared.py             | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py
index 77583626..7077b697 100644
--- a/src/class_singleWorker.py
+++ b/src/class_singleWorker.py
@@ -201,10 +201,11 @@ class singleWorker(StoppableThread):
                 'Could not read or decode privkey for address %s', address)
             raise ValueError
 
-        privSigningKeyHex = hexlify(
-            highlevelcrypto.decodeWalletImportFormat(privSigningKeyBase58))
+        privSigningKeyHex = hexlify(highlevelcrypto.decodeWalletImportFormat(
+            privSigningKeyBase58.encode()))
         privEncryptionKeyHex = hexlify(
-            highlevelcrypto.decodeWalletImportFormat(privEncryptionKeyBase58))
+            highlevelcrypto.decodeWalletImportFormat(
+                privEncryptionKeyBase58.encode()))
 
         # The \x04 on the beginning of the public keys are not sent.
         # This way there is only one acceptable way to encode
@@ -1113,7 +1114,7 @@ class singleWorker(StoppableThread):
                     continue
                 privEncryptionKeyHex = hexlify(
                     highlevelcrypto.decodeWalletImportFormat(
-                        privEncryptionKeyBase58))
+                        privEncryptionKeyBase58.encode()))
                 pubEncryptionKeyBase256 = unhexlify(highlevelcrypto.privToPub(
                     privEncryptionKeyHex))[1:]
                 requiredAverageProofOfWorkNonceTrialsPerByte = \
diff --git a/src/shared.py b/src/shared.py
index 3570864a..b85ddb20 100644
--- a/src/shared.py
+++ b/src/shared.py
@@ -102,8 +102,8 @@ def reloadMyAddressHashes():
         # Returns a simple 32 bytes of information encoded in 64 Hex characters
         try:
             privEncryptionKey = hexlify(
-                highlevelcrypto.decodeWalletImportFormat(
-                    config.get(addressInKeysFile, 'privencryptionkey')
+                highlevelcrypto.decodeWalletImportFormat(config.get(
+                    addressInKeysFile, 'privencryptionkey').encode()
                 ))
         except ValueError:
             logger.error(