@@ -2682,23 +2682,29 @@ def wallet_get_id(
2682
2682
[bold]Note[/bold]: This command is primarily used for informational purposes and has no side effects on the blockchain network state.
2683
2683
"""
2684
2684
wallet = None
2685
- if coldkey_ss58 :
2686
- if not is_valid_ss58_address (coldkey_ss58 ):
2687
- print_error ("You entered an invalid ss58 address" )
2688
- raise typer .Exit ()
2689
- else :
2690
- coldkey_or_ss58 = Prompt .ask (
2691
- "Enter the [blue]wallet name[/blue] or [blue]coldkey ss58 address[/blue]" ,
2692
- default = self .config .get ("wallet_name" ) or defaults .wallet .name ,
2693
- )
2694
- if is_valid_ss58_address (coldkey_or_ss58 ):
2695
- coldkey_ss58 = coldkey_or_ss58
2685
+ if not wallet_name :
2686
+ if coldkey_ss58 :
2687
+ if not is_valid_ss58_address (coldkey_ss58 ):
2688
+ print_error ("You entered an invalid ss58 address" )
2689
+ raise typer .Exit ()
2696
2690
else :
2697
- wallet_name = coldkey_or_ss58 if coldkey_or_ss58 else wallet_name
2698
- wallet = self . wallet_ask (
2699
- wallet_name , wallet_path , wallet_hotkey , ask_for = [ WO . NAME ]
2691
+ coldkey_or_ss58 = Prompt . ask (
2692
+ "Enter the [blue] wallet name[/blue] or [blue]coldkey ss58 address[/blue]" ,
2693
+ default = self . config . get ( " wallet_name" ) or defaults . wallet . name ,
2700
2694
)
2701
- coldkey_ss58 = wallet .coldkeypub .ss58_address
2695
+ if is_valid_ss58_address (coldkey_or_ss58 ):
2696
+ coldkey_ss58 = coldkey_or_ss58
2697
+ else :
2698
+ wallet_name = coldkey_or_ss58 if coldkey_or_ss58 else wallet_name
2699
+ wallet = self .wallet_ask (
2700
+ wallet_name , wallet_path , wallet_hotkey , ask_for = [WO .NAME ]
2701
+ )
2702
+ coldkey_ss58 = wallet .coldkeypub .ss58_address
2703
+ else :
2704
+ wallet = self .wallet_ask (
2705
+ wallet_name , wallet_path , wallet_hotkey , ask_for = [WO .NAME ]
2706
+ )
2707
+ coldkey_ss58 = wallet .coldkeypub .ss58_address
2702
2708
2703
2709
self .verbosity_handler (quiet , verbose )
2704
2710
return self ._run_command (
0 commit comments