diff options
| author | Anthony Towns <aj@erisian.com.au> | 2018-07-09 19:30:39 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2018-07-10 00:06:19 +1000 |
| commit | d58055d25f41e942e04ffeae5f25e37a60ee8829 (patch) | |
| tree | b672c2f0cdb88537a9112d7b750b65589c0b9853 /src/wallet/rpcwallet.cpp | |
| parent | 9a44db2e46af2b73e0dbaa929244161b18c15162 (diff) | |
| download | bitcoin-d58055d25f41e942e04ffeae5f25e37a60ee8829.tar.xz | |
Move AddAndGetDestinationForScript from wallet to outputype module
Makes AddAndGetDestinationForScript use a generic CKeyStore rather than
the wallet, and makes it always add the script to the keystore, rather
than only adding related (redeem) scripts.
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1574f78c5e..40fdbea719 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1363,8 +1363,7 @@ static UniValue addmultisigaddress(const JSONRPCRequest& request) // Construct using pay-to-script-hash: CScript inner = CreateMultisigRedeemscript(required, pubkeys); - pwallet->AddCScript(inner); - CTxDestination dest = pwallet->AddAndGetDestinationForScript(inner, output_type); + CTxDestination dest = AddAndGetDestinationForScript(*pwallet, inner, output_type); pwallet->SetAddressBook(dest, label, "send"); UniValue result(UniValue::VOBJ); |