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/wallet.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/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 19e43f6ec2..65944587f8 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -158,7 +158,7 @@ bool CWallet::LoadCScript(const CScript& redeemScript) * these. Do not add them to the wallet and warn. */ if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE) { - std::string strAddr = CBitcoinAddress(redeemScript.GetID()).ToString(); + std::string strAddr = CBitcoinAddress(CScriptID(redeemScript)).ToString(); LogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n", __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr); return true; |