multiversx-sdk-cli 9.4.1__tar.gz → 9.5.1__tar.gz

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/PKG-INFO

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

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/cli_delegation.py

@@ -41,7 +41,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     # remove nodes
     sub = cli_shared.add_command_subparser(subparsers, "staking-provider", "remove-nodes",
                                            "Remove nodes must be called by the contract owner")
-    sub.add_argument("--bls-keys", required=True, help="a list with the bls keys of the nodes")
+    sub.add_argument("--bls-keys", help="a list with the bls keys of the nodes")
+    sub.add_argument("--validators-file", help="a JSON file describing the Nodes")
     sub.add_argument("--delegation-contract", required=True, help="address of the delegation contract")
     _add_common_arguments(args, sub)
     sub.set_defaults(func=remove_nodes)
@@ -49,7 +50,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     # stake nodes
     sub = cli_shared.add_command_subparser(subparsers, "staking-provider", "stake-nodes",
                                            "Stake nodes must be called by the contract owner")
-    sub.add_argument("--bls-keys", required=True, help="a list with the bls keys of the nodes")
+    sub.add_argument("--bls-keys", help="a list with the bls keys of the nodes")
+    sub.add_argument("--validators-file", help="a JSON file describing the Nodes")
     sub.add_argument("--delegation-contract", required=True, help="address of the delegation contract")
     _add_common_arguments(args, sub)
     sub.set_defaults(func=stake_nodes)
@@ -57,7 +59,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     # unbond nodes
     sub = cli_shared.add_command_subparser(subparsers, "staking-provider", "unbond-nodes",
                                            "Unbond nodes must be called by the contract owner")
-    sub.add_argument("--bls-keys", required=True, help="a list with the bls keys of the nodes")
+    sub.add_argument("--bls-keys", help="a list with the bls keys of the nodes")
+    sub.add_argument("--validators-file", help="a JSON file describing the Nodes")
     sub.add_argument("--delegation-contract", required=True, help="address of the delegation contract")
     _add_common_arguments(args, sub)
     sub.set_defaults(func=unbond_nodes)
@@ -65,7 +68,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     # unstake nodes
     sub = cli_shared.add_command_subparser(subparsers, "staking-provider", "unstake-nodes",
                                            "Unstake nodes must be called by the contract owner")
-    sub.add_argument("--bls-keys", required=True, help="a list with the bls keys of the nodes")
+    sub.add_argument("--bls-keys", help="a list with the bls keys of the nodes")
+    sub.add_argument("--validators-file", help="a JSON file describing the Nodes")
     sub.add_argument("--delegation-contract", required=True, help="address of the delegation contract")
     _add_common_arguments(args, sub)
     sub.set_defaults(func=unstake_nodes)
@@ -73,7 +77,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     # unjail nodes
     sub = cli_shared.add_command_subparser(subparsers, "staking-provider", "unjail-nodes",
                                            "Unjail nodes must be called by the contract owner")
-    sub.add_argument("--bls-keys", required=True, help="a list with the bls keys of the nodes")
+    sub.add_argument("--bls-keys", help="a list with the bls keys of the nodes")
+    sub.add_argument("--validators-file", help="a JSON file describing the Nodes")
     sub.add_argument("--delegation-contract", required=True, help="address of the delegation contract")
     _add_common_arguments(args, sub)
     sub.set_defaults(func=unjail_nodes)
@@ -182,6 +187,7 @@ def add_new_nodes(args: Any):
 
 
 def remove_nodes(args: Any):
+    _check_if_either_bls_keys_or_validators_file_are_provided(args)
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_chain_id_in_args(args)
@@ -196,6 +202,7 @@ def remove_nodes(args: Any):
 
 
 def stake_nodes(args: Any):
+    _check_if_either_bls_keys_or_validators_file_are_provided(args)
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_chain_id_in_args(args)
@@ -209,7 +216,16 @@ def stake_nodes(args: Any):
     cli_shared.send_or_simulate(tx, args)
 
 
+def _check_if_either_bls_keys_or_validators_file_are_provided(args: Any):
+    bls_keys = args.bls_keys
+    validators_file = args.validators_file
+
+    if not bls_keys and not validators_file:
+        raise errors.BadUsage("No bls keys or validators file provided. Use either `--bls-keys` or `--validators-file`")
+
+
 def unbond_nodes(args: Any):
+    _check_if_either_bls_keys_or_validators_file_are_provided(args)
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_chain_id_in_args(args)
@@ -224,6 +240,7 @@ def unbond_nodes(args: Any):
 
 
 def unstake_nodes(args: Any):
+    _check_if_either_bls_keys_or_validators_file_are_provided(args)
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_chain_id_in_args(args)
@@ -238,6 +255,7 @@ def unstake_nodes(args: Any):
 
 
 def unjail_nodes(args: Any):
+    _check_if_either_bls_keys_or_validators_file_are_provided(args)
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_chain_id_in_args(args)

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/cli_shared.py

@@ -16,6 +16,7 @@ from multiversx_sdk_cli.cli_password import (load_guardian_password,
                                              load_password)
 from multiversx_sdk_cli.constants import (DEFAULT_TX_VERSION,
                                           TRANSACTION_OPTIONS_TX_GUARDED)
+from multiversx_sdk_cli.custom_network_provider import CustomNetworkProvider
 from multiversx_sdk_cli.errors import ArgumentsNotProvidedError
 from multiversx_sdk_cli.interfaces import ITransaction
 from multiversx_sdk_cli.ledger.ledger_functions import do_get_ledger_address
@@ -249,7 +250,7 @@ def check_options_for_guarded_tx(options: int):
 
 
 def send_or_simulate(tx: ITransaction, args: Any, dump_output: bool = True) -> CLIOutputBuilder:
-    proxy = ProxyNetworkProvider(args.proxy)
+    proxy = CustomNetworkProvider(args.proxy)
 
     is_set_wait_result = hasattr(args, "wait_result") and args.wait_result
     is_set_send = hasattr(args, "send") and args.send

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/cli_transactions.py

@@ -1,12 +1,10 @@
 from pathlib import Path
 from typing import Any, List
 
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
-
 from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
+from multiversx_sdk_cli.custom_network_provider import CustomNetworkProvider
 from multiversx_sdk_cli.errors import NoWalletProvided
 from multiversx_sdk_cli.transactions import (compute_relayed_v1_data,
                                              do_prepare_transaction,
@@ -88,9 +86,9 @@ def send_transaction(args: Any):
 
     tx = load_transaction_from_file(args.infile)
     output = CLIOutputBuilder()
+    proxy = CustomNetworkProvider(args.proxy)
 
     try:
-        proxy = ProxyNetworkProvider(args.proxy)
         tx_hash = proxy.send_transaction(tx)
         output.set_emitted_transaction_hash(tx_hash)
     finally:
@@ -101,7 +99,7 @@ def send_transaction(args: Any):
 def get_transaction(args: Any):
     args = utils.as_object(args)
     omit_fields = cli_shared.parse_omit_fields_arg(args)
-    proxy = ProxyNetworkProvider(args.proxy)
+    proxy = CustomNetworkProvider(args.proxy)
 
     transaction = proxy.get_transaction(args.hash, True)
     output = CLIOutputBuilder().set_transaction_on_network(transaction, omit_fields).build()

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/cli_wallet.py

@@ -112,6 +112,7 @@ def wallet_new(args: Any):
 
     mnemonic = Mnemonic.generate()
     print(f"Mnemonic: {mnemonic.get_text()}")
+    print(f"Wallet address: {mnemonic.derive_key().generate_public_key().to_address(address_hrp).to_bech32()}")
 
     if format is None:
         return

multiversx_sdk_cli-9.5.1/multiversx_sdk_cli/custom_network_provider.py

@@ -0,0 +1,36 @@
+from typing import Any, Dict, Optional, Protocol
+
+from multiversx_sdk_network_providers import GenericError, ProxyNetworkProvider
+
+from multiversx_sdk_cli.errors import ProxyError
+from multiversx_sdk_cli.interfaces import ISimulateResponse, ITransaction
+
+
+class ITransactionOnNetwork(Protocol):
+    hash: str
+    is_completed: Optional[bool]
+
+    def to_dictionary(self) -> Dict[str, Any]:
+        ...
+
+
+class CustomNetworkProvider:
+    def __init__(self, url: str) -> None:
+        self._provider = ProxyNetworkProvider(url)
+
+    def send_transaction(self, transaction: ITransaction) -> str:
+        try:
+            hash = self._provider.send_transaction(transaction)
+            return hash
+        except GenericError as ge:
+            url = ge.url
+            message = ge.data.get("error", "")
+            data = ge.data.get("data", "")
+            code = ge.data.get("code", "")
+            raise ProxyError(message, url, data, code)
+
+    def get_transaction(self, tx_hash: str, with_process_status: Optional[bool] = False) -> ITransactionOnNetwork:
+        return self._provider.get_transaction(tx_hash, with_process_status)
+
+    def simulate_transaction(self, transaction: ITransaction) -> ISimulateResponse:
+        return self._provider.simulate_transaction(transaction)

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/delegation/staking_provider.py

@@ -82,7 +82,8 @@ class DelegationOperations:
 
     def prepare_transaction_for_removing_nodes(self, owner: IAccount, args: Any) -> ITransaction:
         delegation_contract = Address.new_from_bech32(args.delegation_contract)
-        public_keys = self._parse_public_bls_keys(args.bls_keys)
+
+        public_keys = self._load_validators_public_keys(args)
 
         tx = self._factory.create_transaction_for_removing_nodes(
             sender=owner.address,
@@ -102,7 +103,8 @@ class DelegationOperations:
 
     def prepare_transaction_for_staking_nodes(self, owner: IAccount, args: Any) -> ITransaction:
         delegation_contract = Address.new_from_bech32(args.delegation_contract)
-        public_keys = self._parse_public_bls_keys(args.bls_keys)
+
+        public_keys = self._load_validators_public_keys(args)
 
         tx = self._factory.create_transaction_for_staking_nodes(
             sender=owner.address,
@@ -122,7 +124,8 @@ class DelegationOperations:
 
     def prepare_transaction_for_unbonding_nodes(self, owner: IAccount, args: Any) -> ITransaction:
         delegation_contract = Address.new_from_bech32(args.delegation_contract)
-        public_keys = self._parse_public_bls_keys(args.bls_keys)
+
+        public_keys = self._load_validators_public_keys(args)
 
         tx = self._factory.create_transaction_for_unbonding_nodes(
             sender=owner.address,
@@ -142,7 +145,8 @@ class DelegationOperations:
 
     def prepare_transaction_for_unstaking_nodes(self, owner: IAccount, args: Any) -> ITransaction:
         delegation_contract = Address.new_from_bech32(args.delegation_contract)
-        public_keys = self._parse_public_bls_keys(args.bls_keys)
+
+        public_keys = self._load_validators_public_keys(args)
 
         tx = self._factory.create_transaction_for_unstaking_nodes(
             sender=owner.address,
@@ -162,7 +166,8 @@ class DelegationOperations:
 
     def prepare_transaction_for_unjailing_nodes(self, owner: IAccount, args: Any) -> ITransaction:
         delegation_contract = Address.new_from_bech32(args.delegation_contract)
-        public_keys = self._parse_public_bls_keys(args.bls_keys)
+
+        public_keys = self._load_validators_public_keys(args)
 
         tx = self._factory.create_transaction_for_unjailing_nodes(
             sender=owner.address,
@@ -293,6 +298,14 @@ class DelegationOperations:
 
         return tx
 
+    def _load_validators_public_keys(self, args: Any) -> List[ValidatorPublicKey]:
+        if args.bls_keys:
+            return self._parse_public_bls_keys(args.bls_keys)
+
+        validators_file_path = Path(args.validators_file).expanduser()
+        validators_file = ValidatorsFile(validators_file_path)
+        return validators_file.load_public_keys()
+
     def _parse_public_bls_keys(self, public_bls_keys: str) -> List[ValidatorPublicKey]:
         keys = public_bls_keys.split(",")
         validator_public_keys: List[ValidatorPublicKey] = []

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/errors.py

@@ -198,3 +198,13 @@ class GuardianServiceError(KnownError):
 class ArgumentsNotProvidedError(KnownError):
     def __init__(self, message: str):
         super().__init__(message)
+
+
+class ProxyError(KnownError):
+    def __init__(self, message: str, url: str, data: str, code: str):
+        inner = {
+            "url": url,
+            "data": data,
+            "code": code
+        }
+        super().__init__(message, inner)

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/transactions.py

@@ -2,7 +2,7 @@ import base64
 import json
 import logging
 import time
-from typing import Any, Dict, Optional, Protocol, Sequence, TextIO, Tuple
+from typing import Any, Dict, Optional, Protocol, TextIO
 
 from multiversx_sdk_core import Address, Transaction, TransactionPayload
 
@@ -30,9 +30,6 @@ class INetworkProvider(Protocol):
     def send_transaction(self, transaction: ITransaction) -> str:
         ...
 
-    def send_transactions(self, transactions: Sequence[ITransaction]) -> Tuple[int, str]:
-        ...
-
     def get_transaction(self, tx_hash: str, with_process_status: Optional[bool] = False) -> ITransactionOnNetwork:
         ...
 

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/multiversx_sdk_cli/validators/validators_file.py

@@ -1,8 +1,9 @@
 import json
 from pathlib import Path
-from typing import List
+from typing import Dict, List
 
 from multiversx_sdk_wallet import ValidatorSigner
+from multiversx_sdk_wallet.validator_keys import ValidatorPublicKey
 from multiversx_sdk_wallet.validator_pem import ValidatorPEM
 
 from multiversx_sdk_cli import guards
@@ -23,17 +24,28 @@ class ValidatorsFile:
     def load_signers(self) -> List[ValidatorSigner]:
         signers: List[ValidatorSigner] = []
         for validator in self.get_validators_list():
-            # Get path of "pemFile", make it absolute
-            validator_pem = Path(validator.get("pemFile")).expanduser()
-            validator_pem = validator_pem if validator_pem.is_absolute() else self.validators_file_path.parent / validator_pem
-
-            pem_file = ValidatorPEM.from_file(validator_pem)
-
+            pem_file = self._load_validator_pem(validator)
             validator_signer = ValidatorSigner(pem_file.secret_key)
             signers.append(validator_signer)
 
         return signers
 
+    def load_public_keys(self) -> List[ValidatorPublicKey]:
+        public_keys: List[ValidatorPublicKey] = []
+
+        for validator in self.get_validators_list():
+            pem_file = self._load_validator_pem(validator)
+            public_keys.append(pem_file.secret_key.generate_public_key())
+
+        return public_keys
+
+    def _load_validator_pem(self, validator: Dict[str, str]) -> ValidatorPEM:
+        # Get path of "pemFile", make it absolute
+        validator_pem = Path(validator.get("pemFile", "")).expanduser()
+        validator_pem = validator_pem if validator_pem.is_absolute() else self.validators_file_path.parent / validator_pem
+
+        return ValidatorPEM.from_file(validator_pem)
+
     def _read_json_file_validators(self):
         val_file = self.validators_file_path.expanduser()
         guards.is_file(val_file)

{multiversx_sdk_cli-9.4.1 → multiversx_sdk_cli-9.5.1}/pyproject.toml

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