arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 23:48:12 +00:00
Code Issues Releases Wiki Activity

Added Wanchain support (#230)

Browse Source
This commit is contained in:
Peter van Mourik 2018-04-11 12:24:13 +02:00 committed by Pavol Rusnak
parent 892eb41837
commit 497f0467cf
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trezorctl
View File

@ -714,6 +714,7 @@ def ethereum_get_address(connect, address, show_display):
@cli.command(help='Sign (and optionally publish) Ethereum transaction. Use TO as destination address or set TO to "" for contract creation.') @cli.command(help='Sign (and optionally publish) Ethereum transaction. Use TO as destination address or set TO to "" for contract creation.')
@click.option('-a', '--host', default='localhost:8545', help='RPC port of ethereum node for automatic gas/nonce estimation and publishing') @click.option('-a', '--host', default='localhost:8545', help='RPC port of ethereum node for automatic gas/nonce estimation and publishing')
@click.option('-c', '--chain-id', type=int, help='EIP-155 chain id (replay protection)') @click.option('-c', '--chain-id', type=int, help='EIP-155 chain id (replay protection)')
@click.option('-x', '--tx-type', type=int, help='Wanchain txtype field')
@click.option('-n', '--address', required=True, help="BIP-32 path to source address, e.g., m/44'/60'/0'/0/0") @click.option('-n', '--address', required=True, help="BIP-32 path to source address, e.g., m/44'/60'/0'/0/0")
@click.option('-v', '--value', default='0', help='Ether amount to transfer, e.g. "100 milliether"') @click.option('-v', '--value', default='0', help='Ether amount to transfer, e.g. "100 milliether"')
@click.option('-g', '--gas-limit', type=int, help='Gas limit - Required for offline signing') @click.option('-g', '--gas-limit', type=int, help='Gas limit - Required for offline signing')
@ -723,7 +724,7 @@ def ethereum_get_address(connect, address, show_display):
@click.option('-p', '--publish', is_flag=True, help='Publish transaction via RPC') @click.option('-p', '--publish', is_flag=True, help='Publish transaction via RPC')
@click.argument('to') @click.argument('to')
@click.pass_obj @click.pass_obj
def ethereum_sign_tx(connect, host, chain_id, address, value, gas_limit, gas_price, nonce, data, publish, to): def ethereum_sign_tx(connect, host, chain_id, tx_type, address, value, gas_limit, gas_price, nonce, data, publish, to):
from ethjsonrpc import EthJsonRpc from ethjsonrpc import EthJsonRpc
import rlp import rlp
@ -775,7 +776,7 @@ def ethereum_sign_tx(connect, host, chain_id, address, value, gas_limit, gas_pri
address_n = client.expand_path(address) address_n = client.expand_path(address)
address = '0x%s' % (binascii.hexlify(client.ethereum_get_address(address_n)).decode()) address = '0x%s' % (binascii.hexlify(client.ethereum_get_address(address_n)).decode())
if gas_price is None or gas_limit is None or nonce is None: if gas_price is None or gas_limit is None or nonce is None or publish:
host, port = host.split(':') host, port = host.split(':')
eth = EthJsonRpc(host, int(port)) eth = EthJsonRpc(host, int(port))
@ -798,6 +799,7 @@ def ethereum_sign_tx(connect, host, chain_id, address, value, gas_limit, gas_pri
sig = client.ethereum_sign_tx( sig = client.ethereum_sign_tx(
n=address_n, n=address_n,
tx_type=tx_type,
nonce=nonce, nonce=nonce,
gas_price=gas_price, gas_price=gas_price,
gas_limit=gas_limit, gas_limit=gas_limit,
@ -806,8 +808,12 @@ def ethereum_sign_tx(connect, host, chain_id, address, value, gas_limit, gas_pri
data=data, data=data,
chain_id=chain_id) chain_id=chain_id)
if tx_type is None:
transaction = rlp.encode( transaction = rlp.encode(
(nonce, gas_price, gas_limit, to_address, value, data) + sig) (nonce, gas_price, gas_limit, to_address, value, data) + sig)
else:
transaction = rlp.encode(
(tx_type, nonce, gas_price, gas_limit, to_address, value, data) + sig)
tx_hex = '0x%s' % binascii.hexlify(transaction).decode() tx_hex = '0x%s' % binascii.hexlify(transaction).decode()
if publish: if publish:

5
trezorlib/client.py
View File

@ -572,7 +572,7 @@ 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))
@session @session
def ethereum_sign_tx(self, n, nonce, gas_price, gas_limit, to, value, data=None, chain_id=None): def ethereum_sign_tx(self, n, nonce, gas_price, gas_limit, to, value, data=None, chain_id=None, tx_type=None):
def int_to_big_endian(value): def int_to_big_endian(value):
import rlp.utils import rlp.utils
if value == 0: if value == 0:
@ -599,6 +599,9 @@ class ProtocolMixin(object):
if chain_id: if chain_id:
msg.chain_id = chain_id msg.chain_id = chain_id
if tx_type is not None:
msg.tx_type = tx_type
response = self.call(msg) response = self.call(msg)
while response.data_length is not None: while response.data_length is not None: