@lodestar/builder 1.50.0-dev.1f38fe79fb → 1.50.0-dev.2c73e62678

package/lib/services/executionPayloadEnvelope.d.ts

@@ -0,0 +1,55 @@
+import type { BuilderIndex, RootHex, Slot, deneb, gloas } from "@lodestar/types";
+import { LodestarError } from "@lodestar/utils";
+import type { StoredPayload } from "./payloadStore.js";
+export type ExecutionPayloadEnvelopeInput = {
+    blockRoot: RootHex;
+    builderIndex: BuilderIndex;
+    selectedBid: gloas.ExecutionPayloadBid;
+    storedPayload: StoredPayload;
+};
+export type ExecutionPayloadEnvelopeContents = {
+    envelope: gloas.ExecutionPayloadEnvelope;
+    kzgProofs: deneb.KZGProofs;
+    blobs: deneb.Blobs;
+};
+export declare enum ExecutionPayloadEnvelopeErrorCode {
+    SLOT_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_SLOT_MISMATCH",
+    PARENT_BLOCK_ROOT_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_PARENT_BLOCK_ROOT_MISMATCH",
+    PARENT_BLOCK_HASH_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_PARENT_BLOCK_HASH_MISMATCH",
+    BLOCK_HASH_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BLOCK_HASH_MISMATCH",
+    BUILDER_INDEX_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BUILDER_INDEX_MISMATCH",
+    BLOB_KZG_COMMITMENTS_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BLOB_KZG_COMMITMENTS_MISMATCH",
+    EXECUTION_REQUESTS_ROOT_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_EXECUTION_REQUESTS_ROOT_MISMATCH"
+}
+export type ExecutionPayloadEnvelopeErrorType = {
+    code: ExecutionPayloadEnvelopeErrorCode.BUILDER_INDEX_MISMATCH;
+    builderIndex: BuilderIndex;
+    bidBuilderIndex: BuilderIndex;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.BLOB_KZG_COMMITMENTS_MISMATCH;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_ROOT_MISMATCH;
+    bidExecutionRequestsRoot: RootHex;
+    payloadExecutionRequestsRoot: RootHex;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.PARENT_BLOCK_ROOT_MISMATCH;
+    bidParentBlockRoot: RootHex;
+    storedParentBlockRoot: RootHex;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.SLOT_MISMATCH;
+    bidSlot: Slot;
+    payloadSlot: Slot;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.PARENT_BLOCK_HASH_MISMATCH;
+    bidParentBlockHash: RootHex;
+    payloadParentBlockHash: RootHex;
+} | {
+    code: ExecutionPayloadEnvelopeErrorCode.BLOCK_HASH_MISMATCH;
+    bidBlockHash: RootHex;
+    payloadBlockHash: RootHex;
+};
+export declare class ExecutionPayloadEnvelopeError extends LodestarError<ExecutionPayloadEnvelopeErrorType> {
+}
+/** The caller must have matched the selected bid to its local ledger record. */
+export declare function createExecutionPayloadEnvelopeContents({ blockRoot, builderIndex, selectedBid, storedPayload, }: ExecutionPayloadEnvelopeInput): ExecutionPayloadEnvelopeContents;
+//# sourceMappingURL=executionPayloadEnvelope.d.ts.map

package/lib/services/executionPayloadEnvelope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executionPayloadEnvelope.d.ts","sourceRoot":"","sources":["../../src/services/executionPayloadEnvelope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAE/E,OAAO,EAAC,aAAa,EAAsC,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAErD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,KAAK,CAAC,mBAAmB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,QAAQ,EAAE,KAAK,CAAC,wBAAwB,CAAC;IACzC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;CACpB,CAAC;AAEF,oBAAY,iCAAiC;IAC3C,aAAa,mDAAmD;IAChE,0BAA0B,gEAAgE;IAC1F,0BAA0B,gEAAgE;IAC1F,mBAAmB,yDAAyD;IAC5E,sBAAsB,4DAA4D;IAClF,6BAA6B,mEAAmE;IAChG,gCAAgC,sEAAsE;CACvG;AAED,MAAM,MAAM,iCAAiC,GACzC;IACE,IAAI,EAAE,iCAAiC,CAAC,sBAAsB,CAAC;IAC/D,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,YAAY,CAAC;CAC/B,GACD;IAAC,IAAI,EAAE,iCAAiC,CAAC,6BAA6B,CAAA;CAAC,GACvE;IACE,IAAI,EAAE,iCAAiC,CAAC,gCAAgC,CAAC;IACzE,wBAAwB,EAAE,OAAO,CAAC;IAClC,4BAA4B,EAAE,OAAO,CAAC;CACvC,GACD;IACE,IAAI,EAAE,iCAAiC,CAAC,0BAA0B,CAAC;IACnE,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;CAChC,GACD;IACE,IAAI,EAAE,iCAAiC,CAAC,aAAa,CAAC;IACtD,OAAO,EAAE,IAAI,CAAC;IACd,WAAW,EAAE,IAAI,CAAC;CACnB,GACD;IACE,IAAI,EAAE,iCAAiC,CAAC,0BAA0B,CAAC;IACnE,kBAAkB,EAAE,OAAO,CAAC;IAC5B,sBAAsB,EAAE,OAAO,CAAC;CACjC,GACD;IACE,IAAI,EAAE,iCAAiC,CAAC,mBAAmB,CAAC;IAC5D,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEN,qBAAa,6BAA8B,SAAQ,aAAa,CAAC,iCAAiC,CAAC;CAAG;AAEtG,gFAAgF;AAChF,wBAAgB,sCAAsC,CAAC,EACrD,SAAS,EACT,YAAY,EACZ,WAAW,EACX,aAAa,GACd,EAAE,6BAA6B,GAAG,gCAAgC,CAsFlE"}

package/lib/services/executionPayloadEnvelope.js

@@ -0,0 +1,79 @@
+import { ssz } from "@lodestar/types";
+import { LodestarError, byteArrayEquals, fromHex, toRootHex } from "@lodestar/utils";
+export var ExecutionPayloadEnvelopeErrorCode;
+(function (ExecutionPayloadEnvelopeErrorCode) {
+    ExecutionPayloadEnvelopeErrorCode["SLOT_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_SLOT_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["PARENT_BLOCK_ROOT_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_PARENT_BLOCK_ROOT_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["PARENT_BLOCK_HASH_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_PARENT_BLOCK_HASH_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["BLOCK_HASH_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BLOCK_HASH_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["BUILDER_INDEX_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BUILDER_INDEX_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["BLOB_KZG_COMMITMENTS_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BLOB_KZG_COMMITMENTS_MISMATCH";
+    ExecutionPayloadEnvelopeErrorCode["EXECUTION_REQUESTS_ROOT_MISMATCH"] = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_EXECUTION_REQUESTS_ROOT_MISMATCH";
+})(ExecutionPayloadEnvelopeErrorCode || (ExecutionPayloadEnvelopeErrorCode = {}));
+export class ExecutionPayloadEnvelopeError extends LodestarError {
+}
+/** The caller must have matched the selected bid to its local ledger record. */
+export function createExecutionPayloadEnvelopeContents({ blockRoot, builderIndex, selectedBid, storedPayload, }) {
+    if (builderIndex !== selectedBid.builderIndex) {
+        throw new ExecutionPayloadEnvelopeError({
+            code: ExecutionPayloadEnvelopeErrorCode.BUILDER_INDEX_MISMATCH,
+            builderIndex,
+            bidBuilderIndex: selectedBid.builderIndex,
+        });
+    }
+    const bidParentBlockRoot = toRootHex(selectedBid.parentBlockRoot);
+    const storedParentBlockRoot = toRootHex(storedPayload.parentBlockRoot);
+    if (storedParentBlockRoot !== bidParentBlockRoot) {
+        throw new ExecutionPayloadEnvelopeError({
+            code: ExecutionPayloadEnvelopeErrorCode.PARENT_BLOCK_ROOT_MISMATCH,
+            bidParentBlockRoot,
+            storedParentBlockRoot,
+        }, `Selected bid beacon parent does not match retained payload bidParentBlockRoot=${bidParentBlockRoot} storedParentBlockRoot=${storedParentBlockRoot}`);
+    }
+    const { payload } = storedPayload;
+    const payloadSlot = payload.executionPayload.slotNumber;
+    if (payloadSlot !== selectedBid.slot) {
+        throw new ExecutionPayloadEnvelopeError({ code: ExecutionPayloadEnvelopeErrorCode.SLOT_MISMATCH, bidSlot: selectedBid.slot, payloadSlot }, `Selected bid slot does not match payload slot bidSlot=${selectedBid.slot} payloadSlot=${payloadSlot}`);
+    }
+    const payloadParentBlockHash = toRootHex(payload.executionPayload.parentHash);
+    const bidParentBlockHash = toRootHex(selectedBid.parentBlockHash);
+    if (payloadParentBlockHash !== bidParentBlockHash) {
+        throw new ExecutionPayloadEnvelopeError({
+            code: ExecutionPayloadEnvelopeErrorCode.PARENT_BLOCK_HASH_MISMATCH,
+            bidParentBlockHash,
+            payloadParentBlockHash,
+        }, `Selected bid parent does not match payload parent bidParentBlockHash=${bidParentBlockHash} payloadParentBlockHash=${payloadParentBlockHash}`);
+    }
+    const payloadBlockHash = toRootHex(payload.executionPayload.blockHash);
+    const bidBlockHash = toRootHex(selectedBid.blockHash);
+    if (payloadBlockHash !== bidBlockHash) {
+        throw new ExecutionPayloadEnvelopeError({
+            code: ExecutionPayloadEnvelopeErrorCode.BLOCK_HASH_MISMATCH,
+            bidBlockHash,
+            payloadBlockHash,
+        }, `Selected bid block hash does not match payload bidBlockHash=${bidBlockHash} payloadBlockHash=${payloadBlockHash}`);
+    }
+    if (!ssz.gloas.ExecutionPayloadBid.fields.blobKzgCommitments.equals(selectedBid.blobKzgCommitments, payload.blobsBundle.commitments)) {
+        throw new ExecutionPayloadEnvelopeError({ code: ExecutionPayloadEnvelopeErrorCode.BLOB_KZG_COMMITMENTS_MISMATCH });
+    }
+    const executionRequestsRoot = ssz.gloas.ExecutionRequests.hashTreeRoot(payload.executionRequests);
+    if (!byteArrayEquals(executionRequestsRoot, selectedBid.executionRequestsRoot)) {
+        throw new ExecutionPayloadEnvelopeError({
+            code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_ROOT_MISMATCH,
+            bidExecutionRequestsRoot: toRootHex(selectedBid.executionRequestsRoot),
+            payloadExecutionRequestsRoot: toRootHex(executionRequestsRoot),
+        });
+    }
+    return {
+        envelope: {
+            payload: payload.executionPayload,
+            executionRequests: payload.executionRequests,
+            builderIndex,
+            beaconBlockRoot: fromHex(blockRoot),
+            parentBeaconBlockRoot: selectedBid.parentBlockRoot,
+        },
+        kzgProofs: payload.blobsBundle.proofs,
+        blobs: payload.blobsBundle.blobs,
+    };
+}
+//# sourceMappingURL=executionPayloadEnvelope.js.map

package/lib/services/executionPayloadEnvelope.js.map

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

package/lib/services/payloadOrchestrator.d.ts

@@ -0,0 +1,42 @@
+import { LodestarError } from "@lodestar/utils";
+import { type BuildRequest, type BuiltPayload, type PayloadSource } from "./payloadSource.js";
+export type PayloadBuildJob = {
+    /** Jobs with the same ID share one build and its result. */
+    id: string;
+    request: BuildRequest;
+    /** Unix timestamp in milliseconds at which the prepared payload should be retrieved. */
+    getPayloadAt: number;
+};
+export type PayloadOrchestratorOptions = {
+    /** Maximum time in milliseconds to wait for payload retrieval. */
+    getPayloadTimeout: number;
+};
+export declare enum PayloadOrchestratorErrorCode {
+    PREPARE_DEADLINE_REACHED = "PAYLOAD_ORCHESTRATOR_ERROR_PREPARE_DEADLINE_REACHED",
+    PREPARE_TIMEOUT = "PAYLOAD_ORCHESTRATOR_ERROR_PREPARE_TIMEOUT",
+    GET_PAYLOAD_TIMEOUT = "PAYLOAD_ORCHESTRATOR_ERROR_GET_PAYLOAD_TIMEOUT"
+}
+export type PayloadOrchestratorErrorType = {
+    code: PayloadOrchestratorErrorCode.PREPARE_DEADLINE_REACHED;
+    jobId: string;
+    getPayloadAt: number;
+} | {
+    code: PayloadOrchestratorErrorCode.PREPARE_TIMEOUT | PayloadOrchestratorErrorCode.GET_PAYLOAD_TIMEOUT;
+    jobId: string;
+};
+export declare class PayloadOrchestratorError extends LodestarError<PayloadOrchestratorErrorType> {
+}
+/**
+ * Prepares a payload and retrieves it at the requested time. Preparation retries missing payload IDs until the
+ * retrieval time. Transport-level retries remain owned by the source.
+ */
+export declare class PayloadOrchestrator {
+    private readonly source;
+    private readonly options;
+    private readonly signal;
+    private readonly jobs;
+    constructor(source: PayloadSource, options: PayloadOrchestratorOptions, signal: AbortSignal);
+    run(job: PayloadBuildJob): Promise<BuiltPayload>;
+    private runJob;
+}
+//# sourceMappingURL=payloadOrchestrator.d.ts.map

package/lib/services/payloadOrchestrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"payloadOrchestrator.d.ts","sourceRoot":"","sources":["../../src/services/payloadOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAA0C,MAAM,iBAAiB,CAAC;AACvF,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAI5B,MAAM,MAAM,eAAe,GAAG;IAC5B,4DAA4D;IAC5D,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,YAAY,CAAC;IACtB,wFAAwF;IACxF,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,kEAAkE;IAClE,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,oBAAY,4BAA4B;IACtC,wBAAwB,wDAAwD;IAChF,eAAe,+CAA+C;IAC9D,mBAAmB,mDAAmD;CACvE;AAED,MAAM,MAAM,4BAA4B,GACpC;IACE,IAAI,EAAE,4BAA4B,CAAC,wBAAwB,CAAC;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,IAAI,EAAE,4BAA4B,CAAC,eAAe,GAAG,4BAA4B,CAAC,mBAAmB,CAAC;IACtG,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,qBAAa,wBAAyB,SAAQ,aAAa,CAAC,4BAA4B,CAAC;CAAG;AAE5F;;;GAGG;AACH,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA4C;IAEjE,YACmB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,0BAA0B,EACnC,MAAM,EAAE,WAAW,EAClC;IAEJ,GAAG,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAQ/C;YAEa,MAAM;CAwCrB"}

package/lib/services/payloadOrchestrator.js

@@ -0,0 +1,60 @@
+import { LodestarError, TimeoutError, retry, sleep, withTimeout } from "@lodestar/utils";
+import { PayloadSourceError, PayloadSourceErrorCode, } from "./payloadSource.js";
+const PREPARE_RETRY_DELAY = 100;
+export var PayloadOrchestratorErrorCode;
+(function (PayloadOrchestratorErrorCode) {
+    PayloadOrchestratorErrorCode["PREPARE_DEADLINE_REACHED"] = "PAYLOAD_ORCHESTRATOR_ERROR_PREPARE_DEADLINE_REACHED";
+    PayloadOrchestratorErrorCode["PREPARE_TIMEOUT"] = "PAYLOAD_ORCHESTRATOR_ERROR_PREPARE_TIMEOUT";
+    PayloadOrchestratorErrorCode["GET_PAYLOAD_TIMEOUT"] = "PAYLOAD_ORCHESTRATOR_ERROR_GET_PAYLOAD_TIMEOUT";
+})(PayloadOrchestratorErrorCode || (PayloadOrchestratorErrorCode = {}));
+export class PayloadOrchestratorError extends LodestarError {
+}
+/**
+ * Prepares a payload and retrieves it at the requested time. Preparation retries missing payload IDs until the
+ * retrieval time. Transport-level retries remain owned by the source.
+ */
+export class PayloadOrchestrator {
+    source;
+    options;
+    signal;
+    jobs = new Map();
+    constructor(source, options, signal) {
+        this.source = source;
+        this.options = options;
+        this.signal = signal;
+    }
+    run(job) {
+        const { id } = job;
+        let promise = this.jobs.get(id);
+        if (promise === undefined) {
+            promise = this.runJob(job).finally(() => this.jobs.delete(id));
+            this.jobs.set(id, promise);
+        }
+        return promise;
+    }
+    async runJob({ id, request, getPayloadAt }) {
+        const prepareTimeout = getPayloadAt - Date.now();
+        if (!(prepareTimeout > 0)) {
+            throw new PayloadOrchestratorError({ code: PayloadOrchestratorErrorCode.PREPARE_DEADLINE_REACHED, jobId: id, getPayloadAt }, `Payload preparation deadline reached jobId=${id} getPayloadAt=${getPayloadAt}`);
+        }
+        const handle = await withTimeout((signal = this.signal) => retry(() => this.source.prepare(request, signal), {
+            retries: Infinity,
+            retryDelay: PREPARE_RETRY_DELAY,
+            shouldRetry: (error) => error instanceof PayloadSourceError && error.type.code === PayloadSourceErrorCode.NO_PAYLOAD_ID,
+            signal,
+        }), prepareTimeout, this.signal).catch((error) => {
+            if (error instanceof TimeoutError) {
+                throw new PayloadOrchestratorError({ code: PayloadOrchestratorErrorCode.PREPARE_TIMEOUT, jobId: id });
+            }
+            throw error;
+        });
+        await sleep(getPayloadAt - Date.now(), this.signal);
+        return withTimeout((signal = this.signal) => this.source.getPayload(handle, signal), this.options.getPayloadTimeout, this.signal).catch((error) => {
+            if (error instanceof TimeoutError) {
+                throw new PayloadOrchestratorError({ code: PayloadOrchestratorErrorCode.GET_PAYLOAD_TIMEOUT, jobId: id });
+            }
+            throw error;
+        });
+    }
+}
+//# sourceMappingURL=payloadOrchestrator.js.map

package/lib/services/payloadOrchestrator.js.map

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

package/lib/services/proposerPreferencesTracker.d.ts

@@ -1,13 +1,7 @@
-import { ApiClient } from "@lodestar/api";
 import type { RootHex, Slot, gloas } from "@lodestar/types";
-import { Logger } from "@lodestar/utils";
 /** Retains validated proposer preferences by the branch-specific identity used for bid validation. */
 export declare class ProposerPreferencesTracker {
-    private readonly api;
-    private readonly logger;
     private readonly byDependentRootBySlot;
-    constructor(api: ApiClient, logger: Logger);
-    start(signal: AbortSignal): void;
     onProposerPreferences(signedProposerPreferences: gloas.SignedProposerPreferences): boolean;
     get(slot: Slot, dependentRoot: RootHex): gloas.SignedProposerPreferences | null;
     prune(currentSlot: Slot): number;

package/lib/services/proposerPreferencesTracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proposerPreferencesTracker.d.ts","sourceRoot":"","sources":["../../src/services/proposerPreferencesTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,MAAM,EAAoB,MAAM,iBAAiB,CAAC;AAE1D,sGAAsG;AACtG,qBAAa,0BAA0B;IAMnC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAEpC;IAEF,YACmB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EAC7B;IAEJ,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CA2B/B;IAED,qBAAqB,CAAC,yBAAyB,EAAE,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAWzF;IAED,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,GAAG,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAE9E;IAED,KAAK,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,CAW/B;CACF"}
+{"version":3,"file":"proposerPreferencesTracker.d.ts","sourceRoot":"","sources":["../../src/services/proposerPreferencesTracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAG1D,sGAAsG;AACtG,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAEpC;IAEF,qBAAqB,CAAC,yBAAyB,EAAE,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAWzF;IAED,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,GAAG,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAE9E;IAED,KAAK,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,CAW/B;CACF"}

package/lib/services/proposerPreferencesTracker.js

@@ -1,45 +1,7 @@
-import { routes } from "@lodestar/api";
 import { MapDef, toRootHex } from "@lodestar/utils";
 /** Retains validated proposer preferences by the branch-specific identity used for bid validation. */
 export class ProposerPreferencesTracker {
-    api;
-    logger;
     byDependentRootBySlot = new MapDef(() => new Map());
-    constructor(api, logger) {
-        this.api = api;
-        this.logger = logger;
-    }
-    start(signal) {
-        if (signal.aborted)
-            return;
-        this.logger.verbose("Subscribing to proposer preferences");
-        this.api.events
-            .eventstream({
-            topics: [routes.events.EventType.proposerPreferences],
-            signal,
-            onEvent: (event) => {
-                if (!signal.aborted && event.type === routes.events.EventType.proposerPreferences) {
-                    this.onProposerPreferences(event.message.data);
-                }
-            },
-            onError: (error) => {
-                if (!signal.aborted)
-                    this.logger.error("Failed to receive proposer preferences", {}, error);
-            },
-            onClose: () => {
-                if (signal.aborted) {
-                    this.logger.verbose("Closed proposer preferences stream");
-                }
-                else {
-                    this.logger.error("Proposer preferences stream closed unexpectedly", {});
-                }
-            },
-        })
-            .catch((error) => {
-            if (!signal.aborted)
-                this.logger.error("Failed to subscribe to proposer preferences", {}, error);
-        });
-    }
     onProposerPreferences(signedProposerPreferences) {
         const { proposalSlot, dependentRoot } = signedProposerPreferences.message;
         const dependentRootHex = toRootHex(dependentRoot);

package/lib/services/proposerPreferencesTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"proposerPreferencesTracker.js","sourceRoot":"","sources":["../../src/services/proposerPreferencesTracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proposerPreferencesTracker.js","sourceRoot":"","sources":["../../src/services/proposerPreferencesTracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAElD,sGAAsG;AACtG,MAAM,OAAO,0BAA0B;IACpB,qBAAqB,GAAG,IAAI,MAAM,CACjD,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAChB,CAAC;IAEF,qBAAqB,CAAC,yBAA0D;QAC9E,MAAM,EAAC,YAAY,EAAE,aAAa,EAAC,GAAG,yBAAyB,CAAC,OAAO,CAAC;QACxE,MAAM,gBAAgB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAE9E,IAAI,eAAe,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,IAAU,EAAE,aAAsB;QACpC,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,WAAiB;QACrB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACjE,IAAI,IAAI,IAAI,WAAW,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YAED,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC;YAChC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/builder",
-  "version": "1.50.0-dev.1f38fe79fb",
+  "version": "1.50.0-dev.2c73e62678",
   "description": "A Typescript implementation of the builder client",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -48,16 +48,16 @@
   "dependencies": {
     "@chainsafe/lodestar-z": "catalog:",
     "@chainsafe/ssz": "^1.8.0",
-    "@lodestar/api": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/config": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/params": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/state-transition": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/types": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/utils": "^1.50.0-dev.1f38fe79fb"
+    "@lodestar/api": "^1.50.0-dev.2c73e62678",
+    "@lodestar/config": "^1.50.0-dev.2c73e62678",
+    "@lodestar/params": "^1.50.0-dev.2c73e62678",
+    "@lodestar/state-transition": "^1.50.0-dev.2c73e62678",
+    "@lodestar/types": "^1.50.0-dev.2c73e62678",
+    "@lodestar/utils": "^1.50.0-dev.2c73e62678"
   },
   "devDependencies": {
-    "@lodestar/logger": "^1.50.0-dev.1f38fe79fb",
-    "@lodestar/test-utils": "^1.50.0-dev.1f38fe79fb"
+    "@lodestar/logger": "^1.50.0-dev.2c73e62678",
+    "@lodestar/test-utils": "^1.50.0-dev.2c73e62678"
   },
-  "gitHead": "9a33d9d331de55a20740f4d737b6751081d9d93c"
+  "gitHead": "1ea848c718ce18f7b8492513315c0b24dba3e00f"
 }

package/src/builder.ts

@@ -1,8 +1,8 @@
-import {ApiClient} from "@lodestar/api";
+import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig, assertEqualParams, createBeaconConfig} from "@lodestar/config";
 import {Clock, ClockOptions, IClock} from "@lodestar/state-transition";
 import {BuilderIndex, ExecutionAddress} from "@lodestar/types";
-import {Logger, toHex, toRootHex} from "@lodestar/utils";
+import {Logger, isErrorAborted, toHex, toRootHex} from "@lodestar/utils";
 import {waitForGenesis} from "./genesis.js";
 import {resolveBuilderIdentity} from "./identity.js";
 import {Metrics} from "./metrics.js";
@@ -75,8 +75,7 @@ export class Builder {
     this.clock.runEverySlot(async (slot) => this.onSlot(slot));
     this.clock.runEveryEpoch((epoch) => this.builderStatusTracker.poll(epoch));
     this.clock.start(this.controller.signal);
-    this.blockObserver.start(this.controller.signal);
-    this.proposerPreferencesTracker.start(this.controller.signal);
+    this.subscribeToEvents(opts.api);
 
     this.logger.info("Builder client initialized", {
       index: this.index,
@@ -114,7 +113,7 @@ export class Builder {
 
     const builderStatusTracker = new BuilderStatusTracker(api, logger, index, opts.metrics);
     const blockObserver = new BlockObserver(config, logger, api);
-    const proposerPreferencesTracker = new ProposerPreferencesTracker(api, logger);
+    const proposerPreferencesTracker = new ProposerPreferencesTracker();
 
     const payloadStore = new PayloadStore();
 
@@ -135,6 +134,65 @@ export class Builder {
     this.proposerPreferencesTracker.prune(slot);
   }
 
+  private subscribeToEvents(api: ApiClient): void {
+    const signal = this.controller.signal;
+    if (signal.aborted) return;
+
+    const topics = [routes.events.EventType.block, routes.events.EventType.proposerPreferences];
+    this.logger.verbose("Subscribing to builder events", {topics: topics.join(",")});
+    api.events
+      .eventstream({
+        topics,
+        signal,
+        onEvent: (event) => {
+          void this.onEvent(event);
+        },
+        onError: (error) => {
+          if (!signal.aborted) this.logger.error("Failed to receive builder event", {topics: topics.join(",")}, error);
+        },
+        onClose: () => {
+          if (signal.aborted) {
+            this.logger.verbose("Closed builder event stream", {topics: topics.join(",")});
+          } else {
+            this.logger.error("Builder event stream closed unexpectedly", {topics: topics.join(",")});
+          }
+        },
+      })
+      .catch((error: unknown) => {
+        if (!signal.aborted && !isErrorAborted(error)) {
+          this.logger.error(
+            "Failed to subscribe to builder events",
+            {topics: topics.join(",")},
+            error instanceof Error ? error : Error(String(error))
+          );
+        }
+      });
+  }
+
+  private async onEvent(event: routes.events.BeaconEvent): Promise<void> {
+    const signal = this.controller.signal;
+    if (signal.aborted) return;
+
+    try {
+      switch (event.type) {
+        case routes.events.EventType.block:
+          await this.blockObserver.processBlockEvent(event.message, signal);
+          break;
+        case routes.events.EventType.proposerPreferences:
+          this.proposerPreferencesTracker.onProposerPreferences(event.message.data);
+          break;
+      }
+    } catch (error) {
+      if (!signal.aborted && !isErrorAborted(error)) {
+        this.logger.warn(
+          "Failed to process builder event",
+          {eventType: event.type},
+          error instanceof Error ? error : Error(String(error))
+        );
+      }
+    }
+  }
+
   async close(): Promise<void> {
     this.controller.abort();
   }

package/src/services/bidLedger.ts

@@ -128,6 +128,11 @@ export class BidLedger {
     return toRecord(record);
   }
 
+  hasWon(identity: BidIdentity, blockRoot: RootHex): boolean {
+    const record = this.getBid(identity.slot, identity.parentBlockHash, identity.parentBlockRoot);
+    return record !== null && record.blockHash === identity.blockHash && record.wonBlockRoots.has(blockRoot);
+  }
+
   /** Release a winning bid liability only after its payment is known to be reflected in Builder balance. */
   recordPaymentSettled(identity: BidIdentity): BidLedgerRecord | null {
     const record = this.getBid(identity.slot, identity.parentBlockHash, identity.parentBlockRoot);

package/src/services/bidSelector.ts

@@ -0,0 +1,138 @@
+import type {ChainForkConfig} from "@lodestar/config";
+import type {ForkPostGloas} from "@lodestar/params";
+import type {BuilderIndex, RootHex, SignedBeaconBlock, Slot} from "@lodestar/types";
+import {sszTypesFor} from "@lodestar/types";
+import {LodestarError, toRootHex} from "@lodestar/utils";
+import type {BidIdentity, BidLedger, BidLedgerRecord} from "./bidLedger.js";
+
+export type ObservedPostGloasBlock = {
+  blockRoot: RootHex;
+  slot: Slot;
+  version: ForkPostGloas;
+  block: SignedBeaconBlock<ForkPostGloas>;
+};
+
+export type BidSelectorModules = {
+  config: ChainForkConfig;
+  ledger: BidLedger;
+  builderIndex: BuilderIndex;
+};
+
+export enum BidSelectionIgnoreReason {
+  FOREIGN_BUILDER = "foreign_builder",
+}
+
+export type BidSelectionResult =
+  | {
+      status: "selected";
+      blockRoot: RootHex;
+      bid: BidLedgerRecord;
+    }
+  | {
+      status: "ignored";
+      reason: BidSelectionIgnoreReason;
+    };
+
+export enum BidSelectorErrorCode {
+  BLOCK_ROOT_MISMATCH = "BID_SELECTOR_ERROR_BLOCK_ROOT_MISMATCH",
+  BLOCK_SLOT_MISMATCH = "BID_SELECTOR_ERROR_BLOCK_SLOT_MISMATCH",
+  BLOCK_FORK_MISMATCH = "BID_SELECTOR_ERROR_BLOCK_FORK_MISMATCH",
+  BID_SLOT_MISMATCH = "BID_SELECTOR_ERROR_BID_SLOT_MISMATCH",
+  UNKNOWN_BID = "BID_SELECTOR_ERROR_UNKNOWN_BID",
+}
+
+export type BidSelectorErrorType =
+  | {
+      code: BidSelectorErrorCode.BLOCK_ROOT_MISMATCH;
+      blockRoot: RootHex;
+      computedBlockRoot: RootHex;
+    }
+  | {
+      code: BidSelectorErrorCode.BLOCK_SLOT_MISMATCH;
+      slot: Slot;
+      blockSlot: Slot;
+    }
+  | {
+      code: BidSelectorErrorCode.BLOCK_FORK_MISMATCH;
+      version: ForkPostGloas;
+      blockFork: string;
+    }
+  | {
+      code: BidSelectorErrorCode.BID_SLOT_MISMATCH;
+      slot: Slot;
+      bidSlot: Slot;
+    }
+  | {
+      code: BidSelectorErrorCode.UNKNOWN_BID;
+      slot: Slot;
+      parentBlockHash: RootHex;
+      parentBlockRoot: RootHex;
+      blockHash: RootHex;
+      signedBidRoot: RootHex;
+    };
+
+export class BidSelectorError extends LodestarError<BidSelectorErrorType> {}
+
+/** Matches an imported post-Gloas block to an exact local bid and records the win. */
+export class BidSelector {
+  constructor(private readonly modules: BidSelectorModules) {}
+
+  match(observed: ObservedPostGloasBlock): BidSelectionResult {
+    const {block, blockRoot, slot, version} = observed;
+    const {builderIndex, config, ledger} = this.modules;
+    const blockSlot = block.message.slot;
+
+    if (blockSlot !== slot) {
+      throw new BidSelectorError(
+        {code: BidSelectorErrorCode.BLOCK_SLOT_MISMATCH, slot, blockSlot},
+        `Observed block slot does not match fetched block slot=${slot} blockSlot=${blockSlot}`
+      );
+    }
+
+    const blockFork = config.getForkName(slot);
+    if (blockFork !== version) {
+      throw new BidSelectorError(
+        {code: BidSelectorErrorCode.BLOCK_FORK_MISMATCH, version, blockFork},
+        `Observed block fork does not match configured fork version=${version} blockFork=${blockFork}`
+      );
+    }
+
+    const computedBlockRoot = toRootHex(config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block.message));
+    if (computedBlockRoot !== blockRoot) {
+      throw new BidSelectorError(
+        {code: BidSelectorErrorCode.BLOCK_ROOT_MISMATCH, blockRoot, computedBlockRoot},
+        `Observed block root does not match fetched block blockRoot=${blockRoot} computedBlockRoot=${computedBlockRoot}`
+      );
+    }
+
+    const bid = block.message.body.signedExecutionPayloadBid.message;
+    if (bid.slot !== slot) {
+      throw new BidSelectorError(
+        {code: BidSelectorErrorCode.BID_SLOT_MISMATCH, slot, bidSlot: bid.slot},
+        `Selected bid slot does not match block slot=${slot} bidSlot=${bid.slot}`
+      );
+    }
+    if (bid.builderIndex !== builderIndex) {
+      return {status: "ignored", reason: BidSelectionIgnoreReason.FOREIGN_BUILDER};
+    }
+
+    const identity: BidIdentity = {
+      slot,
+      parentBlockHash: toRootHex(bid.parentBlockHash),
+      parentBlockRoot: toRootHex(bid.parentBlockRoot),
+      blockHash: toRootHex(bid.blockHash),
+    };
+    const signedBidRoot = toRootHex(
+      sszTypesFor(version, "SignedExecutionPayloadBid").hashTreeRoot(block.message.body.signedExecutionPayloadBid)
+    );
+    const localBid = ledger.recordWin({...identity, signedBidRoot}, blockRoot);
+    if (localBid === null) {
+      throw new BidSelectorError(
+        {code: BidSelectorErrorCode.UNKNOWN_BID, ...identity, signedBidRoot},
+        `Selected bid is not in the local ledger slot=${slot} blockHash=${identity.blockHash} signedBidRoot=${signedBidRoot}`
+      );
+    }
+
+    return {status: "selected", blockRoot, bid: localBid};
+  }
+}