Initial v3.0.0 beta

Author: serderovsh

.bumpversion.cfg

@@ -0,0 +1,22 @@
+[bumpversion]
+current_version = 3.0.0
+commit = True
+tag = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<stage>[^.]*)\.(?P<devnum>\d+))?
+serialize =
+	{major}.{minor}.{patch}-{stage}.{devnum}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:stage]
+optional_value = stable
+first_value = stable
+values =
+	alpha
+	beta
+	stable
+
+[bumpversion:part:devnum]
+
+[bumpversion:file:setup.py]
+search = version='{current_version}',
+replace = version='{new_version}',

setup.py

@@ -24,7 +24,7 @@
 
 py_version = platform.python_version()
 
-PACKAGE_VERSION = '2.0.5'
+PACKAGE_VERSION = '3.0.0'
 
 EXTRAS_REQUIRE = {
     'tester': [

tronapi/__init__.py

@@ -5,29 +5,22 @@
 # --------------------------------------------------------------------
 
 import sys
-import warnings
 
 import pkg_resources
 
+from eth_account import Account  # noqa: E402
 from tronapi.providers.http import HttpProvider  # noqa: E402
 from tronapi.main import Tron  # noqa: E402
 
-if (3, 5) <= sys.version_info < (3, 6):
-    warnings.warn(
-        "Support for Python 3.5 will be removed in tronapi v5",
-        category=DeprecationWarning,
-        stacklevel=2)
-
 if sys.version_info < (3, 5):
-    raise EnvironmentError(
-        "Python 3.5 or above is required. "
-        "Note that support for Python 3.5 will be remove in tronapi v5")
+    raise EnvironmentError("Python 3.5 or above is required")
 
 
 __version__ = pkg_resources.get_distribution("tronapi").version
 
 __all__ = [
     '__version__',
     'HttpProvider',
+    'Account',
     'Tron',
-]
+]

tronapi/base/contracts.py

@@ -23,6 +23,7 @@
 
 
 def find_matching_fn_abi(abi, fn_identifier=None, args=None, kwargs=None):
+    global diagnosis
     args = args or tuple()
     kwargs = kwargs or dict()
     filters = []

tronapi/base/toolz/__init__.py

@@ -1,7 +1,8 @@
-# --------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------
 # Copyright (c) iEXBase. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
+# Licensed under the MIT License.
+# See License.txt in the project root for license information.
+# --------------------------------------------------------------------
 
 try:
     from cytoolz import (

tronapi/base/toolz/curried.py

@@ -0,0 +1,10 @@
+try:
+    from cytoolz.curried import (
+        keymap,
+        valmap,
+    )
+except ImportError:
+    from toolz.curried import (  # noqa: F401
+        keymap,
+        valmap,
+    )

tronapi/exceptions.py

@@ -41,6 +41,11 @@ class NoABIFunctionsFound(AttributeError):
     """
     pass
 
+class ValidationError(Exception):
+    """
+    Raised when a supplied value is invalid.
+    """
+    pass
 
 class TransportError(TronError):
     """Base exception for transport related errors.

tronapi/main.py

@@ -11,7 +11,6 @@
 
 from tronapi.base.account import Account, PrivateKey
 from tronapi.base.datastructures import AttributeDict
-from tronapi.base.decorators import deprecated_for
 from tronapi.base.encoding import (
     to_bytes,
     to_int,
@@ -24,7 +23,7 @@
 from tronapi.transactionbuilder import TransactionBuilder
 from tronapi.trx import Trx
 from tronapi.base.validation import is_address
-from tronapi.utils.crypto import keccak as tron_keccak
+from tronapi.utils.crypto import keccak
 from tronapi.utils.currency import to_sun, from_sun
 from tronapi.utils.types import is_integer
 
@@ -34,6 +33,9 @@
 
 
 class Tron:
+    # Providers
+    HTTPProvider = HttpProvider
+
     _default_block = None
     _private_key = None
 
@@ -51,7 +53,9 @@ class Tron:
     isAddress = staticmethod(is_address)
 
     def __init__(self, full_node, solidity_node,
-                 event_server=None, private_key=None):
+                 event_server=None,
+                 private_key=None,
+                 modules=None):
         """Connect to the Tron network.
 
         Args:
@@ -73,10 +77,17 @@ def __init__(self, full_node, solidity_node,
             event_server=event_server
         ))
 
+        # If the parameter of the private key is not empty,
+        # then write to the variable
         if private_key is not None:
             self.private_key = private_key
 
-        for module_name, module_class in DEFAULT_MODULES.items():
+        # If custom methods are not declared,
+        # we take the default from the list
+        if modules is None:
+            modules = DEFAULT_MODULES
+
+        for module_name, module_class in modules.items():
             module_class.attach(self, module_name)
 
         self.transaction = TransactionBuilder(self)
@@ -230,27 +241,18 @@ def is_valid_provider(provider) -> bool:
         return isinstance(provider, HttpProvider)
 
     @staticmethod
-    @deprecated_for("keccak")
     @apply_to_return_value(HexBytes)
     def sha3(primitive=None, text=None, hexstr=None):
-        """Returns the Keccak SHA256 of the given value.
-        Text is encoded to UTF-8 before computing the hash, just like Solidity.
-        Any of the following are valid and equivalent:
-        """
-        return Tron.keccak(primitive, text, hexstr)
-
-    @staticmethod
-    @apply_to_return_value(HexBytes)
-    def keccak(primitive=None, text=None, hexstr=None):
         if isinstance(primitive, (bytes, int, type(None))):
             input_bytes = to_bytes(primitive, hexstr=hexstr, text=text)
-            return tron_keccak(input_bytes)
+            return keccak(input_bytes)
 
         raise TypeError(
-            "You called keccak with first arg %r and keywords %r. You must call it with one of "
-            "these approaches: keccak(text='txt'), keccak(hexstr='0x747874'), "
-            "keccak(b'\\x74\\x78\\x74'), or keccak(0x747874)." % (
-                primitive, {'text': text, 'hexstr': hexstr}
+            "You called sha3 with first arg %r and keywords %r. You must call it with one of "
+            "these approaches: sha3(text='txt'), sha3(hexstr='0x747874'), "
+            "sha3(b'\\x74\\x78\\x74'), or sha3(0x747874)." % (
+                primitive,
+                {'text': text, 'hexstr': hexstr}
             )
         )
 

tronapi/trx.py

@@ -7,7 +7,7 @@
 import math
 from typing import Any
 
-from eth_account.account import Account as EthAccount
+from eth_account import Account
 
 from tronapi.contract import Contract
 from tronapi.exceptions import InvalidTronError, TronError
@@ -24,7 +24,7 @@
 
 
 class Trx(Module):
-    defaultContractFactory = Contract
+    default_contract_factory = Contract
 
     def get_current_block(self):
         """Query the latest block"""
@@ -417,7 +417,7 @@ def sign(self, transaction: Any, use_tron: bool = True):
             # before encrypting or decrypting
             header = TRX_MESSAGE_HEADER if use_tron else ETH_MESSAGE_HEADER
             message_hash = self.tron.sha3(text=header + transaction)
-            signed_message = EthAccount.signHash(message_hash, private_key=self.tron.private_key)
+            signed_message = Account.signHash(message_hash, private_key=self.tron.private_key)
 
             return signed_message
 
@@ -475,7 +475,7 @@ def verify_message(self, message, signed_message=None, address=None, use_tron: b
         header = TRX_MESSAGE_HEADER if use_tron else ETH_MESSAGE_HEADER
 
         message_hash = self.tron.sha3(text=header + message)
-        recovered = EthAccount.recoverHash(message_hash, signature=signed_message.signature)
+        recovered = Account.recoverHash(message_hash, signature=signed_message.signature)
 
         tron_address = '41' + recovered[2:]
         base58address = self.tron.address.from_hex(tron_address).decode()
@@ -667,13 +667,14 @@ def get_contract(self, contract_address):
         })
 
     def contract(self, address=None, **kwargs):
-        ContractFactoryClass = kwargs.pop('ContractFactoryClass', self.defaultContractFactory)
-        ContractFactory = ContractFactoryClass.factory(self.tron, **kwargs)
+        contract_factory_class = kwargs.pop('contract_factory_class',
+                                            self.default_contract_factory)
+        contract_factory = contract_factory_class.factory(self.tron, **kwargs)
 
         if address:
-            return ContractFactory(address)
+            return contract_factory(address)
         else:
-            return ContractFactory
+            return contract_factory
 
     def validate_address(self, address, _is_hex=False):
         """Validate address