update

Author: serderovsh

setup.py

@@ -121,7 +121,7 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],
-    packages=["tronapi", "trx_account"],
+    packages=["tronapi"],
     include_package_data=True,
     install_requires=install_requires,
     tests_require=EXTRAS_REQUIRE['tester'],

trx_account/account.py tronapi/common/account.pytrx_account/account.py renamed to tronapi/common/account.py

@@ -8,12 +8,34 @@
 from binascii import unhexlify
 
 import base58
-from eth_account.datastructures import AttributeDict
+import ecdsa
 from eth_keys import KeyAPI
+from eth_account import Account as ETHAccount
 from trx_utils import is_hex
 
 
-class Account(object):
+class Account:
+    @staticmethod
+    def create():
+        generate_key = ecdsa.SigningKey.generate(curve=ecdsa.SECP256k1)
+        return PrivateKey(generate_key.to_string().hex())
+
+    @staticmethod
+    def sign_hash(message_hash, private_key):
+        if not is_hex(message_hash):
+            raise ValueError('Invalid message_hash provided')
+
+        return ETHAccount.signHash(message_hash, private_key)
+
+    @staticmethod
+    def recover_hash(message_hash, signature):
+        if not is_hex(message_hash):
+            raise ValueError('Invalid message_hash provided')
+
+        return ETHAccount.recoverHash(message_hash, signature=signature)
+
+
+class Address(object):
     @staticmethod
     def from_hex(address):
         """Helper function that will convert a generic value from hex"""

tronapi/common/contracts.py

@@ -26,7 +26,6 @@
     merge_args_and_kwargs
 )
 
-from tronapi.common.function_identifiers import FallbackFn
 from tronapi.common.normalizers import (
     abi_address_to_hex,
     abi_bytes_to_bytes,
@@ -45,6 +44,10 @@
 )
 
 
+class FallbackFn:
+    pass
+
+
 def find_matching_fn_abi(abi, fn_identifier=None, args=None, kwargs=None):
     args = args or tuple()
     kwargs = kwargs or dict()

tronapi/common/encoding.py

@@ -2,6 +2,7 @@
 import re
 from typing import Union
 
+from eth_account.datastructures import AttributeDict
 from hexbytes import HexBytes
 
 from eth_utils import (
@@ -44,7 +45,6 @@
 )
 
 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/common/function_identifiers.py

@@ -10,6 +10,7 @@
 from toolz import curry
 
 from tronapi.common.abi import process_type
+from tronapi.common.account import Address
 from tronapi.common.encoding import (
     to_bytes,
     text_if_str,
@@ -19,7 +20,6 @@
     validate_abi,
     validate_address
 )
-from trx_account import Account
 
 
 def implicitly_identity(to_wrap):
@@ -75,7 +75,7 @@ def addresses_checksummed(abi_type, data):
 
 
 def to_checksum_address(address: str):
-    return Account().from_hex(address)
+    return Address().from_hex(address)
 
 
 @curry

tronapi/common/normalizers.py

@@ -38,7 +38,6 @@
     is_address_type, is_int_type, is_uint_type, is_bool_type, sub_type_of_array_type, is_array_type, \
     length_of_array_type
 from tronapi.exceptions import InvalidAddress
-from tronapi.utils.help import hex_to_base58
 
 
 def _prepare_selector_collision_msg(duplicates):

tronapi/common/validation.py

@@ -31,11 +31,11 @@
 from tronapi.common.contracts import (
     find_matching_fn_abi,
     encode_abi,
-    get_function_info
+    get_function_info,
+    FallbackFn
 )
 from tronapi.common.datatypes import PropertyCheckingFactory
 from tronapi.common.encoding import to_4byte_hex
-from tronapi.common.function_identifiers import FallbackFn
 from tronapi.common.normalizers import (
     normalize_abi,
     normalize_bytecode,

tronapi/contract.py

@@ -15,7 +15,7 @@
     :license: MIT License
 """
 
-import ecdsa
+from eth_account.datastructures import AttributeDict
 from eth_utils import (
     apply_to_return_value,
     to_hex,
@@ -33,12 +33,8 @@
 
 from tronapi.common.abi import map_abi_data
 
-from trx_account import (
-    Account,
-    PrivateKey,
-    AttributeDict
-)
 
+from tronapi.common.account import Address, PrivateKey, Account
 from tronapi.common.normalizers import abi_resolver
 from tronapi.common.encoding import (
     to_bytes,
@@ -256,7 +252,7 @@ def get_event_transaction_id(self, tx_id):
         return response
 
     @property
-    def address(self):
+    def address(self) -> Address:
         """Helper object that allows you to convert
         between hex/base58 and private key representations of a TRON address.
 
@@ -265,7 +261,7 @@ def address(self):
             please use the function tron.to_hex.
 
         """
-        return Account()
+        return Address()
 
     @property
     def create_account(self) -> PrivateKey:
@@ -276,8 +272,7 @@ def create_account(self) -> PrivateKey:
         provided by other or invoke this very API on a public network.
 
         """
-        generate_key = ecdsa.SigningKey.generate(curve=ecdsa.SECP256k1)
-        return PrivateKey(generate_key.to_string().hex())
+        return Account.create()
 
     @staticmethod
     def is_valid_provider(provider) -> bool:

tronapi/main.py

@@ -3,8 +3,9 @@
 # Licensed under the MIT License.
 # See License.txt in the project root for license information.
 # --------------------------------------------------------------------
+import platform
 
-from tronapi.utils.help import format_user_agent
+import tronapi
 
 
 class BaseProvider(object):
@@ -26,3 +27,17 @@ def _http_default_headers():
             'Content-Type': 'application/json',
             'User-Agent': format_user_agent()
         }
+
+    @staticmethod
+    def format_user_agent(name=None):
+        """Construct a User-Agent suitable for use in client code.
+        This will identify use by the provided ``name`` (which should be on the
+        format ``dist_name/version``), TronAPI version and Python version.
+        .. versionadded:: 1.1
+        """
+        parts = ['TronAPI/%s' % tronapi.__version__,
+                 '%s/%s' % (platform.python_implementation(),
+                            platform.python_version())]
+        if name:
+            parts.insert(0, name)
+        return ' '.join(parts)