diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-01-27 09:28:45 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-03 08:48:04 +0100 |
| commit | 1bbad80bf4a939bcacd419f19e46a12a5baa6174 (patch) | |
| tree | 8f19f79175a3895ece6668c587c02afcae863d3a /src/main.cpp | |
| parent | b788c5561ae6d78a3ca3ab2d3f431ad9b3d86bfc (diff) | |
| download | bitcoin-1bbad80bf4a939bcacd419f19e46a12a5baa6174.tar.xz | |
Use separate SignatureChecker for CMutableTransaction
Conflicts:
src/main.cpp
src/script/bitcoinconsensus.cpp
Rebased-From: 858809a33e4f690c4ad213f44a6c4465fc2ef025
Github-Pull: #5719
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8f58547fe5..d5cef779d8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1400,8 +1400,8 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach bool CScriptCheck::operator()() { const CScript &scriptSig = ptxTo->vin[nIn].scriptSig; - if (!VerifyScript(scriptSig, scriptPubKey, nFlags, CachingSignatureChecker(*ptxTo, nIn, cacheStore), &error)) { - return ::error("CScriptCheck() : %s:%d VerifySignature failed: %s", ptxTo->GetHash().ToString(), nIn, ScriptErrorString(error)); + if (!VerifyScript(scriptSig, scriptPubKey, nFlags, CachingTransactionSignatureChecker(*ptxTo, nIn, cacheStore), &error)) { + return ::error("CScriptCheck(): %s:%d VerifySignature failed: %s", ptxTo->GetHash().ToString(), nIn, ScriptErrorString(error)); } return true; } |