Merge main into feat/next

.github/workflows/build-windows.yml

@@ -47,13 +47,4 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=.
-          pytest -m "not skip_on_windows" .
-      - name: Run CLI tests
-        shell: bash
-        run: |
-          export PROXY=https://testnet-gateway.multiversx.com
-          export CHAIN_ID=T
-          cd ./multiversx_sdk_cli/tests
-          source ./test_cli_tx.sh && testAll || return 1
-          source ./test_cli_dns.sh && testOffline || return 1
-          source ./test_cli_validators.sh && testAll || return 1
+          pytest -m "not skip_on_windows and not require_localnet" .

.github/workflows/build.yml

@@ -44,8 +44,3 @@ jobs:
         run: |
           export PYTHONPATH=.
           pytest .
-      - name: Run CLI tests
-        run: |
-          cd ./multiversx_sdk_cli/tests
-          source ./test_cli_contracts.sh && testAll || return 1
-          source ./test_cli_dns.sh && testOffline || return 1

.github/workflows/test-localnet-tests.yml

@@ -0,0 +1,55 @@
+name: Test localnet-dependent tests
+
+on:
+  pull_request:
+    branches: [main, feat/*]
+  workflow_dispatch:
+
+env:
+ BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  localnet:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: [3.11]
+
+    steps:
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          pip3 install -r requirements.txt
+          pip3 install -r ./requirements-dev.txt --upgrade
+
+      - name: Set up MultiversX localnet
+        run: |
+          mkdir -p ~/multiversx-sdk
+          export PYTHONPATH=.
+          python3 -m multiversx_sdk_cli.cli localnet prerequisites --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml
+          python3 -m multiversx_sdk_cli.cli localnet build --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml
+
+          # "Go" and artifacts from "GOPATH/pkg/mod" are not needed anymore.
+          sudo rm -rf ~/multiversx-sdk/golang
+
+          python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml
+          python3 -m multiversx_sdk_cli.cli localnet config --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml
+          nohup python3 -m multiversx_sdk_cli.cli localnet start --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml > localnet.log 2>&1 & echo $! > localnet.pid
+          sleep 120
+
+      - name: Test localnet dependent tests
+        run: |
+           pytest -m require_localnet .
+           python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml

README.md

@@ -8,7 +8,7 @@ Python Command Line Tools for interacting with Multivers<sup>X</sup>.
 [CLI](CLI.md)
 
 ## Distribution
-[mxpy-up](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) and [PyPi](https://pypi.org/project/multiversx-sdk-cli/#history)
+[pipx](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) [(PyPi)](https://pypi.org/project/multiversx-sdk-cli/#history)
 
 ## Development setup
 

multiversx_sdk_cli/accounts.py

@@ -2,11 +2,11 @@
 from pathlib import Path
 from typing import Any, Optional, Protocol
 
 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.config import get_address_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 \
@@ -61,20 +61,20 @@
         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, DEFAULT_HRP)
+            self.address = Address(self.signer.get_pubkey().buffer, get_address_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, DEFAULT_HRP)
+            self.address = Address(self.signer.get_pubkey().buffer, get_address_hrp())
 
     def sign_transaction(self, transaction: ITransaction) -> str:
         assert self.signer is not None
 
         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
@@ -96,6 +96,8 @@
     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
+
+        # TODO: This check will be removed in the next major release.
         if should_use_hash_signing:
             transaction.version = TX_HASH_SIGN_VERSION
             transaction.options = transaction.options | TX_HASH_SIGN_OPTIONS

multiversx_sdk_cli/cli.py

@@ -6,6 +6,7 @@
 from typing import Any, List
 
 import argcomplete
+from multiversx_sdk import LibraryConfig
 from rich.logging import RichHandler
 
 import multiversx_sdk_cli.cli_accounts
@@ -53,6 +54,8 @@ def _do_main(cli_args: List[str]):
         logging.basicConfig(level="INFO", format='%(name)s: %(message)s', handlers=[RichHandler(show_time=False, rich_tracebacks=True)])
 
     verify_deprecated_entries_in_config_file()
+    default_hrp = config.get_address_hrp()
+    LibraryConfig.default_address_hrp = default_hrp
 
     if not hasattr(args, "func"):
         parser.print_help()

multiversx_sdk_cli/cli_accounts.py

@@ -4,6 +4,7 @@
 from multiversx_sdk import Address, ProxyNetworkProvider
 
 from multiversx_sdk_cli import cli_shared, utils
+from multiversx_sdk_cli.config import get_config_for_network_providers
 
 logger = logging.getLogger("cli.accounts")
 
@@ -33,7 +34,8 @@ def _add_address_arg(sub: Any):
 def get_account(args: Any):
     proxy_url = args.proxy
     address = args.address
-    proxy = ProxyNetworkProvider(proxy_url)
+    config = get_config_for_network_providers()
+    proxy = ProxyNetworkProvider(url=proxy_url, config=config)
     account = proxy.get_account(Address.new_from_bech32(address))
 
     if args.balance:

multiversx_sdk_cli/cli_contracts.py

@@ -10,6 +10,7 @@
 
 from multiversx_sdk_cli import cli_shared, projects, utils
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
+from multiversx_sdk_cli.config import get_config_for_network_providers
 from multiversx_sdk_cli.constants import NUMBER_OF_SHARDS
 from multiversx_sdk_cli.contract_verification import \
     trigger_contract_verification
@@ -100,7 +101,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     cli_shared.add_tx_args(args, sub, with_receiver=False, with_data=False)
     _add_function_arg(sub)
     _add_arguments_arg(sub)
-    _add_token_transfers_args(sub)
+    cli_shared.add_token_transfers_args(sub)
     sub.add_argument("--wait-result", action="store_true", default=False,
                      help="signal to wait for the transaction result - only valid if --send is set")
     sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
@@ -243,12 +244,6 @@ def _add_arguments_arg(sub: Any):
                      "E.g. [{ 'to': 'erd1...', 'amount': 10000000000 }]")
 
 
-def _add_token_transfers_args(sub: Any):
-    sub.add_argument("--token-transfers", nargs='+',
-                     help="token transfers for transfer & execute, as [token, amount] "
-                     "E.g. --token-transfers NFT-123456-0a 1 ESDT-987654 100000000")
-
-
 def _add_metadata_arg(sub: Any):
     sub.add_argument("--metadata-not-upgradeable", dest="metadata_upgradeable", action="store_false",
                      help="‼ mark the contract as NOT upgradeable (default: upgradeable)")
@@ -448,14 +443,15 @@ def query(args: Any):
     args.chain = ""
     cli_shared.prepare_chain_id_in_args(args)
 
-    config = TransactionsFactoryConfig(args.chain)
+    factory_config = TransactionsFactoryConfig(args.chain)
     abi = Abi.load(Path(args.abi)) if args.abi else None
-    contract = SmartContract(config, abi)
+    contract = SmartContract(factory_config, abi)
 
     arguments, should_prepare_args = _get_contract_arguments(args)
     contract_address = Address.new_from_bech32(args.contract)
 
-    proxy = ProxyNetworkProvider(args.proxy)
+    network_provider_config = get_config_for_network_providers()
+    proxy = ProxyNetworkProvider(url=args.proxy, config=network_provider_config)
     function = args.function
 
     result = contract.query_contract(

multiversx_sdk_cli/cli_delegation.py

@@ -3,6 +3,7 @@
 from multiversx_sdk import ProxyNetworkProvider, TransactionsFactoryConfig
 
 from multiversx_sdk_cli import cli_shared, errors, utils
+from multiversx_sdk_cli.config import get_config_for_network_providers
 from multiversx_sdk_cli.delegation import DelegationOperations
 
 
@@ -209,7 +210,8 @@ def do_create_delegation_contract(args: Any):
 def get_contract_address_by_deploy_tx_hash(args: Any):
     args = utils.as_object(args)
 
-    proxy = ProxyNetworkProvider(args.proxy)
+    config = get_config_for_network_providers()
+    proxy = ProxyNetworkProvider(url=args.proxy, config=config)
 
     transaction = proxy.get_transaction(args.create_tx_hash)
     transaction_events = transaction.logs.events

multiversx_sdk_cli/cli_dns.py

@@ -1,10 +1,11 @@
 from typing import Any, List
 
-from multiversx_sdk import Address, ProxyNetworkProvider
+from multiversx_sdk import ProxyNetworkProvider
 from prettytable import PrettyTable
 
 from multiversx_sdk_cli import cli_shared
-from multiversx_sdk_cli.constants import ADDRESS_ZERO_BECH32
+from multiversx_sdk_cli.config import get_config_for_network_providers
+from multiversx_sdk_cli.constants import ADDRESS_ZERO_HEX
 from multiversx_sdk_cli.dns import (compute_dns_address_for_shard_id,
                                     dns_address_for_name, name_hash, register,
                                     registration_cost, resolve, validate_name,
@@ -79,14 +80,17 @@ def _ensure_proxy_is_provided(args: Any):
 def dns_resolve(args: Any):
     _ensure_proxy_is_provided(args)
 
-    addr = resolve(args.name, ProxyNetworkProvider(args.proxy))
-    if addr.to_hex() != Address.new_from_bech32(ADDRESS_ZERO_BECH32).to_hex():
+    config = get_config_for_network_providers()
+    addr = resolve(args.name, ProxyNetworkProvider(url=args.proxy, config=config))
+    if addr.to_hex() != ADDRESS_ZERO_HEX:
         print(addr.to_bech32())
 
 
 def dns_validate_name(args: Any):
     _ensure_proxy_is_provided(args)
-    validate_name(args.name, args.shard_id, ProxyNetworkProvider(args.proxy))
+
+    config = get_config_for_network_providers()
+    validate_name(args.name, args.shard_id, ProxyNetworkProvider(url=args.proxy, config=config))
 
 
 def get_name_hash(args: Any):
@@ -107,13 +111,16 @@ def get_dns_address_for_name_hex(args: Any):
 
 def get_registration_cost(args: Any):
     _ensure_proxy_is_provided(args)
-    print(registration_cost(args.shard_id, ProxyNetworkProvider(args.proxy)))
+
+    config = get_config_for_network_providers()
+    print(registration_cost(args.shard_id, ProxyNetworkProvider(url=args.proxy, config=config)))
 
 
 def get_version(args: Any):
     _ensure_proxy_is_provided(args)
 
-    proxy = ProxyNetworkProvider(args.proxy)
+    config = get_config_for_network_providers()
+    proxy = ProxyNetworkProvider(url=args.proxy, config=config)
     if args.all:
         t = PrettyTable(['Shard ID', 'Contract address (bech32)', 'Contract address (hex)', 'Version'])
         for shard_id in range(0, 256):