Add P2SHBitcoinAddress.from_redeemScript()

petertodd · petertodd · commit 8e47689f7213 · 2014-09-19T18:49:42.000-04:00
diff --git a/bitcoin/tests/test_wallet.py b/bitcoin/tests/test_wallet.py
@@ -114,6 +114,11 @@ def T(str_addr, expected_scriptPubKey_hexbytes):
         T('1111111111111111111114oLvT2',
           '76a914000000000000000000000000000000000000000088ac')
 
+class Test_P2SHBitcoinAddress(unittest.TestCase):
+    def test_from_redeemScript(self):
+        addr = P2SHBitcoinAddress.from_redeemScript(CScript())
+        self.assertEqual(str(addr), '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
+
 class Test_P2PKHBitcoinAddress(unittest.TestCase):
     def test_from_non_canonical_scriptPubKey(self):
         def T(hex_scriptpubkey, expected_str_address):
diff --git a/bitcoin/wallet.py b/bitcoin/wallet.py
@@ -87,6 +87,14 @@ def from_bytes(cls, data, nVersion=None):
 
         return super(P2SHBitcoinAddress, cls).from_bytes(data, nVersion)
 
+    @classmethod
+    def from_redeemScript(cls, redeemScript):
+        """Convert a redeemScript to a P2SH address
+
+        Convenience function: equivalent to P2SHBitcoinAddress.from_scriptPubKey(redeemScript.to_p2sh_scriptPubKey())
+        """
+        return cls.from_scriptPubKey(redeemScript.to_p2sh_scriptPubKey())
+
     @classmethod
     def from_scriptPubKey(cls, scriptPubKey):
         """Convert a scriptPubKey to a P2SH address
