SFT-4094: made a central function to get multisig policy, temporary k…

…ey multisigs default to skip

ports/stm32/boards/Passport/modules/multisig_wallet.py

@@ -158,8 +158,8 @@ def chain(self):
 
     @classmethod
     def get_trust_policy(cls):
-        from common import settings
-        return settings.get('multisig_policy', MUSIG_DEFAULT)
+        from utils import get_multisig_policy
+        return get_multisig_policy()
 
     def serialize(self):
         # return a JSON-able object

ports/stm32/boards/Passport/modules/pages/multisig_policy_setting_page.py

@@ -5,6 +5,7 @@
 
 from pages import SettingPage
 from public_constants import MUSIG_ASK, MUSIG_REQUIRE, MUSIG_SKIP, MUSIG_DEFAULT
+from utils import get_multisig_policy
 
 # Chooser for trust policy
 ch = ['Ask to Import', 'Require Existing', 'Skip Verification']
@@ -24,4 +25,4 @@ def __init__(self, card_header=None, statusbar=None):
             statusbar=statusbar,
             setting_name='multisig_policy',
             options=self.OPTIONS,
-            default_value=MUSIG_DEFAULT)
+            default_value=get_multisig_policy())

ports/stm32/boards/Passport/modules/public_constants.py

@@ -113,6 +113,7 @@
 MUSIG_ASK = const(1)
 MUSIG_SKIP = const(2)
 MUSIG_DEFAULT = MUSIG_ASK
+MUSIG_TEMP_DEFAULT = MUSIG_SKIP
 
 # Default Directories
 DIR_BACKUPS = 'backups'

ports/stm32/boards/Passport/modules/utils.py

@@ -12,7 +12,7 @@
 
 import lvgl as lv
 from constants import NUM_BACKUP_CODE_SECTIONS, NUM_DIGITS_PER_BACKUP_CODE_SECTION
-from public_constants import DIR_BACKUPS
+from public_constants import DIR_BACKUPS, MUSIG_DEFAULT, MUSIG_TEMP_DEFAULT
 from files import CardSlot
 from styles.colors import DEFAULT_LARGE_ICON_COLOR
 import ustruct
@@ -1569,4 +1569,9 @@ def insufficient_randomness(seed_words):
     return False
 
 
+def get_multisig_policy():
+    default = MUSIG_TEMP_DEFAULT if has_temporary_seed() else MUSIG_DEFAULT
+    return common.settings.get('multisig_policy', default)
+
+
 # EOF