From 3beca1731cd179762d8ccf0eb60cd5c2a74faa46 Mon Sep 17 00:00:00 2001
From: Suphanat Chunhapanya <haxx.pop@gmail.com>
Date: Wed, 27 Nov 2024 23:38:09 +0700
Subject: [PATCH] EIP-7594: Remove BLOB_SIDECAR_SUBNET_COUNT_EIP7594
---
configs/mainnet.yaml | 1 -
configs/minimal.yaml | 1 -
specs/_features/eip7594/p2p-interface.md | 1 -
.../eth2spec/test/eip7594/unittests/test_config_invariants.py | 2 --
4 files changed, 5 deletions(-)
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
index 36b4db4123..c80716009a 100644
--- a/configs/mainnet.yaml
+++ b/configs/mainnet.yaml
@@ -165,7 +165,6 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
SAMPLES_PER_SLOT: 8
CUSTODY_REQUIREMENT: 4
-BLOB_SIDECAR_SUBNET_COUNT_EIP7594: 8
MAX_BLOBS_PER_BLOCK_EIP7594: 8
# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024
diff --git a/configs/minimal.yaml b/configs/minimal.yaml
index ae19518af7..61f4afb0dc 100644
--- a/configs/minimal.yaml
+++ b/configs/minimal.yaml
@@ -164,7 +164,6 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
SAMPLES_PER_SLOT: 8
CUSTODY_REQUIREMENT: 4
-BLOB_SIDECAR_SUBNET_COUNT_EIP7594: 8
MAX_BLOBS_PER_BLOCK_EIP7594: 8
# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024
diff --git a/specs/_features/eip7594/p2p-interface.md b/specs/_features/eip7594/p2p-interface.md
index de2d7e1f0b..ad08cf69ff 100644
--- a/specs/_features/eip7594/p2p-interface.md
+++ b/specs/_features/eip7594/p2p-interface.md
@@ -57,7 +57,6 @@
| `MAX_REQUEST_DATA_COLUMN_SIDECARS` | `MAX_REQUEST_BLOCKS_DENEB * NUMBER_OF_COLUMNS` | Maximum number of data column sidecars in a single request |
| `MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS` | `2**12` (= 4096 epochs, ~18 days) | The minimum epoch range over which a node must serve data column sidecars |
| `MAX_REQUEST_BLOB_SIDECARS_EIP7594` | `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594` | Maximum number of blob sidecars in a single request |
-| `BLOB_SIDECAR_SUBNET_COUNT_EIP7594` | `2**3` (= 8) | The number of blob sidecar subnets used in the gossipsub protocol |
### Containers
diff --git a/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_config_invariants.py b/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_config_invariants.py
index 8d14f4ae1c..33eaada407 100644
--- a/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_config_invariants.py
+++ b/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_config_invariants.py
@@ -36,5 +36,3 @@ def test_networking(spec):
spec.config.MAX_REQUEST_BLOB_SIDECARS_EIP7594 ==
spec.config.MAX_REQUEST_BLOCKS_DENEB * spec.config.MAX_BLOBS_PER_BLOCK_EIP7594
)
- # Start with the same size, but `BLOB_SIDECAR_SUBNET_COUNT` could potentially increase later.
- assert spec.config.BLOB_SIDECAR_SUBNET_COUNT_EIP7594 == spec.config.MAX_BLOBS_PER_BLOCK_EIP7594