updating scripts for capella/shanghai

ethpandaops · Dec 16, 2022 · 0dea85b · 0dea85b
1 parent abc93fd
commit 0dea85b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/apps/el-gen/genesis_besu.py b/apps/el-gen/genesis_besu.py
@@ -26,7 +26,8 @@
         "berlinBlock":0,
         "londonBlock":0,
         "preMergeForkBlock":0,
-        "terminalTotalDifficulty":0
+        "terminalTotalDifficulty":0,
+        "shanghaiTime": int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12),
     },
     "alloc": {
         # Allocate 1 wei to all possible pre-compiles.

diff --git a/apps/el-gen/genesis_chainspec.py b/apps/el-gen/genesis_chainspec.py
@@ -50,7 +50,8 @@
         "eip1559Transition": "0x0",
         "eip3198Transition": "0x0",
         "eip3529Transition": "0x0",
-        "eip3541Transition": "0x0"
+        "eip3541Transition": "0x0",
+        "eip4895TransitionTimestamp": hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12)),
     },
     "genesis": {
         "seal": {

diff --git a/apps/el-gen/genesis_geth.py b/apps/el-gen/genesis_geth.py
@@ -26,7 +26,8 @@
         "berlinBlock":0,
         "londonBlock":0,
         "mergeForkBlock":0,
-        "terminalTotalDifficulty":0
+        "terminalTotalDifficulty":0,
+        "shanghaiTime": int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12),
     },
     "alloc": {
         # Allocate 1 wei to all possible pre-compiles.

diff --git a/config-example/el/genesis-config.yaml b/config-example/el/genesis-config.yaml
@@ -10,3 +10,5 @@ el_premine:
   "m/44'/60'/0'/0/5": 1000000000ETH
 el_premine_addrs: {}
 genesis_timestamp: ${GENESIS_TIMESTAMP}
+genesis_delay: ${GENESIS_DELAY}
+capella_fork_epoch: ${CAPELLA_FORK_EPOCH}
diff --git a/config-example/values.env b/config-example/values.env
@@ -8,9 +8,9 @@ export GENESIS_FORK_VERSION="0x10000040"
 export ALTAIR_FORK_VERSION="0x20000040"
 export BELLATRIX_FORK_VERSION="0x30000040"
 export CAPELLA_FORK_VERSION="0x40000040"
-export CAPELLA_FORK_EPOCH="18446744073709551615"
+export CAPELLA_FORK_EPOCH="5"
 export WITHDRAWAL_TYPE="0x01"
 export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
 export BEACON_STATIC_ENR="enr:-Iq4QMCTfIMXnow27baRUb35Q8iiFHSIDBJh6hQM5Axohhf4b6Kr_cOCu0htQ5WvVqKvFgY28893DHAg8gnBAXsAVqmGAX53x8JggmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk"
-export GENESIS_TIMESTAMP=1662465600
+export GENESIS_TIMESTAMP=1671192368
 export GENESIS_DELAY=120