Reduce dependency on rlp.utils

Author: keepkeyjon

keepkeylib/client.py

@@ -568,12 +568,7 @@ def ethereum_get_address(self, n, show_display=False, multisig=None):
 
     @session
     def ethereum_sign_tx(self, n, nonce, gas_price, gas_limit, value, to=None, to_n=None, address_type=None, exchange_type=None, data=None, chain_id=None, token_shortcut=None, token_value=None, token_to=None):
-        import rlp.utils
-
-        def int_to_big_endian(value):
-            if value == 0:
-                return b''
-            return rlp.utils.int_to_big_endian(value)
+        from keepkeylib.tools import int_to_big_endian
 
         n = self._convert_prime(n)
         if address_type == types.TRANSFER:   #Ethereum transfer transaction
@@ -623,7 +618,7 @@ def int_to_big_endian(value):
             else:
                 #erc20 token transfer
                 value_array = bytearray([0]*32)
-                for ii,i in enumerate(rlp.utils.int_to_big_endian(token_value)[::-1]):
+                for ii,i in enumerate(int_to_big_endian(token_value)[::-1]):
                     value_array[31 - ii] = i
                 msg = proto.EthereumSignTx(
                     address_n=n,

keepkeylib/eos.py

@@ -2,12 +2,9 @@
 import binascii
 import struct
 from datetime import datetime
-from .tools import b58decode, b58encode, parse_path
+from .tools import b58decode, b58encode, parse_path, int_to_big_endian
 from . import messages_eos_pb2 as proto
 
-def int_to_big_endian(value):
-    return value.to_bytes((value.bit_length() + 7) // 8, "big")
-
 def name_to_number(name):
     length = len(name)
     value = 0

keepkeylib/tools.py

@@ -159,3 +159,14 @@ def _customPrintFieldValue(field, value, out, indent=0, as_utf8=False, as_one_li
 
     google.protobuf.text_format.PrintFieldValue = _customPrintFieldValue
 
+
+def int_to_big_endian(value):
+    import struct
+
+    res = b''
+    while 0 < value:
+        res = struct.pack("B", value & 0xff) + res
+        value = value >> 8
+
+    return res
+

tests/test_msg_ethereum_erc20_signtx_exchange.py

@@ -27,8 +27,7 @@
 import keepkeylib.types_pb2 as proto_types
 import keepkeylib.exchange_pb2 as proto_exchange
 from keepkeylib.client import CallException
-
-from rlp.utils import int_to_big_endian
+from keepkeylib.tools import int_to_big_endian
 
 class TestMsgEthereumtxERC20_exch(common.KeepKeyTest):
 

tests/test_msg_ethereum_signtx.py

@@ -25,8 +25,7 @@
 import keepkeylib.messages_pb2 as proto
 import keepkeylib.types_pb2 as proto_types
 from keepkeylib.client import CallException
-
-from rlp.utils import int_to_big_endian
+from keepkeylib.tools import int_to_big_endian
 
 class TestMsgEthereumSigntx(common.KeepKeyTest):
 

tests/test_msg_ethereum_signtx_exchange.py

@@ -27,8 +27,7 @@
 import keepkeylib.types_pb2 as proto_types
 import keepkeylib.exchange_pb2 as proto_exchange
 from keepkeylib.client import CallException
-
-from rlp.utils import int_to_big_endian
+from keepkeylib.tools import int_to_big_endian
 
 class TestMsgEthereumtx_exch(common.KeepKeyTest):
 

tests/test_msg_ethereum_signtx_xfer.py

@@ -27,8 +27,7 @@
 import keepkeylib.types_pb2 as proto_types
 import keepkeylib.exchange_pb2 as proto_exchange
 from keepkeylib.client import CallException
-
-from rlp.utils import int_to_big_endian
+from keepkeylib.tools import int_to_big_endian
 
 class TestMsgEthereumSigntx(common.KeepKeyTest):
     def test_ethereum_tx_xfer_acc1(self):