Added Block.get_receipts() and formatting

Author: jnnk

ethereum/blocks.py

@@ -1,7 +1,9 @@
 import time
+from itertools import count
+import sys
 import rlp
 from rlp.sedes import big_endian_int, Binary, binary, CountableList
-from rlp.utils import decode_hex, encode_hex, str_to_bytes
+from rlp.utils import decode_hex, encode_hex
 from ethereum import trie
 from ethereum.trie import Trie
 from ethereum.securetrie import SecureTrie
@@ -10,7 +12,6 @@
 from ethereum import processblock
 from ethereum.transactions import Transaction
 from ethereum import bloom
-import sys
 
 if sys.version_info.major == 2:
     from repoze.lru import lru_cache
@@ -95,21 +96,26 @@ def calc_difficulty(parent, timestamp):
 # Auxiliary value for must_* error messages
 aux = [None]
 
+
 def set_aux(auxval):
     aux[0] = auxval
 
+
 def must(what, f, symb, a, b):
     if not f(a, b):
         if aux[0]:
             sys.stderr.write('%r' % aux[0])
         raise VerificationFailed(what, a, symb, b)
 
+
 def must_equal(what, a, b):
     return must(what, lambda x, y: x == y, "==", a, b)
 
+
 def must_ge(what, a, b):
     return must(what, lambda x, y: x >= y, ">=", a, b)
 
+
 def must_le(what, a, b):
     return must(what, lambda x, y: x <= y, "<=", a, b)
 
@@ -390,6 +396,7 @@ def decorator(cls):
             def make_gs_etter(source, attribute):
                 def getter(self):
                     return getattr(getattr(self, source), attribute)
+
                 def setter(self, value):
                     setattr(getattr(self, source), attribute, value)
                 return getter, setter
@@ -403,7 +410,7 @@ def setter(self, value):
 
 
 @mirror_from('header', set(field for field, _ in BlockHeader.fields) -
-                       set(['state_root', 'receipts_root', 'tx_list_root']),
+             set(['state_root', 'receipts_root', 'tx_list_root']),
              only_getters=False)
 class Block(rlp.Serializable):
     """A block.
@@ -430,7 +437,6 @@ class Block(rlp.Serializable):
         ('uncles', CountableList(BlockHeader))
     ]
 
-
     def __init__(self, header, transaction_list=[], uncles=[], db=None,
                  parent=None, making=False):
         if db is None:
@@ -522,21 +528,17 @@ def __init__(self, header, transaction_list=[], uncles=[], db=None,
         if parent:
             must_equal('prev_hash', self.prevhash, parent.hash)
             must_ge('gas_limit', self.gas_limit,
-                    parent.gas_limit * (GASLIMIT_ADJMAX_FACTOR - 1) //
-                            GASLIMIT_ADJMAX_FACTOR)
+                    parent.gas_limit * (GASLIMIT_ADJMAX_FACTOR - 1) // GASLIMIT_ADJMAX_FACTOR)
             must_le('gas_limit', self.gas_limit,
-                    parent.gas_limit * (GASLIMIT_ADJMAX_FACTOR + 1) //
-                            GASLIMIT_ADJMAX_FACTOR)
+                    parent.gas_limit * (GASLIMIT_ADJMAX_FACTOR + 1) // GASLIMIT_ADJMAX_FACTOR)
         must_equal('gas_used', original_values['gas_used'], self.gas_used)
         must_equal('timestamp', self.timestamp, original_values['timestamp'])
         must_equal('difficulty', self.difficulty, original_values['difficulty'])
         must_equal('uncles_hash', utils.sha3(rlp.encode(uncles)), original_values['uncles_hash'])
         assert header.block is None
         must_equal('state_root', self.state.root_hash, header.state_root)
-        must_equal('tx_list_root', self.transactions.root_hash,
-                    header.tx_list_root)
-        must_equal('receipts_root', self.receipts.root_hash,
-                    header.receipts_root)
+        must_equal('tx_list_root', self.transactions.root_hash, header.tx_list_root)
+        must_equal('receipts_root', self.receipts.root_hash, header.receipts_root)
         must_equal('bloom', self.bloom, original_values['bloom'])
         set_aux(None)
 
@@ -553,8 +555,7 @@ def __init__(self, header, transaction_list=[], uncles=[], db=None,
         if not self.state.root_hash_valid():
             raise ValueError("State Merkle root of block %r not found in "
                              "database" % self)
-        if (not self.is_genesis() and self.nonce and
-                                  not self.header.check_pow()):
+        if (not self.is_genesis() and self.nonce and not self.header.check_pow()):
             raise ValueError("PoW check failed")
         self.db.put('validated:'+self.hash, '1')
 
@@ -826,7 +827,20 @@ def get_receipt(self, num):
         :returns: an instance of :class:`Receipt`
         """
         index = rlp.encode(num)
-        return rlp.decode(self.receipts.get(index), Receipt)
+        receipt = self.receipts.get(index)
+        if receipt == trie.BLANK_NODE:
+            raise IndexError('Receipt does not exist')
+        else:
+            return rlp.decode(receipt, Receipt)
+
+    def get_receipts(self):
+        """Build a list of all receipts in this block."""
+        receipts = []
+        for i in count():
+            try:
+                receipts.append(self.get_receipt(i))
+            except IndexError:
+                return receipts
 
     def get_nonce(self, address):
         """Get the nonce of an account.
@@ -1171,8 +1185,7 @@ def to_dict(self, with_state=False, full_transactions=False,
         if with_state:
             state_dump = {}
             for address, v in self.state.to_dict().items():
-                state_dump[encode_hex(address)] = \
-                    self.account_to_dict(address, with_storage_roots)
+                state_dump[encode_hex(address)] = self.account_to_dict(address, with_storage_roots)
             b['state'] = state_dump
         if with_uncles:
             b['uncles'] = [self.__class__.deserialize_header(u)
@@ -1236,8 +1249,7 @@ def chain_difficulty(self):
 
     def __eq__(self, other):
         """Two blocks are equal iff they have the same hash."""
-        return isinstance(other, (Block, CachedBlock)) and  \
-               self.hash == other.hash
+        return isinstance(other, (Block, CachedBlock)) and self.hash == other.hash
 
     def __hash__(self):
         return utils.big_endian_to_int(self.hash)
@@ -1257,10 +1269,12 @@ def __repr__(self):
     def __structlog__(self):
         return encode_hex(self.hash)
 
+
 @lru_cache(5)
 def get_cache_memoized(seedhash, size):
     return mkcache(size, seedhash)
 
+
 # Gas limit adjustment algo
 def calc_gaslimit(parent):
     decay = parent.gas_limit // GASLIMIT_EMA_FACTOR
@@ -1370,9 +1384,8 @@ def genesis(db, start_alloc=GENESIS_INITIAL_ALLOC, difficulty=GENESIS_DIFFICULTY
             block.set_nonce(addr, int(data['nonce']))
         if 'storage' in data:
             for k, v in data['storage'].items():
-                block.set_storage_data(addr,
-                                     utils.big_endian_to_int(decode_hex(k[2:])),
-                                     utils.big_endian_to_int(decode_hex(v[2:])))
+                block.set_storage_data(addr, utils.big_endian_to_int(decode_hex(k[2:])),
+                                       utils.big_endian_to_int(decode_hex(v[2:])))
     block.commit_state()
     block.state.db.commit()
     # genesis block has predefined state root (so no additional finalization