LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-30 08:51:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

keystore bip39: minor clean-up

Browse source
This commit is contained in:
SomberNight 2019-02-13 15:03:32 +01:00
parent c8562f5362
commit e2eb051eed
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
electrum/keystore.py
View file

@ -26,7 +26,7 @@
from unicodedata import normalize from unicodedata import normalize
import hashlib import hashlib
import binascii from typing import Tuple
from . import bitcoin, ecc, constants, bip32 from . import bitcoin, ecc, constants, bip32
from .bitcoin import (deserialize_privkey, serialize_privkey, from .bitcoin import (deserialize_privkey, serialize_privkey,
@ -601,14 +601,15 @@ def bip39_to_seed(mnemonic, passphrase):
return hashlib.pbkdf2_hmac('sha512', mnemonic.encode('utf-8'), return hashlib.pbkdf2_hmac('sha512', mnemonic.encode('utf-8'),
b'mnemonic' + passphrase.encode('utf-8'), iterations = PBKDF2_ROUNDS) b'mnemonic' + passphrase.encode('utf-8'), iterations = PBKDF2_ROUNDS)
# returns tuple (is_checksum_valid, is_wordlist_valid)
def bip39_is_checksum_valid(mnemonic): def bip39_is_checksum_valid(mnemonic: str) -> Tuple[bool, bool]:
"""Test checksum of bip39 mnemonic assuming English wordlist.
Returns tuple (is_checksum_valid, is_wordlist_valid)
"""
words = [ normalize('NFKD', word) for word in mnemonic.split() ] words = [ normalize('NFKD', word) for word in mnemonic.split() ]
words_len = len(words) words_len = len(words)
wordlist = load_wordlist("english.txt") wordlist = load_wordlist("english.txt")
n = len(wordlist) n = len(wordlist)
checksum_length = 11*words_len//33
entropy_length = 32*checksum_length
i = 0 i = 0
words.reverse() words.reverse()
while words: while words:
@ -620,13 +621,12 @@ def bip39_is_checksum_valid(mnemonic):
i = i*n + k i = i*n + k
if words_len not in [12, 15, 18, 21, 24]: if words_len not in [12, 15, 18, 21, 24]:
return False, True return False, True
checksum_length = 11 * words_len // 33 # num bits
entropy_length = 32 * checksum_length # num bits
entropy = i >> checksum_length entropy = i >> checksum_length
checksum = i % 2**checksum_length checksum = i % 2**checksum_length
h = '{:x}'.format(entropy) entropy_bytes = int.to_bytes(entropy, length=entropy_length//8, byteorder="big")
while len(h) < entropy_length/4: hashed = int.from_bytes(sha256(entropy_bytes), byteorder="big")
h = '0'+h
b = bytearray.fromhex(h)
hashed = int(binascii.hexlify(sha256(b)), 16)
calculated_checksum = hashed >> (256 - checksum_length) calculated_checksum = hashed >> (256 - checksum_length)
return checksum == calculated_checksum, True return checksum == calculated_checksum, True