Merge branch 'develop' of https://github.com/CounterpartyXCP/counterb…

…lockd into develop
CounterpartyXCP · Jan 3, 2015 · 90cc76e · 90cc76e
2 parents e2243f3 + 918fed2
commit 90cc76e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/blockchain.py b/lib/blockchain.py
@@ -353,8 +353,10 @@ def scriptpubkey_to_canonical_address(scriptpubkey):
         signatures_required = asm[0]
         signatures_possible = len(asm) - 3
         return "_".join([str(signatures_required)] + sorted(scriptpubkey['addresses']) + [str(signatures_possible)])
-    else:
+    elif 'addresses' in scriptpubkey:
         return scriptpubkey['addresses'][0]
+    else:
+        return None
 
 
 def get_unspent_txouts(source, return_confirmed=False):