Fix ethereum_sign_tx

- Workaround bug in rlp.utils.int_to_big_endian
- Command line tool now expects data to be a hexlified string

trezorctl

@@ -145,12 +145,13 @@ class Commands(object):
 
         gas_price = eth.eth_gasPrice()
         gas_limit = args.gas
+        data = binascii.unhexlify(args.data)
         if not gas_limit:
             gas_limit = hex_to_dec(eth.eth_estimateGas(
                 to_address=args.to,
                 from_address=address,
                 value=value,
-                data=args.data))
+                data="0x"+args.data))
         nonce = eth.eth_getTransactionCount(address)
 
         sig = self.client.ethereum_sign_tx(
@@ -160,10 +161,10 @@ class Commands(object):
             gas_limit=gas_limit,
             to=to_address,
             value=value,
-            data=args.data)
+            data=data)
 
         transaction = rlp.encode(
-            (nonce, gas_price, gas_limit, hex_to_dec(args.to), value, args.data) + sig)
+            (nonce, gas_price, gas_limit, hex_to_dec(args.to), value, data) + sig)
         tx_hex = '0x%s' % binascii.hexlify(transaction)
 
         if args.publish:

trezorlib/client.py

@@ -424,7 +424,11 @@ class ProtocolMixin(object):
         return self.call(proto.EthereumGetAddress(address_n=n, show_display=show_display))
 
     def ethereum_sign_tx(self, n, nonce, gas_price, gas_limit, to, value, data=None):
-        from rlp.utils import int_to_big_endian
+        def int_to_big_endian(value):
+            import rlp.utils
+            if value == 0:
+                return b''
+            return rlp.utils.int_to_big_endian(value)
 
         n = self._convert_prime(n)