diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-24 22:24:46 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-17 13:44:14 -0400 |
| commit | 066e2a1403fe306787a2ce0c8571aa9de57386cf (patch) | |
| tree | 5a4257c467978f1260a0d69e937c16ba16a01773 /src/script/standard.cpp | |
| parent | e8f6d54f1f58d9a5998e37367b84b427e51e1ad7 (diff) | |
| download | bitcoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.tar.xz | |
script: move CScriptID to standard.h and add a ctor for creating them from CScripts
This allows for a reversal of the current behavior.
This:
CScript foo;
CScriptID bar(foo.GetID());
Becomes:
CScript foo;
CScriptID bar(foo);
This way, CScript is no longer dependent on CScriptID or Hash();
Diffstat (limited to 'src/script/standard.cpp')
| -rw-r--r-- | src/script/standard.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 53ae254d59..adbec01f2e 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -14,6 +14,8 @@ using namespace std; typedef vector<unsigned char> valtype; +CScriptID::CScriptID(const CScript& in) : uint160(in.size() ? Hash160(in.begin(), in.end()) : 0) {} + const char* GetTxnOutputType(txnouttype t) { switch (t) |