From 17a81ee96e41ad66d04f90d9c659a9a284474556 Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Wed, 21 Aug 2024 12:52:55 -0700 Subject: [PATCH] update subnet count & custody req --- .../built_in_network_configs/chiado/config.yaml | 4 ++-- .../built_in_network_configs/gnosis/config.yaml | 4 ++-- .../built_in_network_configs/holesky/config.yaml | 4 ++-- .../built_in_network_configs/mainnet/config.yaml | 4 ++-- .../built_in_network_configs/sepolia/config.yaml | 4 ++-- consensus/types/src/chain_spec.rs | 6 +++--- lighthouse/environment/tests/testnet_dir/config.yaml | 4 ++-- scripts/local_testnet/network_params_das_interop.yaml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/eth2_network_config/built_in_network_configs/chiado/config.yaml b/common/eth2_network_config/built_in_network_configs/chiado/config.yaml index 066b27795cd..74fca4c5010 100644 --- a/common/eth2_network_config/built_in_network_configs/chiado/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/chiado/config.yaml @@ -138,6 +138,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384 BLOB_SIDECAR_SUBNET_COUNT: 6 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml b/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml index 23cf040b276..07bd21b35c2 100644 --- a/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml @@ -121,6 +121,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384 BLOB_SIDECAR_SUBNET_COUNT: 6 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/holesky/config.yaml b/common/eth2_network_config/built_in_network_configs/holesky/config.yaml index cec2b61f213..67f1e5b6831 100644 --- a/common/eth2_network_config/built_in_network_configs/holesky/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/holesky/config.yaml @@ -125,6 +125,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096 BLOB_SIDECAR_SUBNET_COUNT: 6 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml index 500b9e60a5c..acf4d83f323 100644 --- a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml @@ -147,6 +147,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096 BLOB_SIDECAR_SUBNET_COUNT: 6 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml b/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml index 2a1809d6ce9..8b84d870103 100644 --- a/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml @@ -121,6 +121,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096 BLOB_SIDECAR_SUBNET_COUNT: 6 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs index 2c64d21130f..0518edab513 100644 --- a/consensus/types/src/chain_spec.rs +++ b/consensus/types/src/chain_spec.rs @@ -808,7 +808,7 @@ impl ChainSpec { */ eip7594_fork_epoch: None, custody_requirement: 1, - data_column_sidecar_subnet_count: 32, + data_column_sidecar_subnet_count: 128, number_of_columns: 128, /* @@ -1130,7 +1130,7 @@ impl ChainSpec { */ eip7594_fork_epoch: None, custody_requirement: 1, - data_column_sidecar_subnet_count: 32, + data_column_sidecar_subnet_count: 128, number_of_columns: 128, /* * Network specific @@ -2122,7 +2122,7 @@ mod yaml_tests { DEPOSIT_NETWORK_ID: 1 DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa CUSTODY_REQUIREMENT: 1 - DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 + DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 "#; diff --git a/lighthouse/environment/tests/testnet_dir/config.yaml b/lighthouse/environment/tests/testnet_dir/config.yaml index 4fc7bc2dcff..84e8274f06e 100644 --- a/lighthouse/environment/tests/testnet_dir/config.yaml +++ b/lighthouse/environment/tests/testnet_dir/config.yaml @@ -100,6 +100,6 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6 ATTESTATION_SUBNET_SHUFFLING_PREFIX_BITS: 3 # DAS -CUSTODY_REQUIREMENT: 1 -DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32 +CUSTODY_REQUIREMENT: 4 +DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128 NUMBER_OF_COLUMNS: 128 \ No newline at end of file diff --git a/scripts/local_testnet/network_params_das_interop.yaml b/scripts/local_testnet/network_params_das_interop.yaml index 3e7fef557e6..0c8f9d7f49d 100644 --- a/scripts/local_testnet/network_params_das_interop.yaml +++ b/scripts/local_testnet/network_params_das_interop.yaml @@ -26,7 +26,7 @@ participants: network_params: eip7594_fork_epoch: 0 eip7594_fork_version: "0x50000038" - data_column_sidecar_subnet_count: 64 + data_column_sidecar_subnet_count: 128 samples_per_slot: 16 custody_requirement: 4 snooper_enabled: false