diff options
| author | fanquake <fanquake@gmail.com> | 2021-04-13 18:12:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-04-13 20:09:33 +0800 |
| commit | aaa4e5a45bd9ec5563ffa7b9e0d46d2de3cb9242 (patch) | |
| tree | 10114691d648b3c57af2f9889b800f378e873b16 /src | |
| parent | 06a0673351282fff1673f3679a7cad9a7faaf987 (diff) | |
wallet: remove CWallet::GetExternalSigner()
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 15 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c297bc2f91..332e7b1397 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3594,19 +3594,6 @@ void ReserveDestination::ReturnDestination() address = CNoDestination(); } -#ifdef ENABLE_EXTERNAL_SIGNER -ExternalSigner CWallet::GetExternalSigner() -{ - const std::string command = gArgs.GetArg("-signer", ""); - if (command == "") throw std::runtime_error(std::string(__func__) + ": restart bitcoind with -signer=<cmd>"); - std::vector<ExternalSigner> signers; - ExternalSigner::Enumerate(command, signers, Params().NetworkIDString()); - if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found"); - // TODO: add fingerprint argument in case of multiple signers - return signers[0]; -} -#endif - bool CWallet::DisplayAddress(const CTxDestination& dest) { #ifdef ENABLE_EXTERNAL_SIGNER @@ -3619,7 +3606,7 @@ bool CWallet::DisplayAddress(const CTxDestination& dest) if (signer_spk_man == nullptr) { return false; } - ExternalSigner signer = GetExternalSigner(); // TODO: move signer in spk_man + ExternalSigner signer = ExternalSignerScriptPubKeyMan::GetExternalSigner(); return signer_spk_man->DisplayAddress(scriptPubKey, signer); #else return false; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 5bf3c91bec..c4acef8705 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -845,9 +845,6 @@ public: std::vector<OutputGroup> GroupOutputs(const std::vector<COutput>& outputs, bool separate_coins, const CFeeRate& effective_feerate, const CFeeRate& long_term_feerate, const CoinEligibilityFilter& filter, bool positive_only) const; -#ifdef ENABLE_EXTERNAL_SIGNER - ExternalSigner GetExternalSigner() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); -#endif /** Display address on an external signer. Returns false if external signer support is not compiled */ bool DisplayAddress(const CTxDestination& dest) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); |