Merge pull request #433 from cdetrio/develop

fix genesis timestamp

thanks!

Author: konradkonrad

ethereum/blocks.py

@@ -1455,7 +1455,7 @@ def genesis(env, **kwargs):
         number=0,
         gas_limit=kwargs.get('gas_limit', env.config['GENESIS_GAS_LIMIT']),
         gas_used=0,
-        timestamp=kwargs.get('timestamp', 0),
+        timestamp=kwargs.get('timestamp', env.config['GENESIS_TIMESTAMP']),
         extra_data=kwargs.get('extra_data', env.config['GENESIS_EXTRA_DATA']),
         mixhash=kwargs.get('mixhash', env.config['GENESIS_MIXHASH']),
         nonce=kwargs.get('nonce', env.config['GENESIS_NONCE']),