diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-26 19:23:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-26 19:23:24 +0200 |
| commit | e8ef3da7133dd9fc411fa8b3cc8b8fc2f9c58a98 (patch) | |
| tree | a6ff0ef6f8cdd85323acc1233a29891346b994fc /src/script.h | |
| parent | d99f5a470c8c4e80223f7a78679db58db78ee979 (diff) | |
| download | bitcoin-e8ef3da7133dd9fc411fa8b3cc8b8fc2f9c58a98.tar.xz | |
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script.h b/src/script.h index 22a6020dce..ae9fdfffa2 100644 --- a/src/script.h +++ b/src/script.h @@ -5,6 +5,7 @@ #define H_BITCOIN_SCRIPT #include "base58.h" +#include "keystore.h" #include <string> #include <vector> @@ -707,12 +708,11 @@ public: -uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); bool IsStandard(const CScript& scriptPubKey); -bool IsMine(const CScript& scriptPubKey); -bool ExtractPubKey(const CScript& scriptPubKey, bool fMineOnly, std::vector<unsigned char>& vchPubKeyRet); +bool IsMine(const CKeyStore& keystore, const CScript& scriptPubKey); +bool ExtractPubKey(const CScript& scriptPubKey, const CKeyStore* pkeystore, std::vector<unsigned char>& vchPubKeyRet); bool ExtractHash160(const CScript& scriptPubKey, uint160& hash160Ret); -bool SignSignature(const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL, CScript scriptPrereq=CScript()); +bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL, CScript scriptPrereq=CScript()); bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsigned int nIn, int nHashType=0); #endif |