diff --git a/src/script/interpreter.h b/src/script/interpreter.h --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -29,9 +29,9 @@ class BaseSignatureChecker { public: - virtual bool VerifySignature(const std::vector &vchSig, - const CPubKey &vchPubKey, - const uint256 &sighash) const; + virtual bool VerifySignatureECDSA(const std::vector &vchSig, + const CPubKey &vchPubKey, + const uint256 &sighash) const; virtual bool CheckSig(const std::vector &scriptSig, const std::vector &vchPubKey, diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -941,7 +941,7 @@ CSHA256() .Write(vchMessage.data(), vchMessage.size()) .Finalize(vchHash.data()); - fSuccess = checker.VerifySignature( + fSuccess = checker.VerifySignatureECDSA( vchSig, CPubKey(vchPubKey), uint256(vchHash)); } @@ -1462,9 +1462,9 @@ return ss.GetHash(); } -bool BaseSignatureChecker::VerifySignature(const std::vector &vchSig, - const CPubKey &pubkey, - const uint256 &sighash) const { +bool BaseSignatureChecker::VerifySignatureECDSA( + const std::vector &vchSig, const CPubKey &pubkey, + const uint256 &sighash) const { return pubkey.VerifyECDSA(sighash, vchSig); } @@ -1487,7 +1487,7 @@ uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, sigHashType, amount, this->txdata, flags); - if (!VerifySignature(vchSig, pubkey, sighash)) { + if (!VerifySignatureECDSA(vchSig, pubkey, sighash)) { return false; } diff --git a/src/script/sigcache.h b/src/script/sigcache.h --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -51,9 +51,9 @@ : TransactionSignatureChecker(txToIn, nInIn, amountIn, txdataIn), store(storeIn) {} - bool VerifySignature(const std::vector &vchSig, - const CPubKey &vchPubKey, - const uint256 &sighash) const override; + bool VerifySignatureECDSA(const std::vector &vchSig, + const CPubKey &vchPubKey, + const uint256 &sighash) const override; }; void InitSignatureCache(); diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -57,10 +57,10 @@ /** * In previous versions of this code, signatureCache was a local static variable - * in CachingTransactionSignatureChecker::VerifySignature. We initialize - * signatureCache outside of VerifySignature to avoid the atomic operation per - * call overhead associated with local static variables even though - * signatureCache could be made local to VerifySignature. + * in CachingTransactionSignatureChecker::VerifySignatureECDSA(). We initialize + * signatureCache outside of VerifySignatureECDSA() to avoid the atomic + * operation per call overhead associated with local static variables even + * though signatureCache could be made local to VerifySignatureECDSA(). */ static CSignatureCache signatureCache; } // namespace @@ -80,7 +80,7 @@ (nElems * sizeof(uint256)) >> 20, nMaxCacheSize >> 20, nElems); } -bool CachingTransactionSignatureChecker::VerifySignature( +bool CachingTransactionSignatureChecker::VerifySignatureECDSA( const std::vector &vchSig, const CPubKey &pubkey, const uint256 &sighash) const { uint256 entry; @@ -88,8 +88,8 @@ if (signatureCache.Get(entry, !store)) { return true; } - if (!TransactionSignatureChecker::VerifySignature(vchSig, pubkey, - sighash)) { + if (!TransactionSignatureChecker::VerifySignatureECDSA(vchSig, pubkey, + sighash)) { return false; } if (store) {