arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

core: flip condition for force_bip143

Browse Source 
this should be equivalent because Bitcoin does not have force_bip143 set
This commit is contained in:
matejcik 2020-03-13 10:27:27 +01:00 committed by Tomas Susanka
parent ed464f3d47
commit 7d5771911c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ async def check_tx_fee(tx: SignTx, keychain: seed.Keychain, coin: coininfo.CoinI
InputScriptType.SPENDADDRESS,
InputScriptType.SPENDMULTISIG,
):
if coin.force_bip143 or (not utils.BITCOIN_ONLY and coin.overwintered):
if not utils.BITCOIN_ONLY and (coin.force_bip143 or coin.overwintered):
if not txi.amount:
raise SigningError(
FailureType.DataError, "Expected input with amount"
@ -288,7 +288,7 @@ async def sign_tx(tx: SignTx, keychain: seed.Keychain):
tx_ser.signature = None
tx_req.serialized = tx_ser
elif coin.force_bip143 or (not utils.BITCOIN_ONLY and coin.overwintered):
elif not utils.BITCOIN_ONLY and (coin.force_bip143 or coin.overwintered):
# STAGE_REQUEST_SEGWIT_INPUT
txi_sign = await helpers.request_tx_input(tx_req, i_sign, coin)
input_check_wallet_path(txi_sign, wallet_path)