Integrated new sdk-py package

multiversx_sdk_cli/accounts.py

@@ -2,10 +2,9 @@
 from pathlib import Path
 from typing import Any, Optional, Protocol
 
-from multiversx_sdk_core import (Address, Message, MessageComputer,
-                                 TransactionComputer)
-from multiversx_sdk_network_providers.accounts import AccountOnNetwork
-from multiversx_sdk_wallet import UserSigner
+from multiversx_sdk import (Address, Message, MessageComputer,
+                            TransactionComputer, UserSigner)
+from multiversx_sdk.network_providers.accounts import AccountOnNetwork
 
 from multiversx_sdk_cli.constants import DEFAULT_HRP
 from multiversx_sdk_cli.interfaces import IAccount, IAddress, ITransaction
@@ -73,9 +72,9 @@
 
         transaction_computer = TransactionComputer()
         if transaction.options & TX_HASH_SIGN_OPTIONS == TX_HASH_SIGN_OPTIONS:
             return self.signer.sign(transaction_computer.compute_hash_for_signing(transaction)).hex()
 
         return self.signer.sign(transaction_computer.compute_bytes_for_signing(transaction)).hex()
 
     def sign_message(self, data: bytes) -> str:
         assert self.signer is not None

multiversx_sdk_cli/cli_accounts.py

@@ -1,9 +1,7 @@
 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 import Address, ProxyNetworkProvider
 
 from multiversx_sdk_cli import cli_shared, utils
 

multiversx_sdk_cli/cli_contracts.py

@@ -3,10 +3,8 @@
 from pathlib import Path
 from typing import Any, List
 
-from multiversx_sdk_core import Address, AddressComputer, Transaction
-from multiversx_sdk_core.transaction_factories import TransactionsFactoryConfig
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
+from multiversx_sdk import (Address, AddressComputer, ProxyNetworkProvider,
+                            Transaction, TransactionsFactoryConfig)
 
 from multiversx_sdk_cli import cli_shared, projects, utils
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder

multiversx_sdk_cli/cli_delegation.py

@@ -1,8 +1,6 @@
 from typing import Any, List
 
-from multiversx_sdk_core.transaction_factories import TransactionsFactoryConfig
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
+from multiversx_sdk import ProxyNetworkProvider, TransactionsFactoryConfig
 
 from multiversx_sdk_cli import cli_shared, errors, utils
 from multiversx_sdk_cli.delegation import DelegationOperations

multiversx_sdk_cli/cli_dns.py

@@ -1,8 +1,6 @@
 from typing import Any, List
 
-from multiversx_sdk_core import Address
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
+from multiversx_sdk import Address, ProxyNetworkProvider
 from prettytable import PrettyTable
 
 from multiversx_sdk_cli import cli_shared

multiversx_sdk_cli/cli_output.py

@@ -3,8 +3,7 @@
 from collections import OrderedDict
 from typing import Any, Dict, List, Optional, Union
 
-from multiversx_sdk_network_providers.transactions import \
-    transaction_to_dictionary
+from multiversx_sdk import TransactionsConverter
 
 from multiversx_sdk_cli import utils
 from multiversx_sdk_cli.interfaces import IAddress, ITransaction
@@ -52,7 +51,8 @@ def build(self) -> Dict[str, Any]:
         output: Dict[str, Any] = OrderedDict()
 
         if self.emitted_transaction:
-            emitted_transaction_dict = transaction_to_dictionary(self.emitted_transaction)
+            tx_converter = TransactionsConverter()
+            emitted_transaction_dict = tx_converter.transaction_to_dictionary(self.emitted_transaction)
             emitted_transaction_hash = self.emitted_transaction_hash or ""
             emitted_transaction_data = self.emitted_transaction.data.decode()
             utils.omit_fields(emitted_transaction_dict, self.emitted_transaction_omitted_fields)

multiversx_sdk_cli/cli_shared.py

@@ -5,9 +5,7 @@
 from argparse import FileType
 from typing import Any, Dict, List, Text, cast
 
-from multiversx_sdk_core import Address
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
+from multiversx_sdk import Address, ProxyNetworkProvider
 
 from multiversx_sdk_cli import config, errors, utils
 from multiversx_sdk_cli.accounts import Account, LedgerAccount

multiversx_sdk_cli/cli_wallet.py

@@ -5,10 +5,8 @@
 from pathlib import Path
 from typing import Any, List, Optional, Tuple
 
-from multiversx_sdk_core import Address
-from multiversx_sdk_wallet import UserSecretKey, UserWallet
-from multiversx_sdk_wallet.mnemonic import Mnemonic
-from multiversx_sdk_wallet.user_pem import UserPEM
+from multiversx_sdk import (Address, Mnemonic, UserPEM, UserSecretKey,
+                            UserWallet)
 
 from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.constants import DEFAULT_HRP

multiversx_sdk_cli/config.py

@@ -3,7 +3,6 @@
 from typing import Any, Dict, List
 
 from multiversx_sdk_cli import errors, utils
-from multiversx_sdk_cli.ux import show_warning
 
 SDK_PATH = Path("~/multiversx-sdk").expanduser().resolve()
 LOCAL_CONFIG_PATH = Path("mxpy.json").resolve()

multiversx_sdk_cli/contract_verification.py

@@ -6,7 +6,7 @@
 from typing import Any, Dict, Optional, Tuple
 
 import requests
-from multiversx_sdk_core import Address
+from multiversx_sdk import Address
 
 from multiversx_sdk_cli.accounts import Account
 from multiversx_sdk_cli.errors import KnownError

multiversx_sdk_cli/contracts.py

@@ -3,12 +3,10 @@
 from pathlib import Path
 from typing import Any, List, Optional, Protocol, Sequence, Union
 
-from multiversx_sdk_core import (Token, TokenComputer, TokenTransfer,
-                                 Transaction, TransactionPayload)
-from multiversx_sdk_core.address import Address
-from multiversx_sdk_core.transaction_factories import \
-    SmartContractTransactionsFactory
-from multiversx_sdk_network_providers.interface import IContractQuery
+from multiversx_sdk import (Address, SmartContractTransactionsFactory, Token,
+                            TokenComputer, TokenTransfer, Transaction,
+                            TransactionPayload)
+from multiversx_sdk.network_providers.interface import IContractQuery
 
 from multiversx_sdk_cli import errors
 from multiversx_sdk_cli.accounts import Account
@@ -70,11 +68,13 @@ class IConfig(Protocol):
     chain_id: str
     min_gas_limit: int
     gas_limit_per_byte: int
+    gas_limit_claim_developer_rewards: int
+    gas_limit_change_owner_address: int
 
 
 class SmartContract:
     def __init__(self, config: IConfig):
-        self._factory = SmartContractTransactionsFactory(config, TokenComputer())
+        self._factory = SmartContractTransactionsFactory(config)
 
     def prepare_deploy_transaction(self,
                                    owner: Account,

multiversx_sdk_cli/cosign_transaction.py

@@ -1,17 +1,17 @@
 from typing import Any, Dict
 
 import requests
-from multiversx_sdk_network_providers.transactions import \
-    transaction_to_dictionary
+from multiversx_sdk import TransactionsConverter
 
 from multiversx_sdk_cli.errors import GuardianServiceError
 from multiversx_sdk_cli.interfaces import ITransaction
 
 
 def cosign_transaction(transaction: ITransaction, service_url: str, guardian_code: str) -> ITransaction:
+    tx_converter = TransactionsConverter()
     payload = {
         "code": f"{guardian_code}",
-        "transaction": transaction_to_dictionary(transaction)
+        "transaction": tx_converter.transaction_to_dictionary(transaction)
     }
 
     url = f"{service_url}/sign-transaction"

multiversx_sdk_cli/custom_network_provider.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Optional, Protocol
 
-from multiversx_sdk_network_providers import GenericError, ProxyNetworkProvider
+from multiversx_sdk import GenericError, ProxyNetworkProvider
 
 from multiversx_sdk_cli.errors import ProxyError
 from multiversx_sdk_cli.interfaces import ISimulateResponse, ITransaction
@@ -21,7 +21,7 @@
     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", "")
@@ -30,7 +30,7 @@
             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/delegation/staking_provider.py

@@ -1,10 +1,8 @@
 from pathlib import Path
 from typing import Any, List, Protocol, Tuple
 
-from multiversx_sdk_core import Address
-from multiversx_sdk_core.transaction_factories import \
-    DelegationTransactionsFactory
-from multiversx_sdk_wallet import ValidatorPublicKey
+from multiversx_sdk import (Address, DelegationTransactionsFactory,
+                            ValidatorPublicKey)
 
 from multiversx_sdk_cli.accounts import Account, LedgerAccount
 from multiversx_sdk_cli.cli_password import load_password

multiversx_sdk_cli/dns.py

@@ -1,7 +1,7 @@
 from typing import Any, List, Protocol
 
 from Cryptodome.Hash import keccak
-from multiversx_sdk_core import Address, AddressComputer
+from multiversx_sdk import Address, AddressComputer
 
 from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.accounts import Account

multiversx_sdk_cli/localnet/wallets.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Dict, Tuple
 
-from multiversx_sdk_wallet.validator_pem import ValidatorPEM
+from multiversx_sdk import ValidatorPEM
 
 from multiversx_sdk_cli import errors, utils
 from multiversx_sdk_cli.accounts import Account

multiversx_sdk_cli/projects/report/data/folder_report.py

@@ -1,9 +1,12 @@
 from pathlib import Path
 from typing import Any, List, Optional
-from multiversx_sdk_cli.projects.report.data.common import first_not_none, flatten_list_of_rows, merge_values_by_key
 
-from multiversx_sdk_cli.projects.report.data.project_report import ProjectReport, merge_list_of_projects
-from multiversx_sdk_cli.projects.report.format.format_options import FormatOptions
+from multiversx_sdk_cli.projects.report.data.common import (
+    first_not_none, flatten_list_of_rows, merge_values_by_key)
+from multiversx_sdk_cli.projects.report.data.project_report import (
+    ProjectReport, merge_list_of_projects)
+from multiversx_sdk_cli.projects.report.format.format_options import \
+    FormatOptions
 
 
 class FolderReport:
@@ -17,6 +20,7 @@ def to_json(self) -> Any:
             'projects': self.projects
         }
 
+    @staticmethod
     def from_json(json: Any) -> 'FolderReport':
         projects = [ProjectReport.from_json(project) for project in json['projects']]
         return FolderReport(Path(json['root_path']), projects)

multiversx_sdk_cli/sign_verify.py

@@ -1,7 +1,6 @@
 from typing import Dict
 
-from multiversx_sdk_core import Address, Message, MessageComputer
-from multiversx_sdk_wallet import UserVerifier
+from multiversx_sdk import Address, Message, MessageComputer, UserVerifier
 
 from multiversx_sdk_cli.accounts import Account
 

multiversx_sdk_cli/tests/test_cli_shared.py

@@ -40,7 +40,7 @@ def test_args_obj_to_list():
     assert args_list[1] == contract_build_args.path
     assert args_list[2] == "--no-wasm-opt"
 
-    contract_build_args.ignore = "random_directory"
+    contract_build_args.ignore = "random_directory"  # type: ignore
     contract_build_args.no_imports = True
     args_list = convert_args_object_to_args_list(contract_build_args)
 

multiversx_sdk_cli/tests/test_cli_wallet.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Any
 
-from multiversx_sdk_wallet import Mnemonic, UserPEM, UserWallet
+from multiversx_sdk import Mnemonic, UserPEM, UserWallet
 
 from multiversx_sdk_cli.cli import main
 
@@ -376,4 +376,4 @@ def _read_stdout(capsys: Any) -> str:
 
 
 def _mock_getpass(monkeypatch: Any, password: str):
-    monkeypatch.setattr(getpass, "getpass", lambda _: password)
+    monkeypatch.setattr(getpass, "getpass", lambda _: password)  # type: ignore

multiversx_sdk_cli/tests/test_contracts.py

@@ -3,7 +3,7 @@
 
 import pytest
 from Cryptodome.Hash import keccak
-from multiversx_sdk_core.address import Address
+from multiversx_sdk import Address
 
 from multiversx_sdk_cli import errors
 from multiversx_sdk_cli.accounts import Account

multiversx_sdk_cli/tests/test_proxy.py

@@ -1,6 +1,4 @@
-from multiversx_sdk_core import Address
-from multiversx_sdk_network_providers.proxy_network_provider import \
-    ProxyNetworkProvider
+from multiversx_sdk import Address, ProxyNetworkProvider
 
 from multiversx_sdk_cli.accounts import Account
 from multiversx_sdk_cli.cli import main

multiversx_sdk_cli/tests/test_validators_core.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from multiversx_sdk_core import Address
+from multiversx_sdk import Address
 
 from multiversx_sdk_cli.validators.core import \
     prepare_transaction_data_for_stake

multiversx_sdk_cli/transactions.py

@@ -4,7 +4,7 @@
 import time
 from typing import Any, Dict, Optional, Protocol, TextIO
 
-from multiversx_sdk_core import Address, Transaction, TransactionPayload
+from multiversx_sdk import Address, Transaction, TransactionPayload
 
 from multiversx_sdk_cli import errors
 from multiversx_sdk_cli.accounts import Account, LedgerAccount

multiversx_sdk_cli/utils.py

@@ -11,10 +11,8 @@
 from typing import (Any, Dict, List, Optional, Protocol, Union,
                     runtime_checkable)
 
-import requests_cache
 import toml
 
-import multiversx_sdk_cli.config
 from multiversx_sdk_cli import errors
 
 logger = logging.getLogger("utils")
@@ -149,17 +147,6 @@ def mark_executable(file: str) -> None:
     os.chmod(file, st.st_mode | stat.S_IEXEC)
 
 
-def find_in_dictionary(dictionary, compound_path):
-    keys = compound_path.split(".")
-    node = dictionary
-    for key in keys:
-        node = node.get(key)
-        if node is None:
-            break
-
-    return node
-
-
 def list_files(folder: Path, suffix: Optional[str] = None) -> List[Path]:
     folder = folder.expanduser()
     files: List[Path] = [folder / file for file in os.listdir(folder)]
@@ -210,7 +197,7 @@ def str_int_to_hex_str(number_str: str) -> str:
     return bytes_str
 
 
-def parse_keys(bls_public_keys):
+def parse_keys(bls_public_keys: str):
     keys = bls_public_keys.split(',')
     parsed_keys = ''
     for key in keys:

multiversx_sdk_cli/validators/core.py

@@ -2,9 +2,7 @@
 from pathlib import Path
 from typing import Any, List, Tuple, Union
 
-from multiversx_sdk_core import Address
-from multiversx_sdk_wallet.validator_pem import ValidatorPEM
-from multiversx_sdk_wallet.validator_signer import ValidatorSigner
+from multiversx_sdk import Address, ValidatorPEM, ValidatorSigner
 
 from multiversx_sdk_cli import utils
 from multiversx_sdk_cli.accounts import Account

multiversx_sdk_cli/validators/validators_file.py

@@ -2,9 +2,7 @@
 from pathlib import Path
 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 import ValidatorPEM, ValidatorPublicKey, ValidatorSigner
 
 from multiversx_sdk_cli import guards
 from multiversx_sdk_cli.errors import CannotReadValidatorsData

pyproject.toml

@@ -27,9 +27,7 @@ dependencies = [
   "semver",
   "requests-cache",
   "rich==13.3.4",
-  "multiversx-sdk-network-providers>=0.13.0,<0.14.0",
-  "multiversx-sdk-wallet>=0.9.0,<0.10.0",
-  "multiversx-sdk-core>=0.8.0,<0.9.0",
+  "multiversx-sdk>=0.9.2,<1.0.0",
   "argcomplete==3.2.2"
 ]
 

requirements.txt

@@ -10,6 +10,4 @@ requests-cache
 rich==13.3.4
 argcomplete==3.2.2
 
-multiversx-sdk-core>=0.8.0,<0.9.0
-multiversx-sdk-network-providers>=0.13.0,<0.14.0
-multiversx-sdk-wallet>=0.9.0,<0.10.0
+multiversx-sdk>=0.9.2,<1.0.0