diff options
| author | Cory Fields <[email protected]> | 2014-09-24 22:24:46 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2014-10-17 13:44:14 -0400 |
| commit | 066e2a1403fe306787a2ce0c8571aa9de57386cf (patch) | |
| tree | 5a4257c467978f1260a0d69e937c16ba16a01773 /src/rpcwallet.cpp | |
| parent | Merge pull request #5082 (diff) | |
| download | discoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.tar.xz discoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.zip | |
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/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index d11455e38..68bb4068b 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -918,7 +918,7 @@ Value addmultisigaddress(const Array& params, bool fHelp) // Construct using pay-to-script-hash: CScript inner = _createmultisig_redeemScript(params); - CScriptID innerID = inner.GetID(); + CScriptID innerID(inner); pwalletMain->AddCScript(inner); pwalletMain->SetAddressBook(innerID, strAccount, "send"); |