fixup! core: refactor keychain to only support one curve at a time

core/src/apps/common/keychain.py

@@ -88,14 +88,11 @@ def __init__(
         curve: str,
         namespaces: Sequence[paths.Bip32Path],
         slip21_namespaces: Sequence[paths.Slip21Path] = (),
-        restrict: bool = True,
     ) -> None:
-        # if `restrict` is False, namespaces will not be checked
         self.seed = seed
         self.curve = curve
         self.namespaces = namespaces
         self.slip21_namespaces = slip21_namespaces
-        self.restrict = restrict
 
         self._cache = LRUCache(10)
 
@@ -108,7 +105,7 @@ def verify_path(self, path: paths.Bip32Path) -> None:
         if "ed25519" in self.curve and not paths.path_is_hardened(path):
             raise wire.DataError("Non-hardened paths unsupported on Ed25519")
 
-        if not self.restrict:
+        if device.unsafe_prompts_allowed():
             return
 
         if any(ns == path[: len(ns)] for ns in self.namespaces):
@@ -139,7 +136,7 @@ def derive(self, path: paths.Bip32Path) -> bip32.HDNode:
         )
 
     def derive_slip21(self, path: paths.Slip21Path) -> Slip21Node:
-        if self.restrict and not any(
+        if not device.unsafe_prompts_allowed() and not any(
             ns == path[: len(ns)] for ns in self.slip21_namespaces
         ):
             raise FORBIDDEN_KEY_PATH
@@ -162,13 +159,7 @@ async def get_keychain(
     slip21_namespaces: Sequence[paths.Slip21Path] = (),
 ) -> Keychain:
     seed = await get_seed(ctx)
-    keychain = Keychain(
-        seed,
-        curve,
-        namespaces,
-        slip21_namespaces,
-        restrict=not device.unsafe_prompts_allowed(),
-    )
+    keychain = Keychain(seed, curve, namespaces, slip21_namespaces)
     return keychain