From c9a08658b99cd6d9e901f63d2c9b128c44e1fbdb Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Thu, 21 Jun 2018 09:18:49 +0200
Subject: [PATCH] At some checks in block and blockchain.stream
---
beem/block.py | 7 ++++++-
beem/blockchain.py | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/beem/block.py b/beem/block.py
index 0cdedc61..a17bc9f3 100644
--- a/beem/block.py
+++ b/beem/block.py
@@ -157,7 +157,12 @@ class Block(BlockchainObject):
@property
def block_num(self):
"""Returns the block number"""
- return int(self['block_id'][:8], base=16)
+ if "block_id" in self:
+ return int(self['block_id'][:8], base=16)
+ elif "id" in self:
+ return self['id']
+ else:
+ return self.identifier
def time(self):
"""Return a datatime instance for the timestamp of this block"""
diff --git a/beem/blockchain.py b/beem/blockchain.py
index cdb89250..39558930 100644
--- a/beem/blockchain.py
+++ b/beem/blockchain.py
@@ -689,6 +689,8 @@ class Blockchain(object):
_id = ""
timestamp = ""
for trx_nr in range(len(trx)):
+ if "operations" not in trx[trx_nr]:
+ continue
for event in trx[trx_nr]["operations"]:
if isinstance(event, list):
op_type, op = event
--
GitLab