Merge a1726c555b into merged_master (Elements PR ElementsProject/elements#1045)

This commit is contained in:
Andrew Poelstra 2021-09-21 19:37:06 +00:00
commit 6c368ab1a3
7 changed files with 156 additions and 13 deletions

View file

@ -2769,7 +2769,7 @@ uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn
hashOutputs = cacheready ? cache->hashOutputs : SHA256Uint256(GetOutputsSHA256(txTo));
if (fRangeproof) {
hashRangeproofs = cacheready ? cache->hashRangeproofs : SHA256Uint256(GetRangeproofsHash(txTo));
hashRangeproofs = cacheready ? cache->hashRangeproofs : GetRangeproofsHash(txTo);
}
} else if ((nHashType & 0x1f) == SIGHASH_SINGLE && nIn < txTo.vout.size()) {
CHashWriter ss(SER_GETHASH, 0);