diff options
| author | Gavin Andresen <[email protected]> | 2012-03-26 15:31:32 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-03-26 15:31:32 -0400 |
| commit | c698633447b95cd69113676a5cc4d554ba408e14 (patch) | |
| tree | ba40fa7775e7d5cbc4042b0c8d743dfa34554bab /src/script.h | |
| parent | Merge branch 'deladdr' of https://github.com/sipa/bitcoin (diff) | |
| parent | Merge pull request #991 from gavinandresen/disableWinURI (diff) | |
| download | discoin-c698633447b95cd69113676a5cc4d554ba408e14.tar.xz discoin-c698633447b95cd69113676a5cc4d554ba408e14.zip | |
Merge branch 'master' of github.com:bitcoin/bitcoin
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script.h b/src/script.h index 46f2d31bb..524d08b3e 100644 --- a/src/script.h +++ b/src/script.h @@ -15,6 +15,7 @@ class CTransaction; class CKeyStore; +/** Signature hash types/flags */ enum { SIGHASH_ALL = 1, @@ -36,6 +37,7 @@ enum txnouttype const char* GetTxnOutputType(txnouttype t); +/** Script opcodes */ enum opcodetype { // push value @@ -212,7 +214,7 @@ inline std::string StackString(const std::vector<std::vector<unsigned char> >& v - +/** Serialized script, used inside transaction inputs and outputs */ class CScript : public std::vector<unsigned char> { protected: |