From 33318b12e06686d3fd75082f60d1daf27f7d3ff7 Mon Sep 17 00:00:00 2001 From: Janus Date: Thu, 15 Mar 2018 01:20:56 +0100 Subject: [PATCH] lightning: zero keylocator means no fancy derivation, pass keydesc argument correctly --- lib/lightning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/lightning.py b/lib/lightning.py index 64168177..b3cf6ba7 100644 --- a/lib/lightning.py +++ b/lib/lightning.py @@ -469,7 +469,7 @@ def SignOutputRaw(json): def signOutputRaw(tx, signDesc): - pri = derivePrivKey(signDesc) + pri = derivePrivKey(signDesc.keyDescriptor) pri2 = maybeTweakPrivKey(signDesc, pri) sig = rawTxInWitnessSignature(tx, signDesc.sigHashes, signDesc.inputIndex, signDesc.output.value, signDesc.witnessScript, sigHashAll, pri2) @@ -543,7 +543,7 @@ def fetchPrivKey(str_address, keyLocatorFamily, keyLocatorIndex, privKey=None): else: ks = WALLET.keystore - if keyLocatorFamily is not None or keyLocatorIndex is not None: + if keyLocatorFamily != 0 or keyLocatorIndex != 0: pri = ks.get_private_key([1017, keyLocatorFamily, keyLocatorIndex], password=None)[0] pri = EC_KEY(pri) else: