Make bech32m the default for RPC, opt-in for GUI

src/qt/receivecoinsdialog.cpp

@@ -87,7 +87,7 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
             &QItemSelectionModel::selectionChanged, this,
             &ReceiveCoinsDialog::recentRequestsView_selectionChanged);
 
-        if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
+        if (model->wallet().getDefaultAddressType() == OutputType::BECH32 || model->wallet().getDefaultAddressType() == OutputType::BECH32M) {
             ui->useBech32->setCheckState(Qt::Checked);
         } else {
             ui->useBech32->setCheckState(Qt::Unchecked);
@@ -144,12 +144,14 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
     QString address;
     QString label = ui->reqLabel->text();
     /* Generate new receiving address */
-    OutputType address_type;
+    OutputType address_type = model->wallet().getDefaultAddressType();
+
     if (ui->useBech32->isChecked()) {
-        address_type = OutputType::BECH32;
+        if (address_type != OutputType::BECH32 && address_type != OutputType::BECH32M) {
+            address_type = OutputType::BECH32;
+        }
     } else {
-        address_type = model->wallet().getDefaultAddressType();
-        if (address_type == OutputType::BECH32) {
+        if (address_type == OutputType::BECH32 || address_type == OutputType::BECH32M) {
             address_type = OutputType::P2SH_SEGWIT;
         }
     }

src/qt/test/addressbooktests.cpp

@@ -64,6 +64,7 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
     test.m_node.wallet_client = wallet_client.get();
     node.setContext(&test.m_node);
     std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), "", CreateMockWalletDatabase());
+    wallet->m_default_address_type = OutputType::BECH32;
     wallet->LoadWallet();
     wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
     {

src/qt/test/wallettests.cpp

@@ -142,6 +142,7 @@ void TestGUI(interfaces::Node& node)
     test.m_node.wallet_client = wallet_client.get();
     node.setContext(&test.m_node);
     std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), "", CreateMockWalletDatabase());
+    wallet->m_default_address_type = OutputType::BECH32;
     wallet->LoadWallet();
     wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
     {

src/wallet/rpcdump.cpp

@@ -1555,6 +1555,10 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
                 // Taproot is not active, raise an error
                 throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import tr() descriptor when Taproot is not active");
             }
+            // When importing an active taproot descriptor, change the default address type to bech32m
+            if (active && wallet.m_default_address_type == OutputType::BECH32) {
+                wallet.m_default_address_type = OutputType::BECH32M;
+            }
         }
 
         // If private keys are enabled, check some things.

src/wallet/test/util.cpp

@@ -18,6 +18,7 @@
 std::unique_ptr<CWallet> CreateSyncedWallet(interfaces::Chain& chain, CChain& cchain, const CKey& key)
 {
     auto wallet = std::make_unique<CWallet>(&chain, "", CreateMockWalletDatabase());
+    wallet->m_default_address_type = OutputType::BECH32;
     {
         LOCK2(wallet->cs_wallet, ::cs_main);
         wallet->SetLastBlockProcessed(cchain.Height(), cchain.Tip()->GetBlockHash());

src/wallet/test/wallet_tests.cpp

@@ -275,6 +275,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
         WalletContext context;
         context.args = &gArgs;
         std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(m_node.chain.get(), "", CreateDummyWalletDatabase());
+        wallet->m_default_address_type = OutputType::BECH32;
         {
             auto spk_man = wallet->GetOrCreateLegacyScriptPubKeyMan();
             LOCK2(wallet->cs_wallet, spk_man->cs_KeyStore);

src/wallet/wallet.cpp

@@ -2628,6 +2628,12 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
             return nullptr;
         }
         walletInstance->m_default_address_type = parsed.value();
+    } else {
+        // Set default type to bech32 for legacy wallets and descriptor wallets without taproot
+        auto spk_man = walletInstance->GetScriptPubKeyMan(OutputType::BECH32M, false);
+        if (walletInstance->IsLegacy() || spk_man == nullptr) {
+            walletInstance->m_default_address_type = OutputType::BECH32;
+        }
     }
 
     if (!args.GetArg("-changetype", "").empty()) {

src/wallet/wallet.h

@@ -113,7 +113,7 @@ enum class FeeEstimateMode;
 class ReserveDestination;
 
 //! Default for -addresstype
-constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::BECH32};
+constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::BECH32M};
 
 static constexpr uint64_t KNOWN_WALLET_FLAGS =
         WALLET_FLAG_AVOID_REUSE