mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Gregory Sanders 2020-01-14 15:05:53 -05:00
parent 4b8f1e989f
commit 6dd59d2e49
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/script/standard.h
View file

@ -80,9 +80,14 @@ struct PKHash : public uint160
using uint160::uint160; using uint160::uint160;
}; };
struct WitnessV0KeyHash;
struct ScriptHash : public uint160 struct ScriptHash : public uint160
{ {
ScriptHash() : 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 uint160& hash) : uint160(hash) {}
explicit ScriptHash(const CScript& script); explicit ScriptHash(const CScript& script);
using uint160::uint160; using uint160::uint160;