remove config vars WALLET_BIP21_LIGHTNING and WALLET_BOLT11_FALLBACK (see #9580)

Author: ecdsa

electrum/gui/qml/components/Preferences.qml

@@ -381,24 +381,6 @@ Pane {
                         }
                     }
 
-                    RowLayout {
-                        Layout.columnSpan: 2
-                        Layout.fillWidth: true
-                        spacing: 0
-                        Switch {
-                            id: useFallbackAddress
-                            onCheckedChanged: {
-                                if (activeFocus)
-                                    Config.useFallbackAddress = checked
-                            }
-                        }
-                        Label {
-                            Layout.fillWidth: true
-                            text: qsTr('Create lightning invoices with on-chain fallback address')
-                            wrapMode: Text.Wrap
-                        }
-                    }
-
                     PrefsHeading {
                         Layout.columnSpan: 2
                         text: qsTr('Advanced')
@@ -460,7 +442,6 @@ Pane {
         fiatEnable.checked = Daemon.fx.enabled
         spendUnconfirmed.checked = Config.spendUnconfirmed
         useTrampolineRouting.checked = !Config.useGossip
-        useFallbackAddress.checked = Config.useFallbackAddress
         enableDebugLogs.checked = Config.enableDebugLogs
         alwaysAllowScreenshots.checked = Config.alwaysAllowScreenshots
         setMaxBrightnessOnQrDisplay.checked = Config.setMaxBrightnessOnQrDisplay

electrum/gui/qml/qeconfig.py

@@ -153,16 +153,6 @@ def useGossip(self, gossip):
         self.config.LIGHTNING_USE_GOSSIP = gossip
         self.useGossipChanged.emit()
 
-    useFallbackAddressChanged = pyqtSignal()
-    @pyqtProperty(bool, notify=useFallbackAddressChanged)
-    def useFallbackAddress(self):
-        return self.config.WALLET_BOLT11_FALLBACK
-
-    @useFallbackAddress.setter
-    def useFallbackAddress(self, use_fallback):
-        self.config.WALLET_BOLT11_FALLBACK = use_fallback
-        self.useFallbackAddressChanged.emit()
-
     enableDebugLogsChanged = pyqtSignal()
     @pyqtProperty(bool, notify=enableDebugLogsChanged)
     def enableDebugLogs(self):

electrum/gui/qt/receive_tab.py

@@ -148,8 +148,6 @@ def on_receive_swap():
         self.toolbar.insertWidget(2, self.toggle_qr_button)
 
         # menu
-        menu.addConfig(self.config.cv.WALLET_BOLT11_FALLBACK, callback=self.on_toggle_bolt11_fallback)
-        menu.addConfig(self.config.cv.WALLET_BIP21_LIGHTNING, callback=self.update_current_request)
         self.qr_menu_action = menu.addToggle(_("Show detached QR code window"), self.window.toggle_qr_window)
         menu.addAction(_("Import requests"), self.window.import_requests)
         menu.addAction(_("Export requests"), self.window.export_requests)
@@ -201,12 +199,6 @@ def expiry_dialog(self):
         self.config.WALLET_PAYREQ_EXPIRY_SECONDS = v
         self.update_expiry_text()
 
-    def on_toggle_bolt11_fallback(self):
-        if not self.wallet.lnworker:
-            return
-        self.wallet.lnworker.clear_invoices_cache()
-        self.update_current_request()
-
     def on_tab_changed(self):
         text, data, help_text, title = self.get_tab_data()
         self.window.do_copy(text, title=title)

electrum/simple_config.py

@@ -970,15 +970,6 @@ def __setattr__(self, name, value):
             _('If enabled, at most 100 satoshis might be lost due to this, per transaction.')),
     )
     WALLET_UNCONF_UTXO_FREEZE_THRESHOLD_SAT = ConfigVar('unconf_utxo_freeze_threshold', default=5_000, type_=int)
-    WALLET_BIP21_LIGHTNING = ConfigVar(
-        'bip21_lightning', default=False, type_=bool,
-        short_desc=lambda: _('Add lightning requests to bitcoin URIs'),
-        long_desc=lambda: _('This may result in large QR codes'),
-    )
-    WALLET_BOLT11_FALLBACK = ConfigVar(
-        'bolt11_fallback', default=True, type_=bool,
-        short_desc=lambda: _('Add on-chain fallback to lightning requests'),
-    )
     WALLET_PAYREQ_EXPIRY_SECONDS = ConfigVar('request_expiry', default=invoices.PR_DEFAULT_EXPIRATION_WHEN_CREATING, type_=int)
     WALLET_USE_SINGLE_PASSWORD = ConfigVar('single_password', default=False, type_=bool)
     # note: 'use_change' and 'multiple_change' are per-wallet settings

electrum/wallet.py

@@ -2671,10 +2671,7 @@ def delete_address(self, address: str) -> None:
         raise UserFacingException("this wallet cannot delete addresses")
 
     def get_request_URI(self, req: Request) -> Optional[str]:
-        lightning_invoice = None
-        if self.config.WALLET_BIP21_LIGHTNING:
-            lightning_invoice = self.get_bolt11_invoice(req)
-        return req.get_bip21_URI(lightning_invoice=lightning_invoice)
+        return req.get_bip21_URI(lightning_invoice=None)
 
     def check_expired_status(self, r: BaseInvoice, status):
         #if r.is_lightning() and r.exp == 0:
@@ -2829,7 +2826,7 @@ def get_bolt11_invoice(self, req: Request) -> str:
             amount_msat=amount_msat,
             message=req.message,
             expiry=req.exp,
-            fallback_address=req.get_address() if self.config.WALLET_BOLT11_FALLBACK else None)
+            fallback_address=None)
         return invoice
 
     def create_request(self, amount_sat: Optional[int], message: Optional[str], exp_delay: Optional[int], address: Optional[str]):