multiversx-sdk-cli 9.2.0b0__tar.gz → 9.3.0__tar.gz

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multiversx-sdk-cli
-Version: 9.2.0b0
+Version: 9.3.0
 Summary: MultiversX Smart Contracts Tools
 Project-URL: Homepage, https://github.com/multiversx/mx-sdk-py-cli
 Author: MultiversX

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/cli.py

@@ -19,7 +19,7 @@ import multiversx_sdk_cli.cli_transactions
 import multiversx_sdk_cli.cli_validators
 import multiversx_sdk_cli.cli_wallet
 import multiversx_sdk_cli.version
-from multiversx_sdk_cli import config, errors, ux
+from multiversx_sdk_cli import config, errors, utils, ux
 
 logger = logging.getLogger("cli")
 
@@ -38,6 +38,7 @@ def main(cli_args: List[str] = sys.argv[1:]):
 
 
 def _do_main(cli_args: List[str]):
+    utils.ensure_folder(config.SDK_PATH)
     argv_with_config_args = config.add_config_args(cli_args)
     parser = setup_parser(argv_with_config_args)
     args = parser.parse_args(argv_with_config_args)
@@ -47,6 +48,8 @@ def _do_main(cli_args: List[str]):
     else:
         logging.basicConfig(level="INFO", format='%(name)s: %(message)s', handlers=[RichHandler(show_time=False, rich_tracebacks=True)])
 
+    verify_deprecated_entries_in_config_file()
+
     if not hasattr(args, "func"):
         parser.print_help()
     else:
@@ -103,6 +106,18 @@ COMMAND GROUPS summary
     return parser
 
 
+def verify_deprecated_entries_in_config_file():
+    deprecated_keys = config.get_deprecated_entries_in_config_file()
+    if len(deprecated_keys) == 0:
+        return
+
+    message = "The following entries are deprecated. Please remove them from the `mxpy.json` config file. \n"
+    for entry in deprecated_keys:
+        message += f"{entry} \n"
+
+    ux.show_warning(message)
+
+
 if __name__ == "__main__":
     ret = main(sys.argv[1:])
     sys.exit(ret)

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/cli_contracts.py

@@ -15,6 +15,7 @@ from multiversx_sdk_cli.contract_verification import \
     trigger_contract_verification
 from multiversx_sdk_cli.contracts import SmartContract, query_contract
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
+from multiversx_sdk_cli.dependency_checker import check_if_rust_is_installed
 from multiversx_sdk_cli.docker import is_docker_installed, run_docker
 from multiversx_sdk_cli.errors import DockerMissingError, NoWalletProvided
 from multiversx_sdk_cli.interfaces import IAddress
@@ -279,11 +280,13 @@ def get_project_paths(args: Any) -> List[Path]:
 
 
 def clean(args: Any):
+    check_if_rust_is_installed()
     project_path = args.path
     projects.clean_project(Path(project_path))
 
 
 def build(args: Any):
+    check_if_rust_is_installed()
     project_paths = [Path(args.path)]
     arg_list = cli_shared.convert_args_object_to_args_list(args)
 
@@ -292,11 +295,13 @@ def build(args: Any):
 
 
 def do_report(args: Any):
+    check_if_rust_is_installed()
     args_dict = args.__dict__
     projects.do_report(args, args_dict)
 
 
 def run_tests(args: Any):
+    check_if_rust_is_installed()
     project_paths = get_project_paths(args)
     for project in project_paths:
         projects.run_tests(project, args)

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/config.py

@@ -150,7 +150,7 @@ def get_defaults() -> Dict[str, Any]:
         "dependencies.vmtools.urlTemplate.linux": "https://github.com/multiversx/mx-chain-vm-go/archive/{TAG}.tar.gz",
         "dependencies.vmtools.urlTemplate.osx": "https://github.com/multiversx/mx-chain-vm-go/archive/{TAG}.tar.gz",
         "dependencies.vmtools.urlTemplate.windows": "https://github.com/multiversx/mx-chain-vm-go/archive/{TAG}.tar.gz",
-        "dependencies.rust.tag": "nightly-2023-05-26",
+        "dependencies.rust.tag": "nightly-2023-12-11",
         "dependencies.golang.resolution": "SDK",
         "dependencies.golang.tag": "go1.20.7",
         "dependencies.golang.urlTemplate.linux": "https://golang.org/dl/{TAG}.linux-amd64.tar.gz",
@@ -167,6 +167,12 @@ def get_defaults() -> Dict[str, Any]:
     }
 
 
+def get_deprecated_entries_in_config_file():
+    default_config_keys = set(get_defaults().keys())
+    current_config_keys = set(get_active().keys())
+    return current_config_keys - default_config_keys
+
+
 def resolve_config_path() -> Path:
     if os.path.isfile(LOCAL_CONFIG_PATH):
         return LOCAL_CONFIG_PATH
@@ -249,6 +255,8 @@ def determine_final_args(argv: List[str], config_args: Dict[str, Any]) -> List[s
 def get_dependency_directory(key: str, tag: str) -> Path:
     parent_directory = get_dependency_parent_directory(key)
     if tag == 'latest':
+        if not parent_directory.is_dir():
+            return parent_directory / tag
         tag = get_latest_semver_from_directory(parent_directory)
 
     return parent_directory / tag

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/dependencies/modules.py

@@ -336,7 +336,7 @@ This may cause problems with the installation of rust.""")
     def _install_sc_meta(self):
         logger.info("Installing multiversx-sc-meta.")
         tag = config.get_dependency_tag("sc-meta")
-        args = ["cargo", "install", "multiversx-sc-meta"]
+        args = ["cargo", "install", "multiversx-sc-meta", "--locked"]
 
         if tag != "latest":
             args.extend(["--version", tag])

multiversx_sdk_cli-9.3.0/multiversx_sdk_cli/dependency_checker.py

@@ -0,0 +1,11 @@
+from multiversx_sdk_cli import config, errors, ux
+from multiversx_sdk_cli.dependencies.modules import Rust
+
+
+def check_if_rust_is_installed():
+    RUST_MODULE_KEY = "rust"
+    rust_module = Rust(RUST_MODULE_KEY)
+    if not rust_module.is_installed(""):
+        tag = config.get_dependency_tag(RUST_MODULE_KEY)
+        ux.show_critical_error("Rust is not installed on your machine. Run `mxpy deps install rust --overwrite` and try again.")
+        raise errors.DependencyMissing(RUST_MODULE_KEY, tag)

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/dns.py

@@ -7,8 +7,8 @@ from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.accounts import Account
 from multiversx_sdk_cli.constants import ADDRESS_ZERO_BECH32, DEFAULT_HRP
 from multiversx_sdk_cli.contracts import query_contract
-from multiversx_sdk_cli.transactions import (
-    do_prepare_transaction, tx_to_dictionary_as_inner_for_relayed_V1)
+from multiversx_sdk_cli.transactions import (compute_relayed_v1_data,
+                                             do_prepare_transaction)
 
 MaxNumShards = 256
 ShardIdentiferLen = 2
@@ -50,7 +50,7 @@ def register(args: Any):
     tx = do_prepare_transaction(args)
 
     if hasattr(args, "relay") and args.relay:
-        args.outfile.write(tx_to_dictionary_as_inner_for_relayed_V1(tx))
+        args.outfile.write(compute_relayed_v1_data(tx))
         return
 
     cli_shared.send_or_simulate(tx, args)

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/multiversx_sdk_cli/projects/templates.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from typing import List, Union
 
 from multiversx_sdk_cli import myprocess
-from multiversx_sdk_cli.dependencies.install import install_module
+from multiversx_sdk_cli.dependency_checker import check_if_rust_is_installed
 
 logger = logging.getLogger("projects.templates")
 
@@ -33,7 +33,7 @@ class Contract:
 
     def _ensure_dependencies_installed(self):
         logger.info("Checking if the necessarry dependencies are installed.")
-        install_module("rust")
+        check_if_rust_is_installed()
 
     def _prepare_args_to_list_templates(self) -> List[str]:
         args = ["sc-meta", "templates"]

multiversx_sdk_cli-9.3.0/multiversx_sdk_cli/ux.py

@@ -0,0 +1,15 @@
+from rich import print
+from rich.markup import escape
+from rich.panel import Panel
+
+
+def show_message(message: str):
+    print(Panel(f"[green]{escape(message)}"))
+
+
+def show_critical_error(message: str):
+    print(Panel(f"[red]{escape(message)}"))
+
+
+def show_warning(message: str):
+    print(Panel(f"[yellow]{escape(message)}"))

{multiversx_sdk_cli-9.2.0b0 → multiversx_sdk_cli-9.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multiversx-sdk-cli"
-version = "9.2.0b0"
+version = "9.3.0"
 authors = [
   { name="MultiversX" },
 ]

multiversx_sdk_cli-9.2.0b0/multiversx_sdk_cli/ux.py

@@ -1,14 +0,0 @@
-from rich import print
-from rich.panel import Panel
-
-
-def show_message(message: str):
-    print(Panel(f"[green]{message}"))
-
-
-def show_critical_error(message: str):
-    print(Panel(f"[red]{message}"))
-
-
-def show_warning(message: str):
-    print(Panel(f"[yellow]{message}"))