arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-09 15:00:58 +00:00
Code Issues Releases Wiki Activity

Fixed expect_buttonrequests

Browse Source 
Splitted simplesigntx
This commit is contained in:
slush0 2014-02-08 23:13:28 +01:00
parent e160afa56d
commit e919f1bd30
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
trezorlib/client.py
View File

@ -178,7 +178,7 @@ class TrezorClient(object):
print "Pressing button", self.debug_button print "Pressing button", self.debug_button
self.debuglink.press_button(self.debug_button) self.debuglink.press_button(self.debug_button)
return self.call(proto.ButtonAck()) return self.call(proto.ButtonAck(), expected_buttonrequests=expected_buttonrequests)
if isinstance(resp, proto.PinMatrixRequest): if isinstance(resp, proto.PinMatrixRequest):
if self.debuglink: if self.debuglink:
@ -222,6 +222,10 @@ class TrezorClient(object):
if expected and not isinstance(resp, expected): if expected and not isinstance(resp, expected):
raise CallException("Expected %s message, got %s message" % (expected.DESCRIPTOR.name, resp.DESCRIPTOR.name)) raise CallException("Expected %s message, got %s message" % (expected.DESCRIPTOR.name, resp.DESCRIPTOR.name))
if expected_buttonrequests != None and len(expected_buttonrequests):
raise CallException("Following ButtonRequests were not in use: %s" % \
[ self._get_buttonrequest_value(x) for x in expected_buttonrequests])
return resp return resp
def sign_message(self, n, message): def sign_message(self, n, message):
@ -246,7 +250,7 @@ class TrezorClient(object):
res = self.call(msg) res = self.call(msg)
return res.tx_size return res.tx_size
def simple_sign_tx(self, coin_name, inputs, outputs): def _prepare_simple_sign_tx(self, coin_name, inputs, outputs):
msg = proto.SimpleSignTx() msg = proto.SimpleSignTx()
msg.coin_name = coin_name msg.coin_name = coin_name
msg.inputs.extend(inputs) msg.inputs.extend(inputs)
@ -261,6 +265,10 @@ class TrezorClient(object):
tx.CopyFrom(self.blockchain.get_tx(binascii.hexlify(inp.prev_hash))) tx.CopyFrom(self.blockchain.get_tx(binascii.hexlify(inp.prev_hash)))
known_hashes.append(inp.prev_hash) known_hashes.append(inp.prev_hash)
return msg
def simple_sign_tx(self, coin_name, inputs, outputs):
msg = self._prepare_simple_sign_tx(coin_name, inputs, outputs)
return self.call(msg) return self.call(msg)
def sign_tx(self, coin_name, inputs, outputs): def sign_tx(self, coin_name, inputs, outputs):
@ -357,7 +365,8 @@ class TrezorClient(object):
passphrase_protection=bool(passphrase_protection), passphrase_protection=bool(passphrase_protection),
pin_protection=bool(pin_protection), pin_protection=bool(pin_protection),
label=label, label=label,
language=language)) language=language,
enforce_wordlist=True))
while isinstance(res, proto.WordRequest): while isinstance(res, proto.WordRequest):
word = self.word_func() word = self.word_func()
@ -462,3 +471,5 @@ class TrezorClient(object):
return False return False
raise Exception("Unexpected result " % resp) raise Exception("Unexpected result " % resp)
# class TrezorDebugClient(TrezorClient):