seed type handling

Author: notTanveer

src/seedsigner/models/seed_storage.py

@@ -5,11 +5,15 @@
 
 
 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_is_electrum : bool = False
+        self._pending_seed_type: str = self.PENDING_SEED_TYPE_BIP39
 
 
     def set_pending_seed(self, seed: Seed):
@@ -58,10 +62,25 @@ def pending_mnemonic(self) -> List[str]:
     def pending_mnemonic_length(self) -> int:
         return len(self._pending_mnemonic)
 
+    
+    @property
+    def pending_seed_type(self) -> str:
+        return self._pending_seed_type
+    
+    
+    @property 
+    def _pending_is_bip39(self) -> bool:
+        return self._pending_seed_type == self.PENDING_SEED_TYPE_BIP39
+        
+        
+    @property
+    def _pending_is_electrum(self) -> bool:
+        return self._pending_seed_type == self.PENDING_SEED_TYPE_ELECTRUM
+
 
-    def init_pending_mnemonic(self, num_words:int = 12, is_electrum:bool = False):
+    def init_pending_mnemonic(self, num_words:int = 12, seed_type: str = None):
         self._pending_mnemonic = [None] * num_words
-        self._pending_is_electrum = is_electrum
+        self._pending_seed_type = seed_type or self.PENDING_SEED_TYPE_BIP39
 
 
     def update_pending_mnemonic(self, word: str, index: int):
@@ -83,7 +102,7 @@ def get_pending_mnemonic_word(self, index: int) -> str:
 
     def get_pending_mnemonic_fingerprint(self, network: str = SettingsConstants.MAINNET) -> str:
         try:
-            if self._pending_is_electrum:
+            if self._pending_seed_type == self.PENDING_SEED_TYPE_ELECTRUM:
                 seed = ElectrumSeed(self._pending_mnemonic)
             else:
                 seed = Seed(self._pending_mnemonic)
@@ -93,7 +112,7 @@ def get_pending_mnemonic_fingerprint(self, network: str = SettingsConstants.MAIN
 
 
     def convert_pending_mnemonic_to_pending_seed(self):
-        if self._pending_is_electrum:
+        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)
@@ -102,4 +121,4 @@ def convert_pending_mnemonic_to_pending_seed(self):
 
     def discard_pending_mnemonic(self):
         self._pending_mnemonic = []
-        self._pending_is_electrum = False
+        self._pending_seed_type = self.PENDING_SEED_TYPE_BIP39

src/seedsigner/views/seed_views.py

@@ -220,7 +220,7 @@ def run(self):
         is_final_word = (
             self.cur_word_index == self.controller.storage.pending_mnemonic_length - 1 and
             not self.is_calc_final_word and
-            not self.controller.storage._pending_is_electrum
+            self.controller.storage._pending_is_bip39  # only apply final word logic for BIP-39
         )
 
         partial_mnemonic = None
@@ -526,7 +526,7 @@ def run(self):
                 show_back_button=False,
         )
 
-        self.controller.storage.init_pending_mnemonic(num_words=12, is_electrum=True)
+        self.controller.storage.init_pending_mnemonic(num_words=12, seed_type=self.controller.storage.PENDING_SEED_TYPE_ELECTRUM)
 
         return Destination(SeedMnemonicEntryView)
 

tests/test_flows_seed.py

@@ -372,7 +372,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, is_electrum=True)
+        self.controller.storage.init_pending_mnemonic(num_words=12, seed_type=self.controller.storage.PENDING_SEED_TYPE_ELECTRUM)
         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()