diff --git a/packages/config/src/chainConfig/configs/mainnet.ts b/packages/config/src/chainConfig/configs/mainnet.ts index dda140e02003..e795610dfd16 100644 --- a/packages/config/src/chainConfig/configs/mainnet.ts +++ b/packages/config/src/chainConfig/configs/mainnet.ts @@ -105,7 +105,6 @@ export const chainConfig: ChainConfig = { // Electra DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32, - MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384, SAMPLES_PER_SLOT: 8, CUSTODY_REQUIREMENT: 1, }; diff --git a/packages/config/src/chainConfig/configs/minimal.ts b/packages/config/src/chainConfig/configs/minimal.ts index 699b68622ede..c2e128a4b480 100644 --- a/packages/config/src/chainConfig/configs/minimal.ts +++ b/packages/config/src/chainConfig/configs/minimal.ts @@ -103,7 +103,6 @@ export const chainConfig: ChainConfig = { // Electra DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32, - MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384, SAMPLES_PER_SLOT: 8, CUSTODY_REQUIREMENT: 1, }; diff --git a/packages/config/src/chainConfig/types.ts b/packages/config/src/chainConfig/types.ts index 3bc77d93857c..2b7f8ae0ce15 100644 --- a/packages/config/src/chainConfig/types.ts +++ b/packages/config/src/chainConfig/types.ts @@ -74,7 +74,6 @@ export type ChainConfig = { MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: number; DATA_COLUMN_SIDECAR_SUBNET_COUNT: number; - MAX_REQUEST_DATA_COLUMN_SIDECARS: number; SAMPLES_PER_SLOT: number; CUSTODY_REQUIREMENT: number; }; @@ -141,7 +140,6 @@ export const chainConfigTypes: SpecTypes = { MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: "number", DATA_COLUMN_SIDECAR_SUBNET_COUNT: "number", - MAX_REQUEST_DATA_COLUMN_SIDECARS: "number", SAMPLES_PER_SLOT: "number", CUSTODY_REQUIREMENT: "number", }; diff --git a/packages/params/src/index.ts b/packages/params/src/index.ts index 7b77a7155a43..16782f5f448d 100644 --- a/packages/params/src/index.ts +++ b/packages/params/src/index.ts @@ -97,6 +97,7 @@ export const { FIELD_ELEMENTS_PER_CELL, FIELD_ELEMENTS_PER_EXT_BLOB, KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH, + MAX_REQUEST_DATA_COLUMN_SIDECARS, } = activePreset; //////////// diff --git a/packages/params/src/presets/mainnet.ts b/packages/params/src/presets/mainnet.ts index 9c28c2e2fad8..e0249272dd8b 100644 --- a/packages/params/src/presets/mainnet.ts +++ b/packages/params/src/presets/mainnet.ts @@ -124,4 +124,5 @@ export const mainnetPreset: BeaconPreset = { FIELD_ELEMENTS_PER_CELL: 64, FIELD_ELEMENTS_PER_EXT_BLOB: 8192, KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4, + MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384, }; diff --git a/packages/params/src/presets/minimal.ts b/packages/params/src/presets/minimal.ts index 5185be3988db..60a0ff44de9f 100644 --- a/packages/params/src/presets/minimal.ts +++ b/packages/params/src/presets/minimal.ts @@ -125,4 +125,5 @@ export const minimalPreset: BeaconPreset = { FIELD_ELEMENTS_PER_CELL: 64, FIELD_ELEMENTS_PER_EXT_BLOB: 8192, KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4, + MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384, }; diff --git a/packages/params/src/types.ts b/packages/params/src/types.ts index b71d6e1d3648..3de0a8b49b92 100644 --- a/packages/params/src/types.ts +++ b/packages/params/src/types.ts @@ -88,6 +88,7 @@ export type BeaconPreset = { FIELD_ELEMENTS_PER_CELL: number; FIELD_ELEMENTS_PER_EXT_BLOB: number; KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: number; + MAX_REQUEST_DATA_COLUMN_SIDECARS: number; }; /** @@ -179,6 +180,7 @@ export const beaconPresetTypes: BeaconPresetTypes = { FIELD_ELEMENTS_PER_CELL: "number", FIELD_ELEMENTS_PER_EXT_BLOB: "number", KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: "number", + MAX_REQUEST_DATA_COLUMN_SIDECARS: "number", }; type BeaconPresetTypes = { diff --git a/packages/types/src/electra/sszTypes.ts b/packages/types/src/electra/sszTypes.ts index 850d63598d54..f99180afb594 100644 --- a/packages/types/src/electra/sszTypes.ts +++ b/packages/types/src/electra/sszTypes.ts @@ -5,13 +5,14 @@ import { MAX_BLOB_COMMITMENTS_PER_BLOCK, NUMBER_OF_COLUMNS, KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH, + MAX_REQUEST_DATA_COLUMN_SIDECARS, } from "@lodestar/params"; import {ssz as primitiveSsz} from "../primitive/index.js"; import {ssz as phase0Ssz} from "../phase0/index.js"; import {ssz as denebSsz} from "../deneb/index.js"; -const {BLSSignature, Root, ColumnIndex, Bytes32} = primitiveSsz; +const {BLSSignature, Root, ColumnIndex, Bytes32, Slot, UintNum64} = primitiveSsz; export const Cell = new ByteVectorType(BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_CELL); export const DataColumn = new ListCompositeType(Cell, MAX_BLOB_COMMITMENTS_PER_BLOCK); diff --git a/packages/validator/src/util/params.ts b/packages/validator/src/util/params.ts index 4351286515ec..5ab0403638f4 100644 --- a/packages/validator/src/util/params.ts +++ b/packages/validator/src/util/params.ts @@ -228,10 +228,10 @@ function getSpecCriticalParams(localConfig: ChainConfig): Record