Merge branch 'feat/next' into improve-guarded-accounts-flow

Author: popenta

multiversx_sdk_cli/contracts.py

@@ -36,6 +36,8 @@
 FALSE_STR_LOWER = "false"
 TRUE_STR_LOWER = "true"
 STR_PREFIX = "str:"
+ADDRESS_PREFIX = "addr:"
+MAINCHAIN_ADDRESS_HRP = "erd"
 
 
 # fmt: off
@@ -262,6 +264,14 @@ def _prepare_args_for_factory(self, arguments: list[str]) -> list[Any]:
                 args.append(BytesValue(self._hex_to_bytes(arg)))
             elif arg.isnumeric():
                 args.append(BigUIntValue(int(arg)))
+            elif arg.startswith(ADDRESS_PREFIX):
+                args.append(AddressValue.new_from_address(Address.new_from_bech32(arg[len(ADDRESS_PREFIX) :])))
+            elif arg.startswith(MAINCHAIN_ADDRESS_HRP):
+                # this flow will be removed in the future
+                logger.warning(
+                    "Address argument has no prefix. This flow will be removed in the future. Please provide each address using the `addr:` prefix. (e.g. --arguments addr:erd1...)"
+                )
+                args.append(AddressValue.new_from_address(Address.new_from_bech32(arg)))
             elif arg.startswith(get_address_hrp()):
                 args.append(AddressValue.new_from_address(Address.new_from_bech32(arg)))
             elif arg.lower() == FALSE_STR_LOWER:

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "ledgercomm[hid]",
   "rich==13.3.4",
   "argcomplete==3.2.2",
-  "multiversx-sdk[ledger]==1.1.0"
+  "multiversx-sdk[ledger]==1.2.0"
 ]
 
 [project.scripts]

requirements.txt

@@ -7,5 +7,4 @@ ledgercomm[hid]
 rich==13.3.4
 argcomplete==3.2.2
 
-# multiversx-sdk[ledger]==1.1.0
-git+https://github.com/multiversx/mx-sdk-py@feat/next#egg=multiversx_sdk
+multiversx-sdk[ledger]==1.2.0