Merge 22025d06e5 into merged_master (Bitcoin PR bitcoin/bitcoin#28605)

test/functional/feature_assumeutxo.py

@@ -112,7 +112,7 @@ class AssumeutxoTest(BitcoinTestFramework):
     def test_invalid_chainstate_scenarios(self):
         self.log.info("Test different scenarios of invalid snapshot chainstate in datadir")
 
-        self.log.info("  - snapshot chainstate refering to a block that is not in the assumeutxo parameters")
+        self.log.info("  - snapshot chainstate referring to a block that is not in the assumeutxo parameters")
         self.stop_node(0)
         chainstate_snapshot_path = self.nodes[0].chain_path / "chainstate_snapshot"
         chainstate_snapshot_path.mkdir()

test/functional/test_framework/blockfilter.py

@@ -29,7 +29,7 @@ def bip158_basic_element_hash(script_pub_key, N, block_hash):
 
 
 def bip158_relevant_scriptpubkeys(node, block_hash):
-    """ Determines the basic filter relvant scriptPubKeys as defined in BIP158:
+    """ Determines the basic filter relevant scriptPubKeys as defined in BIP158:
 
     'A basic filter MUST contain exactly the following items for each transaction in a block:
        - The previous output script (the script being spent) for each input, except for

test/functional/wallet_avoidreuse.py

@@ -257,7 +257,7 @@ class AvoidReuseTest(BitcoinTestFramework):
 
         if not self.options.descriptors:
             # For the second send, we transmute it to a related single-key address
-            # to make sure it's also detected as re-use
+            # to make sure it's also detected as reuse
             validate = self.nodes[1].validateaddress(fundaddr) # ELEMENTS
             fund_spk = validate["scriptPubKey"]
             fund_decoded = self.nodes[0].decodescript(fund_spk)

test/lint/spelling.ignore-words.txt

@@ -7,6 +7,7 @@ cachable
 clen
 covert
 crypted
+debbugs
 fo
 fpr
 hights