DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Update signing to deal with NULL keystore

Browse Source
This commit is contained in:
miketout
2018-10-13 21:42:30 -07:00
parent 6c621e0e43
commit 11f4f605e2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/sign.cpp
View File

@@ -245,7 +245,7 @@ static bool SignStepCC(const BaseSignatureCreator& creator, const CScript& scrip
// first of priv key in our key store or contract address is what we sign with // first of priv key in our key store or contract address is what we sign with
for (auto pk : p.vKeys) for (auto pk : p.vKeys)
{ {
if (creator.KeyStore().GetKey(pk.GetID(), privKey) && privKey.IsValid()) if (creator.IsKeystoreValid() && creator.KeyStore().GetKey(pk.GetID(), privKey) && privKey.IsValid())
break; break;
if (pk == CPubKey(ParseHex(C.CChexstr))) if (pk == CPubKey(ParseHex(C.CChexstr)))

3
src/script/sign.h
View File

@@ -23,7 +23,8 @@ protected:
public: public:
BaseSignatureCreator(const CKeyStore* keystoreIn) : keystore(keystoreIn) {} BaseSignatureCreator(const CKeyStore* keystoreIn) : keystore(keystoreIn) {}
const CKeyStore& KeyStore() const { return *keystore; }; const bool IsKeystoreValid() const { return keystore != NULL; }
const CKeyStore& KeyStore() const { return *keystore; }
virtual ~BaseSignatureCreator() {} virtual ~BaseSignatureCreator() {}
virtual const BaseSignatureChecker& Checker() const =0; virtual const BaseSignatureChecker& Checker() const =0;