Merge pull request #97 from ethpandaops/default-deneb-genesis

Switch default to deneb genesis and scrap goerli configs

.gitignore

@@ -1,2 +1,3 @@
 data/*
-.idea/
+.idea/
+_snapshot_eth_getBlockByNumber.json

README.md

@@ -41,6 +41,12 @@ transactions. This can be done with the below call for example:
 curl -H "Content-Type: application/json" --data-raw '{ "jsonrpc":"2.0","method":"eth_getBlockByNumber", "params":[ "latest", true ], "id":1 }' localhost:8545
 ```
 
+### Release line explanation
+v1 -> bellatrix genesis state
+v2 -> capella genesis state
+v3 -> deneb genesis state
+verkle-gen -> verkle genesis state
+
 ### Available tools within the image
 
 Name | Source

apps/el-gen/genesis_besu.py

@@ -21,10 +21,6 @@
     with open(mainnet_config_path) as m:
         mainnet_json = json.loads(m.read())
     out = mainnet_json
-elif int(data['chain_id']) == 5:
-    with open(goerli_config_path) as m:
-        goerli_json = json.loads(m.read())
-    out = goerli_json
 elif int(data['chain_id']) == 11155111:
     with open(sepolia_config_path) as m:
         sepolia_json = json.loads(m.read())
@@ -49,7 +45,8 @@
             "londonBlock":0,
             "preMergeForkBlock":0,
             "terminalTotalDifficulty":0,
-            "shanghaiTime": int(data['genesis_timestamp'] + data['genesis_delay']),
+            "shanghaiTime": 0,
+            "cancunTime": 0,
         },
         "alloc": {
             # Allocate 1 wei to all possible pre-compiles.
@@ -152,6 +149,6 @@
         # Add alloc entry to output's alloc field
         out["alloc"][addr] = alloc_entry
 
+out['config']['pragueTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['electra_fork_epoch']) * 32 * int(data['slot_duration_in_seconds']))
 out['config']['ethash'] =  {}
-out['config']['cancunTime'] =  int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds']))
 print(json.dumps(out, indent='  '))

apps/el-gen/genesis_chainspec.py

@@ -21,10 +21,6 @@
     with open(mainnet_config_path) as m:
         mainnet_json = json.loads(m.read())
     out = mainnet_json
-elif int(data['chain_id']) == 5:
-    with open(goerli_config_path) as m:
-        goerli_json = json.loads(m.read())
-    out = goerli_json
 elif int(data['chain_id']) == 11155111:
     with open(sepolia_config_path) as m:
         sepolia_json = json.loads(m.read())
@@ -75,11 +71,16 @@
             "eip3198Transition": "0x0",
             "eip3529Transition": "0x0",
             "eip3541Transition": "0x0",
-            "eip4895TransitionTimestamp": hex(int(data['genesis_timestamp']) + int(data['genesis_delay'])),
-            "eip3855TransitionTimestamp": hex(int(data['genesis_timestamp']) + int(data['genesis_delay'])),
-            "eip3651TransitionTimestamp": hex(int(data['genesis_timestamp']) + int(data['genesis_delay'])),
-            "eip3860TransitionTimestamp": hex(int(data['genesis_timestamp']) + int(data['genesis_delay'])),
-            "terminalTotalDifficulty":"0x0"
+            "eip4895TransitionTimestamp": "0x0",
+            "eip3855TransitionTimestamp": "0x0",
+            "eip3651TransitionTimestamp": "0x0",
+            "eip3860TransitionTimestamp": "0x0",
+            "terminalTotalDifficulty":"0x0",
+            "eip4844TransitionTimestamp": "0x0",
+            "eip4788TransitionTimestamp": "0x0",
+            "eip1153TransitionTimestamp": "0x0",
+            "eip5656TransitionTimestamp": "0x0",
+            "eip6780TransitionTimestamp": "0x0"
         },
         "genesis": {
             "seal": {
@@ -189,10 +190,5 @@
         # Add alloc entry to output's alloc field
         out["accounts"][addr] = alloc_entry
 
-out['params']['eip4844TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
-out['params']['eip4788TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
-out['params']['eip1153TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
-out['params']['eip5656TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
-out['params']['eip6780TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
-
+out['params']['eip6800TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['electra_fork_epoch']) * 32 * int(data['slot_duration_in_seconds'])))
 print(json.dumps(out, indent='  '))

apps/el-gen/genesis_geth.py

@@ -21,10 +21,6 @@
     with open(mainnet_config_path) as m:
         mainnet_json = json.loads(m.read())
     out = mainnet_json
-elif int(data['chain_id']) == 5:
-    with open(goerli_config_path) as m:
-        goerli_json = json.loads(m.read())
-    out = goerli_json
 elif int(data['chain_id']) == 11155111:
     with open(sepolia_config_path) as m:
         sepolia_json = json.loads(m.read())
@@ -50,7 +46,8 @@
             "mergeNetsplitBlock":0,
             "terminalTotalDifficulty":0,
             "terminalTotalDifficultyPassed": True,
-            "shanghaiTime": int(data['genesis_timestamp'] + data['genesis_delay']),
+            "shanghaiTime": 0,
+            "cancunTime": 0,
     },
         "alloc": {
             # Allocate 1 wei to all possible pre-compiles.
@@ -151,6 +148,5 @@
         # Add alloc entry to output's alloc field
         out["alloc"][addr] = alloc_entry
 
-
-out['config']['cancunTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['deneb_fork_epoch']) * 32 * int(data['slot_duration_in_seconds']))
+out['config']['pragueTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['electra_fork_epoch']) * 32 * int(data['slot_duration_in_seconds']))
 print(json.dumps(out, indent='  '))