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

Author: vbuterin

README.md

@@ -238,6 +238,6 @@ open('output.json', 'w').write(json.dumps(post, indent=4))
 
 To make a test filler file instead, do `post = t.mk_state_test_postfill(c, pre, True)`.
 
-## Licence
+## License
 
-See LICENCE
+See [LICENSE](LICENSE)

README.rst

@@ -365,7 +365,7 @@ To make your own state tests, use the tester module as follows:
 To make a test filler file instead, do
 ``post = t.mk_state_test_postfill(c, pre, True)``.
 
-Licence
+License
 -------
 
-See LICENCE
+See `LICENSE <LICENSE>`_

ethereum/config.py

@@ -27,6 +27,7 @@
     #                   (block.gas_used * 6 / 5) / 1024
     GASLIMIT_EMA_FACTOR=1024,
     GASLIMIT_ADJMAX_FACTOR=1024,
+    BLOCK_GAS_LIMIT=4712388,
     BLKLIM_FACTOR_NOM=3,
     BLKLIM_FACTOR_DEN=2,
     # Network ID

ethereum/genesis_helpers.py

@@ -107,11 +107,12 @@ def mk_genesis_block(env, **kwargs):
 
 
 def mk_basic_state(alloc, header=None, env=None, executing_on_head=False):
-    state = State(env=env or Env(), executing_on_head=executing_on_head)
+    env = env or Env()
+    state = State(env=env, executing_on_head=executing_on_head)
     if not header:
         header = {
-            "number": 0, "gas_limit": 4712388, "gas_used": 0,
-            "timestamp": 1467446877, "difficulty": 1,
+            "number": 0, "gas_limit": env.config['BLOCK_GAS_LIMIT'],
+            "gas_used": 0, "timestamp": 1467446877, "difficulty": 1,
             "uncles_hash": '0x'+encode_hex(BLANK_UNCLES_HASH)
         }
     h = BlockHeader(number=parse_as_int(header['number']),

ethereum/pow/chain.py

@@ -60,7 +60,7 @@ def __init__(self, genesis=None, env=None, \
             print('Initializing chain from new state based on alloc')
             self.state = mk_basic_state(genesis, {
                 "number": kwargs.get('number', 0),
-                "gas_limit": kwargs.get('gas_limit', 4712388),
+                "gas_limit": kwargs.get('gas_limit', self.env.config['BLOCK_GAS_LIMIT']),
                 "gas_used": kwargs.get('gas_used', 0),
                 "timestamp": kwargs.get('timestamp', 1467446877),
                 "difficulty": kwargs.get('difficulty', 2**25),