From bf4f99ac6df3b8f9a7f49039dc06ad390921c436 Mon Sep 17 00:00:00 2001
From: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
Date: Mon, 6 Jan 2025 21:10:59 +0800
Subject: [PATCH] Bump to v1.5.0-alpha.10 (#57)

* Bump to v1.5.0-alpha.10

* Add new config keys

* Add table

* Update preset
---
 beacon_chain.md                      |  4 +++-
 consensus/config/gnosis.yaml         | 35 ++++++++++++++++++++--------
 consensus/preset/gnosis/electra.yaml |  2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/beacon_chain.md b/beacon_chain.md
index 2d0ff50..e97c8d4 100644
--- a/beacon_chain.md
+++ b/beacon_chain.md
@@ -7,7 +7,7 @@ Refer to [./consensus/config/gnosis.yaml](./consensus/config/gnosis.yaml) for th
 Note that modified preset values will result in different SSZ data structures, such that a client compiled with the Ethereum mainnet preset can't deserialize a state from the Gnosis Beacon Chain.
 
 ```
-ETHEREUM_SPEC_COMMIT: v1.5.0-alpha.8
+ETHEREUM_SPEC_COMMIT: v1.5.0-alpha.10
 ```
 
 ### Preset diff
@@ -31,4 +31,6 @@ ETHEREUM_SPEC_COMMIT: v1.5.0-alpha.8
 | `MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT`  | `8`           | `2`          | See https://github.com/gnosischain/specs/pull/22 for rationale |
 | `MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS` | `4096`        | `16384`      | Increased to match the expected 2 weeks rollups consider today for Ethereum mainnet. The total disk requirement roughly equivalent to Ethereum mainnet since epochs are 4.8x faster |
 | `MAX_BLOBS_PER_BLOCK`                   | `6`           | `2`          | See [/network-upgrades/dencun.md#eip-4844](/network-upgrades/dencun.md#eip-4844) for rationale on choosing 1/2 for the Dencun hard fork |
+| `MAX_BLOBS_PER_BLOCK_ELECTRA`           | `9`           | `2`          | Temporary value equal to `MAX_BLOBS_PER_BLOCK` |
+| `MAX_BLOBS_PER_BLOCK_FULU`              | `12`          | `2`          | Temporary value equal to `MAX_BLOBS_PER_BLOCK` |
 
diff --git a/consensus/config/gnosis.yaml b/consensus/config/gnosis.yaml
index dd74681..5488f68 100644
--- a/consensus/config/gnosis.yaml
+++ b/consensus/config/gnosis.yaml
@@ -48,7 +48,10 @@ DENEB_FORK_VERSION: 0x04000064
 DENEB_FORK_EPOCH: 889856  # 2024-03-11T18:30:20.000Z
 # Electra
 ELECTRA_FORK_VERSION: 0x05000064
-ELECTRA_FORK_EPOCH: 18446744073709551615
+ELECTRA_FORK_EPOCH: 18446744073709551615  # temporary stub
+# Fulu
+FULU_FORK_VERSION: 0x06000064
+FULU_FORK_EPOCH: 18446744073709551615  # temporary stub
 
 
 # Time parameters
@@ -131,25 +134,37 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
-# `2**14` (= 16384 epochs, ~15 days)
+# `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
-## `uint64(2)`
+# `uint64(6)`
 MAX_BLOBS_PER_BLOCK: 2
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
-# EIP7594
+# Electra
+# 2**7 * 10**9 (= 128,000,000,000)
+MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000
+# 2**8 * 10**9 (= 256,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 2
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
+
+# Fulu
 NUMBER_OF_COLUMNS: 128
+NUMBER_OF_CUSTODY_GROUPS: 128
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
-
-# [New in Electra:EIP7251]
-MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
-MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 # 2**8 * 10**9 (= 256,000,000,000)
+MAX_BLOBS_PER_BLOCK_FULU: 2
+# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_FULU`
+MAX_REQUEST_BLOB_SIDECARS_FULU: 1536
 
 # EIP7732
 MAX_REQUEST_PAYLOADS: 128
diff --git a/consensus/preset/gnosis/electra.yaml b/consensus/preset/gnosis/electra.yaml
index a1a3501..543fe64 100644
--- a/consensus/preset/gnosis/electra.yaml
+++ b/consensus/preset/gnosis/electra.yaml
@@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 2
 
 # Execution
 # ---------------------------------------------------------------