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

Switch to a private version of SigVersion inside IsMine 

This will allow us to have the consensus code and IsMine code diverge.
This commit is contained in:
Pieter Wuille 2018-04-16 16:15:02 -07:00 committed by Jack Grigg
parent 030e173d98
commit 36f067bb95
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/ismine.cpp
View File

@ -15,6 +15,11 @@
using namespace std;
enum class IsMineSigVersion
{
BASE = 0
};
typedef vector<unsigned char> valtype;
unsigned int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore)
@ -29,7 +34,7 @@ unsigned int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore)
return nResult;
}
static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, SigVersion sigversion)
static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion)
{
vector<valtype> vSolutions;
txnouttype whichType;
@ -60,7 +65,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, SigVersion::SIGVERSION_SPROUT);
isminetype ret = IsMineInner(keystore, subscript, IsMineSigVersion::BASE);
if (ret == ISMINE_SPENDABLE)
return ret;
}
@ -91,7 +96,7 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu
isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey)
{
return IsMineInner(keystore, scriptPubKey, SigVersion::SIGVERSION_SPROUT);
return IsMineInner(keystore, scriptPubKey, IsMineSigVersion::BASE);
}
isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest)