Merge pull request #18 from ElrondNetwork/testnet-and-typing-fixes

Testnet and typing fixes

Author: camilbancioiu

.gitignore

@@ -5,6 +5,7 @@ __pycache__
 *.py[cod]
 *$py.class
 .pytest_cache/
+erdpy/tests/testdata-out
 
 # mypy
 .mypy_cache/

Makefile

@@ -6,3 +6,8 @@ build-erdpy: clean
 
 publish-erdpy: build-erdpy
 	twine upload dist/*
+
+test:
+	python3 -m unittest discover -s erdpy/tests
+	pytest ./erdpy/tests/test_testnet.py -s
+	source ./erdpy/tests/test_cli_all.sh && testAll || return 1

README.md

@@ -5,10 +5,10 @@ Elrond Python Command Line Tools and SDK for interacting with the Elrond Network
 [docs.elrond.com](https://docs.elrond.com/sdk-and-tools/erdpy/erdpy/)
 
 ## CLI
-[CLI](CLI.md)
+[CLI](erdpy/CLI.md)
 
 ## Distribution
 [erdpy-up](https://docs.elrond.com/sdk-and-tools/erdpy/installing-erdpy/) and [PyPi](https://pypi.org/project/erdpy/#history)
 
 ## CHANGELOG
-[CHANGELOG](CHANGELOG.md)
+[CHANGELOG](erdpy/CHANGELOG.md)

erdpy/accounts.py

@@ -2,7 +2,7 @@
 import os
 from binascii import unhexlify
 from os import path
-from typing import Any, Union
+from typing import Any, Optional
 
 from erdpy import constants, errors, utils
 from erdpy.errors import LedgerError
@@ -45,15 +45,20 @@ def get_all(self):
 
 
 class Account(IAccount):
-    def __init__(self, address: Any = None, pem_file: Union[str, None] = None, pem_index: int = 0, key_file: str = "", pass_file: str = "",
+    def __init__(self,
+                 address: Any = None,
+                 pem_file: Optional[str] = None,
+                 pem_index: int = 0,
+                 key_file: str = "",
+                 pass_file: str = "",
                  ledger: bool = False):
         self.address = Address(address)
         self.pem_file = pem_file
         self.pem_index = int(pem_index)
         self.nonce: int = 0
         self.ledger = ledger
 
-        if pem_file:
+        if self.pem_file:
             seed, pubkey = pem.parse(self.pem_file, self.pem_index)
             self.private_key_seed = seed.hex()
             self.address = Address(pubkey)
@@ -79,9 +84,10 @@ class Address(IAddress):
     PUBKEY_LENGTH = 32
     PUBKEY_STRING_LENGTH = PUBKEY_LENGTH * 2    # hex-encoded
     BECH32_LENGTH = 62
+    _value_hex: str
 
     def __init__(self, value):
-        self._value_hex = None
+        self._value_hex = ''
 
         if not value:
             return
@@ -107,7 +113,9 @@ def hex(self) -> str:
     def bech32(self) -> str:
         self._assert_validity()
         pubkey = self.pubkey()
-        return bech32.bech32_encode(self.HRP, bech32.convertbits(pubkey, 8, 5))
+        b32 = bech32.bech32_encode(self.HRP, bech32.convertbits(pubkey, 8, 5))
+        assert isinstance(b32, str)
+        return b32
 
     def pubkey(self):
         self._assert_validity()
@@ -118,7 +126,7 @@ def is_contract_address(self):
         return self.hex().startswith(constants.SC_HEX_PUBKEY_PREFIX)
 
     def _assert_validity(self):
-        if self._value_hex is None:
+        if self._value_hex == '':
             raise errors.EmptyAddressError()
 
     def __repr__(self):

erdpy/cli_contracts.py

@@ -2,6 +2,8 @@
 import os
 from typing import Any
 
+from pathlib import Path
+
 from erdpy import cli_shared, errors, projects, utils
 from erdpy.accounts import Account, Address
 from erdpy.contracts import CodeMetadata, SmartContract
@@ -110,8 +112,10 @@ def _add_project_arg(sub: Any):
 
 def _add_project_or_bytecode_arg(sub: Any):
     group = sub.add_mutually_exclusive_group(required=True)
-    group.add_argument("--project", default=os.getcwd(), help="🗀 the project directory (default: current directory)")
-    group.add_argument("--bytecode", help="the WASM file")
+    group.add_argument("--project", default=os.getcwd(),
+                       help="🗀 the project directory (default: current directory)")
+    group.add_argument("--bytecode", type=str,
+                      help="the file containing the WASM bytecode")
 
 
 def _add_contract_arg(sub: Any):
@@ -217,8 +221,8 @@ def dump_tx_and_result(tx: Any, result: Any, args: Any):
 
 
 def _prepare_contract(args: Any) -> SmartContract:
-    if args.bytecode:
-        bytecode = utils.read_file(args.bytecode, binary=True).hex()
+    if len(args.bytecode):
+        bytecode = utils.read_binary_file(Path(args.bytecode)).hex()
     else:
         project = load_project(args.project)
         bytecode = project.get_bytecode()

erdpy/config.py

@@ -54,7 +54,9 @@ def get_dependency_url(key: str, tag: str, platform: str) -> str:
 def get_value(name: str) -> str:
     _guard_valid_name(name)
     data = get_active()
-    return data.get(name, get_defaults()[name])
+    value = data.get(name, get_defaults()[name])
+    assert isinstance(value, str)
+    return value
 
 
 def set_value(name: str, value: Any):
@@ -133,6 +135,7 @@ def get_defaults() -> Dict[str, Any]:
         "chainID": "T",
         "txVersion": "1",
         "dependencies.arwentools.tag": "v1.1.2",
+        "dependencies.elrond_wasm_rs.tag": "v0.12.0",
         "dependencies.arwentools.urlTemplate.linux": "https://github.com/ElrondNetwork/arwen-wasm-vm/archive/{TAG}.tar.gz",
         "dependencies.arwentools.urlTemplate.osx": "https://github.com/ElrondNetwork/arwen-wasm-vm/archive/{TAG}.tar.gz",
         "dependencies.llvm.tag": "v9-19feb",
@@ -155,7 +158,6 @@ def get_defaults() -> Dict[str, Any]:
         "dependencies.mcl_signer.tag": "v1.0.0",
         "dependencies.mcl_signer.urlTemplate.linux": "https://github.com/ElrondNetwork/elrond-sdk-go-tools/releases/download/{TAG}/mcl_signer_{TAG}_ubuntu-latest.tar.gz",
         "dependencies.mcl_signer.urlTemplate.osx": "https://github.com/ElrondNetwork/elrond-sdk-go-tools/releases/download/{TAG}/mcl_signer_{TAG}_macos-latest.tar.gz",
-        "dependencies.elrond_wasm_rs.tag": "v0.10.2",
     }
 
 

erdpy/contracts.py

@@ -4,13 +4,22 @@
 
 from Cryptodome.Hash import keccak
 
-from erdpy import config, constants, errors, utils
+from erdpy import config, constants, errors
 from erdpy.accounts import Account, Address
 from erdpy.interfaces import IElrondProxy
 from erdpy.transactions import Transaction
 
 logger = logging.getLogger("contracts")
 
+HEX_PREFIX = "0X"
+
+
+class QueryResult:
+    def __init__(self, as_base64: str, as_hex: str, as_number: int):
+        self.base64 = as_base64
+        self.hex = as_hex
+        self.number = as_number
+
 
 class SmartContract:
     def __init__(self, address: Optional[Address] = None, bytecode=None, metadata=None):
@@ -120,7 +129,14 @@ def prepare_upgrade_transaction_data(self, arguments: List[Any]):
 
         return tx_data
 
-    def query(self, proxy: IElrondProxy, function: str, arguments: List[Any], value: int = 0, caller: Optional[Address] = None) -> List[Any]:
+    def query(
+        self,
+        proxy: IElrondProxy,
+        function: str,
+        arguments: List[Any],
+        value: int = 0,
+        caller: Optional[Address] = None
+    ) -> List[Any]:
         response_data = self.query_detailed(proxy, function, arguments, value, caller)
         return_data = response_data.get("returnData", []) or response_data.get("ReturnData", [])
         return [self._interpret_return_data(data) for data in return_data]
@@ -143,7 +159,7 @@ def query_detailed(self, proxy: IElrondProxy, function: str, arguments: List[Any
         response_data = response.get("data", {})
         return response_data
 
-    def _interpret_return_data(self, data: Any) -> Any:
+    def _interpret_return_data(self, data: str) -> Any:
         if not data:
             return data
 
@@ -152,34 +168,48 @@ def _interpret_return_data(self, data: Any) -> Any:
             as_hex = as_bytes.hex()
             as_number = int(as_hex, 16)
 
-            result = utils.Object()
-            result.base64 = data
-            result.hex = as_hex
-            result.number = as_number
+            result = QueryResult(data, as_hex, as_number)
             return result
         except Exception:
             logger.warn(f"Cannot interpret return data: {data}")
             return None
 
 
 def _prepare_argument(argument: Any):
-    hex_prefix = "0X"
     as_string = str(argument).upper()
 
-    if as_string.startswith(hex_prefix):
-        return as_string[len(hex_prefix):]
+    if as_string.startswith(HEX_PREFIX):
+        return _prepare_hexadecimal(as_string)
+
+    return _prepare_decimal(as_string)
 
-    if not as_string.isnumeric():
-        raise errors.UnknownArgumentFormat(as_string)
 
-    as_number = int(as_string)
-    as_hexstring = hex(as_number)[len(hex_prefix):]
-    if len(as_hexstring) % 2 == 1:
-        as_hexstring = "0" + as_hexstring
+def _prepare_hexadecimal(argument: str) -> str:
+    argument = argument[len(HEX_PREFIX):]
+    argument = ensure_even_length(argument)
+    try:
+        _ = int(argument, 16)
+    except ValueError:
+        raise errors.UnknownArgumentFormat(argument)
+    return argument
 
+
+def _prepare_decimal(argument: str) -> str:
+    if not argument.isnumeric():
+        raise errors.UnknownArgumentFormat(argument)
+
+    as_number = int(argument)
+    as_hexstring = hex(as_number)[len(HEX_PREFIX):]
+    as_hexstring = ensure_even_length(as_hexstring)
     return as_hexstring
 
 
+def ensure_even_length(string: str) -> str:
+    if len(string) % 2 == 1:
+        return '0' + string
+    return string
+
+
 class CodeMetadata:
     def __init__(self, upgradeable: bool = True, payable: bool = False):
         self.upgradeable = upgradeable

erdpy/conv/__init__.py

@@ -3,7 +3,7 @@
 from os import path
 
 from erdpy.validators.validators_file import ValidatorsFile
-from erdpy.conv.conv import Converters
+from erdpy import utils
 from erdpy.accounts import Account
 from erdpy.config import MetaChainSystemSCsCost
 from erdpy.validators.core import estimate_system_sc_call
@@ -15,8 +15,8 @@
 
 def prepare_args_for_create_new_staking_contract(args: Any):
     args.data = 'createNewDelegationContract'
-    args.data += '@' + Converters.str_int_to_hex_str(str(args.total_delegation_cap))
-    args.data += '@' + Converters.str_int_to_hex_str(str(args.service_fee))
+    args.data += '@' + utils.str_int_to_hex_str(str(args.total_delegation_cap))
+    args.data += '@' + utils.str_int_to_hex_str(str(args.service_fee))
 
     args.receiver = DELEGATION_MANAGER_SC_ADDRESS
 
@@ -57,41 +57,41 @@ def prepare_args_for_remove_nodes(args: Any):
 
 
 def prepare_args_for_stake_nodes(args: Any):
-    parsed_keys, num_keys = Converters.parse_keys(args.bls_keys)
+    parsed_keys, num_keys = utils.parse_keys(args.bls_keys)
     args.data = 'stakeNodes' + parsed_keys
     args.receiver = args.delegation_contract
 
     if args.estimate_gas:
-        args.gas_limit = estimate_system_sc_call(args, MetaChainSystemSCsCost.DELEGATION_OPS
-                                                 + MetaChainSystemSCsCost.STAKE, num_keys + 1)
+        cost = MetaChainSystemSCsCost.DELEGATION_OPS + MetaChainSystemSCsCost.STAKE
+        args.gas_limit = estimate_system_sc_call(args, cost, num_keys + 1)
 
 
 def prepare_args_for_unbond_nodes(args: Any):
-    parsed_keys, num_keys = Converters.parse_keys(args.bls_keys)
+    parsed_keys, num_keys = utils.parse_keys(args.bls_keys)
     args.data = 'unBondNodes' + parsed_keys
     args.receiver = args.delegation_contract
 
     if args.estimate_gas:
-        args.gas_limit = estimate_system_sc_call(args, MetaChainSystemSCsCost.DELEGATION_OPS
-                                                 + MetaChainSystemSCsCost.UNBOND, num_keys + 1)
+        cost = MetaChainSystemSCsCost.DELEGATION_OPS + MetaChainSystemSCsCost.UNBOND
+        args.gas_limit = estimate_system_sc_call(args, cost, num_keys + 1)
 
 
 def prepare_args_for_unstake_nodes(args: Any):
-    parsed_keys, num_keys = Converters.parse_keys(args.bls_keys)
+    parsed_keys, num_keys = utils.parse_keys(args.bls_keys)
     args.data = 'unStakeNodes' + parsed_keys
     args.receiver = args.delegation_contract
 
     if args.estimate_gas:
-        args.gas_limit = estimate_system_sc_call(args, MetaChainSystemSCsCost.DELEGATION_OPS
-                                                 + MetaChainSystemSCsCost.UNSTAKE, num_keys + 1)
+        cost = MetaChainSystemSCsCost.DELEGATION_OPS + MetaChainSystemSCsCost.UNSTAKE
+        args.gas_limit = estimate_system_sc_call(args, cost, num_keys + 1)
 
 
 def prepare_args_for_unjail_nodes(args: Any):
     _prepare_args("unJailNodes", args)
 
 
 def _prepare_args(command: str, args: Any):
-    parsed_keys, num_keys = Converters.parse_keys(args.bls_keys)
+    parsed_keys, num_keys = utils.parse_keys(args.bls_keys)
     args.data = command + parsed_keys
     args.receiver = args.delegation_contract
 
@@ -101,7 +101,7 @@ def _prepare_args(command: str, args: Any):
 
 def prepare_args_change_service_fee(args: Any):
     data = 'changeServiceFee'
-    data += '@' + Converters.str_int_to_hex_str(str(args.service_fee))
+    data += '@' + utils.str_int_to_hex_str(str(args.service_fee))
 
     args.data = data
     args.receiver = args.delegation_contract
@@ -111,7 +111,7 @@ def prepare_args_change_service_fee(args: Any):
 
 def prepare_args_modify_delegation_cap(args: Any):
     data = 'modifyTotalDelegationCap'
-    data += '@' + Converters.str_int_to_hex_str(str(args.delegation_cap))
+    data += '@' + utils.str_int_to_hex_str(str(args.delegation_cap))
 
     args.data = data
     args.receiver = args.delegation_contract