RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lightning: in derivePrivKey, only do not HD derive if there is a pubkey

Browse Source
This commit is contained in:
Janus 2018-03-15 11:50:53 +01:00
parent 3bc81164a1
commit 251e5d0fd2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lightning.py
View File

@ -828,15 +828,13 @@ def privKeyForPubKey(pubKey):
def derivePrivKey(keyDesc): def derivePrivKey(keyDesc):
keyDescFam = keyDesc.keyLocator.family keyDescFam = keyDesc.keyLocator.family
keyDescIdx = keyDesc.keyLocator.index keyDescIdx = keyDesc.keyLocator.index
if keyDescFam == 0: keyDescFam = None
if keyDescIdx == 0: keyDescIdx = None
keyDescPubKey = keyDesc.pubKey keyDescPubKey = keyDesc.pubKey
privKey = None privKey = None
if len(keyDescPubKey) != 0: if len(keyDescPubKey) != 0:
privKey = privKeyForPubKey(keyDescPubKey) privKey = privKeyForPubKey(keyDescPubKey)
else: if keyDescFam == 0: keyDescFam = None
assert keyDescFam is not None and keyDescIdx is not None if keyDescIdx == 0: keyDescIdx = None
return fetchPrivKey(None, keyDescFam, keyDescIdx, privKey) return fetchPrivKey(None, keyDescFam, keyDescIdx, privKey)