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/script/sign.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/script/sign.cpp')
| -rw-r--r-- | src/script/sign.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 03c33ad9b5..377a2af16c 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -123,7 +123,7 @@ bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CMutabl } // Test solution - return VerifyScript(txin.scriptSig, fromPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, SignatureChecker(txTo, nIn)); + return VerifyScript(txin.scriptSig, fromPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(txTo, nIn)); } bool SignSignature(const CKeyStore &keystore, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType) @@ -174,7 +174,7 @@ static CScript CombineMultisig(const CScript& scriptPubKey, const CTransaction& if (sigs.count(pubkey)) continue; // Already got a sig for this pubkey - if (SignatureChecker(txTo, nIn).CheckSig(sig, pubkey, scriptPubKey)) + if (TransactionSignatureChecker(txTo, nIn).CheckSig(sig, pubkey, scriptPubKey)) { sigs[pubkey] = sig; break; |