multiversx-sdk-cli 7.3.0__tar.gz → 8.0.0__tar.gz

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/PKG-INFO

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

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/accounts.py

@@ -2,11 +2,11 @@ import logging
 from pathlib import Path
 from typing import Any, Optional, Protocol
 
-from multiversx_sdk_core import MessageV1, bech32
+from multiversx_sdk_core import Address, MessageV1
 from multiversx_sdk_network_providers.accounts import AccountOnNetwork
 from multiversx_sdk_wallet import UserSigner
 
-from multiversx_sdk_cli import constants, errors
+from multiversx_sdk_cli.constants import DEFAULT_HRP
 from multiversx_sdk_cli.interfaces import IAccount, IAddress, ITransaction
 from multiversx_sdk_cli.ledger.config import compare_versions
 from multiversx_sdk_cli.ledger.ledger_app_handler import \
@@ -24,9 +24,17 @@ class INetworkProvider(Protocol):
         ...
 
 
+class EmptyAddress(IAddress):
+    def hex(self) -> str:
+        return ""
+
+    def bech32(self) -> str:
+        return ""
+
+
 class AccountBase(IAccount):
-    def __init__(self, address: Any = None):
-        self.address = Address(address)
+    def __init__(self, address: Any = EmptyAddress()) -> None:
+        self.address = address
         self.nonce: int = 0
 
     def sync_nonce(self, proxy: INetworkProvider):
@@ -47,17 +55,17 @@ class Account(AccountBase):
                  pem_file: Optional[str] = None,
                  pem_index: int = 0,
                  key_file: str = "",
-                 password: str = ""):
+                 password: str = "") -> None:
         super().__init__(address)
 
         if pem_file:
             pem_path = Path(pem_file).expanduser().resolve()
             self.signer = UserSigner.from_pem_file(pem_path, pem_index)
-            self.address = Address(self.signer.get_pubkey().buffer)
+            self.address = Address(self.signer.get_pubkey().buffer, DEFAULT_HRP)
         elif key_file and password:
             key_file_path = Path(key_file).expanduser().resolve()
             self.signer = UserSigner.from_wallet(key_file_path, password)
-            self.address = Address(self.signer.get_pubkey().buffer)
+            self.address = Address(self.signer.get_pubkey().buffer, DEFAULT_HRP)
 
     def sign_transaction(self, transaction: ITransaction) -> str:
         assert self.signer is not None
@@ -73,18 +81,18 @@ class Account(AccountBase):
 
 
 class LedgerAccount(Account):
-    def __init__(self, account_index: int = 0, address_index: int = 0):
+    def __init__(self, account_index: int = 0, address_index: int = 0) -> None:
         super().__init__()
         self.account_index = account_index
         self.address_index = address_index
-        self.address = Address(do_get_ledger_address(account_index=account_index, address_index=address_index))
+        self.address = Address.from_bech32(do_get_ledger_address(account_index=account_index, address_index=address_index))
 
     def sign_transaction(self, transaction: ITransaction) -> str:
         ledger_version = do_get_ledger_version()
         should_use_hash_signing = compare_versions(ledger_version, SIGN_USING_HASH_VERSION) >= 0
         if should_use_hash_signing:
-            transaction.set_version(TX_HASH_SIGN_VERSION)
-            transaction.set_options(TX_HASH_SIGN_OPTIONS)
+            transaction.version = TX_HASH_SIGN_VERSION
+            transaction.options = TX_HASH_SIGN_OPTIONS
 
         signature = do_sign_transaction_with_ledger(
             transaction.serialize_for_signing(),
@@ -111,76 +119,3 @@ class LedgerAccount(Account):
 
         logger.debug(f"LedgerAccount.sign_message(): signature = {signature}")
         return signature
-
-
-class Address(IAddress):
-    HRP = "erd"
-    PUBKEY_LENGTH = 32
-    PUBKEY_STRING_LENGTH = PUBKEY_LENGTH * 2  # hex-encoded
-    BECH32_LENGTH = 62
-    _value_hex: str
-
-    def __init__(self, value: Any):
-        self._value_hex = ''
-
-        if not value:
-            return
-
-        # Copy-constructor
-        if isinstance(value, Address):
-            value = value._value_hex
-
-        # We keep a hex-encoded string as the "backing" value
-        if len(value) == Address.PUBKEY_LENGTH:
-            self._value_hex = value.hex()
-        elif len(value) == Address.PUBKEY_STRING_LENGTH:
-            self._value_hex = _as_string(value)
-        elif len(value) == Address.BECH32_LENGTH:
-            self._value_hex = _decode_bech32(value).hex()
-        else:
-            raise errors.BadAddressFormatError(value)
-
-    def hex(self) -> str:
-        self._assert_validity()
-        return self._value_hex
-
-    def bech32(self) -> str:
-        self._assert_validity()
-        pubkey = self.pubkey()
-        b32 = bech32.bech32_encode(self.HRP, bech32.convertbits(pubkey, 8, 5))
-        assert isinstance(b32, str)
-        return b32
-
-    def pubkey(self):
-        self._assert_validity()
-        pubkey = bytes.fromhex(self._value_hex)
-        return pubkey
-
-    def is_contract_address(self):
-        return self.hex().startswith(constants.SC_HEX_PUBKEY_PREFIX)
-
-    def _assert_validity(self):
-        if self._value_hex == '':
-            raise errors.EmptyAddressError()
-
-    def __repr__(self):
-        return self.bech32()
-
-    @classmethod
-    def zero(cls) -> 'Address':
-        return Address("0" * 64)
-
-
-def _as_string(value):
-    if isinstance(value, str):
-        return value
-    return value.decode("utf-8")
-
-
-def _decode_bech32(value):
-    bech32_string = _as_string(value)
-    hrp, value_bytes = bech32.bech32_decode(bech32_string)
-    if hrp != Address.HRP:
-        raise errors.BadAddressFormatError(value)
-    decoded_bytes = bech32.convertbits(value_bytes, 5, 8, False)
-    return bytearray(decoded_bytes)

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli.py

@@ -4,8 +4,9 @@ import sys
 from argparse import ArgumentParser
 from typing import Any, List
 
+from rich.logging import RichHandler
+
 import multiversx_sdk_cli.cli_accounts
-import multiversx_sdk_cli.cli_block
 import multiversx_sdk_cli.cli_config
 import multiversx_sdk_cli.cli_contracts
 import multiversx_sdk_cli.cli_data
@@ -14,7 +15,6 @@ import multiversx_sdk_cli.cli_deps
 import multiversx_sdk_cli.cli_dns
 import multiversx_sdk_cli.cli_ledger
 import multiversx_sdk_cli.cli_localnet
-import multiversx_sdk_cli.cli_network
 import multiversx_sdk_cli.cli_transactions
 import multiversx_sdk_cli.cli_validators
 import multiversx_sdk_cli.cli_wallet
@@ -38,16 +38,14 @@ def main(cli_args: List[str] = sys.argv[1:]):
 
 
 def _do_main(cli_args: List[str]):
-    logging.basicConfig(level=logging.INFO)
-
     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)
 
     if args.verbose:
-        logging.basicConfig(level=logging.DEBUG, force=True)
+        logging.basicConfig(level="DEBUG", force=True, format='%(name)s: %(message)s', handlers=[RichHandler(show_time=False, rich_tracebacks=True)])
     else:
-        logging.basicConfig(level=logging.INFO, force=True)
+        logging.basicConfig(level="INFO", format='%(name)s: %(message)s', handlers=[RichHandler(show_time=False, rich_tracebacks=True)])
 
     if not hasattr(args, "func"):
         parser.print_help()
@@ -87,10 +85,8 @@ https://docs.multiversx.com/sdk-and-tools/mxpy.
     commands.append(multiversx_sdk_cli.cli_accounts.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_ledger.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_wallet.setup_parser(args, subparsers))
-    commands.append(multiversx_sdk_cli.cli_network.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_deps.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_config.setup_parser(subparsers))
-    commands.append(multiversx_sdk_cli.cli_block.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_localnet.setup_parser(args, subparsers))
     commands.append(multiversx_sdk_cli.cli_data.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_delegation.setup_parser(args, subparsers))

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_accounts.py

@@ -1,11 +1,11 @@
 import logging
 from typing import Any
 
+from multiversx_sdk_core import Address
 from multiversx_sdk_network_providers.proxy_network_provider import \
     ProxyNetworkProvider
 
 from multiversx_sdk_cli import cli_shared, utils
-from multiversx_sdk_cli.accounts import Address
 
 logger = logging.getLogger("cli.accounts")
 
@@ -36,7 +36,7 @@ def get_account(args: Any):
     proxy_url = args.proxy
     address = args.address
     proxy = ProxyNetworkProvider(proxy_url)
-    account = proxy.get_account(Address(address))
+    account = proxy.get_account(Address.from_bech32(address))
 
     if args.balance:
         print(account.balance)

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_config.py

@@ -1,9 +1,8 @@
-from multiversx_sdk_cli import cli_shared
 import logging
 import sys
 from typing import Any
 
-from multiversx_sdk_cli import config, utils
+from multiversx_sdk_cli import cli_shared, config, utils
 
 logger = logging.getLogger("cli.config")
 

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_contracts.py

@@ -1,13 +1,14 @@
 import logging
 import os
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any, List
 
+from multiversx_sdk_core import Address, Transaction
 from multiversx_sdk_network_providers.proxy_network_provider import \
     ProxyNetworkProvider
 
 from multiversx_sdk_cli import cli_shared, errors, projects, utils
-from multiversx_sdk_cli.accounts import Account, Address, LedgerAccount
+from multiversx_sdk_cli.accounts import Account, LedgerAccount
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
 from multiversx_sdk_cli.cli_password import load_password
 from multiversx_sdk_cli.contract_verification import \
@@ -17,7 +18,6 @@ from multiversx_sdk_cli.cosign_transaction import cosign_transaction
 from multiversx_sdk_cli.docker import is_docker_installed, run_docker
 from multiversx_sdk_cli.errors import DockerMissingError, NoWalletProvided
 from multiversx_sdk_cli.projects.core import get_project_paths_recursively
-from multiversx_sdk_cli.transactions import Transaction
 
 logger = logging.getLogger("cli.contracts")
 
@@ -40,14 +40,11 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "build",
                                            "Build a Smart Contract project using the appropriate buildchain.")
-    _add_project_arg(sub)
-    _add_recursive_arg(sub)
-    _add_build_options_args(sub)
+    _add_build_options_sc_meta(sub)
     sub.set_defaults(func=build)
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "clean", "Clean a Smart Contract project.")
-    _add_project_arg(sub)
-    _add_recursive_arg(sub)
+    sub.add_argument("--path", default=os.getcwd(), help="the project directory (default: current directory)")
     sub.set_defaults(func=clean)
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "test", "Run scenarios (tests).")
@@ -59,13 +56,12 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     sub.set_defaults(func=run_tests)
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "report", "Print a detailed report of the smart contracts.")
-    _add_project_arg(sub)
     sub.add_argument("--skip-build", action="store_true", default=False, help="skips the step of building of the wasm contracts")
     sub.add_argument("--skip-twiggy", action="store_true", default=False, help="skips the steps of building the debug wasm files and running twiggy")
     sub.add_argument("--output-format", type=str, default="text-markdown", choices=["github-markdown", "text-markdown", "json"], help="report output format (default: %(default)s)")
     sub.add_argument("--output-file", type=Path, help="if specified, the output is written to a file, otherwise it's written to the standard output")
     sub.add_argument("--compare", type=Path, nargs='+', metavar=("report-1.json", "report-2.json"), help="create a comparison from two or more reports")
-    _add_build_options_args(sub)
+    _add_build_options_sc_meta(sub)
     sub.set_defaults(func=do_report)
 
     output_description = CLIOutputBuilder.describe(with_contract=True, with_transaction_on_network=True, with_simulation=True)
@@ -131,12 +127,9 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     _add_arguments_arg(sub)
     sub.set_defaults(func=query)
 
-    sub = cli_shared.add_command_subparser(
-        subparsers,
-        "contract",
-        "verify",
-        "Verify the authenticity of the code of a deployed Smart Contract",
-    )
+    sub = cli_shared.add_command_subparser(subparsers, "contract", "verify",
+                                           "Verify the authenticity of the code of a deployed Smart Contract",
+                                           )
 
     sub.add_argument(
         "--packaged-src", required=True, help="JSON file containing the source code of the contract"
@@ -175,6 +168,29 @@ def _add_project_arg(sub: Any):
                      help="🗀 the project directory (default: current directory)")
 
 
+def _add_build_options_sc_meta(sub: Any):
+    sub.add_argument("--path", default=os.getcwd(), help="the project directory (default: current directory)")
+    sub.add_argument("--no-wasm-opt", action="store_true", default=False,
+                     help="do not optimize wasm files after the build (default: %(default)s)")
+    sub.add_argument("--wasm-symbols", action="store_true", default=False,
+                     help="for rust projects, does not strip the symbols from the wasm output. Useful for analysing the bytecode. Creates larger wasm files. Avoid in production (default: %(default)s)")
+    sub.add_argument("--wasm-name", type=str,
+                     help="for rust projects, optionally specify the name of the wasm bytecode output file")
+    sub.add_argument("--wasm-suffix", type=str,
+                     help="for rust projects, optionally specify the suffix of the wasm bytecode output file")
+    sub.add_argument("--target-dir", type=str, help="for rust projects, forward the parameter to Cargo")
+    sub.add_argument("--wat", action="store_true", help="also generate a WAT file when building", default=False)
+    sub.add_argument("--mir", action="store_true", help="also emit MIR files when building", default=False)
+    sub.add_argument("--llvm-ir", action="store_true", help="also emit LL (LLVM) files when building", default=False)
+    sub.add_argument("--ignore", help="ignore all directories with these names. [default: target]")
+    sub.add_argument("--no-imports", action="store_true", default=False, help="skips extracting the EI imports after building the contracts")
+    sub.add_argument("--no-abi-git-version", action="store_true", default=False, help="skips loading the Git version into the ABI")
+    sub.add_argument("--twiggy-top", action="store_true", default=False, help="generate a twiggy top report after building")
+    sub.add_argument("--twiggy-paths", action="store_true", default=False, help="generate a twiggy paths report after building")
+    sub.add_argument("--twiggy-monos", action="store_true", default=False, help="generate a twiggy monos report after building")
+    sub.add_argument("--twiggy-dominators", action="store_true", default=False, help="generate a twiggy dominators report after building")
+
+
 def _add_build_options_args(sub: Any):
     sub.add_argument("--debug", action="store_true", default=False, help="set debug flag (default: %(default)s)")
     sub.add_argument("--no-optimization", action="store_true", default=False,
@@ -246,35 +262,21 @@ def get_project_paths(args: Any) -> List[Path]:
 
 
 def clean(args: Any):
-    project_paths = get_project_paths(args)
-    for project in project_paths:
-        projects.clean_project(project)
+    project_path = args.path
+    projects.clean_project(Path(project_path))
 
 
 def build(args: Any):
-    project_paths = get_project_paths(args)
-    options: Dict[str, Any] = _prepare_build_options(args)
+    project_paths = [Path(args.path)]
+    arg_list = cli_shared.convert_args_object_to_args_list(args)
 
     for project in project_paths:
-        projects.build_project(project, options)
-
-
-def _prepare_build_options(args: Any) -> Dict[str, Any]:
-    return {
-        "debug": args.debug,
-        "optimized": not args.no_optimization,
-        "no-wasm-opt": args.no_wasm_opt,
-        "verbose": args.verbose,
-        "cargo-target-dir": args.cargo_target_dir,
-        "wasm-symbols": args.wasm_symbols,
-        "wasm-name": args.wasm_name,
-        "wasm-suffix": args.wasm_suffix
-    }
+        projects.build_project(project, arg_list)
 
 
 def do_report(args: Any):
-    build_options: Dict[str, Any] = _prepare_build_options(args)
-    projects.do_report(args, build_options)
+    args_dict = args.__dict__
+    projects.do_report(args, args_dict)
 
 
 def run_tests(args: Any):
@@ -301,8 +303,8 @@ def deploy(args: Any):
     tx = contract.deploy(sender, arguments, gas_price, gas_limit, value, args.chain, version, args.guardian, args.options)
     tx = _sign_guarded_tx(args, tx)
 
-    logger.info("Contract address: %s", contract.address)
-    utils.log_explorer_contract_address(args.chain, contract.address)
+    logger.info("Contract address: %s", contract.address.bech32())
+    utils.log_explorer_contract_address(args.chain, contract.address.bech32())
 
     _send_or_simulate(tx, contract, args)
 
@@ -354,21 +356,16 @@ def _prepare_signer(args: Any) -> Account:
 
 
 def _sign_guarded_tx(args: Any, tx: Transaction) -> Transaction:
-    signature = tx.signature
-    tx.signature = ""
-
     try:
         guardian_account = cli_shared.prepare_guardian_account(args)
     except NoWalletProvided:
         guardian_account = None
 
     if guardian_account:
-        tx.guardianSignature = guardian_account.sign_transaction(tx)
+        tx.guardian_signature = bytes.fromhex(guardian_account.sign_transaction(tx))
     elif args.guardian:
         tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)  # type: ignore
 
-    tx.signature = signature
-
     return tx
 
 
@@ -385,7 +382,7 @@ def call(args: Any):
     value = args.value
     version = args.version
 
-    contract = SmartContract(contract_address)
+    contract = SmartContract(Address.from_bech32(contract_address))
     sender = _prepare_sender(args)
     cli_shared.prepare_chain_id_in_args(args)
 
@@ -407,7 +404,7 @@ def upgrade(args: Any):
     version = args.version
 
     contract = _prepare_contract(args)
-    contract.address = Address(contract_address)
+    contract.address = Address.from_bech32(contract_address)
     sender = _prepare_sender(args)
     cli_shared.prepare_chain_id_in_args(args)
 
@@ -424,7 +421,7 @@ def query(args: Any):
     function = args.function
     arguments = args.arguments
 
-    contract = SmartContract(contract_address)
+    contract = SmartContract(address=Address.from_bech32(contract_address))
     result = contract.query(ProxyNetworkProvider(args.proxy), function, arguments)
     utils.dump_out_json(result)
 
@@ -436,7 +433,7 @@ def _send_or_simulate(tx: Transaction, contract: SmartContract, args: Any):
 
 
 def verify(args: Any) -> None:
-    contract = Address(args.contract)
+    contract = Address.from_bech32(args.contract)
     verifier_url = args.verifier_url
 
     packaged_src = Path(args.packaged_src).expanduser().resolve()
@@ -465,7 +462,7 @@ def do_reproducible_build(args: Any):
 
     utils.ensure_folder(output_path)
 
-    options = _prepare_build_options(args)
+    options = args.__dict__
     no_wasm_opt = options.get("no-wasm-opt", True)
 
     if not is_docker_installed():

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_dns.py

@@ -1,11 +1,16 @@
 from typing import Any, List
+
+from multiversx_sdk_core import Address
+from multiversx_sdk_network_providers.proxy_network_provider import \
+    ProxyNetworkProvider
 from prettytable import PrettyTable
 
 from multiversx_sdk_cli import cli_shared
-from multiversx_sdk_cli.dns import (name_hash, dns_address_for_name, register, resolve, registration_cost,
-                                    validate_name, version, compute_dns_address_for_shard_id)
-from multiversx_sdk_cli.accounts import Address
-from multiversx_sdk_network_providers.proxy_network_provider import ProxyNetworkProvider
+from multiversx_sdk_cli.constants import ADDRESS_ZERO_BECH32
+from multiversx_sdk_cli.dns import (compute_dns_address_for_shard_id,
+                                    dns_address_for_name, name_hash, register,
+                                    registration_cost, resolve, validate_name,
+                                    version)
 
 
 def setup_parser(args: List[str], subparsers: Any) -> Any:
@@ -69,7 +74,7 @@ def _add_name_arg(sub: Any):
 
 def dns_resolve(args: Any):
     addr = resolve(args.name, ProxyNetworkProvider(args.proxy))
-    if addr.hex() != Address.zero().hex():
+    if addr.hex() != Address.from_bech32(ADDRESS_ZERO_BECH32).hex():
         print(addr.bech32())
 
 

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_output.py

@@ -1,10 +1,11 @@
-from collections import OrderedDict
 import json
-from typing import Any, Dict, List, Union
 import logging
-from multiversx_sdk_cli import utils
+from collections import OrderedDict
+from typing import Any, Dict, List, Optional, Union
+
+from multiversx_sdk_core import Address
 
-from multiversx_sdk_cli.accounts import Address
+from multiversx_sdk_cli import utils
 from multiversx_sdk_cli.interfaces import ITransaction
 from multiversx_sdk_cli.utils import ISerializable
 
@@ -13,6 +14,7 @@ logger = logging.getLogger("cli.output")
 
 class CLIOutputBuilder:
     def __init__(self) -> None:
+        self.emitted_transaction_hash: Optional[str] = None
         self.emitted_transaction: Union[ITransaction, None] = None
         self.emitted_transaction_omitted_fields: List[str] = []
         self.contract_address: Union[Address, None] = None
@@ -20,6 +22,10 @@ class CLIOutputBuilder:
         self.transaction_on_network_omitted_fields: List[str] = []
         self.simulation_results: Union[ISerializable, None] = None
 
+    def set_emitted_transaction_hash(self, hash: str):
+        self.emitted_transaction_hash = hash
+        return self
+
     def set_emitted_transaction(self, emitted_transaction: ITransaction, omitted_fields: List[str] = []):
         self.emitted_transaction = emitted_transaction
         self.emitted_transaction_omitted_fields = omitted_fields
@@ -46,8 +52,8 @@ class CLIOutputBuilder:
 
         if self.emitted_transaction:
             emitted_transaction_dict = self.emitted_transaction.to_dictionary()
-            emitted_transaction_hash = self.emitted_transaction.get_hash() or ""
-            emitted_transaction_data = self.emitted_transaction.get_data() or ""
+            emitted_transaction_hash = self.emitted_transaction_hash or ""
+            emitted_transaction_data = str(self.emitted_transaction.data)
             utils.omit_fields(emitted_transaction_dict, self.emitted_transaction_omitted_fields)
 
             output["emittedTransaction"] = emitted_transaction_dict

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_password.py

@@ -1,15 +1,15 @@
-from typing import Any
 from getpass import getpass
+from typing import Any
 
 
-def load_password(args: Any):
+def load_password(args: Any) -> str:
     if args.passfile:
         with open(args.passfile) as pass_file:
             return pass_file.read().strip()
     return getpass("Keyfile's password: ")
 
 
-def load_guardian_password(args: Any):
+def load_guardian_password(args: Any) -> str:
     if args.guardian_passfile:
         with open(args.guardian_passfile) as pass_file:
             return pass_file.read().strip()

{multiversx_sdk_cli-7.3.0 → multiversx_sdk_cli-8.0.0}/multiversx_sdk_cli/cli_shared.py

@@ -1,9 +1,11 @@
 import argparse
 import ast
+import copy
 import sys
 from argparse import FileType
-from typing import Any, List, Text, cast
+from typing import Any, Dict, List, Text, cast
 
+from multiversx_sdk_core import Address
 from multiversx_sdk_network_providers.proxy_network_provider import \
     ProxyNetworkProvider
 
@@ -15,9 +17,10 @@ from multiversx_sdk_cli.cli_password import (load_guardian_password,
 from multiversx_sdk_cli.constants import (DEFAULT_TX_VERSION,
                                           TRANSACTION_OPTIONS_TX_GUARDED)
 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
 from multiversx_sdk_cli.simulation import Simulator
-from multiversx_sdk_cli.transactions import Transaction
+from multiversx_sdk_cli.transactions import send_and_wait_for_result
 from multiversx_sdk_cli.ux import show_warning
 
 
@@ -147,7 +150,7 @@ def prepare_account(args: Any):
         account = Account(key_file=args.keyfile, password=password)
     elif args.ledger:
         address = do_get_ledger_address(account_index=args.ledger_account_index, address_index=args.ledger_address_index)
-        account = Account(address=address)
+        account = Account(address=Address.from_bech32(address))
     else:
         raise errors.NoWalletProvided()
 
@@ -162,7 +165,7 @@ def prepare_guardian_account(args: Any):
         account = Account(key_file=args.guardian_keyfile, password=password)
     elif args.guardian_ledger:
         address = do_get_ledger_address(account_index=args.guardian_ledger_account_index, address_index=args.guardian_ledger_address_index)
-        account = Account(address=address)
+        account = Account(Address.from_bech32(address))
     else:
         raise errors.NoWalletProvided()
 
@@ -245,7 +248,7 @@ def check_options_for_guarded_tx(options: int):
         raise errors.BadUsage("Invalid guarded transaction's options. The second least significant bit must be set.")
 
 
-def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CLIOutputBuilder:
+def send_or_simulate(tx: ITransaction, args: Any, dump_output: bool = True) -> CLIOutputBuilder:
     proxy = ProxyNetworkProvider(args.proxy)
 
     is_set_wait_result = hasattr(args, "wait_result") and args.wait_result
@@ -262,10 +265,11 @@ def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CL
 
     try:
         if send_wait_result:
-            transaction_on_network = tx.send_wait_result(proxy, args.timeout)
+            transaction_on_network = send_and_wait_for_result(tx, proxy, args.timeout)
             output_builder.set_awaited_transaction(transaction_on_network)
         elif send_only:
-            tx.send(proxy)
+            hash = proxy.send_transaction(tx)
+            output_builder.set_emitted_transaction_hash(hash)
         elif simulate:
             simulation = Simulator(proxy).run(tx)
             output_builder.set_simulation_results(simulation)
@@ -288,3 +292,24 @@ def check_if_sign_method_required(args: List[str], checked_method: str) -> bool:
             return False
 
     return True
+
+
+def convert_args_object_to_args_list(args: Any) -> List[str]:
+    arguments = copy.deepcopy(args)
+    args_dict: Dict[str, Any] = arguments.__dict__
+
+    # delete the function key because we don't need to pass it along
+    args_dict.pop("func", None)
+
+    args_list: List[str] = []
+    for key, val in args_dict.items():
+        modified_key = "--" + key.replace("_", "-")
+
+        if isinstance(val, bool) and val:
+            args_list.extend([modified_key])
+            continue
+
+        if val:
+            args_list.extend([modified_key, val])
+
+    return args_list