fixes

Author: popenta

multiversx_sdk_cli/cli_contracts.py

@@ -390,7 +390,7 @@ def deploy(args: Any):
         args=args,
     )
 
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     config = TransactionsFactoryConfig(chain_id)
 
     abi = Abi.load(Path(args.abi)) if args.abi else None
@@ -442,7 +442,7 @@ def call(args: Any):
         args=args,
     )
 
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     config = TransactionsFactoryConfig(chain_id)
 
     abi = Abi.load(Path(args.abi)) if args.abi else None
@@ -487,7 +487,7 @@ def upgrade(args: Any):
         args=args,
     )
 
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     config = TransactionsFactoryConfig(chain_id)
 
     abi = Abi.load(Path(args.abi)) if args.abi else None

multiversx_sdk_cli/cli_delegation.py

@@ -395,7 +395,7 @@ def validate_arguments(args: Any):
 
 
 def _get_delegation_controller(args: Any):
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     config = TransactionsFactoryConfig(chain_id)
     delegation = DelegationOperations(config)
     return delegation

multiversx_sdk_cli/cli_shared.py

@@ -6,7 +6,7 @@
 from argparse import FileType
 from functools import cache
 from pathlib import Path
-from typing import Any, Text, Union, cast
+from typing import Any, Optional, Text, Union, cast
 
 from multiversx_sdk import (
     Account,
@@ -39,7 +39,7 @@
 from multiversx_sdk_cli.simulation import Simulator
 from multiversx_sdk_cli.transactions import send_and_wait_for_result
 from multiversx_sdk_cli.utils import log_explorer_transaction
-from multiversx_sdk_cli.ux import confirm_continuation, show_warning
+from multiversx_sdk_cli.ux import confirm_continuation
 
 logger = logging.getLogger("cli_shared")
 
@@ -509,16 +509,8 @@ def get_current_nonce_for_address(address: Address, proxy_url: Union[str, None])
 
 
 @cache
-def get_chain_id(chain_id: str, proxy_url: str) -> str:
-    if chain_id and proxy_url:
-        fetched_chain_id = _fetch_chain_id(proxy_url)
-
-        if chain_id != fetched_chain_id:
-            show_warning(
-                f"The chain ID you have provided does not match the chain ID you got from the proxy. Will use the proxy's value: '{fetched_chain_id}'"
-            )
-        return fetched_chain_id
-
+def get_chain_id(proxy_url: str, chain_id: Optional[str] = None) -> str:
+    """We know and have already validated that if chainID is not provided, proxy is provided."""
     if chain_id:
         return chain_id
 
@@ -647,8 +639,11 @@ def prepare_guardian_relayer_data(args: Any) -> GuardianRelayerData:
 
 
 def set_proxy_from_config_if_not_provided(args: Any, config: config.MxpyConfig) -> None:
-    """This function modifies the `args` object by setting the proxy from the config if not already set."""
+    """This function modifies the `args` object by setting the proxy from the config if not already set. If proxy is not needed (chainID and nonce are provided), the proxy will not be set."""
     if not args.proxy:
+        if hasattr(args, "chain") and args.chain and hasattr(args, "nonce") and args.nonce:
+            return
+
         if config.proxy_url:
             logger.info(f"Using proxy URL from config: {config.proxy_url}")
             args.proxy = config.proxy_url

multiversx_sdk_cli/cli_transactions.py

@@ -138,7 +138,7 @@ def create_transaction(args: Any):
     transfers = getattr(args, "token_transfers", None)
     transfers = prepare_token_transfers(transfers) if transfers else None
 
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     tx_controller = TransactionsController(chain_id)
 
     tx = tx_controller.create_transaction(

multiversx_sdk_cli/cli_validators.py

@@ -198,7 +198,7 @@ def do_stake(args: Any):
 
 
 def _get_validators_controller(args: Any):
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     validators = ValidatorsController(chain_id)
     return validators
 

multiversx_sdk_cli/dns.py

@@ -77,7 +77,7 @@ def register(args: Any):
     receiver = dns_address_for_name(args.name)
     data = dns_register_data(args.name)
 
-    chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
+    chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
     controller = TransactionsController(chain_id)
 
     tx = controller.create_transaction(

multiversx_sdk_cli/tests/test_cli_contracts.py

@@ -270,6 +270,7 @@ def test_contract_flow(capsys: Any):
 
 
 def test_contract_deploy_without_required_arguments():
+    """This test passes with an unaltered config. If proxy is set in the config, the test will fail due to mxpy fetching the nonce and the chain ID."""
     alice = f"{parent}/testdata/alice.pem"
     adder = f"{parent}/testdata/adder.wasm"