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

Rename to ethereum_get_address, use binascii.hexlify

Browse Source
This commit is contained in:
Nick Johnson 2016-05-26 07:47:04 +01:00
parent 67bd1c223e
commit 593406ef46
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trezorctl
View File

@ -99,10 +99,10 @@ class Commands(object):
address_n = self.client.expand_path(args.n) address_n = self.client.expand_path(args.n)
return self.client.get_address(args.coin, address_n, args.show_display) return self.client.get_address(args.coin, address_n, args.show_display)
def get_ethereum_address(self, args): def ethereum_get_address(self, args):
address_n = self.client.expand_path(args.n) address_n = self.client.expand_path(args.n)
address = self.client.get_ethereum_address(address_n, args.show_display) address = self.client.ethereum_get_address(address_n, args.show_display)
return "0x%s" % (address.encode('hex'),) return "0x%s" % (binascii.hexlify(address),)
def get_entropy(self, args): def get_entropy(self, args):
return binascii.hexlify(self.client.get_entropy(args.size)) return binascii.hexlify(self.client.get_entropy(args.size))
@ -247,7 +247,7 @@ class Commands(object):
list.help = 'List connected TREZOR USB devices' list.help = 'List connected TREZOR USB devices'
ping.help = 'Send ping message' ping.help = 'Send ping message'
get_address.help = 'Get bitcoin address in base58 encoding' get_address.help = 'Get bitcoin address in base58 encoding'
get_ethereum_address.help = 'Get Ethereum address in hex encoding' ethereum_get_address.help = 'Get Ethereum address in hex encoding'
get_entropy.help = 'Get example entropy' get_entropy.help = 'Get example entropy'
get_features.help = 'Retrieve device features and settings' get_features.help = 'Retrieve device features and settings'
get_public_node.help = 'Get public node of given path' get_public_node.help = 'Get public node of given path'
@ -274,7 +274,7 @@ class Commands(object):
(('-d', '--show-display'), {'action': 'store_true', 'default': False}), (('-d', '--show-display'), {'action': 'store_true', 'default': False}),
) )
get_ethereum_address.arguments = ( ethereum_get_address.arguments = (
(('-n', '-address'), {'type': str}), (('-n', '-address'), {'type': str}),
(('-d', '--show-display'), {'action': 'store_true', 'default': False}), (('-d', '--show-display'), {'action': 'store_true', 'default': False}),
) )

2
trezorlib/client.py
View File

@ -419,7 +419,7 @@ class ProtocolMixin(object):
@field('address') @field('address')
@expect(proto.EthereumAddress) @expect(proto.EthereumAddress)
def get_ethereum_address(self, n, show_display=False, multisig=None): def ethereum_get_address(self, n, show_display=False, multisig=None):
n = self._convert_prime(n) n = self._convert_prime(n)
return self.call(proto.EthereumGetAddress(address_n=n, show_display=show_display)) return self.call(proto.EthereumGetAddress(address_n=n, show_display=show_display))