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

Refactored code to follow trezor-common structures

Browse Source
This commit is contained in:
slush0 2013-12-16 18:02:34 +01:00
parent d3df313442
commit b4ff6139ae
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trezorlib/__init__.py
View File

@ -1,6 +0,0 @@
try:
import messages_pb2 as proto
except ImportError:
print "Source messages_pb2.py or types_pb2.py not found. Make sure python-protobuf is installed and run build_pb.sh to generate it."
import sys
sys.exit()

17
trezorlib/client.py
View File

@ -3,6 +3,7 @@ import time
import ckd_public import ckd_public
import messages_pb2 as proto import messages_pb2 as proto
import types_pb2 as types
def show_message(message): def show_message(message):
print "MESSAGE FROM DEVICE:", message print "MESSAGE FROM DEVICE:", message
@ -108,7 +109,7 @@ class TrezorClient(object):
pin = self.debuglink.read_pin_encoded() pin = self.debuglink.read_pin_encoded()
msg2 = proto.PinMatrixAck(pin=pin) msg2 = proto.PinMatrixAck(pin=pin)
elif self.debug_pin == -1: elif self.debug_pin == -1:
msg2 = proto.PinMatrixCancel() msg2 = proto.Cancel()
else: else:
msg2 = proto.PinMatrixAck(pin='444444222222') msg2 = proto.PinMatrixAck(pin='444444222222')
@ -124,10 +125,10 @@ class TrezorClient(object):
if isinstance(resp, proto.Failure): if isinstance(resp, proto.Failure):
self.message_func(resp.message) self.message_func(resp.message)
if resp.code == proto.Failure_ActionCancelled: if resp.code == types.Failure_ActionCancelled:
raise CallException("Action cancelled by user") raise CallException("Action cancelled by user")
elif resp.code == proto.Failure_PinInvalid: elif resp.code == types.Failure_PinInvalid:
raise PinException("PIN is invalid") raise PinException("PIN is invalid")
raise CallException(resp.code, resp.message) raise CallException(resp.code, resp.message)
@ -210,11 +211,11 @@ class TrezorClient(object):
break break
# Device asked for one more information, let's process it. # Device asked for one more information, let's process it.
if res.request_type == proto.TXOUTPUT: if res.request_type == types.TXOUTPUT:
res = self.call(outputs[res.request_index]) res = self.call(outputs[res.request_index])
continue continue
elif res.request_type == proto.TXINPUT: elif res.request_type == types.TXINPUT:
print "REQUESTING", res.request_index print "REQUESTING", res.request_index
res = self.call(inputs[res.request_index]) res = self.call(inputs[res.request_index])
continue continue
@ -274,7 +275,7 @@ class TrezorClient(object):
if not isinstance(n, list): if not isinstance(n, list):
raise Exception('Parameter must be a list') raise Exception('Parameter must be a list')
node = proto.HDNodeType() node = types.HDNodeType()
node.CopyFrom(public_node) node.CopyFrom(public_node)
for i in n: for i in n:
@ -287,14 +288,14 @@ class TrezorClient(object):
raise Exception("Device must be in bootloader mode") raise Exception("Device must be in bootloader mode")
resp = self.call(proto.FirmwareErase()) resp = self.call(proto.FirmwareErase())
if isinstance(resp, proto.Failure) and resp.code == proto.Failure_FirmwareError: if isinstance(resp, proto.Failure) and resp.code == types.Failure_FirmwareError:
return False return False
resp = self.call(proto.FirmwareUpload(payload=fp.read())) resp = self.call(proto.FirmwareUpload(payload=fp.read()))
if isinstance(resp, proto.Success): if isinstance(resp, proto.Success):
return True return True
elif isinstance(resp, proto.Failure) and resp.code == proto.Failure_FirmwareError: elif isinstance(resp, proto.Failure) and resp.code == types.Failure_FirmwareError:
return False return False
raise Exception("Unexpected result " % resp) raise Exception("Unexpected result " % resp)