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

lightning: either KeyDesc has KeyLocator, or it has PubKey, no need to handle both simultaneously

Browse Source
This commit is contained in:
Janus 2018-03-15 12:19:49 +01:00
parent 63aa8bd89e
commit c2618ecae2
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/lightning.py
View File

@ -520,37 +520,28 @@ def ComputeInputScript(json):
return msg return msg
def fetchPrivKey(str_address, keyLocatorFamily, keyLocatorIndex, privKey=None): def fetchPrivKey(str_address, keyLocatorFamily, keyLocatorIndex):
pri = None pri = None
if str_address is not None: if str_address is not None:
assert privKey is None
pri, redeem_script = WALLET.export_private_key(str_address, None) pri, redeem_script = WALLET.export_private_key(str_address, None)
if redeem_script: if redeem_script:
print("ignoring redeem script", redeem_script) print("ignoring redeem script", redeem_script)
typ, pri, compressed = bitcoin.deserialize_privkey(pri) typ, pri, compressed = bitcoin.deserialize_privkey(pri)
if keyLocatorFamily == 0 and keyLocatorIndex == 0: return EC_KEY(pri)
ks = keystore.BIP32_KeyStore({}) ks = keystore.BIP32_KeyStore({})
der = "m/0'/" der = "m/0'/"
xtype = 'p2wpkh' xtype = 'p2wpkh'
ks.add_xprv_from_seed(pri, xtype, der) ks.add_xprv_from_seed(pri, xtype, der)
elif privKey is not None:
ks = keystore.BIP32_KeyStore({})
der = "m/0'/"
xtype = 'p2wpkh'
ks.add_xprv_from_seed(privKey.secret.to_bytes(32, 'big'), xtype, der)
else: else:
ks = WALLET.keystore ks = WALLET.keystore
assert keyLocatorFamily != 0 and keyLocatorIndex != 0
if keyLocatorFamily != 0 and keyLocatorIndex != 0: if keyLocatorFamily != 0 or keyLocatorIndex != 0:
pri = ks.get_private_key([1017, keyLocatorFamily, keyLocatorIndex], password=None)[0] pri = ks.get_private_key([1017, keyLocatorFamily, keyLocatorIndex], password=None)[0]
pri = EC_KEY(pri) pri = EC_KEY(pri)
else:
if privKey is not None:
pri = privKey
assert pri is not None assert pri is not None
@ -563,8 +554,6 @@ def computeInputScript(tx, signdesc):
assert typ != bitcoin.TYPE_SCRIPT assert typ != bitcoin.TYPE_SCRIPT
assert len(signdesc.keyDescriptor.pubKey) == 0 assert len(signdesc.keyDescriptor.pubKey) == 0
#assert len(signdesc.keyDescriptor.keyLocator.family) != 0
#assert len(signdesc.keyDescriptor.keyLocator.index) != 0
pri = fetchPrivKey(str_address, signdesc.keyDescriptor.keyLocator.family, signdesc.keyDescriptor.keyLocator.index) pri = fetchPrivKey(str_address, signdesc.keyDescriptor.keyLocator.family, signdesc.keyDescriptor.keyLocator.index)
isNestedWitness = False # because NewAddress only does native addresses isNestedWitness = False # because NewAddress only does native addresses
@ -837,9 +826,9 @@ def derivePrivKey(keyDesc):
privKey = None privKey = None
if len(keyDescPubKey) != 0: if len(keyDescPubKey) != 0:
privKey = privKeyForPubKey(keyDescPubKey) return privKeyForPubKey(keyDescPubKey)
return fetchPrivKey(None, keyDescFam, keyDescIdx, privKey) return fetchPrivKey(None, keyDescFam, keyDescIdx)
def DerivePrivKey(json): def DerivePrivKey(json):
req = rpc_pb2.DerivePrivKeyRequest() req = rpc_pb2.DerivePrivKeyRequest()