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

signing/multisig: reuse some code

Browse Source
This commit is contained in:
Jan Pochyla 2018-02-25 19:12:20 +01:00
parent b9c111f6ae
commit c01ebeb552
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,8 @@ 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 None raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
def multisig_get_pubkey(hd: HDNodePathType) -> bytes: def multisig_get_pubkey(hd: HDNodePathType) -> bytes:

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

@ -185,10 +185,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) multisig_pubkey_index(txi_sign.multisig, key_sign_pub)
if pubkey_idx is None:
raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
signature = ecdsa_sign(key_sign, bip143_hash) signature = ecdsa_sign(key_sign, bip143_hash)
tx_ser.signature_index = i_sign tx_ser.signature_index = i_sign
@ -285,9 +282,6 @@ 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 is None:
raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
# compute the signature from the tx digest # compute the signature from the tx digest
signature = ecdsa_sign(key_sign, get_tx_hash(h_sign, True)) signature = ecdsa_sign(key_sign, get_tx_hash(h_sign, True))
@ -349,9 +343,6 @@ async def sign_tx(tx: SignTx, root):
if txi.multisig: if txi.multisig:
# find out place of our signature based on the pubkey # find out place of our signature based on the pubkey
signature_index = multisig_pubkey_index(txi.multisig, key_sign_pub) signature_index = multisig_pubkey_index(txi.multisig, key_sign_pub)
if signature_index is None:
raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
witness = witness_p2wsh(txi.multisig, signature, signature_index, get_hash_type(coin)) witness = witness_p2wsh(txi.multisig, signature, signature_index, get_hash_type(coin))
else: else:
witness = witness_p2wpkh(signature, key_sign_pub, get_hash_type(coin)) witness = witness_p2wpkh(signature, key_sign_pub, get_hash_type(coin))
@ -525,9 +516,6 @@ def input_derive_script(coin: CoinType, i: TxInputType, pubkey: bytes, signature
# multisig # multisig
elif i.script_type == InputScriptType.SPENDMULTISIG: elif i.script_type == InputScriptType.SPENDMULTISIG:
signature_index = multisig_pubkey_index(i.multisig, pubkey) signature_index = multisig_pubkey_index(i.multisig, pubkey)
if signature_index is None:
raise SigningError(FailureType.DataError,
'Pubkey not found in multisig script')
return input_script_multisig( return input_script_multisig(
i.multisig, signature, signature_index, get_hash_type(coin)) i.multisig, signature, signature_index, get_hash_type(coin))
else: else: