@lodestar/types 1.50.1 → 1.51.0-dev.0586e6e617

package/src/heze/sszTypes.ts

@@ -5,8 +5,8 @@ import {ssz as primitiveSsz} from "../primitive/index.js";
 
 const {Slot, Root, BLSSignature, ValidatorIndex} = primitiveSsz;
 
-function activeFields(count: number): boolean[] {
-  return Array.from({length: count}, () => true);
+function activeFields(count: number, gaps: number[] = []): boolean[] {
+  return Array.from({length: count}, (_, index) => !gaps.includes(index));
 }
 
 export const InclusionListCommittee = new VectorBasicType(ValidatorIndex, INCLUSION_LIST_COMMITTEE_SIZE);
@@ -60,21 +60,33 @@ export const SignedExecutionPayloadBid = new ContainerType(
 export const DataColumnSidecar = gloasSsz.DataColumnSidecar;
 export const DataColumnSidecars = gloasSsz.DataColumnSidecars;
 
+const {
+  eth1Data: _eth1Data,
+  eth1DataVotes: _eth1DataVotes,
+  eth1DepositIndex: _eth1DepositIndex,
+  depositRequestsStartIndex: _depositRequestsStartIndex,
+  ...gloasBeaconStateFields
+} = gloasSsz.BeaconState.fields;
+
 export const BeaconState = new ProgressiveContainerType(
   {
-    ...gloasSsz.BeaconState.fields,
+    ...gloasBeaconStateFields,
     latestExecutionPayloadBid: ExecutionPayloadBid, // [Modified in Heze:EIP7805]
   },
-  activeFields(46),
+  // [Modified in Heze:EIP8015] gaps keep the surviving generalized indices stable
+  activeFields(46, [8, 9, 10, 28]),
   {typeName: "BeaconState", jsonCase: "eth2"}
 );
 
+const {eth1Data: _bodyEth1Data, deposits: _deposits, ...gloasBeaconBlockBodyFields} = gloasSsz.BeaconBlockBody.fields;
+
 export const BeaconBlockBody = new ProgressiveContainerType(
   {
-    ...gloasSsz.BeaconBlockBody.fields,
+    ...gloasBeaconBlockBodyFields,
     signedExecutionPayloadBid: SignedExecutionPayloadBid, // [Modified in Heze:EIP7805]
   },
-  activeFields(13),
+  // [Modified in Heze:EIP8015] gaps keep the surviving generalized indices stable
+  activeFields(13, [1, 6]),
   {typeName: "BeaconBlockBody", jsonCase: "eth2", cachePermanentRootStruct: true}
 );
 

package/src/heze/types.ts

@@ -14,4 +14,5 @@ export type BeaconBlockBody = ValueOf<typeof ssz.BeaconBlockBody>;
 export type BeaconBlock = ValueOf<typeof ssz.BeaconBlock>;
 export type SignedBeaconBlock = ValueOf<typeof ssz.SignedBeaconBlock>;
 export type BlockContents = ValueOf<typeof ssz.BlockContents>;
+export type SignedBlockContents = {signedBlock: SignedBeaconBlock};
 export type SSEPayloadAttributes = ValueOf<typeof ssz.SSEPayloadAttributes>;

package/src/index.ts

@@ -3,7 +3,6 @@ export * from "./types.js";
 import type {SSZTypesFor} from "./sszTypes.js";
 import * as ssz from "./sszTypes.js";
 import {sszTypesFor} from "./sszTypes.js";
-export {sszTypesFor, SSZTypesFor, ssz};
 
 export * from "./utils/array.js";
 // Container utils
@@ -15,3 +14,4 @@ export {StringType, stringType} from "./utils/stringType.js";
 // Typeguards
 export * from "./utils/typeguards.js";
 export * from "./utils/validatorStatus.js";
+export {SSZTypesFor, ssz, sszTypesFor};

package/src/phase0/index.ts

@@ -3,4 +3,5 @@ export * from "./validator.js";
 
 import * as ssz from "./sszTypes.js";
 import * as ts from "./types.js";
-export {ts, ssz};
+
+export {ssz, ts};

package/src/primitive/index.ts

@@ -1,3 +1,4 @@
 import * as ssz from "./sszTypes.js";
 import * as ts from "./types.js";
-export {ts, ssz};
+
+export {ssz, ts};

package/src/sszTypes.ts

@@ -4,6 +4,7 @@ import {ssz as altairSsz} from "./altair/index.js";
 import {ssz as bellatrixSsz} from "./bellatrix/index.js";
 import {ssz as capellaSsz} from "./capella/index.js";
 import {ssz as denebSsz} from "./deneb/index.js";
+import {ssz as eip8025Ssz} from "./eip8025/index.js";
 import {ssz as electraSsz} from "./electra/index.js";
 import {ssz as fuluSsz} from "./fulu/index.js";
 import {ssz as gloasSsz} from "./gloas/index.js";
@@ -59,6 +60,7 @@ export const electra = typesByFork[ForkName.electra];
 export const fulu = typesByFork[ForkName.fulu];
 export const gloas = typesByFork[ForkName.gloas];
 export const heze = typesByFork[ForkName.heze];
+export const eip8025 = eip8025Ssz;
 
 /**
  * A type of union of forks must accept as any parameter the UNION of all fork types.

package/src/types.ts

@@ -23,6 +23,7 @@ export {ts as altair} from "./altair/index.js";
 export {ts as bellatrix} from "./bellatrix/index.js";
 export {ts as capella} from "./capella/index.js";
 export {ts as deneb} from "./deneb/index.js";
+export {ts as eip8025} from "./eip8025/index.js";
 export {ts as electra} from "./electra/index.js";
 export {ts as fulu} from "./fulu/index.js";
 export {ts as gloas} from "./gloas/index.js";
@@ -317,7 +318,7 @@ type TypesByFork = {
     SignedBuilderBid: electra.SignedBuilderBid;
     SSEPayloadAttributes: gloas.SSEPayloadAttributes;
     BlockContents: gloas.BlockContents;
-    SignedBlockContents: fulu.SignedBlockContents;
+    SignedBlockContents: gloas.SignedBlockContents;
     ExecutionPayloadAndBlobsBundle: fulu.ExecutionPayloadAndBlobsBundle;
     BlobsBundle: fulu.BlobsBundle;
     SyncCommittee: altair.SyncCommittee;
@@ -359,7 +360,7 @@ type TypesByFork = {
     SignedBuilderBid: electra.SignedBuilderBid;
     SSEPayloadAttributes: heze.SSEPayloadAttributes;
     BlockContents: heze.BlockContents;
-    SignedBlockContents: fulu.SignedBlockContents;
+    SignedBlockContents: heze.SignedBlockContents;
     ExecutionPayloadAndBlobsBundle: fulu.ExecutionPayloadAndBlobsBundle;
     BlobsBundle: fulu.BlobsBundle;
     SyncCommittee: altair.SyncCommittee;

package/src/utils/typeguards.ts

@@ -5,6 +5,7 @@ import {
   ForkPostDeneb,
   ForkPostElectra,
   ForkPostGloas,
+  ForkPreGloas,
 } from "@lodestar/params";
 import {SignedExecutionPayloadEnvelope, SignedExecutionPayloadEnvelopeContents} from "../gloas/types.js";
 import {
@@ -74,8 +75,8 @@ export function isDenebBlockContents(
 
 export function isDenebSignedBlockContents(
   data: BeaconBlock | BlockContents | SignedBeaconBlock | SignedBlockContents
-): data is SignedBlockContents<ForkPostDeneb> {
-  return (data as SignedBlockContents<ForkPostDeneb>).kzgProofs !== undefined;
+): data is SignedBlockContents<ForkPostDeneb & ForkPreGloas> {
+  return "kzgProofs" in data && data.kzgProofs !== undefined;
 }
 
 export function isElectraAttestation(attestation: Attestation): attestation is Attestation<ForkPostElectra> {