diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-22 12:08:51 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-22 12:16:50 +0200 |
commit | 25cc1cf8dc03b9ba0ae886d354855adc207b5b6e (patch) | |
tree | 9298713771596e3ef2c45eb98b3564a995af7978 /src/keystore.cpp | |
parent | 13bddef87019f6608f40031619bee93479d27cd0 (diff) | |
parent | 85c579e3a63cf505d6cedc454755265572e97d3e (diff) | |
download | bitcoin-25cc1cf8dc03b9ba0ae886d354855adc207b5b6e.tar.xz |
Merge pull request #4981
85c579e script: add a slew of includes all around and drop includes from script.h (Cory Fields)
db8eb54 script: move ToString and ValueString out of the header (Cory Fields)
e9ca428 script: add ToByteVector() for converting anything with begin/end (Cory Fields)
066e2a1 script: move CScriptID to standard.h and add a ctor for creating them from CScripts (Cory Fields)
Diffstat (limited to 'src/keystore.cpp')
-rw-r--r-- | src/keystore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp index 755defa26d..039c690625 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -8,6 +8,7 @@ #include "crypter.h" #include "key.h" #include "script/script.h" +#include "script/standard.h" #include "util.h" #include <boost/foreach.hpp> @@ -38,7 +39,7 @@ bool CBasicKeyStore::AddCScript(const CScript& redeemScript) return error("CBasicKeyStore::AddCScript() : redeemScripts > %i bytes are invalid", MAX_SCRIPT_ELEMENT_SIZE); LOCK(cs_KeyStore); - mapScripts[redeemScript.GetID()] = redeemScript; + mapScripts[CScriptID(redeemScript)] = redeemScript; return true; } |