Merge 48c20dbd86 into merged_master (Bitcoin PR bitcoin/bitcoin#30794)

This commit is contained in:
Tom Trevethan 2026-03-26 22:15:08 +00:00
commit 59a761bf56

View file

@ -2311,7 +2311,7 @@ public:
// Serialize the nSequence
if (nInput != nIn && (fHashSingle || fHashNone))
// let the others update at will
::Serialize(s, int{0});
::Serialize(s, int32_t{0});
else
::Serialize(s, txTo.vin[nInput].nSequence);
// Serialize the asset issuance object
@ -2803,7 +2803,7 @@ bool SignatureHashSchnorr(uint256& hash_out, ScriptExecutionData& execdata, cons
}
template <class T>
uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn, int nHashType, const CConfidentialValue& amount, SigVersion sigversion, unsigned int flags, const PrecomputedTransactionData* cache)
uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn, int32_t nHashType, const CConfidentialValue& amount, SigVersion sigversion, unsigned int flags, const PrecomputedTransactionData* cache)
{
assert(nIn < txTo.vin.size());