From 251e5d0fd2f3549341c2c999696c2c5d25ec0621 Mon Sep 17 00:00:00 2001
From: Janus <ysangkok@gmail.com>
Date: Thu, 15 Mar 2018 11:50:53 +0100
Subject: [PATCH] lightning: in derivePrivKey, only do not HD derive if there
 is a pubkey

---
 lib/lightning.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/lightning.py b/lib/lightning.py
index 6d19b8eb..909c514a 100644
--- a/lib/lightning.py
+++ b/lib/lightning.py
@@ -828,15 +828,13 @@ def privKeyForPubKey(pubKey):
 def derivePrivKey(keyDesc):
     keyDescFam = keyDesc.keyLocator.family
     keyDescIdx = keyDesc.keyLocator.index
-    if keyDescFam == 0: keyDescFam = None
-    if keyDescIdx == 0: keyDescIdx = None
     keyDescPubKey = keyDesc.pubKey
     privKey = None
 
     if len(keyDescPubKey) != 0:
         privKey = privKeyForPubKey(keyDescPubKey)
-    else:
-        assert keyDescFam is not None and keyDescIdx is not None
+        if keyDescFam == 0: keyDescFam = None
+        if keyDescIdx == 0: keyDescIdx = None
 
     return fetchPrivKey(None, keyDescFam, keyDescIdx, privKey)