tmp

p2pool · Mar 19, 2014 · 9a73260 · 9a73260
1 parent 35f06e8
commit 9a73260
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/p2pool/bitcoin/data.py b/p2pool/bitcoin/data.py
@@ -258,9 +258,12 @@ def pubkey_to_address(pubkey, net):
 
 def address_to_pubkey_hash(address, net):
     x = human_address_type.unpack(base58_decode(address))
-    if x['version'] != net.ADDRESS_VERSION:
-        raise ValueError('address not for this net!')
-    return x['pubkey_hash']
+    if x['version'] == net.ADDRESS_VERSION:
+        return x['pubkey_hash']
+    elif x['version'] == net.ADDRESS_VERSION + 5:
+        return x['pubkey_hash'] # XXX script hash - handle specially
+    else:
+        raise ValueError('address not for this net! %r' % (address,))
 
 # transactions