Merge pull request #105 from cerc-io/optional-electra

Only set pragueTime if electra_fork_epoch is set
ethpandaops · Apr 4, 2024 · e19666e · e19666e
2 parents f31de0b + c035a5c
commit e19666e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/apps/el-gen/genesis_besu.py b/apps/el-gen/genesis_besu.py
@@ -149,6 +149,11 @@
         # 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 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds']))
+if 'electra_fork_epoch' in data:
+    out['config']['pragueTime'] = \
+        int(data['genesis_timestamp']) + \
+        int(data['genesis_delay']) + \
+        (int(data['electra_fork_epoch']) * ( 32 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds']))
+
 out['config']['ethash'] =  {}
 print(json.dumps(out, indent='  '))
diff --git a/apps/el-gen/genesis_chainspec.py b/apps/el-gen/genesis_chainspec.py
@@ -190,5 +190,11 @@
         # Add alloc entry to output's alloc field
         out["accounts"][addr] = alloc_entry
 
-out['params']['eip6800TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['electra_fork_epoch']) * ( 32 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds'])))
+if 'electra_fork_epoch' in data:
+    out['params']['eip6800TransitionTimestamp']= hex(
+        int(data['genesis_timestamp']) +
+        int(data['genesis_delay']) +
+        int(data['electra_fork_epoch']) * ( 32 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds'])
+    )
+
 print(json.dumps(out, indent='  '))
diff --git a/apps/el-gen/genesis_geth.py b/apps/el-gen/genesis_geth.py
@@ -148,5 +148,10 @@
         # 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 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds']))
+if 'electra_fork_epoch' in data:
+    out['config']['pragueTime'] = \
+        int(data['genesis_timestamp']) + \
+        int(data['genesis_delay']) + \
+        int(data['electra_fork_epoch']) * ( 32 if data['preset_base']=='mainnet' else 8 ) * int(data['slot_duration_in_seconds'])
+
 print(json.dumps(out, indent='  '))