Merge pull request #33 from ethpandaops/add-dencun

Adding dencun support
ethpandaops · Jun 7, 2023 · 3c2b30e · 3c2b30e
2 parents 57e39f9 + 643c25a
commit 3c2b30e
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 35 deletions.
diff --git a/apps/el-gen/genesis_besu.py b/apps/el-gen/genesis_besu.py
@@ -44,7 +44,7 @@
             "londonBlock":0,
             "preMergeForkBlock":0,
             "terminalTotalDifficulty":0,
-            "shanghaiTime": int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12),
+            "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.
@@ -117,5 +117,5 @@
         out["alloc"][key] = {"balance": weival}
 
 out['config']['ethash'] =  {}
-out['config']['shanghaiTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12)
+out['config']['cancunTime'] =  int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['dencun_fork_epoch']) * 32 * 12)
 print(json.dumps(out, indent='  '))
diff --git a/apps/el-gen/genesis_chainspec.py b/apps/el-gen/genesis_chainspec.py
@@ -153,8 +153,5 @@
         weival = value.replace('ETH', '0' * 18)
         out["accounts"][key] = {"balance": weival}
 
-out['params']['eip4895TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12))
-out['params']['eip3855TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12))
-out['params']['eip3651TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12))
-out['params']['eip3860TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12))
+out['params']['eip4844TransitionTimestamp']= hex(int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['dencun_fork_epoch']) * 32 * 12))
 print(json.dumps(out, indent='  '))
diff --git a/apps/el-gen/genesis_geth.py b/apps/el-gen/genesis_geth.py
@@ -45,8 +45,8 @@
             "mergeForkBlock":0,
             "terminalTotalDifficulty":0,
             "terminalTotalDifficultyPassed": True,
-            "shanghaiTime": 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.
             # See https://github.com/ethereum/EIPs/issues/716 "SpuriousDragon RIPEMD bug"
@@ -115,5 +115,5 @@
         weival = value.replace('ETH', '0' * 18)
         out["alloc"][key] = {"balance": weival}
 
-out['config']['shanghaiTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['capella_fork_epoch']) * 32 * 12)
+out['config']['cancunTime'] = int(data['genesis_timestamp']) + int(data['genesis_delay']) + (int(data['dencun_fork_epoch']) * 32 * 12)
 print(json.dumps(out, indent='  '))
diff --git a/apps/el-gen/goerli/besu_genesis.json b/apps/el-gen/goerli/besu_genesis.json
@@ -15,7 +15,7 @@
     "londonBlock": 5062605,
     "mergeForkBlock": 99999999,
     "terminalTotalDifficulty": 10790000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1678832736,
     "trustedCheckpoint": {
       "sectionIndex": 66,
       "sectionHead": "0xeea3a7b2cb275956f3049dd27e6cdacd8a6ef86738d593d556efee5361019475",

diff --git a/apps/el-gen/goerli/chainspec.json b/apps/el-gen/goerli/chainspec.json
@@ -40,10 +40,10 @@
     "eip3529Transition": "0x4D3FCD",
     "eip3541Transition": "0x4D3FCD",
     "terminalTotalDifficulty": "0xa4a470",
-    "eip4895TransitionTimestamp": "0x0",
-    "eip3855TransitionTimestamp": "0x0",
-    "eip3651TransitionTimestamp": "0x0",
-    "eip3860TransitionTimestamp": "0x0",
+    "eip3651TransitionTimestamp": "0x6410F460",
+    "eip3855TransitionTimestamp": "0x6410F460",
+    "eip3860TransitionTimestamp": "0x6410F460",
+    "eip4895TransitionTimestamp": "0x6410F460",
     "gasLimitBoundDivisor": "0x400",
     "maxCodeSize": "0x6000",
     "maxCodeSizeTransition": "0x0",

diff --git a/apps/el-gen/goerli/genesis.json b/apps/el-gen/goerli/genesis.json
@@ -15,7 +15,7 @@
     "londonBlock": 5062605,
     "mergeForkBlock": 99999999,
     "terminalTotalDifficulty": 10790000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1678832736,
     "trustedCheckpoint": {
       "sectionIndex": 66,
       "sectionHead": "0xeea3a7b2cb275956f3049dd27e6cdacd8a6ef86738d593d556efee5361019475",

diff --git a/apps/el-gen/mainnet/besu_genesis.json b/apps/el-gen/mainnet/besu_genesis.json
@@ -15,7 +15,7 @@
     "grayGlacierBlock": 15050000,
     "mergeForkBlock": 16675026,
     "terminalTotalDifficulty": 58750000000000000000000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1681338455,
     "ethash": {},
     "discovery": {
       "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net",

diff --git a/apps/el-gen/mainnet/chainspec.json b/apps/el-gen/mainnet/chainspec.json
@@ -182,10 +182,10 @@
     "eip3529Transition": "0xC5D488",
     "eip3541Transition": "0xC5D488",
     "totalDifficulty": "0x0c70d808a128d7380000",
-    "eip4895TransitionTimestamp": "0x0",
-    "eip3855TransitionTimestamp": "0x0",
-    "eip3651TransitionTimestamp": "0x0",
-    "eip3860TransitionTimestamp": "0x0"
+    "eip4895TransitionTimestamp": "0x64373057",
+    "eip3855TransitionTimestamp": "0x64373057",
+    "eip3651TransitionTimestamp": "0x64373057",
+    "eip3860TransitionTimestamp": "0x64373057"
   },
   "genesis": {
     "seal": {

diff --git a/apps/el-gen/mainnet/genesis.json b/apps/el-gen/mainnet/genesis.json
@@ -19,7 +19,7 @@
     "grayGlacierBlock": 15050000,
     "mergeForkBlock": 16675026,
     "terminalTotalDifficulty": 58750000000000000000000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1681338455,
     "ethash": {}
   },
   "nonce": "0x42",

diff --git a/apps/el-gen/sepolia/besu_genesis.json b/apps/el-gen/sepolia/besu_genesis.json
@@ -13,7 +13,7 @@
     "londonBlock": 0,
     "mergeForkBlock": 1735371,
     "terminalTotalDifficulty": 17000000000000000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1677557088
 
   },
   "alloc": {

diff --git a/apps/el-gen/sepolia/chainspec.json b/apps/el-gen/sepolia/chainspec.json
@@ -57,11 +57,10 @@
     "eip3541Transition": "0x0",
     "terminalTotalDifficulty": "0x3c6568f12e8000",
     "mergeForkIdTransition": "0x1A7ACB",
-    "eip4895TransitionTimestamp": "0x0",
-    "eip3855TransitionTimestamp": "0x0",
-    "eip3651TransitionTimestamp": "0x0",
-    "eip3860TransitionTimestamp": "0x0",
-
+    "eip4895TransitionTimestamp": "0x63FD7D60",
+    "eip3855TransitionTimestamp": "0x63FD7D60",
+    "eip3651TransitionTimestamp": "0x63FD7D60",
+    "eip3860TransitionTimestamp": "0x63FD7D60"
   },
   "genesis": {
     "seal": {

diff --git a/apps/el-gen/sepolia/genesis.json b/apps/el-gen/sepolia/genesis.json
@@ -13,7 +13,7 @@
     "londonBlock": 0,
     "mergeForkBlock": 1735371,
     "terminalTotalDifficulty": 17000000000000000,
-    "shanghaiTime": 0,
+    "shanghaiTime": 1677557088
 
   },
   "alloc": {

diff --git a/config-example/cl/config.yaml b/config-example/cl/config.yaml
@@ -33,9 +33,9 @@ TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615
 CAPELLA_FORK_VERSION: $CAPELLA_FORK_VERSION
 CAPELLA_FORK_EPOCH: $CAPELLA_FORK_EPOCH
 
-# EIP4844
-EIP4844_FORK_VERSION: $EIP4844_FORK_VERSION
-EIP4844_FORK_EPOCH: $EIP4844_FORK_EPOCH
+# DENEB
+DENEB_FORK_VERSION: $DENEB_FORK_VERSION
+DENEB_FORK_EPOCH: $DENEB_FORK_EPOCH
 
 # Time parameters
 # ---------------------------------------------------------------

diff --git a/config-example/el/genesis-config.yaml b/config-example/el/genesis-config.yaml
@@ -11,4 +11,5 @@ el_premine:
 el_premine_addrs: {}
 genesis_timestamp: ${GENESIS_TIMESTAMP}
 genesis_delay: ${GENESIS_DELAY}
-capella_fork_epoch: ${CAPELLA_FORK_EPOCH}
+capella_fork_epoch: ${CAPELLA_FORK_EPOCH}
+dencun_fork_epoch: ${DENCUN_FORK_EPOCH}
diff --git a/config-example/values.env b/config-example/values.env
@@ -9,8 +9,8 @@ export ALTAIR_FORK_VERSION="0x20000000"
 export BELLATRIX_FORK_VERSION="0x30000000"
 export CAPELLA_FORK_VERSION="0x40000000"
 export CAPELLA_FORK_EPOCH="10000"
-export EIP4844_FORK_VERSION="0x50000000"
-export EIP4844_FORK_EPOCH="18446744073709551615"
+export DENEB_FORK_VERSION="0x50000000"
+export DENEB_FORK_EPOCH="18446744073709551615"
 export WITHDRAWAL_TYPE="0x00"
 export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
 export BEACON_STATIC_ENR="enr:-Iq4QJk4WqRkjsX5c2CXtOra6HnxN-BMXnWhmhEQO9Bn9iABTJGdjUOurM7Btj1ouKaFkvTRoju5vz2GPmVON2dffQKGAX53x8JigmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk"

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -7,7 +7,8 @@ gen_shared_files(){
     set -x
     # Shared files
     mkdir -p /data/custom_config_data
-    cp /apps/trusted_setup.txt /data/custom_config_data/trusted_setup.txt
+    wget -O /data/custom_config_data/trusted_setup.txt https://raw.githubusercontent.com/ethereum/c-kzg-4844/main/src/trusted_setup.txt
+    wget -O /data/custom_config_data/trusted_setup.json https://raw.githubusercontent.com/ethereum/consensus-specs/dev/presets/mainnet/trusted_setups/testing_trusted_setups.json
     if ! [ -f "/data/el/jwtsecret" ] || [ -f "/data/cl/jwtsecret" ]; then
         mkdir -p /data/el
         mkdir -p /data/cl