diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-10-22 12:08:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-10-22 12:16:50 +0200 |
| commit | 25cc1cf8dc03b9ba0ae886d354855adc207b5b6e (patch) | |
| tree | 9298713771596e3ef2c45eb98b3564a995af7978 /src/wallet.cpp | |
| parent | Merge pull request #4988 (diff) | |
| parent | script: add a slew of includes all around and drop includes from script.h (diff) | |
| download | discoin-25cc1cf8dc03b9ba0ae886d354855adc207b5b6e.tar.xz discoin-25cc1cf8dc03b9ba0ae886d354855adc207b5b6e.zip | |
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/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 19e43f6ec..65944587f 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; |