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/wallet.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/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b61b919978..60e13e5a45 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4470,26 +4470,3 @@ void CWallet::LearnAllRelatedScripts(const CPubKey& key) LearnRelatedScripts(key, OutputType::P2SH_SEGWIT); } -CTxDestination CWallet::AddAndGetDestinationForScript(const CScript& script, OutputType type) -{ - // Note that scripts over 520 bytes are not yet supported. - switch (type) { - case OutputType::LEGACY: - return CScriptID(script); - case OutputType::P2SH_SEGWIT: - case OutputType::BECH32: { - CTxDestination witdest = WitnessV0ScriptHash(script); - CScript witprog = GetScriptForDestination(witdest); - // Check if the resulting program is solvable (i.e. doesn't use an uncompressed key) - if (!IsSolvable(*this, witprog)) return CScriptID(script); - // Add the redeemscript, so that P2WSH and P2SH-P2WSH outputs are recognized as ours. - AddCScript(witprog); - if (type == OutputType::BECH32) { - return witdest; - } else { - return CScriptID(witprog); - } - } - default: assert(false); - } -} |