Merge branch 'release_076' into dev

Conflicts:
	src/cutecoin/__init__.py
	src/cutecoin/core/wallet.py

lib/ucoinpy/documents/transaction.py

@@ -6,6 +6,7 @@ Created on 2 déc. 2014
 
 from . import Document
 import re
+import logging
 
 class Transaction(Document):
     '''
@@ -40,7 +41,7 @@ SIGNATURE
     '''
 
     re_type = re.compile("Type: (Transaction)\n")
-    re_header = re.compile("TX:([0-9])+:([0-9])+:([0-9])+:([0-9])+:(0|1)\n")
+    re_header = re.compile("TX:([0-9]+):([0-9]+):([0-9]+):([0-9]+):(0|1)\n")
     re_issuers = re.compile("Issuers:\n")
     re_inputs = re.compile("Inputs:\n")
     re_outputs = re.compile("Outputs:\n")

src/cutecoin/core/wallet.py

@@ -83,7 +83,11 @@ class Cache():
                                   req_args={'number': block_number})
                 signed_raw = "{0}{1}\n".format(block['raw'],
                                                block['signature'])
+                try:
                     block_doc = Block.from_signed_raw(signed_raw)
+                except:
+                    logging.debug("Error in {0}".format(block_number))
+                    raise
                 metadata = {'block': block_number,
                             'time': block_doc.time}
                 for tx in block_doc.transactions: