Merge commit 'efb0bae'

luke-jr · Jun 2, 2014 · 9294ed0 · 9294ed0
2 parents 0fefe1e + efb0bae
commit 9294ed0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bitcoin/script.py b/bitcoin/script.py
@@ -38,7 +38,11 @@ def toAddress(cls, addr):
 		if not d:
 			raise ValueError('invalid address')
 		(ver, pubkeyhash) = d
-		return b'\x76\xa9\x14' + pubkeyhash + b'\x88\xac'
+		if ver == 0 or ver == 111:
+			return b'\x76\xa9\x14' + pubkeyhash + b'\x88\xac'
+		elif ver == 5 or ver == 196:
+			return b'\xa9\x14' + pubkeyhash + '\x87'
+		raise ValueError('invalid address version')
 
 def countSigOps(s):
 	# FIXME: don't count data as ops