Show name, format and if uses descriptors in bitcoin-wallet tool

knst · Oct 21, 2020 · fa4074b · fa4074b
1 parent f5bd46a
commit fa4074b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
@@ -95,6 +95,9 @@ static void WalletShowInfo(CWallet* wallet_instance)
     LOCK(wallet_instance->cs_wallet);
 
     tfm::format(std::cout, "Wallet info\n===========\n");
+    tfm::format(std::cout, "Name: %s\n", wallet_instance->GetName());
+    tfm::format(std::cout, "Format: %s\n", wallet_instance->GetDatabase().Format());
+    tfm::format(std::cout, "Descriptors: %s\n", wallet_instance->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS) ? "yes" : "no");
     tfm::format(std::cout, "Encrypted: %s\n", wallet_instance->IsCrypted() ? "yes" : "no");
     tfm::format(std::cout, "HD (hd seed available): %s\n", wallet_instance->IsHDEnabled() ? "yes" : "no");
     tfm::format(std::cout, "Keypool Size: %u\n", wallet_instance->GetKeyPoolSize());

diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py
@@ -98,6 +98,10 @@ def test_tool_wallet_info(self):
         out = textwrap.dedent('''\
             Wallet info
             ===========
+            Name: \
+
+            Format: bdb
+            Descriptors: no
             Encrypted: no
             HD (hd seed available): yes
             Keypool Size: 2
@@ -137,6 +141,10 @@ def test_tool_wallet_info_after_transaction(self):
         out = textwrap.dedent('''\
             Wallet info
             ===========
+            Name: \
+
+            Format: bdb
+            Descriptors: no
             Encrypted: no
             HD (hd seed available): yes
             Keypool Size: 2
@@ -164,6 +172,9 @@ def test_tool_wallet_create_on_existing_wallet(self):
             Topping up keypool...
             Wallet info
             ===========
+            Name: foo
+            Format: bdb
+            Descriptors: no
             Encrypted: no
             HD (hd seed available): yes
             Keypool Size: 2000