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

core: fix transaction header for mixed segwit inputs

Browse Source
This commit is contained in:
Ondřej Vejpustek 2020-03-09 18:07:12 +01:00 committed by Tomas Susanka
parent bbb44405ad
commit d61181d7e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/apps/wallet/sign_tx/signing.py
View File

@ -152,7 +152,8 @@ async def check_tx_fee(tx: SignTx, keychain: seed.Keychain):
if not utils.BITCOIN_ONLY and coin.decred: if not utils.BITCOIN_ONLY and coin.decred:
w_txi = writers.empty_bytearray(8 if i == 0 else 0 + 9 + len(txi.prev_hash)) w_txi = writers.empty_bytearray(8 if i == 0 else 0 + 9 + len(txi.prev_hash))
if i == 0: # serializing first input => prepend headers if i == 0: # serializing first input => prepend headers
writers.write_bytes(w_txi, get_tx_header(coin, tx)) # decred doesn't support segwit
writers.write_bytes(w_txi, get_tx_header(coin, tx, False))
writers.write_tx_input_decred(w_txi, txi) writers.write_tx_input_decred(w_txi, txi)
tx_ser.serialized_tx = w_txi tx_ser.serialized_tx = w_txi
tx_req.serialized = tx_ser tx_req.serialized = tx_ser
@ -236,6 +237,7 @@ async def sign_tx(tx: SignTx, keychain: seed.Keychain):
# - sign inputs # - sign inputs
# - check that nothing changed # - check that nothing changed
any_segwit = True in segwit.values()
coin = coins.by_name(tx.coin_name) coin = coins.by_name(tx.coin_name)
tx_ser = TxRequestSerializedType() tx_ser = TxRequestSerializedType()
@ -320,7 +322,7 @@ async def sign_tx(tx: SignTx, keychain: seed.Keychain):
5 + len(txi_sign.prev_hash) + 4 + len(txi_sign.script_sig) + 4 5 + len(txi_sign.prev_hash) + 4 + len(txi_sign.script_sig) + 4
) )
if i_sign == 0: # serializing first input => prepend headers if i_sign == 0: # serializing first input => prepend headers
writers.write_bytes(w_txi_sign, get_tx_header(coin, tx)) writers.write_bytes(w_txi_sign, get_tx_header(coin, tx, any_segwit))
writers.write_tx_input(w_txi_sign, txi_sign) writers.write_tx_input(w_txi_sign, txi_sign)
tx_ser.serialized_tx = w_txi_sign tx_ser.serialized_tx = w_txi_sign
@ -488,7 +490,7 @@ async def sign_tx(tx: SignTx, keychain: seed.Keychain):
5 + len(txi_sign.prev_hash) + 4 + len(txi_sign.script_sig) + 4 5 + len(txi_sign.prev_hash) + 4 + len(txi_sign.script_sig) + 4
) )
if i_sign == 0: # serializing first input => prepend headers if i_sign == 0: # serializing first input => prepend headers
writers.write_bytes(w_txi_sign, get_tx_header(coin, tx)) writers.write_bytes(w_txi_sign, get_tx_header(coin, tx, any_segwit))
writers.write_tx_input(w_txi_sign, txi_sign) writers.write_tx_input(w_txi_sign, txi_sign)
tx_ser.serialized_tx = w_txi_sign tx_ser.serialized_tx = w_txi_sign
@ -516,8 +518,6 @@ async def sign_tx(tx: SignTx, keychain: seed.Keychain):
tx_req.serialized = tx_ser tx_req.serialized = tx_ser
any_segwit = True in segwit.values()
for i in range(tx.inputs_count): for i in range(tx.inputs_count):
progress.advance() progress.advance()
if segwit[i]: if segwit[i]:
@ -674,7 +674,7 @@ def get_hash_type(coin: coininfo.CoinInfo) -> int:
return hashtype return hashtype
def get_tx_header(coin: coininfo.CoinInfo, tx: SignTx, segwit: bool = False): def get_tx_header(coin: coininfo.CoinInfo, tx: SignTx, segwit: bool):
w_txi = bytearray() w_txi = bytearray()
if not utils.BITCOIN_ONLY and tx.overwintered: if not utils.BITCOIN_ONLY and tx.overwintered:
writers.write_uint32( writers.write_uint32(