@lodestar/beacon-node 1.50.0-dev.c04a499311 → 1.50.0-dev.c24762bc60

package/lib/execution/engine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAA6B,uBAAuB,EAAC,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAmC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE5E,OAAO,EAAC,mBAAmB,EAAE,uBAAuB,EAAE,8BAA8B,EAAC,CAAC;AAEtF,MAAM,MAAM,mBAAmB,GAC3B,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,uBAAuB,CAAC,GAC3C,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG,uBAAuB,CAAC,GAC1C;IAAC,IAAI,EAAE,UAAU,CAAA;CAAC,CAAC;AACvB,eAAO,MAAM,0BAA0B,EAAE,mBAAoD,CAAC;AAE9F,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAGlB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,uBAAuB,EAC7B,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAWlB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAclB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC9B,cAAc,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAA6B,uBAAuB,EAAC,MAAM,WAAW,CAAC;AAG9E,OAAO,EAAmC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE5E,OAAO,EAAC,mBAAmB,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,cAAc,EAAC,CAAC;AACtG,YAAY,EAAC,aAAa,EAAC,CAAC;AAE5B,MAAM,MAAM,mBAAmB,GAC3B,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,uBAAuB,CAAC,GAC3C,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG,uBAAuB,CAAC,GAC1C;IAAC,IAAI,EAAE,UAAU,CAAA;CAAC,CAAC;AACvB,eAAO,MAAM,0BAA0B,EAAE,mBAAoD,CAAC;AAE9F,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAGlB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,uBAAuB,EAC7B,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAsClB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,sBAAsB,GAC9B,gBAAgB,CAclB"}

package/lib/execution/engine/index.js

@@ -1,26 +1,51 @@
-import { fromHex, toPrintableUrl } from "@lodestar/utils";
+import { LodestarError, fromHex, toPrintableUrl } from "@lodestar/utils";
+import { getLodestarClientVersion } from "../../util/metadata.js";
 import { ExecutionEngineDisabled } from "./disabled.js";
-import { ExecutionEngineHttp, defaultExecutionEngineHttpOpts, } from "./http.js";
+import { ExecutionEngineHttp, defaultExecutionEngineHttpOpts, engineApiModes, } from "./http.js";
 import { JsonRpcHttpClient } from "./jsonRpcHttpClient.js";
+import { JsonRpcEngineTransport } from "./jsonRpcTransport.js";
 import { ExecutionEngineMockBackend } from "./mock.js";
+import { EngineRestHttpClient } from "./restHttpClient.js";
+import { RestEngineTransport, formatClientVersionHeader } from "./restTransport.js";
 import { ExecutionEngineMockJsonRpcClient } from "./utils.js";
-export { ExecutionEngineHttp, ExecutionEngineDisabled, defaultExecutionEngineHttpOpts };
+export { ExecutionEngineHttp, ExecutionEngineDisabled, defaultExecutionEngineHttpOpts, engineApiModes };
 export const defaultExecutionEngineOpts = defaultExecutionEngineHttpOpts;
 export function getExecutionEngineFromBackend(backend, modules) {
     const rpc = new ExecutionEngineMockJsonRpcClient(backend);
-    return new ExecutionEngineHttp(rpc, modules);
+    return new ExecutionEngineHttp({ jsonRpc: new JsonRpcEngineTransport(rpc) }, modules);
 }
 export function getExecutionEngineHttp(opts, modules) {
+    const jwtSecret = opts.jwtSecretHex ? fromHex(opts.jwtSecretHex) : undefined;
+    const metrics = modules.metrics?.executionEnginerHttpClient;
+    const engineApi = opts.engineApi ?? "auto";
+    if (engineApi === "ssz" && opts.urls.length !== 1) {
+        throw new LodestarError({ code: "ENGINE_REST_REQUIRES_SINGLE_URL", count: opts.urls.length });
+    }
+    if (engineApi === "auto" && opts.urls.length > 1) {
+        modules.logger.debug("Using JSON-RPC for multiple execution URLs", { count: opts.urls.length });
+    }
     const rpc = new JsonRpcHttpClient(opts.urls, {
         ...opts,
         signal: modules.signal,
-        metrics: modules.metrics?.executionEnginerHttpClient,
-        jwtSecret: opts.jwtSecretHex ? fromHex(opts.jwtSecretHex) : undefined,
+        metrics,
+        jwtSecret,
         jwtId: opts.jwtId,
         jwtVersion: opts.jwtVersion,
     });
-    modules.logger.info("Execution client", { urls: opts.urls.map(toPrintableUrl).toString() });
-    return new ExecutionEngineHttp(rpc, modules, opts);
+    const rest = engineApi === "json-rpc" || opts.urls.length !== 1
+        ? undefined
+        : new RestEngineTransport(new EngineRestHttpClient(opts.urls, {
+            signal: modules.signal,
+            timeout: opts.timeout,
+            retries: opts.retries,
+            retryDelay: opts.retryDelay,
+            jwtSecret,
+            jwtId: opts.jwtId,
+            clientVersion: formatClientVersionHeader(getLodestarClientVersion(opts)),
+            metrics,
+        }));
+    modules.logger.info("Execution client", { urls: opts.urls.map(toPrintableUrl).toString(), engineApi });
+    return new ExecutionEngineHttp({ jsonRpc: new JsonRpcEngineTransport(rpc), rest }, modules, opts);
 }
 export function initializeExecutionEngine(opts, modules) {
     switch (opts.mode) {

package/lib/execution/engine/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution/engine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,mBAAmB,EAGnB,8BAA8B,GAC/B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,0BAA0B,EAA0B,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAC,gCAAgC,EAAiB,MAAM,YAAY,CAAC;AAE5E,OAAO,EAAC,mBAAmB,EAAE,uBAAuB,EAAE,8BAA8B,EAAC,CAAC;AAMtF,MAAM,CAAC,MAAM,0BAA0B,GAAwB,8BAA8B,CAAC;AAE9F,MAAM,UAAU,6BAA6B,CAC3C,OAAuB,EACvB,OAA+B;IAE/B,MAAM,GAAG,GAAG,IAAI,gCAAgC,CAAC,OAAO,CAAC,CAAC;IAC1D,OAAO,IAAI,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,IAA6B,EAC7B,OAA+B;IAE/B,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE;QAC3C,GAAG,IAAI;QACP,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,0BAA0B;QACpD,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC,CAAC;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;IAC1F,OAAO,IAAI,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,IAAyB,EACzB,OAA+B;IAE/B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,IAAI,uBAAuB,EAAE,CAAC;QAEvC,KAAK,MAAM;YACT,OAAO,6BAA6B,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAEtF,KAAK,MAAM;YACT,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/C;YACE,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution/engine/index.ts"],"names":[],"mappings":"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"}

package/lib/execution/engine/interface.d.ts

@@ -114,7 +114,7 @@ export interface IExecutionEngine {
         executionRequests?: ExecutionRequests;
         shouldOverrideBuilder?: boolean;
     }>;
-    /** Amsterdam: payload bodies including the block access list (null if the EL no longer has it) */
+    /** Amsterdam: includes the block access list; REST returns null for bodies outside the Amsterdam era. */
     getPayloadBodiesByHashV2(blockHash: DATA[]): Promise<(ExecutionPayloadBodyV2 | null)[]>;
     getBlobs(fork: ForkPostFulu, versionedHashes: VersionedHashes, buffers?: Uint8Array[]): Promise<BlobAndProofV2[] | null>;
     getBlobs(fork: ForkPreFulu, versionedHashes: VersionedHashes, buffers?: Uint8Array[]): Promise<(BlobAndProof | null)[]>;

package/lib/execution/engine/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/interface.ts"],"names":[],"mappings":"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"}

package/lib/execution/engine/jsonRpcTransport.d.ts

@@ -0,0 +1,25 @@
+import { ForkName } from "@lodestar/params";
+import { ExecutionPayload, ExecutionRequests, Root, RootHex } from "@lodestar/types";
+import { BlobAndProof } from "@lodestar/types/deneb";
+import { BlobAndProofV2 } from "@lodestar/types/fulu";
+import { ClientVersion, PayloadAttributes, PayloadId, VersionedHashes } from "./interface.js";
+import { IJsonRpcHttpClient, JsonRpcHttpClientEventEmitter } from "./jsonRpcHttpClient.js";
+import { ForkchoiceUpdatedResult, GetPayloadResult, IEngineTransport, PayloadStatusResult } from "./transport.js";
+import { ExecutionPayloadBodyV2 } from "./types.js";
+/**
+ * Legacy `engine_*` JSON-RPC methods
+ * https://github.com/ethereum/execution-apis/tree/main/src/engine
+ */
+export declare class JsonRpcEngineTransport implements IEngineTransport {
+    private readonly rpc;
+    constructor(rpc: IJsonRpcHttpClient);
+    get emitter(): JsonRpcHttpClientEventEmitter;
+    newPayload(fork: ForkName, executionPayload: ExecutionPayload, versionedHashes?: VersionedHashes, parentBeaconBlockRoot?: Root, executionRequests?: ExecutionRequests): Promise<PayloadStatusResult>;
+    forkchoiceUpdated(fork: ForkName, headBlockHash: RootHex, safeBlockHash: RootHex, finalizedBlockHash: RootHex, payloadAttributes?: PayloadAttributes): Promise<ForkchoiceUpdatedResult>;
+    getPayload(fork: ForkName, payloadId: PayloadId): Promise<GetPayloadResult>;
+    getPayloadBodiesByHashV2(blockHashes: RootHex[]): Promise<(ExecutionPayloadBodyV2 | null)[]>;
+    getBlobsV1(versionedHashes: VersionedHashes): Promise<(BlobAndProof | null)[]>;
+    getBlobsV2(versionedHashes: VersionedHashes, buffers?: Uint8Array[]): Promise<BlobAndProofV2[] | null>;
+    getClientVersion(clientVersion: ClientVersion): Promise<ClientVersion[]>;
+}
+//# sourceMappingURL=jsonRpcTransport.d.ts.map

package/lib/execution/engine/jsonRpcTransport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonRpcTransport.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/jsonRpcTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAU,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAa,aAAa,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,EAAC,MAAM,gBAAgB,CAAC;AACxG,OAAO,EAAC,kBAAkB,EAAE,6BAA6B,EAAU,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAC,uBAAuB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAIL,sBAAsB,EAYvB,MAAM,YAAY,CAAC;AAmBpB;;;GAGG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAhC,YAA6B,GAAG,EAAE,kBAAkB,EAAI;IAExD,IAAI,OAAO,IAAI,6BAA6B,CAE3C;IAEK,UAAU,CACd,IAAI,EAAE,QAAQ,EACd,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,CAAC,EAAE,eAAe,EACjC,qBAAqB,CAAC,EAAE,IAAI,EAC5B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,mBAAmB,CAAC,CA6C9B;IAEK,iBAAiB,CACrB,IAAI,EAAE,QAAQ,EACd,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,OAAO,EAC3B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,uBAAuB,CAAC,CAoBlC;IAEK,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6BhF;IAEK,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,sBAAsB,GAAG,IAAI,CAAC,EAAE,CAAC,CAQjG;IAEK,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,CAenF;IAEK,UAAU,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,CAsC3G;IAEK,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAY7E;CACF"}

package/lib/execution/engine/jsonRpcTransport.js

@@ -0,0 +1,158 @@
+import { ForkName, ForkSeq } from "@lodestar/params";
+import { strip0xPrefix } from "@lodestar/utils";
+import { ClientCode } from "./interface.js";
+import { BLOB_AND_PROOF_V2_RPC_BYTES, assertReqSizeLimit, deserializeBlobAndProofs, deserializeBlobAndProofsV2, deserializeBlobAndProofsV2IntoBytes, deserializeExecutionPayloadBodyV2, parseExecutionPayload, serializeBeaconBlockRoot, serializeExecutionPayload, serializeExecutionRequests, serializePayloadAttributes, serializeVersionedHashes, } from "./types.js";
+import { bytesToData } from "./utils.js";
+/**
+ * Maximum number of version hashes that can be sent in a getBlobs request
+ * Clients must support at least 128 versionedHashes, so we avoid sending more
+ * https://github.com/ethereum/execution-apis/blob/main/src/engine/cancun.md#specification-3
+ */
+const MAX_VERSIONED_HASHES = 128;
+// Define static options once to prevent extra allocations
+const notifyNewPayloadOpts = { routeId: "notifyNewPayload" };
+const forkchoiceUpdatedOpts = { routeId: "forkchoiceUpdated" };
+const getPayloadOpts = { routeId: "getPayload" };
+const getPayloadBodiesByHashOpts = { routeId: "getPayloadBodiesByHash" };
+const getBlobsV1Opts = { routeId: "getBlobsV1" };
+const getBlobsV2Opts = { routeId: "getBlobsV2" };
+const getClientVersionOpts = { routeId: "getClientVersion" };
+/**
+ * Legacy `engine_*` JSON-RPC methods
+ * https://github.com/ethereum/execution-apis/tree/main/src/engine
+ */
+export class JsonRpcEngineTransport {
+    rpc;
+    constructor(rpc) {
+        this.rpc = rpc;
+    }
+    get emitter() {
+        return this.rpc.emitter;
+    }
+    async newPayload(fork, executionPayload, versionedHashes, parentBeaconBlockRoot, executionRequests) {
+        const serializedExecutionPayload = serializeExecutionPayload(fork, executionPayload);
+        if (ForkSeq[fork] >= ForkSeq.deneb) {
+            if (versionedHashes === undefined) {
+                throw Error(`versionedHashes required in notifyNewPayload for fork=${fork}`);
+            }
+            if (parentBeaconBlockRoot === undefined) {
+                throw Error(`parentBlockRoot required in notifyNewPayload for fork=${fork}`);
+            }
+            const serializedVersionedHashes = serializeVersionedHashes(versionedHashes);
+            const serializedParentBeaconBlockRoot = serializeBeaconBlockRoot(parentBeaconBlockRoot);
+            if (ForkSeq[fork] >= ForkSeq.electra) {
+                if (executionRequests === undefined) {
+                    throw Error(`executionRequests required in notifyNewPayload for fork=${fork}`);
+                }
+                const method = ForkSeq[fork] >= ForkSeq.gloas ? "engine_newPayloadV5" : "engine_newPayloadV4";
+                return this.rpc.fetchWithRetries({
+                    method,
+                    params: [
+                        serializedExecutionPayload,
+                        serializedVersionedHashes,
+                        serializedParentBeaconBlockRoot,
+                        serializeExecutionRequests(fork, executionRequests),
+                    ],
+                }, notifyNewPayloadOpts);
+            }
+            const method = "engine_newPayloadV3";
+            return this.rpc.fetchWithRetries({ method, params: [serializedExecutionPayload, serializedVersionedHashes, serializedParentBeaconBlockRoot] }, notifyNewPayloadOpts);
+        }
+        const method = ForkSeq[fork] >= ForkSeq.capella ? "engine_newPayloadV2" : "engine_newPayloadV1";
+        return this.rpc.fetchWithRetries({ method, params: [serializedExecutionPayload] }, notifyNewPayloadOpts);
+    }
+    async forkchoiceUpdated(fork, headBlockHash, safeBlockHash, finalizedBlockHash, payloadAttributes) {
+        const method = ForkSeq[fork] >= ForkSeq.gloas
+            ? "engine_forkchoiceUpdatedV4"
+            : ForkSeq[fork] >= ForkSeq.deneb
+                ? "engine_forkchoiceUpdatedV3"
+                : ForkSeq[fork] >= ForkSeq.capella
+                    ? "engine_forkchoiceUpdatedV2"
+                    : "engine_forkchoiceUpdatedV1";
+        const payloadAttributesRpc = payloadAttributes ? serializePayloadAttributes(payloadAttributes) : undefined;
+        // If we are just fcUing and not asking execution for payload, retry is not required
+        // and we can move on, as the next fcU will be issued soon on the new slot
+        const fcUReqOpts = payloadAttributes !== undefined ? forkchoiceUpdatedOpts : { ...forkchoiceUpdatedOpts, retries: 0 };
+        const { payloadStatus, payloadId } = await this.rpc.fetchWithRetries({ method, params: [{ headBlockHash, safeBlockHash, finalizedBlockHash }, payloadAttributesRpc] }, fcUReqOpts);
+        return { payloadStatus, payloadId: payloadId && payloadId !== "0x" ? payloadId : null };
+    }
+    async getPayload(fork, payloadId) {
+        let method;
+        switch (fork) {
+            case ForkName.phase0:
+            case ForkName.altair:
+            case ForkName.bellatrix:
+                method = "engine_getPayloadV1";
+                break;
+            case ForkName.capella:
+                method = "engine_getPayloadV2";
+                break;
+            case ForkName.deneb:
+                method = "engine_getPayloadV3";
+                break;
+            case ForkName.electra:
+                method = "engine_getPayloadV4";
+                break;
+            case ForkName.fulu:
+                method = "engine_getPayloadV5";
+                break;
+            default:
+                method = "engine_getPayloadV6";
+                break;
+        }
+        const payloadResponse = await this.rpc.fetchWithRetries({ method, params: [payloadId] }, getPayloadOpts);
+        return parseExecutionPayload(fork, payloadResponse);
+    }
+    async getPayloadBodiesByHashV2(blockHashes) {
+        const method = "engine_getPayloadBodiesByHashV2";
+        assertReqSizeLimit(blockHashes.length, 32);
+        const response = await this.rpc.fetchWithRetries({ method, params: [blockHashes] }, getPayloadBodiesByHashOpts);
+        return response.map(deserializeExecutionPayloadBodyV2);
+    }
+    async getBlobsV1(versionedHashes) {
+        assertReqSizeLimit(versionedHashes.length, MAX_VERSIONED_HASHES);
+        const versionedHashesHex = versionedHashes.map(bytesToData);
+        const response = await this.rpc.fetchWithRetries({ method: "engine_getBlobsV1", params: [versionedHashesHex] }, getBlobsV1Opts);
+        if (response.length !== versionedHashesHex.length) {
+            throw Error(`Invalid engine_getBlobsV1 response length=${response.length} versionedHashes=${versionedHashesHex.length}`);
+        }
+        return response.map(deserializeBlobAndProofs);
+    }
+    async getBlobsV2(versionedHashes, buffers) {
+        assertReqSizeLimit(versionedHashes.length, MAX_VERSIONED_HASHES);
+        const versionedHashesHex = versionedHashes.map(bytesToData);
+        if (buffers) {
+            // Callers preallocate one buffer per max blobs of the epoch, only the first entries are used
+            if (buffers.length < versionedHashesHex.length) {
+                throw Error(`Not enough buffers length=${buffers.length} versionedHashes=${versionedHashesHex.length}`);
+            }
+            for (const [i, buffer] of buffers.entries()) {
+                if (buffer.length !== BLOB_AND_PROOF_V2_RPC_BYTES) {
+                    throw Error(`Invalid buffer[${i}] length=${buffer.length} expected=${BLOB_AND_PROOF_V2_RPC_BYTES}`);
+                }
+            }
+        }
+        const response = await this.rpc.fetchWithRetries({ method: "engine_getBlobsV2", params: [versionedHashesHex] }, getBlobsV2Opts);
+        // engine_getBlobsV2 does not return partial responses. It returns null if any blob is not found
+        if (response == null) {
+            return null;
+        }
+        if (response.length !== versionedHashesHex.length) {
+            throw Error(`Invalid engine_getBlobsV2 response length=${response.length} versionedHashes=${versionedHashesHex.length}`);
+        }
+        if (buffers) {
+            // getBlobsV2() is designed to called once per slot so we expect to have buffers
+            return response.map((data, i) => deserializeBlobAndProofsV2IntoBytes(data, buffers[i]));
+        }
+        return response.map(deserializeBlobAndProofsV2);
+    }
+    async getClientVersion(clientVersion) {
+        const method = "engine_getClientVersionV1";
+        const response = await this.rpc.fetchWithRetries({ method, params: [{ ...clientVersion, commit: `0x${clientVersion.commit}` }] }, getClientVersionOpts);
+        return response.map((cv) => {
+            const code = cv.code in ClientCode ? ClientCode[cv.code] : ClientCode.XX;
+            return { code, name: cv.name, version: cv.version, commit: strip0xPrefix(cv.commit) };
+        });
+    }
+}
+//# sourceMappingURL=jsonRpcTransport.js.map

package/lib/execution/engine/jsonRpcTransport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonRpcTransport.js","sourceRoot":"","sources":["../../../src/execution/engine/jsonRpcTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAInD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAA+D,MAAM,gBAAgB,CAAC;AAGxG,OAAO,EACL,2BAA2B,EAI3B,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC1B,mCAAmC,EACnC,iCAAiC,EACjC,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAEvC;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,0DAA0D;AAC1D,MAAM,oBAAoB,GAAY,EAAC,OAAO,EAAE,kBAAkB,EAAC,CAAC;AACpE,MAAM,qBAAqB,GAAY,EAAC,OAAO,EAAE,mBAAmB,EAAC,CAAC;AACtE,MAAM,cAAc,GAAY,EAAC,OAAO,EAAE,YAAY,EAAC,CAAC;AACxD,MAAM,0BAA0B,GAAY,EAAC,OAAO,EAAE,wBAAwB,EAAC,CAAC;AAChF,MAAM,cAAc,GAAY,EAAC,OAAO,EAAE,YAAY,EAAC,CAAC;AACxD,MAAM,cAAc,GAAY,EAAC,OAAO,EAAE,YAAY,EAAC,CAAC;AACxD,MAAM,oBAAoB,GAAY,EAAC,OAAO,EAAE,kBAAkB,EAAC,CAAC;AAEpE;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IACJ,GAAG;IAAhC,YAA6B,GAAuB;mBAAvB,GAAG;IAAuB,CAAC;IAExD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAAc,EACd,gBAAkC,EAClC,eAAiC,EACjC,qBAA4B,EAC5B,iBAAqC;QAErC,MAAM,0BAA0B,GAAG,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAErF,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,KAAK,CAAC,yDAAyD,IAAI,EAAE,CAAC,CAAC;YAC/E,CAAC;YACD,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,KAAK,CAAC,yDAAyD,IAAI,EAAE,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,yBAAyB,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;YAC5E,MAAM,+BAA+B,GAAG,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;YAExF,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;oBACpC,MAAM,KAAK,CAAC,2DAA2D,IAAI,EAAE,CAAC,CAAC;gBACjF,CAAC;gBACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC;gBAC9F,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAC9B;oBACE,MAAM;oBACN,MAAM,EAAE;wBACN,0BAA0B;wBAC1B,yBAAyB;wBACzB,+BAA+B;wBAC/B,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,CAAC;qBACpD;iBACF,EACD,oBAAoB,CACrB,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,qBAAqB,CAAC;YACrC,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAC9B,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,0BAA0B,EAAE,yBAAyB,EAAE,+BAA+B,CAAC,EAAC,EAC1G,oBAAoB,CACrB,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC;QAChG,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAC9B,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,0BAA0B,CAAC,EAAC,EAC9C,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,IAAc,EACd,aAAsB,EACtB,aAAsB,EACtB,kBAA2B,EAC3B,iBAAqC;QAErC,MAAM,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK;YAC5B,CAAC,CAAC,4BAA4B;YAC9B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK;gBAC9B,CAAC,CAAC,4BAA4B;gBAC9B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO;oBAChC,CAAC,CAAC,4BAA4B;oBAC9B,CAAC,CAAC,4BAA4B,CAAC;QACvC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,CAAC,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3G,oFAAoF;QACpF,0EAA0E;QAC1E,MAAM,UAAU,GAAG,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAC,GAAG,qBAAqB,EAAE,OAAO,EAAE,CAAC,EAAC,CAAC;QAEpH,MAAM,EAAC,aAAa,EAAE,SAAS,EAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAGhE,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,aAAa,EAAE,aAAa,EAAE,kBAAkB,EAAC,EAAE,oBAAoB,CAAC,EAAC,EAAE,UAAU,CAAC,CAAC;QAE5G,OAAO,EAAC,aAAa,EAAE,SAAS,EAAE,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAc,EAAE,SAAoB;QACnD,IAAI,MAAqC,CAAC;QAC1C,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,QAAQ,CAAC,MAAM,CAAC;YACrB,KAAK,QAAQ,CAAC,MAAM,CAAC;YACrB,KAAK,QAAQ,CAAC,SAAS;gBACrB,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ,CAAC,OAAO;gBACnB,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ,CAAC,KAAK;gBACjB,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ,CAAC,OAAO;gBACnB,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ,CAAC,IAAI;gBAChB,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;YACR;gBACE,MAAM,GAAG,qBAAqB,CAAC;gBAC/B,MAAM;QACV,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAGrD,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAC,EAAE,cAAc,CAAC,CAAC;QACjD,OAAO,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,WAAsB;QACnD,MAAM,MAAM,GAAG,iCAAiC,CAAC;QACjD,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAG9C,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAC,EAAE,0BAA0B,CAAC,CAAC;QAC/D,OAAO,QAAQ,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,eAAgC;QAC/C,kBAAkB,CAAC,eAAe,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QACjE,MAAM,kBAAkB,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAG9C,EAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAC,EAAE,cAAc,CAAC,CAAC;QAE/E,IAAI,QAAQ,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAClD,MAAM,KAAK,CACT,6CAA6C,QAAQ,CAAC,MAAM,oBAAoB,kBAAkB,CAAC,MAAM,EAAE,CAC5G,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,eAAgC,EAAE,OAAsB;QACvE,kBAAkB,CAAC,eAAe,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QACjE,MAAM,kBAAkB,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,OAAO,EAAE,CAAC;YACZ,6FAA6F;YAC7F,IAAI,OAAO,CAAC,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAC/C,MAAM,KAAK,CAAC,6BAA6B,OAAO,CAAC,MAAM,oBAAoB,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1G,CAAC;YAED,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC5C,IAAI,MAAM,CAAC,MAAM,KAAK,2BAA2B,EAAE,CAAC;oBAClD,MAAM,KAAK,CAAC,kBAAkB,CAAC,YAAY,MAAM,CAAC,MAAM,aAAa,2BAA2B,EAAE,CAAC,CAAC;gBACtG,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAG9C,EAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAC,EAAE,cAAc,CAAC,CAAC;QAE/E,gGAAgG;QAChG,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAClD,MAAM,KAAK,CACT,6CAA6C,QAAQ,CAAC,MAAM,oBAAoB,kBAAkB,CAAC,MAAM,EAAE,CAC5G,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,gFAAgF;YAChF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,mCAAmC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QAED,OAAO,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAA4B;QACjD,MAAM,MAAM,GAAG,2BAA2B,CAAC;QAE3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAG9C,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,GAAG,aAAa,EAAE,MAAM,EAAE,KAAK,aAAa,CAAC,MAAM,EAAE,EAAC,CAAC,EAAC,EAAE,oBAAoB,CAAC,CAAC;QAErG,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACzB,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAA+B,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;YACpG,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/execution/engine/restHttpClient.d.ts

@@ -0,0 +1,71 @@
+import { LodestarError } from "@lodestar/utils";
+import { JsonRpcHttpClientEventEmitter, JsonRpcHttpClientMetrics, ReqOpts } from "./jsonRpcHttpClient.js";
+import { ExecutionForkName } from "./sszTypes.js";
+export declare const ENGINE_REST_BASE_PATH = "/engine/v1";
+export declare const EXECUTION_VERSION_HEADER = "Eth-Execution-Version";
+export declare const CLIENT_VERSION_HEADER = "X-Engine-Client-Version";
+export declare const MEDIA_TYPE_SSZ = "application/octet-stream";
+export declare const MEDIA_TYPE_JSON = "application/json";
+export type EngineRestRequest = {
+    method: "GET" | "POST";
+    /** Path relative to the `/engine/v1` base path */
+    path: string;
+    query?: Record<string, string | number>;
+    /** Sets the `Eth-Execution-Version` header on fork-scoped endpoints */
+    executionFork?: ExecutionForkName;
+    /** SSZ encoded request body */
+    body?: Uint8Array;
+    responseType: "ssz" | "json";
+};
+export type EngineRestResponse = {
+    status: number;
+    /** Empty on `204 No Content` */
+    body: Uint8Array;
+};
+/** Non-2xx response, `type` and `detail` are taken from the problem+json body when present */
+export declare class EngineRestError extends Error {
+    readonly status: number;
+    readonly type: string | null;
+    readonly detail: string | null;
+    constructor(status: number, type: string | null, detail: string | null, routeId: string);
+}
+export declare class EngineRestResponseError extends LodestarError<{
+    code: "ENGINE_REST_INVALID_RESPONSE";
+    routeId: string;
+    reason: string;
+}> {
+    constructor(routeId: string, reason: string);
+}
+export type EngineRestHttpClientOpts = {
+    signal?: AbortSignal;
+    timeout?: number;
+    retries?: number;
+    retryDelay?: number;
+    /** HS256 secret, a fresh token is generated for every request as ELs check `iat` freshness */
+    jwtSecret?: Uint8Array;
+    /** Included as `id` claim if `jwtSecret` is provided */
+    jwtId?: string;
+    /** Value of the `X-Engine-Client-Version` header, the `clv` JWT claim is removed in the REST API */
+    clientVersion?: string;
+    metrics?: JsonRpcHttpClientMetrics | null;
+};
+/**
+ * HTTP/1.1 client for the REST engine API. Only transport concerns live here, encoding of
+ * request and response bodies is up to the caller.
+ */
+export declare class EngineRestHttpClient {
+    private readonly urls;
+    private readonly opts;
+    readonly emitter: JsonRpcHttpClientEventEmitter;
+    private readonly metrics;
+    constructor(urls: string[], opts?: EngineRestHttpClientOpts);
+    /** Perform request with retries, emitting response and error events consumed by the engine state tracking */
+    request(req: EngineRestRequest, opts?: ReqOpts): Promise<EngineRestResponse>;
+    /** Perform request with retries without emitting events, used to probe support for the REST API */
+    requestWithRetries(req: EngineRestRequest, opts?: ReqOpts): Promise<EngineRestResponse>;
+    private requestAnyUrl;
+    private requestOneUrl;
+}
+/** Client errors are deterministic apart from timeouts and rate limits, transport failures and server errors are retried */
+export declare function isRetryableEngineRestError(e: Error): boolean;
+//# sourceMappingURL=restHttpClient.d.ts.map

package/lib/execution/engine/restHttpClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"restHttpClient.d.ts","sourceRoot":"","sources":["../../../src/execution/engine/restHttpClient.ts"],"names":[],"mappings":"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"}

package/lib/execution/engine/restHttpClient.js

@@ -0,0 +1,201 @@
+import { ErrorAborted, FetchError, LodestarError, TimeoutError, fetch, isValidHttpUrl, retry } from "@lodestar/utils";
+import { JsonRpcHttpClientEvent, JsonRpcHttpClientEventEmitter, } from "./jsonRpcHttpClient.js";
+import { encodeJwtToken } from "./jwt.js";
+export const ENGINE_REST_BASE_PATH = "/engine/v1";
+export const EXECUTION_VERSION_HEADER = "Eth-Execution-Version";
+export const CLIENT_VERSION_HEADER = "X-Engine-Client-Version";
+export const MEDIA_TYPE_SSZ = "application/octet-stream";
+export const MEDIA_TYPE_JSON = "application/json";
+const REQUEST_TIMEOUT = 30 * 1000;
+/** Limits the amount of error detail printed with REST errors */
+const MAX_ERROR_DETAIL_LENGTH = 500;
+/** Non-2xx response, `type` and `detail` are taken from the problem+json body when present */
+export class EngineRestError extends Error {
+    status;
+    type;
+    detail;
+    constructor(status, type, detail, routeId) {
+        super(`Engine REST error: status=${status} type=${type ?? "unknown"}${detail ? ` detail=${detail}` : ""}, ${routeId}`);
+        this.status = status;
+        this.type = type;
+        this.detail = detail;
+    }
+}
+export class EngineRestResponseError extends LodestarError {
+    constructor(routeId, reason) {
+        super({ code: "ENGINE_REST_INVALID_RESPONSE", routeId, reason }, `Invalid engine REST response: ${reason}, ${routeId}`);
+    }
+}
+/**
+ * HTTP/1.1 client for the REST engine API. Only transport concerns live here, encoding of
+ * request and response bodies is up to the caller.
+ */
+export class EngineRestHttpClient {
+    urls;
+    opts;
+    emitter = new JsonRpcHttpClientEventEmitter();
+    metrics;
+    constructor(urls, opts = {}) {
+        this.urls = urls;
+        this.opts = opts;
+        if (urls.length === 0) {
+            throw Error("No urls provided to EngineRestHttpClient");
+        }
+        for (const [i, url] of urls.entries()) {
+            if (!isValidHttpUrl(url)) {
+                throw Error(`EngineRestHttpClient.urls[${i}] must be a valid URL: ${url}`);
+            }
+        }
+        this.metrics = opts.metrics ?? null;
+    }
+    /** Perform request with retries, emitting response and error events consumed by the engine state tracking */
+    async request(req, opts) {
+        try {
+            const response = await this.requestWithRetries(req, opts);
+            this.emitter.emit(JsonRpcHttpClientEvent.RESPONSE, { payload: req, response });
+            return response;
+        }
+        catch (error) {
+            this.emitter.emit(JsonRpcHttpClientEvent.ERROR, { payload: req, error: error });
+            throw error;
+        }
+    }
+    /** Perform request with retries without emitting events, used to probe support for the REST API */
+    async requestWithRetries(req, opts) {
+        const routeId = opts?.routeId ?? "unknown";
+        return retry(() => this.requestAnyUrl(req, opts), {
+            retries: opts?.retries ?? this.opts.retries ?? 0,
+            retryDelay: opts?.retryDelay ?? this.opts.retryDelay,
+            shouldRetry: opts?.shouldRetry ?? isRetryableEngineRestError,
+            signal: this.opts.signal,
+            onRetry: () => {
+                this.metrics?.retryCount.inc({ routeId });
+            },
+        });
+    }
+    async requestAnyUrl(req, opts) {
+        const routeId = opts?.routeId ?? "unknown";
+        let lastError = null;
+        for (let i = 0; i < this.urls.length; i++) {
+            if (i > 0) {
+                this.metrics?.requestUsedFallbackUrl.inc({ routeId });
+            }
+            try {
+                return await this.requestOneUrl(this.urls[i], req, opts);
+            }
+            catch (e) {
+                if (!isRetryableEngineRestError(e)) {
+                    throw e;
+                }
+                lastError = e;
+            }
+        }
+        throw lastError ?? Error("Unknown error");
+    }
+    async requestOneUrl(baseUrl, req, opts) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), opts?.timeout ?? this.opts.timeout ?? REQUEST_TIMEOUT);
+        // Not AbortSignal.any(), Node retains every composite until the long-lived parent signal aborts
+        const onParentSignalAbort = () => controller.abort();
+        this.opts.signal?.addEventListener("abort", onParentSignalAbort, { once: true });
+        if (this.opts.signal?.aborted) {
+            controller.abort();
+        }
+        const routeId = opts?.routeId ?? "unknown";
+        const timer = this.metrics?.requestTime.startTimer({ routeId });
+        this.metrics?.activeRequests.inc({ routeId }, 1);
+        try {
+            const url = new URL(`${ENGINE_REST_BASE_PATH}${req.path}`, baseUrl);
+            for (const [key, value] of Object.entries(req.query ?? {})) {
+                url.searchParams.set(key, String(value));
+            }
+            const headers = {
+                Accept: req.responseType === "ssz" ? MEDIA_TYPE_SSZ : MEDIA_TYPE_JSON,
+            };
+            if (req.body !== undefined) {
+                headers["Content-Type"] = MEDIA_TYPE_SSZ;
+            }
+            if (req.executionFork !== undefined) {
+                headers[EXECUTION_VERSION_HEADER] = req.executionFork;
+            }
+            if (this.opts.clientVersion !== undefined) {
+                headers[CLIENT_VERSION_HEADER] = this.opts.clientVersion;
+            }
+            if (this.opts.jwtSecret) {
+                const jwtClaim = { iat: Math.floor(Date.now() / 1000), id: this.opts.jwtId };
+                headers.Authorization = `Bearer ${encodeJwtToken(jwtClaim, this.opts.jwtSecret)}`;
+            }
+            this.metrics?.requestBytes.inc({ routeId }, req.body?.length ?? 0);
+            const res = await fetch(url, {
+                method: req.method,
+                body: req.body,
+                headers,
+                signal: controller.signal,
+            });
+            const streamTimer = this.metrics?.streamTime.startTimer({ routeId });
+            let body;
+            try {
+                body = new Uint8Array(await res.arrayBuffer());
+            }
+            catch (e) {
+                throw new FetchError(url, e);
+            }
+            finally {
+                streamTimer?.();
+            }
+            this.metrics?.responseBytes.inc({ routeId }, body.length);
+            if (!res.ok) {
+                const { type, detail } = parseProblemBody(body);
+                throw new EngineRestError(res.status, type, detail, routeId);
+            }
+            if (res.status !== 200 && res.status !== 204) {
+                throw new EngineRestResponseError(routeId, `Unexpected status ${res.status}`);
+            }
+            const contentType = res.headers.get("content-type")?.split(";", 1)[0].trim().toLowerCase();
+            const expectedContentType = req.responseType === "ssz" ? MEDIA_TYPE_SSZ : MEDIA_TYPE_JSON;
+            if (res.status !== 204 && contentType !== expectedContentType) {
+                throw new EngineRestResponseError(routeId, `Unexpected content type ${contentType}`);
+            }
+            return { status: res.status, body };
+        }
+        catch (e) {
+            this.metrics?.requestErrors.inc({ routeId });
+            if (controller.signal.aborted) {
+                if (this.opts.signal?.aborted) {
+                    throw new ErrorAborted("request");
+                }
+                throw new TimeoutError("request");
+            }
+            throw e;
+        }
+        finally {
+            timer?.();
+            this.metrics?.activeRequests.dec({ routeId }, 1);
+            clearTimeout(timeout);
+            this.opts.signal?.removeEventListener("abort", onParentSignalAbort);
+        }
+    }
+}
+/** Client errors are deterministic apart from timeouts and rate limits, transport failures and server errors are retried */
+export function isRetryableEngineRestError(e) {
+    return ((e instanceof EngineRestError && (e.status >= 500 || e.status === 408 || e.status === 429)) ||
+        e instanceof TimeoutError ||
+        (e instanceof FetchError && e.type !== "input" && e.type !== "aborted"));
+}
+function parseProblemBody(body) {
+    const text = new TextDecoder().decode(body);
+    try {
+        const problem = JSON.parse(text);
+        if (typeof problem === "object" && problem !== null) {
+            return {
+                type: "type" in problem && typeof problem.type === "string" ? problem.type : null,
+                detail: ("detail" in problem && typeof problem.detail === "string" ? problem.detail : text).slice(0, MAX_ERROR_DETAIL_LENGTH) || null,
+            };
+        }
+    }
+    catch {
+        // Legacy endpoints and proxies may return plain text instead of a problem document.
+    }
+    return { type: null, detail: text.slice(0, MAX_ERROR_DETAIL_LENGTH) || null };
+}
+//# sourceMappingURL=restHttpClient.js.map

package/lib/execution/engine/restHttpClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restHttpClient.js","sourceRoot":"","sources":["../../../src/execution/engine/restHttpClient.ts"],"names":[],"mappings":"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"}