rebase on SeedSigner#807

Author: notTanveer

src/seedsigner/models/seed_storage.py

@@ -1,19 +1,15 @@
 from typing import List
-from seedsigner.models.seed import Seed, ElectrumSeed, InvalidSeedException
+from seedsigner.models.seed import Seed, InvalidSeedException
 from seedsigner.models.settings_definition import SettingsConstants
 
 
 
 class SeedStorage:
-    PENDING_SEED_TYPE__BIP39 = "bip39"
-    PENDING_SEED_TYPE__ELECTRUM = "electrum"
-    # future TODO: PENDING_SEED_TYPE_SLIP39 = "slip39"
-    
     def __init__(self) -> None:
         self.seeds: List[Seed] = []
         self.pending_seed: Seed = None
         self._pending_mnemonic: List[str] = []
-        self._pending_seed_type: str = self.PENDING_SEED_TYPE__BIP39
+        self._pending_Seed_cls = None
 
 
     def set_pending_seed(self, seed: Seed):
@@ -39,15 +35,6 @@ def clear_pending_seed(self):
         self.pending_seed = None
 
 
-    def validate_mnemonic(self, mnemonic: List[str]) -> bool:
-        try:
-            Seed(mnemonic=mnemonic)
-        except InvalidSeedException as e:
-            return False
-        
-        return True
-
-
     def num_seeds(self):
         return len(self.seeds)
 
@@ -62,15 +49,10 @@ def pending_mnemonic(self) -> List[str]:
     def pending_mnemonic_length(self) -> int:
         return len(self._pending_mnemonic)
 
-    
-    @property 
-    def pending_is_bip39(self) -> bool:
-        return self._pending_seed_type == self.PENDING_SEED_TYPE__BIP39
-    
 
-    def init_pending_mnemonic(self, num_words:int = 12, seed_type: str = PENDING_SEED_TYPE__BIP39):
+    def init_pending_mnemonic(self, num_words:int = 12, seed_class = Seed):
         self._pending_mnemonic = [None] * num_words
-        self._pending_seed_type = seed_type
+        self._pending_Seed_cls = seed_class
 
 
     def update_pending_mnemonic(self, word: str, index: int):
@@ -92,23 +74,16 @@ def get_pending_mnemonic_word(self, index: int) -> str:
 
     def get_pending_mnemonic_fingerprint(self, network: str = SettingsConstants.MAINNET) -> str:
         try:
-            if self._pending_seed_type == self.PENDING_SEED_TYPE__ELECTRUM:
-                seed = ElectrumSeed(self._pending_mnemonic)
-            else:
-                seed = Seed(self._pending_mnemonic)
+            seed = self._pending_Seed_cls(self._pending_mnemonic)
             return seed.get_fingerprint(network)
         except InvalidSeedException:
             return None
 
 
     def convert_pending_mnemonic_to_pending_seed(self):
-        if self._pending_seed_type == self.PENDING_SEED_TYPE__ELECTRUM:
-            self.pending_seed = ElectrumSeed(self._pending_mnemonic)
-        else:
-            self.pending_seed = Seed(self._pending_mnemonic)
+        self.pending_seed = self._pending_Seed_cls(self._pending_mnemonic)
         self.discard_pending_mnemonic()
 
 
     def discard_pending_mnemonic(self):
         self._pending_mnemonic = []
-        self._pending_seed_type = self.PENDING_SEED_TYPE__BIP39

src/seedsigner/views/seed_views.py

@@ -13,7 +13,7 @@
 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
-from seedsigner.models.seed import Seed
+from seedsigner.models.seed import Seed, ElectrumSeed
 from seedsigner.models.settings import Settings, SettingsConstants
 from seedsigner.models.settings_definition import SettingsDefinition
 from seedsigner.models.threads import BaseThread, ThreadsafeCounter
@@ -220,7 +220,7 @@ def run(self):
         wordlist = Seed.get_wordlist(wordlist_language_code=self.settings.get_value(SettingsConstants.SETTING__WORDLIST_LANGUAGE))
         is_last_word_index = self.cur_word_index == self.controller.storage.pending_mnemonic_length - 1
         is_normal_seed_entry_mode = not self.is_calc_final_word
-        is_bip39_seed = self.controller.storage.pending_is_bip39
+        is_bip39_seed = self.controller.storage._pending_Seed_cls == Seed
 
         predict_final_seed_word = (
             is_last_word_index and 
@@ -534,7 +534,7 @@ def run(self):
                 show_back_button=False,
         )
 
-        self.controller.storage.init_pending_mnemonic(num_words=12, seed_type=self.controller.storage.PENDING_SEED_TYPE__ELECTRUM)
+        self.controller.storage.init_pending_mnemonic(num_words=12, seed_class=ElectrumSeed)
 
         return Destination(SeedMnemonicEntryView)
 

tests/test_flows_seed.py

@@ -342,7 +342,7 @@ def test_export_xpub_electrum_seed_flow(self):
             Electrum seeds should skip script type selection
         """            
         # Load a finalized Seed into the Controller
-        self.controller.storage.init_pending_mnemonic(num_words=12, seed_type=self.controller.storage.PENDING_SEED_TYPE__ELECTRUM)
+        self.controller.storage.init_pending_mnemonic(num_words=12, seed_class=ElectrumSeed)
         self.controller.storage.set_pending_seed(ElectrumSeed("regular reject rare profit once math fringe chase until ketchup century escape".split()))
         self.controller.storage.finalize_pending_seed()