From e091dd2b72cd107294b4a692ed3312f8b5cb65e4 Mon Sep 17 00:00:00 2001 From: Manu NALEPA Date: Fri, 17 May 2024 11:05:27 +0300 Subject: [PATCH] Fix beacon chain config. (#14017) --- config/params/config.go | 7 ++----- config/params/mainnet_config.go | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/config/params/config.go b/config/params/config.go index 4cd78104c4e4..2c96be0a4c61 100644 --- a/config/params/config.go +++ b/config/params/config.go @@ -258,7 +258,8 @@ type BeaconChainConfig struct { SamplesPerSlot uint64 `yaml:"SAMPLES_PER_SLOT"` // SamplesPerSlot refers to the humber of random samples a node queries per slot. CustodyRequirement uint64 `yaml:"CUSTODY_REQUIREMENT"` // CustodyRequirement refers to the minimum amount of subnets a peer must custody and serve samples from. MinEpochsForDataColumnSidecarsRequest primitives.Epoch `yaml:"MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS"` // MinEpochsForDataColumnSidecarsRequest is the minimum number of epochs the node will keep the data columns for. - MaxCellsInExtendMatrix uint64 `yaml:"MAX_CELLS_IN_EXTENDED_MATRIX"` // MaxCellsInExtendMatrix is the maximum number of cells in the extended data matrix. + MaxCellsInExtendedMatrix uint64 `yaml:"MAX_CELLS_IN_EXTENDED_MATRIX" spec:"true"` // MaxCellsInExtendedMatrix is the full data of one-dimensional erasure coding extended blobs (in row major format). + NumberOfColumns uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"` // NumberOfColumns in the extended data matrix. // Networking Specific Parameters GossipMaxSize uint64 `yaml:"GOSSIP_MAX_SIZE" spec:"true"` // GossipMaxSize is the maximum allowed size of uncompressed gossip messages. @@ -277,10 +278,6 @@ type BeaconChainConfig struct { AttestationSubnetPrefixBits uint64 `yaml:"ATTESTATION_SUBNET_PREFIX_BITS" spec:"true"` // AttestationSubnetPrefixBits is defined as (ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS). SubnetsPerNode uint64 `yaml:"SUBNETS_PER_NODE" spec:"true"` // SubnetsPerNode is the number of long-lived subnets a beacon node should be subscribed to. NodeIdBits uint64 `yaml:"NODE_ID_BITS" spec:"true"` // NodeIdBits defines the bit length of a node id. - - // PeerDAS - NumberOfColumns uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"` // NumberOfColumns in the extended data matrix. - MaxCellsInExtendedMatrix uint64 `yaml:"MAX_CELLS_IN_EXTENDED_MATRIX" spec:"true"` // MaxCellsInExtendedMatrix is the full data of one-dimensional erasure coding extended blobs (in row major format). } // InitializeForkSchedule initializes the schedules forks baked into the config. diff --git a/config/params/mainnet_config.go b/config/params/mainnet_config.go index b3b36e88e062..15eccec56b3a 100644 --- a/config/params/mainnet_config.go +++ b/config/params/mainnet_config.go @@ -297,7 +297,8 @@ var mainnetBeaconConfig = &BeaconChainConfig{ SamplesPerSlot: 8, CustodyRequirement: 1, MinEpochsForDataColumnSidecarsRequest: 4096, - MaxCellsInExtendMatrix: 768, + NumberOfColumns: 128, + MaxCellsInExtendedMatrix: 768, // Values related to networking parameters. GossipMaxSize: 10 * 1 << 20, // 10 MiB @@ -316,10 +317,6 @@ var mainnetBeaconConfig = &BeaconChainConfig{ AttestationSubnetPrefixBits: 6, SubnetsPerNode: 2, NodeIdBits: 256, - - // PeerDAS - NumberOfColumns: 128, - MaxCellsInExtendedMatrix: 768, } // MainnetTestConfig provides a version of the mainnet config that has a different name