blob42/python-trezor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #67 from jhoenicke/master

Browse Source 
Fix ethereum_sign_tx
This commit is contained in:
Pavol Rusnak 2016-08-22 11:06:39 +02:00 committed by GitHub
commit 29154811bd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
trezorctl
View File

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

6
trezorlib/client.py
View File

@ -424,7 +424,11 @@ class ProtocolMixin(object):
return self.call(proto.EthereumGetAddress(address_n=n, show_display=show_display)) 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): 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) n = self._convert_prime(n)