highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-06 13:47:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation

Browse Source 
Github-Pull: #17924
Rebased-From: 6dd59d2e49
This commit is contained in:
Gregory Sanders
2020-01-14 15:05:53 -05:00
committed by João Barbosa
parent e2c45d89f7
commit eac49073eb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/standard.h
View File

@@ -81,9 +81,14 @@ struct PKHash : public uint160
using uint160::uint160;
};
struct WitnessV0KeyHash;
struct ScriptHash : public uint160
{
ScriptHash() : uint160() {}
// These don't do what you'd expect.
// Use ScriptHash(GetScriptForDestination(...)) instead.
explicit ScriptHash(const WitnessV0KeyHash& hash) = delete;
explicit ScriptHash(const PKHash& hash) = delete;
explicit ScriptHash(const uint160& hash) : uint160(hash) {}
explicit ScriptHash(const CScript& script);
using uint160::uint160;