Anchor commitments, new payment basepoint

electrum/daemon.py

@@ -539,6 +539,8 @@ def load_wallet(self, path, password, *, manual_upgrades=True) -> Optional[Abstr
             return
         wallet = Wallet(db, storage, config=self.config)
         wallet.start_network(self.network)
+        if wallet.lnworker:
+            wallet.lnworker.maybe_enable_anchors_store_password(password)
         self._wallets[path] = wallet
         return wallet
 

electrum/gui/kivy/main_window.py

@@ -655,7 +655,7 @@ def on_start(self):
             util.register_callback(self.on_channel_db, ['channel_db'])
             util.register_callback(self.set_num_peers, ['gossip_peers'])
             util.register_callback(self.set_unknown_channels, ['unknown_channels'])
-        
+
         if self.network and self.electrum_config.get('auto_connect') is None:
             self.popup_dialog("first_screen")
             # load_wallet_on_start will be called later, after initial network setup is completed
@@ -690,6 +690,8 @@ def on_wizard_success(self, storage, db, password):
         self.logger.info(f'use single password: {self._use_single_password}')
         wallet = Wallet(db, storage, config=self.electrum_config)
         wallet.start_network(self.daemon.network)
+        if wallet.lnworker:
+            wallet.lnworker.maybe_enable_anchors_store_password(password)
         self.daemon.add_wallet(wallet)
         self.load_wallet(wallet)
 

electrum/gui/qt/__init__.py

@@ -353,7 +353,7 @@ def start_new_window(self, path, uri, *, app_is_starting=False) -> Optional[Elec
     def _start_wizard_to_select_or_create_wallet(self, path) -> Optional[Abstract_Wallet]:
         wizard = InstallWizard(self.config, self.app, self.plugins, gui_object=self)
         try:
-            path, storage = wizard.select_storage(path, self.daemon.get_wallet)
+            path, storage, password = wizard.select_storage(path, self.daemon.get_wallet)
             # storage is None if file does not exist
             if storage is None:
                 wizard.path = path  # needed by trustedcoin plugin
@@ -372,6 +372,8 @@ def _start_wizard_to_select_or_create_wallet(self, path) -> Optional[Abstract_Wa
         if storage is None or db.get_action():
             return
         wallet = Wallet(db, storage, config=self.config)
+        if wallet.lnworker:
+            wallet.lnworker.maybe_enable_anchors_store_password(password)
         wallet.start_network(self.daemon.network)
         self.daemon.add_wallet(wallet)
         return wallet

electrum/gui/qt/channels_list.py

@@ -529,6 +529,13 @@ def icon(self) -> QIcon:
         return read_QIcon("nocloud")
 
 
+class ChanFeatAnchors(ChannelFeature):
+    def tooltip(self) -> str:
+        return _("This channel uses anchor outputs.")
+    def icon(self) -> QIcon:
+        return read_QIcon("anchor")
+
+
 class ChannelFeatureIcons:
     ICON_SIZE = QSize(16, 16)
 
@@ -548,6 +555,8 @@ def from_channel(cls, chan: AbstractChannel) -> 'ChannelFeatureIcons':
                 feats.append(ChanFeatTrampoline())
             if not chan.has_onchain_backup():
                 feats.append(ChanFeatNoOnchainBackup())
+            if chan.has_anchors():
+                feats.append(ChanFeatAnchors())
         return ChannelFeatureIcons(feats)
 
     def paint(self, painter: QPainter, rect: QRect) -> None:

electrum/gui/qt/installwizard.py

@@ -201,7 +201,7 @@ def __init__(self, config: 'SimpleConfig', app: QApplication, plugins: 'Plugins'
         self.raise_()
         self.refresh_gui()  # Need for QT on MacOSX.  Lame.
 
-    def select_storage(self, path, get_wallet_from_daemon) -> Tuple[str, Optional[WalletStorage]]:
+    def select_storage(self, path, get_wallet_from_daemon) -> Tuple[str, Optional[WalletStorage], Optional[str]]:
 
         vbox = QVBoxLayout()
         hbox = QHBoxLayout()
@@ -302,8 +302,9 @@ def on_filename(filename):
                 get_new_wallet_name(wallet_folder)))
         name_e.textChanged.connect(on_filename)
         name_e.setText(os.path.basename(path))
+        password = None
 
-        def run_user_interaction_loop():
+        def run_user_interaction_loop() -> Optional[str]:
             while True:
                 if self.loop.exec_() != 2:  # 2 = next
                     raise UserCancelled()
@@ -320,7 +321,7 @@ def run_user_interaction_loop():
                         password = pw_e.text()
                         try:
                             temp_storage.decrypt(password)
-                            break
+                            return password
                         except InvalidPassword as e:
                             self.show_message(title=_('Error'), msg=str(e))
                             continue
@@ -351,14 +352,14 @@ def run_user_interaction_loop():
                         raise Exception('Unexpected encryption version')
 
         try:
-            run_user_interaction_loop()
+            password = run_user_interaction_loop()
         finally:
             try:
                 pw_e.clear()
             except RuntimeError:  # wrapped C/C++ object has been deleted.
                 pass              # happens when decrypting with hw device
 
-        return temp_storage.path, (temp_storage if temp_storage.file_exists() else None)
+        return temp_storage.path, (temp_storage if temp_storage.file_exists() else None), password
 
     def run_upgrades(self, storage: WalletStorage, db: 'WalletDB') -> None:
         path = storage.path