parse_wshsortedmulti hotfix (#55)

* fix network parsing on mainnet

* add test and bump version number

Co-authored-by: Michael Flaxman <[email protected]>

Author: mflaxman

buidl/hd.py

@@ -775,17 +775,17 @@ def parse_wshsortedmulti(output_record):
             f"Malformed threshold {quorum_m_int}-of-{quorum_n_int} (m must be less than n) in {output_record}"
         )
 
-    # Remove testnet from key records (can just return it once at the parent output record level)
+    # Remove testnet from each key record (can just return it once at the parent output record level)
     # Confirm all key records are on the same network
-    output_is_testnet = key_records[0]["is_testnet"]
-    if not all(x.pop("is_testnet") for x in key_records):
+    networks_list = [x.pop("is_testnet") for x in key_records]
+    if len(set(networks_list)) != 1:
         raise ValueError(f"Multiple (conflicting) networks in pubkeys: {key_records}")
 
     return {
         "quorum_m": quorum_m_int,
         "quorum_n": quorum_n_int,
         "key_records": key_records,
-        "is_testnet": output_is_testnet,
+        "is_testnet": networks_list[0],
     }
 
 

buidl/test/test_hd.py

@@ -661,3 +661,14 @@ def test_valid_p2wsh_sortedmulti(self):
 
         receive_addrs = list(generate_wshsortedmulti_address(**kwargs, is_change=False))
         self.assertEqual(receive_addrs, expected_receive_addrs)
+
+    def test_invalid_p2wsh_sortedmulti(self):
+        # Notice the mix of xpub and tpub
+        output_record = """wsh(sortedmulti(1,[c7d0648a/48h/1h/0h/2h]tpubDEpefcgzY6ZyEV2uF4xcW2z8bZ3DNeWx9h2BcwcX973BHrmkQxJhpAXoSWZeHkmkiTtnUjfERsTDTVCcifW6po3PFR1JRjUUTJHvPpDqJhr/0/*,[12980eed/48h/1h/0h/2h]xpub6ENtkZb1q4JLHBocpPeoQj8xGsQ1Y7Jnkc3Vm43LyPaQ7BfzkDeF3fzxt78SBELXc2PUNHPuVEdTaukwNRqqc8xFKjVXfQ4FpN6eKqe6y9E/0/*))#tatkmj5q"""
+
+        with self.assertRaises(ValueError) as fail:
+            parse_wshsortedmulti(output_record)
+
+        self.assertIn(
+            "Multiple (conflicting) networks in pubkeys: ", str(fail.exception)
+        )

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="buidl",
-    version="0.2.11",
+    version="0.2.12",
     author="Example Author",
     author_email="[email protected]",
     description="An easy-to-use and fully featured bitcoin library written in pure python (no dependencies).",