signed blocks related crashes fixed hopefully

master
Kevin Froman 2018-04-26 20:37:48 -05:00
parent ac7bb63225
commit 388b1b6e1f
1 changed files with 8 additions and 2 deletions

View File

@ -208,7 +208,8 @@ class OnionrCommunicate:
if self._utils.validateHash(currentDB): if self._utils.validateHash(currentDB):
self._core.setAddressInfo(i, "DBHash", currentDB) self._core.setAddressInfo(i, "DBHash", currentDB)
if len(blocks.strip()) != 0: if len(blocks.strip()) != 0:
logger.debug('BLOCKS:' + blocks) pass
#logger.debug('BLOCKS:' + blocks)
blockList = blocks.split('\n') blockList = blocks.split('\n')
for i in blockList: for i in blockList:
if len(i.strip()) == 0: if len(i.strip()) == 0:
@ -263,7 +264,12 @@ class OnionrCommunicate:
blockContent = self._core.getData(i) blockContent = self._core.getData(i)
try: try:
#blockMetadata = json.loads(self._core.getData(i)).split('}')[0] + '}' #blockMetadata = json.loads(self._core.getData(i)).split('}')[0] + '}'
blockMetadata = json.loads(self._core.getData(i).split(b'}')[0] + '}') blockMetadata = self._core.getData(i).split(b'}')[0]
try:
blockMetadata = blockMetadata.decode()
except AttributeError:
pass
blockMetadata = json.loads(blockMetadata + '}')
try: try:
blockMetadata['sig'] blockMetadata['sig']
blockMetadata['id'] blockMetadata['id']