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

signing/multisig: fix for force_bip143 coins

Browse Source
This commit is contained in:
Jan Pochyla 2018-02-24 18:18:45 +01:00
parent e9ae9e6f1e
commit b8769bd9a5
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,19 +79,7 @@ async def check_tx_fee(tx: SignTx, root):
if txi.multisig: if txi.multisig:
multifp.add(txi.multisig) multifp.add(txi.multisig)
if coin.force_bip143: if txi.script_type in (InputScriptType.SPENDWITNESS,
is_bip143 = (txi.script_type == InputScriptType.SPENDADDRESS)
if not is_bip143:
raise SigningError(FailureType.DataError,
'Wrong input script type')
if not txi.amount:
raise SigningError(FailureType.DataError,
'BIP 143 input without amount')
segwit[i] = False
segwit_in += txi.amount
total_in += txi.amount
elif txi.script_type in (InputScriptType.SPENDWITNESS,
InputScriptType.SPENDP2SHWITNESS): InputScriptType.SPENDP2SHWITNESS):
if not coin.segwit: if not coin.segwit:
raise SigningError(FailureType.DataError, raise SigningError(FailureType.DataError,
@ -105,6 +93,14 @@ async def check_tx_fee(tx: SignTx, root):
elif txi.script_type in (InputScriptType.SPENDADDRESS, elif txi.script_type in (InputScriptType.SPENDADDRESS,
InputScriptType.SPENDMULTISIG): InputScriptType.SPENDMULTISIG):
if coin.force_bip143:
if not txi.amount:
raise SigningError(FailureType.DataError,
'BIP 143 input without amount')
segwit[i] = False
segwit_in += txi.amount
total_in += txi.amount
else:
segwit[i] = False segwit[i] = False
total_in += await get_prevtx_output_value( total_in += await get_prevtx_output_value(
tx_req, txi.prev_hash, txi.prev_index) tx_req, txi.prev_hash, txi.prev_index)
@ -175,7 +171,8 @@ async def sign_tx(tx: SignTx, root):
txi_sign = await request_tx_input(tx_req, i_sign) txi_sign = await request_tx_input(tx_req, i_sign)
input_check_wallet_path(txi_sign, wallet_path) input_check_wallet_path(txi_sign, wallet_path)
is_bip143 = (txi_sign.script_type == InputScriptType.SPENDADDRESS) is_bip143 = (txi_sign.script_type == InputScriptType.SPENDADDRESS or
txi_sign.script_type == InputScriptType.SPENDMULTISIG)
if not is_bip143 or txi_sign.amount > authorized_in: if not is_bip143 or txi_sign.amount > authorized_in:
raise SigningError(FailureType.ProcessError, raise SigningError(FailureType.ProcessError,
'Transaction has changed during signing') 'Transaction has changed during signing')
@ -186,6 +183,13 @@ async def sign_tx(tx: SignTx, root):
bip143_hash = bip143.preimage_hash( bip143_hash = bip143.preimage_hash(
tx, txi_sign, ecdsa_hash_pubkey(key_sign_pub), get_hash_type(coin)) tx, txi_sign, ecdsa_hash_pubkey(key_sign_pub), get_hash_type(coin))
# if multisig, check if singing with a key that is included in multisig
if txi_sign.multisig:
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')
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
tx_ser.signature = signature tx_ser.signature = signature
@ -345,6 +349,9 @@ 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 = get_p2wsh_witness(txi.multisig, signature, signature_index, get_hash_type(coin)) witness = get_p2wsh_witness(txi.multisig, signature, signature_index, get_hash_type(coin))
else: else:
witness = get_p2wpkh_witness(signature, key_sign_pub, get_hash_type(coin)) witness = get_p2wpkh_witness(signature, key_sign_pub, get_hash_type(coin))