backport: Merge bitcoin#23750, 23496, 24434, 23136, 23725

src/net.cpp

@@ -4198,7 +4198,7 @@ bool CConnman::Start(CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_met
     if (connOptions.m_use_addrman_outgoing && !connOptions.m_specified_outgoing.empty()) {
         if (clientInterface) {
             clientInterface->ThreadSafeMessageBox(
-                _("Cannot provide specific connections and have addrman find outgoing connections at the same."),
+                _("Cannot provide specific connections and have addrman find outgoing connections at the same time."),
                 "", CClientUIInterface::MSG_ERROR);
         }
         return false;

src/wallet/rpcdump.cpp

@@ -1802,7 +1802,7 @@ RPCHelpMan importdescriptors() {
                                         /* oneline_description */ "", {"timestamp | \"now\"", "integer / string"}
                                     },
                                     {"internal", RPCArg::Type::BOOL, RPCArg::Default{false}, "Whether matching outputs should be treated as not incoming payments (e.g. change)"},
-                                    {"label", RPCArg::Type::STR, RPCArg::Default{""}, "Label to assign to the address, only allowed with internal=false"},
+                                    {"label", RPCArg::Type::STR, RPCArg::Default{""}, "Label to assign to the address, only allowed with internal=false. Disabled for ranged descriptors"},
                                 },
                             },
                         },

test/functional/feature_coinstatsindex.py

@@ -41,7 +41,9 @@ def set_test_params(self):
         self.num_nodes = 2
         self.supports_cli = False
         self.extra_args = [
-            [],
+            # Explicitly set the output type in order to have consistent tx vsize / fees
+            # for both legacy and descriptor wallets (disables the change address type detection algorithm)
+            ["-addresstype=bech32", "-changetype=bech32"],
             ["-coinstatsindex"]
         ]
 

test/functional/test_framework/util.py

@@ -36,13 +36,14 @@ def assert_approx(v, vexp, vspan=0.00001):
         raise AssertionError("%s > [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
 
 
-def assert_fee_amount(fee, tx_size, fee_per_kB):
-    """Assert the fee was in range"""
-    target_fee = round(tx_size * fee_per_kB / 1000, 8)
+def assert_fee_amount(fee, tx_size, feerate_DASH_kvB):
+    """Assert the fee is in range."""
+    feerate_DASH_vB = feerate_DASH_kvB / 1000
+    target_fee = satoshi_round(tx_size * feerate_DASH_vB)
     if fee < target_fee:
         raise AssertionError("Fee of %s DASH too low! (Should be %s DASH)" % (str(fee), str(target_fee)))
     # allow the wallet's estimation to be at most 2 bytes off
-    if fee > (tx_size + 2) * fee_per_kB / 1000:
+    if fee > (tx_size + 2) * feerate_DASH_vB / 1000:
         raise AssertionError("Fee of %s DASH too high! (Should be %s DASH)" % (str(fee), str(target_fee)))
 
 

test/functional/test_runner.py

@@ -359,7 +359,8 @@
     'rpc_scantxoutset.py',
     'feature_logging.py',
     'feature_anchors.py',
-    'feature_coinstatsindex.py',
+    'feature_coinstatsindex.py --legacy-wallet',
+    'feature_coinstatsindex.py --descriptors',
     'wallet_orphanedreward.py',
     'p2p_node_network_limited.py',
     'p2p_node_network_limited.py --v2transport',