Correct handling of cryptopaths in gui

Author: pjkundert

slip39/api.py

@@ -411,12 +411,19 @@ def supported( cls, crypto ):
         for it, or raises an a ValueError.  Eg. "ETH"/"Ethereum" --> "ETH"
 
         """
-        validated		= cls.CRYPTO_NAMES.get(
-            crypto.lower(),
-            crypto.upper() if crypto.upper() in cls.CRYPTO_SYMBOLS else None
-        )
-        if validated:
-            return validated
+        try:
+            validated		= cls.CRYPTO_NAMES.get(
+                crypto.lower(),
+                crypto.upper() if crypto.upper() in cls.CRYPTO_SYMBOLS else None
+            )
+            if validated:
+                return validated
+        except Exception as exc:
+            validated		= exc
+            raise
+        finally:
+            log.debug( f"Validating {crypto!r} yields: {validated!r}" )
+
         raise ValueError( f"{crypto} not presently supported; specify {commas( cls.CRYPTOCURRENCIES )}" )
 
     def __str__( self ):
@@ -865,39 +872,38 @@ def path_hardened( path ):
 
 
 def cryptopaths_parser(
-    cryptocurrency,
+    cryptocurrency,  # Or a cryptopaths list, eg. ["XRP",(ETH,"m/.."),(BTC,NONE,"segwit")]
     edit			= None,
     hardened_defaults		= False,
     format			= None,
 ):
-    """Generate a standard cryptopaths list, from the given sequnce of (<crypto>,<paths>) or
-    "<crypto>[:<paths>]" cryptocurrencies (default: CRYPTO_PATHS, optionally w/ only the hardened
-    portion of the path, eg. omitting the trailing ../0/0).
+    """Generate a standard cryptopaths list, from the given sequnce of "<crypto>",
+    (<crypto>,<paths>), (<crypto>,<paths>,<format>), or "<crypto>[:<paths>[:<format>:]"
+    cryptocurrencies (default: CRYPTO_PATHS, optionally w/ only the hardened portion of the path,
+    eg. omitting the trailing ../0/0).
 
     Adjusts the provided derivation paths by an optional eg. "../-" path adjustment.
 
     A non-default format may be specified, which may change the default HD derivation path.  This
     must also be passed back, as it also affects the crypto's account's address format.
 
     """
-    cryptopaths 		= []
     for crypto in cryptocurrency or CRYPTO_PATHS:
-        try:
-            if type(crypto) is str:
-                crypto,paths	= crypto.split( ':' )   # A sequence of str
-            else:
-                crypto,paths	= crypto                # A sequence of tuples
-        except ValueError:
-            crypto,paths	= crypto,None
-        crypto			= Account.supported( crypto )
-        if paths is None:
-            paths		= Account.path_default( crypto, format )
+        if type(crypto) is str:
+            crypto		= crypto.split( ':' )
+
+        cry,*pth		= crypto
+        pth,*fmt		= pth or (None,)
+        fmt,			= fmt or (None,)
+
+        cry			= Account.supported( cry )
+        if not pth:
+            pth			= Account.path_default( cry, fmt or format )
             if hardened_defaults:
-                paths,_		= path_hardened( paths )
+                pth,_		= path_hardened( pth )
         if edit:
-            paths		= path_edit( paths, edit )
-        cryptopaths.append( (crypto,paths,format) )
-    return cryptopaths
+            pth			= path_edit( pth, edit )
+        yield (cry,pth,fmt)
 
 
 def random_secret(
@@ -1217,9 +1223,9 @@ def accountgroups(
     master_secret: Union[str,bytes],
     cryptopaths: Optional[Sequence[Union[str,Tuple[str,str],Tuple[str,str,str]]]] = None,  # default: ETH, BTC at default path, format
     allow_unbounded: bool	= True,
-    passphrase: Optional[Union[bytes,str]] = None,  # If mnemonic(s) provided, then passphrase/using_bip39 optional
+    passphrase: Optional[Union[bytes,str]] = None,	# If mnemonic(s) provided, then passphrase/using_bip39 optional
     using_bip39: bool		= False,
-    format: Optional[str]	= None,
+    format: Optional[str]	= None,			# If the default format for every cryptopath isn't desired
     edit: Optional[str]		= None,
     hardened_defaults: bool	= False,
 ) -> Sequence[Sequence[Account]]:

slip39/generator/main.py

@@ -290,12 +290,12 @@ def healthy_reset( file ):  # noaq: F811
     #     --xpub --crypto BTC
     #
     # is specified, emit BTC "zpub..." xpubkeys at m/84'/0'/0', m/84'/0'/1', ...
-    cryptopaths			= cryptopaths_parser(
+    cryptopaths			= list( cryptopaths_parser(
         args.cryptocurrency,
         edit			= args.path,
         hardened_defaults	= args.xpub,
         format			= format,
-    )
+    ))
 
     #
     # Set up serial device, if desired.  We will attempt to send each record using hardware flow

slip39/gui/main.py

@@ -1422,7 +1422,7 @@ def deficiency( *deficiencies ):
         # See what Cryptocurrencies and Paper Wallets are desired, by what checkboxes are clicked.
         # If none are, then the default (BTC, ETH) will be defaulted.
         cs_rec			= set( c for c in Account.CRYPTOCURRENCIES if values.get( f"-CRYPTO-{c}-" ) )
-        cps_rec			= cryptopaths_parser( cryptocurrency=cs_rec, edit=edit )
+        cps_rec			= list( cryptopaths_parser( cryptocurrency=cs_rec, edit=edit ))
         if cs_rec != cryptocurrency or cps_rec != cryptopaths:
             log.info( "Updating SLIP-39 due to changing Cryptocurrencies" )
             cryptocurrency	= cs_rec

slip39/layout/pdf.py

@@ -417,7 +417,7 @@ def write_pdfs(
 
     group_threshold		= int( group_threshold ) if group_threshold else math.ceil( len( groups ) * GROUP_THRESHOLD_RATIO )
 
-    cryptopaths			= cryptopaths_parser( cryptocurrency, edit=edit )
+    cryptopaths			= list( cryptopaths_parser( cryptocurrency, edit=edit ))
 
     # If account details not provided in names, generate them.  If using_bip39 is specified, this is
     # where we use BIP-39 Seed generation to produce the wallet Seed, instead of SLIP-39 which uses
@@ -615,7 +615,7 @@ def write_pdfs(
             assert eth_account, \
                 "The optional eth-account package is required to support output of encrypted JSON wallets\n" \
                 "    python3 -m pip install eth-account"
-            assert any( 'ETH' == crypto for crypto,paths in cryptopaths ), \
+            assert any( 'ETH' == crypto for crypto,*_ in cryptopaths ), \
                 "--json is only valid if '--crypto ETH' wallets are specified"
 
             for eth in (