mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-26 09:28:13 +00:00
signing: Use force_bip143 instead of has_forkid
This commit is contained in:
parent
c6246b5fba
commit
d39e4be1c8
@ -807,9 +807,9 @@ void signing_txack(TransactionType *tx)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (coin->has_forkid) {
|
if (coin->force_bip143) {
|
||||||
if (!tx->inputs[0].has_amount) {
|
if (!tx->inputs[0].has_amount) {
|
||||||
fsm_sendFailure(FailureType_Failure_DataError, _("SIGHASH_FORKID input without amount"));
|
fsm_sendFailure(FailureType_Failure_DataError, _("BIP 143 input without amount"));
|
||||||
signing_abort();
|
signing_abort();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1027,7 +1027,7 @@ void signing_txack(TransactionType *tx)
|
|||||||
resp.serialized.has_serialized_tx = true;
|
resp.serialized.has_serialized_tx = true;
|
||||||
if (tx->inputs[0].script_type == InputScriptType_SPENDMULTISIG
|
if (tx->inputs[0].script_type == InputScriptType_SPENDMULTISIG
|
||||||
|| tx->inputs[0].script_type == InputScriptType_SPENDADDRESS) {
|
|| tx->inputs[0].script_type == InputScriptType_SPENDADDRESS) {
|
||||||
if (!coin->has_forkid) {
|
if (!coin->force_bip143) {
|
||||||
fsm_sendFailure(FailureType_Failure_DataError, _("Transaction has changed during signing"));
|
fsm_sendFailure(FailureType_Failure_DataError, _("Transaction has changed during signing"));
|
||||||
signing_abort();
|
signing_abort();
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user