AaronFiore/electrum
1
0
Fork 0
Code Activity

lightning: complete moving of lightning objects, acquire net/wallet lock while answering lightning requests

Browse Source
This commit is contained in:
Janus
2018-03-15 17:38:02 +01:00
committed by ThomasV
parent 98f6f67c6b
commit d84eab0418
6 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/kivy/uix/dialogs/lightning_channels.py
View File

@@ -31,12 +31,12 @@ class LightningChannelsDialog(Factory.Popup):
super(LightningChannelsDialog, self).open(*args, **kwargs)
for i in self.clocks: i.cancel()
self.clocks.append(Clock.schedule_interval(self.fetch_channels, 10))
self.app.wallet.lightning.subscribe(self.rpc_result_handler)
self.app.wallet.network.lightningrpc.subscribe(self.rpc_result_handler)
def dismiss(self, *args, **kwargs):
super(LightningChannelsDialog, self).dismiss(*args, **kwargs)
self.app.wallet.lightning.clearSubscribers()
self.app.wallet.network.lightningrpc.clearSubscribers()
def fetch_channels(self, dw):
lightning.lightningCall(self.app.wallet.lightning, "listchannels")()
lightning.lightningCall(self.app.wallet.network.lightningrpc, "listchannels")()
def rpc_result_handler(self, res):
if isinstance(res, Exception):
raise res

8
gui/kivy/uix/dialogs/lightning_payer.py
View File

@@ -47,11 +47,11 @@ class LightningPayerDialog(Factory.Popup):
def emit(self2, data):
self.app.show_info(data)
class MyConsole:
newResult = FakeQtSignal()
self.app.wallet.lightning.setConsole(MyConsole())
new_lightning_result = FakeQtSignal()
self.app.wallet.network.lightningrpc.setConsole(MyConsole())
def dismiss(self, *args, **kwargs):
super(LightningPayerDialog, self).dismiss(*args, **kwargs)
self.app.wallet.lightning.setConsole(None)
self.app.wallet.network.lightningrpc.setConsole(None)
def do_paste_sample(self):
self.invoice_data = "lnbc1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdpl2pkx2ctnv5sxxmmwwd5kgetjypeh2ursdae8g6twvus8g6rfwvs8qun0dfjkxaq8rkx3yf5tcsyz3d73gafnh3cax9rn449d9p5uxz9ezhhypd0elx87sjle52x86fux2ypatgddc6k63n7erqz25le42c4u4ecky03ylcqca784w"
def do_paste(self):
@@ -63,6 +63,6 @@ class LightningPayerDialog(Factory.Popup):
def do_clear(self):
self.invoice_data = ""
def do_pay(self):
lightning.lightningCall(self.app.wallet.lightning, "sendpayment")("--pay_req=" + self.invoice_data)
lightning.lightningCall(self.app.wallet.network.lightningrpc, "sendpayment")("--pay_req=" + self.invoice_data)
def on_lightning_qr(self):
self.app.show_info("Lightning Invoice QR scanning not implemented") #TODO