Resolves issue 621 - Verify Address for exported Xpub Option

src/seedsigner/gui/screens/screen.py

@@ -1019,6 +1019,14 @@ class WarningScreen(WarningEdgesMixin, LargeIconStatusScreen):
 
 
 
+@dataclass
+class AdviceScreen(WarningEdgesMixin, LargeIconStatusScreen):
+    title: str = _mft("Advice")
+    status_icon_name: str = SeedSignerIconConstants.WARNING
+    status_color: str = "yellow"
+
+
+
 @dataclass
 class DireWarningScreen(WarningScreen):
     status_headline: str = _mft("Classified Info!")     # The colored text under the alert icon

src/seedsigner/views/scan_views.py

@@ -141,6 +141,7 @@ def run(self):
                         "address": address,
                         "script_type": script_type,
                         "network": network,
+                        **({"seed_num": self.seed_num} if "seed_num" in self.__dict__ else {})
                     }
                 )
 
@@ -209,6 +210,11 @@ class ScanAddressView(ScanView):
     instructions_text = _mft("Scan address QR")
     invalid_qr_type_message = _mft("Expected an address QR")
 
+    def __init__(self, seed_num: int=None):
+        super().__init__()
+        self.seed_num = seed_num
+
+
     @property
     def is_valid_qr_type(self):
         return self.decoder.is_address

src/seedsigner/views/seed_views.py

@@ -9,7 +9,7 @@
 
 from seedsigner.gui.components import FontAwesomeIconConstants, SeedSignerIconConstants
 from seedsigner.gui.screens import (RET_CODE__BACK_BUTTON, ButtonListScreen,
-    WarningScreen, DireWarningScreen, seed_screens)
+    WarningScreen, DireWarningScreen, seed_screens, AdviceScreen)
 from seedsigner.gui.screens.screen import ButtonOption
 from seedsigner.models.encode_qr import CompactSeedQrEncoder, GenericStaticQrEncoder, SeedQrEncoder, SpecterXPubQrEncoder, StaticXpubQrEncoder, UrXpubQrEncoder
 from seedsigner.models.qr_type import QRType
@@ -18,6 +18,7 @@
 from seedsigner.models.settings_definition import SettingsDefinition
 from seedsigner.models.threads import BaseThread, ThreadsafeCounter
 from seedsigner.views.view import NotYetImplementedView, OptionDisabledView, View, Destination, BackStackView, MainMenuView
+from seedsigner.views.scan_views import ScanAddressView
 
 logger = logging.getLogger(__name__)
 
@@ -77,9 +78,10 @@ class SeedSelectSeedView(View):
     TYPE_ELECTRUM = ButtonOption("Enter Electrum seed", FontAwesomeIconConstants.KEYBOARD)
 
 
-    def __init__(self, flow: str):
+    def __init__(self, flow: str, seed_num: int = None):
         super().__init__()
         self.flow = flow
+        self.seed_num=seed_num
 
 
     def run(self):
@@ -115,13 +117,16 @@ def run(self):
         if self.settings.get_value(SettingsConstants.SETTING__ELECTRUM_SEEDS) == SettingsConstants.OPTION__ENABLED:
             button_data.append(self.TYPE_ELECTRUM)
 
-        selected_menu_num = self.run_screen(
-            seed_screens.SeedSelectSeedScreen,
-            title=title,
-            text=text,
-            is_button_text_centered=False,
-            button_data=button_data,
-        )
+        if self.seed_num==None:
+            selected_menu_num = self.run_screen(
+                seed_screens.SeedSelectSeedScreen,
+                title=title,
+                text=text,
+                is_button_text_centered=False,
+                button_data=button_data,
+            )
+        else:
+            selected_menu_num = self.seed_num
 
         if selected_menu_num == RET_CODE__BACK_BUTTON:
             return Destination(BackStackView)
@@ -980,7 +985,9 @@ class SeedExportXpubQRDisplayView(View):
     def __init__(self, seed_num: int, coordinator: str, derivation_path: str, sig_type: str = SettingsConstants.SINGLE_SIG):
         super().__init__()
         self.seed = self.controller.get_seed(seed_num)
-
+        self.seed_num = seed_num
+        self.sig_type = sig_type
+
         encoder_args = dict(
             seed=self.seed,
             derivation=derivation_path,
@@ -1007,7 +1014,45 @@ def run(self):
             qr_encoder=self.qr_encoder
         )
 
-        return Destination(MainMenuView)
+        if self.sig_type == SettingsConstants.SINGLE_SIG:
+            return Destination(SeedExportXpubQRAskVerifyAddView, view_args={"seed_num": self.seed_num})
+        else:
+            return Destination(MainMenuView)
+
+
+
+class SeedExportXpubQRAskVerifyAddView(View):
+    """
+        Ask to the user if he wants to verify an address from wallet with exported Xpub.
+    """
+    VERIFY = ButtonOption("Scan an address", SeedSignerIconConstants.QRCODE)
+    DONE = ButtonOption("Done")
+
+    def __init__(self, seed_num: int):
+        super().__init__()
+        self.seed_num = seed_num
+
+
+    def run(self):
+        button_data = [self.VERIFY, self.DONE]
+
+        # Because we have an explicit "DONE" button, we disable "BACK" to keep the
+        # routing options sane.
+        selected_menu_num = self.run_screen(
+            AdviceScreen,
+            title="Wallet Verification",
+            status_headline = "",
+            text=_("Scan a wallet address to verify the exported xpub?"),
+            is_button_text_centered=True,
+            show_back_button=False,
+            button_data=button_data
+        )
+
+        if button_data[selected_menu_num] == self.VERIFY:
+            return Destination(ScanAddressView, view_args={"seed_num": self.seed_num}, clear_history=True)
+
+        elif button_data[selected_menu_num] == self.DONE:
+            return Destination(MainMenuView)
 
 
 
@@ -1684,13 +1729,14 @@ def run(self):
     Address verification
 ****************************************************************************"""
 class AddressVerificationStartView(View):
-    def __init__(self, address: str, script_type: str, network: str):
+    def __init__(self, address: str, script_type: str, network: str, seed_num: int=None):
         super().__init__()
         self.controller.unverified_address = dict(
             address=address,
             script_type=script_type,
             network=network
         )
+        self.seed_num=seed_num
 
 
     def run(self):
@@ -1700,26 +1746,26 @@ def run(self):
         if self.controller.unverified_address["script_type"] == SettingsConstants.LEGACY_P2PKH:
             # Legacy P2PKH addresses are always singlesig
             sig_type = SettingsConstants.SINGLE_SIG
-            destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR), skip_current_view=True)
+            destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR, seed_num=self.seed_num), skip_current_view=True)
 
         if self.controller.unverified_address["script_type"] == SettingsConstants.NESTED_SEGWIT:
             # No way to differentiate single sig from multisig
-            return Destination(AddressVerificationSigTypeView, skip_current_view=True)
+            return Destination(AddressVerificationSigTypeView, skip_current_view=True, view_args={"seed_num": self.seed_num})
 
         if self.controller.unverified_address["script_type"] == SettingsConstants.NATIVE_SEGWIT:
             if len(self.controller.unverified_address["address"]) >= 62:
                 # Mainnet/testnet are 62, regtest is 64
                 sig_type = SettingsConstants.MULTISIG
                 if self.controller.multisig_wallet_descriptor:
                     # Can jump straight to the brute-force verification View
-                    destination = Destination(SeedAddressVerificationView, skip_current_view=True)
+                    destination = Destination(SeedAddressVerificationView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR), skip_current_view=True)
                 else:
                     self.controller.resume_main_flow = Controller.FLOW__VERIFY_MULTISIG_ADDR
                     destination = Destination(LoadMultisigWalletDescriptorView, skip_current_view=True)
 
             else:
                 sig_type = SettingsConstants.SINGLE_SIG
-                destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR), skip_current_view=True)
+                destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR, seed_num=self.seed_num), skip_current_view=True)
 
         elif self.controller.unverified_address["script_type"] == SettingsConstants.TAPROOT:
             # TODO: add Taproot support
@@ -1742,6 +1788,11 @@ class AddressVerificationSigTypeView(View):
     SINGLE_SIG = ButtonOption("Single Sig")
     MULTISIG = ButtonOption("Multisig")
 
+    def __init__(self, seed_num: int=None):
+        super().__init__()
+        self.seed_num = seed_num
+
+
     def run(self):
         from seedsigner.helpers import embit_utils
         from seedsigner.controller import Controller
@@ -1760,7 +1811,7 @@ def run(self):
 
         elif button_data[selected_menu_num] == self.SINGLE_SIG:
             sig_type = SettingsConstants.SINGLE_SIG
-            destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR))
+            destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR, seed_num=self.seed_num))
 
         elif button_data[selected_menu_num] == self.MULTISIG:
             sig_type = SettingsConstants.MULTISIG

tests/screenshot_generator/generator.py

@@ -269,7 +269,8 @@ def PSBTOpReturnView_raw_hex_data_cb_before():
                 ScreenshotConfig(seed_views.SeedExportXpubCoordinatorView, dict(seed_num=0, sig_type="ss", script_type="nat")),
                 ScreenshotConfig(seed_views.SeedExportXpubWarningView, dict(seed_num=0, sig_type="msig", script_type="nes", coordinator="spd", custom_derivation="")),
                 ScreenshotConfig(seed_views.SeedExportXpubDetailsView, dict(seed_num=0, sig_type="ss", script_type="nat", coordinator="bw", custom_derivation="")),
-                #ScreenshotConfig(SeedExportXpubQRDisplayView),
+                ScreenshotConfig(seed_views.SeedExportXpubQRDisplayView, dict(seed_num=0, coordinator="bw", derivation_path="m/84'/1'/0'", sig_type="ss")),
+                ScreenshotConfig(seed_views.SeedExportXpubQRAskVerifyAddView, dict(seed_num=0)),
                 ScreenshotConfig(seed_views.SeedWordsWarningView, dict(seed_num=0)),
                 ScreenshotConfig(seed_views.SeedWordsView, dict(seed_num=0)),
                 ScreenshotConfig(seed_views.SeedWordsView, dict(seed_num=0, page_index=2), screenshot_name="SeedWordsView_2"),

tests/test_flows_seed.py

@@ -198,6 +198,7 @@ def flowtest_standard_xpub(sig_tuple, script_tuple, coord_tuple):
                     FlowStep(seed_views.SeedExportXpubWarningView, screen_return_value=0),
                     FlowStep(seed_views.SeedExportXpubDetailsView, screen_return_value=0),
                     FlowStep(seed_views.SeedExportXpubQRDisplayView, screen_return_value=0),
+                    *( [FlowStep(seed_views.SeedExportXpubQRAskVerifyAddView, screen_return_value=0), FlowStep(scan_views.ScanAddressView, screen_return_value=0) ] if sig_selection == seed_views.SeedExportXpubSigTypeView.SINGLE_SIG else [] ),
                     FlowStep(MainMenuView),
                 ]
         )
@@ -330,6 +331,8 @@ def test_export_xpub_custom_derivation_flow(self):
                 FlowStep(seed_views.SeedExportXpubWarningView, screen_return_value=0),
                 FlowStep(seed_views.SeedExportXpubDetailsView, screen_return_value=0),
                 FlowStep(seed_views.SeedExportXpubQRDisplayView, screen_return_value=0),
+                FlowStep(seed_views.SeedExportXpubQRAskVerifyAddView, screen_return_value=0),
+                FlowStep(scan_views.ScanAddressView, screen_return_value=0),                
                 FlowStep(MainMenuView),
             ]
         )
@@ -360,7 +363,7 @@ def test_export_xpub_skip_non_option_flow(self):
                 FlowStep(seed_views.SeedExportXpubCoordinatorView, is_redirect=True),
                 FlowStep(seed_views.SeedExportXpubWarningView, screen_return_value=0),
                 FlowStep(seed_views.SeedExportXpubDetailsView, screen_return_value=0),
-                FlowStep(seed_views.SeedExportXpubQRDisplayView, screen_return_value=0),
+                FlowStep(seed_views.SeedExportXpubQRDisplayView, screen_return_value=0),             
                 FlowStep(MainMenuView),
             ]
         )
@@ -392,6 +395,8 @@ def test_export_xpub_electrum_seed_flow(self):
                 FlowStep(seed_views.SeedExportXpubWarningView, screen_return_value=0),
                 FlowStep(seed_views.SeedExportXpubDetailsView, screen_return_value=0),
                 FlowStep(seed_views.SeedExportXpubQRDisplayView, screen_return_value=0),
+                FlowStep(seed_views.SeedExportXpubQRAskVerifyAddView, screen_return_value=0),
+                FlowStep(scan_views.ScanAddressView, screen_return_value=0),                
                 FlowStep(MainMenuView),
             ]
         )
@@ -674,4 +679,3 @@ def expect_unsupported_derivation(load_message: Callable):
 
         self.settings.set_value(SettingsConstants.SETTING__NETWORK, SettingsConstants.MAINNET)
         expect_unsupported_derivation(self.load_custom_derivation_into_decoder)
-