zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Pieter Wuille 2018-04-16 16:21:10 -07:00 committed by Jack Grigg
parent 36f067bb95
commit 84b4bdbb51
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/script/ismine.cpp
View File

@ -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<unsigned char> valtype;
unsigned int HaveKeys(const vector<valtype>& 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)