Skip to content
Snippets Groups Projects
Commit 57c4b409 authored by inso's avatar inso
Browse files

Merge branch 'release_076' into dev

Conflicts:
	src/cutecoin/__init__.py
	src/cutecoin/core/wallet.py
parents 2d2a2c27 57e00bcf
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ Created on 2 déc. 2014 ...@@ -6,6 +6,7 @@ Created on 2 déc. 2014
from . import Document from . import Document
import re import re
import logging
class Transaction(Document): class Transaction(Document):
''' '''
...@@ -40,7 +41,7 @@ SIGNATURE ...@@ -40,7 +41,7 @@ SIGNATURE
''' '''
re_type = re.compile("Type: (Transaction)\n") 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_issuers = re.compile("Issuers:\n")
re_inputs = re.compile("Inputs:\n") re_inputs = re.compile("Inputs:\n")
re_outputs = re.compile("Outputs:\n") re_outputs = re.compile("Outputs:\n")
......
...@@ -83,7 +83,11 @@ class Cache(): ...@@ -83,7 +83,11 @@ class Cache():
req_args={'number': block_number}) req_args={'number': block_number})
signed_raw = "{0}{1}\n".format(block['raw'], signed_raw = "{0}{1}\n".format(block['raw'],
block['signature']) block['signature'])
block_doc = Block.from_signed_raw(signed_raw) try:
block_doc = Block.from_signed_raw(signed_raw)
except:
logging.debug("Error in {0}".format(block_number))
raise
metadata = {'block': block_number, metadata = {'block': block_number,
'time': block_doc.time} 'time': block_doc.time}
for tx in block_doc.transactions: for tx in block_doc.transactions:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment