AaronFiore/electrum
1
0
Fork 0
Code Activity

Remove zeroconf option for submarine swaps

Browse Source 
Since we now accept random swap providers, it is unreasonable
to keep that option.
This commit is contained in:
ThomasV
2025-03-21 18:14:19 +01:00
parent 3db26c4ecb
commit 6e92a00ec4
4 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/gui/messages.py
View File

@@ -70,7 +70,6 @@ MSG_FORWARD_SWAP_FUNDING_MEMPOOL = (
MSG_REVERSE_SWAP_FUNDING_MEMPOOL = (
_('The funding transaction has been detected.') + " " +
_('Your claiming transaction will be broadcast when the funding transaction is confirmed.') + " " +
_('You may choose to broadcast it earlier, although that would not be trustless.') + " " +
_("If you go offline before broadcasting the claiming transaction and let the swap time out, "
"you will not get back the already pre-paid mining fees.")
)

20
electrum/gui/qt/swap_dialog.py
View File

@@ -46,11 +46,10 @@ class SwapDialog(WindowModalDialog, QtEventListener):
self.is_reverse = is_reverse if is_reverse is not None else True
vbox = QVBoxLayout(self)
toolbar, menu = create_toolbar_with_menu(self.config, '')
menu.addToggle(
_('Zeroconf swap'), self.toggle_zeroconf
).setEnabled(self.lnworker.can_have_recoverable_channels())
if not self.config.SWAPSERVER_URL:
menu.addAction(_('Choose swap server'), lambda: self.window.choose_swapserver_dialog(transport))
menu.addAction(
_('Choose swap server'),
lambda: self.window.choose_swapserver_dialog(transport),
).setEnabled(not self.config.SWAPSERVER_URL)
vbox.addLayout(toolbar)
self.description_label = WWLabel(self.get_description())
self.send_amount_e = BTCAmountEdit(self.window.get_decimal_point)
@@ -64,7 +63,6 @@ class SwapDialog(WindowModalDialog, QtEventListener):
# send_follows is used to know whether the send amount field / receive
# amount field should be adjusted after the fee slider was moved
self.send_follows = False
self.zeroconf = False
self.send_amount_e.follows = False
self.recv_amount_e.follows = False
self.toggle_button.clicked.connect(self.toggle_direction)
@@ -112,15 +110,6 @@ class SwapDialog(WindowModalDialog, QtEventListener):
fee_slider.update()
self.register_callbacks()
def toggle_zeroconf(self):
self.zeroconf = not self.zeroconf
if self.zeroconf:
msg = "\n\n".join([
"Zero-confirmation swap: Your wallet will not wait until the funding transaction is confirmed.",
"Note that this option is risky: the server can steal your funds if they double-spend the funding transaction."
])
self.window.show_warning(msg)
def closeEvent(self, event):
self.unregister_callbacks()
event.accept()
@@ -266,7 +255,6 @@ class SwapDialog(WindowModalDialog, QtEventListener):
transport,
lightning_amount_sat=lightning_amount,
expected_onchain_amount_sat=onchain_amount + self.swap_manager.get_swap_tx_fee(),
zeroconf=self.zeroconf,
)
try:
# we must not leave the context, so we use run_couroutine_dialog