diff --git a/packages/beacon-node/test/spec/general/index.test.ts b/packages/beacon-node/test/spec/general/index.test.ts index b02fbab716f6..2c763eab5a54 100644 --- a/packages/beacon-node/test/spec/general/index.test.ts +++ b/packages/beacon-node/test/spec/general/index.test.ts @@ -42,6 +42,9 @@ specTestIterator( "ProgressiveSingleFieldContainerTestStruct", "ProgressiveSingleListContainerTestStruct", "ProgressiveComplexTestStruct", + "CompatibleUnionA", + "CompatibleUnionBC", + "CompatibleUnionABCA", ]), }, }, diff --git a/packages/beacon-node/test/spec/specTestVersioning.ts b/packages/beacon-node/test/spec/specTestVersioning.ts index b8157282ddf5..bb2d5d79ae73 100644 --- a/packages/beacon-node/test/spec/specTestVersioning.ts +++ b/packages/beacon-node/test/spec/specTestVersioning.ts @@ -14,7 +14,7 @@ import {DownloadTestsOptions} from "@lodestar/spec-test-util/downloadTests"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); export const ethereumConsensusSpecsTests: DownloadTestsOptions = { - specVersion: "v1.6.0-beta.0", + specVersion: "v1.6.0-beta.2", // Target directory is the host package root: 'packages/*/spec-tests' outputDir: path.join(__dirname, "../../spec-tests"), specTestsRepoUrl: "https://github.com/ethereum/consensus-specs", diff --git a/packages/beacon-node/test/spec/utils/specTestIterator.ts b/packages/beacon-node/test/spec/utils/specTestIterator.ts index 922883bc1b59..07c5525ac9ea 100644 --- a/packages/beacon-node/test/spec/utils/specTestIterator.ts +++ b/packages/beacon-node/test/spec/utils/specTestIterator.ts @@ -59,7 +59,7 @@ const coveredTestRunners = [ // ], // ``` export const defaultSkipOpts: SkipOpts = { - skippedForks: ["eip7732", "eip7805", "gloas"], + skippedForks: ["eip7732", "eip7805"], // TODO: capella // BeaconBlockBody proof in lightclient is the new addition in v1.3.0-rc.2-hotfix // Skip them for now to enable subsequently @@ -69,6 +69,8 @@ export const defaultSkipOpts: SkipOpts = { /^electra\/light_client\/single_merkle_proof\/BeaconBlockBody.*/, /^fulu\/light_client\/single_merkle_proof\/BeaconBlockBody.*/, /^.+\/light_client\/data_collection\/.*/, + /^gloas\/(?!.*ssz_static).*$/, + /^gloas\/ssz_static\/ForkChoiceNode.*$/, ], skippedTests: [], skippedRunners: [], diff --git a/packages/params/test/e2e/ensure-config-is-synced.test.ts b/packages/params/test/e2e/ensure-config-is-synced.test.ts index 8291ded0bc41..09a19cb8243f 100644 --- a/packages/params/test/e2e/ensure-config-is-synced.test.ts +++ b/packages/params/test/e2e/ensure-config-is-synced.test.ts @@ -8,7 +8,7 @@ import {loadConfigYaml} from "../yaml.js"; // Not e2e, but slow. Run with e2e tests /** https://github.com/ethereum/consensus-specs/releases */ -const specConfigCommit = "v1.6.0-beta.0"; +const specConfigCommit = "v1.6.0-beta.2"; /** * Fields that we filter from local config when doing comparison. * Ideally this should be empty as it is not spec compliant diff --git a/packages/types/src/gloas/sszTypes.ts b/packages/types/src/gloas/sszTypes.ts index c810184f3409..1beedb02b6be 100644 --- a/packages/types/src/gloas/sszTypes.ts +++ b/packages/types/src/gloas/sszTypes.ts @@ -226,6 +226,7 @@ export const DataColumnSidecar = new ContainerType( kzgProofs: fuluSsz.DataColumnSidecar.fields.kzgProofs, // signedBlockHeader: phase0Ssz.SignedBeaconBlockHeader, // Removed in GLOAS:EIP7732 // kzgCommitmentsInclusionProof: KzgCommitmentsInclusionProof, // Removed in GLOAS:EIP7732 + slot: Slot, // New in GLOAS:EIP7732 beaconBlockRoot: Root, // New in GLOAS:EIP7732 }, {typeName: "DataColumnSidecar", jsonCase: "eth2"}