multiversx-sdk-cli 11.4.1__tar.gz → 12.0.1__tar.gz

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: multiversx-sdk-cli
-Version: 11.4.1
+Version: 12.0.1
 Summary: MultiversX Smart Contracts Tools
 Project-URL: Homepage, https://github.com/multiversx/mx-sdk-py-cli
 Author: MultiversX
@@ -10,10 +10,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: argcomplete==3.2.2
 Requires-Dist: ledgercomm[hid]
-Requires-Dist: multiversx-sdk[ledger]==2.4.0
+Requires-Dist: multiversx-sdk[ledger]==3.0.0
 Requires-Dist: requests<3.0.0,>=2.32.0
 Requires-Dist: rich==13.3.4
 Requires-Dist: toml>=0.10.2

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cli_contracts.py

@@ -592,6 +592,7 @@ def unverify(args: Any) -> None:
 
     headers = {"Content-type": "application/json"}
     response = requests.delete(verifier_url, json=request_payload, headers=headers)
+    response.raise_for_status()
     logger.info(f"Your request to unverify contract {contract} was submitted.")
     print(response.json().get("message"))
 

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cli_dns.py

@@ -37,7 +37,7 @@ def setup_parser(args: list[str], subparsers: Any) -> Any:
     cli_shared.add_tx_args(args, sub, with_receiver=False, with_data=False)
     cli_shared.add_guardian_wallet_args(args, sub)
     cli_shared.add_relayed_v3_wallet_args(args, sub)
-    sub.add_argument("--name", help="the name to register")
+    sub.add_argument("--name", required=True, help="the name to register")
     sub.set_defaults(func=register)
 
     sub = cli_shared.add_command_subparser(subparsers, "dns", "resolve", "Find the address for a name")

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cli_get.py

@@ -202,7 +202,7 @@ def get_network_config(args: Any):
 
 def get_network_status(args: Any):
     proxy = _get_proxy(args)
-    status = proxy.get_network_status()
+    status = proxy.get_network_status(args.shard)
 
     dump_out_json(status.raw)
 

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cli_shared.py

@@ -361,6 +361,7 @@ def add_wait_result_and_timeout_args(sub: Any):
     )
     sub.add_argument(
         "--timeout",
+        type=int,
         default=100,
         help="max num of seconds to wait for result" " - only valid if --wait-result is set",
     )
@@ -813,6 +814,12 @@ def prepare_token_transfers(transfers: list[str]) -> list[TokenTransfer]:
     token_computer = TokenComputer()
     token_transfers: list[TokenTransfer] = []
 
+    if len(transfers) % 2 != 0:
+        raise ArgumentsNotProvidedError(
+            "Invalid number of arguments for token transfers. "
+            "Expected pairs of [token, amount], but got an odd number of arguments."
+        )
+
     for i in range(0, len(transfers) - 1, 2):
         extended_identifier = transfers[i]
         amount = int(transfers[i + 1])

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cli_transactions.py

@@ -206,6 +206,9 @@ def sign_transaction(args: Any):
         if tx.guardian and not tx_computer.has_options_set_for_guarded_transaction(tx):
             raise BadUsage("Guardian wallet provided but the transaction has incorrect options")
 
+    if not sender and not guardian and not relayer:
+        raise NoWalletProvided()
+
     guardian_and_relayer = GuardianRelayerData(
         guardian=guardian,
         guardian_address=tx.guardian,

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/contract_verification.py

@@ -146,6 +146,7 @@ def query_status_with_task_id(url: str, task_id: str, interval: int = 10):
 def _do_post(url: str, payload: Any) -> tuple[int, str, dict[str, Any]]:
     logger.debug(f"_do_post() to {url}")
     response = requests.post(url, json=payload)
+    response.raise_for_status()
 
     try:
         data = response.json()
@@ -159,6 +160,7 @@ def _do_post(url: str, payload: Any) -> tuple[int, str, dict[str, Any]]:
 def _do_get(url: str) -> tuple[int, str, dict[str, Any]]:
     logger.debug(f"_do_get() from {url}")
     response = requests.get(url)
+    response.raise_for_status()
 
     try:
         data = response.json()

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/cosign_transaction.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 import requests
 from multiversx_sdk import Transaction
 
@@ -15,15 +13,11 @@ def cosign_transaction(transaction: Transaction, service_url: str, guardian_code
     # we call sign-multiple-transactions to be allowed a bigger payload (e.g. deploying large contracts)
     url = f"{service_url}/sign-multiple-transactions"
     response = requests.post(url, json=payload)
-    check_for_guardian_error(response.json())
+    try:
+        response.raise_for_status()
+    except requests.exceptions.HTTPError as e:
+        raise GuardianServiceError(f"Guardian service returned an error: {str(e)}")
 
     # we only send 1 transaction
     tx_as_dict = response.json()["data"]["transactions"][0]
     transaction.guardian_signature = bytes.fromhex(tx_as_dict["guardianSignature"])
-
-
-def check_for_guardian_error(response: dict[str, Any]):
-    error = response["error"]
-
-    if error:
-        raise GuardianServiceError(error)

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/localnet/node_config_toml.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 from multiversx_sdk_cli.localnet.config_root import ConfigRoot
 from multiversx_sdk_cli.localnet.constants import (
@@ -10,7 +10,16 @@ from multiversx_sdk_cli.localnet.nodes_setup_json import CHAIN_ID
 ConfigDict = Dict[str, Any]
 
 
-def patch_config(data: ConfigDict, config: ConfigRoot, enable_epochs_config: ConfigDict):
+def patch_config(
+    data: ConfigDict,
+    config: ConfigRoot,
+    enable_epochs_config: ConfigDict,
+    enable_rounds_config: ConfigDict,
+):
+    """
+    Note: "enable_rounds_config" must be the original (not yet patched) "enableRounds.toml",
+    so that we can detect the default (upstream) Supernova activation round.
+    """
     supernova_activation_epoch = enable_epochs_config["EnableEpochs"].get("SupernovaEnableEpoch", None)
 
     data["GeneralSettings"]["ChainID"] = CHAIN_ID
@@ -77,6 +86,26 @@ def patch_config(data: ConfigDict, config: ConfigRoot, enable_epochs_config: Con
         if enable_epoch == supernova_activation_epoch:
             item["StartRound"] = _compute_supernova_activation_round(config, supernova_activation_epoch)
 
+    # Adjust the "*ByRound" configs: entries defined (upstream) at the default Supernova activation round
+    # must be moved to the (localnet-specific) computed Supernova activation round.
+    # Otherwise, the node fails with "supernova activation configs mismatch".
+    default_supernova_activation_round = _get_supernova_activation_round(enable_rounds_config)
+
+    if supernova_activation_epoch is not None and default_supernova_activation_round is not None:
+        supernova_activation_round = _compute_supernova_activation_round(config, supernova_activation_epoch)
+
+        configs_by_round = [
+            (data["GeneralSettings"].get("ProcessConfigsByRound", []), "EnableRound"),
+            (data["GeneralSettings"].get("EpochStartConfigsByRound", []), "EnableRound"),
+            (data["GeneralSettings"].get("ConsensusConfigsByRound", []), "EnableRound"),
+            (data.get("Antiflood", {}).get("ConfigsByRound", []), "Round"),
+        ]
+
+        for items, round_key in configs_by_round:
+            for item in items:
+                if int(item.get(round_key, 0)) == default_supernova_activation_round:
+                    item[round_key] = supernova_activation_round
+
 
 def patch_api(data: ConfigDict, config: ConfigRoot):
     routes = data["APIPackages"]["transaction"]["Routes"]
@@ -121,6 +150,13 @@ def patch_enable_rounds(data: ConfigDict, config: ConfigRoot, enable_epochs_conf
         supernova_entry["Round"] = str(supernova_computed_activation_round)
 
 
+def _get_supernova_activation_round(enable_rounds_config: ConfigDict) -> Optional[int]:
+    supernova_entry = enable_rounds_config.get("RoundActivations", {}).get("SupernovaEnableRound")
+    if not supernova_entry:
+        return None
+    return int(supernova_entry["Round"])
+
+
 def _compute_supernova_activation_round(config: ConfigRoot, supernova_activation_epoch: int) -> int:
     # Epochs are zero-indexed.
     return (

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/multiversx_sdk_cli/localnet/step_config.py

@@ -112,7 +112,7 @@ def patch_node_config(config: ConfigRoot):
         enable_rounds_config_data = utils.read_toml_file(enable_rounds_config_file)
         genesis_smart_contracts_data = utils.read_json_file(genesis_smart_contracts_file)
 
-        node_config_toml.patch_config(node_config_data, config, enable_epochs_config_data)
+        node_config_toml.patch_config(node_config_data, config, enable_epochs_config_data, enable_rounds_config_data)
         node_config_toml.patch_api(api_config_data, config)
         node_config_toml.patch_enable_epochs(enable_epochs_config_data, config)
         node_config_toml.patch_enable_rounds(enable_rounds_config_data, config, enable_epochs_config_data)

{multiversx_sdk_cli-11.4.1 → multiversx_sdk_cli-12.0.1}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multiversx-sdk-cli"
-version = "11.4.1"
+version = "12.0.1"
 authors = [
   { name="MultiversX" },
 ]
 license = "MIT"
 description = "MultiversX Smart Contracts Tools"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -25,7 +25,7 @@ dependencies = [
   "ledgercomm[hid]",
   "rich==13.3.4",
   "argcomplete==3.2.2",
-  "multiversx-sdk[ledger]==2.4.0"
+  "multiversx-sdk[ledger]==3.0.0"
 ]
 
 [project.scripts]