Integrated the SmartContractFactory

multiversx_sdk_cli/cli_contracts.py

@@ -3,20 +3,24 @@
 from pathlib import Path
 from typing import Any, List
 
-from multiversx_sdk_core import Address, Transaction
+from multiversx_sdk_core import (Address, AddressComputer, TokenComputer,
+                                 Transaction)
+from multiversx_sdk_core.transaction_factories import TransactionsFactoryConfig
 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, LedgerAccount
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
 from multiversx_sdk_cli.cli_password import load_password
+from multiversx_sdk_cli.constants import NUMBER_OF_SHARDS
 from multiversx_sdk_cli.contract_verification import \
     trigger_contract_verification
-from multiversx_sdk_cli.contracts import CodeMetadata, SmartContract
+from multiversx_sdk_cli.contracts import SmartContract, query_contract
 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.interfaces import IAddress
 from multiversx_sdk_cli.projects.core import get_project_paths_recursively
 from multiversx_sdk_cli.projects.templates import Contract
 from multiversx_sdk_cli.ux import show_message
@@ -299,32 +303,22 @@ def deploy(args: Any):
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
 
-    arguments = args.arguments
-    gas_price = args.gas_price
-    gas_limit = args.gas_limit
-    value = args.value
-    version = args.version
-
-    contract = _prepare_contract(args)
     sender = _prepare_sender(args)
     cli_shared.prepare_chain_id_in_args(args)
 
-    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.to_bech32())
-    utils.log_explorer_contract_address(args.chain, contract.address.to_bech32())
+    config = TransactionsFactoryConfig(args.chain)
+    contract = SmartContract(config, TokenComputer())
 
-    _send_or_simulate(tx, contract, args)
+    address_computer = AddressComputer(NUMBER_OF_SHARDS)
+    contract_address = address_computer.compute_contract_address(deployer=sender.address, deployment_nonce=sender.nonce)
 
+    tx = contract.get_deploy_transaction(sender, args)
+    tx = _sign_guarded_tx(args, tx)
 
-def _prepare_contract(args: Any) -> SmartContract:
-    bytecode = utils.read_binary_file(Path(args.bytecode)).hex()
+    logger.info("Contract address: %s", contract_address.to_bech32())
+    utils.log_explorer_contract_address(args.chain, contract_address.to_bech32())
 
-    metadata = CodeMetadata(upgradeable=args.metadata_upgradeable, readable=args.metadata_readable,
-                            payable=args.metadata_payable, payable_by_sc=args.metadata_payable_by_sc)
-    contract = SmartContract(bytecode=bytecode, metadata=metadata)
-    return contract
+    _send_or_simulate(tx, contract_address, args)
 
 
 def _prepare_sender(args: Any) -> Account:
@@ -383,61 +377,57 @@ def call(args: Any):
     cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
 
-    contract_address = args.contract
-    function = args.function
-    arguments = args.arguments
-    gas_price = args.gas_price
-    gas_limit = args.gas_limit
-    value = args.value
-    version = args.version
-
-    contract = SmartContract(Address.from_bech32(contract_address))
-    sender = _prepare_sender(args)
     cli_shared.prepare_chain_id_in_args(args)
+    sender = _prepare_sender(args)
+
+    config = TransactionsFactoryConfig(args.chain)
+    contract = SmartContract(config, TokenComputer())
+    contract_address = Address.new_from_bech32(args.contract)
 
-    tx = contract.execute(sender, function, arguments, gas_price, gas_limit, value, args.chain, version, args.guardian, args.options)
+    tx = contract.get_execute_transaction(sender, args)
     tx = _sign_guarded_tx(args, tx)
 
-    _send_or_simulate(tx, contract, args)
+    _send_or_simulate(tx, contract_address, args)
 
 
 def upgrade(args: Any):
     logger.debug("upgrade")
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
 
-    contract_address = args.contract
-    arguments = args.arguments
-    gas_price = args.gas_price
-    gas_limit = args.gas_limit
-    value = args.value
-    version = args.version
-
-    contract = _prepare_contract(args)
-    contract.address = Address.from_bech32(contract_address)
-    sender = _prepare_sender(args)
     cli_shared.prepare_chain_id_in_args(args)
+    sender = _prepare_sender(args)
 
-    tx = contract.upgrade(sender, arguments, gas_price, gas_limit, value, args.chain, version, args.guardian, args.options)
+    config = TransactionsFactoryConfig(args.chain)
+    contract = SmartContract(config, TokenComputer())
+    contract_address = Address.new_from_bech32(args.contract)
+
+    tx = contract.get_upgrade_transaction(sender, args)
     tx = _sign_guarded_tx(args, tx)
 
-    _send_or_simulate(tx, contract, args)
+    _send_or_simulate(tx, contract_address, args)
 
 
 def query(args: Any):
     logger.debug("query")
 
-    contract_address = args.contract
+    # workaround so we can use the function bellow
+    args.chain = ""
+    cli_shared.prepare_chain_id_in_args(args)
+
+    contract_address = Address.new_from_bech32(args.contract)
+
+    proxy = ProxyNetworkProvider(args.proxy)
     function = args.function
-    arguments = args.arguments
+    arguments = args.arguments or []
 
-    contract = SmartContract(address=Address.from_bech32(contract_address))
-    result = contract.query(ProxyNetworkProvider(args.proxy), function, arguments)
+    result = query_contract(contract_address, proxy, function, arguments)
     utils.dump_out_json(result)
 
 
-def _send_or_simulate(tx: Transaction, contract: SmartContract, args: Any):
+def _send_or_simulate(tx: Transaction, contract_address: IAddress, args: Any):
     output_builder = cli_shared.send_or_simulate(tx, args, dump_output=False)
-    output_builder.set_contract_address(contract.address)
+    output_builder.set_contract_address(contract_address)
     utils.dump_out_json(output_builder.build(), outfile=args.outfile)
 
 

multiversx_sdk_cli/cli_output.py

@@ -3,12 +3,11 @@
 from collections import OrderedDict
 from typing import Any, Dict, List, Optional, Union
 
-from multiversx_sdk_core import Address
 from multiversx_sdk_network_providers.transactions import \
     transaction_to_dictionary
 
 from multiversx_sdk_cli import utils
-from multiversx_sdk_cli.interfaces import ITransaction
+from multiversx_sdk_cli.interfaces import IAddress, ITransaction
 from multiversx_sdk_cli.utils import ISerializable
 
 logger = logging.getLogger("cli.output")
@@ -19,7 +18,7 @@ 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
+        self.contract_address: Union[IAddress, None] = None
         self.transaction_on_network: Union[ISerializable, None] = None
         self.transaction_on_network_omitted_fields: List[str] = []
         self.simulation_results: Union[ISerializable, None] = None
@@ -33,7 +32,7 @@ def set_emitted_transaction(self, emitted_transaction: ITransaction, omitted_fie
         self.emitted_transaction_omitted_fields = omitted_fields
         return self
 
-    def set_contract_address(self, contract_address: Address):
+    def set_contract_address(self, contract_address: IAddress):
         self.contract_address = contract_address
         return self
 

multiversx_sdk_cli/cli_shared.py

@@ -93,9 +93,9 @@ def add_tx_args(args: List[str], sub: Any, with_nonce: bool = True, with_receive
 
 
 def add_guardian_args(sub: Any):
-    sub.add_argument("--guardian", type=str, help="the address of the guradian")
-    sub.add_argument("--guardian-service-url", type=str, help="the url of the guardian service")
-    sub.add_argument("--guardian-2fa-code", type=str, help="the 2fa code for the guardian")
+    sub.add_argument("--guardian", type=str, help="the address of the guradian", default="")
+    sub.add_argument("--guardian-service-url", type=str, help="the url of the guardian service", default="")
+    sub.add_argument("--guardian-2fa-code", type=str, help="the 2fa code for the guardian", default="")
 
 
 def add_wallet_args(args: List[str], sub: Any):

multiversx_sdk_cli/constants.py

@@ -11,3 +11,5 @@
 
 DEFAULT_HRP = "erd"
 ADDRESS_ZERO_BECH32 = "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu"
+
+NUMBER_OF_SHARDS = 3