arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-02 03:48:58 +00:00
Code Issues Releases Wiki Activity

feat(core): Inform user about transaction finalization in Bitcoin replacement transactions.

Browse Source
This commit is contained in:
Andrew Kozlik 2020-11-19 18:44:15 +01:00 committed by Andrew Kozlik
parent c6e78e525a
commit f421a213fd
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/apps/bitcoin/sign_tx/approvers.py
View File

@ -170,6 +170,10 @@ class BasicApprover(Approver):
if self.external_in > self.orig_external_in: if self.external_in > self.orig_external_in:
description = "PayJoin" description = "PayJoin"
elif tx_info.rbf_disabled() and any(
not orig.rbf_disabled() for orig in orig_txs
):
description = "Finalize transaction"
elif len(orig_txs) > 1: elif len(orig_txs) > 1:
description = "Transaction meld" description = "Transaction meld"
else: else:

7
core/src/apps/bitcoin/sign_tx/tx_info.py
View File

@ -69,6 +69,10 @@ _BIP32_MAX_LAST_ELEMENT = const(1000000)
# Setting nSequence to this value for every input in a transaction disables nLockTime. # Setting nSequence to this value for every input in a transaction disables nLockTime.
_SEQUENCE_FINAL = const(0xFFFFFFFF) _SEQUENCE_FINAL = const(0xFFFFFFFF)
# Setting nSequence to a value greater than this for every input in a transaction
# disables replace-by-fee opt-in.
_MAX_BIP125_RBF_SEQUENCE = const(0xFFFFFFFD)
class TxInfoBase: class TxInfoBase:
def __init__(self, signer: Signer) -> None: def __init__(self, signer: Signer) -> None:
@ -122,6 +126,9 @@ class TxInfoBase:
def lock_time_disabled(self) -> bool: def lock_time_disabled(self) -> bool:
return self.min_sequence == _SEQUENCE_FINAL return self.min_sequence == _SEQUENCE_FINAL
def rbf_disabled(self) -> bool:
return self.min_sequence > _MAX_BIP125_RBF_SEQUENCE
def get_tx_check_digest(self) -> bytes: def get_tx_check_digest(self) -> bytes:
return self.h_tx_check.get_digest() return self.h_tx_check.get_digest()