Skip to content

Commit d547a8b

Browse files
author
Lee Miller
committed
Encode WIF string before passing to highlevelcrypto.decodeWalletImportFormat()
1 parent acab92c commit d547a8b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/class_singleWorker.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,11 @@ def _getKeysForAddress(self, address):
201201
'Could not read or decode privkey for address %s', address)
202202
raise ValueError
203203

204-
privSigningKeyHex = hexlify(
205-
highlevelcrypto.decodeWalletImportFormat(privSigningKeyBase58))
204+
privSigningKeyHex = hexlify(highlevelcrypto.decodeWalletImportFormat(
205+
privSigningKeyBase58.encode()))
206206
privEncryptionKeyHex = hexlify(
207-
highlevelcrypto.decodeWalletImportFormat(privEncryptionKeyBase58))
207+
highlevelcrypto.decodeWalletImportFormat(
208+
privEncryptionKeyBase58.encode()))
208209

209210
# The \x04 on the beginning of the public keys are not sent.
210211
# This way there is only one acceptable way to encode
@@ -1113,7 +1114,7 @@ def sendMsg(self):
11131114
continue
11141115
privEncryptionKeyHex = hexlify(
11151116
highlevelcrypto.decodeWalletImportFormat(
1116-
privEncryptionKeyBase58))
1117+
privEncryptionKeyBase58.encode()))
11171118
pubEncryptionKeyBase256 = unhexlify(highlevelcrypto.privToPub(
11181119
privEncryptionKeyHex))[1:]
11191120
requiredAverageProofOfWorkNonceTrialsPerByte = \

src/shared.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ def reloadMyAddressHashes():
102102
# Returns a simple 32 bytes of information encoded in 64 Hex characters
103103
try:
104104
privEncryptionKey = hexlify(
105-
highlevelcrypto.decodeWalletImportFormat(
106-
config.get(addressInKeysFile, 'privencryptionkey')
105+
highlevelcrypto.decodeWalletImportFormat(config.get(
106+
addressInKeysFile, 'privencryptionkey').encode()
107107
))
108108
except ValueError:
109109
logger.error(

0 commit comments

Comments
 (0)