LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-12 05:29:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

restrict lightning to p2wpkh wallets

Browse source
This commit is contained in:
ThomasV 2020-02-20 20:54:26 +01:00
parent 2255b07157
commit 570167a2c4
4 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
electrum/gui/kivy/uix/ui_screens/status.kv
View file

@ -31,7 +31,7 @@ Popup:
value: app.wallet.wallet_type value: app.wallet.wallet_type
BoxLabel: BoxLabel:
text: _("Lightning:") text: _("Lightning:")
value: _('Enabled') if app.wallet.has_lightning() else _('Disabled') value: (_('Enabled') if app.wallet.has_lightning() else _('Disabled')) if app.wallet.can_have_lightning() else _('Not available')
BoxLabel: BoxLabel:
text: _("Balance") + ':' text: _("Balance") + ':'
value: app.format_amount_and_units(root.confirmed + root.unconfirmed + root.unmatured) value: app.format_amount_and_units(root.confirmed + root.unconfirmed + root.unmatured)
@ -90,6 +90,7 @@ Popup:
Button: Button:
size_hint: 0.5, None size_hint: 0.5, None
height: '48dp' height: '48dp'
disabled: not app.wallet.can_have_lightning()
text: _('Disable LN') if app.wallet.has_lightning() else _('Enable LN') text: _('Disable LN') if app.wallet.has_lightning() else _('Enable LN')
on_release: on_release:
root.dismiss() root.dismiss()

29
electrum/gui/qt/main_window.py
View file

@ -2190,20 +2190,21 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
ks_type = str(keystore_types[0]) if keystore_types else _('No keystore') ks_type = str(keystore_types[0]) if keystore_types else _('No keystore')
grid.addWidget(QLabel(ks_type), 4, 1) grid.addWidget(QLabel(ks_type), 4, 1)
# lightning # lightning
if self.wallet.has_lightning(): if self.wallet.can_have_lightning():
lightning_b = QPushButton(_('Disable')) if self.wallet.has_lightning():
lightning_b.clicked.connect(dialog.close) lightning_b = QPushButton(_('Disable'))
lightning_b.clicked.connect(self.disable_lightning) lightning_b.clicked.connect(dialog.close)
lightning_label = QLabel(_('Enabled')) lightning_b.clicked.connect(self.disable_lightning)
lightning_b.setDisabled(bool(self.wallet.lnworker.channels)) lightning_label = QLabel(_('Enabled'))
else: lightning_b.setDisabled(bool(self.wallet.lnworker.channels))
lightning_b = QPushButton(_('Enable')) else:
lightning_b.clicked.connect(dialog.close) lightning_b = QPushButton(_('Enable'))
lightning_b.clicked.connect(self.enable_lightning) lightning_b.clicked.connect(dialog.close)
lightning_label = QLabel(_('Disabled')) lightning_b.clicked.connect(self.enable_lightning)
grid.addWidget(QLabel(_('Lightning')), 5, 0) lightning_label = QLabel(_('Disabled'))
grid.addWidget(lightning_label, 5, 1) grid.addWidget(QLabel(_('Lightning')), 5, 0)
grid.addWidget(lightning_b, 5, 2) grid.addWidget(lightning_label, 5, 1)
grid.addWidget(lightning_b, 5, 2)
vbox.addLayout(grid) vbox.addLayout(grid)
if self.wallet.is_deterministic(): if self.wallet.is_deterministic():

6
electrum/lnpeer.py
View file

@ -474,8 +474,10 @@ class Peer(Logger):
initial_msat = push_msat initial_msat = push_msat
if self.is_static_remotekey(): if self.is_static_remotekey():
addr = self.lnworker.wallet.get_unused_address() wallet = self.lnworker.wallet
static_key = self.lnworker.wallet.get_public_key(addr) # just a pubkey assert wallet.txin_type == 'p2wpkh'
addr = wallet.get_unused_address()
static_key = wallet.get_public_key(addr) # just a pubkey
payment_basepoint = OnlyPubkeyKeypair(bfh(static_key)) payment_basepoint = OnlyPubkeyKeypair(bfh(static_key))
else: else:
payment_basepoint = keypair_generator(LnKeyFamily.PAYMENT_BASE) payment_basepoint = keypair_generator(LnKeyFamily.PAYMENT_BASE)

5
electrum/wallet.py
View file

@ -280,7 +280,12 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
def has_lightning(self): def has_lightning(self):
return bool(self.lnworker) return bool(self.lnworker)
def can_have_lightning(self):
# we want static_remotekey to be a wallet address
return self.txin_type == 'p2wpkh'
def init_lightning(self): def init_lightning(self):
assert self.can_have_lightning()
if self.db.get('lightning_privkey2'): if self.db.get('lightning_privkey2'):
return return
# TODO derive this deterministically from wallet.keystore at keystore generation time # TODO derive this deterministically from wallet.keystore at keystore generation time