Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vub

.coveragerc

@@ -1,8 +1,6 @@
 [run]
 source = pyethereum
 
-To exclude parts of your source from coverage, for example migrations folders:
-
 [report]
 omit =
   */fixtures/*

ethereum/blocks.py

@@ -116,11 +116,14 @@ class Receipt(rlp.Serializable):
     ]
 
     def __init__(self, state_root, gas_used, logs, bloom=None):
+        # does not call super.__init__ as bloom should not be an attribute but a property
         self.state_root = state_root
         self.gas_used = gas_used
         self.logs = logs
         if bloom is not None and bloom != self.bloom:
             raise ValueError("Invalid bloom filter")
+        self._cached_rlp = None
+        self._mutable = True
 
     @property
     def bloom(self):
@@ -426,11 +429,11 @@ def __init__(self, header, transaction_list=[], uncles=[], env=None,
             'difficulty': header.difficulty,
             'uncles_hash': header.uncles_hash,
             'bloom': header.bloom,
-            'header_mutable': self.header.mutable_,
+            'header_mutable': self.header._mutable,
         }
-        assert self.mutable_
-        self.rlp_ = None
-        self.header.mutable_ = True
+        assert self._mutable
+        self._cached_rlp = None
+        self.header._mutable = True
 
         self.transactions = Trie(self.db, trie.BLANK_ROOT)
         self.receipts = Trie(self.db, trie.BLANK_ROOT)
@@ -496,7 +499,7 @@ def must_le(what, a, b):
 
         # from now on, trie roots refer to block instead of header
         header.block = self
-        self.header.mutable_ = original_values['header_mutable']
+        self.header._mutable = original_values['header_mutable']
 
         # Basic consistency verifications
         if not self.check_fields():
@@ -692,8 +695,8 @@ def _get_acct(self, address):
         rlpdata = self.state.get(address)
         if rlpdata != trie.BLANK_NODE:
             acct = rlp.decode(rlpdata, Account, db=self.db)
-            acct.mutable_ = True
-            acct.rlp_ = None
+            acct._mutable = True
+            acct._cached_rlp = None
         else:
             acct = Account.blank_account(self.db)
         return acct

ethereum/tester.py

@@ -270,10 +270,10 @@ def snapshot(self):
 
     def revert(self, data):
         self.block = rlp.decode(data, b.Block, env=self.env)
-        self.block.mutable_ = True
-        self.block.header.mutable_ = True
-        self.block.rlp_ = None
-        self.block.header.rlp_ = None
+        self.block._mutable = True
+        self.block.header._mutable = True
+        self.block._cached_rlp = None
+        self.block.header._cached_rlp = None
 
 # logging
 

setup.py

@@ -32,7 +32,7 @@ def run_tests(self):
 # requirements
 install_requires = set(x.strip() for x in open('requirements.txt'))
 install_requires_replacements = {
-    'https://github.com/ethereum/pyrlp/tarball/develop': 'rlp>=0.3.8',
+    'https://github.com/ethereum/pyrlp/tarball/develop': 'rlp>=0.3.9',
     'https://github.com/ethereum/ethash/tarball/master': 'pyethash'}
 install_requires = [install_requires_replacements.get(r, r) for r in install_requires]
 
@@ -51,6 +51,6 @@ def run_tests(self):
       install_requires=install_requires,
       tests_require=tests_require,
       entry_points=dict(console_scripts=console_scripts),
-      version='1.0.2',
+      version='1.0.3',
       cmdclass=cmdclass
       )