From 8d497aa307040fd7ee5f1fdf1fce5176e026ab48 Mon Sep 17 00:00:00 2001
From: Parithosh Jayanthi <parithosh.jayanthi@ethereum.org>
Date: Mon, 27 Jan 2025 06:16:11 +0100
Subject: [PATCH] Adding fork support for EIP-7732 and EIP-7805 (#176)

Updates config.yaml as well
---
 config-example/cl/config.yaml | 16 ++++++++++++----
 defaults/defaults.env         |  5 ++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config-example/cl/config.yaml b/config-example/cl/config.yaml
index 0417288..be74316 100644
--- a/config-example/cl/config.yaml
+++ b/config-example/cl/config.yaml
@@ -44,6 +44,13 @@ ELECTRA_FORK_EPOCH: $ELECTRA_FORK_EPOCH
 FULU_FORK_VERSION: $FULU_FORK_VERSION
 FULU_FORK_EPOCH: $FULU_FORK_EPOCH
 
+# EIP7732
+EIP7732_FORK_VERSION: $EIP7732_FORK_VERSION
+EIP7732_FORK_EPOCH: $EIP7732_FORK_EPOCH
+
+# EIP7805
+EIP7805_FORK_VERSION: $EIP7805_FORK_VERSION
+EIP7805_FORK_EPOCH: $EIP7805_FORK_EPOCH
 
 # Time parameters
 # ---------------------------------------------------------------
@@ -153,12 +160,13 @@ WHISK_PROPOSER_SELECTION_GAP: 2
 
 # Fulu
 NUMBER_OF_COLUMNS: 128
-MAX_CELLS_IN_EXTENDED_MATRIX: 768
+NUMBER_OF_CUSTODY_GROUPS: 128
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: $DATA_COLUMN_SIDECAR_SUBNET_COUNT
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: $SAMPLES_PER_SLOT
 CUSTODY_REQUIREMENT: $CUSTODY_REQUIREMENT
-TARGET_BLOBS_PER_BLOCK_FULU: $TARGET_BLOBS_PER_BLOCK_FULU
 MAX_BLOBS_PER_BLOCK_FULU: $MAX_BLOBS_PER_BLOCK_FULU
-# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_FULU`
-MAX_REQUEST_BLOB_SIDECARS_FULU: $MAX_REQUEST_BLOB_SIDECARS_FULU
+MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
+
+# EIP7732
+MAX_REQUEST_PAYLOADS: 128
\ No newline at end of file
diff --git a/defaults/defaults.env b/defaults/defaults.env
index 89d72ef..39312c2 100644
--- a/defaults/defaults.env
+++ b/defaults/defaults.env
@@ -21,6 +21,10 @@ export ELECTRA_FORK_VERSION="${ELECTRA_FORK_VERSION:-0x60000000}"
 export ELECTRA_FORK_EPOCH="${ELECTRA_FORK_EPOCH:-2000}"
 export FULU_FORK_VERSION="${FULU_FORK_VERSION:-0x70000000}"
 export FULU_FORK_EPOCH="${FULU_FORK_EPOCH:-99999}"
+export EIP7732_FORK_VERSION="${EIP7732_FORK_VERSION:-0x80000000}
+export EIP7732_FORK_EPOCH="${EIP7732_FORK_EPOCH:-99999}
+export EIP7805_FORK_VERSION="${EIP7805_FORK_VERSION:-0x90000000}
+export EIP7805_FORK_EPOCH="${EIP7805_FORK_EPOCH:-99999}
 export WITHDRAWAL_TYPE="${WITHDRAWAL_TYPE:-0x00}"
 export WITHDRAWAL_ADDRESS="${WITHDRAWAL_ADDRESS:-0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134}"
 export BEACON_STATIC_ENR="${BEACON_STATIC_ENR:-enr:-Iq4QJk4WqRkjsX5c2CXtOra6HnxN-BMXnWhmhEQO9Bn9iABTJGdjUOurM7Btj1ouKaFkvTRoju5vz2GPmVON2dffQKGAX53x8JigmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk}"
@@ -46,6 +50,5 @@ export GOSSIP_MAX_SIZE="${GOSSIP_MAX_SIZE:-10485760}"
 export MAX_CHUNK_SIZE="${MAX_CHUNK_SIZE:-10485760}"
 export MAX_REQUEST_BLOCKS_DENEB="${MAX_REQUEST_BLOCKS_DENEB:-128}"
 export MAX_REQUEST_BLOB_SIDECARS_ELECTRA="${MAX_REQUEST_BLOB_SIDECARS_ELECTRA:-1152}"
-export MAX_REQUEST_BLOB_SIDECARS_FULU="${MAX_REQUEST_BLOB_SIDECARS_FULU:-1536}"
 export EL_PREMINE_ADDRS='{"0x1000000000000000000000000000000000000000": {"balance": "10ETH"}}'
 export ADDITIONAL_PRELOADED_CONTRACTS='{"0x0000000000000000000000000000000000000000": {"balance": "1ETH","code": "0x123465","storage": {},"nonce": 0,"secretKey": "0x"}}'
\ No newline at end of file