Merge pull request #4027 from ppopth/remove-blob-subnet

EIP-7594: Remove BLOB_SIDECAR_SUBNET_COUNT_EIP7594
ethereum · Nov 28, 2024 · d05c6e3 · d05c6e3
2 parents 493d97e + 3beca17
commit d05c6e3
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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