Fix mainnet genesis configuration (#1434)

* Update mainnet genesis constants

* update gas estimations to account for new genesis difficulty

* more test updates to account for genesis constants change

* fix gas limit for benchmark tests

Author: pipermerriam

docs/guides/eth/understanding_the_mining_process.rst

@@ -47,16 +47,19 @@ cookbook.
   from eth.db.atomic import AtomicDB
   from eth.chains.mainnet import MAINNET_GENESIS_HEADER
 
+  # increase the gas limit
+  genesis_header = MAINNET_GENESIS_HEADER.copy(gas_limit=3141592)
+
   # initialize a fresh chain
-  chain = chain_class.from_genesis_header(AtomicDB(), MAINNET_GENESIS_HEADER)
+  chain = chain_class.from_genesis_header(AtomicDB(), genesis_header)
 
 Since we decided to not add any transactions to our block let's just call
 :func:`~~eth.chains.base.MiningChain.mine_block` and see what happens.
 
 ::
 
   # initialize a fresh chain
-  chain = chain_class.from_genesis_header(AtomicDB(), MAINNET_GENESIS_HEADER)
+  chain = chain_class.from_genesis_header(AtomicDB(), genesis_header)
 
   chain.mine_block()
 
@@ -150,7 +153,7 @@ Let's start off by defining the ``GENESIS_PARAMS``.
         'receipt_root': constants.BLANK_ROOT_HASH,
         'difficulty': 1,
         'block_number': constants.GENESIS_BLOCK_NUMBER,
-        'gas_limit': constants.GENESIS_GAS_LIMIT,
+        'gas_limit': 3141592,
         'timestamp': 1514764800,
         'extra_data': constants.GENESIS_EXTRA_DATA,
         'nonce': constants.GENESIS_NONCE
@@ -330,7 +333,7 @@ zero value transfer transaction.
   ...     'receipt_root': constants.BLANK_ROOT_HASH,
   ...     'difficulty': 1,
   ...     'block_number': constants.GENESIS_BLOCK_NUMBER,
-  ...     'gas_limit': constants.GENESIS_GAS_LIMIT,
+  ...     'gas_limit': 3141592,
   ...     'timestamp': 1514764800,
   ...     'extra_data': constants.GENESIS_EXTRA_DATA,
   ...     'nonce': constants.GENESIS_NONCE

eth/chains/mainnet/__init__.py

@@ -14,7 +14,7 @@
     SPURIOUS_DRAGON_MAINNET_BLOCK,
     DAO_FORK_MAINNET_EXTRA_DATA,
 )
-from eth import constants
+from eth import constants as eth_constants
 
 from eth.chains.base import (
     Chain,
@@ -91,18 +91,18 @@ class MainnetChain(BaseMainnetChain, Chain):
 
 
 MAINNET_GENESIS_HEADER = BlockHeader(
-    difficulty=17179869184,
+    difficulty=eth_constants.GENESIS_DIFFICULTY,
     extra_data=decode_hex("0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"),
-    gas_limit=5000,
+    gas_limit=eth_constants.GENESIS_GAS_LIMIT,
     gas_used=0,
     bloom=0,
-    mix_hash=constants.ZERO_HASH32,
-    nonce=constants.GENESIS_NONCE,
+    mix_hash=eth_constants.ZERO_HASH32,
+    nonce=eth_constants.GENESIS_NONCE,
     block_number=0,
-    parent_hash=constants.ZERO_HASH32,
-    receipt_root=constants.BLANK_ROOT_HASH,
-    uncles_hash=constants.EMPTY_UNCLE_HASH,
+    parent_hash=eth_constants.ZERO_HASH32,
+    receipt_root=eth_constants.BLANK_ROOT_HASH,
+    uncles_hash=eth_constants.EMPTY_UNCLE_HASH,
     state_root=decode_hex("0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"),
     timestamp=0,
-    transaction_root=constants.BLANK_ROOT_HASH,
+    transaction_root=eth_constants.BLANK_ROOT_HASH,
 )

eth/constants.py

@@ -152,8 +152,8 @@
 # Genesis Data
 #
 GENESIS_BLOCK_NUMBER = 0
-GENESIS_DIFFICULTY = 131072
-GENESIS_GAS_LIMIT = 3141592
+GENESIS_DIFFICULTY = 17179869184
+GENESIS_GAS_LIMIT = 5000
 GENESIS_PARENT_HASH = ZERO_HASH32
 GENESIS_COINBASE = ZERO_ADDRESS
 GENESIS_NONCE = b'\x00\x00\x00\x00\x00\x00\x00B'  # 0x42 encoded as big-endian-integer

scripts/benchmark/utils/chain_plumbing.py

@@ -69,7 +69,7 @@
     'receipt_root': constants.BLANK_ROOT_HASH,
     'difficulty': 1,
     'block_number': constants.GENESIS_BLOCK_NUMBER,
-    'gas_limit': constants.GENESIS_GAS_LIMIT,
+    'gas_limit': 3141592,
     'extra_data': constants.GENESIS_EXTRA_DATA,
     'nonce': constants.GENESIS_NONCE
 }

tests/conftest.py

@@ -176,7 +176,7 @@ def chain_without_block_validation(
     genesis_params = {
         'block_number': constants.GENESIS_BLOCK_NUMBER,
         'difficulty': constants.GENESIS_DIFFICULTY,
-        'gas_limit': constants.GENESIS_GAS_LIMIT,
+        'gas_limit': 3141592,
         'parent_hash': constants.GENESIS_PARENT_HASH,
         'coinbase': constants.GENESIS_COINBASE,
         'nonce': constants.GENESIS_NONCE,

tests/core/chain-object/test_gas_estimation.py

@@ -30,11 +30,11 @@ def chain(chain_without_block_validation):
         (b'\xff' * 10, None, ADDR_1010, True, 21680),
         (b'\xff' * 10, None, ADDR_1010, False, 21680),
         # sha3 precompile
-        (b'\xff' * 32, None, ADDRESS_2, True, 35381),
-        (b'\xff' * 32, None, ADDRESS_2, False, 35369),
-        (b'\xff' * 320, None, ADDRESS_2, True, 54888),
+        (b'\xff' * 32, None, ADDRESS_2, True, 35333),
+        (b'\xff' * 32, None, ADDRESS_2, False, 35345),
+        (b'\xff' * 320, None, ADDRESS_2, True, 54840),
         # 1000_tolerance binary search
-        (b'\xff' * 32, binary_gas_search_1000_tolerance, ADDRESS_2, True, 23938),
+        (b'\xff' * 32, binary_gas_search_1000_tolerance, ADDRESS_2, True, 23935),
     ),
     ids=[
         'simple default pending',

tests/trinity/core/json-rpc/test_ipc.py

@@ -265,7 +265,7 @@ async def test_network_id_ipc_request(
             build_request('eth_estimateGas', params=[{
                 'data': '0x3838533838f3',
             }, 'latest']),
-            {'result': hex(65483), 'id': 3, 'jsonrpc': '2.0'},
+            {'result': hex(65459), 'id': 3, 'jsonrpc': '2.0'},
         ),
         (
             # specifying v,r,s is invalid

tests/trinity/core/p2p-proto/test_sync.py

@@ -193,7 +193,7 @@ def chaindb_fresh():
     'bloom': 0,
     'difficulty': 5,
     'block_number': constants.GENESIS_BLOCK_NUMBER,
-    'gas_limit': constants.GENESIS_GAS_LIMIT,
+    'gas_limit': 3141592,
     'gas_used': 0,
     'timestamp': 1514764800,
     'extra_data': constants.GENESIS_EXTRA_DATA,