[gui] wallet client: get external signer list

Author: Sjors

src/interfaces/wallet.cpp

@@ -572,6 +572,11 @@ class WalletClientImpl : public WalletClient
         return HandleLoadWallet(std::move(fn));
     }
 
+    ExternalSignerList ExternalSigners() override
+    {
+        return ListExternalSigners();
+    }
+
     WalletContext m_context;
     const std::vector<std::string> m_wallet_filenames;
     std::vector<std::unique_ptr<Handler>> m_rpc_handlers;

src/interfaces/wallet.h

@@ -312,6 +312,8 @@ class Wallet
 //! Wallet chain client that in addition to having chain client methods for
 //! starting up, shutting down, and registering RPCs, also has additional
 //! methods (called by the GUI) to load and create wallets.
+typedef std::vector<std::pair<std::string, std::string>> ExternalSignerList; // TODO: figure out where to define this
+
 class WalletClient : public ChainClient
 {
 public:
@@ -335,6 +337,9 @@ class WalletClient : public ChainClient
    //! loaded at startup or by RPC.
    using LoadWalletFn = std::function<void(std::unique_ptr<Wallet> wallet)>;
    virtual std::unique_ptr<Handler> handleLoadWallet(LoadWalletFn fn) = 0;
+
+   //! List external signers
+   virtual ExternalSignerList ExternalSigners() = 0;
 };
 
 //! Information about one wallet address.

src/qt/walletcontroller.cpp

@@ -281,6 +281,9 @@ void CreateWalletActivity::finish()
 
 void CreateWalletActivity::create()
 {
+    // Check for external signers
+
+
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
     m_create_wallet_dialog->setWindowModality(Qt::ApplicationModal);
     m_create_wallet_dialog->show();

src/wallet/wallet.h

@@ -22,7 +22,6 @@
 #include <wallet/coinselection.h>
 #include <wallet/crypter.h>
 #include <wallet/scriptpubkeyman.h>
-#include <wallet/externalsigner.h>
 #include <wallet/walletdb.h>
 #include <wallet/walletutil.h>
 
@@ -96,8 +95,6 @@ constexpr CAmount DEFAULT_TRANSACTION_MAXFEE{COIN / 10};
 constexpr CAmount HIGH_TX_FEE_PER_KB{COIN / 100};
 //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
 constexpr CAmount HIGH_MAX_TX_FEE{100 * HIGH_TX_FEE_PER_KB};
-//! -signer default
-static const std::string DEFAULT_EXTERNAL_SIGNER = "";
 //! Pre-calculated constants for input size estimation in *virtual size*
 static constexpr size_t DUMMY_NESTED_P2WPKH_INPUT_SIZE = 91;
 
@@ -619,6 +616,7 @@ struct CoinSelectionParams
     CoinSelectionParams() {}
 };
 
+typedef std::vector<std::pair<std::string, std::string>> ExternalSignerList;
 class WalletRescanReserver; //forward declarations for ScanForWalletTransactions/RescanFromTime
 /**
  * A CWallet maintains a set of transactions and balances, and provides the ability to create new transactions.

src/wallet/walletutil.cpp

@@ -4,6 +4,7 @@
 
 #include <wallet/walletutil.h>
 
+#include <chainparams.h>
 #include <logging.h>
 #include <util/system.h>
 
@@ -91,3 +92,21 @@ std::vector<fs::path> ListWalletDir()
 
     return paths;
 }
+
+ExternalSignerList ListExternalSigners()
+{
+    ExternalSignerList result = {};
+#ifdef ENABLE_EXTERNAL_SIGNER
+    const std::string command = gArgs.GetArg("-signer", DEFAULT_EXTERNAL_SIGNER);
+    if (command == "") return result;
+    std::string chain = gArgs.GetChainName();
+    const bool mainnet = chain == CBaseChainParams::MAIN;
+    std::vector<ExternalSigner> signers;
+    ExternalSigner::Enumerate(command, signers, mainnet, /* ignore_errors */ false);
+    if (signers.empty()) return {};
+    for (ExternalSigner signer : signers) {
+        result.push_back(make_pair(signer.m_fingerprint, signer.m_name));
+    }
+#endif
+    return result;
+}

src/wallet/walletutil.h

@@ -7,9 +7,13 @@
 
 #include <fs.h>
 #include <script/descriptor.h>
+#include <wallet/externalsigner.h>
 
 #include <vector>
 
+//! -signer default
+static const std::string DEFAULT_EXTERNAL_SIGNER = "";
+
 /** (client) version numbers for particular wallet features */
 enum WalletFeature
 {
@@ -70,6 +74,13 @@ fs::path GetWalletDir();
 //! Get wallets in wallet directory.
 std::vector<fs::path> ListWalletDir();
 
+typedef std::vector<std::pair<std::string, std::string>> ExternalSignerList; // TODO: figure out where to define this
+/**
+ * Calls enumerate if -signer is configured and returns a list of signer
+ * fingerpints and names. Otherwise returns an empty list.
+ */
+ExternalSignerList ListExternalSigners();
+
 /** Descriptor with some wallet metadata */
 class WalletDescriptor
 {