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

chore(trezorlib): Support payment requests and GetNonce command.

Browse Source
This commit is contained in:
Andrew Kozlik 2021-01-20 16:22:07 +01:00 committed by Andrew Kozlik
parent 0e58218f5f
commit f6154b311e
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/.changelog.d/1430.added Normal file
View File

@ -0,0 +1 @@
Support payment requests and GetNonce command.

57
python/src/trezorlib/btc.py
View File

@ -255,6 +255,7 @@ def sign_tx(
outputs: Sequence[messages.TxOutputType],
details: Optional[messages.SignTx] = None,
prev_txes: Optional["TxCacheType"] = None,
payment_reqs: Sequence[messages.TxAckPaymentRequest] = (),
preauthorized: bool = False,
**kwargs: Any,
) -> Tuple[Sequence[Optional[bytes]], bytes]:
@ -354,34 +355,40 @@ def sign_tx(
else:
current_tx = this_tx
msg = messages.TransactionType()
if res.request_type == R.TXMETA:
msg = copy_tx_meta(current_tx)
elif res.request_type in (R.TXINPUT, R.TXORIGINPUT):
if res.request_type == R.TXPAYMENTREQ:
assert res.details.request_index is not None
msg.inputs = [current_tx.inputs[res.details.request_index]]
elif res.request_type == R.TXOUTPUT:
assert res.details.request_index is not None
if res.details.tx_hash:
msg.bin_outputs = [current_tx.bin_outputs[res.details.request_index]]
else:
msg.outputs = [current_tx.outputs[res.details.request_index]]
elif res.request_type == R.TXORIGOUTPUT:
assert res.details.request_index is not None
msg.outputs = [current_tx.outputs[res.details.request_index]]
elif res.request_type == R.TXEXTRADATA:
assert res.details.extra_data_offset is not None
assert res.details.extra_data_len is not None
assert current_tx.extra_data is not None
o, l = res.details.extra_data_offset, res.details.extra_data_len
msg.extra_data = current_tx.extra_data[o : o + l]
msg = payment_reqs[res.details.request_index]
res = client.call(msg)
else:
raise exceptions.TrezorException(
f"Unknown request type - {res.request_type}."
)
msg = messages.TransactionType()
if res.request_type == R.TXMETA:
msg = copy_tx_meta(current_tx)
elif res.request_type in (R.TXINPUT, R.TXORIGINPUT):
assert res.details.request_index is not None
msg.inputs = [current_tx.inputs[res.details.request_index]]
elif res.request_type == R.TXOUTPUT:
assert res.details.request_index is not None
if res.details.tx_hash:
msg.bin_outputs = [
current_tx.bin_outputs[res.details.request_index]
]
else:
msg.outputs = [current_tx.outputs[res.details.request_index]]
elif res.request_type == R.TXORIGOUTPUT:
assert res.details.request_index is not None
msg.outputs = [current_tx.outputs[res.details.request_index]]
elif res.request_type == R.TXEXTRADATA:
assert res.details.extra_data_offset is not None
assert res.details.extra_data_len is not None
assert current_tx.extra_data is not None
o, l = res.details.extra_data_offset, res.details.extra_data_len
msg.extra_data = current_tx.extra_data[o : o + l]
else:
raise exceptions.TrezorException(
f"Unknown request type - {res.request_type}."
)
res = client.call(messages.TxAck(tx=msg))
res = client.call(messages.TxAck(tx=msg))
if not isinstance(res, messages.TxRequest):
raise exceptions.TrezorException("Unexpected message")

5
python/src/trezorlib/misc.py
View File

@ -108,3 +108,8 @@ def decrypt_keyvalue(
iv=iv,
)
)
@expect(messages.Nonce, field="nonce", ret_type=bytes)
def get_nonce(client: "TrezorClient"):
return client.call(messages.GetNonce())