Merge 2d6e76af24 into merged_master (Bitcoin PR #17261)

Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
This commit is contained in:
Andrew Poelstra 2020-11-14 17:16:10 +00:00
commit 91e195d7cd
30 changed files with 518 additions and 281 deletions

View file

@ -1684,13 +1684,11 @@ uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn
return ss.GetHash();
}
static const uint256 one(uint256S("0000000000000000000000000000000000000000000000000000000000000001"));
// Check for invalid use of SIGHASH_SINGLE
if ((nHashType & 0x1f) == SIGHASH_SINGLE) {
if (nIn >= txTo.vout.size()) {
// nOut out of range
return one;
return UINT256_ONE();
}
}