update encoding.py

Author: serderovsh

tronapi/base/encoding.py

@@ -1,16 +1,108 @@
+import re
 from typing import Optional, Union
 
-from eth_utils import hexstr_if_str, to_hex
+from eth_utils import hexstr_if_str, to_hex, big_endian_to_int, int_to_big_endian
+
+from tronapi.utils.hexadecimal import (
+    remove_0x_prefix,
+    decode_hex,
+    encode_hex,
+    add_0x_prefix
+)
+
+from tronapi.base.toolz import (
+    curry,
+)
 
-from tronapi.utils.hexadecimal import remove_0x_prefix, decode_hex, encode_hex, add_0x_prefix
 from tronapi.utils.types import is_boolean, is_integer
 from tronapi.utils.validation import assert_one_val
 
 
-def to_bytes(primitive: Optional[Union[bytes, int]] = None,
-             hexstr: Optional[str] = None,
-             text: Optional[str] = None) -> bytes:
+def to_hex_twos_compliment(value, bit_size):
+    """
+    Converts integer value to twos compliment hex representation with given bit_size
+    """
+    if value >= 0:
+        return to_hex_with_size(value, bit_size)
+
+    value = (1 << bit_size) + value
+    hex_value = hex(value)
+    hex_value = hex_value.rstrip("L")
+    return hex_value
+
+
+def to_hex_with_size(value, bit_size):
+    """Converts a value to hex with given bit_size:"""
+    return pad_hex(to_hex(value), bit_size)
+
+
+def pad_hex(value, bit_size):
+    """Pads a hex string up to the given bit_size"""
+    value = remove_0x_prefix(value)
+    return add_0x_prefix(value.zfill(int(bit_size / 4)))
+
+
+def trim_hex(hexstr):
+    if hexstr.startswith('0x0'):
+        hexstr = re.sub('^0x0+', '0x', hexstr)
+        if hexstr == '0x':
+            hexstr = '0x0'
+    return hexstr
+
+
+def to_int(value=None, hexstr=None, text=None):
+    """Converts value to it's integer representation.
+
+    Values are converted this way:
+
+     * value:
+       * bytes: big-endian integer
+       * bool: True => 1, False => 0
+     * hexstr: interpret hex as integer
+     * text: interpret as string of digits, like '12' => 12
+    """
+    assert_one_val(value, hexstr=hexstr, text=text)
+
+    if hexstr is not None:
+        return int(hexstr, 16)
+    elif text is not None:
+        return int(text)
+    elif isinstance(value, bytes):
+        return big_endian_to_int(value)
+    elif isinstance(value, str):
+        raise TypeError("Pass in strings with keyword hexstr or text")
+    else:
+        return int(value)
+
+
+@curry
+def text_if_str(to_type, text_or_primitive):
+    """Convert to a type, assuming that strings can be only unicode text (not a hexstr)"""
+    if isinstance(text_or_primitive, str):
+        (primitive, text) = (None, text_or_primitive)
+    else:
+        (primitive, text) = (text_or_primitive, None)
+    return to_type(primitive, text=text)
+
+
+def to_text(primitive=None, hexstr=None, text=None):
+    assert_one_val(primitive, hexstr=hexstr, text=text)
+
+    if hexstr is not None:
+        return to_bytes(hexstr=hexstr).decode('utf-8')
+    elif text is not None:
+        return text
+    elif isinstance(primitive, str):
+        return to_text(hexstr=primitive)
+    elif isinstance(primitive, bytes):
+        return primitive.decode('utf-8')
+    elif is_integer(primitive):
+        byte_encoding = int_to_big_endian(primitive)
+        return to_text(byte_encoding)
+    raise TypeError("Expected an int, bytes or hexstr.")
+
 
+def to_bytes(primitive=None, hexstr=None, text=None):
     assert_one_val(primitive, hexstr=hexstr, text=text)
 
     if is_boolean(primitive):
@@ -28,14 +120,6 @@ def to_bytes(primitive: Optional[Union[bytes, int]] = None,
     raise TypeError("expected an int in first arg, or keyword of hexstr or text")
 
 
-def pad_hex(value: str, bit_size: int) -> str:
-    """
-    Pads a hex string up to the given bit_size
-    """
-    value = remove_0x_prefix(value)
-    return add_0x_prefix(value.zfill(int(bit_size / 4)))
-
-
 def to_4byte_hex(hex_or_str_or_bytes: Union[int, str, bytes]) -> str:
     size_of_4bytes = 4 * 8
     byte_str = hexstr_if_str(to_bytes, hex_or_str_or_bytes)

tronapi/main.py

@@ -6,12 +6,17 @@
 # --------------------------------------------------------------------
 
 import ecdsa
-from eth_utils import apply_to_return_value
+from eth_utils import apply_to_return_value, to_hex
 from hexbytes import HexBytes
 
 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,
+    to_text
+)
 
 from tronapi.exceptions import InvalidTronError, TronError
 from tronapi.manager import TronManager
@@ -21,7 +26,6 @@
 from tronapi.base.validation import is_address
 from tronapi.utils.crypto import keccak as tron_keccak
 from tronapi.utils.currency import to_sun, from_sun
-from tronapi.utils.encoding import to_bytes, to_int, to_hex, to_text
 from tronapi.utils.types import is_integer
 
 DEFAULT_MODULES = {