AaronFiore/electrum
1
0
Fork 0
Code Activity

ledger.sign_transaction: always do certain output checks

Browse Source
This commit is contained in:
SomberNight
2019-12-17 21:33:07 +01:00
parent ee63e84bcf
commit 33facd151d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/plugins/ledger/ledger.py
View File

@@ -379,21 +379,23 @@ class Ledger_KeyStore(Hardware_KeyStore):
txOutput += script txOutput += script
txOutput = bfh(txOutput) txOutput = bfh(txOutput)
# Recognize outputs if not client_electrum.supports_multi_output():
if len(tx.outputs()) > 2:
self.give_error("Transaction with more than 2 outputs not supported")
for txout in tx.outputs():
if not txout.address:
if client_electrum.is_hw1():
self.give_error(_("Only address outputs are supported by {}").format(self.device))
# note: max_size based on https://github.com/LedgerHQ/ledger-app-btc/commit/3a78dee9c0484821df58975803e40d58fbfc2c38#diff-c61ccd96a6d8b54d48f54a3bc4dfa7e2R26
validate_op_return_output(txout, max_size=190)
# Output "change" detection
# - only one output and one change is authorized (for hw.1 and nano) # - only one output and one change is authorized (for hw.1 and nano)
# - at most one output can bypass confirmation (~change) (for all) # - at most one output can bypass confirmation (~change) (for all)
if not p2shTransaction: if not p2shTransaction:
if not client_electrum.supports_multi_output():
if len(tx.outputs()) > 2:
self.give_error("Transaction with more than 2 outputs not supported")
has_change = False has_change = False
any_output_on_change_branch = is_any_tx_output_on_change_branch(tx) any_output_on_change_branch = is_any_tx_output_on_change_branch(tx)
for txout in tx.outputs(): for txout in tx.outputs():
if not txout.address:
if client_electrum.is_hw1():
self.give_error(_("Only address outputs are supported by {}").format(self.device))
# note: max_size based on https://github.com/LedgerHQ/ledger-app-btc/commit/3a78dee9c0484821df58975803e40d58fbfc2c38#diff-c61ccd96a6d8b54d48f54a3bc4dfa7e2R26
validate_op_return_output(txout, max_size=190)
if txout.is_mine and len(tx.outputs()) > 1 \ if txout.is_mine and len(tx.outputs()) > 1 \
and not has_change: and not has_change:
# prioritise hiding outputs on the 'change' branch from user # prioritise hiding outputs on the 'change' branch from user