Bump version: 3.5.0-beta.1

Author: serderovsh

setup.py

@@ -119,7 +119,7 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],
-    packages=find_packages(exclude=['examples']),
+    packages=["tronapi", "trx_account"],
     include_package_data=True,
     install_requires=install_requires,
     tests_require=EXTRAS_REQUIRE['tester'],

tronapi/base/__init__.py

@@ -14,9 +14,9 @@
 from eth_abi import is_encodable
 from eth_utils import to_tuple
 
-from tronapi.base.formatters import recursive_map
+from tronapi.common.formatters import recursive_map
 from tronapi.exceptions import FallbackNotFound
-from tronapi.base.toolz import (
+from tronapi.common.toolz import (
     curry,
     partial,
     pipe,

tronapi/common/__init__.py

@@ -2,9 +2,12 @@
 # Copyright (c) iEXBase. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-
-from tronapi.utils.hexadecimal import remove_0x_prefix, is_hex
-from tronapi.utils.types import is_string, is_integer
+from trx_utils import (
+    is_string,
+    remove_0x_prefix,
+    is_hex,
+    is_integer
+)
 
 
 def is_hex_encoded_block_hash(value):

tronapi/base/abi.py tronapi/common/abi.pytronapi/base/abi.py renamed to tronapi/common/abi.py

@@ -12,7 +12,9 @@
     to_hex,
     function_abi_to_4byte_selector
 )
-from tronapi.base.abi import (
+from trx_utils import is_text, encode_hex
+
+from tronapi.common.abi import (
     filter_by_name,
     filter_by_encodability,
     filter_by_argument_count,
@@ -24,14 +26,16 @@
     merge_args_and_kwargs
 )
 
-from tronapi.base.function_identifiers import FallbackFn
-from tronapi.base.normalizers import abi_address_to_hex, abi_bytes_to_bytes, abi_string_to_text
-from tronapi.base.toolz import (
+from tronapi.common.function_identifiers import FallbackFn
+from tronapi.common.normalizers import (
+    abi_address_to_hex,
+    abi_bytes_to_bytes,
+    abi_string_to_text
+)
+from tronapi.common.toolz import (
     pipe,
     valmap,
 )
-from tronapi.utils.hexadecimal import encode_hex
-from tronapi.utils.types import is_text
 from eth_abi import (
     encode_abi as eth_abi_encode_abi,
 )

tronapi/utils/blocks.py tronapi/common/blocks.pytronapi/utils/blocks.py renamed to tronapi/common/blocks.py

@@ -4,8 +4,8 @@
 # See License.txt in the project root for license information.
 # --------------------------------------------------------------------
 
-from tronapi.base.formatters import apply_formatters_to_dict
-from tronapi.base.toolz import (
+from tronapi.common.formatters import apply_formatters_to_dict
+from tronapi.common.toolz import (
     concat,
     curry,
 )

tronapi/base/contracts.py tronapi/common/contracts.pytronapi/base/contracts.py renamed to tronapi/common/contracts.py

@@ -10,29 +10,41 @@
     big_endian_to_int,
     int_to_big_endian
 )
-
-from tronapi.base.abi import size_of_type, sub_type_of_array_type, is_array_type, is_bool_type, is_uint_type, \
-    is_int_type, is_address_type, is_bytes_type, is_string_type
-from tronapi.base.validation import validate_abi_type, validate_abi_value
-from tronapi.utils.hexadecimal import (
+from trx_utils import (
     remove_0x_prefix,
-    decode_hex,
     encode_hex,
-    add_0x_prefix
+    add_0x_prefix,
+    decode_hex,
+    is_boolean,
+    is_integer,
+    is_list_like,
+    is_bytes
 )
 
-from tronapi.base.toolz import (
-    curry
+from tronapi.common.abi import (
+    size_of_type,
+    sub_type_of_array_type,
+    is_array_type,
+    is_bool_type,
+    is_uint_type,
+    is_int_type,
+    is_address_type,
+    is_bytes_type,
+    is_string_type
 )
 
-from tronapi.utils.types import (
-    is_boolean,
-    is_integer,
-    is_list_like,
-    is_bytes)
 
-from tronapi.base.datastructures import AttributeDict
-from tronapi.utils.validation import assert_one_val
+from tronapi.common.validation import (
+    validate_abi_type,
+    validate_abi_value
+)
+
+from tronapi.common.toolz import (
+    curry
+)
+
+from tronapi.common.validation import assert_one_val
+from trx_account import AttributeDict
 
 
 def hex_encode_abi_type(abi_type, value, force_size=None):

tronapi/base/datatypes.py tronapi/common/datatypes.pytronapi/base/datatypes.py renamed to tronapi/common/datatypes.py

@@ -7,12 +7,14 @@
 from collections import Mapping, Iterable
 
 from eth_utils import to_dict
+from trx_utils import (
+    reject_recursive_repeats,
+    is_string
+)
 
-from tronapi.base.decorators import reject_recursive_repeats
-from tronapi.base.toolz import (
+from tronapi.common.toolz import (
     curry
 )
-from tronapi.utils.types import is_string
 
 
 @curry