Merge pull request #509 from multiversx/fetch-address-hrp-from-network

Fetch HRP from network if possible

Author: popenta

multiversx_sdk_cli/cli_faucet.py

@@ -28,7 +28,7 @@ def setup_parser(args: list[str], subparsers: Any) -> Any:
     sub = cli_shared.add_command_subparser(subparsers, "faucet", "request", "Request xEGLD.")
     cli_shared.add_wallet_args(args, sub)
     sub.add_argument("--chain", choices=["D", "T"], help="the chain identifier")
-    sub.add_argument("--api-url", type=str, help="custom api url for the native auth client")
+    sub.add_argument("--api", type=str, help="custom api url for the native auth client")
     sub.add_argument("--wallet-url", type=str, help="custom wallet url to call the faucet from")
     sub.set_defaults(func=faucet)
 
@@ -75,12 +75,12 @@ def get_wallet_and_api_urls(args: Any) -> tuple[str, str]:
 
 def get_custom_wallet_and_api_urls(args: Any) -> tuple[str, str]:
     wallet = args.wallet_url
-    api = args.api_url
+    api = args.api
 
     if not wallet:
         raise ArgumentsNotProvidedError("--wallet-url not provided")
 
     if not api:
-        raise ArgumentsNotProvidedError("--api-url not provided")
+        raise ArgumentsNotProvidedError("--api not provided")
 
     return wallet, api

multiversx_sdk_cli/cli_shared.py

@@ -8,6 +8,7 @@
 from multiversx_sdk import (
     Account,
     Address,
+    ApiNetworkProvider,
     LedgerAccount,
     ProxyNetworkProvider,
     Transaction,
@@ -282,7 +283,7 @@ def parse_omit_fields_arg(args: Any) -> list[str]:
 
 
 def prepare_account(args: Any):
-    hrp = config.get_address_hrp()
+    hrp = _get_address_hrp(args)
 
     if args.pem:
         return Account.new_from_pem(file_path=Path(args.pem), index=args.sender_wallet_index, hrp=hrp)
@@ -302,8 +303,39 @@ def prepare_account(args: Any):
         raise errors.NoWalletProvided()
 
 
+def _get_address_hrp(args: Any) -> str:
+    """If proxy is provided, fetch the hrp from the network, otherwise get the hrp from config"""
+    hrp: str = ""
+
+    if hasattr(args, "proxy") and args.proxy:
+        hrp = _get_hrp_from_proxy(args)
+    elif hasattr(args, "api") and args.api:
+        hrp = _get_hrp_from_api(args)
+
+    if hrp:
+        return hrp
+
+    return config.get_address_hrp()
+
+
+def _get_hrp_from_proxy(args: Any) -> str:
+    network_provider_config = config.get_config_for_network_providers()
+    proxy = ProxyNetworkProvider(url=args.proxy, config=network_provider_config)
+    network_config = proxy.get_network_config()
+    hrp: str = network_config.raw.get("erd_address_hrp", "")
+    return hrp
+
+
+def _get_hrp_from_api(args: Any) -> str:
+    network_provider_config = config.get_config_for_network_providers()
+    proxy = ApiNetworkProvider(url=args.api, config=network_provider_config)
+    network_config = proxy.get_network_config()
+    hrp: str = network_config.raw.get("erd_address_hrp", "")
+    return hrp
+
+
 def load_guardian_account(args: Any) -> Union[IAccount, None]:
-    hrp = config.get_address_hrp()
+    hrp = _get_address_hrp(args)
 
     if args.guardian_pem:
         return Account.new_from_pem(file_path=Path(args.guardian_pem), index=args.guardian_wallet_index, hrp=hrp)
@@ -434,7 +466,7 @@ def _is_matching_address(account_address: Union[Address, None], args_address: Un
 
 
 def load_relayer_account(args: Any) -> Union[IAccount, None]:
-    hrp = config.get_address_hrp()
+    hrp = _get_address_hrp(args)
 
     if args.relayer_pem:
         return Account.new_from_pem(file_path=Path(args.relayer_pem), index=args.relayer_wallet_index, hrp=hrp)

multiversx_sdk_cli/config.py

@@ -57,7 +57,7 @@ def get_value(name: str) -> str:
     return value
 
 
-def get_address_hrp():
+def get_address_hrp() -> str:
     return get_value("default_address_hrp")