From 7727a6bafe63a741857a6f2f9d1935ea36793ba3 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 27 Nov 2024 09:30:11 +0100 Subject: [PATCH 1/3] exclude `CONFIG_NAME` from spec comparison --- .hack/devnet/run.sh | 1 + clients/consensus/chainspec.go | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.hack/devnet/run.sh b/.hack/devnet/run.sh index 477d107f..7efe9188 100755 --- a/.hack/devnet/run.sh +++ b/.hack/devnet/run.sh @@ -64,6 +64,7 @@ frontend: rainbowkitProjectId: "15fe4ab4d5c0bcb6f0dc7c398301ff0e" validatorNamesYaml: "${__dir}/generated-validator-ranges.yaml" showSensitivePeerInfos: true + showPeerDASInfos: true showSubmitDeposit: true showSubmitElRequests: true beaconapi: diff --git a/clients/consensus/chainspec.go b/clients/consensus/chainspec.go index 4e2c266a..c699c6a6 100644 --- a/clients/consensus/chainspec.go +++ b/clients/consensus/chainspec.go @@ -17,7 +17,7 @@ type ForkVersion struct { // https://github.com/ethereum/consensus-specs/blob/dev/configs/mainnet.yaml type ChainSpec struct { PresetBase string `yaml:"PRESET_BASE"` - ConfigName string `yaml:"CONFIG_NAME"` + ConfigName string `yaml:"CONFIG_NAME" nocheck:"true"` MinGenesisTime time.Time `yaml:"MIN_GENESIS_TIME"` GenesisForkVersion phase0.Version `yaml:"GENESIS_FORK_VERSION"` AltairForkVersion phase0.Version `yaml:"ALTAIR_FORK_VERSION"` @@ -73,6 +73,11 @@ func (chain *ChainSpec) CheckMismatch(chain2 *ChainSpec) []string { chain2T := reflect.ValueOf(chain2).Elem() for i := 0; i < chainT.NumField(); i++ { + fieldT := chainT.Type().Field(i) + if fieldT.Tag.Get("nocheck") == "true" { + continue + } + fieldV := chainT.Field(i) field2V := chain2T.Field(i) From 91e8bc2d74fe587204c0ce6575f84bf472d50398 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 27 Nov 2024 09:40:21 +0100 Subject: [PATCH 2/3] ignore chain specs that have limited availability or differ between clients --- clients/consensus/chainspec.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/consensus/chainspec.go b/clients/consensus/chainspec.go index c699c6a6..2ddbcfc9 100644 --- a/clients/consensus/chainspec.go +++ b/clients/consensus/chainspec.go @@ -30,8 +30,8 @@ type ChainSpec struct { DenebForkEpoch *uint64 `yaml:"DENEB_FORK_EPOCH"` ElectraForkVersion phase0.Version `yaml:"ELECTRA_FORK_VERSION"` ElectraForkEpoch *uint64 `yaml:"ELECTRA_FORK_EPOCH"` - Eip7594ForkVersion phase0.Version `yaml:"EIP7594_FORK_VERSION"` - Eip7594ForkEpoch *uint64 `yaml:"EIP7594_FORK_EPOCH"` + Eip7594ForkVersion phase0.Version `yaml:"EIP7594_FORK_VERSION" nocheck:"true"` + Eip7594ForkEpoch *uint64 `yaml:"EIP7594_FORK_EPOCH" nocheck:"true"` SecondsPerSlot time.Duration `yaml:"SECONDS_PER_SLOT"` SlotsPerEpoch uint64 `yaml:"SLOTS_PER_EPOCH"` EpochsPerHistoricalVector uint64 `yaml:"EPOCHS_PER_HISTORICAL_VECTOR"` @@ -56,9 +56,9 @@ type ChainSpec struct { MinActivationBalance uint64 `yaml:"MIN_ACTIVATION_BALANCE"` // EIP7594: PeerDAS - NumberOfColumns *uint64 `yaml:"NUMBER_OF_COLUMNS"` - DataColumnSidecarSubnetCount *uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT"` - CustodyRequirement *uint64 `yaml:"CUSTODY_REQUIREMENT"` + NumberOfColumns *uint64 `yaml:"NUMBER_OF_COLUMNS" nocheck:"true"` + DataColumnSidecarSubnetCount *uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT" nocheck:"true"` + CustodyRequirement *uint64 `yaml:"CUSTODY_REQUIREMENT" nocheck:"true"` // additional dora specific specs WhiskForkEpoch *uint64 From e487e83a36105e20315a0e71b1ec30cd84819b01 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 27 Nov 2024 09:47:20 +0100 Subject: [PATCH 3/3] fix accidentially commited change --- .hack/devnet/run.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.hack/devnet/run.sh b/.hack/devnet/run.sh index 7efe9188..477d107f 100755 --- a/.hack/devnet/run.sh +++ b/.hack/devnet/run.sh @@ -64,7 +64,6 @@ frontend: rainbowkitProjectId: "15fe4ab4d5c0bcb6f0dc7c398301ff0e" validatorNamesYaml: "${__dir}/generated-validator-ranges.yaml" showSensitivePeerInfos: true - showPeerDASInfos: true showSubmitDeposit: true showSubmitElRequests: true beaconapi: