From 53bc89fb96ffc4e8788da3d7b1e1c56003210dce Mon Sep 17 00:00:00 2001
From: Janus <ysangkok@gmail.com>
Date: Fri, 9 Feb 2018 14:18:24 +0100
Subject: [PATCH] lightning: complain on encrypted wallet

---
 lib/lightning.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/lightning.py b/lib/lightning.py
index 5561d7ad..e429078f 100644
--- a/lib/lightning.py
+++ b/lib/lightning.py
@@ -696,7 +696,11 @@ class LightningWorker(ForeverCoroutineJob):
         self.config = config
         ks = self.wallet().keystore
         assert hasattr(ks, "xprv"), "Wallet must have xprv, can't be e.g. imported"
-        xprv, xpub = bitcoin.bip32_private_derivation(ks.xprv, "m/", "m/152/152/152/152")
+        try:
+            xprv = ks.get_master_private_key(None)
+        except:
+            raise BaseException("Could not get master private key, is the wallet password protected?")
+        xprv, xpub = bitcoin.bip32_private_derivation(xprv, "m/", "m/152/152/152/152")
         tupl = bitcoin.deserialize_xprv(xprv)
         privKey = tupl[-1]
         assert type(privKey) is type(bytes([]))