electrum

commit 6f246b90bfc24c534d21aee8ccec8aa69cefbd39
parent 11c6fce7bf68d1acbdddf38ee789689fb1522a29
Author: SomberNight <somber.night@protonmail.com>
Date:   Tue,  5 Jun 2018 17:31:07 +0200

wait for peer.initialized in channel_establishment_flow

Diffstat:
M
lib/lnbase.py
 | 
1
+
M
lib/lnworker.py
 | 
1
+

2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/lnbase.py b/lib/lnbase.py
@@ -781,6 +781,7 @@ class Peer(PrintError):
         self.writer.close()
 
     async def channel_establishment_flow(self, wallet, config, password, funding_sat, push_msat, temp_channel_id):
+        await self.initialized
         # see lnd/keychain/derivation.go
         keyfamilymultisig = 0
         keyfamilyrevocationbase = 1
diff --git a/lib/lnworker.py b/lib/lnworker.py
@@ -180,6 +180,7 @@ class LNWorker(PrintError):
 
     def open_channel(self, node_id, local_amt_sat, push_amt_sat, pw):
         coro = self._open_channel_coroutine(node_id, local_amt_sat, push_amt_sat, None if pw == "" else pw)
+        # FIXME this is blocking the GUI
         return asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop).result()
 
     def pay(self, invoice):