Merge pull request #106 from ethpandaops/bbusa/fix-minimal-forktime-calc

fix: minimal forktime calculation
ethpandaops · Mar 28, 2024 · 29af0d6 · 29af0d6
2 parents 1824e10 + a0b611a
commit 29af0d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/apps/el-gen/genesis_besu.py b/apps/el-gen/genesis_besu.py
@@ -149,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']['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,5 @@
         # 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 * int(data['slot_duration_in_seconds'])))
+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,5 @@
         # 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']['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='  '))
diff --git a/config-example/el/genesis-config.yaml b/config-example/el/genesis-config.yaml
@@ -1,3 +1,4 @@
+preset_base: ${PRESET_BASE}
 chain_id: ${CHAIN_ID}
 deposit_contract_address: "${DEPOSIT_CONTRACT_ADDRESS}"
 mnemonic: ${EL_AND_CL_MNEMONIC}