From c9a941c5a75c3763ac49620e5df72dae15fb87ca Mon Sep 17 00:00:00 2001
From: Mehdi AOUADI <mehdi.aouadi@consensys.net>
Date: Tue, 3 Dec 2024 14:34:05 +0100
Subject: [PATCH 1/2] move MAX_BLOBS_PER_BLOCK from preset to config params

---
 .../resources/tech/pegasys/teku/spec/config/configs/chiado.yaml | 2 ++
 .../tech/pegasys/teku/spec/config/configs/ephemery.yaml         | 2 ++
 .../resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml | 2 ++
 .../tech/pegasys/teku/spec/config/configs/less-swift.yaml       | 2 ++
 .../resources/tech/pegasys/teku/spec/config/configs/lukso.yaml  | 2 ++
 .../tech/pegasys/teku/spec/config/configs/mainnet.yaml          | 2 ++
 .../tech/pegasys/teku/spec/config/configs/minimal.yaml          | 2 ++
 .../tech/pegasys/teku/spec/config/configs/sepolia.yaml          | 2 ++
 .../resources/tech/pegasys/teku/spec/config/configs/swift.yaml  | 2 ++
 .../tech/pegasys/teku/spec/config/presets/gnosis/deneb.yaml     | 2 --
 .../tech/pegasys/teku/spec/config/presets/mainnet/deneb.yaml    | 2 --
 .../tech/pegasys/teku/spec/config/presets/minimal/deneb.yaml    | 2 --
 .../tech/pegasys/teku/spec/config/presets/swift/deneb.yaml      | 2 --
 .../teku/spec/config/standard/presets/mainnet/deneb.yaml        | 2 --
 .../teku/spec/config/standard/presets/minimal/deneb.yaml        | 2 --
 .../pegasys/teku/spec/config/standard/presets/swift/deneb.yaml  | 2 --
 16 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml
index fda0da2f5b4..7ba59a19848 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml
@@ -134,6 +134,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml
index 8df5977f605..0b3f87844d2 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml
@@ -123,6 +123,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml
index 42b99807212..c7600b8648a 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml
@@ -133,6 +133,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml
index 63cb669375b..6adebb9c009 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml
@@ -136,6 +136,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml
index 578d711cccc..47ad8fa06a4 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml
@@ -155,6 +155,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
index 18ca69b53e4..3c831ba06eb 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
@@ -142,6 +142,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
index f3386e056f3..1a6ea3507fa 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
@@ -142,6 +142,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml
index f4eac63a5b5..f00e64693b0 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml
@@ -118,6 +118,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
index 72afef1833e..4dd4e891242 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
@@ -137,6 +137,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/deneb.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/deneb.yaml
index e2fb3e76260..2a9fb62d70d 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/deneb.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # `uint64(2**12)` (= 4096)
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 4096
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 12 = 17
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 17
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/deneb.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/deneb.yaml
index 8dfd353076c..76bab10c380 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/deneb.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # `uint64(2**12)` (= 4096)
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 4096
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 12 = 17
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 17
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/deneb.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/deneb.yaml
index 03d2cd3bc05..f71173db736 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/deneb.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # [customized]
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/deneb.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/deneb.yaml
index 03d2cd3bc05..f71173db736 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/deneb.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # [customized]
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/deneb.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/deneb.yaml
index 8dfd353076c..76bab10c380 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/deneb.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # `uint64(2**12)` (= 4096)
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 4096
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 12 = 17
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 17
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/deneb.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/deneb.yaml
index 03d2cd3bc05..f71173db736 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/deneb.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # [customized]
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/deneb.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/deneb.yaml
index 03d2cd3bc05..f71173db736 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/deneb.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/deneb.yaml
@@ -6,7 +6,5 @@
 FIELD_ELEMENTS_PER_BLOB: 4096
 # [customized]
 MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
-# `uint64(6)`
-MAX_BLOBS_PER_BLOCK: 6
 # [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
 KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
\ No newline at end of file

From f048fdef782fdcc23da910e06a77518ad0ede6a9 Mon Sep 17 00:00:00 2001
From: Mehdi AOUADI <mehdi.aouadi@consensys.net>
Date: Tue, 3 Dec 2024 15:45:06 +0100
Subject: [PATCH 2/2] add missing MAX_BLOBS_PER_BLOCK

---
 .../tech/pegasys/teku/cli/subcommand/deneb_config.yaml          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml b/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml
index 9a15730dcdc..49c8d3b11bd 100644
--- a/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml
+++ b/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml
@@ -139,6 +139,8 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+# `6`
+MAX_BLOBS_PER_BLOCK: 6
 
 # Electra
 MAX_BLOBS_PER_BLOCK_ELECTRA: 6