@lodestar/api 1.51.0-dev.c99cf49add → 1.51.0-dev.cda05d18f1

package/src/beacon/routes/validator.ts

@@ -28,7 +28,9 @@ import {
   UintBn64,
   ValidatorIndex,
   altair,
+  bellatrix,
   gloas,
+  heze,
   phase0,
   ssz,
   sszTypesFor,
@@ -269,6 +271,20 @@ export const SignedProposerPreferencesListType = ArrayOf(
   ssz.gloas.SignedProposerPreferences,
   (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH
 );
+export const InclusionListDutyType = new ContainerType(
+  {
+    /** The validator's public key, uniquely identifying them */
+    pubkey: ssz.BLSPubkey,
+    /** Index of validator in validator registry */
+    validatorIndex: ssz.ValidatorIndex,
+    /** The slot at which the validator must produce the inclusion list */
+    slot: ssz.Slot,
+    /** Shuffling dependent root of the duty's epoch, to set as `dependent_root` on the inclusion list */
+    dependentRoot: ssz.Root,
+  },
+  {jsonCase: "eth2"}
+);
+export const InclusionListDutyListType = ArrayOf(InclusionListDutyType);
 
 // The url is UTF-8 bytes on the SSZ wire but a plain string in JSON
 class BuilderUrlType extends ByteListType {
@@ -323,6 +339,8 @@ export const BuilderPreferencesEntryListType = ArrayOf(
   MAX_BUILDER_ENTRIES * (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH
 );
 
+export type InclusionListDuty = ValueOf<typeof InclusionListDutyType>;
+export type InclusionListDutyList = ValueOf<typeof InclusionListDutyListType>;
 export type ValidatorIndices = ValueOf<typeof ValidatorIndicesType>;
 export type AttesterDuty = ValueOf<typeof AttesterDutyType>;
 export type AttesterDutyList = ValueOf<typeof AttesterDutyListType>;
@@ -773,6 +791,50 @@ export type Endpoints = {
     EmptyResponseData,
     EmptyMeta
   >;
+
+  /**
+   * Get inclusion list committee duties
+   * Requests the beacon node to provide a set of inclusion list committee duties for a particular epoch.
+   */
+  getInclusionListCommitteeDuties: Endpoint<
+    "POST",
+    {
+      /** Should only be allowed 1 epoch ahead */
+      epoch: Epoch;
+      /** An array of the validator indices for which to obtain the duties */
+      indices: ValidatorIndices;
+    },
+    {params: {epoch: Epoch}; body: unknown},
+    InclusionListDutyList,
+    ExecutionOptimisticAndDependentRootMeta
+  >;
+
+  /**
+   * Produce an inclusion list
+   * Requests the beacon node to produce the transactions for an inclusion list at the given slot.
+   */
+  produceInclusionList: Endpoint<
+    "GET",
+    {
+      /** The slot for which an inclusion list should be created */
+      slot: Slot;
+    },
+    {query: {slot: number}},
+    bellatrix.Transactions,
+    VersionMeta
+  >;
+
+  /**
+   * Publish inclusion list
+   * Verifies the given inclusion list and publishes it on the `inclusion_list` gossipsub topic.
+   */
+  publishInclusionList: Endpoint<
+    "POST",
+    {signedInclusionList: heze.SignedInclusionList},
+    {body: unknown; headers: {[MetaHeader.Version]: string}},
+    EmptyResponseData,
+    EmptyMeta
+  >;
 };
 
 export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoints> {
@@ -1453,6 +1515,60 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
         requestWireFormat: WireFormat.ssz,
       },
     },
+    getInclusionListCommitteeDuties: {
+      url: "/eth/v1/validator/duties/inclusion_list/{epoch}",
+      method: "POST",
+      req: {
+        writeReqJson: ({epoch, indices}) => ({params: {epoch}, body: ValidatorIndicesType.toJson(indices)}),
+        parseReqJson: ({params, body}) => ({epoch: params.epoch, indices: ValidatorIndicesType.fromJson(body)}),
+        writeReqSsz: ({epoch, indices}) => ({params: {epoch}, body: ValidatorIndicesType.serialize(indices)}),
+        parseReqSsz: ({params, body}) => ({epoch: params.epoch, indices: ValidatorIndicesType.deserialize(body)}),
+        schema: {
+          params: {epoch: Schema.UintRequired},
+          body: Schema.StringArray,
+        },
+      },
+      resp: {
+        data: InclusionListDutyListType,
+        meta: ExecutionOptimisticAndDependentRootCodec,
+      },
+    },
+    produceInclusionList: {
+      url: "/eth/v1/validator/inclusion_list",
+      method: "GET",
+      req: {
+        writeReq: ({slot}) => ({query: {slot}}),
+        parseReq: ({query}) => ({slot: query.slot}),
+        schema: {
+          query: {slot: Schema.UintRequired},
+        },
+      },
+      resp: {
+        data: ssz.bellatrix.Transactions,
+        meta: VersionCodec,
+      },
+    },
+    publishInclusionList: {
+      url: "/eth/v1/validator/inclusion_list",
+      method: "POST",
+      req: {
+        writeReqJson: ({signedInclusionList}) => ({
+          body: ssz.heze.SignedInclusionList.toJson(signedInclusionList),
+          headers: {[MetaHeader.Version]: config.getForkName(signedInclusionList.message.slot)},
+        }),
+        parseReqJson: ({body}) => ({signedInclusionList: ssz.heze.SignedInclusionList.fromJson(body)}),
+        writeReqSsz: ({signedInclusionList}) => ({
+          body: ssz.heze.SignedInclusionList.serialize(signedInclusionList),
+          headers: {[MetaHeader.Version]: config.getForkName(signedInclusionList.message.slot)},
+        }),
+        parseReqSsz: ({body}) => ({signedInclusionList: ssz.heze.SignedInclusionList.deserialize(body)}),
+        schema: {
+          body: Schema.Object,
+          headers: {[MetaHeader.Version]: Schema.String},
+        },
+      },
+      resp: EmptyResponseCodec,
+    },
   };
 }
 

package/src/keymanager/index.ts

@@ -28,7 +28,6 @@ export {
   ImportStatus,
   builderConfigDataFromJson,
 } from "./routes.js";
-
 export type {ApiClient};
 
 type ClientModules = HttpClientModules & {

package/src/utils/client/httpClient.ts

@@ -353,12 +353,15 @@ export class HttpClient implements IHttpClient {
     // Implement fetch timeout
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), init.timeoutMs);
-    init.signal = controller.signal;
 
     // Attach global/local signal to this request's controller
+    // Check already-aborted after subscribe to avoid a race where abort fires between the check and addEventListener
     const onSignalAbort = (): void => controller.abort();
     for (const s of abortSignals) {
       s?.addEventListener("abort", onSignalAbort);
+      if (s?.aborted) {
+        controller.abort();
+      }
     }
 
     const routeId = definition.operationId;
@@ -367,7 +370,7 @@ export class HttpClient implements IHttpClient {
 
     try {
       this.logger?.debug("API request", {routeId, requestWireFormat, responseWireFormat});
-      const {url, requestInit} = createApiRequest(definition, args, init);
+      const {url, requestInit} = createApiRequest(definition, args, {...init, signal: controller.signal});
       const response = await this.fetch(url, requestInit);
       const apiResponse = new ApiResponse(definition, response.body, response);
 

package/src/utils/server/method.ts

@@ -12,9 +12,10 @@ type ApplicationResponseObject<E extends Endpoint> = {
   : {data: E["return"] | (E["return"] extends undefined ? undefined : Uint8Array)}) &
   (E["meta"] extends EmptyMeta ? {meta?: never} : {meta: E["meta"]});
 
-export type ApplicationResponse<E extends Endpoint> = HasOnlyOptionalProps<ApplicationResponseObject<E>> extends true
-  ? ApplicationResponseObject<E> | void
-  : ApplicationResponseObject<E>;
+export type ApplicationResponse<E extends Endpoint> =
+  HasOnlyOptionalProps<ApplicationResponseObject<E>> extends true
+    ? ApplicationResponseObject<E> | void
+    : ApplicationResponseObject<E>;
 
 export type ApiContext = {
   /**