arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-06 14:52:33 +00:00
Code Issues Releases Wiki Activity

signing: check for empty address_n

Browse Source
This commit is contained in:
Jan Pochyla 2018-02-24 18:17:06 +01:00
parent 6472b201f7
commit d6c0fae045
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/wallet/sign_tx/helpers.py
View File

@ -122,6 +122,8 @@ def sanitize_tx_input(tx: TransactionType) -> TxInputType:
txi.script_type = InputScriptType.SPENDADDRESS txi.script_type = InputScriptType.SPENDADDRESS
if txi.sequence is None: if txi.sequence is None:
txi.sequence = 0xffffffff txi.sequence = 0xffffffff
if getattr(txi, 'address_n', None) is None:
txi.address_n = []
return txi return txi

2
src/apps/wallet/sign_tx/multisig.py
View File

@ -70,7 +70,7 @@ def multisig_pubkey_index(multisig: MultisigRedeemScriptType, pubkey: bytes) ->
def multisig_get_pubkey(hd: HDNodePathType) -> bytes: def multisig_get_pubkey(hd: HDNodePathType) -> bytes:
p = hd.address_n p = hd.address_n or []
n = hd.node n = hd.node
node = bip32.HDNode( node = bip32.HDNode(
depth=n.depth, depth=n.depth,

7
src/apps/wallet/sign_tx/signing.py
View File

@ -475,11 +475,12 @@ def get_address_for_change(o: TxOutputType, coin: CoinType, root):
input_script_type = InputScriptType.SPENDP2SHWITNESS input_script_type = InputScriptType.SPENDP2SHWITNESS
else: else:
raise SigningError(FailureType.DataError, 'Invalid script type') raise SigningError(FailureType.DataError, 'Invalid script type')
return get_address(input_script_type, coin, node_derive(root, o.address_n), o.multisig) address_n = o.address_n or []
return get_address(input_script_type, coin, node_derive(root, address_n), o.multisig)
def output_is_change(o: TxOutputType, wallet_path: list, segwit_in: int) -> bool: def output_is_change(o: TxOutputType, wallet_path: list, segwit_in: int) -> bool:
address_n = o.address_n address_n = o.address_n or []
is_segwit = (o.script_type == OutputScriptType.PAYTOWITNESS or is_segwit = (o.script_type == OutputScriptType.PAYTOWITNESS or
o.script_type == OutputScriptType.PAYTOP2SHWITNESS) o.script_type == OutputScriptType.PAYTOP2SHWITNESS)
if is_segwit and o.amount > segwit_in: if is_segwit and o.amount > segwit_in:
@ -487,7 +488,7 @@ def output_is_change(o: TxOutputType, wallet_path: list, segwit_in: int) -> bool
# segwit inputs paid. this is to prevent user being tricked into # segwit inputs paid. this is to prevent user being tricked into
# creating ANYONECANSPEND outputs before full segwit activation. # creating ANYONECANSPEND outputs before full segwit activation.
return False return False
return (address_n is not None and wallet_path is not None and return (wallet_path is not None and
wallet_path == address_n[:-_BIP32_WALLET_DEPTH] and wallet_path == address_n[:-_BIP32_WALLET_DEPTH] and
address_n[-2] <= _BIP32_CHANGE_CHAIN and address_n[-2] <= _BIP32_CHANGE_CHAIN and
address_n[-1] <= _BIP32_MAX_LAST_ELEMENT) address_n[-1] <= _BIP32_MAX_LAST_ELEMENT)