diff --git a/shared/chains.py b/shared/chains.py index a52639d4..a0747649 100644 --- a/shared/chains.py +++ b/shared/chains.py @@ -482,11 +482,15 @@ def af_to_bip44_purpose(addr_fmt): AF_P2WPKH: 84, AF_P2TR: 86}[addr_fmt] - def addr_fmt_label(addr_fmt): - return {AF_CLASSIC: "Classic P2PKH", - AF_P2WPKH_P2SH: "P2SH-Segwit", - AF_P2WPKH: "Segwit P2WPKH"}[addr_fmt] + return { + AF_CLASSIC: "Classic P2PKH", + AF_P2WPKH_P2SH: "P2SH-Segwit", + AF_P2WPKH: "Segwit P2WPKH", + AF_P2TR: "Taproot P2TR", + AF_P2WSH: "Segwit P2WSH", + AF_P2WSH_P2SH: "P2SH-P2WSH" + }[addr_fmt] def verify_recover_pubkey(sig, digest): # verifies a message digest against a signature and recovers diff --git a/shared/miniscript.py b/shared/miniscript.py index e1f6595d..328c6bae 100644 --- a/shared/miniscript.py +++ b/shared/miniscript.py @@ -13,7 +13,7 @@ from wallet import BaseStorageWallet from menu import MenuSystem, MenuItem from ux import ux_show_story, ux_confirm, ux_dramatic_pause from files import CardSlot, CardMissingError, needs_microsd -from utils import problem_file_line, xfp2str, addr_fmt_label, truncate_address, to_ascii_printable, swab32 +from utils import problem_file_line, xfp2str, truncate_address, to_ascii_printable, swab32 from charcodes import KEY_QR, KEY_CANCEL, KEY_NFC, KEY_ENTER @@ -241,7 +241,7 @@ class MiniScriptWallet(BaseStorageWallet): async def _detail(self, new_wallet=False, is_duplicate=False, short=False): - s = addr_fmt_label(self.addr_fmt) + "\n\n" + s = chains.addr_fmt_label(self.addr_fmt) + "\n\n" if self.taproot: s += self.taproot_internal_key_detail(short=short) diff --git a/shared/utils.py b/shared/utils.py index 9759bc6e..1c1caf42 100644 --- a/shared/utils.py +++ b/shared/utils.py @@ -585,17 +585,6 @@ def chunk_writer(fd, body): dis.progress_bar_show(1) -def addr_fmt_label(addr_fmt): - return { - AF_CLASSIC: "Classic P2PKH", - AF_P2WPKH_P2SH: "P2SH-Segwit", - AF_P2WPKH: "Segwit P2WPKH", - AF_P2TR: "Taproot P2TR", - AF_P2WSH: "Segwit P2WSH", - AF_P2WSH_P2SH: "P2SH-P2WSH" - }[addr_fmt] - - def pad_raw_secret(raw_sec_str): # Chip can hold 72-bytes as a secret # every secret has 0th byte as marker