LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ssl config names, add new config tab

Browse source
This commit is contained in:
ThomasV 2019-09-05 11:36:50 +02:00
parent 466c2bd293
commit 94e7e94e2f
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1804,7 +1804,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
status, msg = True, tx.txid() status, msg = True, tx.txid()
if pr and status is True: if pr and status is True:
key = pr.get_id() key = pr.get_id()
self.wallet.set_invoice_paid(key, tx.txid()) #self.wallet.set_invoice_paid(key, tx.txid())
self.payment_request = None self.payment_request = None
refund_address = self.wallet.get_receiving_address() refund_address = self.wallet.get_receiving_address()
coro = pr.send_payment_and_receive_paymentack(str(tx), refund_address) coro = pr.send_payment_and_receive_paymentack(str(tx), refund_address)
@ -2900,7 +2900,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
gui_widgets = [] gui_widgets = []
fee_widgets = [] fee_widgets = []
tx_widgets = [] tx_widgets = []
id_widgets = [] oa_widgets = []
server_widgets = []
# language # language
lang_help = _('Select which language is used in the GUI (after restart).') lang_help = _('Select which language is used in the GUI (after restart).')
@ -3017,14 +3018,14 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
set_alias_color() set_alias_color()
self.alias_received_signal.connect(set_alias_color) self.alias_received_signal.connect(set_alias_color)
alias_e.editingFinished.connect(on_alias_edit) alias_e.editingFinished.connect(on_alias_edit)
id_widgets.append((alias_label, alias_e)) oa_widgets.append((alias_label, alias_e))
# SSL certificate # SSL certificate
msg = ' '.join([ msg = ' '.join([
_('SSL certificate used to sign payment requests.'), _('SSL certificate used to sign payment requests.'),
_('Use setconfig to set ssl_chain and ssl_privkey.'), _('Use setconfig to set ssl_chain and ssl_privkey.'),
]) ])
if self.config.get('ssl_privkey') or self.config.get('ssl_chain'): if self.config.get('ssl_keyfile') and self.config.get('ssl_certfile'):
try: try:
SSL_identity = paymentrequest.check_ssl_config(self.config) SSL_identity = paymentrequest.check_ssl_config(self.config)
SSL_error = None SSL_error = None
@ -3040,7 +3041,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
if SSL_error: if SSL_error:
SSL_id_e.setToolTip(SSL_error) SSL_id_e.setToolTip(SSL_error)
SSL_id_e.setReadOnly(True) SSL_id_e.setReadOnly(True)
id_widgets.append((SSL_id_label, SSL_id_e)) server_widgets.append((SSL_id_label, SSL_id_e))
units = base_units_list units = base_units_list
msg = (_('Base unit of your wallet.') msg = (_('Base unit of your wallet.')
@ -3299,7 +3300,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
(tx_widgets, _('Transactions')), (tx_widgets, _('Transactions')),
(gui_widgets, _('General')), (gui_widgets, _('General')),
(fiat_widgets, _('Fiat')), (fiat_widgets, _('Fiat')),
(id_widgets, _('Identity')), (server_widgets, _('PayServer')),
(oa_widgets, _('OpenAlias')),
] ]
for widgets, name in tabs_info: for widgets, name in tabs_info:
tab = QWidget() tab = QWidget()

4
electrum/paymentrequest.py
View file

@ -422,8 +422,8 @@ def verify_cert_chain(chain):
def check_ssl_config(config): def check_ssl_config(config):
from . import pem from . import pem
key_path = config.get('ssl_privkey') key_path = config.get('ssl_keyfile')
cert_path = config.get('ssl_chain') cert_path = config.get('ssl_certfile')
with open(key_path, 'r', encoding='utf-8') as f: with open(key_path, 'r', encoding='utf-8') as f:
params = pem.parse_private_key(f.read()) params = pem.parse_private_key(f.read())
with open(cert_path, 'r', encoding='utf-8') as f: with open(cert_path, 'r', encoding='utf-8') as f: