arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-11 11:28:46 +00:00
Code Issues Releases Wiki Activity

signing/multisig: fix missing pubkey, remove dead code

Browse Source
This commit is contained in:
Jan Pochyla 2018-02-24 15:13:07 +01:00
parent a46934459a
commit 6472b201f7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ def multisig_pubkey_index(multisig: MultisigRedeemScriptType, pubkey: bytes) ->
for i, hd in enumerate(multisig.pubkeys): for i, hd in enumerate(multisig.pubkeys):
if multisig_get_pubkey(hd) == pubkey: if multisig_get_pubkey(hd) == pubkey:
return i return i
return -1 return None
def multisig_get_pubkey(hd: HDNodePathType) -> bytes: def multisig_get_pubkey(hd: HDNodePathType) -> bytes:
@ -85,10 +85,3 @@ def multisig_get_pubkey(hd: HDNodePathType) -> bytes:
def multisig_get_pubkeys(multisig: MultisigRedeemScriptType): def multisig_get_pubkeys(multisig: MultisigRedeemScriptType):
return [multisig_get_pubkey(hd) for hd in multisig.pubkeys] return [multisig_get_pubkey(hd) for hd in multisig.pubkeys]
def check_address_n_against_pubkeys(multisig: MultisigRedeemScriptType, address_n) -> bool:
for p in multisig.pubkeys:
if p.address_n == address_n:
return True
return False

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

@ -281,7 +281,7 @@ async def sign_tx(tx: SignTx, root):
# if multisig, check if singing with a key that is included in multisig # if multisig, check if singing with a key that is included in multisig
if txi_sign.multisig: if txi_sign.multisig:
pubkey_idx = multisig_pubkey_index(txi_sign.multisig, key_sign_pub) pubkey_idx = multisig_pubkey_index(txi_sign.multisig, key_sign_pub)
if pubkey_idx < 0: if pubkey_idx is None:
raise SigningError(FailureType.DataError, raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script') 'Pubkey not found in multisig script')