fixes after review

Author: popenta

CLI.md

@@ -30,7 +30,7 @@ TOP-LEVEL OPTIONS:
   -v, --version         show program's version number and exit
   --verbose
   --log-level {debug,info,warning,error}
-                        default: debug
+                        default: info
 
 ----------------------
 COMMAND GROUPS summary
@@ -5822,12 +5822,11 @@ usage: mxpy config-wallet new [-h] ...
 Creates a new wallet config and sets it as the active wallet.
 
 positional arguments:
-  alias                the alias of the wallet
+  alias        the alias of the wallet
 
 options:
-  -h, --help           show this help message and exit
-  --path PATH          the absolute path to the wallet file
-  --template TEMPLATE  a wallet config from which to create the new config
+  -h, --help   show this help message and exit
+  --path PATH  the absolute path to the wallet file
 
 ```
 ### ConfigWallet.List
@@ -5891,31 +5890,31 @@ options:
   --alias ALIAS  the alias of the wallet
 
 ```
-### ConfigWallet.Set
+### ConfigWallet.Switch
 
 
 ```
-$ mxpy config-wallet delete --help
-usage: mxpy config-wallet delete [-h] ...
-
-Deletes a config value from the specified wallet.
+$ mxpy config-wallet switch --help
+usage: mxpy config-wallet switch [-h] ...
 
-positional arguments:
-  value          the value to delete for the specified address
+Switch to a different wallet.
 
 options:
   -h, --help     show this help message and exit
   --alias ALIAS  the alias of the wallet
 
 ```
-### ConfigWallet.Switch
+### ConfigWallet.Delete
 
 
 ```
-$ mxpy config-wallet switch --help
-usage: mxpy config-wallet switch [-h] ...
+$ mxpy config-wallet delete --help
+usage: mxpy config-wallet delete [-h] ...
 
-Switch to a different wallet.
+Deletes a config value from the specified wallet.
+
+positional arguments:
+  value          the value to delete for the specified address
 
 options:
   -h, --help     show this help message and exit
@@ -5941,7 +5940,7 @@ options:
 
 ```
 $ mxpy config-wallet reset --help
-usage: mxpy address reset [-h] ...
+usage: mxpy config-wallet reset [-h] ...
 
 Deletes the config file. No default wallet will be set.
 

CLI.md.sh

@@ -201,8 +201,8 @@ generate() {
     command "ConfigWallet.Dump" "config-wallet dump"
     command "ConfigWallet.Get" "config-wallet get"
     command "ConfigWallet.Set" "config-wallet set"
-    command "ConfigWallet.Set" "config-wallet delete"
     command "ConfigWallet.Switch" "config-wallet switch"
+    command "ConfigWallet.Delete" "config-wallet delete"
     command "ConfigWallet.Remove" "config-wallet remove"
     command "ConfigWallet.Reset" "config-wallet reset"
 

multiversx_sdk_cli/cli_config_wallet.py

@@ -11,8 +11,8 @@
     get_value,
     read_wallet_config_file,
     resolve_wallet_config_path,
-    set_active,
     set_value,
+    switch_wallet,
 )
 from multiversx_sdk_cli.utils import dump_out_json
 from multiversx_sdk_cli.ux import confirm_continuation
@@ -31,15 +31,10 @@ def setup_parser(subparsers: Any) -> Any:
     )
     sub.add_argument("alias", type=str, help="the alias of the wallet")
     sub.add_argument("--path", type=str, required=False, help="the absolute path to the wallet file")
-    sub.add_argument(
-        "--template",
-        required=False,
-        help="a wallet config from which to create the new config",
-    )
     sub.set_defaults(func=new_wallet_config)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-wallet", "list", "List configured wallets")
-    sub.set_defaults(func=list_addresses)
+    sub.set_defaults(func=list_wallets)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-wallet", "dump", "Dumps the active wallet.")
     sub.set_defaults(func=dump)
@@ -49,26 +44,26 @@ def setup_parser(subparsers: Any) -> Any:
     )
     sub.add_argument("value", type=str, help="the value to get from the specified wallet (e.g. path)")
     _add_alias_arg(sub)
-    sub.set_defaults(func=get_address_config_value)
+    sub.set_defaults(func=get_wallet_config_value)
 
     sub = cli_shared.add_command_subparser(
         subparsers, "config-wallet", "set", "Sets a config value for the specified wallet."
     )
     sub.add_argument("key", type=str, help="the key to set for the specified wallet (e.g. index)")
     sub.add_argument("value", type=str, help="the value to set for the specified key")
     _add_alias_arg(sub)
-    sub.set_defaults(func=set_address_config_value)
+    sub.set_defaults(func=set_wallet_config_value)
 
     sub = cli_shared.add_command_subparser(
         subparsers, "config-wallet", "delete", "Deletes a config value from the specified wallet."
     )
     sub.add_argument("value", type=str, help="the value to delete for the specified address")
     _add_alias_arg(sub)
-    sub.set_defaults(func=delete_address_config_value)
+    sub.set_defaults(func=delete_wallet_config_value)
 
     sub = cli_shared.add_command_subparser(subparsers, "config-wallet", "switch", "Switch to a different wallet.")
     _add_alias_arg(sub)
-    sub.set_defaults(func=switch_address)
+    sub.set_defaults(func=switch_wallet_to_active)
 
     sub = cli_shared.add_command_subparser(
         subparsers,
@@ -77,15 +72,15 @@ def setup_parser(subparsers: Any) -> Any:
         "Removes a wallet from the config using the alias. No default wallet will be set. Use `config-wallet switch` to set a new wallet.",
     )
     _add_alias_arg(sub)
-    sub.set_defaults(func=remove_address)
+    sub.set_defaults(func=remove_wallet)
 
     sub = cli_shared.add_command_subparser(
         subparsers,
-        "address",
+        "config-wallet",
         "reset",
         "Deletes the config file. No default wallet will be set.",
     )
-    sub.set_defaults(func=delete_address_config_file)
+    sub.set_defaults(func=delete_wallet_config_file)
 
     parser.epilog = cli_shared.build_group_epilog(subparsers)
     return subparsers
@@ -96,53 +91,53 @@ def _add_alias_arg(sub: Any):
 
 
 def new_wallet_config(args: Any):
-    create_new_wallet_config(name=args.alias, path=args.path, template=args.template)
+    create_new_wallet_config(name=args.alias, path=args.path)
     dump_out_json(get_active_wallet())
 
 
-def list_addresses(args: Any):
-    _ensure_address_config_file_exists()
+def list_wallets(args: Any):
+    _ensure_wallet_config_file_exists()
 
     data = read_wallet_config_file()
     dump_out_json(data)
 
 
 def dump(args: Any):
-    _ensure_address_config_file_exists()
+    _ensure_wallet_config_file_exists()
     dump_out_json(get_active_wallet())
 
 
-def get_address_config_value(args: Any):
-    _ensure_address_config_file_exists()
+def get_wallet_config_value(args: Any):
+    _ensure_wallet_config_file_exists()
     value = get_value(args.value, args.alias)
     print(value)
 
 
-def set_address_config_value(args: Any):
-    _ensure_address_config_file_exists()
+def set_wallet_config_value(args: Any):
+    _ensure_wallet_config_file_exists()
     set_value(args.key, args.value, args.alias)
 
 
-def delete_address_config_value(args: Any):
-    _ensure_address_config_file_exists()
+def delete_wallet_config_value(args: Any):
+    _ensure_wallet_config_file_exists()
 
     delete_config_value(args.value, args.alias)
     dump_out_json(get_active_wallet())
 
 
-def switch_address(args: Any):
-    _ensure_address_config_file_exists()
+def switch_wallet_to_active(args: Any):
+    _ensure_wallet_config_file_exists()
 
-    set_active(args.alias)
+    switch_wallet(args.alias)
     dump_out_json(get_active_wallet())
 
 
-def remove_address(args: Any):
-    _ensure_address_config_file_exists()
+def remove_wallet(args: Any):
+    _ensure_wallet_config_file_exists()
     delete_alias(args.alias)
 
 
-def delete_address_config_file(args: Any):
+def delete_wallet_config_file(args: Any):
     address_file = resolve_wallet_config_path()
     if not address_file.is_file():
         logger.info("Wallet config file not found. Aborting...")
@@ -153,7 +148,7 @@ def delete_address_config_file(args: Any):
     logger.info("Successfully deleted the address config file.")
 
 
-def _ensure_address_config_file_exists():
+def _ensure_wallet_config_file_exists():
     address_file = resolve_wallet_config_path()
     if not address_file.is_file():
         logger.info("Wallet config file not found. Aborting...")

multiversx_sdk_cli/cli_shared.py

@@ -382,7 +382,7 @@ def load_wallet_by_alias(alias: str, hrp: str) -> Account:
         raise UnknownWalletAliasError(alias)
 
     logger.info(f"Using sender [{alias}] from wallet config.")
-    return _load_wallet_from_address_config(wallet=wallet, hrp=hrp)
+    return _load_wallet_from_wallet_config(wallet=wallet, hrp=hrp)
 
 
 def load_default_wallet(hrp: str) -> Account:
@@ -394,10 +394,10 @@ def load_default_wallet(hrp: str) -> Account:
     alias_of_default_wallet = read_wallet_config_file().get("active", "")
     logger.info(f"Using sender [{alias_of_default_wallet}] from wallet config.")
 
-    return _load_wallet_from_address_config(wallet=active_wallet, hrp=hrp)
+    return _load_wallet_from_wallet_config(wallet=active_wallet, hrp=hrp)
 
 
-def _load_wallet_from_address_config(wallet: dict[str, str], hrp: str) -> Account:
+def _load_wallet_from_wallet_config(wallet: dict[str, str], hrp: str) -> Account:
     wallet_path = wallet.get("path", None)
     if not wallet_path:
         raise AddressConfigFileError("'path' field must be set in the wallet config.")

multiversx_sdk_cli/config_wallet.py

@@ -110,7 +110,7 @@ def _write_file(data: dict[str, Any]):
     write_json_file(str(env_path), data)
 
 
-def set_active(name: str):
+def switch_wallet(name: str):
     """Switches to the wallet configuration with the given name."""
     data = read_wallet_config_file()
     _guard_valid_wallet_name(data, name)
@@ -124,14 +124,11 @@ def _guard_valid_wallet_name(env: Any, name: str):
         raise UnknownWalletAliasError(name)
 
 
-def create_new_wallet_config(name: str, path: Optional[str] = None, template: Optional[str] = None):
-    """Creates a new wallet config with the given name and optional template and sets it as the default wallet."""
+def create_new_wallet_config(name: str, path: Optional[str] = None):
+    """Creates a new wallet config with the given name and sets it as the default wallet."""
     data = read_wallet_config_file()
     _guard_alias_unique(data, name)
     new_wallet = {}
-    if template:
-        _guard_valid_wallet_name(data, template)
-        new_wallet = data["wallets"][template]
 
     if path:
         new_wallet["path"] = path
@@ -143,8 +140,8 @@ def create_new_wallet_config(name: str, path: Optional[str] = None, template: Op
 
 
 def _guard_alias_unique(env: Any, name: str):
-    envs = env.get("wallets", {})
-    if name in envs:
+    wallets = env.get("wallets", {})
+    if name in wallets:
         raise AliasAlreadyExistsError(name)