diff options
| author | Pieter Wuille <[email protected]> | 2014-06-22 20:40:53 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-06-22 20:45:30 +0200 |
| commit | d4e4e05435a93a72711120f46ee79482c13fae45 (patch) | |
| tree | aeb3e1ba960864e331b647abbfabe2ecb5a90c45 /src/script.h | |
| parent | Merge pull request #4381 (diff) | |
| parent | Code simplifications after CTransaction::GetHash() caching (diff) | |
| download | discoin-d4e4e05435a93a72711120f46ee79482c13fae45.tar.xz discoin-d4e4e05435a93a72711120f46ee79482c13fae45.zip | |
Merge pull request #4309
d38da59 Code simplifications after CTransaction::GetHash() caching (Pieter Wuille)
4949004 Add CMutableTransaction and make CTransaction immutable. (Pieter Wuille)
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/script.h b/src/script.h index a282e7dc0..bd6574627 100644 --- a/src/script.h +++ b/src/script.h @@ -20,6 +20,7 @@ class CCoins; class CKeyStore; class CTransaction; +class CMutableTransaction; static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes static const unsigned int MAX_OP_RETURN_RELAY = 40; // bytes @@ -805,8 +806,8 @@ bool IsMine(const CKeyStore& keystore, const CTxDestination &dest); void ExtractAffectedKeys(const CKeyStore &keystore, const CScript& scriptPubKey, std::vector<CKeyID> &vKeys); bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet); bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet); -bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); -bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); +bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); +bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); // Given two sets of signatures for scriptPubKey, possibly with OP_0 placeholders, |