From 84b4bdbb51ce515d0a66db20c997168841db46ef Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 16 Apr 2018 16:21:10 -0700 Subject: [PATCH] Track difference between scriptPubKey and P2SH execution in IsMine Inside IsMine we care about the distinction between scriptPubKey execution and P2SH redeemScript execution. The consensus code does not care about this distinction, and thus SigVersion does not have a field for P2SH. As the IsMine code will care, it uses a separate enum with more fields. --- src/script/ismine.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index 2cc713882..69aa9b585 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -15,11 +15,23 @@ using namespace std; +/** + * This is an enum that tracks the execution context of a script, similar to + * SigVersion in script/interpreter. It is separate however because we want to + * distinguish between top-level scriptPubKey execution and P2SH redeemScript + * execution (a distinction that has no impact on consensus rules). + */ enum class IsMineSigVersion { - BASE = 0 + TOP = 0, //! scriptPubKey execution + P2SH = 1, //! P2SH redeemScript }; +static bool PermitsUncompressed(IsMineSigVersion sigversion) +{ + return sigversion == IsMineSigVersion::TOP || sigversion == IsMineSigVersion::P2SH; +} + typedef vector valtype; unsigned int HaveKeys(const vector& pubkeys, const CKeyStore& keystore) @@ -65,7 +77,7 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu CScriptID scriptID = CScriptID(uint160(vSolutions[0])); CScript subscript; if (keystore.GetCScript(scriptID, subscript)) { - isminetype ret = IsMineInner(keystore, subscript, IsMineSigVersion::BASE); + isminetype ret = IsMineInner(keystore, subscript, IsMineSigVersion::P2SH); if (ret == ISMINE_SPENDABLE) return ret; } @@ -96,7 +108,7 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey) { - return IsMineInner(keystore, scriptPubKey, IsMineSigVersion::BASE); + return IsMineInner(keystore, scriptPubKey, IsMineSigVersion::TOP); } isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest)